chore: merge main

Author: dbajpeyi

.github/workflows/auto-respond-pr.yml

@@ -58,7 +58,7 @@ jobs:
                   direction: last
 
             - name: Create Comment Body
-              uses: actions/github-script@v7
+              uses: actions/github-script@v8
               id: create_body
               with:
                   github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-pr.yml

@@ -57,7 +57,7 @@ jobs:
                   direction: last
 
             - name: Create Comment Body
-              uses: actions/github-script@v7
+              uses: actions/github-script@v8
               id: create_body
               with:
                   github-token: ${{ secrets.GITHUB_TOKEN }}

.swift-version

@@ -0,0 +1,88 @@
+# Adding a New Bundle
+
+Bundles are how platforms integrate content-scope-scripts, they're often used within a context and so serve a distinct purpose. There is a cost to serving multiple bundles within the web page context so that should be avoided.
+
+To add a new bundle to the Content Scope Scripts build system:
+
+## 1. Define Build Configuration
+
+**File**: `injected/scripts/entry-points.js`
+
+Add your bundle to the `builds` object:
+
+```js
+'my-new-bundle': {
+    input: 'entry-points/my-entry.js',
+    output: ['../build/my-platform/myScript.js'],
+},
+```
+
+## 2. Update TypeScript Types
+
+**File**: `injected/src/globals.d.ts`
+
+Add the bundle name to the `injectName` union type:
+
+```ts
+injectName?:
+    | 'firefox'
+    | 'apple'
+    | 'my-new-bundle'  // Add here
+```
+
+## 3. Configure Platform Features (Optional)
+
+**File**: `injected/src/features.js`
+
+If creating a platform-specific bundle, add feature configuration:
+
+```js
+'my-platform': [
+    'cookie',
+    ...baseFeatures,
+    'mySpecificFeature',
+],
+```
+
+## Optional: 4. Create Entry Point
+
+**Directory**: `injected/entry-points/`
+
+Create your entry point file (e.g., `my-entry.js`) that imports and configures the required features for your bundle.
+
+**Entry points** are the main files that define the implementation of a build. These should only be added if absolutely required.
+
+## Remote configuration
+
+Inject Name is a condition that can then be used in the config.
+
+**Example**: Target specific bundles in feature configuration:
+
+```json
+{
+    "features": {
+        "myFeature": {
+            "state": "enabled",
+            "settings": {
+                "something": "hello",
+                "conditionalChanges": [
+                    {
+                        "condition": {
+                            "injectName": "android-adsjs"
+                        },
+                        "patchSettings": [
+                            {
+                                "op": "replace",
+                                "path": "/something",
+                                "value": "else"
+                            }
+                        ]
+                    }
+                ]
+            }
+        }
+    }
+}
+```
+
+This allows the same feature to have different behavior depending on which bundle it's running in.

injected/docs/adding-bundles.md

@@ -64,7 +64,10 @@ The following placeholders are replaced during the build process:
 - **`$CONTENT_SCOPE$`** - Raw remote config object
 - **`$USER_UNPROTECTED_DOMAINS$`** - An array of user allowlisted domains
 - **`$USER_PREFERENCES$`** - An object containing:
-    - `platform`: `{ name: '<ios | macos | extension | android | windows>', internal: <boolean> }`
+    - `platform`:
+        - `name`: '<ios | macos | extension | android | windows>',
+        - `internal`: <boolean>
+        - `version`: <string | number>
     - `debug`: boolean
     - `globalPrivacyControlValue`: boolean
     - `sessionKey`: `<CSRNG UUID 4 string>` (used for fingerprinting) - this should regenerate on browser close or every 24 hours

injected/docs/platform-integration.md

@@ -1,9 +1,54 @@
 /**
  * @module Android AdsJS integration
  */
-import { load, init } from '../src/content-scope-features.js';
-import { processConfig } from './../src/utils';
-import { AndroidAdsjsMessagingConfig } from '../../messaging/index.js';
+import { load, init, updateFeatureArgs } from '../src/content-scope-features.js';
+import { processConfig, isBeingFramed } from './../src/utils';
+import { AndroidAdsjsMessagingConfig, MessagingContext, Messaging } from '../../messaging/index.js';
+
+/**
+ * Send initial ping once per frame to establish communication with the platform.
+ * This replaces the per-feature ping that was previously sent in AndroidAdsjsMessagingTransport.
+ * When response is received, updates all loaded feature configurations.
+ *
+ * @param {AndroidAdsjsMessagingConfig} messagingConfig
+ * @param {object} processedConfig - The base configuration
+ */
+async function sendInitialPingAndUpdate(messagingConfig, processedConfig) {
+    // Only send ping in top context, not in frames
+    if (isBeingFramed()) {
+        return;
+    }
+
+    try {
+        // Create messaging context for the initial ping
+        const messagingContext = new MessagingContext({
+            context: 'contentScopeScripts',
+            env: processedConfig.debug ? 'development' : 'production',
+            featureName: 'messaging',
+        });
+
+        // Create messaging instance - handles all the subscription/error boilerplate
+        const messaging = new Messaging(messagingContext, messagingConfig);
+
+        if (processedConfig.debug) {
+            console.log('AndroidAdsjs: Sending initial ping...');
+        }
+
+        // Send the ping request
+        const response = await messaging.request('initialPing', {});
+
+        // Update all loaded features with merged configuration
+        if (response && typeof response === 'object') {
+            const updatedConfig = { ...processedConfig, ...response };
+
+            await updateFeatureArgs(updatedConfig);
+        }
+    } catch (error) {
+        if (processedConfig.debug) {
+            console.error('AndroidAdsjs: Initial ping failed:', error);
+        }
+    }
+}
 
 function initCode() {
     // @ts-expect-error https://app.asana.com/0/1201614831475344/1203979574128023/f
@@ -24,6 +69,10 @@ function initCode() {
         debug: processedConfig.debug,
     });
 
