anear-js-api 0.6.2 → 0.6.4

package/lib/utils/DisplayEventProcessor.js

@@ -346,18 +346,12 @@ class DisplayEventProcessor {
     const participantStruct = this.participantsIndex.get(participantId)
     const appCtx = templateRenderContext.app || {}
 
-    // Determine which participant (if any) is currently timed according to
-    // the AppM context (e.g., Tic-Tac-Toe currentPlayerToken).
-    const currentToken = appCtx.currentPlayerToken
-    const currentPlayerId = currentToken && appCtx.playerIds ? appCtx.playerIds[currentToken] : null
-    const isCurrentPlayer = currentPlayerId && participantId === currentPlayerId
-
     if (timeoutFn) {
-      // Only the current player should receive a real timeout value that
-      // starts an APM timer. For other participants we keep `timeout` null
-      // so their APMs never start per-participant timers.
-      if (isCurrentPlayer) {
-        timeout = timeoutFn(appCtx, participantStruct)
+      // For participant displays, any non-null / positive timeout value should
+      // start a real per-participant timer on that participant's APM.
+      const msecs = timeoutFn(appCtx, participantStruct)
+      if (typeof msecs === 'number' && msecs > 0) {
+        timeout = msecs
       }
     }
     const privateRenderContext = {
@@ -366,41 +360,36 @@ class DisplayEventProcessor {
     }
 
     // Build visual timeout (meta.timeout) used by the countdown bar.
-    // For the current player, derive from their own APM state.
-    // For opponents / other participants, mirror the current player's timer
-    // so everyone sees the same countdown without starting extra APM timers.
+    // For participant displays we support two patterns:
+    //   1) Global participants timeout (allParticipants flow) – mirror the
+    //      shared participantsActionTimeout so EVERYONE sees the same bar,
+    //      regardless of whether their own APM is timed.
+    //   2) Per-participant timeout (eachParticipant flow) – no global timeout;
+    //      only the timed participant gets a bar, derived from their own APM.
     let visualTimeout = null
     try {
-      // Helper to compute remaining from a given participant machine
-      const computeRemainingFromMachine = (pm) => {
-        const state = pm?.state
-        const ctx = state?.context
-        if (!ctx || !ctx.actionTimeoutStart || ctx.actionTimeoutMsecs == null) return null
+      // First, prefer a shared participants timeout if one exists (e.g., move timer).
+      const pat = this.precomputedParticipantsTimeout || this.participantsActionTimeout
+      if (pat && typeof pat.msecs === 'number') {
         const now = Date.now()
-        const elapsed = now - ctx.actionTimeoutStart
-        const base = ctx.actionTimeoutMsecs
-        const remaining = base - elapsed
-        return remaining > 0 ? remaining : 0
-      }
-
-      if (isCurrentPlayer) {
-        if (timeout !== null) {
-          const remainingMsecs = computeRemainingFromMachine(participantMachine) ?? timeout
-          visualTimeout = { msecs: timeout, remainingMsecs }
+        const start = pat.startedAt || Date.now()
+        const remainingMsecs = Math.max(0, pat.msecs - (now - start))
+        visualTimeout = { msecs: pat.msecs, remainingMsecs }
+      } else if (timeout !== null) {
+        // Fallback: no global timeout; if this participant has a real timer,
+        // show a bar based on their own APM state.
+        const state = participantMachine?.state
+        const ctx = state?.context
+        let remainingMsecs = null
+        if (ctx && ctx.actionTimeoutStart && ctx.actionTimeoutMsecs != null) {
+          const now = Date.now()
+          const elapsed = now - ctx.actionTimeoutStart
+          const remaining = ctx.actionTimeoutMsecs - elapsed
+          remainingMsecs = remaining > 0 ? remaining : 0
         }
-      } else if (currentPlayerId) {
-        // Mirror the current player's timer for non-current participants.
-        const currentPm = this.participantMachines[currentPlayerId]
-        const remainingMsecs = computeRemainingFromMachine(currentPm)
-
-        if (remainingMsecs != null) {
-          // Prefer the app-configured move timeout if available; otherwise
-          // fall back to the remaining time as the total for visuals.
-          const moveTimeout =
-            (appCtx.C && typeof appCtx.C.MOVE_TIMEOUT_MSECS === 'number' && appCtx.C.MOVE_TIMEOUT_MSECS > 0)
-              ? appCtx.C.MOVE_TIMEOUT_MSECS
-              : remainingMsecs
-          visualTimeout = { msecs: moveTimeout, remainingMsecs }
+        visualTimeout = {
+          msecs: timeout,
+          remainingMsecs: remainingMsecs ?? timeout
         }
       }
     } catch (_e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anear-js-api",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Javascript Developer API for Anear Apps",
   "main": "lib/index.js",
   "scripts": {