@adhese/sdk 0.11.2 → 0.13.0

package/dist/index.cjs

@@ -58,7 +58,7 @@ function createSafeFrame({
 }
 const name = "@adhese/sdk";
 const type = "module";
-const version = "0.11.2";
+const version = "0.13.0";
 const description = "Adhese SDK";
 const license = "GPL-3.0";
 const repository = {
@@ -88,10 +88,10 @@ const scripts = {
   prepareRelease: "npm run build"
 };
 const dependencies = {
-  "@adhese/sdk-shared": "^0.1.0",
+  "@adhese/sdk-shared": "^0.2.0",
   "@vue/runtime-core": "^3.4.21",
   remeda: "^1.61.0",
-  zod: "^3.23.4"
+  zod: "^3.23.5"
 };
 const packageJson = {
   name,
@@ -223,17 +223,6 @@ function createSyncHook(name2, {
   };
   return [run, (callback) => add(callback, { name: name2, onAdd })];
 }
-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));
-  }
-  return [run, (callback) => add(callback, { name: name2, onAdd })];
-}
 function isCallbackAsync(callback) {
   return callback.constructor.name === "AsyncFunction";
 }
@@ -269,77 +258,7 @@ const [runOnInit, onInit] = createSyncHook("onInit", {
       runOnInit();
   }
 });
