@vuer-ai/vuer-rtc-server 0.2.3 → 0.4.1

package/src/transport/RTCServer.ts

@@ -41,7 +41,7 @@ function toUint8Array(data: BinaryData | string): Uint8Array | null {
 // function summarizeOps(msg: CRDTMessage): string {
 //   if (!msg.ops || msg.ops.length === 0) return 'empty';
 //   const first = msg.ops[0];
-//   const summary = `${first.otype} ${first.key}.${first.path}`;
+//   const summary = `${first.ot} ${first.key}.${first.path}`;
 //   return msg.ops.length > 1 ? `${summary} (+${msg.ops.length - 1} more)` : summary;
 // }
 
@@ -65,8 +65,8 @@ export class RTCServer {
    *
    * Call this once per connection after the WS upgrade completes.
    */
-  handleConnection(ws: MinimalWebSocket, roomId: string, sessionId: string): void {
-    // console.log(`[connect] room=${roomId} session=${sessionId}`);
+  handleConnection(ws: MinimalWebSocket, roomId: string, client: string): void {
+    // console.log(`[connect] room=${roomId} client=${client}`);
 
     // Track this socket for control broadcasts (e.g. room-reset)
     if (!this.roomSockets.has(roomId)) {
@@ -75,8 +75,8 @@ export class RTCServer {
     this.roomSockets.get(roomId)!.add(ws);
 
     // Register member as connected
-    this.broker.setMember(roomId, sessionId, {
-      sessionId,
+    this.broker.setMember(roomId, client, {
+      client,
       vectorClock: {},
       lastSeen: Date.now(),
       connected: true,
@@ -85,7 +85,7 @@ export class RTCServer {
     // Subscribe to room broadcasts — forward to this client
     const unsubscribe = this.broker.subscribe(roomId, (msg: SequencedMessage) => {
       // Don't echo back to the sender; they get an ack instead
-      if (msg.sessionId === sessionId) return;
+      if (msg.client === client) return;
       ws.send(serialize({ mtype: 'broadcast', msg }));
     });
 
@@ -106,12 +106,12 @@ export class RTCServer {
       }
 
       if (data.mtype === 'heartbeat') {
-        this.handleHeartbeat(roomId, sessionId, data.vectorClock ?? {});
+        this.handleHeartbeat(roomId, client, data.vectorClock ?? {});
         return;
       }
 
       if (data.mtype === 'sync') {
-        this.handleSyncRequest(ws, roomId, sessionId, data);
+        this.handleSyncRequest(ws, roomId, client, data);
         return;
       }
 
@@ -124,11 +124,11 @@ export class RTCServer {
 
     // Cleanup on close
     ws.on('close', () => {
-      // console.log(`[disconnect] room=${roomId} session=${sessionId}`);
+      // console.log(`[disconnect] room=${roomId} client=${client}`);
       unsubscribe();
       this.roomSockets.get(roomId)?.delete(ws);
-      this.broker.setMember(roomId, sessionId, {
-        sessionId,
+      this.broker.setMember(roomId, client, {
+        client,
         vectorClock: {},
         lastSeen: Date.now(),
         connected: false,
@@ -209,14 +209,14 @@ export class RTCServer {
    */
   async getRoomState(roomId: string): Promise<{
     historyCount: number;
-    members: Array<{ sessionId: string; connected: boolean; lastSeen: number }>;
+    members: Array<{ client: string; connected: boolean; lastSeen: number }>;
   }> {
     const history = this.messageHistory.get(roomId);
     const members = await this.broker.getMembers(roomId);
     return {
       historyCount: history?.length ?? 0,
       members: Array.from(members.values()).map(m => ({
-        sessionId: m.sessionId,
+        client: m.client,
         connected: m.connected,
         lastSeen: m.lastSeen,
       })),
@@ -229,7 +229,7 @@ export class RTCServer {
     roomId: string,
     msg: CRDTMessage,
   ): Promise<void> {
-    // console.log(`[msg] room=${roomId} session=${msg.sessionId} lamport=${msg.lamportTime} ${summarizeOps(msg)}`);
+    // console.log(`[msg] room=${roomId} client=${msg.client} lamport=${msg.lt} ${summarizeOps(msg)}`);
 
     // Persist / dedup if journal is available
     if (this.journal) {
@@ -280,9 +280,9 @@ export class RTCServer {
    * (either in its journal or compacted into the snapshot).
    */
   private isKnownByVectorClock(msg: CRDTMessage, clientClock: VectorClock): boolean {
-    const authorSeq = msg.clock[msg.sessionId];
+    const authorSeq = msg.clock[msg.client];
     if (authorSeq === undefined) return false;
-    return (clientClock[msg.sessionId] ?? 0) >= authorSeq;
+    return (clientClock[msg.client] ?? 0) >= authorSeq;
   }
 
   /**
@@ -292,12 +292,12 @@ export class RTCServer {
   private handleSyncRequest(
     ws: MinimalWebSocket,
     roomId: string,
-    sessionId: string,
+    client: string,
     data: { mtype: 'sync'; vectorClock?: VectorClock; filter: Uint8Array | string; count: number },
   ): void {
     const history = this.messageHistory.get(roomId);
     if (!history || history.length === 0) {
-      // console.log(`[sync] room=${roomId} session=${sessionId} no history`);
+      // console.log(`[sync] room=${roomId} client=${client} no history`);
       return;
     }
 
@@ -310,7 +310,7 @@ export class RTCServer {
     let retransmitted = 0;
     for (const msg of history) {
       // Skip the client's own messages (they already have them)
-      if (msg.sessionId === sessionId) continue;
+      if (msg.client === client) continue;
       // Skip messages covered by the client's snapshot (compacted)
       if (this.isKnownByVectorClock(msg, clientClock)) continue;
       // Check the bloom filter for remaining (uncompacted) messages
@@ -320,16 +320,16 @@ export class RTCServer {
       }
     }
 
-    // console.log(`[sync] room=${roomId} session=${sessionId} clientMsgs=${data.count} history=${history.length} retransmitted=${retransmitted}`);
+    // console.log(`[sync] room=${roomId} client=${client} clientMsgs=${data.count} history=${history.length} retransmitted=${retransmitted}`);
   }
 
   private handleHeartbeat(
     roomId: string,
-    sessionId: string,
+    client: string,
     vectorClock: Record<string, number>,
   ): void {
-    this.broker.setMember(roomId, sessionId, {
-      sessionId,
+    this.broker.setMember(roomId, client, {
+      client,
       vectorClock,
       lastSeen: Date.now(),
       connected: true,

package/tests/benchmark/journal-optimization-benchmark.test.ts

@@ -32,21 +32,21 @@ import {
 
 function createMessage(
   id: string,
-  sessionId: string,
-  lamportTime: number,
+  client: string,
+  lt: number,
   ops: any[] = []
 ): CRDTMessage {
   return {
     id,
-    sessionId,
-    clock: { [sessionId]: lamportTime },
-    lamportTime,
-    timestamp: Date.now() / 1000,
+    client,
+    clock: { [client]: lt },
+    lt,
+    ts: Date.now() / 1000,
     ops: ops.length > 0 ? ops : [{
       key: 'cube-1',
-      otype: 'vector3.set',
+      ot: 'vector3.set',
       path: 'position',
-      value: [lamportTime, 0, 0],
+      value: [lt, 0, 0],
     }],
   };
 }
@@ -72,7 +72,7 @@ function generateScenario(config: ScenarioConfig): CRDTMessage[] {
       for (let i = 0; i < messageCount; i++) {
         messages.push(
           createMessage(`msg-${i}`, 'session-1', i, [
-            { key: 'doc', otype: 'text.insert', path: 'content', value: 'a' },
+            { key: 'doc', ot: 'text.insert', path: 'content', value: 'a' },
           ])
         );
       }
@@ -90,7 +90,7 @@ function generateScenario(config: ScenarioConfig): CRDTMessage[] {
               `msg-${lamport}`,
               `session-${agent}`,
               lamport,
-              [{ key: 'doc', otype: 'text.insert', path: 'content', value: 'x' }]
+              [{ key: 'doc', ot: 'text.insert', path: 'content', value: 'x' }]
             )
           );
           lamport++;
@@ -102,10 +102,10 @@ function generateScenario(config: ScenarioConfig): CRDTMessage[] {
     case 'alternating': {
       // Worst case: different agent each message
       for (let i = 0; i < messageCount; i++) {
-        const sessionId = `session-${i % agentCount}`;
+        const client = `session-${i % agentCount}`;
         messages.push(
-          createMessage(`msg-${i}`, sessionId, i, [
-            { key: 'doc', otype: 'text.insert', path: 'content', value: 'y' },
+          createMessage(`msg-${i}`, client, i, [
+            { key: 'doc', ot: 'text.insert', path: 'content', value: 'y' },
           ])
         );
       }
@@ -124,7 +124,7 @@ function generateScenario(config: ScenarioConfig): CRDTMessage[] {
                 `msg-${lamport}`,
                 `session-${agent}`,
                 lamport,
-                [{ key: 'doc', otype: 'text.insert', path: 'content', value: 'z' }]
+                [{ key: 'doc', ot: 'text.insert', path: 'content', value: 'z' }]
               )
             );
             lamport++;

package/tests/compression/compression.test.ts

@@ -27,7 +27,7 @@ describe('CompressionUtils', () => {
           rootKey: 'root',
         },
         vectorClock: { session1: 10 },
-        lamportTime: 10,
+        lt: 10,
         journalIndex: 10,
       };
 
@@ -67,7 +67,7 @@ describe('CompressionUtils', () => {
           session2: 85,
           session3: 92,
         },
-        lamportTime: 100,
+        lt: 100,
         journalIndex: 100,
       };
 
@@ -105,7 +105,7 @@ describe('CompressionUtils', () => {
           rootKey: 'root',
         },
         vectorClock: { session1: 5 },
-        lamportTime: 5,
+        lt: 5,
         journalIndex: 5,
       };
 
@@ -143,7 +143,7 @@ describe('CompressionUtils', () => {
         vectorClock: Object.fromEntries(
           Array.from({ length: 10 }, (_, i) => [`session${i}`, i * 10])
         ),
-        lamportTime: 100,
+        lt: 100,
         journalIndex: 100,
       };
 
@@ -176,7 +176,7 @@ describe('CompressionUtils', () => {
           rootKey: 'root',
         },
         vectorClock: {},
-        lamportTime: 0,
+        lt: 0,
         journalIndex: 0,
       };
 
@@ -207,7 +207,7 @@ describe('CompressionUtils', () => {
           rootKey: 'root',
         },
         vectorClock: { s1: 50, s2: 50, s3: 50 },
-        lamportTime: 50,
+        lt: 50,
         journalIndex: 50,
       };
 
@@ -306,7 +306,7 @@ describe('CompressionUtils', () => {
         vectorClock: Object.fromEntries(
           Array.from({ length: 50 }, (_, i) => [`session-${i}`, 1000 + i * 100])
         ),
-        lamportTime: 6000,
+        lt: 6000,
         journalIndex: 6000,
       };
 
@@ -328,7 +328,7 @@ describe('CompressionUtils', () => {
           rootKey: 'root',
         },
         vectorClock: {},
-        lamportTime: 0,
+        lt: 0,
         journalIndex: 0,
       };