@browserless.io/browserless 2.27.0 → 2.28.0

package/extensions/ublocklite/rulesets/scripting/scriptlet/fra-0.prevent-fetch.js

@@ -26,17 +26,28 @@
 // Isolate from global scope
 
 // Start of local scope
-(function uBOL_noFetchIf() {
+(function uBOL_preventFetch() {
 
 /******************************************************************************/
 
-function noFetchIf(
+function preventFetch(...args) {
+    preventFetchFn(false, ...args);
+}
+
+function preventFetchFn(
+    trusted = false,
     propsToMatch = '',
     responseBody = '',
     responseType = ''
 ) {
     const safe = safeSelf();
-    const logPrefix = safe.makeLogPrefix('prevent-fetch', propsToMatch, responseBody, responseType);
+    const scriptletName = `${trusted ? 'trusted-' : ''}prevent-fetch`;
+    const logPrefix = safe.makeLogPrefix(
+        scriptletName,
+        propsToMatch,
+        responseBody,
+        responseType
+    );
     const needles = [];
     for ( const condition of safe.String_split.call(propsToMatch, /\s+/) ) {
         if ( condition === '' ) { continue; }
@@ -112,7 +123,7 @@ function noFetchIf(
         if ( proceed ) {
             return context.reflect();
         }
-        return Promise.resolve(generateContentFn(false, responseBody)).then(text => {
+        return Promise.resolve(generateContentFn(trusted, responseBody)).then(text => {
             safe.uboLog(logPrefix, `Prevented with response "${text}"`);
             const response = new Response(text, {
                 headers: {
@@ -530,7 +541,7 @@ if ( hasAncestors ) {
 // Apply scriplets
 for ( const i of todoIndices ) {
     if ( tonotdoIndices.has(i) ) { continue; }
-    try { noFetchIf(...argsList[i]); }
+    try { preventFetch(...argsList[i]); }
     catch { }
 }
 

package/extensions/ublocklite/rulesets/scripting/scriptlet/hun-0.prevent-fetch.js

@@ -26,17 +26,28 @@
 // Isolate from global scope
 
 // Start of local scope
-(function uBOL_noFetchIf() {
+(function uBOL_preventFetch() {
 
 /******************************************************************************/
 
-function noFetchIf(
+function preventFetch(...args) {
+    preventFetchFn(false, ...args);
+}
+
+function preventFetchFn(
+    trusted = false,
     propsToMatch = '',
     responseBody = '',
     responseType = ''
 ) {
     const safe = safeSelf();
-    const logPrefix = safe.makeLogPrefix('prevent-fetch', propsToMatch, responseBody, responseType);
+    const scriptletName = `${trusted ? 'trusted-' : ''}prevent-fetch`;
+    const logPrefix = safe.makeLogPrefix(
+        scriptletName,
+        propsToMatch,
+        responseBody,
+        responseType
+    );
     const needles = [];
     for ( const condition of safe.String_split.call(propsToMatch, /\s+/) ) {
         if ( condition === '' ) { continue; }
@@ -112,7 +123,7 @@ function noFetchIf(
         if ( proceed ) {
             return context.reflect();
         }
-        return Promise.resolve(generateContentFn(false, responseBody)).then(text => {
+        return Promise.resolve(generateContentFn(trusted, responseBody)).then(text => {
             safe.uboLog(logPrefix, `Prevented with response "${text}"`);
             const response = new Response(text, {
                 headers: {
@@ -530,7 +541,7 @@ if ( hasAncestors ) {
 // Apply scriplets
 for ( const i of todoIndices ) {
     if ( tonotdoIndices.has(i) ) { continue; }
-    try { noFetchIf(...argsList[i]); }
+    try { preventFetch(...argsList[i]); }
     catch { }
 }
 

package/extensions/ublocklite/rulesets/scripting/scriptlet/idn-0.prevent-fetch.js

@@ -26,17 +26,28 @@
 // Isolate from global scope
 
 // Start of local scope
-(function uBOL_noFetchIf() {
+(function uBOL_preventFetch() {
 
 /******************************************************************************/
 
-function noFetchIf(
+function preventFetch(...args) {
+    preventFetchFn(false, ...args);
+}
+
+function preventFetchFn(
+    trusted = false,
     propsToMatch = '',
     responseBody = '',
     responseType = ''
 ) {
     const safe = safeSelf();
-    const logPrefix = safe.makeLogPrefix('prevent-fetch', propsToMatch, responseBody, responseType);
+    const scriptletName = `${trusted ? 'trusted-' : ''}prevent-fetch`;
+    const logPrefix = safe.makeLogPrefix(
+        scriptletName,
+        propsToMatch,
+        responseBody,
+        responseType
+    );
     const needles = [];
     for ( const condition of safe.String_split.call(propsToMatch, /\s+/) ) {
         if ( condition === '' ) { continue; }
@@ -112,7 +123,7 @@ function noFetchIf(
         if ( proceed ) {
             return context.reflect();
         }
-        return Promise.resolve(generateContentFn(false, responseBody)).then(text => {
+        return Promise.resolve(generateContentFn(trusted, responseBody)).then(text => {
             safe.uboLog(logPrefix, `Prevented with response "${text}"`);
             const response = new Response(text, {
                 headers: {
@@ -530,7 +541,7 @@ if ( hasAncestors ) {
 // Apply scriplets
 for ( const i of todoIndices ) {
     if ( tonotdoIndices.has(i) ) { continue; }
-    try { noFetchIf(...argsList[i]); }
+    try { preventFetch(...argsList[i]); }
     catch { }
 }
 

package/extensions/ublocklite/rulesets/scripting/scriptlet/idn-0.prevent-window-open.js

@@ -391,7 +391,7 @@ function safeSelf() {
 
 const scriptletGlobals = {}; // eslint-disable-line
 const argsList = [[]];
-const hostnamesMap = new Map([["anichin.top",0],["animekompi.vip",0],["indobo.com",0],["jurnalistekno.id",0],["kimcilonly.site",0],["kiryuu.id",0],["kiryuu.org",0],["komikcast02.com",0],["njavtv.com",0],["subindojav.cc",0]]);
+const hostnamesMap = new Map([["anichin.top",0],["animekompi.vip",0],["indobo.com",0],["jurnalistekno.id",0],["kimcilonly.site",0],["kiryuu.id",0],["kiryuu.org",0],["kiryuu01.com",0],["komikcast02.com",0],["njavtv.com",0],["subindojav.cc",0]]);
 const exceptionsMap = new Map([]);
 const hasEntities = false;
 const hasAncestors = false;

package/extensions/ublocklite/rulesets/scripting/scriptlet/irn-0.json-prune.js

@@ -425,8 +425,8 @@ function getRandomTokenFn() {
 /******************************************************************************/
 
 const scriptletGlobals = {}; // eslint-disable-line
-const argsList = [["trace data.vast_url data.ads"],["result.commercialUrl result.watermark"],["result.adsText result.adsLink"],["data.geocampaigns"],["data","data.vast data.content data.ad_id"],["body.productStatus"]];
-const hostnamesMap = new Map([["filmnet.ir",0],["play.namava.ir",1],["skyroom.online",2],["app.snapp.taxi",3],["tmk.ir",4],["player.telewebion.com",5]]);
+const argsList = [["props.children.[].props.children.[].props.children.props.advertisment"],["trace data.vast_url data.ads"],["result.commercialUrl result.watermark"],["result.adsText result.adsLink"],["data.geocampaigns"],["data","data.vast data.content data.ad_id"],["body.productStatus"]];
+const hostnamesMap = new Map([["fam.ir",0],["filmnet.ir",1],["play.namava.ir",2],["skyroom.online",3],["app.snapp.taxi",4],["tmk.ir",5],["player.telewebion.com",6]]);
 const exceptionsMap = new Map([]);
 const hasEntities = false;
 const hasAncestors = false;

package/extensions/ublocklite/rulesets/scripting/scriptlet/irn-0.prevent-fetch.js

@@ -26,17 +26,28 @@
 // Isolate from global scope
 
 // Start of local scope
-(function uBOL_noFetchIf() {
+(function uBOL_preventFetch() {
 
 /******************************************************************************/
 
-function noFetchIf(
+function preventFetch(...args) {
+    preventFetchFn(false, ...args);
+}
+
+function preventFetchFn(
+    trusted = false,
     propsToMatch = '',
     responseBody = '',
     responseType = ''
 ) {
     const safe = safeSelf();
-    const logPrefix = safe.makeLogPrefix('prevent-fetch', propsToMatch, responseBody, responseType);
+    const scriptletName = `${trusted ? 'trusted-' : ''}prevent-fetch`;
+    const logPrefix = safe.makeLogPrefix(
+        scriptletName,
+        propsToMatch,
+        responseBody,
+        responseType
+    );
     const needles = [];
     for ( const condition of safe.String_split.call(propsToMatch, /\s+/) ) {
         if ( condition === '' ) { continue; }
@@ -112,7 +123,7 @@ function noFetchIf(
         if ( proceed ) {
             return context.reflect();
         }
-        return Promise.resolve(generateContentFn(false, responseBody)).then(text => {
+        return Promise.resolve(generateContentFn(trusted, responseBody)).then(text => {
             safe.uboLog(logPrefix, `Prevented with response "${text}"`);
             const response = new Response(text, {
                 headers: {
@@ -530,7 +541,7 @@ if ( hasAncestors ) {
 // Apply scriplets
 for ( const i of todoIndices ) {
     if ( tonotdoIndices.has(i) ) { continue; }
-    try { noFetchIf(...argsList[i]); }
+    try { preventFetch(...argsList[i]); }
     catch { }
 }
 

package/extensions/ublocklite/rulesets/scripting/scriptlet/isr-0.prevent-fetch.js

@@ -26,17 +26,28 @@
 // Isolate from global scope
 
 // Start of local scope
-(function uBOL_noFetchIf() {
+(function uBOL_preventFetch() {
 
 /******************************************************************************/
 
-function noFetchIf(
+function preventFetch(...args) {
+    preventFetchFn(false, ...args);
+}
+
+function preventFetchFn(
+    trusted = false,
     propsToMatch = '',
     responseBody = '',
     responseType = ''
 ) {
     const safe = safeSelf();
-    const logPrefix = safe.makeLogPrefix('prevent-fetch', propsToMatch, responseBody, responseType);
+    const scriptletName = `${trusted ? 'trusted-' : ''}prevent-fetch`;
+    const logPrefix = safe.makeLogPrefix(
+        scriptletName,
+        propsToMatch,
+        responseBody,
+        responseType
+    );
     const needles = [];
     for ( const condition of safe.String_split.call(propsToMatch, /\s+/) ) {
         if ( condition === '' ) { continue; }
@@ -112,7 +123,7 @@ function noFetchIf(
         if ( proceed ) {
             return context.reflect();
         }
-        return Promise.resolve(generateContentFn(false, responseBody)).then(text => {
+        return Promise.resolve(generateContentFn(trusted, responseBody)).then(text => {
             safe.uboLog(logPrefix, `Prevented with response "${text}"`);
             const response = new Response(text, {
                 headers: {
@@ -530,7 +541,7 @@ if ( hasAncestors ) {
 // Apply scriplets
 for ( const i of todoIndices ) {
     if ( tonotdoIndices.has(i) ) { continue; }
-    try { noFetchIf(...argsList[i]); }
+    try { preventFetch(...argsList[i]); }
     catch { }
 }