-const defaultLogLevels = ["trace", "debug", "info", "warn", "error"];
-function createLogger({
-  scope,
-  logLevels = defaultLogLevels,
-  minLogLevelThreshold = logLevels[2]
-}) {
-  const logs = /* @__PURE__ */ new Set();
-  let currentMinLogLevelThreshold = minLogLevelThreshold;
-  const events = sdkShared.createEventManager();
-  const logFunctions = Object.fromEntries(logLevels.map((level, index) => {
-    const logFunction = (message, attributes) => {
-      logs.add({
-        scope,
-        level,
-        message,
-        attributes,
-        timestamp: Date.now(),
-        id: sdkShared.uniqueId()
-      });
-      events.log.dispatch({
-        scope,
-        level,
-        message,
-        attributes,
-        timestamp: Date.now(),
-        id: sdkShared.uniqueId()
-      });
-      if (index >= logLevels.indexOf(currentMinLogLevelThreshold)) {
-        if (["warn", "error", "trace"].includes(level)) {
-          console[level](...[
-            `%c${scope}`,
-            "color: red; font-weight: bold;",
-            message,
-            attributes
-          ].filter(Boolean));
-        } else {
-          console.log(...[
-            `%c${scope} %c${level.toUpperCase()}`,
-            "color: red; font-weight: bold;",
-            "font-weight: bold;",
-            message,
-            attributes
-          ].filter(Boolean));
-        }
-      }
-    };
-    return [level, logFunction];
-  }));
-  return {
-    ...logFunctions,
-    scope,
-    events,
-    setMinLogLevelThreshold(level) {
-      currentMinLogLevelThreshold = level;
-    },
-    resetMinLogLevelThreshold() {
-      currentMinLogLevelThreshold = minLogLevelThreshold;
-    },
-    getMinLogLevelThreshold() {
-      return currentMinLogLevelThreshold;
-    },
-    getLogs() {
-      return Array.from(logs);
-    },
-    resetLogs() {
-      events.reset.dispatch();
-      logs.clear();
-    }
-  };
-}
-const logger = createLogger({
+const logger = sdkShared.createLogger({
   scope: "Adhese SDK"
 });
 const [runOnRequest, onRequest] = createAsyncHook("onRequest");
@@ -541,7 +460,7 @@ function getPreviewObjects() {
   return previewObjects;
 }
 function requestWithPost({
-  context: { options: { host }, parameters },
+  context,
   ...options
 }) {
   const payload = {
@@ -550,9 +469,9 @@ function requestWithPost({
       slotname: runtimeCore.toValue(slot.name),
       parameters: parseParameters(slot.parameters)
     })),
-    parameters: parameters && parseParameters(parameters)
+    parameters: context.parameters && parseParameters(context.parameters)
   };
-  return fetch(`${new URL(host).href}json`, {
+  return fetch(`${new URL(context.options.host).href}json`, {
     method: "POST",
     body: JSON.stringify(payload),
     headers: {
@@ -594,12 +513,12 @@ const debouncedRequestAds = remeda.debounce(async (context) => {
     slots: Array.from(batch.values()).map(({ options }) => options.slot),
     context
   });
-  for (const { options, resolve, reject } of batch.values()) {
+  for (const { options, resolve } of batch.values()) {
     const ad = ads.find(({ slotName }) => runtimeCore.toValue(slotName) === runtimeCore.toValue(options.slot.name));
     if (ad)
       resolve(ad);
     else
-      reject(new Error(`Ad: ${runtimeCore.toValue(options.slot.name)} not found`));
+      resolve(null);
   }
   batch.clear();
   return ads;
@@ -609,8 +528,8 @@ const debouncedRequestAds = remeda.debounce(async (context) => {
 });
 async function requestAd(options) {
   const promise = new Promise(
-    (resolve, reject) => {
-      batch.set(runtimeCore.toValue(options.slot.name), { options, resolve, reject });
+    (resolve) => {
+      batch.set(runtimeCore.toValue(options.slot.name), { options, resolve });
     }
   );
   await debouncedRequestAds.call(options.context);
@@ -621,7 +540,7 @@ async function requestAds(requestOptions) {
   const options = await runOnRequest(requestOptions);
   const { context } = options;
   try {
-    (_a = context.events) == null ? void 0 : _a.requestAd.dispatch({
+    (_a = context == null ? void 0 : context.events) == null ? void 0 : _a.requestAd.dispatch({
       ...options,
       context
     });
@@ -652,13 +571,12 @@ async function requestAds(requestOptions) {
     return mergedResult;
   } catch (error) {
     logger.error(String(error));
-    (_e = context.events) == null ? void 0 : _e.requestError.dispatch(error);
+    (_e = context == null ? void 0 : context.events) == null ? void 0 : _e.requestError.dispatch(error);
     throw error;
   }
 }
 const [runOnRender, onRender] = createAsyncHook("onRender");
 const [runOnSlotCreate, onSlotCreate] = createSyncHook("onSlotCreate");
-const [runOnViewabilityChanged, onViewabilityChanged] = createPassiveHook("onViewabilityChanged");
 function useViewabilityObserver({ context, ad, name: name2, element }) {
   let timeoutId = null;
   const {
@@ -802,16 +720,14 @@ function createSlot(slotOptions) {
       var _a, _b;
       if ((!newAd || oldAd && remeda.isDeepEqual(newAd, oldAd)) && isRendered.value)
         return;
-      if (newIsInViewport || context.options.eagerRendering)
+      if (newIsInViewport)
         await render(newAd ?? void 0);
       (_b = context.events) == null ? void 0 : _b.changeSlots.dispatch(Array.from(((_a = context.getAll) == null ? void 0 : _a.call(context)) ?? []));
     });
     runtimeCore.watch(isInViewport, (value) => {
-      runOnViewabilityChanged({
-        name: name2.value,
-        isInViewport: value
-      });
-    }, { immediate: true });
+      var _a;
+      (_a = options.onViewabilityChanged) == null ? void 0 : _a.call(options, value);
+    });
     const [
       isViewabilityTracked,
       disposeViewabilityObserver
@@ -831,7 +747,11 @@ function createSlot(slotOptions) {
         },
         context
       });
-      originalAd.value = response;
+      if (response) {
+        ad.value = response;
+        if (!originalAd.value)
+          originalAd.value = response;
+      }
       return response;
     }
     async function render(adToRender) {
@@ -839,8 +759,11 @@ function createSlot(slotOptions) {
       await sdkShared.waitForDomLoad();
       await waitOnInit;
       let renderAd = adToRender ?? ad.value ?? originalAd.value ?? await requestAd$1();
-      if (renderAd)
-        renderAd = ((_a = options.onBeforeRender) == null ? void 0 : _a.call(options, renderAd)) ?? renderAd;
+      if (!renderAd) {
+        logger.debug(`No ad to render for slot ${name2.value}`);
+        return null;
+      }
+      renderAd = ((_a = options.onBeforeRender) == null ? void 0 : _a.call(options, renderAd)) ?? renderAd;
       renderAd = await runOnRender(renderAd);
       if (!element.value) {
         const error = `Could not create slot for format ${format.value}. No element found.`;
@@ -889,8 +812,13 @@ function createSlot(slotOptions) {
       queryDetector == null ? void 0 : queryDetector.dispose();
       scope.stop();
     }
+    onInit(async () => {
+      if (options.lazyLoading)
+        return;
+      ad.value = await requestAd$1();
+    });
     return {
-      location: context.location,
+      location: context.location ?? "",
       lazyLoading: options.lazyLoading ?? false,
       slot,
       parameters,
@@ -901,6 +829,7 @@ function createSlot(slotOptions) {
       isImpressionTracked,
       render,
       getElement,
+      request: requestAd$1,
       dispose
     };
   });
@@ -960,6 +889,10 @@ function createSlotManager({
         slot.dispose();
         throw new Error(`Slot with the name: ${slot.name.value} already exists. Create a new slot with a different format, slot, or the location.`);
       }
+      const disposeSlotWatch = runtimeCore.watch(slot.name, (newName, previousName) => {
+        slots.set(newName, slot);
+        slots.delete(previousName);
+      });
       function onDispose2() {
         var _a2;
         slots.delete(slot.name.value);
@@ -968,12 +901,9 @@ function createSlotManager({
           slots: Array.from(slots)
         });
         (_a2 = context.events) == null ? void 0 : _a2.removeSlot.dispatch(slot);
+        disposeSlotWatch();
       }
       slots.set(slot.name.value, slot);
-      runtimeCore.watch(slot.name, (newName, previousName) => {
-        slots.set(newName, slot);
-        slots.delete(previousName);
-      });
       logger.debug("Slot added", {
         slot,
         slots: Array.from(slots.values())
@@ -1087,7 +1017,14 @@ function createAdhese(options) {
       debug: mergedOptions.debug,
       options: mergedOptions,
       logger,
-      isDisposed: false
+      isDisposed: false,
+      parameters: /* @__PURE__ */ new Map(),
+      events: sdkShared.createEventManager(),
+      dispose,
+      findDomSlots: findDomSlots2,
+      getAll,
+      get,
+      addSlot
     });
     for (const [index, plugin] of mergedOptions.plugins.entries()) {
       plugin(context, {
@@ -1098,8 +1035,7 @@ function createAdhese(options) {
         onRender,
         onRequest,
         onResponse,
-        onSlotCreate,
-        onViewabilityChanged
+        onSlotCreate
       });
     }
     context.events = sdkShared.createEventManager();
@@ -1107,52 +1043,39 @@ function createAdhese(options) {
       renderFile: `${mergedOptions.poolHost}/sf/r.html`,
       context
     }) : void 0;
-    function getLocation() {
-      return context.location;
-    }
-    function setLocation(newLocation) {
+    runtimeCore.watch(() => context.location, (newLocation) => {
       var _a;
-      context.location = newLocation;
       (_a = context.events) == null ? void 0 : _a.locationChange.dispatch(newLocation);
-    }
+    });
     const queryDetector = createQueryDetector({
       onChange: onQueryChange,
       queries: mergedOptions.queries
     });
     context.parameters = createParameters(mergedOptions, queryDetector);
     runtimeCore.watch(
-      context.parameters,
-      onParametersChange,
+      () => context.parameters,
+      (newParameters) => {
+        var _a;
+        (_a = context.events) == null ? void 0 : _a.parametersChange.dispatch(newParameters);
+      },
       {
-        deep: true,
-        immediate: true
+        deep: true
       }
     );
-    function onParametersChange() {
-      var _a;
-      if (context.parameters)
-        (_a = context.events) == null ? void 0 : _a.parametersChange.dispatch(context.parameters);
-    }
-    const debouncedFetchAllUnrenderedSlots = remeda.debounce(fetchAllUnrenderedSlots, {
-      waitMs: 100,
-      timing: "both"
-    });
     async function onQueryChange() {
       var _a, _b;
       const query = queryDetector.getQuery();
       (_a = context.parameters) == null ? void 0 : _a.set("dt", query);
       (_b = context.parameters) == null ? void 0 : _b.set("br", query);
-      await debouncedFetchAllUnrenderedSlots.call();
-    }
-    function getConsent() {
-      return context.consent;
+      await fetchAllUnrenderedSlots();
     }
-    function setConsent(newConsent) {
+    runtimeCore.watch(() => context.consent, (newConsent) => {
       var _a, _b;
       (_a = context.parameters) == null ? void 0 : _a.set("tl", newConsent ? "all" : "none");
-      context.consent = newConsent;
       (_b = context.events) == null ? void 0 : _b.consentChange.dispatch(newConsent);
-    }
+    }, {
+      immediate: true
+    });
     const slotManager = createSlotManager({
       initialSlots: mergedOptions.initialSlots,
       context
@@ -1166,30 +1089,20 @@ function createAdhese(options) {
     }
     context.get = get;
     function addSlot(slotOptions) {
-      const newSlot = slotManager.add(slotOptions);
-      debouncedFetchAllUnrenderedSlots.call().catch(logger.error);
-      return newSlot;
+      return slotManager.add(slotOptions);
     }
     context.addSlot = addSlot;
     async function findDomSlots2() {
       const domSlots = (await slotManager.findDomSlots() ?? []).filter((slot) => !slot.lazyLoading);
       if (domSlots.length <= 0)
         return [];
-      const ads = await Promise.all(domSlots.map((slot) => requestAd({
-        slot,
-        context
-      })));
-      for (const ad of ads) {
-        const slot = slotManager.get(ad.slotName);
-        if (slot)
-          slot.ad.value = ad;
-      }
+      await fetchAllUnrenderedSlots();
       return domSlots;
     }
-    async function toggleDebug() {
+    context.findDomSlots = findDomSlots2;
+    runtimeCore.watch(() => context.debug, async (newDebug) => {
       var _a, _b;
-      context.debug = !context.debug;
-      if (context.debug) {
+      if (newDebug) {
         logger.setMinLogLevelThreshold("debug");
         logger.debug("Debug mode enabled");
         (_a = context.events) == null ? void 0 : _a.debugChange.dispatch(true);
@@ -1198,21 +1111,14 @@ function createAdhese(options) {
         logger.setMinLogLevelThreshold("info");
         (_b = context.events) == null ? void 0 : _b.debugChange.dispatch(false);
       }
-      return context.debug;
-    }
+    }, {
+      immediate: true
+    });
     async function fetchAllUnrenderedSlots() {
       const slots = (slotManager.getAll() ?? []).filter((slot) => !slot.lazyLoading && !slot.ad.value);
       if (slots.length === 0)
         return;
-      const ads = await Promise.all(slots.map((slot) => requestAd({
-        slot,
-        context
-      })));
-      for (const ad of ads) {
-        const slot = slotManager.get(ad.slotName);
-        if (slot)
-          slot.ad.value = ad;
-      }
+      await Promise.allSettled(slots.map((slot) => slot.request()));
     }
     const disposeOnTcfConsentChange = onTcfConsentChange(async (data) => {
       var _a, _b;
@@ -1223,7 +1129,7 @@ function createAdhese(options) {
       });
       (_a = context.parameters) == null ? void 0 : _a.set("xt", data.tcString);
       (_b = context.parameters) == null ? void 0 : _b.delete("tl");
-      await debouncedFetchAllUnrenderedSlots.call();
+      await fetchAllUnrenderedSlots();
     });
     function dispose() {
       var _a, _b;
@@ -1240,34 +1146,21 @@ function createAdhese(options) {
       clearAllHooks();
       scope.stop();
     }
+    context.dispose = dispose;
     onInit(async () => {
       var _a;
+      await sdkShared.awaitTimeout(0);
       if ((slotManager.getAll().length ?? 0) > 0)
         await fetchAllUnrenderedSlots().catch(logger.error);
       if (mergedOptions.findDomSlotsOnLoad)
-        await findDomSlots2();
+        await (context == null ? void 0 : context.findDomSlots());
       if (mergedOptions.debug || window.location.search.includes("adhese_debug=true") || isPreviewMode())
         (_a = context.events) == null ? void 0 : _a.debugChange.dispatch(true);
       if (!scope.active)
         dispose();
     });
     runOnInit();
-    return {
-      parameters: context.parameters,
-      events: context.events,
-      getLocation,
-      setLocation,
-      getConsent,
-      setConsent,
-      addSlot,
-      findDomSlots: findDomSlots2,
-      dispose,
-      toggleDebug,
-      get: slotManager.get,
-      getAll: slotManager.getAll,
-      context,
-      options: mergedOptions
-    };
+    return context;
   });
 }
 exports.createAdhese = createAdhese;