anear-js-api 0.4.9 → 0.4.11

package/lib/api/AnearApi.js

@@ -53,6 +53,12 @@ class AnearApi extends ApiService {
 
     return this.get("event_participants", {id: participantId})
   }
+
+  getUser(userId) {
+    logger.debug(`API: GET user ${userId}`)
+
+    return this.get("users", {id: userId})
+  }
 }
 
 module.exports = AnearApi

package/lib/messaging/AnearMessaging.js

@@ -7,6 +7,7 @@ const AppId = process.env.ANEARAPP_APP_ID
 
 const BroadcastMessageType       = 'broadcast'
 const PublicDisplayMessageType   = 'public_display'
+const PrivateDisplayMessageType  = 'private_display'
 const ActionMessageType          = 'client_action'
 const CreateEventMessageType     = 'create_event'
 const ExitEventMessageType       = 'exit_event'
@@ -67,7 +68,7 @@ class AnearMessaging {
       await this.getAppInfo(AppId)
       logger.debug("Ably connected!")
       await this.setupCreateEventChannel()
-      await this.reloadAnyEventsInProgress(AppId)
+      // await this.reloadAnyEventsInProgress(AppId) WHEN THIS WORKS or IS IMPORTANT...FIX!
     }
 
     this.realtime.connection.on("connected", connectedCallback)
@@ -476,16 +477,19 @@ class AnearMessaging {
     )
   }
 
-  async publishEventSpectatorsMessage(anearEvent, css, message, messageType = PublicDisplayMessageType) {
+  // you can pass in timeout params if you want the spectator display
+  // to show current anear-timer status
+  publishEventSpectatorsMessage(anearEvent, css, message, timeoutMsecs = 0, timeRemaining = 0) {
+
     const channel = this.eventChannels[anearEvent.id].spectators
 
-    await this.publishMessage(
+    return this.publishMessage(
       channel,
-      messageType,
+      PublicDisplayMessageType,
       css,
       message,
-      0,
-      0
+      timeoutMsecs,
+      timeRemaining
     )
   }
 
@@ -504,13 +508,13 @@ class AnearMessaging {
     return [startTimers, timeoutMsecs]
   }
 
-  async publishEventParticipantsMessage(anearEvent, participants, css, message, timeoutMsecs=0) {
+  publishEventParticipantsMessage(anearEvent, participants, css, message, timeoutMsecs=0) {
     const eventId = anearEvent.id
     const channel = this.eventChannels[eventId].participants
 
     const [startTimers, timeRemaining] = this.setMultipleParticipantTimers(participants, timeoutMsecs)
 
-    await this.publishMessage(
+    const promise = this.publishMessage(
       channel,
       PublicDisplayMessageType,
       css,
@@ -518,13 +522,15 @@ class AnearMessaging {
       timeoutMsecs,
       timeRemaining
     )
+
     startTimers()
+
+    return promise
   }
 
-  async publishEventPrivateMessage(
+  publishEventPrivateMessage(
           anearEvent,
           participant,
-          messageType,
           css,
           message,
           timeoutMsecs=0) {
@@ -535,18 +541,21 @@ class AnearMessaging {
 
     const [startTimer, timeRemaining] = participant.ensureTimer(timeoutMsecs)
 
-    await this.publishMessage(
+    const promise = this.publishMessage(
       channel,
-      messageType,
+      PrivateDisplayMessageType,
       css,
       message,
       timeoutMsecs,
       timeRemaining
     )
+
     startTimer()
+
+    return promise
   }
 
-  async publishMessage(
+  publishMessage(
           channel,
           messageType,
           css,
@@ -562,24 +571,24 @@ class AnearMessaging {
 
     logger.debug(`publishMessage(timeoutMsecs=${timeoutMsecs}}, timeRemaining=${timeRemaining})`)
 
-    await this.publishChannelMessage(
+    return this.publishChannelMessage(
       channel,
       messageType,
       payload
     )
   }
 
-  async publishEventTransitionMessage(anearEvent, newState) {
+  publishEventTransitionMessage(anearEvent, newState) {
     const channel = this.eventChannels[anearEvent.id].events
     const payload = {content: {state: newState}}
 
     logger.debug(`publishEventTransitionMessage: event ${anearEvent.id} transitioning to ${newState}`)
 
-    await this.publishChannelMessage(channel, EventTransitionMessageType, payload)
+    return this.publishChannelMessage(channel, EventTransitionMessageType, payload)
   }
 
-  async publishChannelMessage(channel, messageType, payload) {
-    await channel.publish(
+  publishChannelMessage(channel, messageType, payload) {
+    return channel.publish(
       messageType,
       payload
     )

package/lib/models/AnearEvent.js

@@ -8,8 +8,6 @@ const JsonApiResource = require('./JsonApiResource')
 const Participants = require('../utils/Participants')
 const logger = require('../utils/Logger')
 
-const PrivateDisplayMessageType  = 'private_display'
-
 const PlayableStates = ['closing', 'closed', 'canceled']
 
 class AnearEvent extends JsonApiResource {
@@ -152,15 +150,14 @@ class AnearEvent extends JsonApiResource {
     logger.debug(`mutex ${name} released!`)
   }
 
-  publishEventSpectatorsMessage(message) {
-    return this.messaging.publishEventSpectatorsMessage(this, this.css, message)
+  publishEventSpectatorsMessage(message, timeoutMsecs = 0) {
+    return this.messaging.publishEventSpectatorsMessage(this, this.css, message, timeoutMsecs)
   }
 
   publishEventPrivateMessage(participant, message, timeoutMsecs=0) {
     return this.messaging.publishEventPrivateMessage(
       this,
       participant,
-      PrivateDisplayMessageType,
       this.css,
       message,
       timeoutMsecs

package/lib/models/AnearParticipant.js

@@ -84,6 +84,10 @@ class AnearParticipant extends JsonApiResource {
     return this.attributes['private-channel-name']
   }
 
+  get timerStatus() {
+    return this.timer.currentStatus
+  }
+
   ensureTimer(timeoutMsecs) {
     // this is called when a new timer is being started for a privateMessage
     // sent to a participant, or public message to all participants

package/lib/utils/ParticipantTimer.js

@@ -20,6 +20,14 @@ class ParticipantTimer {
     this.runTimer(now, timeoutMsecs)
   }
 
+  get currentStatus() {
+    return {
+      state: this.state,
+      timeoutMsecs: this.timeoutMsecs,
+      timeRemaining: this.interrupt()
+    }
+  }
+
   timerExpired() {
     logger.debug(`TIMEOUT!! timer expired for participant ${this.participantId}`)
     this.state = Expired
@@ -28,6 +36,7 @@ class ParticipantTimer {
 
   runTimer(now, timeoutMsecs) {
     this.startedAt = now
+    this.timeoutMsecs = timeoutMsecs // original timeout duration
     this.timeRemaining = timeoutMsecs
     this.state = Running
     this.id = setTimeout(() => this.timerExpired(), timeoutMsecs)
@@ -80,6 +89,8 @@ class ParticipantTimer {
     this.id = null
     this.state = Off
     this.startedAt = null
+    this.timeoutMsecs = 0
+    this.timeRemaining = 0
   }
 
   checkTimerIs(state) {

package/package.json

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