@highfivve/ad-tag 5.11.8 → 5.11.9

package/lib/ads/modules/emetriq/trackInApp.js

@@ -1,21 +1,29 @@
-const extractDeviceIdParam = (context, advertiserIdKey) => {
-    const deviceId = context.config__.targeting?.keyValues[advertiserIdKey];
+const extractDeviceIdParam = (targeting, advertiserIdKey) => {
+    const deviceId = targeting[advertiserIdKey];
     if (deviceId) {
         return `&device_id=${typeof deviceId === 'string' ? deviceId : deviceId[0]}`;
     }
     return '';
 };
+const extractKeywordsParam = (targeting, keywordsKey) => {
+    const keywords = keywordsKey ? targeting[keywordsKey] : undefined;
+    if (keywords) {
+        const value = typeof keywords === 'string' ? keywords : keywords.join(',');
+        return `&keywords=${encodeURIComponent(value)}`;
+    }
+    return '';
+};
 export const trackInApp = (context, appConfig, additionalIdentifier, additionalCustomParams, document) => {
-    const deviceIdParam = extractDeviceIdParam(context, appConfig.advertiserIdKey);
+    const targeting = {
+        ...context.config__.targeting?.keyValues,
+        ...context.runtimeConfig__.keyValues
+    };
+    const deviceIdParam = extractDeviceIdParam(targeting, appConfig.advertiserIdKey);
     const consentString = context.tcData__.gdprApplies
         ? `gdpr=1&gdpr_consent=${context.tcData__.tcString}`
         : 'gdpr=0';
-    const linkParam = appConfig.linkOrKeyword.link
-        ? `&link=${encodeURIComponent(appConfig.linkOrKeyword.link)}`
-        : '';
-    const keywordsParam = appConfig.linkOrKeyword.keywords
-        ? `&keywords=${encodeURIComponent(appConfig.linkOrKeyword.keywords)}`
-        : '';
+    const linkParam = `&link=${encodeURIComponent(context.window__.location.href)}`;
+    const keywordsParam = extractKeywordsParam(targeting, appConfig.keywordsKey);
     let additionalIdsParam = '';
     const identifiers = { ...appConfig.additionalIdentifier, ...additionalIdentifier };
     Object.entries(identifiers).forEach(([key, value]) => {

package/lib/ads/moli.js

@@ -231,6 +231,16 @@ export const createMoliTag = (window) => {
         }
         return Promise.resolve(null);
     }
+    function refreshQueuedInfiniteSlots(config, runtimeConfig) {
+        const { refreshInfiniteSlots } = runtimeConfig;
+        if (refreshInfiniteSlots.length === 0) {
+            return config;
+        }
+        const log = getLogger(runtimeConfig, window);
+        const configWithInfiniteSlots = refreshInfiniteSlots.reduce((currentConfig, slot) => addNewInfiniteSlotToConfig(currentConfig, slot.idOfConfiguredSlot, slot.artificialDomId, log), config);
+        adService.refreshAdSlots(refreshInfiniteSlots.map(slot => slot.artificialDomId), configWithInfiniteSlots, runtimeConfig);
+        return configWithInfiniteSlots;
+    }
     function requestAds() {
         switch (state.state) {
             case 'configurable': {
@@ -324,7 +334,8 @@ export const createMoliTag = (window) => {
                         const validateLocation = config.spa?.validateLocation ?? 'href';
                         if (state.state === 'spa-requestAds' &&
                             allowRefreshAdSlot(validateLocation, state.href, window.location)) {
-                            const { config, runtimeConfig } = state;
+                            const { runtimeConfig } = state;
+                            const config = refreshQueuedInfiniteSlots(state.config, runtimeConfig);
                             if (state.runtimeConfig.refreshSlots.length > 0) {
                                 adService.refreshAdSlots(runtimeConfig.refreshSlots, config, runtimeConfig);
                             }
@@ -336,6 +347,7 @@ export const createMoliTag = (window) => {
                             afterRequestAds.forEach(hook => hook('spa-finished'));
                             const finishedState = {
                                 ...state,
+                                config,
                                 state: 'spa-finished',
                                 nextRuntimeConfig: newEmptyRuntimeConfig(state.runtimeConfig),
                                 runtimeConfig: newEmptyRuntimeConfig(state.runtimeConfig, { keepTargeting: true })
@@ -432,8 +444,9 @@ export const createMoliTag = (window) => {
                     }
                     return adService.requestAds(config, nextRuntimeConfig).then(() => config);
                 })
-                    .then(config => {
+                    .then(requestedConfig => {
                     const runtimeConfig = state.runtimeConfig;
+                    const config = refreshQueuedInfiniteSlots(requestedConfig, runtimeConfig);
                     if (state.runtimeConfig.refreshSlots.length > 0) {
                         adService.refreshAdSlots(state.runtimeConfig.refreshSlots, config, state.runtimeConfig);
                     }

package/lib/gen/packageJson.js

@@ -1,3 +1,3 @@
 export const packageJson = {
-    version: '5.11.8'
+    version: '5.11.9'
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highfivve/ad-tag",
-  "version": "5.11.8",
+  "version": "5.11.9",
   "license": "Apache-2.0",
   "description": "An ad tag implementation called moli",
   "main": "./lib/index.js",