Fix sync event typing

server/src/notifications/eventParsing.ts

@@ -31,7 +31,7 @@ export function extractMessageEventType(event: SyncEvent): string | null {
         return null
     }
 
-    const message = event.message?.content ?? event.data
+    const message = event.message?.content
     const envelope = extractEventEnvelope(message)
     if (!envelope) {
         return null

server/src/sse/sseManager.ts

@@ -108,7 +108,7 @@ export class SSEManager {
         }
 
         if (event.type === 'message-received') {
-            return Boolean(event.sessionId && connection.sessionId === event.sessionId)
+            return connection.sessionId === event.sessionId
         }
 
         if (event.type === 'connection-changed') {
@@ -119,11 +119,11 @@ export class SSEManager {
             return true
         }
 
-        if (event.sessionId && connection.sessionId === event.sessionId) {
+        if ('sessionId' in event && connection.sessionId === event.sessionId) {
             return true
         }
 
-        if (event.machineId && connection.machineId === event.machineId) {
+        if ('machineId' in event && connection.machineId === event.machineId) {
             return true
         }
 

server/src/sync/syncEngine.ts

@@ -128,32 +128,17 @@ export class SyncEngine {
             }
         }
 
-        const webappEvent: SyncEvent = event.type === 'message-received'
-            ? {
-                type: event.type,
-                namespace,
-                sessionId: event.sessionId,
-                machineId: event.machineId,
-                message: event.message
-            }
-            : {
-                type: event.type,
-                namespace,
-                sessionId: event.sessionId,
-                machineId: event.machineId
-            }
-
-        this.sseManager.broadcast(webappEvent)
+        this.sseManager.broadcast(enrichedEvent)
     }
 
     private resolveNamespace(event: SyncEvent): string | undefined {
         if (event.namespace) {
             return event.namespace
         }
-        if (event.sessionId) {
+        if ('sessionId' in event) {
             return this.sessions.get(event.sessionId)?.namespace
         }
-        if (event.machineId) {
+        if ('machineId' in event) {
             return this.machines.get(event.machineId)?.namespace
         }
         return undefined