anear-js-api 0.4.6 → 0.4.7

package/lib/api/AnearApi.js

@@ -8,38 +8,34 @@ class AnearApi extends ApiService {
     super(apiKey, apiVersion)
   }
 
-  async getAccount() {
+  getAccount() {
     logger.debug("API: GET /accounts")
 
-    return await this.get("accounts")
+    return this.get("accounts")
   }
 
-  async getEvent(eventId) {
+  getEvent(eventId) {
     logger.debug(`API: GET event ${eventId}`)
 
-    const json = await this.get("events", {id: eventId})
-    return json
+    return this.get("events", {id: eventId})
   }
 
-  async getAppZones(appId) {
+  getAppZones(appId) {
     logger.debug(`API: GET app_zones ${appId}`)
 
-    const json = await this.get("app_zones", {id: appId})
-    return json
+    return this.get("app_zones", {id: appId})
   }
 
-  async getApp(appId) {
+  getApp(appId) {
     logger.debug(`API: GET app ${appId}`)
 
-    const json = await this.get("apps", {id: appId})
-    return json
+    return this.get("apps", {id: appId})
   }
 
-  async getZoneEvents(zoneId) {
+  getZoneEvents(zoneId) {
     logger.debug(`API: GET zone_events ${zoneId}`)
 
-    const json = await this.get("zone_events", {id: zoneId})
-    return json
+    return this.get("zone_events", {id: zoneId})
   }
 
   async transitionEvent(eventId, eventName='next') {
@@ -52,11 +48,10 @@ class AnearApi extends ApiService {
     return attrs
   }
 
-  async getEventParticipantJson(participantId, geoLocation) {
+  getEventParticipantJson(participantId, geoLocation) {
     logger.debug(`API: GET event_participant ${participantId}`)
 
-    const json = await this.get("event_participants", {id: participantId})
-    return json
+    return this.get("event_participants", {id: participantId})
   }
 }
 

package/lib/api/__mocks__/AnearApi.js

@@ -2,7 +2,7 @@
 
 class AnearApi {
 
-  async getAccount() {
+  getAccount() {
   }
 
   async transitionEvent(eventId, eventName='next') {

package/lib/messaging/AnearMessaging.js

@@ -61,7 +61,7 @@ class AnearMessaging {
   initRealtime(clientOptions) {
     logger.debug("new Ably.Realtime connection..., log level: ", AblyLogLevel)
 
-    this.realtime = new Ably.Realtime(clientOptions)
+    this.realtime = new Ably.Realtime.Promise(clientOptions)
 
     const connectedCallback = async () => {
       await this.getAppInfo(AppId)

package/lib/models/AnearEvent.js

@@ -218,21 +218,31 @@ class AnearEvent extends JsonApiResource {
   async participantEnter(participant) {
     // Called each time a participant ENTERs (attaches to) the Event's Action Channel.
     // This could be when joining an event for the first time, rejoining, or after a browser
-    // refresh/reconnect. If the participant exists in this.participants, we call Refresh,
-    // else Enter Invoke Enter/Refresh callbacks
-    if (this.participants.exists(participant)) {
-      logger.info(`AnearEvent: participant ${participant.id} exists.  Refreshing...`)
-
-      this.participants.add(participant) // update the participants record
-
-      this.anearStateMachine.sendRefreshEvent({ participant })
-
-      await participant.update()
+    // refresh/reconnect. If the participant exists in Storage and in this.participants,
+    // its probably due to a browser refresh, and we call Refresh. Else, its either a brand
+    // new participant or an anearEvent recovery after crash, and so we invoke new participant enter
+    //
+    if (participant.exists()) { // persisted in storage?
+      if (this.participants.exists(participant)) {
+        logger.debug(`AnearEvent: participant ${participant.id} exists.  Refreshing...`)
+
+        // Likely here due to participant browser refresh
+        // get the existing participant, turn off his timer and send refresh event to StateMachine
+        const existingParticipant = this.participants.get(participant)
+        existingParticipant.interruptTimer()
+        this.anearStateMachine.sendRefreshEvent({participant: existingParticipant})
+        await existingParticipant.update()
+      } else {
+        // Likely here due to prior AnearEvent error and this is a event reload and restart
+        // add the participants record back into Participants and update persisted copy
+        this.participants.add(participant)
+        this.anearStateMachine.sendJoinEvent({ participant })
+        await participant.update()
+      }
     } else {
+      // New Participant first-time join this AnearEvent
       this.participants.add(participant) // add the participants record
-
       this.anearStateMachine.sendJoinEvent({ participant })
-
       await participant.persist()
     }
   }
@@ -360,8 +370,8 @@ class AnearEvent extends JsonApiResource {
     await this.messaging.detachAll(this.id)
   }
 
-  logMessage(...args) {
-    logger.info(...args)
+  logDebugMessage(...args) {
+    logger.debug(...args)
   }
 
   logError(context, event) {

package/lib/utils/Participants.js

@@ -46,7 +46,15 @@ class Participants {
   }
 
   exists({id}) {
-    return this.getById(id) != undefined
+    const emptyObject = (obj) => {
+      return Object.keys(obj).length === 0 && Object.getPrototypeOf(obj) === Object.prototype
+    }
+
+    const participant = this.getById(id)
+
+    if (!participant) { return false } // id not found
+
+    return !emptyObject(participant)
   }
 
   get({id}) {

package/package.json

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