Skip to content

Commit fa6a5f0

Browse files
author
Taois
committed
fix: 修复上个版本没正确在生成配置时候使用文件头问题
1 parent dafa0d7 commit fa6a5f0

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

controllers/config.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,10 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
124124
});
125125
// console.log('ds ruleMeta:', ruleMeta);
126126
await FileHeaderManager.writeHeader(filePath, ruleMeta);
127-
} else if (!isLoaded) {
127+
} else {
128+
Object.assign(ruleMeta, header);
129+
}
130+
if (!isLoaded) {
128131
const sizeInBytes = await FileHeaderManager.getFileSize(filePath, {humanReadable: true});
129132
console.log(`Loading RuleObject: ${filePath} fileSize:${sizeInBytes}`);
130133
}
@@ -222,7 +225,10 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
222225
});
223226
// console.log('dr2 ruleMeta:', ruleMeta);
224227
await FileHeaderManager.writeHeader(filePath, ruleMeta);
225-
} else if (!isLoaded) {
228+
} else {
229+
Object.assign(ruleMeta, header);
230+
}
231+
if (!isLoaded) {
226232
const sizeInBytes = await FileHeaderManager.getFileSize(filePath, {humanReadable: true});
227233
console.log(`Loading RuleObject: ${filePath} fileSize:${sizeInBytes}`);
228234
}
@@ -304,7 +310,10 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
304310
});
305311
// console.log('py ruleMeta:', ruleMeta);
306312
await FileHeaderManager.writeHeader(filePath, ruleMeta);
307-
} else if (!isLoaded) {
313+
} else {
314+
Object.assign(ruleMeta, header);
315+
}
316+
if (!isLoaded) {
308317
const sizeInBytes = await FileHeaderManager.getFileSize(filePath, {humanReadable: true});
309318
console.log(`Loading RuleObject: ${filePath} fileSize:${sizeInBytes}`);
310319
}

libs/drpyS.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ export async function getRuleObject(filePath, env, refresh) {
540540
return cached.ruleObject;
541541
}
542542
}
543-
log(`Loading RuleObject: ${filePath} fileSize:${fileContent.length}`);
543+
// log(`Loading RuleObject: ${filePath} fileSize:${fileContent.length}`);
544544
let t1 = utils.getNowTime();
545545
const {sandbox, context} = await getSandbox(env);
546546
const js_code = await getOriginalJs(fileContent);

0 commit comments

Comments
 (0)