@browserless.io/browserless 2.12.0-beta-3 → 2.12.0-beta-6

package/extensions/ublock/js/hntrie.js

@@ -19,10 +19,6 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-/* globals WebAssembly */
-
-'use strict';
-
 /*******************************************************************************
 
   The original prototype was to develop an idea I had about using jump indices
@@ -115,7 +111,7 @@
 */
 
 const PAGE_SIZE   = 65536;
-                                            // i32 /  i8
+//                                             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
@@ -124,6 +120,16 @@ const TRIE0_START = TRIE0_SLOT + 4 << 2;    //       272
 
 const roundToPageSize = v => (v + PAGE_SIZE-1) & ~(PAGE_SIZE-1);
 
+// http://www.cse.yorku.ca/~oz/hash.html#djb2
+const i32Checksum = (buf32) => {
+    const n = buf32.length;
+    let hash = 177573 ^ n;
+    for ( let i = 0; i < n; i++ ) {
+        hash = (hash << 5) + hash ^ buf32[i];
+    }
+    return hash;
+};
+
 class HNTrieContainer {
 
     constructor() {
@@ -446,16 +452,16 @@ class HNTrieContainer {
     }
 
     toSelfie() {
-        return this.buf32.subarray(
-            0,
-            this.buf32[CHAR1_SLOT] + 3 >>> 2
-        );
+        const buf32 = this.buf32.subarray(0, this.buf32[CHAR1_SLOT] + 3 >>> 2);
+        return { buf32, checksum: i32Checksum(buf32) };
     }
 
     fromSelfie(selfie) {
-        if ( selfie instanceof Uint32Array === false ) { return false; }
+        if ( selfie instanceof Object === false ) { return false; }
+        if ( selfie.buf32 instanceof Uint32Array === false ) { return false; }
+        if ( selfie.checksum !== i32Checksum(selfie.buf32) ) { return false; }
         this.needle = '';
-        let byteLength = selfie.length << 2;
+        let byteLength = selfie.buf32.length << 2;
         if ( byteLength === 0 ) { return false; }
         byteLength = roundToPageSize(byteLength);
         if ( this.wasmMemory !== null ) {
@@ -466,9 +472,9 @@ class HNTrieContainer {
                 this.buf = new Uint8Array(this.wasmMemory.buffer);
                 this.buf32 = new Uint32Array(this.buf.buffer);
             }
-            this.buf32.set(selfie);
+            this.buf32.set(selfie.buf32);
         } else {
-            this.buf32 = selfie;
+            this.buf32 = selfie.buf32;
             this.buf = new Uint8Array(this.buf32.buffer);
         }
         // https://github.com/uBlockOrigin/uBlock-issues/issues/2925

package/extensions/ublock/js/logger-ui-inspector.js

@@ -19,10 +19,6 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-/* globals browser */
-
-'use strict';
-
 import { dom, qs$, qsa$ } from './dom.js';
 
 /******************************************************************************/
@@ -38,7 +34,6 @@ const domTree = qs$('#domTree');
 const filterToIdMap = new Map();
 
 let inspectedTabId = 0;
-let inspectedURL = '';
 let inspectedHostname = '';
 let uidGenerator = 1;
 
@@ -112,7 +107,6 @@ const contentInspectorChannel = (( ) => {
 
     const onContentMessage = msg => {
         if ( msg.what === 'domLayoutFull' ) {
-            inspectedURL = msg.url;
             inspectedHostname = msg.hostname;
             renderDOMFull(msg);
         } else if ( msg.what === 'domLayoutIncremental' ) {
@@ -661,9 +655,9 @@ const revert = ( ) => {
 const toggleOn = ( ) => {
     dom.cl.add('#inspectors', 'dom');
     window.addEventListener('beforeunload', toggleOff);
-    document.addEventListener('tabIdChanged', onTabIdChanged);
-    domTree.addEventListener('click', onClicked, true);
-    domTree.addEventListener('mouseover', onMouseOver, true);
+    dom.on(document, 'tabIdChanged', onTabIdChanged);
+    dom.on(domTree, 'click', onClicked, true);
+    dom.on(domTree, 'mouseover', onMouseOver, true);
     dom.on('#domInspector .vExpandToggler', 'click', toggleVExpandView);
     dom.on('#domInspector .vCompactToggler', 'click', toggleVCompactView);
     dom.on('#domInspector .hCompactToggler', 'click', toggleHCompactView);
@@ -680,9 +674,9 @@ const toggleOff = ( ) => {
     dom.cl.remove('#inspectors', 'dom');
     shutdownInspector();
     window.removeEventListener('beforeunload', toggleOff);
-    document.removeEventListener('tabIdChanged', onTabIdChanged);
-    domTree.removeEventListener('click', onClicked, true);
-    domTree.removeEventListener('mouseover', onMouseOver, true);
+    dom.off(document, 'tabIdChanged', onTabIdChanged);
+    dom.off(domTree, 'click', onClicked, true);
+    dom.off(domTree, 'mouseover', onMouseOver, true);
     dom.off('#domInspector .vExpandToggler', 'click', toggleVExpandView);
     dom.off('#domInspector .vCompactToggler', 'click', toggleVCompactView);
     dom.off('#domInspector .hCompactToggler', 'click', toggleHCompactView);
@@ -700,7 +694,6 @@ const toggle = ( ) => {
     } else {
         toggleOff();
     }
-    logger.resize();
 };
 
 dom.on(showdomButton, 'click', toggle);