fix: protocol compatibility fixes

Author: eckoln

README.md

@@ -188,5 +188,3 @@ bun run --filter=@apps/server deploy
 - **No event size limit:** Events larger than 10 KB are not rejected. Pusher returns HTTP `413` for oversized events. Large WebSocket messages may hit Cloudflare frame limits.
 
 - **No `auth_timestamp` clock skew check:** The REST API authentication middleware does not validate that the `auth_timestamp` query parameter falls within ±600 seconds of the current time. This means signed requests can be replayed indefinitely.
-
-- **`info` parameter not supported on event triggers:** The `POST /events` and `POST /batch_events` endpoints do not return channel attributes (`user_count`, `subscription_count`) when the `info` query parameter is provided.

apps/server/src/api/routes/apps.ts

@@ -148,6 +148,29 @@ app.post(
 
     await stub.broadcast(payload)
 
+    if (payload.info) {
+      const requested = payload.info.split(',').map((s) => s.trim())
+      const includeUserCount = requested.includes('user_count')
+      const includeSubscriptionCount = requested.includes('subscription_count')
+
+      const channels =
+        payload.channels ?? (payload.channel ? [payload.channel] : [])
+      const result: Record<string, Record<string, number>> = {}
+
+      for (const channel of channels) {
+        const occ = await stub.getChannel(channel)
+        const attrs: Record<string, number> = {}
+        if (occ) {
+          if (includeUserCount) attrs.user_count = occ.user_count
+          if (includeSubscriptionCount)
+            attrs.subscription_count = occ.subscription_count
+        }
+        result[channel] = attrs
+      }
+
+      return c.json({ channels: result }, 200)
+    }
+
     return c.json({}, 200)
   },
 )
@@ -167,7 +190,27 @@ app.post(
 
     await stub.broadcast(payload)
 
-    return c.json({ batch: payload.batch.map(() => ({})) }, 200)
+    const batchResponses = await Promise.all(
+      payload.batch.map(async (item) => {
+        if (!item.info) return {}
+
+        const requested = item.info.split(',').map((s) => s.trim())
+        const includeUserCount = requested.includes('user_count')
+        const includeSubscriptionCount =
+          requested.includes('subscription_count')
+
+        const occ = await stub.getChannel(item.channel)
+        const attrs: Record<string, number> = {}
+        if (occ) {
+          if (includeUserCount) attrs.user_count = occ.user_count
+          if (includeSubscriptionCount)
+            attrs.subscription_count = occ.subscription_count
+        }
+        return attrs
+      }),
+    )
+
+    return c.json({ batch: batchResponses }, 200)
   },
 )
 

apps/server/src/api/schemas/apps.ts

@@ -8,24 +8,27 @@ export const querySchema = z.object({
   body_md5: z.string().optional(),
 })
 
-export const eventSchema = z.object({
-  name: z.string().nonempty(),
-  channels: z.array(z.string()).nonempty().optional(),
-  channel: z.string().nonempty().optional(),
-  data: z.string(),
-  socket_id: z.string().optional(),
-}).refine((data) => {
-  if (!data.channels && !data.channel) {
-    throw new z.ZodError([
-      {
-        code: z.ZodIssueCode.custom,
-        message: 'Either channels or channel is required',
-        path: ['channels'],
-      },
-    ])
-  }
-  return true
-})
+export const eventSchema = z
+  .object({
+    name: z.string().nonempty(),
+    channels: z.array(z.string()).nonempty().optional(),
+    channel: z.string().nonempty().optional(),
+    data: z.string(),
+    socket_id: z.string().optional(),
+    info: z.string().optional(),
+  })
+  .refine((data) => {
+    if (!data.channels && !data.channel) {
+      throw new z.ZodError([
+        {
+          code: 'custom',
+          message: 'Either channels or channel is required',
+          path: ['channels'],
+        },
+      ])
+    }
+    return true
+  })
 
 export type Event = z.infer<typeof eventSchema>
 
@@ -37,6 +40,7 @@ export const batchEventSchema = z.object({
         channel: z.string().nonempty(),
         data: z.string(),
         socket_id: z.string().optional(),
+        info: z.string().optional(),
       }),
     )
     .nonempty()

apps/server/src/handlers/ws-handler.ts

@@ -48,7 +48,10 @@ export class WebSocketHandler {
       } else if (this.isClientEvent(event)) {
         await this.handleClientEvent(ws, { event, channel, data })
       } else {
-        console.log('Message event handler not implemented.', event)
+        this.connections.sendTo(ws, {
+          event: 'pusher:error',
+          data: { code: 4009, message: 'Event not supported' },
+        })
       }
     } catch (e) {
       console.error('Failed to handle WebSocket message:', e)