AG-39385: remove local scriptlet data

Squashed commit of the following:

commit 570cee7
Author: Dmitriy Seregin <[email protected]>
Date:   Wed Jan 29 14:20:11 2025 +0300

    update changelog

commit 0610d0f
Author: Dmitriy Seregin <[email protected]>
Date:   Wed Jan 29 14:10:29 2025 +0300

    undo changes in archive

commit 8b31bf2
Author: Dmitriy Seregin <[email protected]>
Date:   Wed Jan 29 13:10:12 2025 +0300

    update archive for tests

commit c94a1eb
Author: Slava Leleka <[email protected]>
Date:   Wed Jan 29 13:01:07 2025 +0300

    AG-39385 export LocalScriptFunctionData type
    
    Squashed commit of the following:
    
    commit 3fdede0
    Author: Slava Leleka <[email protected]>
    Date:   Tue Jan 28 19:32:09 2025 -0500
    
        Revert "update tgz files"
    
        This reverts commit 47d9d3f.
    
    commit 47d9d3f
    Author: Slava Leleka <[email protected]>
    Date:   Tue Jan 28 19:26:47 2025 -0500
    
        update tgz files
    
    commit 0abf271
    Author: Slava Leleka <[email protected]>
    Date:   Tue Jan 28 19:26:33 2025 -0500
    
        export LocalScriptFunctionData

commit decaaa0
Author: Dmitriy Seregin <[email protected]>
Date:   Mon Jan 27 22:20:47 2025 +0300

    update test archive

commit 788065b
Author: Dmitriy Seregin <[email protected]>
Date:   Mon Jan 27 22:20:35 2025 +0300

    small update for better build

commit 1f02721
Author: Slava Leleka <[email protected]>
Date:   Mon Jan 27 12:17:46 2025 -0500

    fix changelog

commit 24aa3ed
Author: Dmitriy Seregin <[email protected]>
Date:   Mon Jan 27 17:08:14 2025 +0300

    update archive for tests

commit 9554e9a
Author: Dmitriy Seregin <[email protected]>
Date:   Mon Jan 27 17:08:01 2025 +0300

    fix

commit d199a35
Author: Dmitriy Seregin <[email protected]>
Date:   Mon Jan 27 16:56:23 2025 +0300

    bump version && update changelog

commit 0dd230f
Author: Maxim Topciu <[email protected]>
Date:   Sun Jan 26 15:34:22 2025 +0300

    AG-39385 remove local scriptlet data

Author: 105th

packages/tswebextension/CHANGELOG.md

