most-box 0.2.9 → 0.3.0

package/server/index.js

@@ -137,6 +137,9 @@ function bindEngineEvents({
   engine.on('channel:peer:offline', data =>
     wsBroadcast('channel:peer:offline', data)
   )
+  engine.on('channel:presence', data =>
+    wsSendToChannel(data.channelKey, 'channel:presence', data)
+  )
   engine.on('channel:joined', data => wsBroadcast('channel:joined', data))
   engine.on('channel:left', data => wsBroadcast('channel:left', data))
   engine.on('user:metadata:updated', data => {
@@ -157,23 +160,33 @@ function bindEngineEvents({
 }
 
 function createWebSocketServer({
+  engine,
   serverInstance,
   validateWebSocketRequest,
+  getWebSocketUserAddress,
   subscribeToChannel,
   unsubscribeFromChannel,
   cleanupWsSubscriptions,
 }) {
   const wss = new WebSocketServer({ noServer: true })
+  let wsConnectionCounter = 0
 
-  wss.on('connection', ws => {
+  wss.on('connection', (ws, req) => {
+    ws.userAddress = getWebSocketUserAddress(req)
+    ws.presenceSourceId = `ws:${++wsConnectionCounter}`
     ws.on('error', () => {})
     ws.on('close', () => {
       cleanupWsSubscriptions(ws)
+      try {
+        engine.clearChannelPresenceSource(ws.presenceSourceId, {
+          broadcast: true,
+        })
+      } catch {}
     })
     ws.on('message', raw => {
       try {
         const msg = JSON.parse(raw)
-        const { event, data } = msg
+        const { event, data = {} } = msg
 
         switch (event) {
           case 'register':
@@ -189,6 +202,48 @@ function createWebSocketServer({
               unsubscribeFromChannel(ws, data.channel)
             }
             break
+          case 'channel:presence:join':
+            if (data.channel && ws.userAddress) {
+              engine.joinChannelPresence(data.channel, {
+                ownerAddress: ws.userAddress,
+                sourceId: ws.presenceSourceId,
+                sessionId: data.sessionId,
+                displayName: data.displayName,
+                avatar: data.avatar,
+                profileUpdatedAt: data.profileUpdatedAt,
+              })
+            }
+            break
+          case 'channel:presence:heartbeat':
+            if (data.channel && ws.userAddress) {
+              engine.heartbeatChannelPresence(data.channel, {
+                ownerAddress: ws.userAddress,
+                sourceId: ws.presenceSourceId,
+                sessionId: data.sessionId,
+              })
+            }
+            break
+          case 'channel:presence:profile':
+            if (data.channel && ws.userAddress) {
+              engine.updateChannelPresenceProfile(data.channel, {
+                ownerAddress: ws.userAddress,
+                sourceId: ws.presenceSourceId,
+                sessionId: data.sessionId,
+                displayName: data.displayName,
+                avatar: data.avatar,
+                profileUpdatedAt: data.profileUpdatedAt,
+              })
+            }
+            break
+          case 'channel:presence:leave':
+            if (data.channel && ws.userAddress) {
+              engine.leaveChannelPresence(data.channel, {
+                ownerAddress: ws.userAddress,
+                sourceId: ws.presenceSourceId,
+                sessionId: data.sessionId,
+              })
+            }
+            break
         }
       } catch (err) {
         console.error('[WS Message Error]', err.message)
@@ -295,8 +350,10 @@ export async function main() {
   )
 
   wssRef.current = createWebSocketServer({
+    engine,
     serverInstance: serverInstanceRef.current,
     validateWebSocketRequest: appRuntime.validateWebSocketRequest,
+    getWebSocketUserAddress: appRuntime.getWebSocketUserAddress,
     subscribeToChannel: appRuntime.subscribeToChannel,
     unsubscribeFromChannel: appRuntime.unsubscribeFromChannel,
     cleanupWsSubscriptions: appRuntime.cleanupWsSubscriptions,

package/server/src/http/app.js

@@ -225,6 +225,11 @@ export function createApp(engine, options = {}) {
       return false
     }
 
+    return Boolean(getWebSocketUserAddress(req))
+  }
+
+  function getWebSocketUserAddress(req) {
+    const url = new URL(req.url, `http://localhost:${appPort}`)
     const address = url.searchParams.get('address') || ''
     const timestamp = url.searchParams.get('timestamp') || ''
     const signature = url.searchParams.get('signature') || ''
@@ -233,7 +238,7 @@ export function createApp(engine, options = {}) {
       'GET',
       '/ws'
     )
-    return auth.ok
+    return auth.ok ? auth.address : ''
   }
 
   // 将广播函数挂载到 engine 上供外部测试使用
@@ -310,5 +315,6 @@ export function createApp(engine, options = {}) {
     unsubscribeFromChannel,
     cleanupWsSubscriptions,
     validateWebSocketRequest,
+    getWebSocketUserAddress,
   }
 }

package/server/src/http/nodeStatus.js

@@ -266,6 +266,12 @@ export function buildOpenApiSpec(appPort) {
           responses: { 200: { description: 'Channel peers' } },
         },
       },
+      '/api/channels/{name}/presence': {
+        get: {
+          summary: 'List active user presence for a channel',
+          responses: { 200: { description: 'Channel presence' } },
+        },
+      },
       '/api/channels/{name}/remark': {
         put: {
           summary: 'Set an authenticated user channel remark',

package/server/src/http/routes/channelRoutes.js

@@ -123,6 +123,18 @@ export function registerChannelRoutes(app, { engine }) {
     }
   })
 
+  app.get('/api/channels/:name/presence', c => {
+    try {
+      return c.json(
+        engine.getChannelPresence(c.req.param('name'), {
+          ownerAddress: c.get('userAddress'),
+        })
+      )
+    } catch (err) {
+      return badRequestOrAppError(c, err)
+    }
+  })
+
   app.put('/api/channels/:name/remark', async c => {
     const name = c.req.param('name')
     const body = await c.req.json()