anear-js-api 0.4.36 → 0.4.37

package/lib/state_machines/AnearCoreServiceMachine.js

@@ -218,6 +218,12 @@ const AnearCoreServiceMachineFunctions = {
         anearEventMachines: (context, event) => {
           const eventJSON = JSON.parse(event.data)
           const anearEvent = new AnearEvent(eventJSON)
+
+          if (context.anearEventMachines[anearEvent.id]) {
+            logger.info(`[ACSM] Event machine for ${anearEvent.id} already exists. Ignoring CREATE_EVENT.`)
+            return context.anearEventMachines
+          }
+
           const service = AnearEventMachine(anearEvent, context)
 
           return {

package/lib/state_machines/AnearEventMachine.js

@@ -57,8 +57,6 @@ const AnearEventMachineContext = (
   participantMachines: {}
 })
 
-const MinuteMsecs = minutes => minutes * (60 * 1000)
-
 const DeferredStates = [
   'PARTICIPANT_ENTER',
   'PARTICIPANT_LEAVE',
@@ -198,13 +196,21 @@ const ActiveEventStatesConfig = {
           invoke: {
             src: 'renderDisplay',
             onDone: {
-              target: '#waitingAnnounce',
+              target: 'notifyingRenderComplete',
               internal: true
             },
             onError: {
               target: '#activeEvent.failure'
             }
           }
+        },
+        notifyingRenderComplete: {
+          after: {
+            timeoutRendered: {
+              target: '#waitingAnnounce',
+              actions: ['notifyAppMachineRendered']
+            }
+          }
         }
       }
     },
@@ -282,7 +288,7 @@ const ActiveEventStatesConfig = {
           invoke: {
             src: 'renderDisplay',
             onDone: {
-              target: '#waitingToStart',
+              target: 'notifyingRenderComplete',
               internal: true
             },
             onError: {
@@ -307,6 +313,14 @@ const ActiveEventStatesConfig = {
             }
           }
         },
+        notifyingRenderComplete: {
+          after: {
+            timeoutRendered: {
+              target: '#waitingToStart',
+              actions: ['notifyAppMachineRendered']
+            }
+          }
+        },
         waitParticipantReady: {
           id: 'waitParticipantReady',
           deferred: DeferredStatesPlus('START'),
@@ -339,7 +353,7 @@ const ActiveEventStatesConfig = {
           }
         ],
         PARTICIPANT_TIMEOUT: {
-          action: ['processParticipantTimeout']
+          actions: ['processParticipantTimeout']
         },
         PAUSE: '#activeEvent.paused', // Currently no use-case for these
         CLOSE: '#activeEvent.closeEvent' // AppM explicitly closed the event
@@ -391,7 +405,7 @@ const ActiveEventStatesConfig = {
           invoke: {
             src: 'renderDisplay',
             onDone: {
-              target: '#waitingForActions',
+              target: 'notifyingRenderComplete',
               internal: true
             },
             onError: {
@@ -399,6 +413,14 @@ const ActiveEventStatesConfig = {
             }
           }
         },
+        notifyingRenderComplete: {
+          after: {
+            timeoutRendered: {
+              target: '#waitingForActions',
+              actions: ['notifyAppMachineRendered']
+            }
+          }
+        },
         participantEntering: {
           // a PARTICIPANT_ENTER received from a new user JOIN click. Unless already exists,
           // create an AnearParticipantMachine instance.
@@ -455,47 +477,40 @@ const ActiveEventStatesConfig = {
     },
     closeEvent: {
       id: 'closeEvent',
-      initial: 'eventTransitionClosed',
+      initial: 'notifyingParticipants',
       states: {
-        eventTransitionClosed: {
-          invoke: {
-            src: 'eventTransitionClosed',
-            onDone: 'waitForParticipantsToExit',
-            onError: '#activeEvent.failure'
-          }
+        notifyingParticipants: {
+          entry: 'sendParticipantExitEvents',
+          always: 'waitForParticipantsToExit'
         },
         waitForParticipantsToExit: {
-          on: {
-            ANNOUNCE: {
-              actions: () => logger.debug('[AEM] ANNOUNCE received in closeEvent state; too late - already shutting down')
-            },
-            START: {
-              actions: () => logger.debug('[AEM] START received in closeEvent state; too late - already shutting down')
-            },
-            CLOSE: {
-              actions: () => logger.debug('[AEM] CLOSE received in closeEvent state; ignoring redundant event')
-            },
-            CANCEL: {
-              actions: () => logger.debug('[AEM] CANCEL received in closeEvent state; ignoring redundant event')
-            },
-            PARTICIPANT_LEAVE: {
-              actions: ['sendExitToParticipantMachine']
-            }
-          },
+          entry: context => logger.debug(`[AEM] Entering waitForParticipantsToExit with ${Object.keys(context.participants).length} participants`),
           always: [
             {
               cond: context => Object.keys(context.participants).length === 0,
-              target: 'detaching'
+              target: 'finalizing'
+            }
+          ],
+          on: {
+            PARTICIPANT_LEAVE: {
+              actions: () => logger.debug('[AEM] Ignoring PARTICIPANT_LEAVE during orchestrated shutdown.')
             }
-          ]
+          }
+        },
+        finalizing: {
+          deferred: DeferredStates,
+          invoke: {
+            src: 'eventTransitionClosed',
+            onDone: 'detaching',
+            onError: '#activeEvent.failure'
+          }
         },
         detaching: {
           deferred: DeferredStates,
           invoke: {
             src: 'detachChannels',
             onDone: {
-              target: '#activeEvent.doneExit',
-              actions: ['notifyAppMachineShutdown']
+              target: '#activeEvent.doneExit'
             }
           }
         }
@@ -503,47 +518,45 @@ const ActiveEventStatesConfig = {
     },
     canceled: {
       id: 'canceled',
-      initial: 'eventTransitionCanceled',
+      initial: 'notifyingParticipants',
+      on: {
+        CLOSE: {
+          actions: () => logger.debug('[AEM] Ignoring CLOSE during cancel.')
+        }
+      },
       states: {
-        eventTransitionCanceled: {
-          invoke: {
-            src: 'eventTransitionCanceled',
-            onDone: 'waitForParticipantsToExit',
-            onError: '#activeEvent.failure'
-          }
+        notifyingParticipants: {
+          entry: 'sendParticipantExitEvents',
+          always: 'waitForParticipantsToExit'
         },
         waitForParticipantsToExit: {
-          on: {
-            ANNOUNCE: {
-              actions: () => logger.debug('[AEM] ANNOUNCE received in canceled state; too late - already canceled')
-            },
-            START: {
-              actions: () => logger.debug('[AEM] START received in canceled state; too late - already canceled')
-            },
-            CLOSE: {
-              actions: () => logger.debug('[AEM] CLOSE received in canceled state; ignoring redundant event')
-            },
-            CANCEL: {
-              actions: () => logger.debug('[AEM] CANCEL received in canceled state; ignoring redundant event')
-            },
-            PARTICIPANT_LEAVE: {
-              actions: ['sendExitToParticipantMachine']
-            }
-          },
+          entry: context => logger.debug(`[AEM] Entering waitForParticipantsToExit with ${Object.keys(context.participants).length} participants`),
           always: [
             {
               cond: context => Object.keys(context.participants).length === 0,
-              target: 'detaching'
+              target: 'finalizing'
+            }
+          ],
+          on: {
+            PARTICIPANT_LEAVE: {
+              actions: () => logger.debug('[AEM] Ignoring PARTICIPANT_LEAVE during orchestrated shutdown.')
             }
-          ]
+          }
+        },
+        finalizing: {
+          deferred: DeferredStates,
+          invoke: {
+            src: 'eventTransitionCanceled',
+            onDone: 'detaching',
+            onError: '#activeEvent.failure'
+          }
         },
         detaching: {
           deferred: DeferredStates,
           invoke: {
             src: 'detachChannels',
             onDone: {
-              target: '#activeEvent.doneExit',
-              actions: ['notifyAppMachineShutdown']
+              target: '#activeEvent.doneExit'
             },
             onError: {
               target: '#activeEvent.failure'
@@ -714,11 +727,10 @@ const AnearEventMachineFunctions = ({
         return service.start()
       }
     }),
-    notifyAppMachineShutdown: (context, event) => {
-      // Send TERMINATED to AppM when shutdown is complete
+    notifyAppMachineRendered: (context, event) => {
       if (context.appEventMachine) {
-        logger.debug('[AEM] Sending TERMINATED to AppM - shutdown complete')
-        context.appEventMachine.send('TERMINATED')
+        logger.debug('[AEM] Sending RENDERED to AppM')
+        context.appEventMachine.send('RENDERED')
       }
     },
     createEventChannel: assign({
@@ -827,6 +839,8 @@ const AnearEventMachineFunctions = ({
       if (participantMachine) {
         logger.debug("[AEM] sending PARTICIPANT_EXIT to ", participantMachine.id)
         participantMachine.send('PARTICIPANT_EXIT')
+      } else {
+        logger.warn(`[AEM] Participant machine not found for id ${event.data.id} during sendExitToParticipantMachine`)
       }
     },
     sendParticipantExitToAppEventMachine: (context, event) => {
@@ -1028,7 +1042,14 @@ const AnearEventMachineFunctions = ({
       // The remote client has left the event.  This is a permanent exit
       // from the event
       const type = event.data.type
-      return type === 'PARTICIPANT_EXIT' || type === 'EVENT_UNMOUNT'
+      switch (type) {
+        case 'PARTICIPANT_EXIT':
+        case 'EVENT_UNMOUNT':
+        case 'TRANSITION_CLOSED':
+          return true
+        default:
+          return false
+      }
     },
     participantExists: (context, event) => !!context.participants[event.data.id],
     eventCreatorIsHost: (context, event) => context.anearEvent.hosted,
@@ -1037,8 +1058,9 @@ const AnearEventMachineFunctions = ({
   delays: {
     // in the future, these delays should be goverened by the type of App and
     // if there has been activity.
-    timeoutEventAnnounce: context => MinuteMsecs(C.TIMEOUT_MINUTES.ANNOUNCE),
-    timeoutEventStart: context => MinuteMsecs(C.TIMEOUT_MINUTES.START)
+    timeoutEventAnnounce: context => C.TIMEOUT_MSECS.ANNOUNCE,
+    timeoutEventStart: context => C.TIMEOUT_MSECS.START,
+    timeoutRendered: context => C.TIMEOUT_MSECS.RENDERED_EVENT_DELAY
   }
 })
 

package/lib/state_machines/AnearParticipantMachine.js

@@ -293,7 +293,7 @@ const AnearParticipantMachineFunctions = {
   },
   delays: {
     actionTimeout: context => context.actionTimeoutMsecs,
-    reconnectTimeout: _c => C.TIMEOUT_SECONDS.RECONNECT * 1000 // client must reconnect in this time
+    reconnectTimeout: _c => C.TIMEOUT_MSECS.RECONNECT // client must reconnect in this time
   }
 }
 

package/lib/utils/AppMachineTransition.js

@@ -23,8 +23,9 @@ const AppMachineTransition = (anearEvent) => {
     // Check if AppM has reached a final state (handle different XState versions)
     const isDone = appEventMachineState?.done || appEventMachineState?.value === 'done'
     
-    // Process meta FIRST (including exit displays) before sending CLOSE
-    if (metaObjects.length > 0) {
+    // Process meta FIRST (including exit displays) before sending CLOSE.
+    // Do not re-process meta on the RENDERED event from AEM to avoid an infinite loop.
+    if (event.type !== 'RENDERED' && metaObjects.length > 0) {
       const appStateName = _stringifiedState(value)
       
       const displayEvents = []

package/lib/utils/Constants.js

@@ -7,11 +7,17 @@ module.exports = {
   ImagesDirPath: 'assets/images',
   CssDirPath: 'assets/css',
   PugSuffix: '.pug',
-  TIMEOUT_MINUTES: {
-    START: 60, // 1 hour
-    ANNOUNCE: 120 // 2 hours
+  TIMEOUT_MSECS: {
+    ANNOUNCE: 5 * 60 * 1000, // 5 minutes
+    START: 5 * 60 * 1000,    // 5 minutes
+    RENDERED_EVENT_DELAY: 100, // 100 milliseconds
+    RECONNECT: 30 * 1000 // 30 seconds
   },
-  TIMEOUT_SECONDS: {
-    RECONNECT: 30
+  EventStates: {
+    CREATED: 'created',
+    STARTED: 'started',
+    ENDED: 'ended',
+    CANCELLED: 'cancelled',
+    FAILED: 'failed'
   }
 }

package/package.json

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