@@ -17,6 +17,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [AdguardBrowserExtension#3002]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/3002
 
+## [2.4.0-alpha.11] - 2025-01-29
+
+### Removed
+
+- Local Scriptlet rules allowing. This is a reversion of `2.4.0-alpha.10` changes
+  so there is no more limitation on Scriptlet rules execution.
+
+[2.4.0-alpha.11]: https://github.com/AdguardTeam/tsurlfilter/releases/tag/tswebextension-v2.4.0-alpha.11
+
 ## [2.4.0-alpha.10] - 2025-01-17
 
 ### Changed

packages/tswebextension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adguard/tswebextension",
-  "version": "2.4.0-alpha.10",
+  "version": "2.4.0-alpha.11",
   "description": "This is a TypeScript library that implements AdGuard's extension API",
   "main": "dist/index.js",
   "typings": "dist/types/src/lib/mv2/background/index.d.ts",

packages/tswebextension/src/lib/mv2/background/services/content-filtering/content-stream.ts

@@ -1,4 +1,4 @@
-import { TextEncoder, TextDecoder } from 'text-encoding';
+import TextEncoding from 'text-encoding';
 import { type WebRequest } from 'webextension-polyfill';
 import { RequestType } from '@adguard/tsurlfilter';
 
@@ -16,6 +16,10 @@ import { type ContentStringFilterInterface } from './content-string-filter';
 import { FilteringEventType, type FilteringLogInterface } from '../../../../common/filtering-log';
 import { logger } from '../../../../common/utils/logger';
 
+// Do not destruct inside import, because it somehow breaks build in browser
+// extension via "ReferenceError: TextDecoder is not defined".
+const { TextEncoder, TextDecoder } = TextEncoding;
+
 /**
  * Content Stream Filter class.
  *

packages/tswebextension/src/lib/mv3/background/app.ts

@@ -37,7 +37,6 @@ import { getErrorMessage } from '../../common/error';
 import { ALLOWLIST_FILTER_ID, QUICK_FIXES_FILTER_ID, USER_FILTER_ID } from '../../common/constants';
 import {
     type LocalScriptFunctionData,
-    type LocalScriptletRulesData,
     localScriptRulesService,
 } from './services/local-script-rules-service';
 
@@ -392,15 +391,6 @@ export class TsWebExtension implements AppInterface<
         localScriptRulesService.setLocalScriptRules(localScriptRules);
     }
 
-    /**
-     * Sets prebuild local **scriptlet** rules.
-     *
-     * @param localScriptletRules Object with pre-build Scriptlet rules. @see {@link LocalScriptRulesService}.
-     */
-    public static setLocalScriptletRules(localScriptletRules: LocalScriptletRulesData): void {
-        localScriptRulesService.setLocalScriptletRules(localScriptletRules);
-    }
-
     /**
      * Updates `hideReferrer` stealth config value without re-initialization of engine.
      *

packages/tswebextension/src/lib/mv3/background/cosmetic-api.ts

@@ -1,4 +1,4 @@
-import { type CosmeticResult, type CosmeticRule } from '@adguard/tsurlfilter';
+import { type ScriptletData, type CosmeticResult, type CosmeticRule } from '@adguard/tsurlfilter';
 import { CosmeticRuleType } from '@adguard/agtree';
 
 import { appContext } from './app-context';
@@ -13,7 +13,6 @@ import { defaultFilteringLog, FilteringEventType } from '../../common/filtering-
 import { getDomain } from '../../common/utils/url';
 import { type ContentType } from '../../common/request-type';
 import { nanoid } from '../nanoid';
-import { type ScriptletRuleData } from '../tabs/frame';
 import { localScriptRulesService } from './services/local-script-rules-service';
 
 export type ContentScriptCosmeticData = {
@@ -45,7 +44,7 @@ type ScriptsAndScriptletsData = {
     /**
      * List of scriptlet data objects.
      */
-    scriptletDataList: ScriptletRuleData[],
+    scriptletDataList: ScriptletData[],
 };
 
 /**
@@ -198,16 +197,12 @@ export class CosmeticApi extends CosmeticApiCommon {
         for (let i = 0; i < rules.length; i += 1) {
             const rule = rules[i];
             if (rule.isScriptlet) {
-                const scriptletRunData = rule.getScriptletData();
+                const scriptletData = rule.getScriptletData();
 
-                // it looks like `//scriptlet...` so it will be easily matched against localScriptletRules
-                const scriptletRuleText = rule.getContent();
-
-                if (scriptletRunData && scriptletRuleText) {
-                    scriptletDataList.push({
-                        scriptletRunData,
-                        scriptletRuleText,
-                    });
+                if (scriptletData) {
+                    scriptletDataList.push(
+                        scriptletData,
+                    );
                 }
             } else {
                 // TODO: Optimize script injection by checking if common scripts (e.g., AG_)
@@ -349,27 +344,11 @@ export class CosmeticApi extends CosmeticApiCommon {
 
         try {
             await Promise.all(scriptletDataList.map((scriptletData) => {
-                /**
-                 * It is possible to follow all places using this logic by searching JS_RULES_EXECUTION.
-                 *
-                 * This is STEP 4.2: Selecting only local scriptlet rules which were pre-built into the extension.
-                 */
-
-                const { scriptletRunData, scriptletRuleText } = scriptletData;
-
-                /**
-                 * Here we check if the scriptlet rule is local to guarantee that we do not execute remote code.
-                 */
-                const isLocalScriptlet = localScriptRulesService.isLocalScriptlet(scriptletRuleText);
-                if (!isLocalScriptlet) {
-                    return;
-                }
-
                 // eslint-disable-next-line consistent-return
                 return ScriptingApi.executeScriptlet({
                     tabId,
                     frameId,
-                    scriptletRunData,
+                    scriptletData,
                     domainName: getDomain(frameContext.url),
                 });
             }));
