anear-js-api 2.1.1 → 2.2.1

package/lib/utils/AssetFileCollector.js

@@ -42,14 +42,12 @@ class AssetFileCollector {
         await this.walkDirectory(fullPath, filesData);
       } else if (entry.isFile()) {
         const relativePath = path.relative(this.baseDir, fullPath).replace(/\\/g, '/'); // Ensure forward slashes
-        const stat = await fs.stat(fullPath)
         const contentHash = await this.computeFileHash(fullPath);
         const contentType = this.getContentType(fullPath);
         filesData.push({
           path: relativePath,
           content_hash: contentHash,
           content_type: contentType,
-          mtime_ms: stat.mtimeMs,
         });
       }
     }

package/lib/utils/DisplayEventProcessor.js

@@ -50,7 +50,7 @@ class DisplayEventProcessor {
     this.participantsActionTimeout = anearEventMachineContext.participantsActionTimeout
     this.pugTemplates = anearEventMachineContext.pugTemplates
     this.pugHelpers = anearEventMachineContext.pugHelpers
-    this.participantMachines = anearEventMachineContext.participantMachines
+    this.participantPrivateChannels = anearEventMachineContext.participantPrivateChannels || {}
     this.participantsDisplayChannel = anearEventMachineContext.participantsDisplayChannel
     this.spectatorsDisplayChannel = anearEventMachineContext.spectatorsDisplayChannel
     this.participants = anearEventMachineContext.participants
@@ -329,32 +329,23 @@ class DisplayEventProcessor {
     }
 
     const hostId = hostEntry[0];
-    const hostMachine = this.participantMachines[hostId]
-
-    if (!hostMachine) {
-      throw new Error(`[DisplayEventProcessor] Host participant machine not found for hostId: ${hostId}`)
+    const hostChannel = this.participantPrivateChannels[hostId]
+    if (!hostChannel) {
+      throw new Error(`[DisplayEventProcessor] Host private channel not found for hostId: ${hostId}`)
     }
-    this._sendPrivateDisplay(hostMachine, hostId, template, templateRenderContext, timeoutFn, anchor, type, targetsArray, content, contentType)
-    return Promise.resolve()
+    return this._sendPrivateDisplay(hostChannel, hostId, template, templateRenderContext, timeoutFn, anchor, type, targetsArray, content, contentType)
   }
 
   _processPrivateParticipantDisplays(template, templateRenderContext, timeoutFn, anchor = null, type = null, targetsArray = null, content = null, contentType = null) {
-    Object.values(this.participantsIndex.all).forEach(
-      participantStruct => {
-        if (participantStruct.info.isHost) return;
-        if (participantStruct.info.active === false) return;
-
+    return Promise.all(
+      Object.values(this.participantsIndex.all).map(participantStruct => {
+        if (participantStruct.info.isHost || participantStruct.info.active === false) return Promise.resolve()
         const participantId = participantStruct.info.id
-        const participantMachine = this.participantMachines[participantId]
-        if (!participantMachine) {
-          logger.warn(`[DisplayEventProcessor] Participant machine not found for ${participantId}, skipping display`)
-          return
-        }
-        this._sendPrivateDisplay(participantMachine, participantId, template, templateRenderContext, timeoutFn, anchor, type, targetsArray, content, contentType)
-      }
+        const participantChannel = this.participantPrivateChannels[participantId]
+        if (!participantChannel) return Promise.resolve()
+        return this._sendPrivateDisplay(participantChannel, participantId, template, templateRenderContext, timeoutFn, anchor, type, targetsArray, content, contentType)
+      })
     )
-
-    return Promise.resolve()
   }
 
   /**
@@ -380,9 +371,9 @@ class DisplayEventProcessor {
       return { promise: Promise.resolve(), displaySent: false }
     }
 
-    const participantMachine = this.participantMachines[participantId]
-    if (!participantMachine) {
-      logger.debug(`[DisplayEventProcessor] Participant machine not found for ${participantId} (exited); treating as delivered`)
+    const participantChannel = this.participantPrivateChannels[participantId]
+    if (!participantChannel) {
+      logger.debug(`[DisplayEventProcessor] Participant private channel not found for ${participantId} (exited); treating as delivered`)
       return { promise: Promise.resolve(), displaySent: false }
     }
 
@@ -390,8 +381,8 @@ class DisplayEventProcessor {
       () => displayTimeout :
       timeoutFn
 
-    this._sendPrivateDisplay(participantMachine, participantId, template, templateRenderContext, effectiveTimeoutFn, anchor, type, targetsArray, content, contentType)
-    return { promise: Promise.resolve(), displaySent: true }
+    const promise = this._sendPrivateDisplay(participantChannel, participantId, template, templateRenderContext, effectiveTimeoutFn, anchor, type, targetsArray, content, contentType)
+    return { promise, displaySent: true }
   }
 
   _processSelectiveParticipantDisplay(template, templateRenderContext, timeoutFn, participantId, displayTimeout = null, anchor = null, type = null, targetsArray = null, content = null, contentType = null) {
@@ -399,7 +390,7 @@ class DisplayEventProcessor {
     return promise
   }
 
-  _sendPrivateDisplay(participantMachine, participantId, template, templateRenderContext, timeoutFn, anchor = null, type = null, targetsArray = null, content = null, contentType = null) {
+  _sendPrivateDisplay(participantChannel, participantId, template, templateRenderContext, timeoutFn, anchor = null, type = null, targetsArray = null, content = null, contentType = null) {
     let timeout = null
 
     const participantStruct = this.participantsIndex.get(participantId)
@@ -435,18 +426,7 @@ class DisplayEventProcessor {
         const remainingMsecs = Math.max(0, pat.msecs - (now - start))
         visualTimeout = { msecs: pat.msecs, remainingMsecs }
       } else {
-        const state = participantMachine?.state
-        const ctx = state?.context
-        if (ctx && ctx.actionTimeoutStart && ctx.actionTimeoutMsecs != null && ctx.actionTimeoutMsecs > 0) {
-          const now = Date.now()
-          const elapsed = now - ctx.actionTimeoutStart
-          const remaining = ctx.actionTimeoutMsecs - elapsed
-          const remainingMsecs = remaining > 0 ? remaining : 0
-          visualTimeout = {
-            msecs: ctx.actionTimeoutMsecs,
-            remainingMsecs
-          }
-        } else if (timeout !== null) {
+        if (timeout !== null) {
           visualTimeout = { msecs: timeout, remainingMsecs: timeout }
         }
       }
@@ -493,7 +473,8 @@ class DisplayEventProcessor {
       renderMessage.timeout = timeout
     }
 
-    participantMachine.send({ type: 'RENDER_DISPLAY', ...renderMessage })
+    EventStats.recordPublish(this.eventStats, participantChannel, 'PRIVATE_DISPLAY', renderMessage)
+    return RealtimeMessaging.publish(participantChannel, 'PRIVATE_DISPLAY', renderMessage)
   }
 
   _normalizeAnchorUpdateType(type) {

package/package.json

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

package/tests/DisplayEventProcessor.test.js

@@ -1,13 +1,17 @@
 const DisplayEventProcessor = require('../lib/utils/DisplayEventProcessor')
+const RealtimeMessaging = require('../lib/utils/RealtimeMessaging')
+
+jest.mock('../lib/utils/RealtimeMessaging', () => ({
+  publish: jest.fn(() => Promise.resolve())
+}))
 
 const makeProcessor = (overrides = {}) => {
-  const participantMachine = { send: jest.fn(), state: { context: {} } }
   const baseContext = {
     anearEvent: {},
     participantsActionTimeout: null,
     pugTemplates: {},
     pugHelpers: {},
-    participantMachines: { p1: participantMachine },
+    participantPrivateChannels: { p1: 'private-channel-p1' },
     participantsDisplayChannel: 'participants-channel',
     spectatorsDisplayChannel: null,
     participants: {
@@ -18,14 +22,17 @@ const makeProcessor = (overrides = {}) => {
   }
 
   return {
-    processor: new DisplayEventProcessor(baseContext),
-    participantMachine
+    processor: new DisplayEventProcessor(baseContext)
   }
 }
 
 describe('DisplayEventProcessor anchor updates', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
   test('sends direct text content to an anchor for eachParticipant', () => {
-    const { processor, participantMachine } = makeProcessor()
+    const { processor } = makeProcessor()
 
     processor._processSingle({
       appRenderContext: { app: { score: 98 }, meta: { viewer: 'eachParticipant', timeoutFn: null } },
@@ -38,20 +45,23 @@ describe('DisplayEventProcessor anchor updates', () => {
       props: {}
     })
 
-    expect(participantMachine.send).toHaveBeenCalledWith({
-      type: 'RENDER_DISPLAY',
-      targets: {
-        seat_p1_score: {
-          content: '98',
-          contentType: 'text',
-          type: 'replace'
+    expect(RealtimeMessaging.publish).toHaveBeenCalledWith(
+      'private-channel-p1',
+      'PRIVATE_DISPLAY',
+      {
+        targets: {
+          seat_p1_score: {
+            content: '98',
+            contentType: 'text',
+            type: 'replace'
+          }
         }
       }
-    })
+    )
   })
 
   test('supports multi-target participant updates mixing text and html', () => {
-    const { processor, participantMachine } = makeProcessor({
+    const { processor } = makeProcessor({
       pugTemplates: {
         'seat_label.pug': () => '<span>Seat A</span>'
       }
@@ -68,20 +78,23 @@ describe('DisplayEventProcessor anchor updates', () => {
       props: {}
     })
 
-    expect(participantMachine.send).toHaveBeenCalledWith({
-      type: 'RENDER_DISPLAY',
-      targets: {
-        seat_p1_score: {
-          content: '12',
-          contentType: 'text',
-          type: 'replace'
-        },
-        seat_p1_label: {
-          content: '<span>Seat A</span>',
-          type: 'replace'
+    expect(RealtimeMessaging.publish).toHaveBeenCalledWith(
+      'private-channel-p1',
+      'PRIVATE_DISPLAY',
+      {
+        targets: {
+          seat_p1_score: {
+            content: '12',
+            contentType: 'text',
+            type: 'replace'
+          },
+          seat_p1_label: {
+            content: '<span>Seat A</span>',
+            type: 'replace'
+          }
         }
       }
-    })
+    )
   })
 })