mirror of
https://github.com/SukkaW/Surge.git
synced 2026-01-29 01:51:52 +08:00
Refactor: replace BFS w/ DFS [skip ci]
This commit is contained in:
@@ -125,12 +125,12 @@ describe('Trie', () => {
|
||||
trie.add('cdn.example.com');
|
||||
trie.add('example.org');
|
||||
|
||||
expect(trie.find('example.com')).toStrictEqual(['example.com', 'blog.example.com', 'cdn.example.com']);
|
||||
expect(trie.find('com')).toStrictEqual(['example.com', 'blog.example.com', 'cdn.example.com']);
|
||||
expect(trie.find('.example.com')).toStrictEqual(['blog.example.com', 'cdn.example.com']);
|
||||
expect(trie.find('example.com')).toStrictEqual(['example.com', 'cdn.example.com', 'blog.example.com']);
|
||||
expect(trie.find('com')).toStrictEqual(['example.com', 'cdn.example.com', 'blog.example.com']);
|
||||
expect(trie.find('.example.com')).toStrictEqual(['cdn.example.com', 'blog.example.com']);
|
||||
expect(trie.find('org')).toStrictEqual(['example.org']);
|
||||
expect(trie.find('example.net')).toStrictEqual([]);
|
||||
expect(trie.dump()).toStrictEqual(['example.com', 'example.org', 'blog.example.com', 'cdn.example.com']);
|
||||
expect(trie.dump()).toStrictEqual(['example.org', 'example.com', 'cdn.example.com', 'blog.example.com']);
|
||||
});
|
||||
|
||||
it('should be possible to retrieve items matching the given prefix even with a smol trie', () => {
|
||||
@@ -147,7 +147,7 @@ describe('Trie', () => {
|
||||
expect(trie.find('.example.com')).toStrictEqual(['.example.com']);
|
||||
expect(trie.find('org')).toStrictEqual(['example.org']);
|
||||
expect(trie.find('example.net')).toStrictEqual([]);
|
||||
expect(trie.dump()).toStrictEqual(['.example.com', 'example.org']);
|
||||
expect(trie.dump()).toStrictEqual(['example.org', '.example.com']);
|
||||
});
|
||||
|
||||
it('should be possible to create a trie from an arbitrary iterable.', () => {
|
||||
@@ -173,14 +173,14 @@ describe('surge domainset dedupe', () => {
|
||||
it('should match subdomain - 1', () => {
|
||||
const trie = createTrie(['www.noc.one', 'www.sukkaw.com', 'blog.skk.moe', 'image.cdn.skk.moe', 'cdn.sukkaw.net'], false);
|
||||
|
||||
expect(trie.find('.skk.moe')).toStrictEqual(['blog.skk.moe', 'image.cdn.skk.moe']);
|
||||
expect(trie.find('.skk.moe')).toStrictEqual(['image.cdn.skk.moe', 'blog.skk.moe']);
|
||||
expect(trie.find('.sukkaw.com')).toStrictEqual(['www.sukkaw.com']);
|
||||
});
|
||||
|
||||
it('should match subdomain - 2', () => {
|
||||
const trie = createTrie(['www.noc.one', 'www.sukkaw.com', '.skk.moe', 'blog.skk.moe', 'image.cdn.skk.moe', 'cdn.sukkaw.net'], false);
|
||||
|
||||
expect(trie.find('.skk.moe')).toStrictEqual(['.skk.moe', 'blog.skk.moe', 'image.cdn.skk.moe']);
|
||||
expect(trie.find('.skk.moe')).toStrictEqual(['.skk.moe', 'image.cdn.skk.moe', 'blog.skk.moe']);
|
||||
expect(trie.find('.sukkaw.com')).toStrictEqual(['www.sukkaw.com']);
|
||||
});
|
||||
|
||||
@@ -203,13 +203,13 @@ describe('smol tree', () => {
|
||||
], true);
|
||||
|
||||
expect(trie.dump()).toStrictEqual([
|
||||
'skk.moe',
|
||||
'anotherskk.moe',
|
||||
'.cdn.local',
|
||||
'blog.skk.moe',
|
||||
'blog.anotherskk.moe',
|
||||
'img.skk.local',
|
||||
'blog.img.skk.local'
|
||||
'blog.img.skk.local',
|
||||
'.cdn.local',
|
||||
'anotherskk.moe',
|
||||
'blog.anotherskk.moe',
|
||||
'skk.moe',
|
||||
'blog.skk.moe'
|
||||
]);
|
||||
});
|
||||
|
||||
@@ -221,10 +221,10 @@ describe('smol tree', () => {
|
||||
], true);
|
||||
|
||||
expect(trie.dump()).toStrictEqual([
|
||||
'.skk.moe',
|
||||
'www.noc.one',
|
||||
'.sub.example.com',
|
||||
'cdn.noc.one',
|
||||
'.sub.example.com'
|
||||
'www.noc.one',
|
||||
'.skk.moe'
|
||||
]);
|
||||
});
|
||||
|
||||
@@ -262,10 +262,10 @@ describe('smol tree', () => {
|
||||
], true);
|
||||
|
||||
expect(trie.dump()).toStrictEqual([
|
||||
'commercial.shouji.360.cn',
|
||||
'cdn.creative.medialytics.com',
|
||||
'act.commercial.shouji.360.cn',
|
||||
'px.cdn.creative.medialytics.com'
|
||||
'px.cdn.creative.medialytics.com',
|
||||
'commercial.shouji.360.cn',
|
||||
'act.commercial.shouji.360.cn'
|
||||
]);
|
||||
});
|
||||
|
||||
@@ -278,10 +278,10 @@ describe('smol tree', () => {
|
||||
], true);
|
||||
|
||||
expect(trie.dump()).toStrictEqual([
|
||||
'skk.moe',
|
||||
'anotherskk.moe',
|
||||
'blog.skk.moe',
|
||||
'blog.anotherskk.moe'
|
||||
'blog.anotherskk.moe',
|
||||
'skk.moe',
|
||||
'blog.skk.moe'
|
||||
]);
|
||||
});
|
||||
|
||||
@@ -299,34 +299,34 @@ describe('smol tree', () => {
|
||||
trie.whitelist('.skk.moe');
|
||||
|
||||
expect(trie.dump()).toStrictEqual([
|
||||
'anotherskk.moe',
|
||||
'.cdn.local',
|
||||
'blog.anotherskk.moe',
|
||||
'img.skk.local',
|
||||
'blog.img.skk.local'
|
||||
'blog.img.skk.local',
|
||||
'.cdn.local',
|
||||
'anotherskk.moe',
|
||||
'blog.anotherskk.moe'
|
||||
]);
|
||||
|
||||
trie.whitelist('anotherskk.moe');
|
||||
expect(trie.dump()).toStrictEqual([
|
||||
'.cdn.local',
|
||||
'blog.anotherskk.moe',
|
||||
'img.skk.local',
|
||||
'blog.img.skk.local'
|
||||
'blog.img.skk.local',
|
||||
'.cdn.local',
|
||||
'blog.anotherskk.moe'
|
||||
]);
|
||||
|
||||
trie.add('anotherskk.moe');
|
||||
trie.whitelist('.anotherskk.moe');
|
||||
|
||||
expect(trie.dump()).toStrictEqual([
|
||||
'.cdn.local',
|
||||
'img.skk.local',
|
||||
'blog.img.skk.local'
|
||||
'blog.img.skk.local',
|
||||
'.cdn.local'
|
||||
]);
|
||||
|
||||
trie.whitelist('img.skk.local');
|
||||
expect(trie.dump()).toStrictEqual([
|
||||
'.cdn.local',
|
||||
'blog.img.skk.local'
|
||||
'blog.img.skk.local',
|
||||
'.cdn.local'
|
||||
]);
|
||||
|
||||
trie.whitelist('cdn.local');
|
||||
@@ -349,15 +349,14 @@ describe('smol tree', () => {
|
||||
], true);
|
||||
|
||||
expect(trie.dump()).toStrictEqual([
|
||||
'.t.co',
|
||||
'cdn.example.com', 'blog.cdn.example.com',
|
||||
'.skk.moe',
|
||||
'cdn.example.com', 'blog.cdn.example.com'
|
||||
'.t.co'
|
||||
]);
|
||||
|
||||
trie.whitelist('.t.co');
|
||||
expect(trie.dump()).toStrictEqual([
|
||||
'.skk.moe',
|
||||
'cdn.example.com', 'blog.cdn.example.com'
|
||||
'cdn.example.com', 'blog.cdn.example.com', '.skk.moe'
|
||||
]);
|
||||
|
||||
trie.whitelist('skk.moe');
|
||||
|
||||
Reference in New Issue
Block a user