anear-js-api 0.5.6 → 0.5.7

package/lib/state_machines/AnearEventMachine.js

@@ -106,7 +106,7 @@ const ActiveEventGlobalEvents = {
     target: '#canceled'
   },
   APPM_FINAL: {
-    // AppM reached a root-level final → cleanup only (no ANAPI transition)
+    actions: ['logImplicitShutdownWarning'],
     target: '#activeEvent.shutdownOnly'
   }
 }
@@ -329,6 +329,15 @@ const ActiveEventStatesConfig = {
         RENDER_DISPLAY: {
           target: '#announceRendering'
         },
+        PARTICIPANT_UPDATE: [
+          {
+            cond: 'isReconnectUpdate',
+            actions: 'processReconnectEvents'
+          },
+          {
+            actions: ['updateParticipantGeoLocation', 'processUpdateEvents']
+          }
+        ],
         PARTICIPANT_LEAVE: [
           {
             cond: 'isPermanentLeave',
@@ -448,6 +457,15 @@ const ActiveEventStatesConfig = {
         RENDER_DISPLAY: {
           target: '#liveRendering'
         },
+        PARTICIPANT_UPDATE: [
+          {
+            cond: 'isReconnectUpdate',
+            actions: 'processReconnectEvents'
+          },
+          {
+            actions: ['updateParticipantGeoLocation', 'processUpdateEvents']
+          }
+        ],
         PARTICIPANT_LEAVE: [
           {
             cond: 'isPermanentLeave',
@@ -607,13 +625,30 @@ const ActiveEventStatesConfig = {
     closeEvent: {
       id: 'closeEvent',
       initial: 'notifyingParticipants',
+      on: {
+        APPM_FINAL: {
+          actions: () => logger.debug('[AEM] Ignoring APPM_FINAL during closeEvent.')
+        }
+      },
       states: {
         notifyingParticipants: {
           entry: 'sendParticipantExitEvents',
-          always: 'waitForParticipantsToExit'
+          always: [
+            {
+              cond: context => getAllParticipantIds(context).length === 0,
+              target: 'finalizing'
+            },
+            {
+              target: 'waitForParticipantsToExit'
+            }
+          ]
         },
         waitForParticipantsToExit: {
           entry: context => logger.debug(`[AEM] Entering waitForParticipantsToExit with ${getAllParticipantIds(context).length} participants`),
+          after: {
+             // Wait up to 2 seconds for participants to exit cleanly, then force shutdown
+             2000: 'finalizing'
+          },
           always: [
             {
               cond: context => getAllParticipantIds(context).length === 0,
@@ -621,9 +656,18 @@ const ActiveEventStatesConfig = {
             }
           ],
           on: {
-            PARTICIPANT_LEAVE: {
-              actions: () => logger.debug('[AEM] Ignoring PARTICIPANT_LEAVE during orchestrated shutdown.')
-            }
+            PARTICIPANT_LEAVE: [
+              {
+                // The user has explicitly left (type: PARTICIPANT_EXIT).
+                // This implies they are not waiting for any game-over screen.
+                // Clean them up immediately without waiting.
+                cond: 'isPermanentLeave',
+                actions: ['cleanupExitingParticipant', (c, e) => logger.debug(`[AEM] Participant ${e.data.id} permanently left during closeEvent shutdown.`)]
+              },
+              {
+                actions: ['cleanupExitingParticipant', (c, e) => logger.debug(`[AEM] Participant ${e.data.id} left during closeEvent shutdown.`)]
+              }
+            ]
           }
         },
         finalizing: {
@@ -651,15 +695,30 @@ const ActiveEventStatesConfig = {
       on: {
         CLOSE: {
           actions: () => logger.debug('[AEM] Ignoring CLOSE during cancel.')
+        },
+        APPM_FINAL: {
+          actions: () => logger.debug('[AEM] Ignoring APPM_FINAL during cancel.')
         }
       },
       states: {
         notifyingParticipants: {
           entry: 'sendParticipantExitEvents',
-          always: 'waitForParticipantsToExit'
+          always: [
+            {
+              cond: context => getAllParticipantIds(context).length === 0,
+              target: 'finalizing'
+            },
+            {
+              target: 'waitForParticipantsToExit'
+            }
+          ]
         },
         waitForParticipantsToExit: {
           entry: context => logger.debug(`[AEM] Entering waitForParticipantsToExit with ${getAllParticipantIds(context).length} participants`),
+          after: {
+             // Wait up to 2 seconds for participants to exit cleanly, then force shutdown
+             2000: 'finalizing'
+          },
           always: [
             {
               cond: context => getAllParticipantIds(context).length === 0,
@@ -667,9 +726,19 @@ const ActiveEventStatesConfig = {
             }
           ],
           on: {
-            PARTICIPANT_LEAVE: {
-              actions: () => logger.debug('[AEM] Ignoring PARTICIPANT_LEAVE during orchestrated shutdown.')
-            }
+            PARTICIPANT_LEAVE: [
+              {
+                // The user has explicitly left (type: PARTICIPANT_EXIT).
+                // This implies they are not waiting for any game-over screen.
+                // Clean them up immediately without waiting.
+                cond: 'isPermanentLeave',
+                actions: ['cleanupExitingParticipant', (c, e) => logger.debug(`[AEM] Participant ${e.data.id} permanently left during canceled shutdown.`)]
+              },
+              {
+                // Standard leave (e.g. disconnect). Clean them up too.
+                actions: ['cleanupExitingParticipant', (c, e) => logger.debug(`[AEM] Participant ${e.data.id} left during canceled shutdown.`)]
+              }
+            ]
           }
         },
         finalizing: {
@@ -697,23 +766,53 @@ const ActiveEventStatesConfig = {
     shutdownOnly: {
       id: 'shutdownOnly',
       initial: 'notifyingParticipants',
+      on: {
+        APPM_FINAL: {
+          actions: () => logger.debug('[AEM] Ignoring APPM_FINAL during shutdownOnly.')
+        }
+      },
       states: {
         notifyingParticipants: {
           entry: 'sendParticipantExitEvents',
-          always: 'waitForParticipantsToExit'
+          always: [
+            {
+              cond: context => getAllParticipantIds(context).length === 0,
+              target: 'finalizing'
+            },
+            {
+              target: 'waitForParticipantsToExit'
+            }
+          ]
         },
         waitForParticipantsToExit: {
           entry: context => logger.debug(`[AEM] Entering waitForParticipantsToExit with ${getAllParticipantIds(context).length} participants`),
+          after: {
+             // Wait up to 2 seconds for participants to exit cleanly, then force shutdown
+             2000: 'finalizing'
+          },
           always: [
             {
               cond: context => getAllParticipantIds(context).length === 0,
-              target: 'detaching'
+              target: 'finalizing'
             }
           ],
           on: {
-            PARTICIPANT_LEAVE: {
-              actions: () => logger.debug('[AEM] Ignoring PARTICIPANT_LEAVE during orchestrated shutdown.')
-            }
+            PARTICIPANT_LEAVE: [
+              {
+                cond: 'isPermanentLeave',
+                actions: ['cleanupExitingParticipant', (c, e) => logger.debug(`[AEM] Participant ${e.data.id} permanently left during shutdownOnly.`)]
+              },
+              {
+                actions: ['cleanupExitingParticipant', (c, e) => logger.debug(`[AEM] Participant ${e.data.id} left during shutdownOnly.`)]
+              }
+            ]
+          }
+        },
+        finalizing: {
+          invoke: {
+            src: 'eventTransitionCanceled',
+            onDone: 'detaching',
+            onError: '#activeEvent.failure'
           }
         },
         detaching: {
@@ -1313,6 +1412,14 @@ const AnearEventMachineFunctions = ({
     logCreatorEnter: (_c, event) => logger.debug("[AEM] got creator PARTICIPANT_ENTER: ", event.data.id),
     logAPMReady: (c, e) => logger.debug("[AEM] PARTICIPANT_MACHINE_READY for: ", e.data.anearParticipant.id),
     logInvalidParticipantEnter: (c, e) => logger.info("[AEM] Error: Unexepected PARTICIPANT_ENTER with id: ", e.data.id),
+    logDeferringAppmFinal: (_c, _e) => logger.info("[AEM] Deferring APPM_FINAL event because AEM is already transitioning to terminated state."),
+    logImplicitShutdownWarning: (_c, _e) => {
+      logger.error("********************************************************************************");
+      logger.error("[AEM] WARNING: AppMachine reached a 'final' state without explicitly calling anearEvent.closeEvent() or anearEvent.cancelEvent().");
+      logger.error("[AEM] The event is being force-transitioned to 'canceled' to ensure cleanup.");
+      logger.error("[AEM] Please update your AppMachine to invoke an explicit exit action.");
+      logger.error("********************************************************************************");
+    },
   },
   services: {
     saveAppEventContext: async (context, event) => {

package/lib/state_machines/AnearParticipantMachine.js

@@ -181,6 +181,10 @@ const AnearParticipantMachineConfig = participantId => ({
                 }
               },
               on: {
+                PARTICIPANT_EXIT: {
+                  actions: 'logExit',
+                  target: '#cleanupAndExit'
+                },
                 ACTION: {
                   actions: [
                     'updateLastSeen',
@@ -206,6 +210,7 @@ const AnearParticipantMachineConfig = participantId => ({
             },
             cleanupAndExit: {
               id: 'cleanupAndExit',
+              entry: 'nullActionTimeout',
               // Ignore most events during cleanup, but allow exit displays
               on: {
                 RENDER_DISPLAY: { actions: 'logIgnoringRenderDisplayCleanup' },

package/package.json

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