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

Perf: improve generate public speed [skip ci]

Browse Source
This commit is contained in:
SukkaW 2025-06-07 19:00:03 +08:00
parent a671973858
commit 9635db8288
3 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
Build/build-public.ts
View File

@ -6,8 +6,9 @@ import { task } from './trace';
import { treeDir, TreeFileType } from './lib/tree-dir'; 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_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, mkdirp, writeFile } 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';
@ -15,9 +16,7 @@ import { compareAndWriteFile } from './lib/create-file';
const mockDir = path.join(ROOT_DIR, 'Mock'); const mockDir = path.join(ROOT_DIR, 'Mock');
const modulesDir = path.join(ROOT_DIR, 'Modules'); const modulesDir = path.join(ROOT_DIR, 'Modules');
async function copyDirContents(srcDir: string, destDir: string) { async function copyDirContents(srcDir: string, destDir: string, promises: Array<Promise<VoidOrVoidArray>> = []): Promise<Array<Promise<VoidOrVoidArray>>> {
const promises: Array<Promise<void>> = [];
for await (const entry of await fsp.opendir(srcDir)) { for await (const entry of await fsp.opendir(srcDir)) {
const src = path.join(srcDir, entry.name); const src = path.join(srcDir, entry.name);
const dest = path.join(destDir, entry.name); const dest = path.join(destDir, entry.name);
@ -28,21 +27,27 @@ async function copyDirContents(srcDir: string, destDir: string) {
} }
} }
return Promise.all(promises); return promises;
} }
export const buildPublic = task(require.main === module, __filename)(async (span) => { 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 () => {
await Promise.all([ const p: Array<Promise<any>> = [];
// mkdirp(OUTPUT_MODULES_DIR),
mkdirp(OUTPUT_MODULES_RULES_DIR),
mkdirp(OUTPUT_MOCK_DIR)
]);
await Promise.all([ let pt = mkdirp(OUTPUT_MODULES_RULES_DIR);
copyDirContents(modulesDir, OUTPUT_MODULES_DIR), if (pt) {
copyDirContents(mockDir, OUTPUT_MOCK_DIR) p.push(pt.then(() => { copyDirContents(modulesDir, OUTPUT_MODULES_RULES_DIR, p); }));
]); } else {
p.push(copyDirContents(modulesDir, OUTPUT_MODULES_RULES_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);
}); });
const html = await span const html = await span
@ -108,7 +113,7 @@ const priorityOrder: Record<'default' | string & {}, number> = {
}; };
const prioritySorter = (a: TreeType, b: TreeType) => ((priorityOrder[a.name] || priorityOrder.default) - (priorityOrder[b.name] || priorityOrder.default)) || fastStringCompare(a.name, b.name); const prioritySorter = (a: TreeType, b: TreeType) => ((priorityOrder[a.name] || priorityOrder.default) - (priorityOrder[b.name] || priorityOrder.default)) || fastStringCompare(a.name, b.name);
function walk(tree: TreeTypeArray) { function treeHtml(tree: TreeTypeArray) {
let result = ''; let result = '';
tree.sort(prioritySorter); tree.sort(prioritySorter);
for (let i = 0, len = tree.length; i < len; i++) { for (let i = 0, len = tree.length; i < len; i++) {
@ -117,9 +122,7 @@ function walk(tree: TreeTypeArray) {
result += html` result += html`
<li class="folder"> <li class="folder">
${entry.name} ${entry.name}
<ul> <ul>${treeHtml(entry.children)}</ul>
${walk(entry.children)}
</ul>
</li> </li>
`; `;
} else if (/* entry.type === 'file' && */ entry.name !== 'index.html') { } else if (/* entry.type === 'file' && */ entry.name !== 'index.html') {
@ -132,29 +135,29 @@ function walk(tree: TreeTypeArray) {
function generateHtml(tree: TreeTypeArray) { function generateHtml(tree: TreeTypeArray) {
return html` return html`
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Surge Ruleset Server | Sukka (@SukkaW)</title> <title>Surge Ruleset Server | Sukka (@SukkaW)</title>
<meta name="viewport" content="width=device-width,initial-scale=1,viewport-fit=cover"> <meta name="viewport" content="width=device-width,initial-scale=1,viewport-fit=cover">
<link href="https://cdn.skk.moe/favicon.ico" rel="icon" type="image/ico"> <link href="https://cdn.skk.moe/favicon.ico" rel="icon" type="image/ico">
<link href="https://cdn.skk.moe/favicon/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180"> <link href="https://cdn.skk.moe/favicon/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180">
<link href="https://cdn.skk.moe/favicon/android-chrome-192x192.png" rel="icon" type="image/png" sizes="192x192"> <link href="https://cdn.skk.moe/favicon/android-chrome-192x192.png" rel="icon" type="image/png" sizes="192x192">
<link href="https://cdn.skk.moe/favicon/favicon-32x32.png" rel="icon" type="image/png" sizes="32x32"> <link href="https://cdn.skk.moe/favicon/favicon-32x32.png" rel="icon" type="image/png" sizes="32x32">
<link href="https://cdn.skk.moe/favicon/favicon-16x16.png" rel="icon" type="image/png" sizes="16x16"> <link href="https://cdn.skk.moe/favicon/favicon-16x16.png" rel="icon" type="image/png" sizes="16x16">
<meta name="description" content="Sukka 自用的 Surge / Clash Premium 规则组"> <meta name="description" content="Sukka 自用的 Surge / Clash Premium 规则组">
<link rel="stylesheet" href="https://cdn.skk.moe/ruleset/css/21d8777a.css" /> <link rel="stylesheet" href="https://cdn.skk.moe/ruleset/css/21d8777a.css" />
<meta property="og:title" content="Surge Ruleset | Sukka (@SukkaW)"> <meta property="og:title" content="Surge Ruleset | Sukka (@SukkaW)">
<meta property="og:type" content="Website"> <meta property="og:type" content="Website">
<meta property="og:url" content="https://ruleset.skk.moe/"> <meta property="og:url" content="https://ruleset.skk.moe/">
<meta property="og:image" content="https://cdn.skk.moe/favicon/android-chrome-192x192.png"> <meta property="og:image" content="https://cdn.skk.moe/favicon/android-chrome-192x192.png">
<meta property="og:description" content="Sukka 自用的 Surge / Clash Premium 规则组"> <meta property="og:description" content="Sukka 自用的 Surge / Clash Premium 规则组">
<meta name="twitter:card" content="summary"> <meta name="twitter:card" content="summary">
<link rel="canonical" href="https://ruleset.skk.moe/"> <link rel="canonical" href="https://ruleset.skk.moe/">
</head> </head>
<body> <body>
<main class="container"> <main class="container">
<h1>Sukka Ruleset Server</h1> <h1>Sukka Ruleset Server</h1>
@ -163,9 +166,7 @@ function generateHtml(tree: TreeTypeArray) {
</p> </p>
<p>Last Build: ${new Date().toISOString()}</p> <p>Last Build: ${new Date().toISOString()}</p>
<br> <br>
<ul class="directory-list"> <ul class="directory-list">${treeHtml(tree)}</ul>
${walk(tree)}
</ul>
</main> </main>
</body> </body>
</html> </html>

2
Build/lib/misc.ts
View File

@ -32,6 +32,8 @@ interface Write {
): Promise<void> ): Promise<void>
} }
export type VoidOrVoidArray = void | VoidOrVoidArray[];
export function mkdirp(dir: string) { export function mkdirp(dir: string) {
if (fs.existsSync(dir)) { if (fs.existsSync(dir)) {
return; return;

8
Build/lib/tree-dir.ts
View File

@ -1,5 +1,6 @@
import fsp from 'node:fs/promises'; import fsp from 'node:fs/promises';
import { sep } from 'node:path'; import { sep } from 'node:path';
import type { VoidOrVoidArray } from './misc';
// eslint-disable-next-line sukka/no-export-const-enum -- TODO: fix this in the future // eslint-disable-next-line sukka/no-export-const-enum -- TODO: fix this in the future
export const enum TreeFileType { export const enum TreeFileType {
@ -23,13 +24,12 @@ interface TreeDirectoryType {
export type TreeType = TreeDirectoryType | TreeFile; export type TreeType = TreeDirectoryType | TreeFile;
export type TreeTypeArray = TreeType[]; export type TreeTypeArray = TreeType[];
type VoidOrVoidArray = void | VoidOrVoidArray[];
export async function treeDir(rootPath: string): Promise<TreeTypeArray> { export async function treeDir(rootPath: string): Promise<TreeTypeArray> {
const tree: TreeTypeArray = []; const tree: TreeTypeArray = [];
const promises: Array<Promise<VoidOrVoidArray>> = [];
const walk = async (dir: string, node: TreeTypeArray, dirRelativeToRoot = ''): Promise<VoidOrVoidArray> => { const walk = async (dir: string, node: TreeTypeArray, dirRelativeToRoot = ''): Promise<VoidOrVoidArray> => {
const promises: Array<Promise<VoidOrVoidArray>> = [];
for await (const child of await fsp.opendir(dir)) { for await (const child of await fsp.opendir(dir)) {
// Ignore hidden files // Ignore hidden files
if (child.name[0] === '.' || child.name === 'CNAME') { if (child.name[0] === '.' || child.name === 'CNAME') {
@ -60,10 +60,10 @@ export async function treeDir(rootPath: string): Promise<TreeTypeArray> {
continue; continue;
} }
} }
return Promise.all(promises);
}; };
await walk(rootPath, tree); await walk(rootPath, tree);
await Promise.all(promises);
return tree; return tree;
} }