Merge branch 'master' into AGT-890-tcf-race-condition-for-prebid

Author: patmmccann

libraries/consentManagement/cmUtils.ts

@@ -1,9 +1,9 @@
 import { timedAuctionHook } from '../../src/utils/perfMetrics.js';
 import { isNumber, isPlainObject, isStr, logError, logInfo, logWarn } from '../../src/utils.js';
-import { ConsentHandler } from '../../src/consentHandler.js';
 import { PbPromise } from '../../src/utils/promise.js';
 import { buildActivityParams } from '../../src/activities/params.js';
 import { getHook } from '../../src/hook.js';
+import { type ConsentHandler } from "../../src/consentHandler.ts";
 
 export function consentManagementHook(name, loadConsentData) {
   const SEEN = new WeakSet();
@@ -95,7 +95,7 @@ export function lookupConsentData(
   }).finally(() => {
     timeoutHandle && clearTimeout(timeoutHandle);
   }).catch((e) => {
-    consentDataHandler.setConsentData(null);
+    consentDataHandler.error(e);
     throw e;
   });
 }

libraries/mspa/activityControls.ts

@@ -2,7 +2,7 @@ import { registerActivityControl } from '../../src/activities/rules.js';
 import {
   ACTIVITY_ENRICH_EIDS,
   ACTIVITY_ENRICH_UFPD,
-  ACTIVITY_SYNC_USER,
+  ACTIVITY_SYNC_USER, ACTIVITY_TRANSMIT_EIDS,
   ACTIVITY_TRANSMIT_PRECISE_GEO,
   ACTIVITY_TRANSMIT_UFPD
 } from '../../src/activities/activities.js';
@@ -122,6 +122,7 @@ export function isTransmitGeoConsentDenied(cd) {
 const CONSENT_RULES = {
   [ACTIVITY_SYNC_USER]: isConsentDenied,
   [ACTIVITY_ENRICH_EIDS]: isConsentDenied,
+  [ACTIVITY_TRANSMIT_EIDS]: isConsentDenied,
   [ACTIVITY_ENRICH_UFPD]: isConsentDenied,
   [ACTIVITY_TRANSMIT_UFPD]: isTransmitUfpdConsentDenied,
   [ACTIVITY_TRANSMIT_PRECISE_GEO]: isTransmitGeoConsentDenied

modules/userId/index.ts

@@ -495,6 +495,7 @@ function idSystemInitializer({ mkDelay = delay } = {}) {
   const startInit = defer<void>();
   const startCallbacks = defer<void>();
   let cancel;
+  let initStarted = false;
   let initialized = false;
   let initMetrics;
 
@@ -531,6 +532,7 @@ function idSystemInitializer({ mkDelay = delay } = {}) {
     PbPromise.all([hooksReady, startInit.promise])
       .then(timeConsent)
       .then(checkRefs(() => {
+        initialized = true;
         initSubmodules(initModules, allModules);
       }))
       .then(() => startCallbacks.promise.finally(initMetrics.startTiming('userId.callbacks.pending')))
@@ -547,8 +549,8 @@ function idSystemInitializer({ mkDelay = delay } = {}) {
    * filtered by `submoduleNames`).
    */
   return function ({ refresh = false, submoduleNames = null, ready = false } = {}) {
-    if (ready && !initialized) {
-      initialized = true;
+    if (ready && !initStarted) {
+      initStarted = true;
       startInit.resolve();
       // submodule callbacks should run immediately if `auctionDelay` > 0, or `syncDelay` ms after the
       // auction ends otherwise
@@ -765,8 +767,13 @@ function registerSignalSources() {
 }
 
 function retryOnCancel(initParams?) {
-  return initIdSystem(initParams).then(
-    () => getUserIds(),
+  const ready = initIdSystem(initParams);
+  return ready.then(
+    () => {
+      // if something has changed, try again
+      const updated = initIdSystem();
+      return updated === ready ? getUserIds() : retryOnCancel();
+    },
     (e) => {
       if (e === INIT_CANCELED) {
         // there's a pending refresh - because GreedyPromise runs this synchronously, we are now in the middle
@@ -1254,6 +1261,9 @@ export function init(config, { mkDelay = delay } = {}) {
   configRegistry = [];
   initializedSubmodules = mkPriorityMaps();
   initIdSystem = idSystemInitializer({ mkDelay });
+  allConsent.onChange(() => {
+    initIdSystem({ refresh: true });
+  })
   if (configListener != null) {
     configListener();
   }