anear-js-api 0.6.0 → 0.6.2

package/lib/models/AnearEvent.js

@@ -154,7 +154,11 @@ class AnearEvent extends JsonApiResource {
   }
 
   allowsSpectators() {
-    return !this.hasFlag("no_spectators")
+    //
+    // Canonical spectators decision uses the ANAPI-provided boolean when present.
+    // Fallback to legacy negative flag for older payloads.
+    //
+    return this.attributes['spectators-allowed']
   }
 
   isParticipantEventCreator(participant) {

package/lib/state_machines/AnearEventMachine.js

@@ -1087,10 +1087,21 @@ const CreateEventChannelsAndAppMachineConfig = {
         }
       },
       on: {
-        ATTACHED: {
-          actions: ['enableParticipantPresenceEvents', 'subscribeToActionMessages'],
-          target: 'setupSpectatorsChannel'
-        }
+        ATTACHED: [
+          {
+            // If the event supports spectators, continue to set up the
+            // spectatorsDisplayChannel and related presence callbacks.
+            cond: 'eventSupportsSpectators',
+            actions: ['enableParticipantPresenceEvents', 'subscribeToActionMessages'],
+            target: 'setupSpectatorsChannel'
+          },
+          {
+            // Otherwise, skip spectator channel entirely and move directly
+            // to creating the AppEventMachine.
+            actions: ['enableParticipantPresenceEvents', 'subscribeToActionMessages'],
+            target: 'createAppEventMachine'
+          }
+        ]
       }
     },
     setupSpectatorsChannel: {
@@ -1178,12 +1189,23 @@ const AnearEventMachineFunctions = ({
       )
     }),
     createSpectatorsChannel: assign({
-      spectatorsDisplayChannel: context => RealtimeMessaging.getChannel(
-        context.anearEvent.spectatorsChannelName,
-        context.anearEvent
-      )
+      spectatorsDisplayChannel: context => {
+        const channelName = context.anearEvent.spectatorsChannelName
+        if (!channelName) {
+          logger.debug('[AEM] spectatorsChannelName is undefined; skipping spectators channel creation')
+          return null
+        }
+        return RealtimeMessaging.getChannel(
+          channelName,
+          context.anearEvent
+        )
+      }
     }),
     enableSpectatorPresenceEvents: context => {
+      if (!context.spectatorsDisplayChannel) {
+        logger.debug('[AEM] spectatorsDisplayChannel is null; spectator presence events disabled for this event')
+        return
+      }
       // future spectators who (un)attach to the spectatorsDisplayChannel will
       // trigger presence events to the anearEventMachine
       RealtimeMessaging.enablePresenceCallbacks(
@@ -1641,6 +1663,7 @@ const AnearEventMachineFunctions = ({
       return { anearParticipant }
     },
     getAttachedSpectators: async (context, event) => {
+      if (!context.spectatorsDisplayChannel) return []
       const members = await RealtimeMessaging.getPresenceOnChannel(context.spectatorsDisplayChannel)
       return members
     },
@@ -1666,6 +1689,14 @@ const AnearEventMachineFunctions = ({
     },
     transitionAndGetAttachedSpectators: async (context, event) => {
       const transitionPromise = AnearApi.transitionEvent(context.anearEvent.id, 'announce')
+
+      // If there is no spectators channel (event/app does not support spectators),
+      // just transition state and return an empty spectator list.
+      if (!context.spectatorsDisplayChannel) {
+        await transitionPromise
+        return []
+      }
+
       const membersPromise = RealtimeMessaging.getPresenceOnChannel(context.spectatorsDisplayChannel)
       const [_, members] = await Promise.all([transitionPromise, membersPromise])
       return members
@@ -1723,6 +1754,15 @@ const AnearEventMachineFunctions = ({
     participantExists: (context, event) => !!context.participants[event.data.id],
     eventCreatorIsHost: (context, _e) => context.anearEvent.hosted,
     isOpenHouseEvent: (context, _e) => context.anearEvent.openHouse || false,
+    eventSupportsSpectators: (context, _e) => {
+      try {
+        // True only when ANAPI has indicated spectators are allowed for this event.
+        // JSAPI AnearEvent#allowsSpectators reads the canonical spectators-allowed flag.
+        return !!(context.anearEvent && context.anearEvent.allowsSpectators && context.anearEvent.allowsSpectators())
+      } catch (_e) {
+        return false
+      }
+    },
     isParticipantsTimeoutActive: (context, event) => {
       const isStartingNewTimeout = event.data && event.data.participantsTimeout && event.data.participantsTimeout.msecs > 0;
       const isTimeoutAlreadyRunning = context.participantsActionTimeout !== null;

package/lib/utils/DisplayEventProcessor.js

@@ -176,6 +176,14 @@ class DisplayEventProcessor {
       case 'spectators':
         logger.debug(`[DisplayEventProcessor] Publishing ${viewPath} to SPECTATORS_DISPLAY`)
 
+        // If this event/app does not support spectators, the spectatorsDisplayChannel
+        // will be null. In that case, skip publishing instead of throwing.
+        if (!this.spectatorsDisplayChannel) {
+          logger.debug('[DisplayEventProcessor] spectatorsDisplayChannel is null; skipping SPECTATORS_DISPLAY publish')
+          publishPromise = Promise.resolve()
+          break
+        }
+
         // Spectators never have action timeouts; they can display a visual bar only.
         // Prefer their own configured timeout for visuals, otherwise mirror the
         // allParticipants collective timeout (remaining time) if one is running.

package/package.json

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