@@ -511,10 +490,7 @@ export class CosmeticApi extends CosmeticApiCommon {
 
             // do not log rules if they are not local
             // which means that will not be applied
-            if (
-                !localScriptRulesService.isLocalScript(ruleText)
-                && !localScriptRulesService.isLocalScriptlet(ruleText)
-            ) {
+            if (!localScriptRulesService.isLocalScript(ruleText)) {
                 continue;
             }
 

packages/tswebextension/src/lib/mv3/background/index.ts

@@ -79,5 +79,6 @@ export { BACKGROUND_TAB_ID, LF } from '../../common/constants';
 export { ContentType } from '../../common/request-type';
 export type { RequestData } from './request/events/request-event';
 export type { MessagesHandlerMV3 } from './messages-api';
+export type { LocalScriptFunctionData } from './services/local-script-rules-service';
 
 export { TSWEBEXTENSION_VERSION, EXTENDED_CSS_VERSION } from '../../common/configuration';

packages/tswebextension/src/lib/mv3/background/scripting-api.ts

@@ -51,7 +51,7 @@ export type ExecuteScriptletParams = {
     /**
      * The scriptlet data to be executed.
      */
-    scriptletRunData: ScriptletData,
+    scriptletData: ScriptletData,
 
     /**
      * The domain name of the frame.
@@ -90,15 +90,15 @@ export class ScriptingApi {
      * @param params Parameters for executing the scriptlet.
      * @param params.tabId The ID of the tab.
      * @param params.frameId The ID of the frame.
-     * @param params.scriptletRunData The scriptlet data to be executed.
+     * @param params.scriptletData The scriptlet data to be executed.
      * @param params.domainName The domain name of the frame. Used for debugging.
      * @returns Promise that resolves when the script is executed.
      */
     public static async executeScriptlet(
         {
             tabId,
             frameId,
-            scriptletRunData,
+            scriptletData,
             domainName,
         }: ExecuteScriptletParams,
     ): Promise<void> {
@@ -108,18 +108,18 @@ export class ScriptingApi {
         }
 
         const params: IConfiguration = {
-            ...scriptletRunData.params,
+            ...scriptletData.params,
             uniqueId: String(appContext.startTimeMs),
             verbose: appContext.configuration?.settings.debugScriptlets || false,
             domainName: domainName ?? undefined,
         };
 
         await chrome.scripting.executeScript({
             target: { tabId, frameIds: [frameId] },
-            func: scriptletRunData.func,
+            func: scriptletData.func,
             injectImmediately: true,
             world: 'MAIN',
-            args: [params, scriptletRunData.params.args],
+            args: [params, scriptletData.params.args],
         });
     }
 

packages/tswebextension/src/lib/mv3/background/services/local-script-rules-service.ts

@@ -12,15 +12,6 @@ export type LocalScriptFunctionData = {
     [key: string]: LocalScriptFunction;
 };
 
-/**
- * An object containing local scriptlet rules where:
- * - key — scriptlet rule text
- * - value — boolean value indicating whether it is allowed to run (always true).
- */
-export type LocalScriptletRulesData = {
-    [key: string]: boolean;
-};
-
 /**
  * It is possible to follow all places using this logic by searching JS_RULES_EXECUTION.
  *
@@ -38,12 +29,6 @@ export class LocalScriptRulesService {
      */
     private localScripts: LocalScriptFunctionData | undefined;
 
-    /**
-     * When {@link setLocalScriptletRules} is called, this holds a list of pre-built Scriptlets rules allowed to run.
-     * If it is never called, this remains undefined.
-     */
-    private localScriptlets: LocalScriptletRulesData | undefined;
-
     /**
      * Stores prebuilt JS rules in memory for later use.
      *
@@ -53,16 +38,6 @@ export class LocalScriptRulesService {
         this.localScripts = localScriptRules;
     }
 
-    /**
-     * Stores prebuilt Scriptlet rules in memory for later use.
-     *
-     * @param localScriptletRules A map of scriptlet rules as string
-     * to a boolean value indicating whether it is allowed to run.
-     */
-    public setLocalScriptletRules(localScriptletRules: LocalScriptletRulesData): void {
-        this.localScriptlets = localScriptletRules;
-    }
-
     /**
      * Checks if the given script text is included in our prebuilt local scripts.
      *
@@ -80,23 +55,6 @@ export class LocalScriptRulesService {
         return this.localScripts[scriptText] !== undefined;
     }
 
-    /**
-     * Checks if the given scriptlet rule is included in our prebuilt local scriptlets.
-     *
-     * This helper method is primarily for transparency during the Chrome Web Store review process.
-     *
-     * @param scriptletRuleText The scriptlet rule to verify.
-     *
-     * @returns True if the scriptlet rule is part of our local collection, false otherwise.
-     */
-    public isLocalScriptlet(scriptletRuleText: string): boolean {
-        if (this.localScriptlets === undefined) {
-            return false;
-        }
-
-        return this.localScriptlets[scriptletRuleText] !== undefined;
-    }
-
     /**
      * Retrieves the function associated with the specified script text
      * from our local scripts collection.

packages/tswebextension/src/lib/mv3/tabs/frame.ts

@@ -5,25 +5,6 @@ import {
     type ScriptletData,
 } from '@adguard/tsurlfilter';
 
-/**
- * Scriptlet rule data object which contains scriptlet data for execution
- * and scriptlet rule text (rule content) to match whether it is local or not.
- */
-export type ScriptletRuleData = {
-    /**
-     * Scriptlet data for the execution.
-     */
-    scriptletRunData: ScriptletData,
-
-    /**
-     * Scriptlet rule text to match whether it is local or not.
-     *
-     * @example
-     * `//scriptlet('set-constant', 'canRunAds', 'true')`
-     */
-    scriptletRuleText: string,
-};
-
 /**
  * Prepared cosmetic result.
  * This type represents the processed cosmetic data extracted from the initial cosmetic result.
@@ -37,7 +18,7 @@ type PreparedCosmeticResult = {
     /**
      * A list of scriptlet data extracted from the cosmetic result.
      */
-    scriptletDataList: ScriptletRuleData[];
+    scriptletDataList: ScriptletData[];
 
     /**
      * CSS styles extracted from the cosmetic result.