deploy: update dist v1.9.101

AdguardTeam · Nov 30, 2023 · 223b8a3 · 223b8a3
1 parent 4d6350d
commit 223b8a3
Show file tree

Hide file tree

Showing 9 changed files with 160 additions and 13 deletions.
diff --git a/dist/build.txt b/dist/build.txt
@@ -1 +1 @@
-version=1.9.96
+version=1.9.101
diff --git a/dist/redirect-files/googletagservices-gpt.js b/dist/redirect-files/googletagservices-gpt.js
@@ -312,6 +312,7 @@
             setCookieOptions: noopThis,
             setForceSafeFrame: noopThis,
             setLocation: noopThis,
+            setPrivacySettings: noopThis,
             setPublisherProvidedId: noopThis,
             setRequestNonPersonalizedAds: noopThis,
             setSafeFrameConfig: noopThis,

diff --git a/dist/redirects.json b/dist/redirects.json
diff --git a/dist/redirects.yml b/dist/redirects.yml
@@ -1,6 +1,6 @@
 #
 #    AdGuard Scriptlets (Redirects Source)
-#    Version 1.9.96
+#    Version 1.9.101
 #
 - title: 1x1-transparent.gif
   added: v1.0.4
@@ -127,6 +127,8 @@
     ```adblock
     ||example.org/geo/location$xmlhttprequest,redirect=noopjson
     ```
+  aliases:
+    - noop.json
   file: noopjson.json
   contentType: application/json
   content: '{}'
@@ -2507,6 +2509,7 @@
                 setCookieOptions: noopThis,
                 setForceSafeFrame: noopThis,
                 setLocation: noopThis,
+                setPrivacySettings: noopThis,
                 setPublisherProvidedId: noopThis,
                 setRequestNonPersonalizedAds: noopThis,
                 setSafeFrameConfig: noopThis,

diff --git a/dist/scriptlets.corelibs.json b/dist/scriptlets.corelibs.json
diff --git a/dist/scriptlets.js b/dist/scriptlets.js
@@ -1,7 +1,7 @@
 
 /**
  * AdGuard Scriptlets
- * Version 1.9.96
+ * Version 1.9.101
  */
 
 (function () {
@@ -1184,6 +1184,23 @@
         }
       });
 
+      // In the case if responseType is opaque
+      // mock response' body, status & statusText to avoid adb checks
+      // https://github.com/AdguardTeam/Scriptlets/issues/364
+      if (responseType === 'opaque') {
+        Object.defineProperties(response, {
+          body: {
+            value: null
+          },
+          status: {
+            value: 0
+          },
+          statusText: {
+            value: ''
+          }
+        });
+      }
+
       // eslint-disable-next-line consistent-return
       return Promise.resolve(response);
     };
@@ -6402,6 +6419,7 @@
      *   defaults to `emptyObj`. Possible values:
      *     - `emptyObj` — empty object
      *     - `emptyArr` — empty array
+     *     - `emptyStr` — empty string
      * - `responseType` — optional, string for defining response type,
      *   original response type is used if not specified. Possible values:
      *     - `default`
@@ -6478,6 +6496,8 @@
         strResponseBody = '{}';
       } else if (responseBody === 'emptyArr') {
         strResponseBody = '[]';
+      } else if (responseBody === 'emptyStr') {
+        strResponseBody = '';
       } else {
         logMessage(source, "Invalid responseBody parameter: '".concat(responseBody, "'"));
         return;
@@ -10158,7 +10178,8 @@
       ubo: 'noop.js',
       abp: 'blank-js'
     }, {
-      adg: 'noopjson'
+      adg: 'noopjson',
+      ubo: 'noop.json'
     }, {
       adg: 'nooptext',
       ubo: 'noop.txt',
@@ -11999,6 +12020,7 @@
         setCookieOptions: noopThis,
         setForceSafeFrame: noopThis,
         setLocation: noopThis,
+        setPrivacySettings: noopThis,
         setPublisherProvidedId: noopThis,
         setRequestNonPersonalizedAds: noopThis,
         setSafeFrameConfig: noopThis,
@@ -16895,6 +16917,7 @@
       "noop.js": "noopjs.js",
       "blank-js": "noopjs.js",
       noopjson: "noopjson.json",
+      "noop.json": "noopjson.json",
       nooptext: "nooptext.js",
       "noop.txt": "nooptext.js",
       "blank-text": "nooptext.js",
@@ -17044,6 +17067,8 @@
       convertAdgRedirectToUbo
     };
 
