Add global site object to load

Author: jonathanKingston

inject/android.js

@@ -3,7 +3,7 @@
  * @category Content Scope Scripts Integrations
  */
 import { load, init, update } from '../src/content-scope-features.js'
-import { processConfig, isGloballyDisabled } from './../src/utils'
+import { processConfig, isGloballyDisabled, computeLimitedSiteObject } from './../src/utils'
 
 const allowedMessages = [
     'getClickToLoadState',
@@ -22,7 +22,8 @@ function initCode () {
     }
 
     load({
-        platform: processedConfig.platform
+        platform: processedConfig.platform,
+        site: computeLimitedSiteObject()
     })
 
     const messageSecret = processedConfig.messageSecret

inject/apple.js

@@ -3,7 +3,7 @@
  * @category Content Scope Scripts Integrations
  */
 import { load, init } from '../src/content-scope-features.js'
-import { processConfig, isGloballyDisabled } from './../src/utils'
+import { processConfig, isGloballyDisabled, computeLimitedSiteObject } from './../src/utils'
 
 function initCode () {
     // @ts-expect-error https://app.asana.com/0/1201614831475344/1203979574128023/f
@@ -13,7 +13,8 @@ function initCode () {
     }
 
     load({
-        platform: processedConfig.platform
+        platform: processedConfig.platform,
+        site: computeLimitedSiteObject()
     })
 
     init(processedConfig)

inject/chrome-mv3.js

@@ -4,13 +4,15 @@
  */
 import { load, init, update } from '../src/content-scope-features.js'
 import { isTrackerOrigin } from '../src/trackers'
+import { computeLimitedSiteObject } from '../src/utils.js'
 
 const secret = (crypto.getRandomValues(new Uint32Array(1))[0] / 2 ** 32).toString().replace('0.', '')
 
 load({
     platform: {
         name: 'extension'
     },
+    site: computeLimitedSiteObject(),
     // @ts-expect-error https://app.asana.com/0/1201614831475344/1203979574128023/f
     documentOriginIsTracker: isTrackerOrigin($TRACKER_LOOKUP$),
     // @ts-expect-error https://app.asana.com/0/1201614831475344/1203979574128023/f

inject/chrome.js

@@ -3,6 +3,7 @@
  * @category Content Scope Scripts Integrations
  */
 import { isTrackerOrigin } from '../src/trackers'
+import { computeLimitedSiteObject } from '../src/utils'
 
 /**
  * Inject all the overwrites into the page.
@@ -46,12 +47,14 @@ function init () {
     const randomPassword = '_p' + randomString()
     const reusableMethodName = '_rm' + randomString()
     const reusableSecret = '_r' + randomString()
+    const siteObject = computeLimitedSiteObject()
     const initialScript = `
       /* global contentScopeFeatures */
       contentScopeFeatures.load({
           platform: {
               name: 'extension'
           },
+          site: ${JSON.stringify(siteObject)},
           documentOriginIsTracker: ${documentOriginIsTracker},
           bundledConfig: ${JSON.stringify(bundledConfig)}
       })

inject/integration.js

@@ -71,6 +71,7 @@ async function initCode () {
     const processedConfig = generateConfig()
 
     load({
+        site: processedConfig.site,
         platform: processedConfig.platform
     })
 

inject/mozilla.js

@@ -4,6 +4,7 @@
  */
 import { load, init, update } from '../src/content-scope-features.js'
 import { isTrackerOrigin } from '../src/trackers'
+import { computeLimitedSiteObject } from '../src/utils.js'
 
 const allowedMessages = [
     'getClickToLoadState',
@@ -25,6 +26,7 @@ function initCode () {
         platform: {
             name: 'extension'
         },
+        site: computeLimitedSiteObject(),
         // @ts-expect-error https://app.asana.com/0/1201614831475344/1203979574128023/f
         documentOriginIsTracker: isTrackerOrigin($TRACKER_LOOKUP$),
         // @ts-expect-error https://app.asana.com/0/1201614831475344/1203979574128023/f

inject/windows.js

@@ -3,7 +3,7 @@
  * @category Content Scope Scripts Integrations
  */
 import { load, init } from '../src/content-scope-features.js'
-import { processConfig, isGloballyDisabled, windowsSpecificFeatures } from './../src/utils'
+import { processConfig, isGloballyDisabled, windowsSpecificFeatures, computeLimitedSiteObject } from './../src/utils'
 
 function initCode () {
     // @ts-expect-error https://app.asana.com/0/1201614831475344/1203979574128023/f
@@ -13,7 +13,8 @@ function initCode () {
     }
 
     load({
-        platform: processedConfig.platform
+        platform: processedConfig.platform,
+        site: computeLimitedSiteObject()
     })
 
     init(processedConfig)

src/content-scope-features.js

@@ -25,6 +25,7 @@ const performanceMonitor = new PerformanceMonitor()
 
 /**
  * @typedef {object} LoadArgs
+ * @property {object} site
  * @property {object} platform
  * @property {string} platform.name
  * @property {string} [platform.version]

src/utils.js

@@ -493,6 +493,16 @@ export function isUnprotectedDomain (topLevelHostname, featureList) {
  * @property {string} sessionKey
  */
 
+/**
+ * Used to inialize extension code in the load phase
+ */
+export function computeLimitedSiteObject () {
+    const topLevelHostname = getTabHostname()
+    return {
+        domain: topLevelHostname
+    }
+}
+
 /**
  * Expansion point to add platform specific versioning logic
  * @param {UserPreferences} preferences
@@ -556,8 +566,8 @@ function isSupportedVersion (minSupportedVersion, currentVersion) {
  * @param {string[]} platformSpecificFeatures
  */
 export function processConfig (data, userList, preferences, platformSpecificFeatures = []) {
-    const topLevelHostname = getTabHostname()
-    const allowlisted = userList.filter(domain => domain === topLevelHostname).length > 0
+    const site = computeLimitedSiteObject()
+    const allowlisted = userList.filter(domain => domain === site.domain).length > 0
     const remoteFeatureNames = Object.keys(data.features)
     const platformSpecificFeaturesNotInRemoteConfig = platformSpecificFeatures.filter((featureName) => !remoteFeatureNames.includes(featureName))
     /** @type {Record<string, any>} */
@@ -576,15 +586,14 @@ export function processConfig (data, userList, preferences, platformSpecificFeat
                 return false
             }
         }
-        return feature.state === 'enabled' && !isUnprotectedDomain(topLevelHostname, feature.exceptions)
+        return feature.state === 'enabled' && !isUnprotectedDomain(site.domain, feature.exceptions)
     }).concat(platformSpecificFeaturesNotInRemoteConfig) // only disable platform specific features if it's explicitly disabled in remote config
-    const isBroken = isUnprotectedDomain(topLevelHostname, data.unprotectedTemporary)
-    output.site = {
-        domain: topLevelHostname,
+    const isBroken = isUnprotectedDomain(site.domain, data.unprotectedTemporary)
+    output.site = Object.assign(site, {
         isBroken,
         allowlisted,
         enabledFeatures
-    }
+    })
     // TODO
     output.cookie = {}