anear-js-api 0.4.26 → 0.4.28

package/lib/state_machines/AnearEventMachine.js

@@ -103,22 +103,61 @@ const ActiveEventStatesConfig = {
   initial: 'registerCreator',
   states: {
     registerCreator: {
-      deferred: DeferredStates,
-      invoke: {
-        src: 'getAttachedCreatorOrHost',
-        onDone: {
-          actions: ['startNewParticipantMachine'],
-          target: '.',
-          internal: true
+      // First, while continuing to defer any PARTICIPANT_ENTERs, see if the creator presence
+      // is available via channel.get() and if not, we will get the PARTICIPANT_ENTER at the
+      // right time in waiting where the deferred is not active.
+      initial: 'loading',
+      states: {
+        loading: {
+          deferred: DeferredStates,
+          invoke: {
+            src: 'getAttachedCreatorOrHost',
+            onDone: {
+              // event.data.anearParticipant will be null if no presence enter
+              // was available on actions channel via get().  We must wait for
+              // the undeferred PARTICIPANT_ENTER instead.  But if get() DID
+              // return the creator presence, then an APM will be created
+              // and we goto waiting for the PARTICIPANT_MACHINE_READY
+              actions: ['startNewParticipantMachine'],
+              target: 'waiting'
+            },
+            onError: {
+              target: '#failure'
+            }
+          }
         },
-        onError: {
-          target: '#failure'
-        }
-      },
-      on: {
-        PARTICIPANT_READY: {
-          actions: (c, e) => logger.debug("Got PARTICIPANT_READY for ", e.data.anearParticipant.id),
-          target: '#eventCreated'
+        waiting: {
+          id: 'waiting',
+          initial: 'creatorStatus',
+          states: {
+            creatorStatus: {
+              id: 'creatorStatus',
+              on: {
+                PARTICIPANT_ENTER: {
+                  actions: (c, e) => logger.debug("got creator PARTICIPANT_ENTER"),
+                  target: '#waiting.fetching'
+                },
+                PARTICIPANT_MACHINE_READY: {
+                  actions: (c, e) => logger.debug("Got PARTICIPANT_MACHINE_READY for ", e.data.anearParticipant.id),
+                  target: '#eventCreated'
+                }
+              }
+            },
+            fetching: {
+              id: 'fetching',
+              deferred: DeferredStates,
+              invoke: {
+                src: 'fetchParticipantData',
+                onDone: {
+                  actions: ['startNewParticipantMachine'],
+                  target: '#waiting.creatorStatus'
+                },
+                onError: {
+                  target: '#activeEvent.failure'
+                }
+              }
+            }
+          }
         }
       }
     },
@@ -137,7 +176,6 @@ const ActiveEventStatesConfig = {
       initial: 'waitingAnnounce',
       entry: [
         'sendParticipantEnterToAppEventMachine',
-        'enableParticipantPresenceEvents',
         'enableSpectatorPresenceEvents'
       ],
       on: {
@@ -440,12 +478,12 @@ const CreateEventChannelsAndAppMachineConfig = {
   // 6. Transition to activeEvent
   id: 'createChannels',
   initial: 'setupEventChannel',
+  deferred: DeferredStates, // don't allow PARTICIPANT_ENTER until we are registering creator/host
 
   states: {
     setupEventChannel: {
       // get(eventChannelName) and setup state-change callbacks
       entry: [(c,e) => logger.debug(`=== NEW EVENT ${c.anearEvent.id} ===`), 'createEventChannel'],
-      deferred: DeferredStates,
       invoke: {
         src: 'attachToEventChannel',
         onDone: {
@@ -465,7 +503,6 @@ const CreateEventChannelsAndAppMachineConfig = {
     },
     setupParticipantsDisplayChannel: {
       entry: 'createParticipantsDisplayChannel',
-      deferred: DeferredStates,
       invoke: {
         src: 'attachToParticipantsDisplayChannel',
         onDone: {
@@ -477,12 +514,13 @@ const CreateEventChannelsAndAppMachineConfig = {
         }
       },
       on: {
-        ATTACHED: 'setupActionsChannel'
+        ATTACHED: {
+          target: 'setupActionsChannel'
+        }
       }
     },
     setupActionsChannel: {
       entry: 'createActionsChannel',
-      deferred: DeferredStates,
       invoke: {
         src: 'attachToActionsChannel',
         onDone: {
@@ -495,14 +533,13 @@ const CreateEventChannelsAndAppMachineConfig = {
       },
       on: {
         ATTACHED: {
-          actions: ['subscribeToActionMessages'],
+          actions: ['enableParticipantPresenceEvents', 'subscribeToActionMessages'],
           target: 'setupSpectatorsChannel'
         }
       }
     },
     setupSpectatorsChannel: {
       entry: 'createSpectatorsChannel',
-      deferred: DeferredStates,
       invoke: {
         src: 'attachToSpectatorsChannel',
         onDone: {
@@ -614,6 +651,8 @@ const AnearEventMachineFunctions = ({
     startNewParticipantMachine: assign((context, event) => {
       const { anearParticipant } = event.data
 
+      if (!anearParticipant) return {}
+
       if (context.participants[anearParticipant.id]) {
         logger.debug(`participant entry for ${anearParticipant.id} already exists`)
         return {}
@@ -840,7 +879,7 @@ const AnearEventMachineFunctions = ({
 
       const members = await RealtimeMessaging.getPresenceOnChannel(context.actionsChannel)
 
-      if (members.length === 0) throw new Error("missing creator presence on Actions channel")
+      if (members.length === 0) return { anearParticipant: null }
 
       // event.data in onDone actions is
       // {
@@ -871,8 +910,8 @@ const AnearEventMachineFunctions = ({
     },
     fetchParticipantData: async (context, event) => {
       // event.data => {id: <participantId>, geoLocation: {}}
-      const participantJSON = await AnearApi.getEventParticipantJson(event.id)
-      const anearParticipant = new AnearParticipant(participantJSON, event.geoLocation)
+      const participantJSON = await AnearApi.getEventParticipantJson(event.data.id)
+      const anearParticipant = new AnearParticipant(participantJSON, event.data.geoLocation)
 
       return {
         anearParticipant

package/lib/state_machines/AnearParticipantMachine.js

@@ -199,7 +199,10 @@ const AnearParticipantMachineFunctions = {
       return { privateChannel }
     }),
     sendParticipantReady: (context, event) => {
-      context.anearEvent.send('PARTICIPANT_READY', { data: { anearParticipant: context.anearParticipant } })
+      context.anearEvent.send(
+        'PARTICIPANT_MACHINE_READY',
+        { data: { anearParticipant: context.anearParticipant } }
+      )
     },
     createAnyAppParticipantMachine: assign({
       appParticipantMachine: context => {

package/lib/utils/RealtimeMessaging.js

@@ -55,8 +55,9 @@ class RealtimeMessaging {
       channel.presence.subscribe(
         action,
         member => {
-          logger.debug(`sending machine event: rcvd presence ${eventName} from ${member.id} on ${channel.name}`)
-          actor.send(eventName, { data: member.data })
+          const { data } = member
+          logger.debug(`sending machine event: rcvd presence ${eventName} from ${data.id} on ${channel.name}`)
+          actor.send(eventName, { data })
         }
       )
     }

package/package.json

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