GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2026-01-28 17:41:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Chore: minor changes
Some checks failed
Build / Build (push) Has been cancelled
Details
Build / Diff output (push) Has been cancelled
Details
Build / Deploy to Cloudflare Pages (3.114.9) (push) Has been cancelled
Details
Build / Deploy to GitHub and GitLab (push) Has been cancelled
Details

Browse Source
This commit is contained in:
SukkaW
2025-06-18 22:19:59 +08:00
parent b081534692
commit f6abcc2e01
3 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Build/build-public.ts
View File

@@ -7,15 +7,12 @@ import { treeDir, TreeFileType } from './lib/tree-dir';
import type { TreeType, TreeTypeArray } from './lib/tree-dir'; import type { TreeType, TreeTypeArray } from './lib/tree-dir';
import { OUTPUT_MOCK_DIR, OUTPUT_MODULES_RULES_DIR, PUBLIC_DIR, ROOT_DIR } from './constants/dir'; import { OUTPUT_MOCK_DIR, OUTPUT_MODULES_RULES_DIR, PUBLIC_DIR, ROOT_DIR } from './constants/dir';
import { fastStringCompare, mkdirp, writeFile } from './lib/misc'; import { fastStringCompare, writeFile } from './lib/misc';
import type { VoidOrVoidArray } from './lib/misc'; import type { VoidOrVoidArray } from './lib/misc';
import picocolors from 'picocolors'; import picocolors from 'picocolors';
import { tagged as html } from 'foxts/tagged'; import { tagged as html } from 'foxts/tagged';
import { compareAndWriteFile } from './lib/create-file'; import { compareAndWriteFile } from './lib/create-file';
const mockDir = path.join(ROOT_DIR, 'Mock');
const modulesDir = path.join(ROOT_DIR, 'Modules');
const priorityOrder: Record<'default' | string & {}, number> = { const priorityOrder: Record<'default' | string & {}, number> = {
LICENSE: 0, LICENSE: 0,
domainset: 10, domainset: 10,
@@ -53,18 +50,11 @@ export const buildPublic = task(require.main === module, __filename)(async (span
await span.traceChildAsync('copy rest of the files', async () => { await span.traceChildAsync('copy rest of the files', async () => {
const p: Array<Promise<any>> = []; const p: Array<Promise<any>> = [];
let pt = mkdirp(OUTPUT_MODULES_RULES_DIR); fs.mkdirSync(OUTPUT_MODULES_RULES_DIR, { recursive: true });
if (pt) { p.push(copyDirContents(path.join(ROOT_DIR, 'Modules'), OUTPUT_MODULES_RULES_DIR, p));
p.push(pt.then(() => { copyDirContents(modulesDir, OUTPUT_MODULES_RULES_DIR, p); }));
} else { fs.mkdirSync(OUTPUT_MOCK_DIR, { recursive: true });
p.push(copyDirContents(modulesDir, OUTPUT_MODULES_RULES_DIR, p)); p.push(copyDirContents(path.join(ROOT_DIR, 'Mock'), OUTPUT_MOCK_DIR, p));
}
pt = mkdirp(OUTPUT_MOCK_DIR);
if (pt) {
p.push(pt.then(() => { copyDirContents(mockDir, OUTPUT_MOCK_DIR, p); }));
} else {
p.push(copyDirContents(mockDir, OUTPUT_MOCK_DIR, p));
}
await Promise.all(p); await Promise.all(p);
}); });

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

@@ -6,7 +6,7 @@ import { TextLineStream } from 'foxts/text-line-stream';
import { ProcessLineStream } from './process-line'; import { ProcessLineStream } from './process-line';
// eslint-disable-next-line sukka/unicorn/custom-error-definition -- typescript is better // eslint-disable-next-line sukka/unicorn/custom-error-definition -- typescript is better
export class CustomAbortError extends Error { class CustomAbortError extends Error {
public readonly name = 'AbortError'; public readonly name = 'AbortError';
public readonly digest = 'AbortError'; public readonly digest = 'AbortError';
} }

3
Build/lib/parse-dnsmasq.ts
View File

@@ -2,7 +2,6 @@ import { createReadlineInterfaceFromResponse } from './fetch-text-by-line';
import type { UndiciResponseData } from './fetch-retry'; import type { UndiciResponseData } from './fetch-retry';
import type { Response } from 'undici'; import type { Response } from 'undici';
import { fastNormalizeDomain } from './normalize-domain';
export function extractDomainsFromFelixDnsmasq(line: string): string | null { export function extractDomainsFromFelixDnsmasq(line: string): string | null {
if (line.startsWith('server=/') && line.endsWith('/114.114.114.114')) { if (line.startsWith('server=/') && line.endsWith('/114.114.114.114')) {
@@ -16,7 +15,7 @@ export async function parseFelixDnsmasqFromResp(resp: UndiciResponseData | Respo
for await (const line of createReadlineInterfaceFromResponse(resp, true)) { for await (const line of createReadlineInterfaceFromResponse(resp, true)) {
const domain = extractDomainsFromFelixDnsmasq(line); const domain = extractDomainsFromFelixDnsmasq(line);
if (domain && fastNormalizeDomain(domain)) { if (domain) {
results.push(domain); results.push(domain);
} }
} }