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

Perf: drop array

Browse Source
This commit is contained in:
SukkaW
2024-09-10 01:09:14 +08:00
parent 05ccd9fa50
commit 3b91b69406
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Build/lib/bitwise.ts
View File

@@ -4,6 +4,11 @@ export const pack = (a: number, b: number): number => {
}; };
/** Unpacks two 16-bit integers from one 32-bit integer */ /** Unpacks two 16-bit integers from one 32-bit integer */
export const unpack = (value: number): [a: number, b: number] => { export const unpack = (value: number, arr: [a: number, b: number] = Array.from(new Array(2).keys()) as any): [a: number, b: number] => {
return [(value >> 16) & 0xFFFF, value & 0xFFFF]; arr[0] = (value >> 16) & 0xFFFF;
arr[1] = value & 0xFFFF;
return arr;
}; };
export const unpackFirst = (value: number): number => (value >> 16) & 0xFFFF;
export const unpackSecond = (value: number): number => value & 0xFFFF;

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

@@ -9,7 +9,7 @@ import { readFileByLine } from './fetch-text-by-line';
import stringify from 'json-stringify-pretty-compact'; import stringify from 'json-stringify-pretty-compact';
import { ipCidrListToSingbox, surgeDomainsetToSingbox, surgeRulesetToSingbox } from './singbox'; import { ipCidrListToSingbox, surgeDomainsetToSingbox, surgeRulesetToSingbox } from './singbox';
import { createTrie } from './trie'; import { createTrie } from './trie';
import { pack, unpack } from './bitwise'; import { pack, unpackFirst, unpackSecond } from './bitwise';
export async function compareAndWriteFile(span: Span, linesA: string[], filePath: string) { export async function compareAndWriteFile(span: Span, linesA: string[], filePath: string) {
let isEqual = true; let isEqual = true;
@@ -119,7 +119,8 @@ const flagDomainSuffix = 1 << 3;
const processRuleSet = (ruleSet: string[]) => { const processRuleSet = (ruleSet: string[]) => {
const trie = createTrie<number>(null, true); const trie = createTrie<number>(null, true);
const sortMap: Array<[value: number, weight: number]> = []; /** Packed Array<[valueIndex: number, weight: number]> */
const sortMap: number[] = [];
for (let i = 0, len = ruleSet.length; i < len; i++) { for (let i = 0, len = ruleSet.length; i < len; i++) {
const line = ruleSet[i]; const line = ruleSet[i];
const [type, value] = line.split(','); const [type, value] = line.split(',');
@@ -140,39 +141,34 @@ const processRuleSet = (ruleSet: string[]) => {
if (value.includes('|')) { if (value.includes('|')) {
extraWeight += 1; extraWeight += 1;
} }
sortMap.push([i, sortTypeOrder[type] + extraWeight]); sortMap.push(pack(i, sortTypeOrder[type] + extraWeight));
break; break;
case null: case null:
sortMap.push([i, 10]); sortMap.push(pack(i, 10));
break; break;
default: default:
if (type in sortTypeOrder) { if (type in sortTypeOrder) {
sortMap.push([i, sortTypeOrder[type]]); sortMap.push(pack(i, sortTypeOrder[type]));
} else { } else {
sortMap.push([i, sortTypeOrder[defaultSortTypeOrder]]); sortMap.push(pack(i, sortTypeOrder[defaultSortTypeOrder]));
} }
} }
} }
if (ruleSet.includes('DOMAIN,github.com')) {
console.log(trie.inspect(0, (meta) => ({
index: ruleSet[unpack(meta!)[0]],
flag: unpack(meta!)[1] === flagDomain ? 'DOMAIN' : 'DOMAIN-SUFFIX'
})));
console.log(trie.root);
}
const dumped = trie.dumpWithMeta(); const dumped = trie.dumpWithMeta();
for (let i = 0, len = dumped.length; i < len; i++) { for (let i = 0, len = dumped.length; i < len; i++) {
const [originalIndex, flag] = unpack(dumped[i][1]); const originalIndex = unpackFirst(dumped[i][1]);
const flag = unpackSecond(dumped[i][1]);
const type = flag === flagDomain ? 'DOMAIN' : 'DOMAIN-SUFFIX'; const type = flag === flagDomain ? 'DOMAIN' : 'DOMAIN-SUFFIX';
sortMap.push([originalIndex, sortTypeOrder[type]]); sortMap.push(pack(originalIndex, sortTypeOrder[type]));
} }
return sortMap return sortMap
.sort((a, b) => a[1] - b[1]) .sort((a, b) => unpackSecond(a) - unpackSecond(b))
.map(c => ruleSet[c[0]]); .map(c => ruleSet[unpackFirst(c)]);
}; };
const MARK = 'this_ruleset_is_made_by_sukkaw.ruleset.skk.moe'; const MARK = 'this_ruleset_is_made_by_sukkaw.ruleset.skk.moe';