+    var version = "1.9.101";
+
     function abortCurrentInlineScript(source, args) {
       function abortCurrentInlineScript(source, property, search) {
         var searchRegexp = toRegExp(search);
@@ -20841,6 +20866,19 @@
             value: responseType
           }
         });
+        if (responseType === "opaque") {
+          Object.defineProperties(response, {
+            body: {
+              value: null
+            },
+            status: {
+              value: 0
+            },
+            statusText: {
+              value: ""
+            }
+          });
+        }
         return Promise.resolve(response);
       }
       var updatedArgs = args ? [].concat(source).concat(args) : [source];
@@ -21757,6 +21795,8 @@
           strResponseBody = "{}";
         } else if (responseBody === "emptyArr") {
           strResponseBody = "[]";
+        } else if (responseBody === "emptyStr") {
+          strResponseBody = "";
         } else {
           logMessage(source, "Invalid responseBody parameter: '".concat(responseBody, "'"));
           return;
@@ -21922,6 +21962,19 @@
             value: responseType
           }
         });
+        if (responseType === "opaque") {
+          Object.defineProperties(response, {
+            body: {
+              value: null
+            },
+            status: {
+              value: 0
+            },
+            statusText: {
+              value: ""
+            }
+          });
+        }
         return Promise.resolve(response);
       }
       function modifyResponse(origResponse) {
@@ -24788,6 +24841,19 @@
             value: responseType
           }
         });
+        if (responseType === "opaque") {
+          Object.defineProperties(response, {
+            body: {
+              value: null
+            },
+            status: {
+              value: 0
+            },
+            statusText: {
+              value: ""
+            }
+          });
+        }
         return Promise.resolve(response);
       }
       function getPropertyInChain(base, chain) {
@@ -28606,7 +28672,8 @@
         convertAbpToAdg: convertAbpSnippetToAdg,
         convertScriptletToAdg,
         convertAdgToUbo: convertAdgScriptletToUbo,
-        redirects
+        redirects,
+        SCRIPTLETS_VERSION: version
       };
     }();
 

diff --git a/dist/umd/scriptlets.d.ts b/dist/umd/scriptlets.d.ts
@@ -1,5 +1,10 @@
 declare module '@adguard/scriptlets' {
 
+    /**
+     * Scriptlets version
+     */
+    const SCRIPTLETS_VERSION: string;
+
     /**
      * Scriptlet properties
      */

diff --git a/dist/umd/scriptlets.umd.js b/dist/umd/scriptlets.umd.js
@@ -1,7 +1,7 @@
 
 /**
  * AdGuard Scriptlets
- * Version 1.9.96
+ * Version 1.9.101
  */
 
 (function (factory) {
@@ -1186,6 +1186,23 @@
         }
       });
 
+      // In the case if responseType is opaque
+      // mock response' body, status & statusText to avoid adb checks
+      // https://github.com/AdguardTeam/Scriptlets/issues/364
+      if (responseType === 'opaque') {
+        Object.defineProperties(response, {
+          body: {
+            value: null
+          },
+          status: {
+            value: 0
+          },
+          statusText: {
+            value: ''
+          }
+        });
+      }
+
       // eslint-disable-next-line consistent-return
       return Promise.resolve(response);
     };
@@ -6404,6 +6421,7 @@
      *   defaults to `emptyObj`. Possible values:
      *     - `emptyObj` — empty object
      *     - `emptyArr` — empty array
+     *     - `emptyStr` — empty string
      * - `responseType` — optional, string for defining response type,
      *   original response type is used if not specified. Possible values:
      *     - `default`
