GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2025-12-12 01:00:34 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Chore: minor changes

Browse Source
This commit is contained in:
SukkaW 2025-11-20 02:20:27 +08:00
parent d7f9961062
commit 9e9ee36292
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Build/build-microsoft-cdn.ts
View File

@ -1,6 +1,5 @@
import { task } from './trace'; import { task } from './trace';
import { SHARED_DESCRIPTION } from './constants/description'; import { SHARED_DESCRIPTION } from './constants/description';
import { once } from 'foxts/once';
import { RulesetOutput } from './lib/rules/ruleset'; import { RulesetOutput } from './lib/rules/ruleset';
import Worktank from 'worktank'; import Worktank from 'worktank';
import { RULES } from './constants/microsoft-cdn'; import { RULES } from './constants/microsoft-cdn';
@ -48,18 +47,13 @@ const pool = new Worktank({
} }
}); });
export const getMicrosoftCdnRulesetPromise = once<Promise<[domains: string[], domainSuffixes: string[]]>>(async () => { export const getMicrosoftCdnRulesetPromise = pool.exec(
const res = await pool.exec( 'getMicrosoftCdnRuleset',
'getMicrosoftCdnRuleset', [__filename]
[__filename] ).finally(() => pool.terminate());
);
pool.terminate();
return res;
});
export const buildMicrosoftCdn = task(require.main === module, __filename)(async (span) => { export const buildMicrosoftCdn = task(require.main === module, __filename)(async (span) => {
const [domains, domainSuffixes] = await span.traceChildPromise('get microsoft cdn domains', getMicrosoftCdnRulesetPromise()); const [domains, domainSuffixes] = await span.traceChildPromise('get microsoft cdn domains', getMicrosoftCdnRulesetPromise);
return new RulesetOutput(span, 'microsoft_cdn', 'non_ip') return new RulesetOutput(span, 'microsoft_cdn', 'non_ip')
.withTitle('Sukka\'s Ruleset - Microsoft CDN') .withTitle('Sukka\'s Ruleset - Microsoft CDN')

2
Build/build-sspanel-appprofile.ts
View File

@ -61,7 +61,7 @@ export const buildSSPanelUIMAppProfile = task(require.main === module, __filenam
// domestic - domains // domestic - domains
getDomesticAndDirectDomainsRulesetPromise(), getDomesticAndDirectDomainsRulesetPromise(),
getAppleCdnDomainsPromise(), getAppleCdnDomainsPromise(),
getMicrosoftCdnRulesetPromise(), getMicrosoftCdnRulesetPromise,
readFileIntoProcessedArray(path.join(OUTPUT_SURGE_DIR, 'non_ip/apple_cn.conf')), readFileIntoProcessedArray(path.join(OUTPUT_SURGE_DIR, 'non_ip/apple_cn.conf')),
readFileIntoProcessedArray(path.join(OUTPUT_SURGE_DIR, 'non_ip/neteasemusic.conf')), readFileIntoProcessedArray(path.join(OUTPUT_SURGE_DIR, 'non_ip/neteasemusic.conf')),
// microsoft & apple - domains // microsoft & apple - domains

4
Build/lib/create-file.ts
View File

@ -29,8 +29,8 @@ export async function compareAndWriteFile(span: Span, linesA: string[], filePath
// The default highwater mark is normally 16384, // The default highwater mark is normally 16384,
// So we make sure direct write to file if the content is // So we make sure direct write to file if the content is
// most likely less than 500 lines // most likely less than 250 lines
if (linesALen < 500) { if (linesALen < 250) {
return writeFile(filePath, fastStringArrayJoin(linesA, '\n') + '\n'); return writeFile(filePath, fastStringArrayJoin(linesA, '\n') + '\n');
} }

3
Build/lib/fetch-assets.ts
View File

@ -35,6 +35,9 @@ export async function fetchAssets(
console.log(picocolors.gray('[fetch cancelled]'), picocolors.gray(url)); console.log(picocolors.gray('[fetch cancelled]'), picocolors.gray(url));
throw reusedCustomAbortError; throw reusedCustomAbortError;
} }
if (index >= 0) {
console.log(picocolors.yellowBright('[fetch fallback begin]'), picocolors.gray(url));
}
const res = await $$fetch(url, { signal: controller.signal, ...defaultRequestInit }); const res = await $$fetch(url, { signal: controller.signal, ...defaultRequestInit });
let stream = nullthrow(res.body, url + ' has an empty body') let stream = nullthrow(res.body, url + ' has an empty body')