浏览代码

Housekeeping & Make ESLint Happy

SukkaW 1 年之前
父节点
当前提交
a5829cc6bd
共有 7 个文件被更改,包括 20 次插入20 次删除
  1. 3 3
      Build/build-speedtest-domainset.ts
  2. 0 2
      Build/lib/tldts.bench.ts
  3. 3 3
      Build/validate-domestic.ts
  4. 6 4
      Source/domainset/cdn.conf
  5. 2 1
      Source/non_ip/ai.conf
  6. 二进制
      bun.lockb
  7. 6 7
      package.json

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

@@ -190,7 +190,7 @@ export const buildSpeedtestDomainSet = task(import.meta.main, import.meta.path)(
       .then(setAddFromArrayCurried(domains))
   );
 
-  await new Promise<void>((resolve) => {
+  await new Promise<void>((resolve, reject) => {
     const pMap = ([
       'Hong Kong',
       'Taiwan',
@@ -244,8 +244,8 @@ export const buildSpeedtestDomainSet = task(import.meta.main, import.meta.path)(
 
     Promise.all(Object.values(pMap)).then(() => {
       clearTimeout(timer);
-      resolve();
-    });
+      return resolve();
+    }).catch(() => reject);
   });
 
   const deduped = span.traceChildSync('sort result', () => sortDomains(domainDeduper(Array.from(domains))));

+ 0 - 2
Build/lib/tldts.bench.ts

@@ -35,14 +35,12 @@ import { getGorhillPublicSuffixPromise } from './get-gorhill-publicsuffix';
 
       bench('tldts', () => {
         for (let i = 0, len = data.length; i < len; i++) {
-          // eslint-disable-next-line import-x/namespace -- safe
           tldts[methodName](data[i], tldtsOpt);
         }
       });
 
       bench('tldts-experimental', () => {
         for (let i = 0, len = data.length; i < len; i++) {
-          // eslint-disable-next-line import-x/namespace -- safe
           tldtsExperimental[methodName](data[i], tldtsOpt);
         }
       });

+ 3 - 3
Build/validate-domestic.ts

@@ -61,9 +61,9 @@ export const parseDomesticList = async () => {
     }
   };
 
-  await Promise.all([
-    runAgainstRuleset(path.resolve(import.meta.dir, '../List/non_ip/domestic.conf'))
-  ]);
+  // await Promise.all([
+  await runAgainstRuleset(path.resolve(import.meta.dir, '../List/non_ip/domestic.conf'));
+  // ]);
 
   console.log(notIncludedDomestic.size, notIncludedDomestic);
 };

+ 6 - 4
Source/domainset/cdn.conf

@@ -1122,9 +1122,10 @@ media.masto.nu
 .misskeyusercontent.jp
 o.n1mp.org
 
-# >> OCSP
+# >> OCSP & Cert Public Key
 r3.o.lencr.org
 ocsp.digicert.com
+cacerts.digicert.com
 ocsp2.apple.com
 ocsp.sectigo.com
 crl.usertrust.com
@@ -2004,9 +2005,8 @@ static-mh.content.disney.io
 # Kwai
 g-static.ap4r.com
 # StripChat
-assets.strpst.com
-img.strpst.com
-static-cdn.strpst.com
+.strpst.com
+.stripst.com
 .stripcdn.com
 .doppiocdn.net
 .doppiocdn.com
@@ -2056,6 +2056,8 @@ images.plurk.com
 s.plurk.com
 # dropshare
 .dsc.cloud
+# SparkNotes
+img.sparknotes.com
 # Others
 .ziffstatic.com
 .muscache.com

+ 2 - 1
Source/non_ip/ai.conf

@@ -11,8 +11,9 @@ DOMAIN-SUFFIX,ai.com
 DOMAIN-SUFFIX,x.ai
 DOMAIN-KEYWORD,openai
 # DOMAIN-SUFFIX,openaiapi-site.azureedge.net
-# Common AI
+# Perplexity
 DOMAIN-SUFFIX,perplexity.ai
+# Claude
 DOMAIN-SUFFIX,anthropic.com
 DOMAIN-SUFFIX,claude.ai
 # Google Gemini

二进制
bun.lockb


+ 6 - 7
package.json

@@ -29,20 +29,19 @@
     "punycode": "^2.3.1",
     "table": "^6.8.2",
     "tar-stream": "^3.1.7",
-    "tldts": "^6.1.28",
-    "tldts-experimental": "^6.1.28",
+    "tldts": "^6.1.29",
+    "tldts-experimental": "^6.1.29",
     "yaml": "^2.4.5"
   },
   "devDependencies": {
-    "@eslint-sukka/node": "6.0.0-beta.3",
-    "@eslint-sukka/ts": "6.0.0-beta.3",
+    "@eslint-sukka/node": "^6.0.0-beta.27",
     "@types/async-retry": "^1.4.8",
     "@types/bun": "^1.1.5",
     "@types/tar-stream": "^3.1.3",
-    "bun-types": "^1.1.15",
+    "bun-types": "^1.1.16",
     "eslint": "^9.5.0",
-    "eslint-config-sukka": "6.0.0-beta.3",
-    "eslint-formatter-sukka": "6.0.0-beta.3",
+    "eslint-config-sukka": "^6.0.0-beta.27",
+    "eslint-formatter-sukka": "^6.0.0-beta.27",
     "mitata": "^0.1.11",
     "typescript": "^5.5.2"
   },