Housekeeping

This commit is contained in:
SukkaW
2024-10-17 16:28:57 +08:00
parent e18f57f568
commit 5aee1b6870
6 changed files with 382 additions and 169 deletions

View File

@@ -1,17 +1,17 @@
import { describe, it } from 'mocha';
import { expect } from 'chai';
import { expect } from 'expect';
import createKeywordFilter from './aho-corasick';
describe('AhoCorasick', () => {
it('basic', () => {
let kwfilter = createKeywordFilter(['ap', 'an']);
expect(kwfilter('bananan')).to.equal(true);
expect(kwfilter('apple')).to.equal(true);
expect(kwfilter('melon')).to.equal(false);
expect(kwfilter('bananan')).toBe(true);
expect(kwfilter('apple')).toBe(true);
expect(kwfilter('melon')).toBe(false);
kwfilter = createKeywordFilter(['cdn', 'sukka']);
expect(kwfilter('bananan')).to.equal(false);
expect(kwfilter('apple')).to.equal(false);
expect(kwfilter('melon')).to.equal(false);
expect(kwfilter('bananan')).toBe(false);
expect(kwfilter('apple')).toBe(false);
expect(kwfilter('melon')).toBe(false);
});
});

View File

@@ -1,4 +1,4 @@
import { expect } from 'chai';
import { expect } from 'expect';
import { fileEqual } from './create-file';
// eslint-disable-next-line @typescript-eslint/require-await -- async iterable
@@ -9,7 +9,7 @@ const createSource = async function *(input: string[]) {
};
async function test(a: string[], b: string[], expected: boolean) {
expect((await fileEqual(a, createSource(b)))).to.eq(expected);
expect((await fileEqual(a, createSource(b)))).toBe(expected);
}
describe('fileEqual', () => {

View File

@@ -1,5 +1,5 @@
import { describe, it } from 'mocha';
import { expect } from 'chai';
import { expect } from 'expect';
import { sortDomains } from './stable-sort-domain';
describe('sortDomains', () => {
@@ -8,7 +8,7 @@ describe('sortDomains', () => {
'.s3-website.ap-northeast-3.amazonaws.com',
'.s3.dualstack.ap-south-1.amazonaws.com',
'.s3-website.af-south-1.amazonaws.com'
])).to.deep.equal([
])).toStrictEqual([
'.s3-website.af-south-1.amazonaws.com',
'.s3.dualstack.ap-south-1.amazonaws.com',
'.s3-website.ap-northeast-3.amazonaws.com'
@@ -18,7 +18,7 @@ describe('sortDomains', () => {
'.s3.dualstack.ap-south-1.amazonaws.com',
'.s3-website.ap-northeast-3.amazonaws.com',
'.s3-website.af-south-1.amazonaws.com'
])).to.deep.equal([
])).toStrictEqual([
'.s3-website.af-south-1.amazonaws.com',
'.s3.dualstack.ap-south-1.amazonaws.com',
'.s3-website.ap-northeast-3.amazonaws.com'
@@ -27,7 +27,7 @@ describe('sortDomains', () => {
expect(sortDomains([
'.s3-website-us-west-2.amazonaws.com',
'.s3-1.amazonaws.com'
])).to.deep.equal([
])).toStrictEqual([
'.s3-1.amazonaws.com',
'.s3-website-us-west-2.amazonaws.com'
]);
@@ -35,7 +35,7 @@ describe('sortDomains', () => {
expect(sortDomains([
'.s3-1.amazonaws.com',
'.s3-website-us-west-2.amazonaws.com'
])).to.deep.equal([
])).toStrictEqual([
'.s3-1.amazonaws.com',
'.s3-website-us-west-2.amazonaws.com'
]);
@@ -46,7 +46,7 @@ describe('sortDomains', () => {
'.s3-accesspoint.dualstack.us-west-2.amazonaws.com',
'.s3.dualstack.us-west-2.amazonaws.com'
])
).to.deep.equal([
).toStrictEqual([
'.s3.dualstack.us-west-2.amazonaws.com',
'.s3-deprecated.us-west-2.amazonaws.com',
'.s3-accesspoint.dualstack.us-west-2.amazonaws.com'
@@ -58,7 +58,7 @@ describe('sortDomains', () => {
'.s3-accesspoint.dualstack.us-west-2.amazonaws.com',
'.s3.dualstack.us-west-2.amazonaws.com'
])
).to.deep.equal([
).toStrictEqual([
'.s3.dualstack.us-west-2.amazonaws.com',
'.s3-deprecated.us-west-2.amazonaws.com',
'.s3-accesspoint.dualstack.us-west-2.amazonaws.com'
@@ -69,7 +69,7 @@ describe('sortDomains', () => {
'.ec2-25-58-215-234.us-east-2.compute.amazonaws.com',
'.ec2-13-58-215-234.us-east-2.compute.amazonaws.com'
])
).to.deep.equal([
).toStrictEqual([
'.ec2-13-58-215-234.us-east-2.compute.amazonaws.com',
'.ec2-25-58-215-234.us-east-2.compute.amazonaws.com'
]);
@@ -80,7 +80,7 @@ describe('sortDomains', () => {
'.notice.samsungcloudsolution.com',
'samsungqbe.com',
'samsungcloudsolution.com'
])).to.deep.equal([
])).toStrictEqual([
'samsungqbe.com',
'samsungcloudsolution.com',
'.notice.samsungcloudsolution.com'
@@ -117,7 +117,7 @@ describe('sortDomains', () => {
'.rwww.samsungotn.net',
'.samsungpoland.com.pl'
])
).to.deep.equal([
).toStrictEqual([
'.gld.samsungosp.com',
'.rwww.samsungotn.net',
'samsungqbe.com',

View File

@@ -1,10 +1,10 @@
import { createTrie } from './trie';
import { describe, it } from 'mocha';
import { expect } from 'chai';
import { expect } from 'expect';
// describe('hostname to tokens', () => {
// it('should split hostname into tokens.', () => {
// expect(hostnameToTokens('.blog.skk.moe')).to.deep.equal([
// expect(hostnameToTokens('.blog.skk.moe')).toStrictEqual([
// '.',
// 'blog',
// '.',
@@ -13,7 +13,7 @@ import { expect } from 'chai';
// 'moe'
// ]);
// expect(hostnameToTokens('blog.skk.moe')).to.deep.equal([
// expect(hostnameToTokens('blog.skk.moe')).toStrictEqual([
// 'blog',
// '.',
// 'skk',
@@ -21,13 +21,13 @@ import { expect } from 'chai';
// 'moe'
// ]);
// expect(hostnameToTokens('skk.moe')).to.deep.equal([
// expect(hostnameToTokens('skk.moe')).toStrictEqual([
// 'skk',
// '.',
// 'moe'
// ]);
// expect(hostnameToTokens('moe')).to.deep.equal([
// expect(hostnameToTokens('moe')).toStrictEqual([
// 'moe'
// ]);
// });
@@ -41,14 +41,14 @@ describe('Trie', () => {
trie.add('skk.moe');
trie.add('anotherskk.moe');
expect(trie.size).to.equal(3);
expect(trie.size).toBe(3);
expect(trie.has('a.skk.moe'), 'a.skk.moe').to.equal(true);
expect(trie.has('skk.moe'), 'skk.moe').to.equal(true);
expect(trie.has('anotherskk.moe'), 'anotherskk.moe').to.equal(true);
expect(trie.has('example.com'), 'example.com').to.equal(false);
expect(trie.has('skk.mo'), 'skk.mo').to.equal(false);
expect(trie.has('another.skk.moe'), 'another.skk.moe').to.equal(false);
expect(trie.has('a.skk.moe')).toBe(true);
expect(trie.has('skk.moe')).toBe(true);
expect(trie.has('anotherskk.moe')).toBe(true);
expect(trie.has('example.com')).toBe(false);
expect(trie.has('skk.mo')).toBe(false);
expect(trie.has('another.skk.moe')).toBe(false);
});
it('adding the same item several times should not increase size.', () => {
@@ -59,19 +59,19 @@ describe('Trie', () => {
// eslint-disable-next-line sukka/no-element-overwrite -- deliberately do testing
trie.add('skk.moe');
expect(trie.size).to.equal(2);
expect(trie.has('skk.moe')).to.equal(true);
expect(trie.size).toBe(2);
expect(trie.has('skk.moe')).toBe(true);
});
it('should be possible to set the null sequence.', () => {
const trie = createTrie(null, false);
trie.add('');
expect(trie.has('')).to.equal(true);
expect(trie.has('')).toBe(true);
const trie2 = createTrie(null, true);
trie2.add('');
expect(trie2.has('')).to.equal(true);
expect(trie2.has('')).toBe(true);
});
it('should be possible to delete items.', () => {
@@ -82,20 +82,20 @@ describe('Trie', () => {
trie.add('example.com');
trie.add('moe.sb');
expect(trie.delete('')).to.equal(false);
expect(trie.delete('')).to.equal(false);
expect(trie.delete('example.org')).to.equal(false);
expect(trie.delete('')).toBe(false);
expect(trie.delete('')).toBe(false);
expect(trie.delete('example.org')).toBe(false);
expect(trie.delete('skk.moe')).to.equal(true);
expect(trie.has('skk.moe')).to.equal(false);
expect(trie.has('moe.sb')).to.equal(true);
expect(trie.delete('skk.moe')).toBe(true);
expect(trie.has('skk.moe')).toBe(false);
expect(trie.has('moe.sb')).toBe(true);
expect(trie.size).to.equal(3);
expect(trie.size).toBe(3);
expect(trie.delete('example.com')).to.equal(true);
expect(trie.size).to.equal(2);
expect(trie.delete('moe.sb')).to.equal(true);
expect(trie.size).to.equal(1);
expect(trie.delete('example.com')).toBe(true);
expect(trie.size).toBe(2);
expect(trie.delete('moe.sb')).toBe(true);
expect(trie.size).toBe(1);
});
it('should be possible to check the existence of a sequence in the Trie.', () => {
@@ -103,10 +103,10 @@ describe('Trie', () => {
trie.add('example.org.skk.moe');
expect(trie.has('example.org.skk.moe')).to.equal(true);
expect(trie.has('skk.moe')).to.equal(false);
expect(trie.has('example.org')).to.equal(false);
expect(trie.has('')).to.equal(false);
expect(trie.has('example.org.skk.moe')).toBe(true);
expect(trie.has('skk.moe')).toBe(false);
expect(trie.has('example.org')).toBe(false);
expect(trie.has('')).toBe(false);
});
it('should be possible to retrieve items matching the given prefix.', () => {
@@ -117,12 +117,12 @@ describe('Trie', () => {
trie.add('cdn.example.com');
trie.add('example.org');
expect(trie.find('example.com'), 'example.com').to.deep.equal(['example.com', 'cdn.example.com', 'blog.example.com']);
expect(trie.find('com'), 'com').to.deep.equal(['example.com', 'cdn.example.com', 'blog.example.com']);
expect(trie.find('.example.com'), '.example.com').to.deep.equal(['cdn.example.com', 'blog.example.com']);
expect(trie.find('org'), 'prg').to.deep.equal(['example.org']);
expect(trie.find('example.net'), 'example.net').to.deep.equal([]);
expect(trie.find(''), '').to.deep.equal(['example.org', 'example.com', 'cdn.example.com', 'blog.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.find('')).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', () => {
@@ -134,23 +134,23 @@ describe('Trie', () => {
trie.add('cdn.example.com');
trie.add('example.org');
expect(trie.find('example.com')).to.deep.equal(['.example.com']);
expect(trie.find('com')).to.deep.equal(['.example.com']);
expect(trie.find('.example.com')).to.deep.equal(['.example.com']);
expect(trie.find('org')).to.deep.equal(['example.org']);
expect(trie.find('example.net')).to.deep.equal([]);
expect(trie.find('')).to.deep.equal(['example.org', '.example.com']);
expect(trie.find('example.com')).toStrictEqual(['.example.com']);
expect(trie.find('com')).toStrictEqual(['.example.com']);
expect(trie.find('.example.com')).toStrictEqual(['.example.com']);
expect(trie.find('org')).toStrictEqual(['example.org']);
expect(trie.find('example.net')).toStrictEqual([]);
expect(trie.find('')).toStrictEqual(['example.org', '.example.com']);
});
it('should be possible to create a trie from an arbitrary iterable.', () => {
let trie = createTrie(['skk.moe', 'blog.skk.moe'], false);
expect(trie.size).to.equal(2);
expect(trie.has('skk.moe')).to.equal(true);
expect(trie.size).toBe(2);
expect(trie.has('skk.moe')).toBe(true);
trie = createTrie(new Set(['skk.moe', 'example.com']), false);
expect(trie.size).to.equal(2);
expect(trie.has('skk.moe')).to.equal(true);
expect(trie.size).toBe(2);
expect(trie.has('skk.moe')).toBe(true);
});
});
@@ -158,27 +158,27 @@ describe('surge domainset dedupe', () => {
it('should not remove same entry', () => {
const trie = createTrie(['.skk.moe', 'noc.one'], false);
expect(trie.find('.skk.moe')).to.deep.equal(['.skk.moe']);
expect(trie.find('noc.one')).to.deep.equal(['noc.one']);
expect(trie.find('.skk.moe')).toStrictEqual(['.skk.moe']);
expect(trie.find('noc.one')).toStrictEqual(['noc.one']);
});
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')).to.deep.equal(['image.cdn.skk.moe', 'blog.skk.moe']);
expect(trie.find('.sukkaw.com')).to.deep.equal(['www.sukkaw.com']);
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')).to.deep.equal(['.skk.moe', 'image.cdn.skk.moe', 'blog.skk.moe']);
expect(trie.find('.sukkaw.com')).to.deep.equal(['www.sukkaw.com']);
expect(trie.find('.skk.moe')).toStrictEqual(['.skk.moe', 'image.cdn.skk.moe', 'blog.skk.moe']);
expect(trie.find('.sukkaw.com')).toStrictEqual(['www.sukkaw.com']);
});
it('should not remove non-subdomain', () => {
const trie = createTrie(['skk.moe', 'sukkaskk.moe'], false);
expect(trie.find('.skk.moe')).to.deep.equal([]);
expect(trie.find('.skk.moe')).toStrictEqual([]);
});
});
@@ -190,7 +190,7 @@ describe('smol tree', () => {
'.blog.sub.example.com', 'sub.example.com', 'cdn.sub.example.com', '.sub.example.com'
], true);
expect(trie.dump()).to.deep.equal([
expect(trie.dump()).toStrictEqual([
'.sub.example.com',
'cdn.noc.one', 'www.noc.one',
'.skk.moe'
@@ -202,7 +202,7 @@ describe('smol tree', () => {
'.skk.moe', 'blog.skk.moe', '.cdn.skk.moe', 'skk.moe'
], true);
expect(trie.dump()).to.deep.equal([
expect(trie.dump()).toStrictEqual([
'.skk.moe'
]);
});
@@ -212,12 +212,12 @@ describe('smol tree', () => {
'.blog.sub.example.com', 'cdn.sub.example.com', '.sub.example.com'
], true);
expect(trie.dump()).to.deep.equal([
expect(trie.dump()).toStrictEqual([
'.sub.example.com'
]);
trie.add('.sub.example.com');
expect(trie.dump()).to.deep.equal([
expect(trie.dump()).toStrictEqual([
'.sub.example.com'
]);
});
@@ -230,7 +230,7 @@ describe('smol tree', () => {
'px.cdn.creative.medialytics.com'
], true);
expect(trie.dump()).to.deep.equal([
expect(trie.dump()).toStrictEqual([
'cdn.creative.medialytics.com',
'px.cdn.creative.medialytics.com',
'commercial.shouji.360.cn',
@@ -246,7 +246,7 @@ describe('smol tree', () => {
'blog.skk.moe'
], true);
expect(trie.dump()).to.deep.equal([
expect(trie.dump()).toStrictEqual([
'anotherskk.moe',
'blog.anotherskk.moe',
'skk.moe',
@@ -265,7 +265,7 @@ describe('smol tree', () => {
'img.skk.local'
], true);
expect(trie.dump(), '1').to.deep.equal([
expect(trie.dump()).toStrictEqual([
'img.skk.local',
'blog.img.skk.local',
'.cdn.local',
@@ -277,7 +277,7 @@ describe('smol tree', () => {
trie.whitelist('.skk.moe');
expect(trie.dump(), '2').to.deep.equal([
expect(trie.dump()).toStrictEqual([
'img.skk.local',
'blog.img.skk.local',
'.cdn.local',
@@ -286,7 +286,7 @@ describe('smol tree', () => {
]);
trie.whitelist('anotherskk.moe');
expect(trie.dump(), '3').to.deep.equal([
expect(trie.dump()).toStrictEqual([
'img.skk.local',
'blog.img.skk.local',
'.cdn.local',
@@ -296,25 +296,25 @@ describe('smol tree', () => {
trie.add('anotherskk.moe');
trie.whitelist('.anotherskk.moe');
expect(trie.dump(), '4').to.deep.equal([
expect(trie.dump()).toStrictEqual([
'img.skk.local',
'blog.img.skk.local',
'.cdn.local'
]);
trie.whitelist('img.skk.local');
expect(trie.dump(), '5').to.deep.equal([
expect(trie.dump()).toStrictEqual([
'blog.img.skk.local',
'.cdn.local'
]);
trie.whitelist('cdn.local');
expect(trie.dump(), '6').to.deep.equal([
expect(trie.dump()).toStrictEqual([
'blog.img.skk.local'
]);
trie.whitelist('.skk.local');
expect(trie.dump(), '7').to.deep.equal([]);
expect(trie.dump()).toStrictEqual([]);
});
it('should whitelist trie correctly', () => {
@@ -327,22 +327,22 @@ describe('smol tree', () => {
'cdn.example.com'
], true);
expect(trie.dump()).to.deep.equal([
expect(trie.dump()).toStrictEqual([
'cdn.example.com', 'blog.cdn.example.com',
'.skk.moe',
'.t.co'
]);
trie.whitelist('.t.co');
expect(trie.dump()).to.deep.equal([
expect(trie.dump()).toStrictEqual([
'cdn.example.com', 'blog.cdn.example.com',
'.skk.moe'
]);
trie.whitelist('skk.moe');
expect(trie.dump()).to.deep.equal(['cdn.example.com', 'blog.cdn.example.com']);
expect(trie.dump()).toStrictEqual(['cdn.example.com', 'blog.cdn.example.com']);
trie.whitelist('cdn.example.com');
expect(trie.dump()).to.deep.equal(['blog.cdn.example.com']);
expect(trie.dump()).toStrictEqual(['blog.cdn.example.com']);
});
});