@schibsted/pulse-sdk 8.0.0-rc.4 → 8.0.0-rc.6

package/dist/cjs/leaveTrackingTpaas/index.js

@@ -56,19 +56,42 @@ 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 durationStartTime = 0;
+let activityStartTime = 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);
+        activityStartTime = resetTime();
+        durationStartTime = resetTime();
         currentLeaveSchema = schema;
         currentTrackMethod = trackMethod;
         logger.debug('addLeaveTracking:after:state', currentLeaveEvent);
@@ -160,12 +183,8 @@ 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();
+    activityStartTime = resetTime();
 };
 const resetTpaasViewedContent = () => {
     currentLeaveEvent = (0, constants_1.DEFAULT_PAGE_LEAVE_EVENT)();
@@ -174,34 +193,41 @@ 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
+    const durationMs = Math.max(endTime - durationStartTime, 1);
+    const activityDurationMs = Math.max(Math.min(endTime - activityStartTime, constants_1.ACTIVITY_DURATION_LIMIT_MS), 1);
     const leave = {
-        durationMs: duration,
-        activityDurationMs: activityDuration.value,
+        durationMs,
+        activityDurationMs,
         ...currentLeaveEvent,
     };
     logger.debug('trackTpaasLeave: event', leave);
@@ -276,18 +302,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,15 +314,9 @@ function addUpdateActivityDurationListeners() {
         types_1.BrowserEvents.TOUCHSTART,
     ];
     activityListeners = addEventListeners(activityEvents, () => {
-        activityDuration = resetLastActivity(activityDuration);
+        activityStartTime = resetTime();
     }, { passive: true });
 }
-function resetLastActivity(activityDuration) {
-    return {
-        ...activityDuration,
-        timeSinceLastActivity: 0,
-    };
-}
 /*
  Add listeners to a set of browser events.
  */

package/dist/cjs/tracker-proxy/consts.js

@@ -22,7 +22,6 @@ exports.TPAAS_ALLOWED_METHODS = [
     'trackEngagementVideoAd',
     'trackEngagementWidget',
     'trackCompletedHealthAction',
-    'trackImpressionAdSlot',
     'trackImpressionForm',
     'trackImpressionHealthUIElement',
     'trackImpressionOffer',
@@ -37,15 +36,13 @@ exports.TPAAS_ALLOWED_METHODS = [
     'trackLeaveLandingpage',
     'trackLeaveListing',
     'trackLeaveLockedArticle',
-    'trackLeaveLockedAudio',
     'trackLeaveLockedAudioPage',
-    'trackLeaveLockedVideo',
     'trackLeaveLockedVideoPage',
     'trackLeavePage',
+    'trackLeaveSportsPage',
     'trackLeaveVideoPage',
     'trackLeaveWeather',
     'trackViewArticle',
-    'trackViewAudio',
     'trackViewAudioPage',
     'trackViewError',
     'trackViewFrontpage',
@@ -53,13 +50,11 @@ exports.TPAAS_ALLOWED_METHODS = [
     'trackViewLandingpage',
     'trackViewListing',
     'trackViewLockedArticle',
-    'trackViewLockedAudio',
     'trackViewLockedAudioPage',
-    'trackViewLockedVideo',
     'trackViewLockedVideoPage',
     'trackViewPage',
+    'trackViewSportsPage',
     'trackViewTitle',
-    'trackViewVideo',
     'trackViewVideoPage',
     'trackViewWeather',
     // these are not TPaaS methods,

package/dist/cjs/version.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SDK_VERSION = void 0;
 // This file is auto-generated by bin/generate-version.js. Do not edit manually.
-exports.SDK_VERSION = '8.0.0-rc.4';
+exports.SDK_VERSION = '8.0.0-rc.6';