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

Perf: change trie object shape

Browse Source
This commit is contained in:
SukkaW 2024-06-28 17:41:58 +08:00
parent b4057ef757
commit fa85fff3c3
1 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
Build/lib/trie.ts
View File

@ -8,19 +8,18 @@ import { fastStringArrayJoin } from './misc';
const noop = () => { /** noop */ }; const noop = () => { /** noop */ };
interface TrieNode { type TrieNode = [
s: boolean, boolean, /** sentinel */
p: TrieNode | null, TrieNode | null, /** parent */
[Bun.inspect.custom](): string, Map<string, TrieNode> /** children */
c: Map<string, TrieNode> ];
}
const deepTrieNodeToJSON = (node: TrieNode) => { const deepTrieNodeToJSON = (node: TrieNode) => {
const obj: Record<string, any> = {}; const obj: Record<string, any> = {};
if (node.s) { if (node[0]) {
obj['[start]'] = node.s; obj['[start]'] = node[0];
} }
node.c.forEach((value, key) => { node[2].forEach((value, key) => {
obj[key] = deepTrieNodeToJSON(value); obj[key] = deepTrieNodeToJSON(value);
}); });
return obj; return obj;
@ -31,12 +30,9 @@ function trieNodeInspectCustom(this: TrieNode) {
} }
const createNode = (parent: TrieNode | null = null): TrieNode => { const createNode = (parent: TrieNode | null = null): TrieNode => {
return { const node = [false, parent, new Map<string, TrieNode>()] as TrieNode;
s: false, Object.defineProperty(node, Bun.inspect.custom, { value: trieNodeInspectCustom });
p: parent, return node;
c: new Map<string, TrieNode>(),
[Bun.inspect.custom]: trieNodeInspectCustom
};
}; };
const hostnameToTokens = (hostname: string): string[] => { const hostnameToTokens = (hostname: string): string[] => {
@ -83,17 +79,17 @@ export const createTrie = (from?: string[] | Set<string> | null, hostnameMode =
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.c.has(token)) { if (node[2].has(token)) {
node = node.c.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.s) { if (smolTree && token === '.' && node[0]) {
return; return;
} }
} else { } else {
const newNode = createNode(node); const newNode = createNode(node);
node.c.set(token, newNode); node[2].set(token, newNode);
node = newNode; node = newNode;
} }
} }
@ -103,26 +99,26 @@ export const createTrie = (from?: string[] | Set<string> | null, hostnameMode =
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
const parent = node.p!; const parent = node[1]!;
// Make sure parent `[start]sub.example.com` (without dot) is removed (SETINEL to false) // Make sure parent `[start]sub.example.com` (without dot) is removed (SETINEL to false)
parent.s = false; parent[0] = false;
// Removing the rest of the parent's child nodes // Removing the rest of the parent's child nodes
node.c.clear(); node[2].clear();
// The SENTINEL of this node will be set to true at the end of the function, so we don't need to set it here // The SENTINEL of this node will be set to true at the end of the function, so we don't need to set it here
// we can use else-if here, because the children is now empty, we don't need to check the leading "." // we can use else-if here, because the children is now empty, we don't need to check the leading "."
} else if (node.c.get('.')?.s === true) { } else if (node[2].get('.')?.[0] === true) {
// Trying to add `example.com` when there is already a `.example.com` in the trie // Trying to add `example.com` when there is already a `.example.com` in the trie
// 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.s) { // smol tree don't have size, so else-if here } else if (!node[0]) { // smol tree don't have size, so else-if here
size++; size++;
} }
node.s = true; node[0] = true;
}; };
const walkIntoLeafWithTokens = ( const walkIntoLeafWithTokens = (
@ -143,8 +139,8 @@ export const createTrie = (from?: string[] | Set<string> | null, hostnameMode =
parent = node; parent = node;
if (node.c.has(token)) { if (node[2].has(token)) {
node = node.c.get(token)!; node = node[2].get(token)!;
} else { } else {
return null; return null;
} }
@ -175,7 +171,7 @@ export const createTrie = (from?: string[] | Set<string> | null, hostnameMode =
node = nodeStack.pop()!; node = nodeStack.pop()!;
const suffix = suffixStack.pop()!; const suffix = suffixStack.pop()!;
node.c.forEach((childNode, k) => { node[2].forEach((childNode, k) => {
// Pushing the child node to the stack for next iteration of DFS // Pushing the child node to the stack for next iteration of DFS
nodeStack.push(childNode); nodeStack.push(childNode);
@ -183,7 +179,7 @@ export const createTrie = (from?: string[] | Set<string> | null, hostnameMode =
}); });
// If the node is a sentinel, we push the suffix to the results // If the node is a sentinel, we push the suffix to the results
if (node.s) { if (node[0]) {
onMatches(suffix); onMatches(suffix);
} }
} while (nodeStack.length); } while (nodeStack.length);
@ -205,7 +201,7 @@ export const createTrie = (from?: string[] | Set<string> | null, hostnameMode =
// Even if the node size is 1, but the single child is ".", we should retain the branch // Even if the node size is 1, but the single child is ".", we should retain the branch
// Since the "." could be special if it is the leaf-est node // Since the "." could be special if it is the leaf-est node
const onlyChild = node.c.size < 2 && (!hostnameMode || !node.c.has('.')); const onlyChild = node[2].size < 2 && (!hostnameMode || !node[2].has('.'));
if (toPrune != null) { // the top-est branch that could potentially being pruned if (toPrune != null) { // the top-est branch that could potentially being pruned
if (!onlyChild) { if (!onlyChild) {
@ -298,15 +294,15 @@ export const createTrie = (from?: string[] | Set<string> | null, hostnameMode =
const res = getSingleChildLeaf(suffixToTokens(suffix)); const res = getSingleChildLeaf(suffixToTokens(suffix));
if (res === null) return false; if (res === null) return false;
if (!res.node.s) return false; if (!res.node[0]) return false;
size--; size--;
const { node, toPrune, tokenToPrune } = res; const { node, toPrune, tokenToPrune } = res;
if (tokenToPrune && toPrune) { if (tokenToPrune && toPrune) {
toPrune.c.delete(tokenToPrune); toPrune[2].delete(tokenToPrune);
} else { } else {
node.s = false; node[0] = false;
} }
return true; return true;
@ -320,7 +316,7 @@ export const createTrie = (from?: string[] | Set<string> | null, hostnameMode =
const res = walkIntoLeafWithTokens(tokens); const res = walkIntoLeafWithTokens(tokens);
return res return res
? res.node.s ? res.node[0]
: false; : false;
}; };
@ -351,27 +347,27 @@ export const createTrie = (from?: string[] | Set<string> | null, hostnameMode =
// Trying to whitelist `[start].sub.example.com` where there is already a `[start]blog.sub.example.com` in the trie // Trying to whitelist `[start].sub.example.com` where there is already a `[start]blog.sub.example.com` in the trie
if (tokens[0] === '.') { if (tokens[0] === '.') {
// If there is a `[start]sub.example.com` here, remove it // If there is a `[start]sub.example.com` here, remove it
parent.s = false; parent[0] = false;
// Removing all the child nodes by disconnecting "." // Removing all the child nodes by disconnecting "."
parent.c.delete('.'); parent[2].delete('.');
} }
// Trying to whitelist `example.com` when there is already a `.example.com` in the trie // Trying to whitelist `example.com` when there is already a `.example.com` in the trie
const dotNode = node.c.get('.'); const dotNode = node[2].get('.');
if (dotNode) { if (dotNode) {
dotNode.s = false; dotNode[0] = false;
} }
// if (dotNode?.s === true) { // if (dotNode?.s === true) {
// dotNode.s = false; // dotnode[0] = false;
// } // }
// return early if not found // return early if not found
if (!node.s) return; if (!node[0]) return;
if (tokenToPrune && toPrune) { if (tokenToPrune && toPrune) {
toPrune.c.delete(tokenToPrune); toPrune[2].delete(tokenToPrune);
} else { } else {
node.s = false; node[0] = false;
} }
}; };