+    // Send initial ping asynchronously to update feature configurations when response arrives
+    sendInitialPingAndUpdate(processedConfig.messagingConfig, processedConfig);
+
+    // Load and init features immediately with base configuration
     load({
         platform: processedConfig.platform,
         site: processedConfig.site,

injected/entry-points/android-adsjs.js

@@ -1,4 +1,4 @@
-import { load, init } from '../src/content-scope-features.js';
+import { load, init, updateFeatureArgs } from '../src/content-scope-features.js';
 import { TestTransportConfig } from '../../messaging/index.js';
 import { getTabUrl } from '../src/utils.js';
 
@@ -120,6 +120,7 @@ async function initCode() {
             window.__testContentScopeArgs = merged;
             // init features
             await init(merged);
+            await updateFeatureArgs(merged);
 
             // set status to initialized so that tests can resume
             setStatus('initialized');

injected/entry-points/integration.js

@@ -130,6 +130,26 @@ test.describe('Ensure Notification interface is injected', () => {
             return window.Notification.maxActions;
         });
         expect(maxActionsPropDenied).toEqual(2);
+
+        const notificationToString = await page.evaluate(() => {
+            return window.Notification.toString();
+        });
+        expect(notificationToString).toEqual('function Notification() { [native code] }');
+
+        const requestPermissionToString = await page.evaluate(() => {
+            return window.Notification.requestPermission.toString();
+        });
+        expect(requestPermissionToString).toEqual('function requestPermission() { [native code] }');
+
+        const notificationToStringToString = await page.evaluate(() => {
+            return window.Notification.toString.toString();
+        });
+        expect(notificationToStringToString).toEqual('function toString() { [native code] }');
+
+        const requestPermissionToStringToString = await page.evaluate(() => {
+            return window.Notification.requestPermission.toString.toString();
+        });
+        expect(requestPermissionToStringToString).toEqual('function toString() { [native code] }');
     });
 });
 

injected/integration-test/web-compat.spec.js

@@ -38,11 +38,11 @@
     "@canvas/image-data": "^1.0.0",
     "@fingerprintjs/fingerprintjs": "^4.6.2",
     "@types/chrome": "^0.1.1",
-    "@types/jasmine": "^5.1.8",
+    "@types/jasmine": "^5.1.9",
     "@types/node": "^24.1.0",
-    "@typescript-eslint/eslint-plugin": "^8.41.0",
+    "@typescript-eslint/eslint-plugin": "^8.42.0",
     "fast-check": "^4.2.0",
-    "jasmine": "^5.9.0",
+    "jasmine": "^5.10.0",
     "web-ext": "^8.9.0"
   }
 }

injected/package.json

@@ -42,6 +42,12 @@ export default class ContentFeature extends ConfigFeature {
      */
     listenForUpdateChanges = false;
 
+    /**
+     * Set this to true if you wish to receive configuration updates from initial ping responses (Android only).
+     * @type {boolean}
+     */
+    listenForConfigUpdates = false;
+
     /** @type {ImportMeta} */
     #importConfig;
 
@@ -56,6 +62,40 @@ export default class ContentFeature extends ConfigFeature {
         return this.args?.debug || false;
     }
 
+    get shouldLog() {
+        return this.isDebug;
+    }
+
+    /**
+     * Logging utility for this feature (Stolen some inspo from DuckPlayer logger, will unify in the future)
+     */
+    get log() {
+        const shouldLog = this.shouldLog;
+        const prefix = `${this.name.padEnd(20, ' ')} |`;
+
+        return {
+            // These are getters to have the call site be the reported line number.
+            get info() {
+                if (!shouldLog) {
+                    return () => {};
+                }
+                return console.log.bind(console, prefix);
+            },
+            get warn() {
+                if (!shouldLog) {
+                    return () => {};
+                }
+                return console.warn.bind(console, prefix);
+            },
+            get error() {
+                if (!shouldLog) {
+                    return () => {};
+                }
+                return console.error.bind(console, prefix);
+            },
+        };
+    }
+
     get desktopModeEnabled() {
         return this.args?.desktopModeEnabled || false;
     }
@@ -223,6 +263,17 @@ export default class ContentFeature extends ConfigFeature {
      */
     update() {}
 
+    /**
+     * Called when user preferences are merged from initial ping response. (Android only)
+     * Override this method in your feature to handle user preference updates.
+     * This only happens once during initialization when the platform responds with user-specific settings.
+     * @param {object} _updatedConfig - The configuration with merged user preferences
+     */
+    onUserPreferencesMerged(_updatedConfig) {
+        // Default implementation does nothing
+        // Features can override this to handle user preference updates
+    }
+
     /**
      * Register a flag that will be added to page breakage reports
      */