Fix rules build

This commit is contained in:
SukkaW 2023-06-29 15:18:53 +08:00
parent 2c70da233b
commit d388147249
2 changed files with 28 additions and 16 deletions

View File

@ -4,9 +4,21 @@ const fse = require('fs-extra');
const path = require('path'); const path = require('path');
const readline = require('readline'); const readline = require('readline');
const { isDomainLoose } = require('./lib/is-domain-loose'); const { isDomainLoose } = require('./lib/is-domain-loose');
const tldts = require('tldts');
(async () => { (async () => {
const results = []; const set = new Set();
/**
* @param {string} input
*/
const addApexDomain = (input) => {
const d = tldts.getDomain(input, { allowPrivateDomains: true });
if (d) {
set.add(d);
}
};
for await ( for await (
const line of readline.createInterface({ const line of readline.createInterface({
@ -15,9 +27,9 @@ const { isDomainLoose } = require('./lib/is-domain-loose');
}) })
) { ) {
if (line.startsWith('DOMAIN-SUFFIX,')) { if (line.startsWith('DOMAIN-SUFFIX,')) {
results.push(line.replace('DOMAIN-SUFFIX,', 'SUFFIX,')); addApexDomain(line.replace('DOMAIN-SUFFIX,', ''))
} else if (line.startsWith('DOMAIN,')) { } else if (line.startsWith('DOMAIN,')) {
results.push(line.replace('DOMAIN,', 'SUFFIX,')); addApexDomain(line.replace('DOMAIN,', ''));
} }
} }
@ -28,9 +40,9 @@ const { isDomainLoose } = require('./lib/is-domain-loose');
}) })
) { ) {
if (line[0] === '.') { if (line[0] === '.') {
results.push(`SUFFIX,${line.slice(1)}`); addApexDomain(line.slice(1));
} else if (isDomainLoose(line)) { } else if (isDomainLoose(line)) {
results.push(`SUFFIX,${line}`); addApexDomain(line);
} }
} }
@ -41,17 +53,15 @@ const { isDomainLoose } = require('./lib/is-domain-loose');
}) })
) { ) {
if (line[0] === '.') { if (line[0] === '.') {
results.push(`SUFFIX,${line.slice(1)}`); addApexDomain(line.slice(1));
} else if (isDomainLoose(line)) { } else if (isDomainLoose(line)) {
results.push(`SUFFIX,${line}`); addApexDomain(line);
} }
} }
results.push('');
await fse.ensureDir(path.resolve(__dirname, '../List/internal')); await fse.ensureDir(path.resolve(__dirname, '../List/internal'));
await fs.promises.writeFile( await fs.promises.writeFile(
path.resolve(__dirname, '../List/internal/cdn.csv'), path.resolve(__dirname, '../List/internal/cdn.csv'),
results.join('\n') Array.from(set).map(i => `SUFFIX,${i}`).join('\n') + '\n'
); );
})(); })();

View File

@ -64,12 +64,19 @@
"download-previous-build" "download-previous-build"
] ]
}, },
"build:internal-rules": {
"command": "node ./Build/build-internal-rules.js",
"dependencies": [
"build:cdn-conf"
]
},
"build:public": { "build:public": {
"command": "node ./Build/build-public.js", "command": "node ./Build/build-public.js",
"dependencies": [ "dependencies": [
"build:anti-bogus-domain", "build:anti-bogus-domain",
"build:apple-cdn", "build:apple-cdn",
"build:cdn-conf", "build:cdn-conf",
"build:internal-rules",
"build:reject-domainset", "build:reject-domainset",
"build:telegram-cidr" "build:telegram-cidr"
] ]
@ -83,12 +90,6 @@
"build:cdn-conf" "build:cdn-conf"
] ]
}, },
"build:internal-rules": {
"command": "node ./Build/build-internal-rules.js",
"dependencies": [
"build:cdn-conf"
]
},
"build": { "build": {
"dependencies": [ "dependencies": [
"build:anti-bogus-domain", "build:anti-bogus-domain",
@ -97,6 +98,7 @@
"build:reject-domainset", "build:reject-domainset",
"build:telegram-cidr", "build:telegram-cidr",
"build:chn-cidr", "build:chn-cidr",
"build:internal-rules",
"build:public", "build:public",
"validate:domainset" "validate:domainset"
] ]