anear-js-api 0.3.0 → 0.3.3

package/lib/messaging/AnearMessaging.js

@@ -69,8 +69,8 @@ class AnearMessaging {
       async () => {
         await this.getAppInfo(AppId)
         logger.info("Ably connected!")
-        await this.reloadAnyEventsInProgress(AppId)
         await this.setupCreateEventChannel()
+        await this.reloadAnyEventsInProgress(AppId)
       }
     )
   }
@@ -181,18 +181,24 @@ class AnearMessaging {
 
     logger.info(`Event ${anearEvent.id} ${eventExists ? "already exists" : "does not exist"} in Storage`)
 
+    let loadedEvent = anearEvent
+
     if (!eventExists) {
       await this.runExclusive("createEventCallback", async () => {
         await anearEvent.createdEventCallback()
         await anearEvent.persist()
+        anearEvent.startStateMachine()
+        await this.initEventRealtimeMessaging(anearEvent)
       })
+    } else {
+      loadedEvent = await this.getAnearEventFromStorage(anearEvent.id)
+      await this.initEventRealtimeMessaging(loadedEvent)
+      loadedEvent.startStateMachine()
     }
 
-    logger.info(`New ${anearEvent.constructor.name} Event: `, anearEvent.toJSON())
-
-    anearEvent.startStateMachine()
+    logger.info(`New ${loadedEvent.constructor.name} Event: `, loadedEvent.toJSON())
 
-    await this.initEventRealtimeMessaging(anearEvent)
+    return loadedEvent
   }
 
   async reloadAnyEventsInProgress(appId) {
@@ -205,7 +211,8 @@ class AnearMessaging {
         for (const eventData of events) {
           const eventJson = await this.api.getEvent(eventData.id)
           const anearEvent = new this.AnearEventClass(eventJson, this)
-          await this.loadOrPersistEventAndInitialize(anearEvent)
+          // const loadedEvent = await this.loadOrPersistEventAndInitialize(anearEvent)
+          // await this.refreshActiveParticipants(loadedEvent) DOES NOT WORK YET
         }
       }
     } catch (err) {
@@ -213,6 +220,20 @@ class AnearMessaging {
     }
   }
 
+  async refreshActiveParticipants(anearEvent) {
+    const allParticipants = anearEvent.participants.active(false)
+
+    return Promise.all(
+      allParticipants.map(
+        async participant => await this.processParticipantEnter(
+          anearEvent,
+          participant.id,
+          participant.geoLocation
+        )
+      )
+    )
+  }
+
   async setupCreateEventChannel() {
     logger.info(`attaching to channel ${AnearCreateEventChannelName}`)
 
@@ -328,21 +349,23 @@ class AnearMessaging {
 
     logger.debug(`**** ENTER PARTICIPANT ****  event: ${anearEvent.id}, participant: ${participantId}`)
 
+    await this.processParticipantEnter(anearEvent, participantId, geoLocation)
+  }
+
+  async processParticipantEnter(anearEvent, participantId, geoLocation) {
+
+    logger.debug(`processing Participant Enter for event: ${anearEvent.id}, participant: ${participantId}`)
     //
     // get the participant data from the API (this will also validate the participant).
     // check if the participant is already in storage, and if so, instantiate, else
     // instantiate from API response
     //
     try {
-      logger.debug(`API fetch participant info for ${participantId}`)
-
       const participantJson = await this.api.getEventParticipantJson(participantId)
       const participant = new this.AnearParticipantClass(participantJson)
 
       participant.geoLocation = geoLocation
 
-      await this.setupPrivatePublishingChannel(participant)
-
       const persistedAnearParticipant = await this.AnearParticipantClass.getFromStorage(participantId)
 
       if (persistedAnearParticipant) {
@@ -350,6 +373,7 @@ class AnearMessaging {
       }
 
       await this.runExclusive("participantEnterCallback", async () => {
+        await this.setupPrivatePublishingChannel(participant)
         await anearEvent.participantEnter(participant)
         await anearEvent.update()
       })
@@ -357,7 +381,7 @@ class AnearMessaging {
       // participant not found or is not currently marked active at the API service
       // don't allow participation.  FIX: we need to publish to the private channel
       // with an error message type.
-      logger.error(`participantEnterMessagingCallback(${anearEvent.id}, ${participantId}) error: `, error)
+      logger.error(`processParticipanEnter(${anearEvent.id}, ${participantId}) error: `, error)
     }
   }
 

package/lib/models/AnearEvent.js

@@ -74,7 +74,7 @@ class AnearEvent extends JsonApiResource {
   async clonedEventContext() {
     const clonedEvent = await this.getClonedEvent()
 
-    return clonedEvent?.context
+    return clonedEvent ? clonedEvent.context : null
   }
 
   get stateMachineContext() {
@@ -207,13 +207,13 @@ class AnearEvent extends JsonApiResource {
 
       this.participants.add(this, participant) // update the participants entry
 
-      this.anearStateMachine.sendRefreshEvent({participant: participant})
+      this.anearStateMachine.sendRefreshEvent({ participant })
 
       await participant.update()
     } else {
       this.participants.add(this, participant) // add the participants entry
 
-      this.anearStateMachine.sendJoinEvent({participant: participant})
+      this.anearStateMachine.sendJoinEvent({ participant })
 
       await participant.persist()
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anear-js-api",
-  "version": "0.3.0",
+  "version": "0.3.3",
   "description": "Javascript Developer API for Anear Apps",
   "main": "lib/index.js",
   "scripts": {
@@ -17,7 +17,7 @@
   },
   "homepage": "https://github.com/machvee/anear-js-api#readme",
   "dependencies": {
-    "ably": "^1.2.15",
+    "ably": "^1.2.18",
     "async-mutex": "^0.3.2",
     "async-redis": "^2.0.0",
     "cross-fetch": "^3.1.5",