@playcademy/sdk 0.7.3-beta.8 → 0.7.4-beta.1

package/dist/index.js

@@ -1692,34 +1692,47 @@ function createTimebackActivityTracker(client) {
     activity.windowPausedAtStart = pausedAtReset;
     startHeartbeatInterval(activity);
   }
-  function armPausedHeartbeatTimeout(activity) {
+  function markPausedHeartbeatTimedOut(activity) {
+    activity.pausedHeartbeatTimeoutId = null;
+    activity.pausedHeartbeatTimedOut = true;
+    stopHeartbeatInterval(activity);
+  }
+  function armPausedHeartbeatTimeout(activity, startedAt = Date.now()) {
     if (activity.pausedHeartbeatTimeoutMs === Infinity) {
       return;
     }
     clearPausedHeartbeatTimeout(activity);
+    const now = Date.now();
+    const elapsedPauseMs = Math.max(0, now - Math.min(startedAt, now));
+    const remainingTimeoutMs = activity.pausedHeartbeatTimeoutMs - elapsedPauseMs;
+    if (remainingTimeoutMs <= 0) {
+      markPausedHeartbeatTimedOut(activity);
+      return;
+    }
     const trackedActivity = activity;
     activity.pausedHeartbeatTimeoutId = setTimeout(() => {
       if (currentActivity !== trackedActivity) {
         return;
       }
-      trackedActivity.pausedHeartbeatTimeoutId = null;
-      trackedActivity.pausedHeartbeatTimedOut = true;
-      stopHeartbeatInterval(trackedActivity);
-    }, activity.pausedHeartbeatTimeoutMs);
+      markPausedHeartbeatTimedOut(trackedActivity);
+    }, remainingTimeoutMs);
   }
-  function addPauseReason(reason) {
+  function addPauseReason(reason, startedAt = Date.now()) {
     if (!currentActivity) {
       return;
     }
+    if (reason !== "inactivity") {
+      applyOverdueInactivity();
+    }
     const wasPaused = currentActivity.pauseReasons.size > 0;
     const wasAutoPaused = hasAutoPauseReason(currentActivity);
     const alreadyHadReason = currentActivity.pauseReasons.has(reason);
     currentActivity.pauseReasons.add(reason);
     if (!wasPaused && currentActivity.pauseReasons.size > 0) {
-      currentActivity.pauseStartTime = Date.now();
+      currentActivity.pauseStartTime = Math.min(startedAt, Date.now());
     }
     if (isAutoPauseReason(reason) && !alreadyHadReason && !wasAutoPaused) {
-      armPausedHeartbeatTimeout(currentActivity);
+      armPausedHeartbeatTimeout(currentActivity, startedAt);
     }
     syncInactivityTracking();
   }
@@ -1772,16 +1785,31 @@ function createTimebackActivityTracker(client) {
     }
     clearInactivityTimeout(activity);
     const trackedActivity = activity;
-    activity.inactivityTimerStartedAt = Date.now();
+    const timerStartedAt = Date.now();
+    const inactivityStartedAt = timerStartedAt + trackedActivity.remainingInactivityMs;
+    activity.inactivityTimerStartedAt = timerStartedAt;
     activity.inactivityTimeoutId = setTimeout(() => {
       if (currentActivity !== trackedActivity) {
         return;
       }
       trackedActivity.remainingInactivityMs = 0;
       clearInactivityTimeout(trackedActivity);
-      addPauseReason("inactivity");
+      addPauseReason("inactivity", inactivityStartedAt);
     }, trackedActivity.remainingInactivityMs);
   }