@@ -6480,6 +6498,8 @@
         strResponseBody = '{}';
       } else if (responseBody === 'emptyArr') {
         strResponseBody = '[]';
+      } else if (responseBody === 'emptyStr') {
+        strResponseBody = '';
       } else {
         logMessage(source, "Invalid responseBody parameter: '".concat(responseBody, "'"));
         return;
@@ -10160,7 +10180,8 @@
       ubo: 'noop.js',
       abp: 'blank-js'
     }, {
-      adg: 'noopjson'
+      adg: 'noopjson',
+      ubo: 'noop.json'
     }, {
       adg: 'nooptext',
       ubo: 'noop.txt',
@@ -12001,6 +12022,7 @@
         setCookieOptions: noopThis,
         setForceSafeFrame: noopThis,
         setLocation: noopThis,
+        setPrivacySettings: noopThis,
         setPublisherProvidedId: noopThis,
         setRequestNonPersonalizedAds: noopThis,
         setSafeFrameConfig: noopThis,
@@ -16897,6 +16919,7 @@
       "noop.js": "noopjs.js",
       "blank-js": "noopjs.js",
       noopjson: "noopjson.json",
+      "noop.json": "noopjson.json",
       nooptext: "nooptext.js",
       "noop.txt": "nooptext.js",
       "blank-text": "nooptext.js",
@@ -17046,6 +17069,8 @@
       convertAdgRedirectToUbo
     };
 
+    var version = "1.9.101";
+
     function abortCurrentInlineScript(source, args) {
       function abortCurrentInlineScript(source, property, search) {
         var searchRegexp = toRegExp(search);
@@ -20843,6 +20868,19 @@
             value: responseType
           }
         });
+        if (responseType === "opaque") {
+          Object.defineProperties(response, {
+            body: {
+              value: null
+            },
+            status: {
+              value: 0
+            },
+            statusText: {
+              value: ""
+            }
+          });
+        }
         return Promise.resolve(response);
       }
       var updatedArgs = args ? [].concat(source).concat(args) : [source];
@@ -21759,6 +21797,8 @@
           strResponseBody = "{}";
         } else if (responseBody === "emptyArr") {
           strResponseBody = "[]";
+        } else if (responseBody === "emptyStr") {
+          strResponseBody = "";
         } else {
           logMessage(source, "Invalid responseBody parameter: '".concat(responseBody, "'"));
           return;
@@ -21924,6 +21964,19 @@
             value: responseType
           }
         });
+        if (responseType === "opaque") {
+          Object.defineProperties(response, {
+            body: {
+              value: null
+            },
+            status: {
+              value: 0
+            },
+            statusText: {
+              value: ""
+            }
+          });
+        }
         return Promise.resolve(response);
       }
       function modifyResponse(origResponse) {
@@ -24790,6 +24843,19 @@
             value: responseType
           }
         });
+        if (responseType === "opaque") {
+          Object.defineProperties(response, {
+            body: {
+              value: null
+            },
+            status: {
+              value: 0
+            },
+            statusText: {
+              value: ""
+            }
+          });
+        }
         return Promise.resolve(response);
       }
       function getPropertyInChain(base, chain) {
@@ -28608,7 +28674,8 @@
         convertAbpToAdg: convertAbpSnippetToAdg,
         convertScriptletToAdg,
         convertAdgToUbo: convertAdgScriptletToUbo,
-        redirects
+        redirects,
+        SCRIPTLETS_VERSION: version
       };
     }();
 

diff --git a/wiki/about-scriptlets.md b/wiki/about-scriptlets.md
@@ -1162,6 +1162,7 @@ example.org#%#//scriptlet('prevent-fetch'[, propsToMatch[, responseBody[, respon
   defaults to `emptyObj`. Possible values:
     - `emptyObj` — empty object
     - `emptyArr` — empty array
+    - `emptyStr` — empty string
 - `responseType` — optional, string for defining response type,
   original response type is used if not specified. Possible values:
     - `default`