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

Perf: reduce if in trie.add

Browse Source
This commit is contained in:
SukkaW 2024-06-28 17:49:28 +08:00
parent fa85fff3c3
commit 6031d9652e
1 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
Build/lib/trie.ts
View File

@ -25,14 +25,8 @@ const deepTrieNodeToJSON = (node: TrieNode) => {
return obj; return obj;
}; };
function trieNodeInspectCustom(this: TrieNode) {
return JSON.stringify(deepTrieNodeToJSON(this), null, 2);
}
const createNode = (parent: TrieNode | null = null): TrieNode => { const createNode = (parent: TrieNode | null = null): TrieNode => {
const node = [false, parent, new Map<string, TrieNode>()] as TrieNode; return [false, parent, new Map<string, TrieNode>()] as TrieNode;
Object.defineProperty(node, Bun.inspect.custom, { value: trieNodeInspectCustom });
return node;
}; };
const hostnameToTokens = (hostname: string): string[] => { const hostnameToTokens = (hostname: string): string[] => {
@ -70,32 +64,32 @@ export const createTrie = (from?: string[] | Set<string> | null, hostnameMode =
/** /**
* Method used to add the given suffix to the trie. * Method used to add the given suffix to the trie.
*/ */
const add = (suffix: string): void => { const add = smolTree
let node: TrieNode = root; ? (suffix: string): void => {
let token: string; let node: TrieNode = root;
let token: string;
const tokens = suffixToTokens(suffix); const tokens = suffixToTokens(suffix);
for (let i = tokens.length - 1; i >= 0; i--) { for (let i = tokens.length - 1; i >= 0; i--) {
token = tokens[i]; token = tokens[i];
if (node[2].has(token)) { if (node[2].has(token)) {
node = node[2].get(token)!; node = node[2].get(token)!;
// During the adding of `[start]blog|.skk.moe` and find out that there is a `[start].skk.moe` in the trie // During the adding of `[start]blog|.skk.moe` and find out that there is a `[start].skk.moe` in the trie
// Dedupe the covered subdomain by skipping // Dedupe the covered subdomain by skipping
if (smolTree && token === '.' && node[0]) { if (token === '.' && node[0]) {
return; return;
}
} else {
const newNode = createNode(node);
node[2].set(token, newNode);
node = newNode;
} }
} else {
const newNode = createNode(node);
node[2].set(token, newNode);
node = newNode;
} }
}
// If we are in smolTree mode, we need to do something at the end of the loop // If we are in smolTree mode, we need to do something at the end of the loop
if (smolTree) {
if (tokens[0] === '.') { if (tokens[0] === '.') {
// Trying to add `[start].sub.example.com` where there is already a `[start]blog.sub.example.com` in the trie // Trying to add `[start].sub.example.com` where there is already a `[start]blog.sub.example.com` in the trie
@ -114,12 +108,32 @@ export const createTrie = (from?: string[] | Set<string> | null, hostnameMode =
// No need to increment size and set SENTINEL to true (skip this "new" item) // No need to increment size and set SENTINEL to true (skip this "new" item)
return; return;
} }
} else if (!node[0]) { // smol tree don't have size, so else-if here
size++;
}
node[0] = true; node[0] = true;
}; }
: (suffix: string): void => {
let node: TrieNode = root;
let token: string;
const tokens = suffixToTokens(suffix);
for (let i = tokens.length - 1; i >= 0; i--) {
token = tokens[i];
if (node[2].has(token)) {
node = node[2].get(token)!;
} else {
const newNode = createNode(node);
node[2].set(token, newNode);
node = newNode;
}
}
if (!node[0]) { // smol tree don't have size, so else-if here
size++;
node[0] = true;
}
};
const walkIntoLeafWithTokens = ( const walkIntoLeafWithTokens = (
tokens: string | string[], tokens: string | string[],