2017-11-02 20:49:11 +01:00
|
|
|
/*******************************************************************************
|
|
|
|
|
|
|
|
uBlock Origin - a browser extension to block requests.
|
2018-11-03 12:58:46 +01:00
|
|
|
Copyright (C) 2017-present Raymond Hill
|
2017-11-02 20:49:11 +01:00
|
|
|
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program. If not, see {http://www.gnu.org/licenses/}.
|
|
|
|
|
|
|
|
Home: https://github.com/gorhill/uBlock
|
|
|
|
*/
|
|
|
|
|
2021-08-21 13:33:53 +02:00
|
|
|
/* globals WebAssembly */
|
2021-08-08 17:49:31 +02:00
|
|
|
|
2017-11-02 20:49:11 +01:00
|
|
|
'use strict';
|
|
|
|
|
|
|
|
/*******************************************************************************
|
|
|
|
|
|
|
|
The original prototype was to develop an idea I had about using jump indices
|
|
|
|
in a TypedArray for quickly matching hostnames (or more generally strings)[1].
|
|
|
|
Once I had a working, un-optimized prototype, I realized I had ended up
|
|
|
|
with something formally named a "trie": <https://en.wikipedia.org/wiki/Trie>,
|
|
|
|
hence the name. I have no idea whether the implementation here or one
|
|
|
|
resembling it has been done elsewhere.
|
|
|
|
|
2018-12-04 19:02:09 +01:00
|
|
|
"HN" in HNTrieContainer stands for "HostName", because the trie is
|
|
|
|
specialized to deal with matching hostnames -- which is a bit more
|
|
|
|
complicated than matching plain strings.
|
2017-11-02 20:49:11 +01:00
|
|
|
|
|
|
|
For example, `www.abc.com` is deemed matching `abc.com`, because the former
|
|
|
|
is a subdomain of the latter. The opposite is of course not true.
|
|
|
|
|
2019-05-14 15:31:51 +02:00
|
|
|
The resulting read-only tries created as a result of using HNTrieContainer
|
|
|
|
are simply just typed arrays filled with integers. The matching algorithm is
|
2017-11-02 20:49:11 +01:00
|
|
|
just a matter of reading/comparing these integers, and further using them as
|
|
|
|
indices in the array as a way to move around in the trie.
|
|
|
|
|
|
|
|
[1] To solve <https://github.com/gorhill/uBlock/issues/3193>
|
|
|
|
|
2018-12-04 19:02:09 +01:00
|
|
|
Since this trie is specialized for matching hostnames, the stored
|
|
|
|
strings are reversed internally, because of hostname comparison logic:
|
|
|
|
|
|
|
|
Correct matching:
|
|
|
|
index 0123456
|
|
|
|
abc.com
|
|
|
|
|
|
|
|
|
www.abc.com
|
|
|
|
index 01234567890
|
|
|
|
|
|
|
|
Incorrect matching (typically used for plain strings):
|
|
|
|
index 0123456
|
|
|
|
abc.com
|
|
|
|
|
|
|
|
|
www.abc.com
|
|
|
|
index 01234567890
|
|
|
|
|
|
|
|
------------------------------------------------------------------------------
|
|
|
|
|
|
|
|
1st iteration:
|
|
|
|
- https://github.com/gorhill/uBlock/blob/ff58107dac3a32607f8113e39ed5015584506813/src/js/hntrie.js
|
|
|
|
- Suitable for small to medium set of hostnames
|
|
|
|
- One buffer per trie
|
|
|
|
|
|
|
|
2nd iteration: goal was to make matches() method wasm-able
|
|
|
|
- https://github.com/gorhill/uBlock/blob/c3b0fd31f64bd7ffecdd282fb1208fe07aac3eb0/src/js/hntrie.js
|
|
|
|
- Suitable for small to medium set of hostnames
|
|
|
|
- Distinct tries all share same buffer:
|
|
|
|
- Reduced memory footprint
|
|
|
|
- https://stackoverflow.com/questions/45803829/memory-overhead-of-typed-arrays-vs-strings/45808835#45808835
|
|
|
|
- Reusing needle character lookups for all tries
|
|
|
|
- This significantly reduce the number of String.charCodeAt() calls
|
|
|
|
- Slightly improved creation time
|
|
|
|
|
|
|
|
This is the 3rd iteration: goal was to make add() method wasm-able and
|
|
|
|
further improve memory/CPU efficiency.
|
|
|
|
|
|
|
|
This 3rd iteration has the following new traits:
|
|
|
|
- Suitable for small to large set of hostnames
|
|
|
|
- Support multiple trie containers (instanciable)
|
|
|
|
- Designed to hold large number of hostnames
|
|
|
|
- Hostnames can be added at any time (instead of all at once)
|
|
|
|
- This means pre-sorting is no longer a requirement
|
|
|
|
- The trie is always compact
|
|
|
|
- There is no longer a need for a `vacuum` method
|
|
|
|
- This makes the add() method wasm-able
|
|
|
|
- It can return the exact hostname which caused the match
|
|
|
|
- serializable/unserializable available for fast loading
|
|
|
|
- Distinct trie reference support the iteration protocol, thus allowing
|
|
|
|
to extract all the hostnames in the trie
|
|
|
|
|
|
|
|
Its primary purpose is to replace the use of Set() as a mean to hold
|
|
|
|
large number of hostnames (ex. FilterHostnameDict in static filtering
|
|
|
|
engine).
|
|
|
|
|
|
|
|
A HNTrieContainer is mostly a large buffer in which distinct but related
|
|
|
|
tries are stored. The memory layout of the buffer is as follow:
|
|
|
|
|
|
|
|
0-254: needle being processed
|
|
|
|
255: length of needle
|
|
|
|
256-259: offset to start of trie data section (=> trie0)
|
|
|
|
260-263: offset to end of trie data section (=> trie1)
|
|
|
|
264-267: offset to start of character data section (=> char0)
|
|
|
|
268-271: offset to end of character data section (=> char1)
|
|
|
|
272: start of trie data section
|
|
|
|
|
2017-11-02 20:49:11 +01:00
|
|
|
*/
|
|
|
|
|
2019-06-19 16:00:19 +02:00
|
|
|
const PAGE_SIZE = 65536;
|
|
|
|
// i32 / i8
|
|
|
|
const TRIE0_SLOT = 256 >>> 2; // 64 / 256
|
|
|
|
const TRIE1_SLOT = TRIE0_SLOT + 1; // 65 / 260
|
|
|
|
const CHAR0_SLOT = TRIE0_SLOT + 2; // 66 / 264
|
|
|
|
const CHAR1_SLOT = TRIE0_SLOT + 3; // 67 / 268
|
|
|
|
const TRIE0_START = TRIE0_SLOT + 4 << 2; // 272
|
2018-12-04 19:02:09 +01:00
|
|
|
|
2020-02-23 18:18:45 +01:00
|
|
|
const roundToPageSize = v => (v + PAGE_SIZE-1) & ~(PAGE_SIZE-1);
|
|
|
|
|
Refactoring work in static network filtering engine
The original motivation is to further speed up launch time
for either non-selfie-based and selfie-based initialization
of the static network filtering engine (SNFE).
As a result of the refactoring:
Filters are no longer instance-based, they are sequence-of-
integer-based. This eliminates the need to create instances
of filters at launch, and consequently eliminates all the
calls to class constructors, the resulting churning of memory,
and so forth.
All the properties defining filter instances are now as much
as possible 32-bit integer-based, and these are allocated in a
single module-scoped typed array -- this eliminates the need
to allocate memory for every filter being instantiated.
Not all filter properties can be represented as a 32-bit
integer, and in this case a filter class can allocate slots
into another module-scoped array of references.
As a result, this eliminates a lot of memory allocations when
the SNFE is populated with filters, and this makes the saving
and loading of selfie more straightforward, as the operation
is reduced to saving/loading two arrays, one of 32-bit
integers, and the other, much smaller, an array JSON-able
values.
All filter classes now only contain static methods, and all
of these methods are called with an index to the specific
filter data in the module-scoped array of 32-bit integers.
The filter sequences (used to avoid the use of JS arrays) are
also allocated in the single module-scoped array of 32-bit
integers -- they used to be stored in their own dedicated
array.
Additionally, some filters are now loaded more in a deferred
way, so as reduce uBO's time-to-readiness -- the outcome of
this still needs to be evaluated, time-to-readiness is
especially a concern in Firefox for Android or less powerful
computers.
2021-12-04 17:16:44 +01:00
|
|
|
class HNTrieContainer {
|
2018-12-04 19:02:09 +01:00
|
|
|
|
2020-02-23 18:18:45 +01:00
|
|
|
constructor() {
|
|
|
|
const len = PAGE_SIZE * 2;
|
|
|
|
this.buf = new Uint8Array(len);
|
2019-04-26 01:38:07 +02:00
|
|
|
this.buf32 = new Uint32Array(this.buf.buffer);
|
|
|
|
this.needle = '';
|
2019-06-19 16:00:19 +02:00
|
|
|
this.buf32[TRIE0_SLOT] = TRIE0_START;
|
|
|
|
this.buf32[TRIE1_SLOT] = this.buf32[TRIE0_SLOT];
|
2020-02-23 18:18:45 +01:00
|
|
|
this.buf32[CHAR0_SLOT] = len >>> 1;
|
2019-06-19 16:00:19 +02:00
|
|
|
this.buf32[CHAR1_SLOT] = this.buf32[CHAR0_SLOT];
|
2019-04-26 01:38:07 +02:00
|
|
|
this.wasmMemory = null;
|
2020-12-04 13:53:01 +01:00
|
|
|
|
|
|
|
this.lastStored = '';
|
|
|
|
this.lastStoredLen = this.lastStoredIndex = 0;
|
2019-04-26 01:38:07 +02:00
|
|
|
}
|
2018-12-04 19:02:09 +01:00
|
|
|
|
|
|
|
//--------------------------------------------------------------------------
|
|
|
|
// Public methods
|
|
|
|
//--------------------------------------------------------------------------
|
2018-11-03 12:58:46 +01:00
|
|
|
|
2020-02-23 18:18:45 +01:00
|
|
|
reset(details) {
|
|
|
|
if (
|
|
|
|
details instanceof Object &&
|
|
|
|
typeof details.byteLength === 'number' &&
|
|
|
|
typeof details.char0 === 'number'
|
|
|
|
) {
|
|
|
|
if ( details.byteLength > this.buf.byteLength ) {
|
|
|
|
this.reallocateBuf(details.byteLength);
|
|
|
|
}
|
|
|
|
this.buf32[CHAR0_SLOT] = details.char0;
|
|
|
|
}
|
2019-06-19 16:00:19 +02:00
|
|
|
this.buf32[TRIE1_SLOT] = this.buf32[TRIE0_SLOT];
|
|
|
|
this.buf32[CHAR1_SLOT] = this.buf32[CHAR0_SLOT];
|
2020-12-04 13:53:01 +01:00
|
|
|
|
|
|
|
this.lastStored = '';
|
|
|
|
this.lastStoredLen = this.lastStoredIndex = 0;
|
2019-04-26 01:38:07 +02:00
|
|
|
}
|
2018-11-03 12:58:46 +01:00
|
|
|
|
2019-04-26 01:38:07 +02:00
|
|
|
setNeedle(needle) {
|
2018-11-03 12:58:46 +01:00
|
|
|
if ( needle !== this.needle ) {
|
2018-12-04 19:02:09 +01:00
|
|
|
const buf = this.buf;
|
2018-11-03 12:58:46 +01:00
|
|
|
let i = needle.length;
|
2019-06-19 16:00:19 +02:00
|
|
|
if ( i > 255 ) { i = 255; }
|
2018-11-03 12:58:46 +01:00
|
|
|
buf[255] = i;
|
|
|
|
while ( i-- ) {
|
|
|
|
buf[i] = needle.charCodeAt(i);
|
|
|
|
}
|
|
|
|
this.needle = needle;
|
2017-11-02 20:49:11 +01:00
|
|
|
}
|
2018-11-03 12:58:46 +01:00
|
|
|
return this;
|
2019-04-26 01:38:07 +02:00
|
|
|
}
|
2017-11-02 20:49:11 +01:00
|
|
|
|
2019-04-26 01:38:07 +02:00
|
|
|
matchesJS(iroot) {
|
2019-06-19 16:00:19 +02:00
|
|
|
const buf32 = this.buf32;
|
|
|
|
const buf8 = this.buf;
|
|
|
|
const char0 = buf32[CHAR0_SLOT];
|
|
|
|
let ineedle = buf8[255];
|
|
|
|
let icell = buf32[iroot+0];
|
2019-04-29 19:15:16 +02:00
|
|
|
if ( icell === 0 ) { return -1; }
|
2021-08-10 15:27:59 +02:00
|
|
|
let c = 0, v = 0, i0 = 0, n = 0;
|
2018-11-03 12:58:46 +01:00
|
|
|
for (;;) {
|
2018-12-04 19:02:09 +01:00
|
|
|
if ( ineedle === 0 ) { return -1; }
|
2018-11-03 12:58:46 +01:00
|
|
|
ineedle -= 1;
|
2021-08-10 15:27:59 +02:00
|
|
|
c = buf8[ineedle];
|
2018-12-04 19:02:09 +01:00
|
|
|
// find first segment with a first-character match
|
2018-11-03 12:58:46 +01:00
|
|
|
for (;;) {
|
2019-06-19 16:00:19 +02:00
|
|
|
v = buf32[icell+2];
|
2021-08-10 15:27:59 +02:00
|
|
|
i0 = char0 + (v >>> 8);
|
2019-06-19 16:00:19 +02:00
|
|
|
if ( buf8[i0] === c ) { break; }
|
|
|
|
icell = buf32[icell+0];
|
2018-12-04 19:02:09 +01:00
|
|
|
if ( icell === 0 ) { return -1; }
|
2018-11-03 12:58:46 +01:00
|
|
|
}
|
2018-12-04 19:02:09 +01:00
|
|
|
// all characters in segment must match
|
2021-08-10 15:27:59 +02:00
|
|
|
n = v & 0x7F;
|
2018-12-04 19:02:09 +01:00
|
|
|
if ( n > 1 ) {
|
|
|
|
n -= 1;
|
|
|
|
if ( n > ineedle ) { return -1; }
|
|
|
|
i0 += 1;
|
|
|
|
const i1 = i0 + n;
|
2018-11-03 12:58:46 +01:00
|
|
|
do {
|
|
|
|
ineedle -= 1;
|
2019-06-19 16:00:19 +02:00
|
|
|
if ( buf8[i0] !== buf8[ineedle] ) { return -1; }
|
2018-12-04 19:02:09 +01:00
|
|
|
i0 += 1;
|
|
|
|
} while ( i0 < i1 );
|
2018-11-03 12:58:46 +01:00
|
|
|
}
|
2021-08-10 15:27:59 +02:00
|
|
|
// boundary at end of segment?
|
|
|
|
if ( (v & 0x80) !== 0 ) {
|
|
|
|
if ( ineedle === 0 || buf8[ineedle-1] === 0x2E /* '.' */ ) {
|
2018-12-04 19:02:09 +01:00
|
|
|
return ineedle;
|
|
|
|
}
|
2018-11-03 12:58:46 +01:00
|
|
|
}
|
2021-08-10 15:27:59 +02:00
|
|
|
// next segment
|
|
|
|
icell = buf32[icell+1];
|
|
|
|
if ( icell === 0 ) { break; }
|
2017-11-02 20:49:11 +01:00
|
|
|
}
|
2021-08-10 15:27:59 +02:00
|
|
|
return -1;
|
2019-04-26 01:38:07 +02:00
|
|
|
}
|
2017-11-02 20:49:11 +01:00
|
|
|
|
2021-12-18 18:53:09 +01:00
|
|
|
createTrie() {
|
2018-12-04 19:02:09 +01:00
|
|
|
// grow buffer if needed
|
2019-06-19 16:00:19 +02:00
|
|
|
if ( (this.buf32[CHAR0_SLOT] - this.buf32[TRIE1_SLOT]) < 12 ) {
|
2018-12-04 19:02:09 +01:00
|
|
|
this.growBuf(12, 0);
|
2018-11-03 12:58:46 +01:00
|
|
|
}
|
2019-06-19 16:00:19 +02:00
|
|
|
const iroot = this.buf32[TRIE1_SLOT] >>> 2;
|
|
|
|
this.buf32[TRIE1_SLOT] += 12;
|
2018-12-04 19:02:09 +01:00
|
|
|
this.buf32[iroot+0] = 0;
|
|
|
|
this.buf32[iroot+1] = 0;
|
|
|
|
this.buf32[iroot+2] = 0;
|
2021-12-18 18:53:09 +01:00
|
|
|
return iroot;
|
|
|
|
}
|
|
|
|
|
|
|
|
createTrieFromIterable(hostnames) {
|
|
|
|
const itrie = this.createTrie();
|
|
|
|
for ( const hn of hostnames ) {
|
|
|
|
if ( hn === '' ) { continue; }
|
|
|
|
this.setNeedle(hn).add(itrie);
|
|
|
|
}
|
|
|
|
return itrie;
|
|
|
|
}
|
|
|
|
|
|
|
|
createTrieFromStoredDomainOpt(i, n) {
|
|
|
|
const itrie = this.createTrie();
|
|
|
|
const jend = i + n;
|
|
|
|
let j = i, offset = 0, k = 0, c = 0;
|
|
|
|
while ( j !== jend ) {
|
|
|
|
offset = this.buf32[CHAR0_SLOT]; // Important
|
|
|
|
k = 0;
|
|
|
|
for (;;) {
|
|
|
|
if ( j === jend ) { break; }
|
|
|
|
c = this.buf[offset+j];
|
|
|
|
j += 1;
|
|
|
|
if ( c === 0x7C /* '|' */ ) { break; }
|
|
|
|
if ( k === 255 ) { continue; }
|
|
|
|
this.buf[k] = c;
|
|
|
|
k += 1;
|
|
|
|
}
|
|
|
|
if ( k !== 0 ) {
|
|
|
|
this.buf[255] = k;
|
|
|
|
this.add(itrie);
|
Refactoring work in static network filtering engine
The original motivation is to further speed up launch time
for either non-selfie-based and selfie-based initialization
of the static network filtering engine (SNFE).
As a result of the refactoring:
Filters are no longer instance-based, they are sequence-of-
integer-based. This eliminates the need to create instances
of filters at launch, and consequently eliminates all the
calls to class constructors, the resulting churning of memory,
and so forth.
All the properties defining filter instances are now as much
as possible 32-bit integer-based, and these are allocated in a
single module-scoped typed array -- this eliminates the need
to allocate memory for every filter being instantiated.
Not all filter properties can be represented as a 32-bit
integer, and in this case a filter class can allocate slots
into another module-scoped array of references.
As a result, this eliminates a lot of memory allocations when
the SNFE is populated with filters, and this makes the saving
and loading of selfie more straightforward, as the operation
is reduced to saving/loading two arrays, one of 32-bit
integers, and the other, much smaller, an array JSON-able
values.
All filter classes now only contain static methods, and all
of these methods are called with an index to the specific
filter data in the module-scoped array of 32-bit integers.
The filter sequences (used to avoid the use of JS arrays) are
also allocated in the single module-scoped array of 32-bit
integers -- they used to be stored in their own dedicated
array.
Additionally, some filters are now loaded more in a deferred
way, so as reduce uBO's time-to-readiness -- the outcome of
this still needs to be evaluated, time-to-readiness is
especially a concern in Firefox for Android or less powerful
computers.
2021-12-04 17:16:44 +01:00
|
|
|
}
|
|
|
|
}
|
2021-12-25 13:51:12 +01:00
|
|
|
this.needle = ''; // Important
|
|
|
|
this.buf[255] = 0; // Important
|
2021-12-18 18:53:09 +01:00
|
|
|
return itrie;
|
2019-04-26 01:38:07 +02:00
|
|
|
}
|
2017-11-02 20:49:11 +01:00
|
|
|
|
Refactoring work in static network filtering engine
The original motivation is to further speed up launch time
for either non-selfie-based and selfie-based initialization
of the static network filtering engine (SNFE).
As a result of the refactoring:
Filters are no longer instance-based, they are sequence-of-
integer-based. This eliminates the need to create instances
of filters at launch, and consequently eliminates all the
calls to class constructors, the resulting churning of memory,
and so forth.
All the properties defining filter instances are now as much
as possible 32-bit integer-based, and these are allocated in a
single module-scoped typed array -- this eliminates the need
to allocate memory for every filter being instantiated.
Not all filter properties can be represented as a 32-bit
integer, and in this case a filter class can allocate slots
into another module-scoped array of references.
As a result, this eliminates a lot of memory allocations when
the SNFE is populated with filters, and this makes the saving
and loading of selfie more straightforward, as the operation
is reduced to saving/loading two arrays, one of 32-bit
integers, and the other, much smaller, an array JSON-able
values.
All filter classes now only contain static methods, and all
of these methods are called with an index to the specific
filter data in the module-scoped array of 32-bit integers.
The filter sequences (used to avoid the use of JS arrays) are
also allocated in the single module-scoped array of 32-bit
integers -- they used to be stored in their own dedicated
array.
Additionally, some filters are now loaded more in a deferred
way, so as reduce uBO's time-to-readiness -- the outcome of
this still needs to be evaluated, time-to-readiness is
especially a concern in Firefox for Android or less powerful
computers.
2021-12-04 17:16:44 +01:00
|
|
|
dumpTrie(iroot) {
|
|
|
|
let hostnames = Array.from(this.trieIterator(iroot));
|
|
|
|
if ( String.prototype.padStart instanceof Function ) {
|
|
|
|
const maxlen = Math.min(
|
|
|
|
hostnames.reduce((maxlen, hn) => Math.max(maxlen, hn.length), 0),
|
|
|
|
64
|
|
|
|
);
|
|
|
|
hostnames = hostnames.map(hn => hn.padStart(maxlen));
|
|
|
|
}
|
|
|
|
for ( const hn of hostnames ) {
|
|
|
|
console.log(hn);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
trieIterator(iroot) {
|
|
|
|
return {
|
|
|
|
value: undefined,
|
|
|
|
done: false,
|
|
|
|
next() {
|
|
|
|
if ( this.icell === 0 ) {
|
|
|
|
if ( this.forks.length === 0 ) {
|
|
|
|
this.value = undefined;
|
|
|
|
this.done = true;
|
|
|
|
return this;
|
|
|
|
}
|
|
|
|
this.charPtr = this.forks.pop();
|
|
|
|
this.icell = this.forks.pop();
|
|
|
|
}
|
|
|
|
for (;;) {
|
|
|
|
const idown = this.container.buf32[this.icell+0];
|
|
|
|
if ( idown !== 0 ) {
|
|
|
|
this.forks.push(idown, this.charPtr);
|
|
|
|
}
|
|
|
|
const v = this.container.buf32[this.icell+2];
|
|
|
|
let i0 = this.container.buf32[CHAR0_SLOT] + (v >>> 8);
|
|
|
|
const i1 = i0 + (v & 0x7F);
|
|
|
|
while ( i0 < i1 ) {
|
|
|
|
this.charPtr -= 1;
|
|
|
|
this.charBuf[this.charPtr] = this.container.buf[i0];
|
|
|
|
i0 += 1;
|
|
|
|
}
|
|
|
|
this.icell = this.container.buf32[this.icell+1];
|
|
|
|
if ( (v & 0x80) !== 0 ) {
|
|
|
|
return this.toHostname();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
toHostname() {
|
|
|
|
this.value = this.textDecoder.decode(
|
|
|
|
new Uint8Array(this.charBuf.buffer, this.charPtr)
|
|
|
|
);
|
|
|
|
return this;
|
|
|
|
},
|
|
|
|
container: this,
|
|
|
|
icell: this.buf32[iroot],
|
|
|
|
charBuf: new Uint8Array(256),
|
|
|
|
charPtr: 256,
|
|
|
|
forks: [],
|
|
|
|
textDecoder: new TextDecoder(),
|
|
|
|
[Symbol.iterator]() { return this; },
|
|
|
|
};
|
2019-04-26 01:38:07 +02:00
|
|
|
}
|
2017-11-02 20:49:11 +01:00
|
|
|
|
2021-12-18 18:53:09 +01:00
|
|
|
// TODO:
|
|
|
|
// Rework code to add from a string already present in the character
|
|
|
|
// buffer, i.e. not having to go through setNeedle() when adding a new
|
|
|
|
// hostname to a trie. This will require much work though, and probably
|
|
|
|
// changing the order in which string segments are stored in the
|
|
|
|
// character buffer.
|
2019-04-26 01:38:07 +02:00
|
|
|
addJS(iroot) {
|
2018-12-04 19:02:09 +01:00
|
|
|
let lhnchar = this.buf[255];
|
|
|
|
if ( lhnchar === 0 ) { return 0; }
|
|
|
|
// grow buffer if needed
|
|
|
|
if (
|
2019-06-19 16:00:19 +02:00
|
|
|
(this.buf32[CHAR0_SLOT] - this.buf32[TRIE1_SLOT]) < 24 ||
|
|
|
|
(this.buf.length - this.buf32[CHAR1_SLOT]) < 256
|
2018-12-04 19:02:09 +01:00
|
|
|
) {
|
|
|
|
this.growBuf(24, 256);
|
2018-11-03 12:58:46 +01:00
|
|
|
}
|
2019-04-29 19:15:16 +02:00
|
|
|
let icell = this.buf32[iroot+0];
|
|
|
|
// special case: first node in trie
|
|
|
|
if ( icell === 0 ) {
|
2021-08-10 15:27:59 +02:00
|
|
|
this.buf32[iroot+0] = this.addLeafCell(lhnchar);
|
2019-04-29 19:15:16 +02:00
|
|
|
return 1;
|
|
|
|
}
|
2018-12-04 19:02:09 +01:00
|
|
|
//
|
2019-06-19 16:00:19 +02:00
|
|
|
const char0 = this.buf32[CHAR0_SLOT];
|
2021-08-10 15:27:59 +02:00
|
|
|
let isegchar, lsegchar, boundaryBit, inext;
|
2018-12-04 19:02:09 +01:00
|
|
|
// find a matching cell: move down
|
2018-11-03 12:58:46 +01:00
|
|
|
for (;;) {
|
2021-08-10 15:27:59 +02:00
|
|
|
const v = this.buf32[icell+2];
|
|
|
|
let isegchar0 = char0 + (v >>> 8);
|
2018-12-04 19:02:09 +01:00
|
|
|
// if first character is no match, move to next descendant
|
2019-04-30 13:00:52 +02:00
|
|
|
if ( this.buf[isegchar0] !== this.buf[lhnchar-1] ) {
|
2018-12-04 19:02:09 +01:00
|
|
|
inext = this.buf32[icell+0];
|
|
|
|
if ( inext === 0 ) {
|
2021-08-10 15:27:59 +02:00
|
|
|
this.buf32[icell+0] = this.addLeafCell(lhnchar);
|
2018-12-04 19:02:09 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
icell = inext;
|
|
|
|
continue;
|
2018-11-03 12:58:46 +01:00
|
|
|
}
|
2019-04-30 13:00:52 +02:00
|
|
|
// 1st character was tested
|
2021-08-10 15:27:59 +02:00
|
|
|
isegchar = 1;
|
2018-12-04 19:02:09 +01:00
|
|
|
lhnchar -= 1;
|
|
|
|
// find 1st mismatch in rest of segment
|
2021-08-10 15:27:59 +02:00
|
|
|
lsegchar = v & 0x7F;
|
2018-12-04 19:02:09 +01:00
|
|
|
if ( lsegchar !== 1 ) {
|
|
|
|
for (;;) {
|
|
|
|
if ( isegchar === lsegchar ) { break; }
|
|
|
|
if ( lhnchar === 0 ) { break; }
|
2019-04-30 13:00:52 +02:00
|
|
|
if ( this.buf[isegchar0+isegchar] !== this.buf[lhnchar-1] ) { break; }
|
2018-12-04 19:02:09 +01:00
|
|
|
isegchar += 1;
|
|
|
|
lhnchar -= 1;
|
|
|
|
}
|
2018-11-03 12:58:46 +01:00
|
|
|
}
|
2021-08-10 15:27:59 +02:00
|
|
|
boundaryBit = v & 0x80;
|
2018-12-04 19:02:09 +01:00
|
|
|
// all segment characters matched
|
|
|
|
if ( isegchar === lsegchar ) {
|
|
|
|
// needle remainder: no
|
|
|
|
if ( lhnchar === 0 ) {
|
2021-08-10 15:27:59 +02:00
|
|
|
// boundary: yes, already present
|
|
|
|
if ( boundaryBit !== 0 ) { return 0; }
|
|
|
|
// boundary: no, mark as boundary
|
|
|
|
this.buf32[icell+2] = v | 0x80;
|
2018-12-04 19:02:09 +01:00
|
|
|
}
|
|
|
|
// needle remainder: yes
|
|
|
|
else {
|
2021-08-10 15:27:59 +02:00
|
|
|
// remainder is at label boundary? if yes, no need to add
|
|
|
|
// the rest since the shortest match is always reported
|
|
|
|
if ( boundaryBit !== 0 ) {
|
|
|
|
if ( this.buf[lhnchar-1] === 0x2E /* '.' */ ) { return -1; }
|
|
|
|
}
|
|
|
|
inext = this.buf32[icell+1];
|
2018-12-04 19:02:09 +01:00
|
|
|
if ( inext !== 0 ) {
|
|
|
|
icell = inext;
|
|
|
|
continue;
|
|
|
|
}
|
2021-08-10 15:27:59 +02:00
|
|
|
// add needle remainder
|
|
|
|
this.buf32[icell+1] = this.addLeafCell(lhnchar);
|
2018-12-04 19:02:09 +01:00
|
|
|
}
|
2018-11-03 12:58:46 +01:00
|
|
|
}
|
2018-12-04 19:02:09 +01:00
|
|
|
// some segment characters matched
|
|
|
|
else {
|
|
|
|
// split current cell
|
|
|
|
isegchar0 -= char0;
|
2021-08-10 15:27:59 +02:00
|
|
|
this.buf32[icell+2] = isegchar0 << 8 | isegchar;
|
2018-12-04 19:02:09 +01:00
|
|
|
inext = this.addCell(
|
|
|
|
0,
|
|
|
|
this.buf32[icell+1],
|
2021-08-10 15:27:59 +02:00
|
|
|
isegchar0 + isegchar << 8 | boundaryBit | lsegchar - isegchar
|
2018-12-04 19:02:09 +01:00
|
|
|
);
|
2019-04-30 13:00:52 +02:00
|
|
|
this.buf32[icell+1] = inext;
|
2021-08-10 15:27:59 +02:00
|
|
|
// needle remainder: yes, need new cell for remaining characters
|
|
|
|
if ( lhnchar !== 0 ) {
|
|
|
|
this.buf32[inext+0] = this.addLeafCell(lhnchar);
|
2018-12-04 19:02:09 +01:00
|
|
|
}
|
2021-08-10 15:27:59 +02:00
|
|
|
// needle remainder: no, need boundary cell
|
2018-12-04 19:02:09 +01:00
|
|
|
else {
|
2021-08-10 15:27:59 +02:00
|
|
|
this.buf32[icell+2] |= 0x80;
|
2018-12-04 19:02:09 +01:00
|
|
|
}
|
2018-11-03 12:58:46 +01:00
|
|
|
}
|
2018-12-04 19:02:09 +01:00
|
|
|
return 1;
|
2017-11-02 20:49:11 +01:00
|
|
|
}
|
2019-04-26 01:38:07 +02:00
|
|
|
}
|
2018-12-04 19:02:09 +01:00
|
|
|
|
2019-04-26 01:38:07 +02:00
|
|
|
optimize() {
|
2018-12-04 19:02:09 +01:00
|
|
|
this.shrinkBuf();
|
|
|
|
return {
|
|
|
|
byteLength: this.buf.byteLength,
|
2019-06-19 16:00:19 +02:00
|
|
|
char0: this.buf32[CHAR0_SLOT],
|
2018-12-04 19:02:09 +01:00
|
|
|
};
|
2019-04-26 01:38:07 +02:00
|
|
|
}
|
2018-11-03 12:58:46 +01:00
|
|
|
|
2019-04-26 01:38:07 +02:00
|
|
|
serialize(encoder) {
|
2019-02-14 19:33:55 +01:00
|
|
|
if ( encoder instanceof Object ) {
|
|
|
|
return encoder.encode(
|
|
|
|
this.buf32.buffer,
|
2019-06-19 16:00:19 +02:00
|
|
|
this.buf32[CHAR1_SLOT]
|
2019-02-14 19:33:55 +01:00
|
|
|
);
|
|
|
|
}
|
2018-12-04 19:02:09 +01:00
|
|
|
return Array.from(
|
|
|
|
new Uint32Array(
|
|
|
|
this.buf32.buffer,
|
|
|
|
0,
|
2019-06-19 16:00:19 +02:00
|
|
|
this.buf32[CHAR1_SLOT] + 3 >>> 2
|
2018-12-04 19:02:09 +01:00
|
|
|
)
|
|
|
|
);
|
2019-04-26 01:38:07 +02:00
|
|
|
}
|
2018-11-03 12:58:46 +01:00
|
|
|
|
2019-04-26 01:38:07 +02:00
|
|
|
unserialize(selfie, decoder) {
|
2019-03-16 14:00:31 +01:00
|
|
|
this.needle = '';
|
2019-02-14 19:33:55 +01:00
|
|
|
const shouldDecode = typeof selfie === 'string';
|
|
|
|
let byteLength = shouldDecode
|
|
|
|
? decoder.decodeSize(selfie)
|
|
|
|
: selfie.length << 2;
|
2019-04-20 15:06:54 +02:00
|
|
|
if ( byteLength === 0 ) { return false; }
|
2020-02-23 18:18:45 +01:00
|
|
|
byteLength = roundToPageSize(byteLength);
|
2018-12-04 19:02:09 +01:00
|
|
|
if ( this.wasmMemory !== null ) {
|
|
|
|
const pageCountBefore = this.buf.length >>> 16;
|
2019-02-14 19:33:55 +01:00
|
|
|
const pageCountAfter = byteLength >>> 16;
|
2018-12-04 19:02:09 +01:00
|
|
|
if ( pageCountAfter > pageCountBefore ) {
|
|
|
|
this.wasmMemory.grow(pageCountAfter - pageCountBefore);
|
|
|
|
this.buf = new Uint8Array(this.wasmMemory.buffer);
|
|
|
|
this.buf32 = new Uint32Array(this.buf.buffer);
|
|
|
|
}
|
2019-02-14 19:33:55 +01:00
|
|
|
} else if ( byteLength > this.buf.length ) {
|
|
|
|
this.buf = new Uint8Array(byteLength);
|
|
|
|
this.buf32 = new Uint32Array(this.buf.buffer);
|
|
|
|
}
|
|
|
|
if ( shouldDecode ) {
|
|
|
|
decoder.decode(selfie, this.buf.buffer);
|
2018-11-03 12:58:46 +01:00
|
|
|
} else {
|
2019-02-14 19:33:55 +01:00
|
|
|
this.buf32.set(selfie);
|
2017-11-02 20:49:11 +01:00
|
|
|
}
|
2019-04-20 15:06:54 +02:00
|
|
|
return true;
|
2019-04-26 01:38:07 +02:00
|
|
|
}
|
2018-12-04 19:02:09 +01:00
|
|
|
|
2020-05-24 16:46:16 +02:00
|
|
|
// The following *Hostname() methods can be used to store hostname strings
|
|
|
|
// outside the trie. This is useful to store/match hostnames which are
|
|
|
|
// not part of a collection, and yet still benefit from storing the strings
|
|
|
|
// into a trie container's character buffer.
|
|
|
|
// TODO: WASM version of matchesHostname()
|
|
|
|
|
|
|
|
storeHostname(hn) {
|
|
|
|
let n = hn.length;
|
|
|
|
if ( n > 255 ) {
|
|
|
|
hn = hn.slice(-255);
|
|
|
|
n = 255;
|
|
|
|
}
|
2020-12-04 13:53:01 +01:00
|
|
|
if ( n === this.lastStoredLen && hn === this.lastStored ) {
|
|
|
|
return this.lastStoredIndex;
|
|
|
|
}
|
|
|
|
this.lastStored = hn;
|
|
|
|
this.lastStoredLen = n;
|
2020-05-24 16:46:16 +02:00
|
|
|
if ( (this.buf.length - this.buf32[CHAR1_SLOT]) < n ) {
|
|
|
|
this.growBuf(0, n);
|
|
|
|
}
|
|
|
|
const offset = this.buf32[CHAR1_SLOT];
|
|
|
|
this.buf32[CHAR1_SLOT] = offset + n;
|
|
|
|
const buf8 = this.buf;
|
|
|
|
for ( let i = 0; i < n; i++ ) {
|
|
|
|
buf8[offset+i] = hn.charCodeAt(i);
|
|
|
|
}
|
2020-12-04 13:53:01 +01:00
|
|
|
return (this.lastStoredIndex = offset - this.buf32[CHAR0_SLOT]);
|
2020-05-24 16:46:16 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
extractHostname(i, n) {
|
|
|
|
const textDecoder = new TextDecoder();
|
|
|
|
const offset = this.buf32[CHAR0_SLOT] + i;
|
|
|
|
return textDecoder.decode(this.buf.subarray(offset, offset + n));
|
|
|
|
}
|
|
|
|
|
2021-12-18 18:53:09 +01:00
|
|
|
storeDomainOpt(s) {
|
|
|
|
let n = s.length;
|
|
|
|
if ( n === this.lastStoredLen && s === this.lastStored ) {
|
|
|
|
return this.lastStoredIndex;
|
|
|
|
}
|
|
|
|
this.lastStored = s;
|
|
|
|
this.lastStoredLen = n;
|
|
|
|
if ( (this.buf.length - this.buf32[CHAR1_SLOT]) < n ) {
|
|
|
|
this.growBuf(0, n);
|
|
|
|
}
|
|
|
|
const offset = this.buf32[CHAR1_SLOT];
|
|
|
|
this.buf32[CHAR1_SLOT] = offset + n;
|
|
|
|
const buf8 = this.buf;
|
|
|
|
for ( let i = 0; i < n; i++ ) {
|
|
|
|
buf8[offset+i] = s.charCodeAt(i);
|
|
|
|
}
|
|
|
|
return (this.lastStoredIndex = offset - this.buf32[CHAR0_SLOT]);
|
|
|
|
}
|
|
|
|
|
|
|
|
extractDomainOpt(i, n) {
|
|
|
|
const textDecoder = new TextDecoder();
|
|
|
|
const offset = this.buf32[CHAR0_SLOT] + i;
|
|
|
|
return textDecoder.decode(this.buf.subarray(offset, offset + n));
|
|
|
|
}
|
|
|
|
|
2020-05-24 16:46:16 +02:00
|
|
|
matchesHostname(hn, i, n) {
|
|
|
|
this.setNeedle(hn);
|
|
|
|
const buf8 = this.buf;
|
|
|
|
const hr = buf8[255];
|
|
|
|
if ( n > hr ) { return false; }
|
|
|
|
const hl = hr - n;
|
|
|
|
const nl = this.buf32[CHAR0_SLOT] + i;
|
|
|
|
for ( let j = 0; j < n; j++ ) {
|
|
|
|
if ( buf8[nl+j] !== buf8[hl+j] ) { return false; }
|
|
|
|
}
|
|
|
|
return n === hr || hn.charCodeAt(hl-1) === 0x2E /* '.' */;
|
|
|
|
}
|
|
|
|
|
2021-07-29 22:54:51 +02:00
|
|
|
async enableWASM(wasmModuleFetcher, path) {
|
2021-08-21 13:33:53 +02:00
|
|
|
if ( typeof WebAssembly === 'undefined' ) { return false; }
|
|
|
|
if ( this.wasmMemory instanceof WebAssembly.Memory ) { return true; }
|
2021-07-29 22:54:51 +02:00
|
|
|
const module = await getWasmModule(wasmModuleFetcher, path);
|
2021-08-21 13:33:53 +02:00
|
|
|
if ( module instanceof WebAssembly.Module === false ) { return false; }
|
|
|
|
const memory = new WebAssembly.Memory({ initial: 2 });
|
|
|
|
const instance = await WebAssembly.instantiate(module, {
|
2020-05-15 18:03:05 +02:00
|
|
|
imports: {
|
|
|
|
memory,
|
|
|
|
growBuf: this.growBuf.bind(this, 24, 256)
|
2020-02-22 19:36:22 +01:00
|
|
|
}
|
2020-05-15 18:03:05 +02:00
|
|
|
});
|
2021-08-21 13:33:53 +02:00
|
|
|
if ( instance instanceof WebAssembly.Instance === false ) { return false; }
|
2020-02-22 19:36:22 +01:00
|
|
|
this.wasmMemory = memory;
|
|
|
|
const curPageCount = memory.buffer.byteLength >>> 16;
|
2020-05-15 18:03:05 +02:00
|
|
|
const newPageCount = roundToPageSize(this.buf.byteLength) >>> 16;
|
2020-02-22 19:36:22 +01:00
|
|
|
if ( newPageCount > curPageCount ) {
|
|
|
|
memory.grow(newPageCount - curPageCount);
|
|
|
|
}
|
|
|
|
const buf = new Uint8Array(memory.buffer);
|
|
|
|
buf.set(this.buf);
|
|
|
|
this.buf = buf;
|
|
|
|
this.buf32 = new Uint32Array(this.buf.buffer);
|
|
|
|
this.matches = this.matchesWASM = instance.exports.matches;
|
|
|
|
this.add = this.addWASM = instance.exports.add;
|
2021-07-29 22:54:51 +02:00
|
|
|
return true;
|
2020-02-22 19:36:22 +01:00
|
|
|
}
|
|
|
|
|
2021-12-12 16:32:49 +01:00
|
|
|
dumpInfo() {
|
|
|
|
return [
|
|
|
|
`Buffer size (Uint8Array): ${this.buf32[CHAR1_SLOT].toLocaleString('en')}`,
|
|
|
|
`WASM: ${this.wasmMemory === null ? 'disabled' : 'enabled'}`,
|
|
|
|
].join('\n');
|
|
|
|
}
|
|
|
|
|
2018-12-04 19:02:09 +01:00
|
|
|
//--------------------------------------------------------------------------
|
|
|
|
// Private methods
|
|
|
|
//--------------------------------------------------------------------------
|
|
|
|
|
2019-04-26 01:38:07 +02:00
|
|
|
addCell(idown, iright, v) {
|
2019-06-19 16:00:19 +02:00
|
|
|
let icell = this.buf32[TRIE1_SLOT];
|
|
|
|
this.buf32[TRIE1_SLOT] = icell + 12;
|
2018-12-04 19:02:09 +01:00
|
|
|
icell >>>= 2;
|
|
|
|
this.buf32[icell+0] = idown;
|
|
|
|
this.buf32[icell+1] = iright;
|
|
|
|
this.buf32[icell+2] = v;
|
|
|
|
return icell;
|
2019-04-26 01:38:07 +02:00
|
|
|
}
|
2018-12-04 19:02:09 +01:00
|
|
|
|
2021-08-10 15:27:59 +02:00
|
|
|
addLeafCell(lsegchar) {
|
|
|
|
const r = this.buf32[TRIE1_SLOT] >>> 2;
|
|
|
|
let i = r;
|
|
|
|
while ( lsegchar > 127 ) {
|
|
|
|
this.buf32[i+0] = 0;
|
|
|
|
this.buf32[i+1] = i + 3;
|
|
|
|
this.buf32[i+2] = this.addSegment(lsegchar, lsegchar - 127);
|
|
|
|
lsegchar -= 127;
|
|
|
|
i += 3;
|
|
|
|
}
|
|
|
|
this.buf32[i+0] = 0;
|
|
|
|
this.buf32[i+1] = 0;
|
|
|
|
this.buf32[i+2] = this.addSegment(lsegchar, 0) | 0x80;
|
|
|
|
this.buf32[TRIE1_SLOT] = i + 3 << 2;
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
addSegment(lsegchar, lsegend) {
|
2018-12-04 19:02:09 +01:00
|
|
|
if ( lsegchar === 0 ) { return 0; }
|
2019-06-19 16:00:19 +02:00
|
|
|
let char1 = this.buf32[CHAR1_SLOT];
|
|
|
|
const isegchar = char1 - this.buf32[CHAR0_SLOT];
|
2018-12-04 19:02:09 +01:00
|
|
|
let i = lsegchar;
|
|
|
|
do {
|
|
|
|
this.buf[char1++] = this.buf[--i];
|
2021-08-10 15:27:59 +02:00
|
|
|
} while ( i !== lsegend );
|
2019-06-19 16:00:19 +02:00
|
|
|
this.buf32[CHAR1_SLOT] = char1;
|
2021-08-10 15:27:59 +02:00
|
|
|
return isegchar << 8 | lsegchar - lsegend;
|
2019-04-26 01:38:07 +02:00
|
|
|
}
|
2018-11-03 12:58:46 +01:00
|
|
|
|
2019-04-26 01:38:07 +02:00
|
|
|
growBuf(trieGrow, charGrow) {
|
2018-12-04 19:02:09 +01:00
|
|
|
const char0 = Math.max(
|
2020-02-23 18:18:45 +01:00
|
|
|
roundToPageSize(this.buf32[TRIE1_SLOT] + trieGrow),
|
2019-06-19 16:00:19 +02:00
|
|
|
this.buf32[CHAR0_SLOT]
|
2018-12-04 19:02:09 +01:00
|
|
|
);
|
2019-06-19 16:00:19 +02:00
|
|
|
const char1 = char0 + this.buf32[CHAR1_SLOT] - this.buf32[CHAR0_SLOT];
|
2018-12-04 19:02:09 +01:00
|
|
|
const bufLen = Math.max(
|
2020-02-23 18:18:45 +01:00
|
|
|
roundToPageSize(char1 + charGrow),
|
2018-12-04 19:02:09 +01:00
|
|
|
this.buf.length
|
|
|
|
);
|
|
|
|
this.resizeBuf(bufLen, char0);
|
2019-04-26 01:38:07 +02:00
|
|
|
}
|
2018-12-04 19:02:09 +01:00
|
|
|
|
2019-04-26 01:38:07 +02:00
|
|
|
shrinkBuf() {
|
2018-12-04 19:02:09 +01:00
|
|
|
// Can't shrink WebAssembly.Memory
|
|
|
|
if ( this.wasmMemory !== null ) { return; }
|
2019-06-19 16:00:19 +02:00
|
|
|
const char0 = this.buf32[TRIE1_SLOT] + 24;
|
|
|
|
const char1 = char0 + this.buf32[CHAR1_SLOT] - this.buf32[CHAR0_SLOT];
|
2018-12-04 19:02:09 +01:00
|
|
|
const bufLen = char1 + 256;
|
|
|
|
this.resizeBuf(bufLen, char0);
|
2019-04-26 01:38:07 +02:00
|
|
|
}
|
2018-12-04 19:02:09 +01:00
|
|
|
|
2019-04-26 01:38:07 +02:00
|
|
|
resizeBuf(bufLen, char0) {
|
2020-02-23 18:18:45 +01:00
|
|
|
bufLen = roundToPageSize(bufLen);
|
2021-08-08 17:41:05 +02:00
|
|
|
if ( bufLen === this.buf.length && char0 === this.buf32[CHAR0_SLOT] ) {
|
2018-12-04 19:02:09 +01:00
|
|
|
return;
|
|
|
|
}
|
2019-06-19 16:00:19 +02:00
|
|
|
const charDataLen = this.buf32[CHAR1_SLOT] - this.buf32[CHAR0_SLOT];
|
2018-12-04 19:02:09 +01:00
|
|
|
if ( this.wasmMemory !== null ) {
|
|
|
|
const pageCount = (bufLen >>> 16) - (this.buf.byteLength >>> 16);
|
|
|
|
if ( pageCount > 0 ) {
|
|
|
|
this.wasmMemory.grow(pageCount);
|
|
|
|
this.buf = new Uint8Array(this.wasmMemory.buffer);
|
|
|
|
this.buf32 = new Uint32Array(this.wasmMemory.buffer);
|
|
|
|
}
|
|
|
|
} else if ( bufLen !== this.buf.length ) {
|
|
|
|
const newBuf = new Uint8Array(bufLen);
|
|
|
|
newBuf.set(
|
|
|
|
new Uint8Array(
|
|
|
|
this.buf.buffer,
|
|
|
|
0,
|
2019-06-19 16:00:19 +02:00
|
|
|
this.buf32[TRIE1_SLOT]
|
2018-12-04 19:02:09 +01:00
|
|
|
),
|
|
|
|
0
|
|
|
|
);
|
|
|
|
newBuf.set(
|
|
|
|
new Uint8Array(
|
|
|
|
this.buf.buffer,
|
2019-06-19 16:00:19 +02:00
|
|
|
this.buf32[CHAR0_SLOT],
|
2018-12-04 19:02:09 +01:00
|
|
|
charDataLen
|
|
|
|
),
|
|
|
|
char0
|
|
|
|
);
|
|
|
|
this.buf = newBuf;
|
|
|
|
this.buf32 = new Uint32Array(this.buf.buffer);
|
2019-06-19 16:00:19 +02:00
|
|
|
this.buf32[CHAR0_SLOT] = char0;
|
|
|
|
this.buf32[CHAR1_SLOT] = char0 + charDataLen;
|
2018-12-04 19:02:09 +01:00
|
|
|
}
|
2019-06-19 16:00:19 +02:00
|
|
|
if ( char0 !== this.buf32[CHAR0_SLOT] ) {
|
2018-12-04 19:02:09 +01:00
|
|
|
this.buf.set(
|
|
|
|
new Uint8Array(
|
|
|
|
this.buf.buffer,
|
2019-06-19 16:00:19 +02:00
|
|
|
this.buf32[CHAR0_SLOT],
|
2018-12-04 19:02:09 +01:00
|
|
|
charDataLen
|
|
|
|
),
|
|
|
|
char0
|
|
|
|
);
|
2019-06-19 16:00:19 +02:00
|
|
|
this.buf32[CHAR0_SLOT] = char0;
|
|
|
|
this.buf32[CHAR1_SLOT] = char0 + charDataLen;
|
2018-12-04 19:02:09 +01:00
|
|
|
}
|
2019-04-26 01:38:07 +02:00
|
|
|
}
|
2020-02-23 18:18:45 +01:00
|
|
|
|
|
|
|
reallocateBuf(newSize) {
|
|
|
|
newSize = roundToPageSize(newSize);
|
|
|
|
if ( newSize === this.buf.length ) { return; }
|
|
|
|
if ( this.wasmMemory === null ) {
|
|
|
|
const newBuf = new Uint8Array(newSize);
|
|
|
|
newBuf.set(
|
|
|
|
newBuf.length < this.buf.length
|
|
|
|
? this.buf.subarray(0, newBuf.length)
|
|
|
|
: this.buf
|
|
|
|
);
|
|
|
|
this.buf = newBuf;
|
|
|
|
} else {
|
|
|
|
const growBy =
|
|
|
|
((newSize + 0xFFFF) >>> 16) - (this.buf.length >>> 16);
|
|
|
|
if ( growBy <= 0 ) { return; }
|
|
|
|
this.wasmMemory.grow(growBy);
|
|
|
|
this.buf = new Uint8Array(this.wasmMemory.buffer);
|
|
|
|
}
|
|
|
|
this.buf32 = new Uint32Array(this.buf.buffer);
|
|
|
|
}
|
Refactoring work in static network filtering engine
The original motivation is to further speed up launch time
for either non-selfie-based and selfie-based initialization
of the static network filtering engine (SNFE).
As a result of the refactoring:
Filters are no longer instance-based, they are sequence-of-
integer-based. This eliminates the need to create instances
of filters at launch, and consequently eliminates all the
calls to class constructors, the resulting churning of memory,
and so forth.
All the properties defining filter instances are now as much
as possible 32-bit integer-based, and these are allocated in a
single module-scoped typed array -- this eliminates the need
to allocate memory for every filter being instantiated.
Not all filter properties can be represented as a 32-bit
integer, and in this case a filter class can allocate slots
into another module-scoped array of references.
As a result, this eliminates a lot of memory allocations when
the SNFE is populated with filters, and this makes the saving
and loading of selfie more straightforward, as the operation
is reduced to saving/loading two arrays, one of 32-bit
integers, and the other, much smaller, an array JSON-able
values.
All filter classes now only contain static methods, and all
of these methods are called with an index to the specific
filter data in the module-scoped array of 32-bit integers.
The filter sequences (used to avoid the use of JS arrays) are
also allocated in the single module-scoped array of 32-bit
integers -- they used to be stored in their own dedicated
array.
Additionally, some filters are now loaded more in a deferred
way, so as reduce uBO's time-to-readiness -- the outcome of
this still needs to be evaluated, time-to-readiness is
especially a concern in Firefox for Android or less powerful
computers.
2021-12-04 17:16:44 +01:00
|
|
|
}
|
2018-11-03 12:58:46 +01:00
|
|
|
|
2019-04-26 01:38:07 +02:00
|
|
|
HNTrieContainer.prototype.matches = HNTrieContainer.prototype.matchesJS;
|
|
|
|
HNTrieContainer.prototype.matchesWASM = null;
|
|
|
|
|
|
|
|
HNTrieContainer.prototype.add = HNTrieContainer.prototype.addJS;
|
|
|
|
HNTrieContainer.prototype.addWASM = null;
|
|
|
|
|
2018-11-03 12:58:46 +01:00
|
|
|
/******************************************************************************/
|
2017-11-02 20:49:11 +01:00
|
|
|
|
2018-12-04 19:02:09 +01:00
|
|
|
// Code below is to attempt to load a WASM module which implements:
|
|
|
|
//
|
|
|
|
// - HNTrieContainer.add()
|
|
|
|
// - HNTrieContainer.matches()
|
|
|
|
//
|
|
|
|
// The WASM module is entirely optional, the JS implementations will be
|
|
|
|
// used should the WASM module be unavailable for whatever reason.
|
|
|
|
|
2020-02-22 19:36:22 +01:00
|
|
|
const getWasmModule = (( ) => {
|
|
|
|
let wasmModulePromise;
|
2017-11-02 20:49:11 +01:00
|
|
|
|
2021-07-29 22:54:51 +02:00
|
|
|
return async function(wasmModuleFetcher, path) {
|
2020-02-22 19:36:22 +01:00
|
|
|
if ( wasmModulePromise instanceof Promise ) {
|
|
|
|
return wasmModulePromise;
|
|
|
|
}
|
|
|
|
|
|
|
|
// The wasm module will work only if CPU is natively little-endian,
|
|
|
|
// as we use native uint32 array in our js code.
|
|
|
|
const uint32s = new Uint32Array(1);
|
|
|
|
const uint8s = new Uint8Array(uint32s.buffer);
|
|
|
|
uint32s[0] = 1;
|
|
|
|
if ( uint8s[0] !== 1 ) { return; }
|
|
|
|
|
2021-07-29 22:54:51 +02:00
|
|
|
wasmModulePromise = wasmModuleFetcher(`${path}hntrie`).catch(reason => {
|
2021-07-29 01:48:38 +02:00
|
|
|
console.info(reason);
|
2020-02-22 19:36:22 +01:00
|
|
|
});
|
|
|
|
|
|
|
|
return wasmModulePromise;
|
|
|
|
};
|
2018-11-03 12:58:46 +01:00
|
|
|
})();
|
2019-06-19 16:00:19 +02:00
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2021-08-10 15:27:59 +02:00
|
|
|
export default HNTrieContainer;
|