@schibsted/pulse-sdk 8.0.0-rc.2 → 8.0.0-rc.21

package/dist/cjs/identity/actor.js

@@ -3,16 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.evaluateActor = exports.userIsLoggedIn = exports.getActor = exports.getUserId = exports.WARN_CIS_SYNC_LOGIN_UNDEFINED = void 0;
-const pulse_utils_1 = require("@schibsted/pulse-utils");
+exports.userIsLoggedIn = exports.getUserId = exports.getActor = exports.evaluateActor = exports.WARN_CIS_SYNC_LOGIN_UNDEFINED = void 0;
 const actor_1 = require("../builders/actor");
+const utils_1 = require("../utils");
 const warnOnce_1 = __importDefault(require("../warnOnce"));
 /**
  * @internal exported for testing
  */
-exports.WARN_CIS_SYNC_LOGIN_UNDEFINED = 'Cis sync initiated with no actor builder and no event available. If you do not use a login system, please indicate' +
-    ' this using tracker.update({ actor: undefined }), otherwise do tracker.update({ actor: somePromise }) with a' +
-    ' promise that resolves to the login state.';
+exports.WARN_CIS_SYNC_LOGIN_UNDEFINED = 'No Actor Builder found in event input or tracker builders. Please provide an Actor Builder to ensure the SDK resolves logged-in and logged-out scenarios correctly.';
 /**
  * Get the actor id (userId) from the current browser. A promise is returned
  * because a call may be made to complete the login process.
@@ -33,6 +31,19 @@ const getActor = async (builders) => {
     return await evaluateActor(builders);
 };
 exports.getActor = getActor;
+/**
+ * Pinpoints the Actor Builder from the Event payload or the available Builders
+ * @param eventInput - The event input which may contain an `actor` property
+ * @param builders - The builders managed by the SDK.
+ */
+function getActorSource(eventInput = {}, builders = {}) {
+    if ((0, actor_1.hasActorBuilder)(eventInput)) {
+        return eventInput.actor;
+    }
+    if ((0, actor_1.hasActorBuilder)(builders)) {
+        return builders.actor;
+    }
+}
 const userIsLoggedIn = async (builders) => {
     const actor = await getActor(builders);
     return !!actor?.id;
@@ -45,8 +56,9 @@ exports.userIsLoggedIn = userIsLoggedIn;
  * @private
  */
 const evaluateActor = async (eventInput = {}, builders = {}) => {
-    if ((0, actor_1.isActorInput)(eventInput) || (0, actor_1.isActorInput)(builders)) {
-        const evaluatedActor = await (0, pulse_utils_1.evaluateAndFlatten)(eventInput.actor || builders.actor);
+    const actorSource = getActorSource(eventInput, builders);
+    if (actorSource) {
+        const evaluatedActor = await (0, utils_1.evaluateAndFlatten)(actorSource);
         if (evaluatedActor) {
             return evaluatedActor;
         }
@@ -54,7 +66,7 @@ const evaluateActor = async (eventInput = {}, builders = {}) => {
     // We allow an empty actor object, because it is a sign that the application is not setting nor updating Actor correctly.
     // Inferring "id: undefined" as a fallback would mask that bug.
     // Hence, the warning below.
-    (0, warnOnce_1.default)('no-actor-builder-and-no-event-present', exports.WARN_CIS_SYNC_LOGIN_UNDEFINED);
+    (0, warnOnce_1.default)('no-actor-builder', exports.WARN_CIS_SYNC_LOGIN_UNDEFINED);
     return {};
 };
 exports.evaluateActor = evaluateActor;

package/dist/cjs/identity/advertising.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAdvertisingIdentifiers = exports.getIncludeAdvertising = exports.getAdId = void 0;
+exports.getIncludeAdvertising = exports.getAdvertisingIdentifiers = exports.getAdId = void 0;
 const actor_1 = require("./actor");
 const cis_1 = require("./cis");
 /**

package/dist/cjs/identity/cis.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requireCisSyncCallForAdvertisingIds = exports.cisSync = exports.clearCookieJweIfStale = void 0;
-const pulse_cis_sync_1 = require("@schibsted/pulse-cis-sync");
-Object.defineProperty(exports, "clearCookieJweIfStale", { enumerable: true, get: function () { return pulse_cis_sync_1.clearCookieJweIfStale; } });
+exports.requireCisSyncCallForAdvertisingIds = exports.clearCookieJweIfStale = exports.cisSync = void 0;
+const cis_sync_1 = require("../cis-sync");
+Object.defineProperty(exports, "clearCookieJweIfStale", { enumerable: true, get: function () { return cis_sync_1.clearCookieJweIfStale; } });
 const version_1 = require("../version");
 const actor_1 = require("./actor");
 const requireCisSyncCallForAdvertisingIds = () => {
-    (0, pulse_cis_sync_1.resetRefreshAfter)(new Date());
+    (0, cis_sync_1.resetRefreshAfter)(new Date());
 };
 exports.requireCisSyncCallForAdvertisingIds = requireCisSyncCallForAdvertisingIds;
 /**
@@ -45,14 +45,15 @@ const cisSync = async (data, builders, config) => {
     // _pulse2data cookie, or just not do the sync.
     //
     const actorPromise = (0, actor_1.evaluateActor)(data, builders);
-    const { cisBaseUrl, cisEnabled, includeAdvertising: includeAdvertisingPromise, isHybrid, nativeJwe, providerId, trackerId, vendors, } = config || {};
+    const { adChoicesEnabled, cisBaseUrl, cisEnabled, includeAdvertising: includeAdvertisingPromise, isHybrid, nativeJwe, providerId, trackerId, vendors, } = config || {};
     const [includeAdvertising, actor] = await Promise.all([includeAdvertisingPromise, actorPromise]);
     const { id, realm } = actor;
     if (cisEnabled) {
         // @ts-expect-error
-        return (0, pulse_cis_sync_1.syncWithCis)(
+        return (0, cis_sync_1.syncWithCis)(
         // @ts-expect-error
         id, nativeJwe, cisBaseUrl, realm, providerId, isHybrid ? 'Hybrid' : 'Web', version_1.SDK_VERSION, {
+            adChoicesEnabled,
             includeAdvertising,
             vendors,
             trackerId,

package/dist/cjs/index.js

@@ -39,19 +39,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unsubscribe = exports.subscribeWithState = exports.subscribeOnce = exports.subscribe = exports.getPulseTracker = exports.createPulseTracker = exports.Tracker = exports.EventBuilders = void 0;
+exports.Tracker = exports.unsubscribe = exports.subscribeWithState = exports.subscribeOnce = exports.subscribe = exports.getPulseTracker = exports.createPulseTracker = exports.EventBuilders = void 0;
 const Tracker_1 = __importDefault(require("./Tracker"));
 exports.Tracker = Tracker_1.default;
 exports.default = Tracker_1.default;
 exports.EventBuilders = __importStar(require("./builders"));
-__exportStar(require("./Tracker"), exports);
-__exportStar(require("@schibsted/tpaas-schemas"), exports);
 var createPulseTracker_1 = require("./createPulseTracker");
 Object.defineProperty(exports, "createPulseTracker", { enumerable: true, get: function () { return createPulseTracker_1.createPulseTracker; } });
 var getPulseTracker_1 = require("./getPulseTracker");
 Object.defineProperty(exports, "getPulseTracker", { enumerable: true, get: function () { return getPulseTracker_1.getPulseTracker; } });
+__exportStar(require("./Tracker"), exports);
 var Tracker_2 = require("./Tracker");
 Object.defineProperty(exports, "subscribe", { enumerable: true, get: function () { return Tracker_2.subscribe; } });
 Object.defineProperty(exports, "subscribeOnce", { enumerable: true, get: function () { return Tracker_2.subscribeOnce; } });
 Object.defineProperty(exports, "subscribeWithState", { enumerable: true, get: function () { return Tracker_2.subscribeWithState; } });
 Object.defineProperty(exports, "unsubscribe", { enumerable: true, get: function () { return Tracker_2.unsubscribe; } });
+__exportStar(require("./tpaas-schemas"), exports);

package/dist/cjs/leaveTracking/index.js

@@ -44,16 +44,16 @@ exports.trackPageLeave = trackPageLeave;
 exports.updateViewedContent = updateViewedContent;
 exports.addEventListeners = addEventListeners;
 exports.removeEventListeners = removeEventListeners;
-const pulse_utils_1 = require("@schibsted/pulse-utils");
 const logger = __importStar(require("loglevel"));
 const Tracker_1 = require("../Tracker");
+const utils_1 = require("../utils");
 const constants_1 = require("./constants");
 const types_1 = require("./types");
 let pageLeaveListeners = [];
 let updateViewedContentListeners = [];
 let activityListeners = [];
 let resizeObserver = null;
-let throttledUpdateFn = (0, pulse_utils_1.throttle)(() => undefined, 0);
+let throttledUpdateFn = (0, utils_1.throttle)(() => undefined, 0);
 let startTime = 0;
 let activityDuration = (0, constants_1.DEFAULT_ACTIVITY_DURATION)();
 let currentPageLeaveEvent = (0, constants_1.DEFAULT_PAGE_LEAVE_EVENT)();
@@ -177,7 +177,7 @@ const resetTime = () => Date.now();
  Update the default Leave event with an event supplied by the brand
  */
 function updatePageLeaveEvent(leaveEvent) {
-    (0, pulse_utils_1.pulseMerge)(currentPageLeaveEvent, leaveEvent);
+    (0, utils_1.pulseMerge)(currentPageLeaveEvent, leaveEvent);
 }
 /*
  Send a Leave event only if Page Leave tracking is active in the SDK
@@ -202,7 +202,7 @@ async function trackPageLeave(tracker, providedEvent, eventName) {
     const endTime = Date.now();
     const duration = endTime - startTime;
     const leaveEvent = providedEvent || currentLeaveEventBuilder();
-    const mergedEvent = (0, pulse_utils_1.pulseMerge)({
+    const mergedEvent = (0, utils_1.pulseMerge)({
         ...currentPageLeaveEvent,
         engagement: {
             duration,
@@ -227,7 +227,7 @@ async function trackPageLeave(tracker, providedEvent, eventName) {
  */
 function addUpdateViewedContentListeners(objectElement, pageElement, objectResizable) {
     updateViewedContent(objectElement, pageElement);
-    throttledUpdateFn = (0, pulse_utils_1.throttle)(() => updateViewedContent(objectElement, pageElement), 500);
+    throttledUpdateFn = (0, utils_1.throttle)(() => updateViewedContent(objectElement, pageElement), 500);
     updateViewedContentListeners = addEventListeners([types_1.BrowserEvents.SCROLL, types_1.BrowserEvents.RESIZE], throttledUpdateFn);
     if (objectResizable) {
         if (!resizeObserver) {
@@ -250,7 +250,7 @@ function addUpdateViewedContentListeners(objectElement, pageElement, objectResiz
   {maxPageViewPercentage} The maximum relative scroll position the user has seen in %.
 */
 function updateViewedContent(objectElement, pageElement) {
-    const { totalHeight: additionalTotalHeight, viewedHeight: additionalViewedHeight } = (0, pulse_utils_1.isFunction)(additionalHeightBuilder)
+    const { totalHeight: additionalTotalHeight, viewedHeight: additionalViewedHeight } = (0, utils_1.isFunction)(additionalHeightBuilder)
         ? additionalHeightBuilder()
         : { totalHeight: 0, viewedHeight: 0 };
     const objectScrolledPixels = (0, exports.calculateScrolledPixels)(objectElement) + additionalViewedHeight;
@@ -262,7 +262,7 @@ function updateViewedContent(objectElement, pageElement) {
     const pageViewPercentage = calculateViewPercentage(pageScrolledPixels, pageElement.scrollHeight + additionalTotalHeight);
     const maxPageViewPercentage = Math.max(pageViewPercentage, Number(currentPageLeaveEvent.engagement.maxPageViewPercentage));
     logger.debug('updateViewedContent:before:engagement', { ...currentPageLeaveEvent.engagement });
-    (0, pulse_utils_1.pulseMerge)(currentPageLeaveEvent.engagement, {
+    (0, utils_1.pulseMerge)(currentPageLeaveEvent.engagement, {
         pageScrollPosition,
         maxPageScrollPosition,
         objectViewPercentage,
@@ -274,7 +274,7 @@ function updateViewedContent(objectElement, pageElement) {
 }
 const calculateScrolledPixels = (element) => {
     const rect = element.getBoundingClientRect();
-    const scrolledPixels = pulse_utils_1.isBrowser ? element.scrollHeight - rect.bottom + window.innerHeight : 0;
+    const scrolledPixels = utils_1.isBrowser ? element.scrollHeight - rect.bottom + window.innerHeight : 0;
     if (scrolledPixels <= 0) {
         return 0;
     }
@@ -325,7 +325,7 @@ function resetLastActivity(activityDuration) {
  */
 function addEventListeners(events, handler, options) {
     return events.map((eventName) => {
-        if (pulse_utils_1.isBrowser) {
+        if (utils_1.isBrowser) {
             window.addEventListener(eventName, handler, options);
         }
         return [eventName, handler];
@@ -336,7 +336,7 @@ function addEventListeners(events, handler, options) {
  */
 function removeEventListeners(eventListeners, options = {}) {
     for (const [eventName, listener] of eventListeners) {
-        if (pulse_utils_1.isBrowser) {
+        if (utils_1.isBrowser) {
             window.removeEventListener(eventName, listener, options);
         }
     }

package/dist/cjs/leaveTrackingTpaas/constants.js

@@ -1,12 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_PAGE_LEAVE_EVENT = exports.DEFAULT_ACTIVITY_DURATION = void 0;
-const DEFAULT_ACTIVITY_DURATION = () => ({
-    value: 0,
-    interval: undefined,
-    timeSinceLastActivity: 0,
-});
-exports.DEFAULT_ACTIVITY_DURATION = DEFAULT_ACTIVITY_DURATION;
+exports.ACTIVITY_DURATION_LIMIT_MS = exports.DEFAULT_PAGE_LEAVE_EVENT = void 0;
 const DEFAULT_PAGE_LEAVE_EVENT = () => ({
     objectViewPercentage: 0,
     maxObjectViewPercentage: 0,
@@ -16,3 +10,4 @@ const DEFAULT_PAGE_LEAVE_EVENT = () => ({
     maxPageScrollPosition: 0,
 });
 exports.DEFAULT_PAGE_LEAVE_EVENT = DEFAULT_PAGE_LEAVE_EVENT;
+exports.ACTIVITY_DURATION_LIMIT_MS = 30000;

package/dist/cjs/leaveTrackingTpaas/index.js

@@ -45,8 +45,8 @@ exports.updateTpaasViewedContent = updateTpaasViewedContent;
 exports.addEventListeners = addEventListeners;
 exports.removeEventListeners = removeEventListeners;
 exports.shouldEnableLeaveTracking = shouldEnableLeaveTracking;
-const pulse_utils_1 = require("@schibsted/pulse-utils");
 const logger = __importStar(require("loglevel"));
+const utils_1 = require("../utils");
 const constants_1 = require("./constants");
 const types_1 = require("./types");
 let currentLeaveSchema;
@@ -55,20 +55,45 @@ let leaveListeners = [];
 let updateViewedContentListeners = [];
 let activityListeners = [];
 let resizeObserver = null;
-let throttledUpdateFn = (0, pulse_utils_1.throttle)(() => undefined, 0);
-let startTime = 0;
-let activityDuration = (0, constants_1.DEFAULT_ACTIVITY_DURATION)();
+let throttledUpdateFn = (0, utils_1.throttle)(() => undefined, 0);
+let durationStartTime = 0;
+let previousActivityTime = 0;
+let activityDurationMs = 0;
 let currentLeaveEvent = (0, constants_1.DEFAULT_PAGE_LEAVE_EVENT)();
 let additionalHeightBuilder;
+/**
+ * Resolves a DOM element from either a CSS selector string or an Element instance.
+ */
+function resolveDomElement(element) {
+    try {
+        return typeof element === 'string' ? document.querySelector(element) : element || null;
+    }
+    catch (e) {
+        logger.error('Error while resolving DOM element', e);
+        return null;
+    }
+}
 /*
  Add leave tracking
  */
 function addTpaasLeaveTracking({ objectElement, pageElement, schema, objectResizable, heightBuilder, trackMethod, }) {
     function _addLeaveTracking() {
+        const objectDomElement = resolveDomElement(objectElement);
+        if (objectDomElement == null) {
+            logger.error('Could not find object element for leave tracking');
+            return;
+        }
+        let pageDomElement = resolveDomElement(pageElement);
+        if (pageDomElement == null) {
+            logger.warn('Could not find page element for leave tracking, defaulting to document.body');
+            pageDomElement = document.body;
+        }
         additionalHeightBuilder = heightBuilder;
         addTpaasLeaveListeners();
-        addUpdateEventListeners(objectElement, pageElement || document.body, objectResizable);
-        startTime = resetTime();
+        addUpdateEventListeners(objectDomElement, pageDomElement, objectResizable);
+        previousActivityTime = resetTime();
+        durationStartTime = resetTime();
+        activityDurationMs = 0;
         currentLeaveSchema = schema;
         currentTrackMethod = trackMethod;
         logger.debug('addLeaveTracking:after:state', currentLeaveEvent);
@@ -160,12 +185,9 @@ function removeUpdateEventListeners() {
  */
 const resetEventDefaults = () => {
     currentLeaveEvent = (0, constants_1.DEFAULT_PAGE_LEAVE_EVENT)();
-    startTime = resetTime();
-    activityDuration = resetActivityDuration();
-};
-const resetActivityDuration = () => {
-    clearInterval(activityDuration.interval);
-    return (0, constants_1.DEFAULT_ACTIVITY_DURATION)();
+    durationStartTime = resetTime();
+    previousActivityTime = resetTime();
+    activityDurationMs = 0;
 };
 const resetTpaasViewedContent = () => {
     currentLeaveEvent = (0, constants_1.DEFAULT_PAGE_LEAVE_EVENT)();
@@ -174,34 +196,43 @@ exports.resetTpaasViewedContent = resetTpaasViewedContent;
 const resetTime = () => Date.now();
 /*
  Send a Leave event only if Page Leave tracking is active in the SDK
- The event that is ultimately sent is a merge between the default event
- saved in this file and the event supplied by the brand, with preference going
- to the brand event. After the event has been sent, leave page tracking is removed
+ The event that is ultimately sent is the View event saved in the currentTrackMethod callback.
+ After the event has been sent, leave page tracking is removed
  and must be explicitly re-added if needed.
 */
-function trackTpaasActiveLeave() {
+async function trackTpaasActiveLeave() {
     if (leaveTpaasTrackingIsActive()) {
-        trackTpaasLeave();
+        await trackTpaasLeave();
     }
 }
 /*
  Send a Leave event regardless of whether Page Leave tracking is active in the SDK
- The event that is ultimately sent is a merge between the default event
- saved in this file and the event supplied by the brand, with preference going
- to the brand event. After the event has been sent, leave page tracking is removed
+ The event that is ultimately sent is the View event saved in the currentTrackMethod callback.
+ After the event has been sent, leave page tracking is removed
  and must be explicitly re-added if needed.
  */
-function trackTpaasLeave() {
+async function trackTpaasLeave() {
     const leave = getTpaasLeaveObject();
-    currentTrackMethod(leave);
+    // Capture currentTrackMethod and remove tracking synchronously before awaiting.
+    // If removal happened after the await, a new trackView* call arriving during the async
+    // gap would see tracking still active with the same schema and silently discard its
+    // new callback (e.g. a fresh leaveAudioBuilder), causing the next leave event to
+    // never fire or to use the wrong builder.
+    const trackMethod = currentTrackMethod;
     removeTpaasLeaveTracking();
+    await trackMethod(leave);
 }
 function getTpaasLeaveObject() {
     const endTime = Date.now();
-    const duration = endTime - startTime;
+    // TPaaS leave event requires duration/activity to be at least 1ms, otherwise the event is rejected
+    // also, in practice, it's almost impossible to have an activity or duration of 0ms
+    // We don't call increaseActivityDuration here because it's possible to call getTpaasLeaveObject multiple times
+    // without any activity events in between, which would incorrectly increase the activity duration.
+    const durationMs = Math.max(endTime - durationStartTime, 1);
+    const lastActivityDuration = calculateActivityGap(endTime);
     const leave = {
-        durationMs: duration,
-        activityDurationMs: activityDuration.value,
+        durationMs,
+        activityDurationMs: Math.max(activityDurationMs + lastActivityDuration, 1),
         ...currentLeaveEvent,
     };
     logger.debug('trackTpaasLeave: event', leave);
@@ -213,7 +244,7 @@ function getTpaasLeaveObject() {
  */
 function addUpdateViewedContentListeners(objectElement, pageElement, objectResizable) {
     updateTpaasViewedContent(objectElement, pageElement);
-    throttledUpdateFn = (0, pulse_utils_1.throttle)(() => updateTpaasViewedContent(objectElement, pageElement), 500);
+    throttledUpdateFn = (0, utils_1.throttle)(() => updateTpaasViewedContent(objectElement, pageElement), 500);
     updateViewedContentListeners = addEventListeners([types_1.BrowserEvents.SCROLL, types_1.BrowserEvents.RESIZE], throttledUpdateFn);
     if (objectResizable) {
         if (!resizeObserver) {
@@ -236,7 +267,7 @@ function addUpdateViewedContentListeners(objectElement, pageElement, objectResiz
   {maxPageViewPercentage} The maximum relative scroll position the user has seen in %.
 */
 function updateTpaasViewedContent(objectElement, pageElement) {
-    const { totalHeight: additionalTotalHeight, viewedHeight: additionalViewedHeight } = (0, pulse_utils_1.isFunction)(additionalHeightBuilder)
+    const { totalHeight: additionalTotalHeight, viewedHeight: additionalViewedHeight } = (0, utils_1.isFunction)(additionalHeightBuilder)
         ? additionalHeightBuilder()
         : { totalHeight: 0, viewedHeight: 0 };
     const objectScrolledPixels = (0, exports.calculateScrolledPixels)(objectElement) + additionalViewedHeight;
@@ -260,7 +291,7 @@ function updateTpaasViewedContent(objectElement, pageElement) {
 }
 const calculateScrolledPixels = (element) => {
     const rect = element.getBoundingClientRect();
-    const scrolledPixels = pulse_utils_1.isBrowser ? element.scrollHeight - rect.bottom + window.innerHeight : 0;
+    const scrolledPixels = utils_1.isBrowser ? element.scrollHeight - rect.bottom + window.innerHeight : 0;
     if (scrolledPixels <= 0) {
         return 0;
     }
@@ -276,18 +307,10 @@ exports.calculateScrollPosition = calculateScrollPosition;
  'mousedown', 'mousemove', 'keydown', 'scroll' and/or 'touchstart' browser events.
  */
 function addUpdateActivityDurationListeners() {
-    if (activityDuration.interval !== undefined) {
-        // If the interval is already set, do not set it again
+    // if there are already listeners for activity, do not add more
+    if (activityListeners.length > 0) {
         return;
     }
-    const interval = 1000;
-    const activityTimeout = 30 * 1000;
-    activityDuration.interval = window.setInterval(() => {
-        activityDuration.timeSinceLastActivity += interval;
-        if (activityDuration.timeSinceLastActivity < activityTimeout) {
-            activityDuration.value += interval;
-        }
-    }, interval);
     const activityEvents = [
         types_1.BrowserEvents.SCROLL,
         types_1.BrowserEvents.MOUSEDOWN,
@@ -296,21 +319,22 @@ function addUpdateActivityDurationListeners() {
         types_1.BrowserEvents.TOUCHSTART,
     ];
     activityListeners = addEventListeners(activityEvents, () => {
-        activityDuration = resetLastActivity(activityDuration);
+        increaseActivityDuration(Date.now());
     }, { passive: true });
 }
-function resetLastActivity(activityDuration) {
-    return {
-        ...activityDuration,
-        timeSinceLastActivity: 0,
-    };
+function calculateActivityGap(activityEndTime) {
+    return Math.min(activityEndTime - previousActivityTime, constants_1.ACTIVITY_DURATION_LIMIT_MS);
+}
+function increaseActivityDuration(activityEndTime) {
+    activityDurationMs += calculateActivityGap(activityEndTime);
+    previousActivityTime = resetTime();
 }
 /*
  Add listeners to a set of browser events.
  */
 function addEventListeners(events, handler, options) {
     return events.map((eventName) => {
-        if (pulse_utils_1.isBrowser) {
+        if (utils_1.isBrowser) {
             window.addEventListener(eventName, handler, options);
         }
         return [eventName, handler];
@@ -321,7 +345,7 @@ function addEventListeners(events, handler, options) {
  */
 function removeEventListeners(eventListeners, options = {}) {
     for (const [eventName, listener] of eventListeners) {
-        if (pulse_utils_1.isBrowser) {
+        if (utils_1.isBrowser) {
             window.removeEventListener(eventName, listener, options);
         }
     }

package/dist/cjs/network-browser.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = send;
-const pulse_utils_1 = require("@schibsted/pulse-utils");
-const supportsBeacon = () => pulse_utils_1.isBrowser && Boolean(window.navigator.sendBeacon);
+const utils_1 = require("./utils");
+const supportsBeacon = () => utils_1.isBrowser && Boolean(window.navigator.sendBeacon);
 function send(url, data, sdkConfig) {
     // if there is as large number of events, only send 10 in each request
     const eventChunks = Array.isArray(data)
@@ -17,7 +17,7 @@ function send(url, data, sdkConfig) {
             return acc;
         }, [[]])
         : [[data]];
-    if (pulse_utils_1.isBrowser && supportsBeacon() && (sdkConfig.useBeaconWhenAvailable || sdkConfig.useBeacon)) {
+    if (utils_1.isBrowser && supportsBeacon() && (sdkConfig.useBeaconWhenAvailable || sdkConfig.useBeacon)) {
         const result = eventChunks.reduce((previousStatus, eventChunk) => previousStatus && window.navigator.sendBeacon(url, JSON.stringify(eventChunk)), true);
         if (result) {
             return Promise.resolve(true);

package/dist/cjs/remoteConfig/index.js

@@ -11,8 +11,8 @@ exports.clearInMemoryConfig = clearInMemoryConfig;
 exports.shouldSyncRemoteConfig = shouldSyncRemoteConfig;
 exports.resolveConfigServicesByTag = resolveConfigServicesByTag;
 exports.syncRemoteConfig = syncRemoteConfig;
-const pulse_utils_1 = require("@schibsted/pulse-utils");
 const loglevel_1 = __importDefault(require("loglevel"));
+const utils_1 = require("../utils");
 const CIS_KEY = 'cis';
 const COLLECTOR_KEY = 'collector';
 const getRemoteConfigStorageKey = '_pulse.internal.remote.config';
@@ -36,7 +36,7 @@ async function fetchRemoteConfigWithRetry(url, retries = 3) {
 }
 function readConfigFromStorage() {
     try {
-        return JSON.parse(pulse_utils_1.webApi.localStorage?.getItem(getRemoteConfigStorageKey) ?? '');
+        return JSON.parse(utils_1.webApi.localStorage?.getItem(getRemoteConfigStorageKey) ?? '');
     }
     catch (_err) {
         return null;
@@ -51,7 +51,7 @@ function writeConfigToStorage(config, url) {
                 updatedAt: new Date().toISOString(),
             },
         };
-        pulse_utils_1.webApi.localStorage?.setItem(getRemoteConfigStorageKey, JSON.stringify(configPersistence));
+        utils_1.webApi.localStorage?.setItem(getRemoteConfigStorageKey, JSON.stringify(configPersistence));
         return configPersistence;
     }
     catch (_err) {
@@ -60,7 +60,7 @@ function writeConfigToStorage(config, url) {
 }
 function clearConfigFromStorage() {
     try {
-        pulse_utils_1.webApi.localStorage?.removeItem(getRemoteConfigStorageKey);
+        utils_1.webApi.localStorage?.removeItem(getRemoteConfigStorageKey);
         return true;
     }
     catch (_err) {
@@ -86,7 +86,7 @@ function shouldSyncRemoteConfig(url, config, metadata) {
         url !== metadata?.remoteConfigUrl);
 }
 function resolveConfigServicesByTag(tag, config) {
-    if ((0, pulse_utils_1.isString)(tag) && config) {
+    if ((0, utils_1.isString)(tag) && config) {
         let services = config.scopes?.[tag]?.services || null;
         if (!services && tag !== 'default') {
             services = config.scopes.default.services;

package/dist/cjs/session/store.js

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.touchSession = exports.readSession = exports.generateSessionSDRN = void 0;
+const uuid_1 = require("uuid");
+const utils_1 = require("../utils");
+const { USE_LOCALSTORAGE } = utils_1.cookieConfig;
+const SESSION_STORAGE_KEY = '_pulsesession';
+const SESSION_MAX_INTERVAL_MS = 30 * 60 * 1000; // 30 minutes
+/**
+ * @private
+ */
+const generateSessionSDRN = (sessionId) => `${utils_1.SESSION_SDRN_PREFIX}${sessionId}`;
+exports.generateSessionSDRN = generateSessionSDRN;
+// Return parsed json from cookie (or localStorage if enabled), or undefined.
+const readAndParse = () => {
+    try {
+        const storedSession = (0, utils_1.readCookie)(SESSION_STORAGE_KEY);
+        if (storedSession) {
+            return JSON.parse(storedSession);
+        }
+    }
+    catch (_e) {
+        // If localStorage/cookie is not available, we treat it as if
+        // the value is undefined.
+        // If data is unparseable, we also ignore it.
+        return undefined;
+    }
+    return undefined;
+};
+/**
+ * Reads the stored session. Any invalid or unreadable data is ignored.
+ * @private
+ */
+const readSession = () => {
+    const storedSession = readAndParse();
+    if (storedSession) {
+        const [sessionSdrn, startTimeMs, lastEventTimeMs] = storedSession;
+        const startTime = new Date(startTimeMs);
+        const lastEventTime = new Date(lastEventTimeMs);
+        if (sessionSdrn && !Number.isNaN(startTime.getTime()) && !Number.isNaN(lastEventTime.getTime())) {
+            return {
+                // the session is stored as an SDRN, for compatibility with legacy events and older SDK versions
+                sessionId: sessionSdrn.replace(utils_1.SESSION_SDRN_PREFIX, ''),
+                startTime,
+                lastEventTime,
+            };
+        }
+    }
+    return undefined;
+};
+exports.readSession = readSession;
+const writeSession = ({ sessionId, startTime, lastEventTime }) => {
+    try {
+        // SDK v8 (supporting TPaaS events) needs to be compatible with legacy events AND older SDK versions
+        // as a result, we can't store just the sessionId, we need the full SDRN in there
+        const sessionToStore = [
+            (0, exports.generateSessionSDRN)(sessionId),
+            startTime.getTime(),
+            lastEventTime.getTime(),
+        ];
+        const halfHourInDays = 1.0 / (24 * 2);
+        (0, utils_1.writeCookie)(SESSION_STORAGE_KEY, JSON.stringify(sessionToStore), (0, utils_1.getRootDomain)(), halfHourInDays);
+        // Delete old localStorage-based session if needed
+        if (!USE_LOCALSTORAGE) {
+            // removeItem will do nothing to a non-existing item.
+            utils_1.webApi.localStorage?.removeItem(SESSION_STORAGE_KEY);
+        }
+    }
+    catch (_e) {
+        // If we can't write the session, we just move on in life
+    }
+};
+const updateSession = (createdAt, session) => {
+    if (!session || session.lastEventTime.getTime() < createdAt.getTime() - SESSION_MAX_INTERVAL_MS) {
+        return { sessionId: (0, uuid_1.v4)(), startTime: createdAt, lastEventTime: createdAt, isFirstEvent: true };
+    }
+    // Never move lastEventTime backwards, or the session would expire early.
+    // In case the order of events is not strictly chronological, this ensures the session remains valid.
+    const lastEventTime = createdAt.getTime() > session.lastEventTime.getTime() ? createdAt : session.lastEventTime;
+    return { ...session, lastEventTime, isFirstEvent: false };
+};
+/**
+ * Registers an event created at `createdAt` in the stored session: extends the current session,
+ * or starts a new one when it expired, and stores the result.
+ *
+ * Call it synchronously, together with capturing `createdAt`, before any asynchronous work,
+ * so sessions are updated in the order events are tracked.
+ *
+ * @private
+ */
+const touchSession = (createdAt) => {
+    const session = updateSession(createdAt, (0, exports.readSession)());
+    writeSession(session);
+    return session;
+};
+exports.touchSession = touchSession;

package/dist/cjs/tpaas-builders/builders/catalogVersion.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.builder = builder;
+const tpaas_schemas_1 = require("../../tpaas-schemas");
+function builder() {
+    return {
+        catalogVersion: tpaas_schemas_1.CATALOG_VERSION,
+    };
+}