+  function applyOverdueInactivity(now = Date.now()) {
+    const activity = currentActivity;
+    if (!activity || activity.inactivityTimerStartedAt === null || activity.pauseReasons.has("inactivity")) {
+      return;
+    }
+    const inactivityStartedAt = activity.inactivityTimerStartedAt + activity.remainingInactivityMs;
+    if (now < inactivityStartedAt) {
+      return;
+    }
+    activity.remainingInactivityMs = 0;
+    clearInactivityTimeout(activity);
+    addPauseReason("inactivity", inactivityStartedAt);
+  }
   function syncInactivityTracking() {
     const activity = currentActivity;
     if (!activity) {
@@ -1802,6 +1830,7 @@ function createTimebackActivityTracker(client) {
     activity.remainingInactivityMs = activity.inactivityTimeoutMs;
   }
   function handleUserInteraction() {
+    applyOverdueInactivity();
     const activity = currentActivity;
     if (!activity || activity.inactivityTimeoutMs === Infinity || isDocumentHidden()) {
       return;
@@ -1840,6 +1869,7 @@ function createTimebackActivityTracker(client) {
     };
   }
   async function flushHeartbeat(isFinal) {
+    applyOverdueInactivity();
     const activity = currentActivity;
     if (!activity) {
       return;
@@ -1860,6 +1890,7 @@ function createTimebackActivityTracker(client) {
     });
   }
   function handlePageHide() {
+    applyOverdueInactivity();
     const activity = currentActivity;
     if (!activity) {
       return;
@@ -1999,6 +2030,7 @@ function createTimebackActivityTracker(client) {
         throw new Error("No activity in progress. Call startActivity() before endActivity().");
       }
       const activity = currentActivity;
+      applyOverdueInactivity();
       cleanupListeners();
       await flushHeartbeat(true);
       if (activity.pauseStartTime !== null) {

package/dist/internal.js

@@ -1692,34 +1692,47 @@ function createTimebackActivityTracker(client) {
     activity.windowPausedAtStart = pausedAtReset;
     startHeartbeatInterval(activity);
   }
-  function armPausedHeartbeatTimeout(activity) {
+  function markPausedHeartbeatTimedOut(activity) {
+    activity.pausedHeartbeatTimeoutId = null;
+    activity.pausedHeartbeatTimedOut = true;
+    stopHeartbeatInterval(activity);
+  }
+  function armPausedHeartbeatTimeout(activity, startedAt = Date.now()) {
     if (activity.pausedHeartbeatTimeoutMs === Infinity) {
       return;
     }
     clearPausedHeartbeatTimeout(activity);
+    const now = Date.now();
+    const elapsedPauseMs = Math.max(0, now - Math.min(startedAt, now));
+    const remainingTimeoutMs = activity.pausedHeartbeatTimeoutMs - elapsedPauseMs;
+    if (remainingTimeoutMs <= 0) {
+      markPausedHeartbeatTimedOut(activity);
+      return;
+    }
     const trackedActivity = activity;
     activity.pausedHeartbeatTimeoutId = setTimeout(() => {
       if (currentActivity !== trackedActivity) {
         return;
       }
-      trackedActivity.pausedHeartbeatTimeoutId = null;
-      trackedActivity.pausedHeartbeatTimedOut = true;
-      stopHeartbeatInterval(trackedActivity);
-    }, activity.pausedHeartbeatTimeoutMs);
+      markPausedHeartbeatTimedOut(trackedActivity);
+    }, remainingTimeoutMs);
   }
-  function addPauseReason(reason) {
+  function addPauseReason(reason, startedAt = Date.now()) {
     if (!currentActivity) {
       return;
     }
+    if (reason !== "inactivity") {
+      applyOverdueInactivity();
+    }
     const wasPaused = currentActivity.pauseReasons.size > 0;
     const wasAutoPaused = hasAutoPauseReason(currentActivity);
     const alreadyHadReason = currentActivity.pauseReasons.has(reason);
     currentActivity.pauseReasons.add(reason);
     if (!wasPaused && currentActivity.pauseReasons.size > 0) {
-      currentActivity.pauseStartTime = Date.now();
+      currentActivity.pauseStartTime = Math.min(startedAt, Date.now());
     }
     if (isAutoPauseReason(reason) && !alreadyHadReason && !wasAutoPaused) {
-      armPausedHeartbeatTimeout(currentActivity);
+      armPausedHeartbeatTimeout(currentActivity, startedAt);
     }
     syncInactivityTracking();
   }
@@ -1772,16 +1785,31 @@ function createTimebackActivityTracker(client) {
     }
     clearInactivityTimeout(activity);
     const trackedActivity = activity;
-    activity.inactivityTimerStartedAt = Date.now();
+    const timerStartedAt = Date.now();
+    const inactivityStartedAt = timerStartedAt + trackedActivity.remainingInactivityMs;
+    activity.inactivityTimerStartedAt = timerStartedAt;
     activity.inactivityTimeoutId = setTimeout(() => {
       if (currentActivity !== trackedActivity) {
         return;
       }
       trackedActivity.remainingInactivityMs = 0;
       clearInactivityTimeout(trackedActivity);
-      addPauseReason("inactivity");
+      addPauseReason("inactivity", inactivityStartedAt);
     }, trackedActivity.remainingInactivityMs);
   }
+  function applyOverdueInactivity(now = Date.now()) {
+    const activity = currentActivity;
+    if (!activity || activity.inactivityTimerStartedAt === null || activity.pauseReasons.has("inactivity")) {
+      return;
+    }
+    const inactivityStartedAt = activity.inactivityTimerStartedAt + activity.remainingInactivityMs;
+    if (now < inactivityStartedAt) {
+      return;
+    }
+    activity.remainingInactivityMs = 0;
+    clearInactivityTimeout(activity);
+    addPauseReason("inactivity", inactivityStartedAt);
+  }
   function syncInactivityTracking() {
     const activity = currentActivity;
     if (!activity) {
@@ -1802,6 +1830,7 @@ function createTimebackActivityTracker(client) {
     activity.remainingInactivityMs = activity.inactivityTimeoutMs;
   }
   function handleUserInteraction() {
+    applyOverdueInactivity();
     const activity = currentActivity;
     if (!activity || activity.inactivityTimeoutMs === Infinity || isDocumentHidden()) {
       return;
@@ -1840,6 +1869,7 @@ function createTimebackActivityTracker(client) {
     };
   }
   async function flushHeartbeat(isFinal) {
+    applyOverdueInactivity();
     const activity = currentActivity;
     if (!activity) {
       return;
@@ -1860,6 +1890,7 @@ function createTimebackActivityTracker(client) {
     });
   }
   function handlePageHide() {
+    applyOverdueInactivity();
     const activity = currentActivity;
     if (!activity) {
       return;
@@ -1999,6 +2030,7 @@ function createTimebackActivityTracker(client) {
         throw new Error("No activity in progress. Call startActivity() before endActivity().");
       }
       const activity = currentActivity;
+      applyOverdueInactivity();
       cleanupListeners();
       await flushHeartbeat(true);
       if (activity.pauseStartTime !== null) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@playcademy/sdk",
-    "version": "0.7.3-beta.8",
+    "version": "0.7.4-beta.1",
     "type": "module",
     "exports": {
         ".": {