anear-js-api 0.4.38 → 0.4.39

package/lib/state_machines/AnearParticipantMachine.js

@@ -40,6 +40,7 @@ const AnearParticipantMachineContext = (anearParticipant, anearEvent, appPartici
   appParticipantMachineFactory,
   appParticipantMachine: null,
   actionTimeoutMsecs: null,
+  actionTimeoutStart: null,
   lastSeen: CurrentDateTimestamp()
 })
 
@@ -71,10 +72,7 @@ const AnearParticipantMachineConfig = participantId => ({
               on: {
                 ATTACHED: {
                   actions: [
-                    (context, event) => logger.debug(
-                      "APM Got ATTACHED for privateChannel for ",
-                      context.anearParticipant.id
-                    ),
+                    'logAttached',
                     'sendParticipantReady'
                   ],
                   target: '#setupAppMachine'
@@ -90,7 +88,7 @@ const AnearParticipantMachineConfig = participantId => ({
         },
         live: {
           id: 'live',
-          entry: (c, e) => logger.debug(`Participant ${participantId} is LIVE!`),
+          entry: 'logLive',
           initial: 'idle',
           states: {
             idle: {
@@ -105,28 +103,46 @@ const AnearParticipantMachineConfig = participantId => ({
                   target: 'waitReconnect'
                 },
                 PARTICIPANT_EXIT: {
-                  actions: (c, e) => logger.debug('APM got PARTICIPANT_EXIT.  Exiting...'),
+                  actions: 'logExit',
                   target: '#cleanupAndExit'
                 },
-                ACTION: {
-                  actions: ['updateLastSeen', 'sendActionToAppParticipantMachine']
-                }
+                PARTICIPANT_RECONNECT: [
+                  {
+                    cond: 'hasRemainingTimeoutAndRenderEvent',
+                    actions: [
+                      'logReconnected',
+                      'republishWithRemainingTimeout'
+                    ],
+                    target: 'waitParticipantResponse'
+                  },
+                  {
+                    actions: 'logReconnected',
+                    target: 'idle'
+                  }
+                ]
               }
             },
             waitReconnect: {
-              entry: (c, e) => logger.info(`Participant ${c.anearParticipant.id} has DISCONNECTED`),
+              entry: 'logDisconnected',
               after: {
-                reconnectTimeout: {
-                  actions: [c => logger.info(`Participant ${c.anearParticipant.id} never RECONNECTED.  Exiting.`)],
-                  target: '#cleanupAndExit'
-                }
+                dynamicReconnectTimeout: [
+                  {
+                    cond: 'wasMidTurnOnDisconnect',
+                    actions: 'logActionTimeoutWhileDisconnected',
+                    target: '#participantTimedOut'
+                  },
+                  {
+                    actions: 'logNeverReconnected',
+                    target: '#cleanupAndExit'
+                  }
+                ]
               },
               on: {
                 PARTICIPANT_EXIT: {
                   target: '#cleanupAndExit'
                 },
                 PARTICIPANT_RECONNECT: {
-                  actions: (c, e) => logger.info(`Participant ${c.anearParticipant.id} has RECONNECTED`),
+                  actions: 'logReconnected',
                   target: 'idle'
                 }
               }
@@ -146,6 +162,11 @@ const AnearParticipantMachineConfig = participantId => ({
               }
             },
             waitParticipantResponse: {
+              always: {
+                cond: 'isTimeoutImmediate',
+                actions: 'logImmediateTimeout',
+                target: '#participantTimedOut'
+              },
               after: {
                 actionTimeout: {
                   actions: 'nullActionTimeout',
@@ -160,28 +181,32 @@ const AnearParticipantMachineConfig = participantId => ({
                     'nullActionTimeout'
                   ],
                   target: 'idle'
+                },
+                PARTICIPANT_DISCONNECT: {
+                  actions: 'updateRemainingTimeoutOnDisconnect',
+                  target: 'waitReconnect'
                 }
               }
             },
             participantTimedOut: {
               id: 'participantTimedOut',
-              entry: 'sendTimeoutEvents',
+              entry: ['sendTimeoutEvents', 'nullActionTimeout'],
               always: 'idle'
             },
             cleanupAndExit: {
               id: 'cleanupAndExit',
               // Ignore most events during cleanup, but allow exit displays
               on: {
-                RENDER_DISPLAY: { actions: (c, e) => logger.debug('APM ignoring RENDER_DISPLAY during cleanup') },
-                PRIVATE_DISPLAY: { actions: (c, e) => logger.debug('APM ignoring PRIVATE_DISPLAY during cleanup') },
+                RENDER_DISPLAY: { actions: 'logIgnoringRenderDisplayCleanup' },
+                PRIVATE_DISPLAY: { actions: 'logIgnoringPrivateDisplayCleanup' },
                 PARTICIPANT_EXIT: {
-                  actions: () => logger.debug('APM ignoring redundant PARTICIPANT_EXIT during cleanup')
+                  actions: 'logIgnoringRedundantExit'
                 },
                 PARTICIPANT_RECONNECT: {
-                  actions: () => logger.debug('APM ignoring PARTICIPANT_RECONNECT during cleanup - already timed out')
+                  actions: 'logIgnoringReconnectCleanup'
                 },
                 ACTION: {
-                  actions: () => logger.debug('APM ignoring ACTION during cleanup')
+                  actions: 'logIgnoringActionCleanup'
                 }
               },
               invoke: {
@@ -202,10 +227,10 @@ const AnearParticipantMachineConfig = participantId => ({
               entry: ['notifyEventMachineExit'],
               // Final state - ignore all events except exit displays
               on: {
-                RENDER_DISPLAY: { actions: () => logger.debug('APM ignoring RENDER_DISPLAY in final state') },
-                PRIVATE_DISPLAY: { actions: () => logger.debug('APM ignoring PRIVATE_DISPLAY in final state') },
+                RENDER_DISPLAY: { actions: 'logIgnoringRenderDisplayDone' },
+                PRIVATE_DISPLAY: { actions: 'logIgnoringPrivateDisplayDone' },
                 '*': {
-                  actions: (_c, e) => logger.debug('APM ignoring event in final state: ', e.type)
+                  actions: 'logIgnoringEventDone'
                 }
               },
               type: 'final'
@@ -256,8 +281,40 @@ const AnearParticipantMachineFunctions = {
     updateLastSeen: assign({
       lastSeen: context => CurrentDateTimestamp()
     }),
-    updateActionTimeout: assign({actionTimeoutMsecs: (_c, event) => event.data.timeout}),
-    nullActionTimeout: assign({actionTimeoutMsecs: _c => null}),
+    updateActionTimeout: assign((context, event) => {
+      const newTimeoutDuration = event.data.timeout
+
+      if (context.actionTimeoutStart) {
+        const elapsed = CurrentDateTimestamp() - context.actionTimeoutStart
+        const remaining = newTimeoutDuration - elapsed
+        logger.debug(`[APM] Resuming timer for ${context.anearParticipant.id} with ${remaining}ms remaining`)
+        return {
+          actionTimeoutMsecs: remaining > 0 ? remaining : 0
+        }
+      } else {
+        logger.debug(`[APM] Starting new timer for ${context.anearParticipant.id} with ${newTimeoutDuration}ms`)
+        return {
+          actionTimeoutMsecs: newTimeoutDuration,
+          actionTimeoutStart: CurrentDateTimestamp()
+        }
+      }
+    }),
+    nullActionTimeout: assign({
+      actionTimeoutMsecs: _c => null,
+      actionTimeoutStart: _c => null
+    }),
+    updateRemainingTimeoutOnDisconnect: assign((context, event) => {
+      if (context.actionTimeoutStart) {
+        const elapsed = CurrentDateTimestamp() - context.actionTimeoutStart
+        const remaining = context.actionTimeoutMsecs - elapsed
+        const remainingMsecs = remaining > 0 ? remaining : 0
+        logger.debug(`[APM] Participant disconnected mid-turn. Storing remaining timeout of ${remainingMsecs}ms`)
+        return {
+          actionTimeoutMsecs: remainingMsecs
+        }
+      }
+      return {}
+    }),
     notifyEventMachineExit: (context, event) => {
       context.anearEvent.send('PARTICIPANT_MACHINE_EXIT', { participantId: context.anearParticipant.id })
     },
@@ -268,7 +325,23 @@ const AnearParticipantMachineFunctions = {
       } else {
         logger.error("Error details:", event.data);
       }
-    }
+    },
+    logAttached: (c, e) => logger.debug(`[APM] Got ATTACHED for privateChannel for ${c.anearParticipant.id}`),
+    logLive: (c, e) => logger.debug(`[APM] Participant ${c.anearParticipant.id} is LIVE!`),
+    logExit: (c, e) => logger.debug('[APM] got PARTICIPANT_EXIT. Exiting...'),
+    logDisconnected: (c, e) => logger.info(`[APM] Participant ${c.anearParticipant.id} has DISCONNECTED`),
+    logActionTimeoutWhileDisconnected: c => logger.info(`[APM] Participant ${c.anearParticipant.id} timed out on action while disconnected.`),
+    logNeverReconnected: c => logger.info(`[APM] Participant ${c.anearParticipant.id} never RECONNECTED. Exiting.`),
+    logReconnected: (c, e) => logger.info(`[APM] Participant ${c.anearParticipant.id} has RECONNECTED`),
+    logImmediateTimeout: (c, e) => logger.debug(`[APM] Timeout of ${c.actionTimeoutMsecs}ms is immediate for ${c.anearParticipant.id}.`),
+    logIgnoringRenderDisplayCleanup: (c, e) => logger.debug('[APM] ignoring RENDER_DISPLAY during cleanup'),
+    logIgnoringPrivateDisplayCleanup: (c, e) => logger.debug('[APM] ignoring PRIVATE_DISPLAY during cleanup'),
+    logIgnoringRedundantExit: () => logger.debug('[APM] ignoring redundant PARTICIPIPANT_EXIT during cleanup'),
+    logIgnoringReconnectCleanup: () => logger.debug('[APM] ignoring PARTICIPANT_RECONNECT during cleanup - already timed out'),
+    logIgnoringActionCleanup: () => logger.debug('[APM] ignoring ACTION during cleanup'),
+    logIgnoringRenderDisplayDone: () => logger.debug('[APM] ignoring RENDER_DISPLAY in final state'),
+    logIgnoringPrivateDisplayDone: () => logger.debug('[APM] ignoring PRIVATE_DISPLAY in final state'),
+    logIgnoringEventDone: (_c, e) => logger.debug('[APM] ignoring event in final state: ', e.type)
   },
   services: {
     publishPrivateDisplay: async (context, event) => {
@@ -289,11 +362,22 @@ const AnearParticipantMachineFunctions = {
   },
   guards: {
     hasAppParticipantMachine: context => context.appParticipantMachineFactory !== null,
-    hasActionTimeout: (_c, event) => event.data && event.data.timeout > 0
+    hasActionTimeout: (_c, event) => event.data && event.data.timeout > 0,
+    isTimeoutImmediate: context => context.actionTimeoutMsecs !== null && context.actionTimeoutMsecs <= 0,
+    wasMidTurnOnDisconnect: context => context.actionTimeoutMsecs !== null && context.actionTimeoutMsecs > 0
   },
   delays: {
     actionTimeout: context => context.actionTimeoutMsecs,
-    reconnectTimeout: _c => C.TIMEOUT_MSECS.RECONNECT // client must reconnect in this time
+    dynamicReconnectTimeout: context => {
+      // If an action timeout is active, use its remaining time.
+      if (context.actionTimeoutMsecs !== null && context.actionTimeoutMsecs > 0) {
+        logger.debug(`[APM] Using remaining action timeout for reconnect window: ${context.actionTimeoutMsecs}ms`)
+        return context.actionTimeoutMsecs
+      }
+      // Otherwise, use the standard reconnect timeout.
+      logger.debug(`[APM] Using standard reconnect timeout: ${C.TIMEOUT_MSECS.RECONNECT}ms`)
+      return C.TIMEOUT_MSECS.RECONNECT
+    }
   }
 }
 

package/package.json

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