@browserless.io/browserless 2.34.0-beta-0 → 2.34.0

package/extensions/ublocklite/rulesets/scripting/scriptlet/ubol-tests.jsonl-edit-fetch-response.js

@@ -127,12 +127,19 @@ class JSONPath {
         const r = this.#compile(query, 0);
         if ( r === undefined ) { return; }
         if ( r.i !== query.length ) {
-            if ( query.startsWith('+=', r.i) ) {
+            let val;
+            if ( query.startsWith('=', r.i) ) {
+                if ( /^=repl\(.+\)$/.test(query.slice(r.i)) ) {
+                    r.modify = 'repl';
+                    val = query.slice(r.i+6, -1);
+                } else {
+                    val = query.slice(r.i+1);
+                }
+            } else if ( query.startsWith('+=', r.i) ) {
                 r.modify = '+';
-                r.i += 1;
+                val = query.slice(r.i+2);
             }
-            if ( query.startsWith('=', r.i) === false ) { return; }
-            try { r.rval = JSON.parse(query.slice(r.i+1)); }
+            try { r.rval = JSON.parse(val); }
             catch { return; }
         }
         this.#compiled = r;
@@ -145,28 +152,25 @@ class JSONPath {
         return paths;
     }
     apply(root) {
-        if ( this.valid === false ) { return 0; }
-        const { modify, rval } = this.#compiled;
-        this.#root = root;
+        if ( this.valid === false ) { return; }
+        const { rval } = this.#compiled;
+        this.#root = { '$': root };
         const paths = this.#evaluate(this.#compiled.steps, []);
-        const n = paths.length;
-        let i = n;
+        let i = paths.length
+        if ( i === 0 ) { this.#root = null; return; }
         while ( i-- ) {
             const { obj, key } = this.#resolvePath(paths[i]);
             if ( rval !== undefined ) {
-                if ( modify === '+' ) {
-                    this.#modifyVal(obj, key, rval);
-                } else {
-                    obj[key] = rval;
-                }
+                this.#modifyVal(obj, key);
             } else if ( Array.isArray(obj) && typeof key === 'number' ) {
                 obj.splice(key, 1);
             } else {
                 delete obj[key];
             }
         }
+        const result = this.#root['$'] ?? null;
         this.#root = null;
-        return n;
+        return result;
     }
     dump() {
         return JSON.stringify(this.#compiled);
@@ -191,8 +195,15 @@ class JSONPath {
         if ( query.length === 0 ) { return; }
         const steps = [];
         let c = query.charCodeAt(i);
-        steps.push({ mv: c === 0x24 /* $ */ ? this.#ROOT : this.#CURRENT });
-        if ( c === 0x24 /* $ */ || c === 0x40 /* @ */ ) { i += 1; }
+        if ( c === 0x24 /* $ */ ) {
+            steps.push({ mv: this.#ROOT });
+            i += 1;
+        } else if ( c === 0x40 /* @ */ ) {
+            steps.push({ mv: this.#CURRENT });
+            i += 1;
+        } else {
+            steps.push({ mv: i === 0 ? this.#ROOT : this.#CURRENT });
+        }
         let mv = this.#UNDEFINED;
         for (;;) {
             if ( i === query.length ) { break; }
@@ -254,7 +265,8 @@ class JSONPath {
             i = r.i + 1;
             mv = this.#UNDEFINED;
         }
-        if ( steps.length <= 1 ) { return; }
+        if ( steps.length === 0 ) { return; }
+        if ( mv !== this.#UNDEFINED ) { return; }
         return { steps, i };
     }
     #evaluate(steps, pathin) {
@@ -263,7 +275,7 @@ class JSONPath {
         for ( const step of steps ) {
             switch ( step.mv ) {
             case this.#ROOT:
-                resultset = [ [] ];
+                resultset = [ [ '$' ] ];
                 break;
             case this.#CURRENT:
                 resultset = [ pathin ];
@@ -486,13 +498,40 @@ class JSONPath {
         }
         if ( outcome ) { return k; }
     }
-    #modifyVal(obj, key, rval) {
-        const lval = obj[key];
-        if ( rval instanceof Object === false ) { return; }
-        if ( lval instanceof Object === false ) { return; }
-        if ( Array.isArray(lval) ) { return; }
-        for ( const [ k, v ] of Object.entries(rval) ) {
-            lval[k] = v;
+    #modifyVal(obj, key) {
+        const { modify, rval } = this.#compiled;
+        switch ( modify ) {
+        case undefined:
+            obj[key] = rval;
+            break;
+        case '+': {
+            if ( rval instanceof Object === false ) { return; }
+            const lval = obj[key];
+            if ( lval instanceof Object === false ) { return; }
+            if ( Array.isArray(lval) ) { return; }
+            for ( const [ k, v ] of Object.entries(rval) ) {
+                lval[k] = v;
+            }
+            break;
+        }
+        case 'repl': {
+            const lval = obj[key];
+            if ( typeof lval !== 'string' ) { return; }
+            if ( this.#compiled.re === undefined ) {
+                this.#compiled.re = null;
+                try {
+                    this.#compiled.re = rval.regex !== undefined
+                        ? new RegExp(rval.regex, rval.flags)
+                        : new RegExp(rval.pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
+                } catch {
+                }
+            }
+            if ( this.#compiled.re === null ) { return; }
+            obj[key] = lval.replace(this.#compiled.re, rval.replacement);
+            break;
+        }
+        default:
+            break;
         }
     }
 }
@@ -509,11 +548,12 @@ function jsonlEditFn(jsonp, text = '') {
             linesAfter.push(lineBefore);
             continue;
         }
-        if ( jsonp.apply(obj) === 0 ) {
+        const objAfter = jsonp.apply(obj);
+        if ( objAfter === undefined ) {
             linesAfter.push(lineBefore);
             continue;
         }
-        const lineAfter = safe.JSON_stringify(obj);
+        const lineAfter = safe.JSON_stringify(objAfter);
         linesAfter.push(lineAfter);
     }
     return linesAfter.join(lineSeparator);

package/extensions/ublocklite/rulesets/scripting/scriptlet/ubol-tests.jsonl-edit-xhr-response.js

@@ -119,12 +119,19 @@ class JSONPath {
         const r = this.#compile(query, 0);
         if ( r === undefined ) { return; }
         if ( r.i !== query.length ) {
-            if ( query.startsWith('+=', r.i) ) {
+            let val;
+            if ( query.startsWith('=', r.i) ) {
+                if ( /^=repl\(.+\)$/.test(query.slice(r.i)) ) {
+                    r.modify = 'repl';
+                    val = query.slice(r.i+6, -1);
+                } else {
+                    val = query.slice(r.i+1);
+                }
+            } else if ( query.startsWith('+=', r.i) ) {
                 r.modify = '+';
-                r.i += 1;
+                val = query.slice(r.i+2);
             }
-            if ( query.startsWith('=', r.i) === false ) { return; }
-            try { r.rval = JSON.parse(query.slice(r.i+1)); }
+            try { r.rval = JSON.parse(val); }
             catch { return; }
         }
         this.#compiled = r;
@@ -137,28 +144,25 @@ class JSONPath {
         return paths;
     }
     apply(root) {
-        if ( this.valid === false ) { return 0; }
-        const { modify, rval } = this.#compiled;
-        this.#root = root;
+        if ( this.valid === false ) { return; }
+        const { rval } = this.#compiled;
+        this.#root = { '$': root };
         const paths = this.#evaluate(this.#compiled.steps, []);
-        const n = paths.length;
-        let i = n;
+        let i = paths.length
+        if ( i === 0 ) { this.#root = null; return; }
         while ( i-- ) {
             const { obj, key } = this.#resolvePath(paths[i]);
             if ( rval !== undefined ) {
-                if ( modify === '+' ) {
-                    this.#modifyVal(obj, key, rval);
-                } else {
-                    obj[key] = rval;
-                }
+                this.#modifyVal(obj, key);
             } else if ( Array.isArray(obj) && typeof key === 'number' ) {
                 obj.splice(key, 1);
             } else {
                 delete obj[key];
             }
         }
+        const result = this.#root['$'] ?? null;
         this.#root = null;
-        return n;
+        return result;
     }
     dump() {
         return JSON.stringify(this.#compiled);
@@ -183,8 +187,15 @@ class JSONPath {
         if ( query.length === 0 ) { return; }
         const steps = [];
         let c = query.charCodeAt(i);
-        steps.push({ mv: c === 0x24 /* $ */ ? this.#ROOT : this.#CURRENT });
-        if ( c === 0x24 /* $ */ || c === 0x40 /* @ */ ) { i += 1; }
+        if ( c === 0x24 /* $ */ ) {
+            steps.push({ mv: this.#ROOT });
+            i += 1;
+        } else if ( c === 0x40 /* @ */ ) {
+            steps.push({ mv: this.#CURRENT });
+            i += 1;
+        } else {
+            steps.push({ mv: i === 0 ? this.#ROOT : this.#CURRENT });
+        }
         let mv = this.#UNDEFINED;
         for (;;) {
             if ( i === query.length ) { break; }
@@ -246,7 +257,8 @@ class JSONPath {
             i = r.i + 1;
             mv = this.#UNDEFINED;
         }
-        if ( steps.length <= 1 ) { return; }
+        if ( steps.length === 0 ) { return; }
+        if ( mv !== this.#UNDEFINED ) { return; }
         return { steps, i };
     }
     #evaluate(steps, pathin) {
@@ -255,7 +267,7 @@ class JSONPath {
         for ( const step of steps ) {
             switch ( step.mv ) {
             case this.#ROOT:
-                resultset = [ [] ];
+                resultset = [ [ '$' ] ];
                 break;
             case this.#CURRENT:
                 resultset = [ pathin ];
@@ -478,13 +490,40 @@ class JSONPath {
         }
         if ( outcome ) { return k; }
     }
-    #modifyVal(obj, key, rval) {
-        const lval = obj[key];
-        if ( rval instanceof Object === false ) { return; }
-        if ( lval instanceof Object === false ) { return; }
-        if ( Array.isArray(lval) ) { return; }
-        for ( const [ k, v ] of Object.entries(rval) ) {
-            lval[k] = v;
+    #modifyVal(obj, key) {
+        const { modify, rval } = this.#compiled;
+        switch ( modify ) {
+        case undefined:
+            obj[key] = rval;
+            break;
+        case '+': {
+            if ( rval instanceof Object === false ) { return; }
+            const lval = obj[key];
+            if ( lval instanceof Object === false ) { return; }
+            if ( Array.isArray(lval) ) { return; }
+            for ( const [ k, v ] of Object.entries(rval) ) {
+                lval[k] = v;
+            }
+            break;
+        }
+        case 'repl': {
+            const lval = obj[key];
+            if ( typeof lval !== 'string' ) { return; }
+            if ( this.#compiled.re === undefined ) {
+                this.#compiled.re = null;
+                try {
+                    this.#compiled.re = rval.regex !== undefined
+                        ? new RegExp(rval.regex, rval.flags)
+                        : new RegExp(rval.pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
+                } catch {
+                }
+            }
+            if ( this.#compiled.re === null ) { return; }
+            obj[key] = lval.replace(this.#compiled.re, rval.replacement);
+            break;
+        }
+        default:
+            break;
         }
     }
 }
@@ -501,11 +540,12 @@ function jsonlEditFn(jsonp, text = '') {
             linesAfter.push(lineBefore);
             continue;
         }
-        if ( jsonp.apply(obj) === 0 ) {
+        const objAfter = jsonp.apply(obj);
+        if ( objAfter === undefined ) {
             linesAfter.push(lineBefore);
             continue;
         }
-        const lineAfter = safe.JSON_stringify(obj);
+        const lineAfter = safe.JSON_stringify(objAfter);
         linesAfter.push(lineAfter);
     }
     return linesAfter.join(lineSeparator);

package/extensions/ublocklite/rulesets/scripting/scriptlet/vie-1.abort-current-script.js

@@ -372,7 +372,7 @@ function getRandomTokenFn() {
 
 const scriptletGlobals = {}; // eslint-disable-line
 const argsList = [["Promise","detectedAdblock"],["Object.defineProperty","ADMStorageFileCDN"],["$","aff"],["document.addEventListener","popunder"],["$","arrDirectLink"],["document.getElementById","openPop"],["document.addEventListener","open"],["jQuery","popup"],["WebAssembly","globalThis"],["navigator","devtoolsDetector"],["Symbol","break;case $"],["document.createElement",";break;case"],["eval","$._Eu"],["setTimeout","ad_block"],["setTimeout","Aff"],["jQuery","Popup"],["setInterval","offsetHeight"],["document.addEventListener","Click"],["document.getElementsByClassName","reading-content"],["document.createElement","optad"],["JSON.parse","break;case $."],["$","PopUnder"],["jQuery","click_time"],["JSON","fromCharCode"],["document.createElement","script"],["addEvent","popu"],["$","p0pUpRandom"],["document.querySelectorAll","popMagic"],["document.getElementById","myModal"],["eval"],["Promise","break;case"],["document.addEventListener","popup"],["$","window.open"],["jQuery","window.open"],["document.addEventListener","runAllDetections"],["jQuery","open"],["WebAssembly","instantiate"],["document.write","snow"],["document.addEventListener","shopee"],["setTimeout","open"],["jQuery","click_ads"],["setTimeout","window.location"]];
-const hostnamesMap = new Map([["10gb.vn",0],["cafef.vn",1],["gamek.vn",1],["genk.vn",1],["kenh14.vn",1],["soha.vn",1],["tuoitre.vn",1],["afamily.vn",1],["thanhnien.vn",1],["childish2x2.fun",2],["dualeotruyenpm.com",[3,36]],["m.blogtruyenmoi.com",3],["economic45882.shop",4],["cdn4.tiptoe34x1.fun",4],["freeplayervideo.com",5],["abysscdn.com",5],["player-cdn.com",5],["playhydrax.com",5],["game8.vn",6],["cunghocvui.com",6],["sexhd88.online",6],["gocmod.com",7],["goctruyentranhvui17.com",8],["nettruyenar.com",8],["sextop1.show",8],["hhvsub1.com",8],["vn5.sexviet88.xyz",[8,36]],["gotphim.com",9],["hh3dhay.life",[10,11,12]],["tram3d.com",11],["tram3d.me",12],["animevietsub.cam",12],["imail.edu.vn",[13,14]],["motchill18.com",14],["trumtruyen.live",14],["ios.codevn.net",[15,16]],["javhd.shop",17],["laophatgia.net",18],["linkneverdie.net",19],["linkneverdie.top",19],["linkneverdie2.com",19],["lrepacks.net",20],["lxmanga.my",21],["motchilltvphim.com",22],["nettruyenvia.com",23],["p.thoctv.com",24],["phimmoi.sale",25],["phimtho.net",26],["rphang.online",27],["misskon.com",27],["saigon24.net",28],["truyen247.pro",29],["truyenqqtto.com",30],["haysex.site",30],["truyensextv.com",31],["www.sieutamphim.org",[31,38]],["tusachmanga.com",32],["vailonxx.vip",33],["vanphatelectric.com",34],["viet69.hot",35],["vlxx.bz",36],["yurineko.my",36],["haysex.ai",36],["cliphot69.shop",36],["doctruyen3qui12.pro",36],["ihentai.cloud",36],["hentaivc.net",36],["buomtv.live",36],["truyenvn.shop",36],["javtiful.com",36],["quatvn.love",36],["vn61phimsexhay.com",36],["phim18hdxx.com",36],["sexmup3x.net",36],["demo.14412882.com",36],["cliphot69.pics",36],["hhtq5.vip",36],["sexdiary.club",36],["vn2.xvideos69.xxx",36],["umetruyenhay.com",36],["damconuong.run",36],["truyenqqgo.com",36],["clipsexsub3x.net",36],["sayhentaii.art",36],["vungoctuan.vn",37],["www.toptruyentv8.com",39],["www.truyen35zz.com",40],["xnxx-sex-videos.com",41]]);
+const hostnamesMap = new Map([["10gb.vn",0],["cafef.vn",1],["gamek.vn",1],["genk.vn",1],["kenh14.vn",1],["soha.vn",1],["tuoitre.vn",1],["afamily.vn",1],["thanhnien.vn",1],["childish2x2.fun",2],["dualeotruyenpm.com",[3,36]],["m.blogtruyenmoi.com",3],["economic45882.shop",4],["cdn4.tiptoe34x1.fun",4],["freeplayervideo.com",5],["abysscdn.com",5],["player-cdn.com",5],["playhydrax.com",5],["game8.vn",6],["cunghocvui.com",6],["sexhd88.online",6],["gocmod.com",7],["goctruyentranhvui17.com",8],["nettruyenar.com",8],["sextop1.show",8],["hhvsub1.com",8],["vn5.sexviet88.xyz",[8,36]],["gotphim.com",9],["hh3dhay.life",[10,11,12]],["tram3d.com",11],["tram3d.me",12],["animevietsub.cam",12],["imail.edu.vn",[13,14]],["motchill19.com",14],["trumtruyen.live",14],["ios.codevn.net",[15,16]],["javhd.shop",17],["laophatgia.net",18],["linkneverdie.net",19],["linkneverdie.top",19],["linkneverdie2.com",19],["lrepacks.net",20],["lxmanga.my",21],["motchilltvphim.com",22],["nettruyenvia.com",23],["p.thoctv.com",24],["phimmoi.sale",25],["phimtho.net",26],["rphang.online",27],["misskon.com",27],["saigon24.net",28],["truyen247.pro",29],["truyenqqtto.com",30],["haysex.site",30],["truyensextv.com",31],["www.sieutamphim.org",[31,38]],["tusachmanga.com",32],["vailonxx.vip",33],["vanphatelectric.com",34],["viet69.free",35],["vlxx.bz",36],["yurineko.my",36],["heohay.net",36],["cliphot69.shop",36],["doctruyen3qui12.pro",36],["ihentai.cloud",36],["hentaivc.net",36],["buomtv.live",36],["truyenvn.shop",36],["javtiful.com",36],["quatvn.love",36],["vn65phimsexhay.com",36],["phim18hdxx.com",36],["sexmup3x.net",36],["demo.14412882.com",36],["cliphot69.pics",36],["hhtq5.vip",36],["sexdiary.club",36],["vn2.xvideos69.xxx",36],["umetruyenhay.com",36],["damconuong.run",36],["truyenqqgo.com",36],["clipsexsub3x.net",36],["sayhentaii.art",36],["vungoctuan.vn",37],["www.toptruyentv8.com",39],["www.truyen35zz.com",40],["xnxx-sex-videos.com",41]]);
 const exceptionsMap = new Map([]);
 const hasEntities = false;
 const hasAncestors = false;

package/extensions/ublocklite/rulesets/scripting/scriptlet/vie-1.abort-on-property-read.js

@@ -288,8 +288,8 @@ function getRandomTokenFn() {
 /******************************************************************************/
 
 const scriptletGlobals = {}; // eslint-disable-line
-const argsList = [["_0x3f9b"],["parseInt"],["adpiaListUrl"],["Math.round"],["pushOnPage"],["sessionStorage"],["ads"],["adsPlayer"],["adsPopupPlayer"],["adsTvc"],["keyPlayer"],["Cookies"],["affUrls"],["document.cookie"],["nFNcksmwU"],["open"],["oneClick"],["localStorage"],["sp"],["adsRedirectPopups"],["adtimaConfig"]];
-const hostnamesMap = new Map([["animevietsubs.net",0],["aoe.vn",1],["audiotruyenfull.com",2],["javnong.cc",3],["linkneverdie.net",4],["linkneverdie.top",4],["linkneverdie2.com",4],["motchilll.fit",5],["plcdn.xyz",[6,7,8,9,10]],["sexmup3x.net",11],["thichxemphim1.site",12],["truyensieuhay.com",13],["hayhaytv.site",13],["quangcaoyenbai.com",13],["phimchill.life",13],["thuvienhd.biz",13],["tv.tvhayhd.org",13],["thefaplive.com",13],["mv.dailyphimz.com",13],["mv.phimbathu.one",13],["sexhihi.bar",13],["anime47.live",13],["teamlanhlung8.shop",[13,17]],["hdcphim.us",13],["veryfiles.com",14],["viettoons.tv",15],["mv.phimmoiaz.cc",15],["anime11.site",15],["anh.moe",15],["maclife.io",15],["xemphimjav.us",[15,17]],["hoctot.hocmai.vn",15],["bluphim.uk.com",15],["samtruyentranh.com",15],["truyenfull.vision",15],["player.phimapi.com",15],["noitu.site",15],["vinaurl.net",16],["www.motchill18.com",17],["motchill18.com",17],["xnhau.sh",17],["www.nettruyenupp.com",18],["xoilaciik.cc",19],["znews.vn",20]]);
+const argsList = [["_0x3f9b"],["parseInt"],["adpiaListUrl"],["Math.round"],["pushOnPage"],["localStorage"],["sessionStorage"],["ads"],["adsPlayer"],["adsPopupPlayer"],["adsTvc"],["keyPlayer"],["Cookies"],["affUrls"],["document.cookie"],["nFNcksmwU"],["open"],["oneClick"],["sp"],["adsRedirectPopups"],["adtimaConfig"]];
+const hostnamesMap = new Map([["animevietsubs.net",0],["aoe.vn",1],["audiotruyenfull.com",2],["javnong.cc",3],["linkneverdie.net",4],["linkneverdie.top",4],["linkneverdie2.com",4],["motchill19.com",5],["xnhau.sh",5],["teamlanhlung8.shop",[5,14]],["xemphimjav.us",[5,16]],["motchillk.to",6],["plcdn.xyz",[7,8,9,10,11]],["sexmup3x.net",12],["thichxemphim.live",13],["truyensieuhay.com",14],["hayhaytv.site",14],["quangcaoyenbai.com",14],["phimchill.life",14],["thuvienhd.biz",14],["tv.tvhayhd.org",14],["thefaplive.com",14],["mv.dailyphimz.com",14],["mv.phimbathu.one",14],["sexhihi.bar",14],["anime47.live",14],["hdcphim.us",14],["forum.timfshare.com",14],["veryfiles.com",15],["viettoons.tv",16],["mv.phimmoiaz.cc",16],["anime11.site",16],["anh.moe",16],["maclife.io",16],["hoctot.hocmai.vn",16],["bluphim.uk.com",16],["samtruyentranh.com",16],["truyenfull.vision",16],["player.phimapi.com",16],["noitu.site",16],["vinaurl.net",17],["www.nettruyenupp.com",18],["xoilacvvy.cc",19],["znews.vn",20]]);
 const exceptionsMap = new Map([]);
 const hasEntities = false;
 const hasAncestors = false;