@adhese/sdk 0.16.1 → 0.17.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @adhese/sdk
 
+## 0.17.0
+
+### Minor Changes
+
+- ef68972: Add hooks to context instead of global variable which could break when adhese was disposed
+- ef68972: Move hook create functions to @adhese/sdk-shared
+
+### Patch Changes
+
+- Updated dependencies [2c01e34]
+- Updated dependencies [ad9b38f]
+- Updated dependencies [ef68972]
+  - @adhese/sdk-shared@0.6.0
+
+## 0.16.2
+
+### Patch Changes
+
+- 2763181: Force @adhese/sdk to use @adhese/sdk-shared@0.5.1
+
 ## 0.16.1
 
 ### Patch Changes

package/dist/index.cjs

@@ -3,7 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const sdkShared = require("@adhese/sdk-shared");
 const remeda = require("remeda");
 const name = "@adhese/sdk";
-const version = "0.16.1";
+const version = "0.17.0";
 function addTrackingPixel(url) {
   const img = document.createElement("img");
   img.src = url.toString();
@@ -15,104 +15,9 @@ function addTrackingPixel(url) {
   img.style.top = "0";
   return document.body.appendChild(img);
 }
-const hookMap = /* @__PURE__ */ new Map();
-function clearAllHooks() {
-  hookMap.clear();
-}
-function createAsyncHook(name2, {
-  onRun,
-  onAdd
-} = {}) {
-  hookMap.set(name2, /* @__PURE__ */ new Set());
-  const run = async (arg) => {
-    let latestResult = arg;
-    for (const callback of hookMap.get(name2) ?? [])
-      latestResult = await callback(latestResult) ?? latestResult;
-    onRun == null ? void 0 : onRun(hookMap.get(name2));
-    return latestResult;
-  };
-  function dispose() {
-    hookMap.delete(name2);
-  }
-  return [run, (callback) => add(callback, { name: name2, onAdd }), dispose];
-}
-function createSyncHook(name2, {
-  onRun,
-  onAdd
-} = {}) {
-  hookMap.set(name2, /* @__PURE__ */ new Set());
-  const run = (arg) => {
-    let latestResult = arg;
-    const promisedCallbacks = [];
-    for (const callback of hookMap.get(name2) ?? []) {
-      if (isCallbackAsync(callback))
-        promisedCallbacks.push(callback);
-      else
-        latestResult = callback(latestResult) ?? latestResult;
-    }
-    Promise.allSettled(promisedCallbacks.map((callback) => callback(latestResult))).catch(console.trace);
-    onRun == null ? void 0 : onRun(hookMap.get(name2));
-    return latestResult;
-  };
-  function dispose() {
-    hookMap.delete(name2);
-  }
-  return [run, (callback) => add(callback, { name: name2, onAdd }), dispose];
-}
-function createPassiveHook(name2, {
-  onRun,
-  onAdd
-} = {}) {
-  hookMap.set(name2, /* @__PURE__ */ new Set());
-  function run(arg) {
-    Promise.allSettled(Array.from(hookMap.get(name2) ?? []).map((callback) => callback(arg))).catch(console.trace);
-    onRun == null ? void 0 : onRun(hookMap.get(name2));
-  }
-  function dispose() {
-    hookMap.delete(name2);
-  }
-  return [run, (callback) => add(callback, { name: name2, onAdd }), dispose];
-}
-function isCallbackAsync(callback) {
-  return callback.constructor.name === "AsyncFunction";
-}
-function add(callback, {
-  name: name2,
-  onAdd
-}) {
-  const hookSet = hookMap.get(name2);
-  if (hookSet)
-    hookSet.add(callback);
-  else
-    hookMap.set(name2, /* @__PURE__ */ new Set([callback]));
-  onAdd == null ? void 0 : onAdd(hookSet);
-  return () => {
-    var _a;
-    (_a = hookMap.get(name2)) == null ? void 0 : _a.delete(callback);
-  };
-}
-let resolveOnInitPromise = () => {
-};
-let isInit = false;
-const waitOnInit = new Promise((resolve) => {
-  resolveOnInitPromise = resolve;
-});
-const [runOnInit, onInit] = createSyncHook("onInit", {
-  onRun(callbacks) {
-    isInit = true;
-    resolveOnInitPromise();
-    callbacks == null ? void 0 : callbacks.clear();
-  },
-  onAdd() {
-    if (isInit)
-      runOnInit();
-  }
-});
 const logger = sdkShared.createLogger({
   scope: `${name}@${version}`
 });
-const [runOnRequest, onRequest] = createAsyncHook("onRequest");
-const [runOnResponse, onResponse] = createAsyncHook("onResponse");
 async function requestPreviews(account) {
   const previewObjects = getPreviewObjects();
   const [list, adSchema] = await Promise.all([
@@ -238,7 +143,7 @@ async function requestAd(options) {
 }
 async function requestAds(requestOptions) {
   var _a, _b, _c, _d, _e;
-  const options = await runOnRequest(requestOptions);
+  const options = await requestOptions.context.hooks.runOnRequest(requestOptions);
   const { context } = options;
   try {
     (_a = context == null ? void 0 : context.events) == null ? void 0 : _a.requestAd.dispatch({
@@ -266,7 +171,7 @@ async function requestAds(requestOptions) {
     });
     if (matchedPreviews.length > 0)
       (_c = context.events) == null ? void 0 : _c.previewReceived.dispatch(matchedPreviews);
-    const mergedResult = await runOnResponse([
+    const mergedResult = await context.hooks.runOnResponse([
       ...result.filter((ad) => !previews.some((preview) => preview.libId === ad.libId)),
       ...matchedPreviews
     ]);
@@ -278,19 +183,7 @@ async function requestAds(requestOptions) {
     throw error;
   }
 }
-const [runOnSlotCreate, onSlotCreate] = createSyncHook("onSlotCreate");
-let isDisposed = false;
-const [runOnDispose, onDispose] = createSyncHook("onDispose", {
-  onRun(callbacks) {
-    isDisposed = true;
-    callbacks == null ? void 0 : callbacks.clear();
-  },
-  onAdd() {
-    if (isDisposed)
-      runOnDispose();
-  }
-});
-function useQueryDetector(queries = {
+function useQueryDetector(context, queries = {
   mobile: "(max-width: 768px)",
   tablet: "(min-width: 769px) and (max-width: 1024px)",
   desktop: "(min-width: 1025px)"
@@ -303,7 +196,7 @@ function useQueryDetector(queries = {
   }, {
     waitMs: 50
   });
-  onInit(() => {
+  context.hooks.onInit(() => {
     for (const query of queryList)
       query.addEventListener("change", handleOnChange.call);
     handleOnChange.call();
@@ -312,7 +205,7 @@ function useQueryDetector(queries = {
     for (const query of queryList)
       query.removeEventListener("change", handleOnChange.call);
   }
-  onDispose(dispose);
+  context.hooks.onDispose(dispose);
   return [sdkShared.computed(() => active.value), dispose];
 }
 function getQuery(entries) {
@@ -351,9 +244,9 @@ function renderInline(ad, element) {
 function generateName(location, format, slot) {
   return `${location}${slot ? `${slot}` : ""}-${format}`;
 }
-function useDomLoaded() {
+function useDomLoaded(context) {
   const isDomLoaded = sdkShared.ref(false);
-  onInit(async () => {
+  context.hooks.onInit(async () => {
     await sdkShared.waitForDomLoad();
     isDomLoaded.value = true;
   });
@@ -442,27 +335,27 @@ function useViewabilityObserver({ context, slotContext, hooks, onTracked }) {
   });
   return isTracked;
 }
-function useSlotHooks({ setup }, slotContext, id) {
-  const [runOnBeforeRender, onBeforeRender, disposeOnBeforeRender] = createAsyncHook(`onBeforeRender:${id}`);
-  const [runOnRender, onRender, disposeOnRender] = createAsyncHook(`onRender:${id}`);
-  const [runOnBeforeRequest, onBeforeRequest, disposeOnBeforeRequest] = createAsyncHook(`onBeforeRequest:${id}`);
-  const [runOnRequest2, onRequest2, disposeOnRequest] = createAsyncHook(`onRequest:${id}`);
-  const [runOnDispose2, onDispose2, disposeOnDispose] = createPassiveHook(`onDispose:${id}`);
+function useSlotHooks({ setup }, slotContext) {
+  const [runOnBeforeRender, onBeforeRender, disposeOnBeforeRender] = sdkShared.createAsyncHook();
+  const [runOnRender, onRender, disposeOnRender] = sdkShared.createAsyncHook();
+  const [runOnBeforeRequest, onBeforeRequest, disposeOnBeforeRequest] = sdkShared.createAsyncHook();
+  const [runOnRequest, onRequest, disposeOnRequest] = sdkShared.createAsyncHook();
+  const [runOnDispose, onDispose, disposeOnDispose] = sdkShared.createPassiveHook();
   setup == null ? void 0 : setup(slotContext, {
     onBeforeRender,
     onRender,
     onBeforeRequest,
-    onDispose: onDispose2,
-    onRequest: onRequest2
+    onDispose,
+    onRequest
   });
-  onDispose2(() => {
+  onDispose(() => {
     disposeOnBeforeRender();
     disposeOnRender();
     disposeOnBeforeRequest();
     disposeOnRequest();
     disposeOnDispose();
   });
-  return { runOnBeforeRender, runOnRender, runOnBeforeRequest, runOnRequest: runOnRequest2, runOnDispose: runOnDispose2, onDispose: onDispose2, onBeforeRequest, onRequest: onRequest2, onBeforeRender, onRender };
+  return { runOnBeforeRender, runOnRender, runOnBeforeRequest, runOnRequest, runOnDispose, onDispose, onBeforeRequest, onRequest, onBeforeRender, onRender };
 }
 const renderFunctions = {
   iframe: renderIframe,
@@ -477,7 +370,7 @@ function createSlot(slotOptions) {
   const scope = sdkShared.effectScope();
   return scope.run(() => {
     const slotContext = sdkShared.ref(null);
-    const options = runOnSlotCreate({
+    const options = slotOptions.context.hooks.runOnSlotCreate({
       ...defaultOptions,
       ...slotOptions
     });
@@ -493,13 +386,13 @@ function createSlot(slotOptions) {
       runOnBeforeRender,
       runOnRender,
       runOnBeforeRequest,
-      runOnRequest: runOnRequest2,
-      runOnDispose: runOnDispose2,
+      runOnRequest,
+      runOnDispose,
       ...hooks
-    } = useSlotHooks(options, slotContext, id);
-    const isDisposed2 = sdkShared.ref(false);
+    } = useSlotHooks(options, slotContext);
+    const isDisposed = sdkShared.ref(false);
     const parameters = sdkShared.reactive(new Map(Object.entries(options.parameters ?? {})));
-    const [device, disposeQueryDetector] = useQueryDetector(typeof options.format === "string" ? {
+    const [device, disposeQueryDetector] = useQueryDetector(context, typeof options.format === "string" ? {
       [options.format]: "(min-width: 0px)"
     } : Object.fromEntries(options.format.map((item) => [item.format, item.query])));
     const format = sdkShared.computed(() => typeof options.format === "string" ? options.format : device.value);
@@ -517,7 +410,7 @@ function createSlot(slotOptions) {
       data.value = newAd;
       originalData.value = newAd;
     });
-    const isDomLoaded = useDomLoaded();
+    const isDomLoaded = useDomLoaded(context);
     const element = sdkShared.computed(
       () => {
         var _a;
@@ -544,7 +437,7 @@ function createSlot(slotOptions) {
     hooks.onDispose(() => {
       disposeQueryDetector();
     });
-    onInit(async () => {
+    context.hooks.onInit(async () => {
       var _a;
       status.value = "initialized";
       if (options.lazyLoading)
@@ -580,7 +473,7 @@ function createSlot(slotOptions) {
         });
       }
       if (response)
-        response = await runOnRequest2(response);
+        response = await runOnRequest(response);
       data.value = response;
       if (!originalData.value)
         originalData.value = response;
@@ -592,7 +485,6 @@ function createSlot(slotOptions) {
     async function render(adToRender) {
       status.value = "rendering";
       await sdkShared.waitForDomLoad();
-      await waitOnInit;
       let renderAd = adToRender ?? data.value ?? originalData.value ?? await request();
       renderAd = renderAd && await runOnBeforeRender(renderAd);
       if (!renderAd) {
@@ -644,8 +536,8 @@ function createSlot(slotOptions) {
       cleanElement();
       (_a = impressionTrackingPixelElement.value) == null ? void 0 : _a.remove();
       data.value = null;
-      runOnDispose2();
-      isDisposed2.value = true;
+      runOnDispose();
+      isDisposed.value = true;
       scope.stop();
     }
     const state = sdkShared.reactive({
@@ -661,7 +553,7 @@ function createSlot(slotOptions) {
       isImpressionTracked,
       status,
       element,
-      isDisposed: isDisposed2,
+      isDisposed,
       id,
       render,
       request,
@@ -708,7 +600,7 @@ function createSlotManager({
   function getAll() {
     return Array.from(context.slots).map(([, slot]) => slot);
   }
-  function add2(options) {
+  function add(options) {
     var _a;
     const slot = createSlot({
       ...options,
@@ -755,14 +647,14 @@ function createSlotManager({
     context.slots.clear();
   }
   for (const options of initialSlots) {
-    add2({
+    add({
       ...options,
       lazyLoading: false
     });
   }
   return {
     getAll,
-    add: add2,
+    add,
     findDomSlots: findDomSlots$1,
     get,
     dispose
@@ -775,11 +667,11 @@ function useConsent(context) {
     if (data.tcString)
       consent.value = data.tcString;
   }
-  onInit(() => {
+  context.hooks.onInit(() => {
     var _a;
     (_a = window.__tcfapi) == null ? void 0 : _a.call(window, "addEventListener", 2, onTcfConsentChange);
   });
-  onDispose(() => {
+  context.hooks.onDispose(() => {
     var _a;
     (_a = window.__tcfapi) == null ? void 0 : _a.call(window, "removeEventListener", 2, onTcfConsentChange);
   });
@@ -816,7 +708,7 @@ async function fetchAllUnrenderedSlots(slots) {
   await Promise.allSettled(filteredSlots.map((slot) => slot.request()));
 }
 function useMainQueryDetector(mergedOptions, context) {
-  const [device] = useQueryDetector(mergedOptions.queries);
+  const [device] = useQueryDetector(context, mergedOptions.queries);
   sdkShared.watch(device, async (newDevice) => {
     var _a, _b;
     context.device = newDevice;
@@ -840,7 +732,7 @@ function useMainDebugMode(context) {
   }, {
     immediate: true
   });
-  onDispose(() => {
+  context.hooks.onDispose(() => {
     context.logger.resetLogs();
     context.logger.info("Adhese instance disposed");
   });
@@ -868,6 +760,56 @@ function useMainParameters(context, options) {
     }
   );
 }
+function createGlobalHooks() {
+  const disposeFunctions = /* @__PURE__ */ new Set();
+  let isInit = false;
+  const [runOnInit, onInit, disposeOnInit] = sdkShared.createSyncHook({
+    onRun(callbacks) {
+      isInit = true;
+      callbacks == null ? void 0 : callbacks.clear();
+    },
+    onAdd() {
+      if (isInit)
+        runOnInit();
+    }
+  });
+  disposeFunctions.add(disposeOnInit);
+  let isDisposed = false;
+  const [runOnDispose, onDispose, disposeOnDispose] = sdkShared.createSyncHook({
+    onRun(callbacks) {
+      isDisposed = true;
+      callbacks == null ? void 0 : callbacks.clear();
+    },
+    onAdd() {
+      if (isDisposed)
+        runOnDispose();
+    }
+  });
+  disposeFunctions.add(disposeOnDispose);
+  const [runOnRequest, onRequest, disposeOnRequest] = sdkShared.createAsyncHook();
+  disposeFunctions.add(disposeOnRequest);
+  const [runOnResponse, onResponse, disposeOnResponse] = sdkShared.createAsyncHook();
+  disposeFunctions.add(disposeOnResponse);
+  const [runOnSlotCreate, onSlotCreate, disposeOnSlotCreate] = sdkShared.createSyncHook();
+  disposeFunctions.add(disposeOnSlotCreate);
+  function clearAll() {
+    for (const disposeFunction of disposeFunctions)
+      disposeFunction();
+  }
+  return {
+    runOnInit,
+    onInit,
+    runOnDispose,
+    onDispose,
+    runOnRequest,
+    onRequest,
+    runOnResponse,
+    onResponse,
+    runOnSlotCreate,
+    onSlotCreate,
+    clearAll
+  };
+}
 function createAdhese(options) {
   const scope = sdkShared.effectScope();
   return scope.run(() => {
@@ -888,6 +830,7 @@ function createAdhese(options) {
       ...options
     };
     setupLogging(mergedOptions);
+    const hooks = createGlobalHooks();
     const context = sdkShared.reactive({
       location: mergedOptions.location,
       consent: mergedOptions.consent,
@@ -899,6 +842,7 @@ function createAdhese(options) {
       events: sdkShared.createEventManager(),
       slots: /* @__PURE__ */ new Map(),
       device: "unknown",
+      hooks,
       dispose,
       findDomSlots: findDomSlots2,
       getAll,
@@ -909,11 +853,7 @@ function createAdhese(options) {
       plugin(context, {
         index,
         version,
-        onInit,
-        onDispose,
-        onRequest,
-        onResponse,
-        onSlotCreate
+        hooks
       });
     }
     sdkShared.watch(() => context.location, (newLocation) => {
@@ -954,12 +894,12 @@ function createAdhese(options) {
       slotManager.dispose();
       (_a = context.parameters) == null ? void 0 : _a.clear();
       (_b = context.events) == null ? void 0 : _b.dispose();
-      runOnDispose();
-      clearAllHooks();
+      hooks.runOnDispose();
+      hooks.clearAll();
       scope.stop();
     }
     context.dispose = dispose;
-    onInit(async () => {
+    hooks.onInit(async () => {
       var _a;
       await sdkShared.awaitTimeout(0);
       if ((slotManager.getAll().length ?? 0) > 0)
@@ -971,7 +911,7 @@ function createAdhese(options) {
       if (!scope.active)
         dispose();
     });
-    runOnInit();
+    hooks.runOnInit();
     return context;
   });
 }