瀏覽代碼

Chore: minor changes

SukkaW 16 小時之前
父節點
當前提交
8364aebdda
共有 3 個文件被更改,包括 7 次插入7 次删除
  1. 5 5
      Build/build-reject-domainset.ts
  2. 1 1
      Build/build-speedtest-domainset.ts
  3. 1 1
      Build/lib/create-file.ts

+ 5 - 5
Build/build-reject-domainset.ts

@@ -269,11 +269,11 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
   });
   });
 
 
   await Promise.all([
   await Promise.all([
-    rejectDomainsetOutput.write(),
-    rejectExtraDomainsetOutput.write(),
-    rejectPhisingDomainsetOutput.write(),
-    rejectIPOutput.write(),
-    rejectNonIpRulesetOutput.write()
+    span.traceChildAsync('write reject domainset', () => rejectDomainsetOutput.write()),
+    span.traceChildAsync('write reject_extra domainset', () => rejectExtraDomainsetOutput.write()),
+    span.traceChildAsync('write reject_phishing domainset', () => rejectPhisingDomainsetOutput.write()),
+    span.traceChildAsync('write reject ip list', () => rejectIPOutput.write()),
+    span.traceChildAsync('write reject non-ip ruleset', () => rejectNonIpRulesetOutput.write())
   ]);
   ]);
 
 
   // we are going to re-use rejectOutput's domainTrie and mutate it
   // we are going to re-use rejectOutput's domainTrie and mutate it

+ 1 - 1
Build/build-speedtest-domainset.ts

@@ -79,7 +79,7 @@ export const buildSpeedtestDomainSet = task(require.main === module, __filename)
     )
     )
     .addFromDomainset(readFileIntoProcessedArray(path.resolve(SOURCE_DIR, 'domainset/speedtest.conf')))
     .addFromDomainset(readFileIntoProcessedArray(path.resolve(SOURCE_DIR, 'domainset/speedtest.conf')))
     .addFromDomainset(readFileIntoProcessedArray(path.resolve(OUTPUT_SURGE_DIR, 'domainset/speedtest.conf')))
     .addFromDomainset(readFileIntoProcessedArray(path.resolve(OUTPUT_SURGE_DIR, 'domainset/speedtest.conf')))
-    .bulkAddDomain(await span.traceChildPromise('get speedtest.test servers', getSpeedtestHostsGroupsPromise))
+    .bulkAddDomain(await span.traceChildPromise('get speedtest.net servers', getSpeedtestHostsGroupsPromise))
     .bulkAddDomain(await span.traceChildPromise('get librespeed backends', getLibrespeedBackendsPromise))
     .bulkAddDomain(await span.traceChildPromise('get librespeed backends', getLibrespeedBackendsPromise))
     .write()
     .write()
 );
 );

+ 1 - 1
Build/lib/create-file.ts

@@ -49,7 +49,7 @@ export async function compareAndWriteFile(span: Span, linesA: string[], filePath
     }
     }
     await new Promise<void>(resolve => {
     await new Promise<void>(resolve => {
       // Since we previously poped the last empty line for comparison, we need to add it back here to ensure final EOF line
       // Since we previously poped the last empty line for comparison, we need to add it back here to ensure final EOF line
-      writeStream.end('\n', resolve);
+      writeStream.end(resolve);
     });
     });
     await promisify(writeStream.close.bind(writeStream))();
     await promisify(writeStream.close.bind(writeStream))();
   });
   });