refactor: move out import config into content-scope-features

Author: dbajpeyi

injected/entry-points/android.js

@@ -30,14 +30,8 @@ function initCode() {
         debug: processedConfig.debug,
     });
 
-    const importConfig = {
-        trackerLookup: import.meta.trackerLookup,
-        injectName: import.meta.injectName,
-    };
-
     load({
         platform: processedConfig.platform,
-        importConfig,
         site: processedConfig.site,
         bundledConfig: processedConfig.bundledConfig,
         messagingConfig: processedConfig.messagingConfig,

injected/entry-points/apple.js

@@ -41,14 +41,8 @@ function initCode() {
         });
     }
 
-    const importConfig = {
-        trackerLookup: import.meta.trackerLookup,
-        injectName: import.meta.injectName,
-    };
-
     load({
         platform: processedConfig.platform,
-        importConfig,
         site: processedConfig.site,
         bundledConfig: processedConfig.bundledConfig,
         messagingConfig: processedConfig.messagingConfig,

injected/entry-points/chrome.js

@@ -54,7 +54,6 @@ function init() {
           platform: {
               name: 'extension'
           },
-          trackerLookup: ${JSON.stringify(trackerLookup)},
           site: ${JSON.stringify(siteObject)},
           documentOriginIsTracker: ${documentOriginIsTracker},
           bundledConfig: ${JSON.stringify(bundledConfig)}

injected/entry-points/extension-mv3.js

@@ -6,16 +6,10 @@ import { computeLimitedSiteObject } from '../src/utils.js';
 
 const secret = (crypto.getRandomValues(new Uint32Array(1))[0] / 2 ** 32).toString().replace('0.', '');
 
-const importConfig = {
-    trackerLookup: import.meta.trackerLookup,
-    injectName: import.meta.injectName,
-};
-
 load({
     platform: {
         name: 'extension',
     },
-    importConfig,
     site: computeLimitedSiteObject(),
     // @ts-expect-error https://app.asana.com/0/1201614831475344/1203979574128023/f
     bundledConfig: $BUNDLED_CONFIG$,

injected/entry-points/integration.js

@@ -84,15 +84,9 @@ async function initCode() {
         },
     });
 
-    const importConfig = {
-        trackerLookup: processedConfig.trackerLookup,
-        injectName: import.meta.injectName,
-    };
-
     load({
         // @ts-expect-error Types of property 'name' are incompatible.
         platform: processedConfig.platform,
-        importConfig,
         site: processedConfig.site,
         messagingConfig: processedConfig.messagingConfig,
     });

injected/entry-points/windows.js

@@ -28,14 +28,8 @@ function initCode() {
         },
     });
 
-    const importConfig = {
-        trackerLookup: processedConfig.trackerLookup,
-        injectName: import.meta.injectName,
-    };
-
     load({
         platform: processedConfig.platform,
-        importConfig,
         site: processedConfig.site,
         bundledConfig: processedConfig.bundledConfig,
         messagingConfig: processedConfig.messagingConfig,

injected/src/content-feature.js

@@ -35,15 +35,6 @@ class ConfigParser {
     /** @type {any} */
     name;
 
-    /** @type {object | undefined} */
-    #trackerLookup;
-
-    /** @type {boolean | undefined} */
-    #documentOriginIsTracker;
-
-    /** @type {string} */
-    #injectName;
-
     /**
      * @param {any} name
      */
@@ -57,15 +48,12 @@ class ConfigParser {
     initLoadArgs(loadArgs) {
         const { bundledConfig, site, platform } = loadArgs;
         this.#bundledConfig = bundledConfig;
-        this.#injectName = loadArgs.importConfig.injectName;
         // If we have a bundled config, treat it as a regular config
         // This will be overriden by the remote config if it is available
         if (this.#bundledConfig) {
             const enabledFeatures = computeEnabledFeatures(bundledConfig, site.domain, platform.version);
             this.#featureSettings = parseFeatureSettings(bundledConfig, enabledFeatures);
         }
-        this.#trackerLookup = loadArgs.importConfig.trackerLookup;
-        this.#documentOriginIsTracker = isTrackerOrigin(this.#trackerLookup);
     }
 
     /**
@@ -178,37 +166,12 @@ class ConfigParser {
         return result?.[featureKeyName];
     }
 
-    /**
-     * @returns {object}
-     **/
-    get trackerLookup() {
-        return this.#trackerLookup || {};
-    }
-
     /**
      * @returns {import('./utils.js').RemoteConfig | undefined}
      **/
     get bundledConfig() {
         return this.#bundledConfig;
     }
-
-    /**
-     * @returns {boolean}
-     */
-    get documentOriginIsTracker() {
-        return !!this.#documentOriginIsTracker;
-    }
-
-    set documentOriginIsTracker(value) {
-        this.#documentOriginIsTracker = value;
-    }
-
-    /**
-     * @returns {string}
-     */
-    get injectName() {
-        return this.#injectName;
-    }
 }
 
 export default class ContentFeature extends ConfigParser {
@@ -222,10 +185,13 @@ export default class ContentFeature extends ConfigParser {
     /** @type {{ debug?: boolean, desktopModeEnabled?: boolean, forcedZoomEnabled?: boolean, featureSettings?: Record<string, unknown>, assets?: AssetConfig | undefined, site: Site, messagingConfig?: import('@duckduckgo/messaging').MessagingConfig } | null} */
     #args;
 
-    constructor(featureName) {
+    /** @type {any} */
+    #importConfig;
+    constructor(featureName, importConfig) {
         super(featureName);
         this.#args = null;
         this.monitor = new PerformanceMonitor();
+        this.#importConfig = importConfig;
     }
 
     get isDebug() {
@@ -259,6 +225,27 @@ export default class ContentFeature extends ConfigParser {
         return this.#args?.assets;
     }
 
+    /**
+     * @returns {object}
+     **/
+    get trackerLookup() {
+        return this.#importConfig.trackerLookup || {};
+    }
+
+    /**
+     * @returns {string}
+     */
+    get injectName() {
+        return this.#importConfig.injectName;
+    }
+
+    /**
+     * @returns {boolean}
+     */
+    get documentOriginIsTracker() {
+        return isTrackerOrigin(this.trackerLookup);
+    }
+
     /**
      * @deprecated as we should make this internal to the class and not used externally
      * @return {MessagingContext}

injected/src/content-scope-features.js

@@ -23,7 +23,6 @@ const isHTMLDocument =
  * @property {import('./content-feature').Site} site
  * @property {import('./utils.js').Platform} platform
  * @property {import('./utils.js').RemoteConfig} bundledConfig
- * @property {object} importConfig - contains trackerLookup and injectName, trackerLookup is provided currently only by the extension
  * @property {import('@duckduckgo/messaging').MessagingConfig} [messagingConfig]
  * @property {string} [messageSecret] - optional, used in the messageBridge creation
  */
@@ -37,11 +36,16 @@ export function load(args) {
         return;
     }
 
-    const featureNames = typeof args.importConfig.injectName === 'string' ? platformSupport[args.importConfig.injectName] : [];
+    const importConfig = {
+        trackerLookup: import.meta.trackerLookup,
+        injectName: import.meta.injectName,
+    };
+
+    const featureNames = typeof importConfig.injectName === 'string' ? platformSupport[importConfig.injectName] : [];
 
     for (const featureName of featureNames) {
         const ContentFeature = platformFeatures['ddg_feature_' + featureName];
-        const featureInstance = new ContentFeature(featureName);
+        const featureInstance = new ContentFeature(featureName, importConfig);
         featureInstance.callLoad(args);
         features.push({ featureName, featureInstance });
     }