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

package/tests/journal/compaction.test.ts

@@ -21,17 +21,17 @@ import type { CRDTMessage, SceneGraph, Operation, Snapshot } from '@vuer-ai/vuer
 /** Build a CRDTMessage with sensible defaults */
 function makeMsg(
   id: string,
-  sessionId: string,
+  client: string,
   ops: Operation[],
-  lamportTime: number,
+  lt: number,
   clock?: Record<string, number>,
 ): CRDTMessage {
   return {
     id,
-    sessionId,
-    clock: clock ?? { [sessionId]: lamportTime },
-    lamportTime,
-    timestamp: Date.now() / 1000,
+    client,
+    clock: clock ?? { [client]: lt },
+    lt,
+    ts: Date.now() / 1000,
     ops,
   };
 }
@@ -40,7 +40,7 @@ function makeMsg(
 function nodeInsertOp(parentKey: string, nodeKey: string, props: Record<string, unknown> = {}): Operation {
   return {
     key: parentKey,
-    otype: 'node.insert',
+    ot: 'node.insert',
     path: 'children',
     value: {
       key: nodeKey,
@@ -55,7 +55,7 @@ function nodeInsertOp(parentKey: string, nodeKey: string, props: Record<string,
 function vec3SetOp(nodeKey: string, path: string, value: [number, number, number]): Operation {
   return {
     key: nodeKey,
-    otype: 'vector3.set',
+    ot: 'vector3.set',
     path,
     value,
   } as Operation;
@@ -65,7 +65,7 @@ function vec3SetOp(nodeKey: string, path: string, value: [number, number, number
 function numSetOp(nodeKey: string, path: string, value: number): Operation {
   return {
     key: nodeKey,
-    otype: 'number.set',
+    ot: 'number.set',
     path,
     value,
   } as Operation;
@@ -75,7 +75,7 @@ function numSetOp(nodeKey: string, path: string, value: number): Operation {
 function numAddOp(nodeKey: string, path: string, value: number): Operation {
   return {
     key: nodeKey,
-    otype: 'number.add',
+    ot: 'number.add',
     path,
     value,
   } as Operation;
@@ -85,7 +85,7 @@ function numAddOp(nodeKey: string, path: string, value: number): Operation {
 function nodeRemoveOp(parentKey: string, nodeKey: string): Operation {
   return {
     key: parentKey,
-    otype: 'node.remove',
+    ot: 'node.remove',
     path: 'children',
     value: nodeKey,
   } as Operation;
@@ -131,7 +131,7 @@ class InMemoryJournalService {
       snapshot: {
         graph: createEmptyGraph(),
         vectorClock: {},
-        lamportTime: 0,
+        lt: 0,
         journalIndex: 0,
       },
       journal: [],
@@ -161,11 +161,11 @@ class InMemoryJournalService {
 
     // Meta ops
     for (const op of msg.ops) {
-      if (op.otype === 'meta.undo') {
+      if (op.ot === 'meta.undo') {
         const targetId = (op as any).targetMsgId;
         const target = state.journal.find((e) => e.msg.id === targetId);
-        if (target) target.deletedAt = msg.timestamp;
-      } else if (op.otype === 'meta.redo') {
+        if (target) target.deletedAt = msg.ts;
+      } else if (op.ot === 'meta.redo') {
         const targetId = (op as any).targetMsgId;
         const target = state.journal.find((e) => e.msg.id === targetId);
         if (target) delete target.deletedAt;
@@ -181,7 +181,7 @@ class InMemoryJournalService {
     let graph = state.snapshot.graph;
     for (const entry of state.journal) {
       if (entry.deletedAt) continue;
-      const realOps = entry.msg.ops.filter((op) => !op.otype.startsWith('meta.'));
+      const realOps = entry.msg.ops.filter((op) => !op.ot.startsWith('meta.'));
       if (realOps.length > 0) {
         graph = applyMessage(graph, { ...entry.msg, ops: realOps });
       }
@@ -208,20 +208,20 @@ class InMemoryJournalService {
 
     let maxLamport = state.snapshot.journalIndex;
     for (const entry of state.journal) {
-      maxLamport = Math.max(maxLamport, entry.msg.lamportTime);
+      maxLamport = Math.max(maxLamport, entry.msg.lt);
     }
 
     let mergedClock = { ...state.snapshot.vectorClock };
     for (const entry of state.journal) {
-      for (const [sessionId, time] of Object.entries(entry.msg.clock)) {
-        mergedClock[sessionId] = Math.max(mergedClock[sessionId] || 0, time);
+      for (const [client, time] of Object.entries(entry.msg.clock)) {
+        mergedClock[client] = Math.max(mergedClock[client] || 0, time);
       }
     }
 
     state.snapshot = {
       graph: newGraph,
       vectorClock: mergedClock,
-      lamportTime: maxLamport,
+      lt: maxLamport,
       journalIndex: maxLamport,
     };
 
@@ -379,7 +379,7 @@ describe('JournalService.compact()', () => {
 
     const stateAfter = svc.loadDocument(DOC_ID)!;
     expect(stateAfter.journal).toHaveLength(0);
-    expect(stateAfter.snapshot.lamportTime).toBe(snapshotBefore.lamportTime);
+    expect(stateAfter.snapshot.lt).toBe(snapshotBefore.lt);
   });
 
   it('should compact a single entry', () => {
@@ -390,7 +390,7 @@ describe('JournalService.compact()', () => {
     const state = svc.loadDocument(DOC_ID)!;
     expect(state.journal).toHaveLength(0);
     expect(state.snapshot.graph.nodes['scene']).toBeDefined();
-    expect(state.snapshot.lamportTime).toBe(1);
+    expect(state.snapshot.lt).toBe(1);
   });
 
   it('should compact with mixed operation types', () => {
@@ -429,7 +429,7 @@ describe('JournalService.compact()', () => {
     const state = svc.loadDocument(DOC_ID)!;
     expect(state.snapshot.vectorClock['alice']).toBe(1);
     expect(state.snapshot.vectorClock['bob']).toBe(1);
-    expect(state.snapshot.lamportTime).toBe(2);
+    expect(state.snapshot.lt).toBe(2);
   });
 
   it('should handle undo entries during compaction (skip deleted)', () => {
@@ -441,7 +441,7 @@ describe('JournalService.compact()', () => {
     // Undo the position change
     svc.processMessage(
       DOC_ID,
-      makeMsg('m4-undo', 'a', [{ key: '_meta', otype: 'meta.undo', path: '_meta', targetMsgId: 'm3' } as any], 4),
+      makeMsg('m4-undo', 'a', [{ key: '_meta', ot: 'meta.undo', path: '_meta', targetMsgId: 'm3' } as any], 4),
     );
 
     const graphBefore = svc.computeGraph(svc.loadDocument(DOC_ID)!);
@@ -588,12 +588,12 @@ describe('Edge Cases', () => {
     // Undo m3
     svc.processMessage(
       DOC_ID,
-      makeMsg('m4', 'a', [{ key: '_meta', otype: 'meta.undo', path: '_meta', targetMsgId: 'm3' } as any], 4),
+      makeMsg('m4', 'a', [{ key: '_meta', ot: 'meta.undo', path: '_meta', targetMsgId: 'm3' } as any], 4),
     );
     // Redo m3
     svc.processMessage(
       DOC_ID,
-      makeMsg('m5', 'a', [{ key: '_meta', otype: 'meta.redo', path: '_meta', targetMsgId: 'm3' } as any], 5),
+      makeMsg('m5', 'a', [{ key: '_meta', ot: 'meta.redo', path: '_meta', targetMsgId: 'm3' } as any], 5),
     );
 
     const graphBefore = svc.computeGraph(svc.loadDocument(DOC_ID)!);

package/tests/journal/journal-rle.test.ts

@@ -23,22 +23,22 @@ import {
  */
 function createTestMessage(
   id: string,
-  sessionId: string,
-  lamportTime: number,
-  timestamp: number,
+  client: string,
+  lt: number,
+  ts: number,
   ops: any[] = []
 ): CRDTMessage {
   return {
     id,
-    sessionId,
-    clock: { [sessionId]: lamportTime },
-    lamportTime,
-    timestamp,
+    client,
+    clock: { [client]: lt },
+    lt,
+    ts,
     ops: ops.length > 0 ? ops : [{
       key: 'cube-1',
-      otype: 'vector3.set',
+      ot: 'vector3.set',
       path: 'position',
-      value: [lamportTime, 0, 0],
+      value: [lt, 0, 0],
     }],
   };
 }
@@ -118,8 +118,8 @@ describe('JournalRLE - Run-Length Encoding', () => {
 
     it('should handle many agents with alternating pattern', () => {
       const messages = Array.from({ length: 10 }, (_, i) => {
-        const sessionId = i % 2 === 0 ? 'session-1' : 'session-2';
-        return createTestMessage(`msg-${i}`, sessionId, i, 1000 + i);
+        const client = i % 2 === 0 ? 'session-1' : 'session-2';
+        return createTestMessage(`msg-${i}`, client, i, 1000 + i);
       });
 
       const encoded = encodeJournalRLE(messages);
@@ -136,18 +136,18 @@ describe('JournalRLE - Run-Length Encoding', () => {
       const messages = [
         {
           id: 'msg-1',
-          sessionId: 'session-1',
+          client: 'session-1',
           clock: { 'session-1': 5, 'session-2': 3 },
-          lamportTime: 8,
-          timestamp: 1000,
+          lt: 8,
+          ts: 1000,
           ops: [],
         },
         {
           id: 'msg-2',
-          sessionId: 'session-1',
+          client: 'session-1',
           clock: { 'session-1': 6, 'session-2': 3 },
-          lamportTime: 9,
-          timestamp: 1001,
+          lt: 9,
+          ts: 1001,
           ops: [],
         },
       ] as CRDTMessage[];
@@ -169,15 +169,15 @@ describe('JournalRLE - Run-Length Encoding', () => {
       const encoded = encodeJournalRLE(messages);
       const decoded = decodeJournalRLE(encoded);
 
-      expect(decoded[0].lamportTime).toBe(1);
-      expect(decoded[1].lamportTime).toBe(2);
-      expect(decoded[2].lamportTime).toBe(3);
+      expect(decoded[0].lt).toBe(1);
+      expect(decoded[1].lt).toBe(2);
+      expect(decoded[2].lt).toBe(3);
     });
 
     it('should preserve operation semantics', () => {
       const ops = [
-        { key: 'cube-1', otype: 'vector3.set', path: 'position', value: [1, 2, 3] },
-        { key: 'cube-2', otype: 'vector3.add', path: 'position', value: [0.5, 0.5, 0.5] },
+        { key: 'cube-1', ot: 'vector3.set', path: 'position', value: [1, 2, 3] },
+        { key: 'cube-2', ot: 'vector3.add', path: 'position', value: [0.5, 0.5, 0.5] },
       ];
 
       const messages = [
@@ -245,8 +245,8 @@ describe('JournalRLE - Run-Length Encoding', () => {
     it('should have low compression for heterogeneous journal', () => {
       // 100 messages alternating between 10 agents
       const messages = Array.from({ length: 100 }, (_, i) => {
-        const sessionId = `session-${i % 10}`;
-        return createTestMessage(`msg-${i}`, sessionId, i, 1000 + i);
+        const client = `session-${i % 10}`;
+        return createTestMessage(`msg-${i}`, client, i, 1000 + i);
       });
 
       const encoded = encodeJournalRLE(messages);
@@ -286,7 +286,7 @@ describe('JournalRLE - Run-Length Encoding', () => {
             agentId: 'session-1',
             count: 5,
             messages: [
-              createTestMessage('msg-1', 'session-2', 1, 1000), // Wrong sessionId!
+              createTestMessage('msg-1', 'session-2', 1, 1000), // Wrong client!
             ] as CRDTMessage[],
           },
         ],
@@ -294,7 +294,7 @@ describe('JournalRLE - Run-Length Encoding', () => {
       };
 
       expect(() => decodeJournalRLE(corrupted)).toThrow(
-        /sessionId mismatch/
+        /client mismatch/
       );
     });
 
@@ -354,7 +354,7 @@ describe('JournalRLE - Run-Length Encoding', () => {
       const complexOps = [
         {
           key: 'node-1',
-          otype: 'node.insert',
+          ot: 'node.insert',
           path: 'children',
           value: {
             key: 'child-1',
@@ -365,7 +365,7 @@ describe('JournalRLE - Run-Length Encoding', () => {
         },
         {
           key: '_meta',
-          otype: 'meta.undo',
+          ot: 'meta.undo',
           path: '_meta',
           targetMsgId: 'msg-1',
         },
@@ -387,14 +387,14 @@ describe('JournalRLE - Run-Length Encoding', () => {
     it('should handle multiple operations per message', () => {
       const multiOpMsg: CRDTMessage = {
         id: 'msg-1',
-        sessionId: 'session-1',
+        client: 'session-1',
         clock: { 'session-1': 1 },
-        lamportTime: 1,
-        timestamp: 1000,
+        lt: 1,
+        ts: 1000,
         ops: [
-          { key: 'node-1', otype: 'vector3.set', path: 'position', value: [1, 2, 3] },
-          { key: 'node-2', otype: 'vector3.set', path: 'position', value: [4, 5, 6] },
-          { key: 'node-3', otype: 'vector3.set', path: 'position', value: [7, 8, 9] },
+          { key: 'node-1', ot: 'vector3.set', path: 'position', value: [1, 2, 3] },
+          { key: 'node-2', ot: 'vector3.set', path: 'position', value: [4, 5, 6] },
+          { key: 'node-3', ot: 'vector3.set', path: 'position', value: [7, 8, 9] },
         ],
       };
 
@@ -416,7 +416,7 @@ describe('JournalRLE - Run-Length Encoding', () => {
       const encoded = encodeJournalRLE(messages);
       const decoded = decodeJournalRLE(encoded);
 
-      expect(decoded[0].timestamp).toBe(largeTimestamp);
+      expect(decoded[0].ts).toBe(largeTimestamp);
     });
   });
 
@@ -433,7 +433,7 @@ describe('JournalRLE - Run-Length Encoding', () => {
             'session-a',
             i,
             1000 + i,
-            [{ key: 'cube-1', otype: 'vector3.add', path: 'position', value: [0.1, 0, 0] }]
+            [{ key: 'cube-1', ot: 'vector3.add', path: 'position', value: [0.1, 0, 0] }]
           )
         );
       }
@@ -446,7 +446,7 @@ describe('JournalRLE - Run-Length Encoding', () => {
             'session-b',
             i,
             1010 + i,
-            [{ key: 'cube-2', otype: 'vector3.add', path: 'position', value: [0, 0.1, 0] }]
+            [{ key: 'cube-2', ot: 'vector3.add', path: 'position', value: [0, 0.1, 0] }]
           )
         );
       }
@@ -459,7 +459,7 @@ describe('JournalRLE - Run-Length Encoding', () => {
             'session-a',
             i,
             1020 + i,
-            [{ key: 'cube-1', otype: 'vector3.add', path: 'position', value: [0.1, 0, 0] }]
+            [{ key: 'cube-1', ot: 'vector3.add', path: 'position', value: [0.1, 0, 0] }]
           )
         );
       }

package/tests/journal/journal-service.test.ts

@@ -47,10 +47,10 @@ describe('JournalService', () => {
       for (const fixture of fixtures) {
         const msg = fixture.msg;
         expect(msg.id).toBeDefined();
-        expect(msg.sessionId).toBeDefined();
+        expect(msg.client).toBeDefined();
         expect(msg.clock).toBeDefined();
-        expect(msg.lamportTime).toBeGreaterThanOrEqual(0);
-        expect(msg.timestamp).toBeGreaterThan(0);
+        expect(msg.lt).toBeGreaterThanOrEqual(0);
+        expect(msg.ts).toBeGreaterThan(0);
         expect(Array.isArray(msg.ops)).toBe(true);
       }
     });
@@ -60,7 +60,7 @@ describe('JournalService', () => {
       expect(undoFixture).toBeDefined();
 
       const undoOp = undoFixture!.msg.ops[0];
-      expect(undoOp.otype).toBe('meta.undo');
+      expect(undoOp.ot).toBe('meta.undo');
       expect(undoOp.key).toBe('_meta');
       expect((undoOp as any).targetMsgId).toBe('msg-1');
     });
@@ -70,7 +70,7 @@ describe('JournalService', () => {
       expect(redoFixture).toBeDefined();
 
       const redoOp = redoFixture!.msg.ops[0];
-      expect(redoOp.otype).toBe('meta.redo');
+      expect(redoOp.ot).toBe('meta.redo');
       expect(redoOp.key).toBe('_meta');
       expect((redoOp as any).targetMsgId).toBe('msg-1');
     });
@@ -115,14 +115,14 @@ describe('JournalService', () => {
       // First create a node (key=parent, path='children', value.key=new node)
       const nodeMsg: CRDTMessage = {
         id: 'node-msg',
-        sessionId: 'session-1',
+        client: 'session-1',
         clock: { 'session-1': 0 },
-        lamportTime: 0,
-        timestamp: Date.now() / 1000,
+        lt: 0,
+        ts: Date.now() / 1000,
         ops: [
           {
             key: '',  // No parent for root node
-            otype: 'node.insert',
+            ot: 'node.insert',
             path: 'children',
             value: {
               key: 'cube-1',
@@ -153,14 +153,14 @@ describe('JournalService', () => {
       // Create node (key=parent, path='children', value.key=new node)
       const nodeMsg: CRDTMessage = {
         id: 'node-msg',
-        sessionId: 'session-1',
+        client: 'session-1',
         clock: { 'session-1': 0 },
-        lamportTime: 0,
-        timestamp: Date.now() / 1000,
+        lt: 0,
+        ts: Date.now() / 1000,
         ops: [
           {
             key: '',  // No parent for root node
-            otype: 'node.insert',
+            ot: 'node.insert',
             path: 'children',
             value: {
               key: 'cube-1',

package/tests/journal/lww-ordering-bug.test.ts

@@ -19,14 +19,14 @@ function coalesceBuggy(messages: CRDTMessage[]): CRDTMessage[] {
   // Current implementation: Group by session
   const sessionGroups = new Map<string, CRDTMessage[]>();
   for (const msg of messages) {
-    if (!sessionGroups.has(msg.sessionId)) {
-      sessionGroups.set(msg.sessionId, []);
+    if (!sessionGroups.has(msg.client)) {
+      sessionGroups.set(msg.client, []);
     }
-    sessionGroups.get(msg.sessionId)!.push(msg);
+    sessionGroups.get(msg.client)!.push(msg);
   }
 
   const coalesced: CRDTMessage[] = [];
-  for (const [sessionId, sessionMessages] of sessionGroups) {
+  for (const [client, sessionMessages] of sessionGroups) {
     // Flatten all ops from this session
     const allOps: Operation[] = [];
     for (const msg of sessionMessages) {
@@ -56,12 +56,12 @@ function coalesceCorrect(messages: CRDTMessage[]): CRDTMessage[] {
   let lastSessionId: string | null = null;
 
   for (const msg of messages) {
-    if (msg.sessionId !== lastSessionId && currentRun.length > 0) {
+    if (msg.client !== lastSessionId && currentRun.length > 0) {
       runs.push(currentRun);
       currentRun = [];
     }
     currentRun.push(msg);
-    lastSessionId = msg.sessionId;
+    lastSessionId = msg.client;
   }
   if (currentRun.length > 0) runs.push(currentRun);
 
@@ -97,24 +97,24 @@ describe('LWW Ordering Bug', () => {
     let graph = createEmptyGraph();
     graph = applyMessage(graph, {
       id: 'init',
-      sessionId: 'init',
+      client: 'init',
       clock: { init: 1 },
-      lamportTime: 1,
-      timestamp: 0,
-      ops: [{ otype: 'node.insert', key: '__root', path: 'children', value: { key: 'cube', tag: 'Mesh', name: 'Cube' } }],
+      lt:1,
+      ts: 0,
+      ops: [{ ot: 'node.insert', key: '__root', path: 'children', value: { key: 'cube', tag: 'Mesh', name: 'Cube' } }],
     });
 
     // Original messages in interleaved order
     const messages: CRDTMessage[] = [
       {
         id: 'msg1',
-        sessionId: 'alice',
+        client: 'alice',
         clock: { alice: 10 },
-        lamportTime: 10,
-        timestamp: 1000,
+        lt:10,
+        ts: 1000,
         ops: [
           {
-            otype: 'string.set',
+            ot: 'string.set',
             key: 'cube',
             path: 'color',
             value: 'red',
@@ -123,13 +123,13 @@ describe('LWW Ordering Bug', () => {
       },
       {
         id: 'msg2',
-        sessionId: 'bob',
+        client: 'bob',
         clock: { alice: 10, bob: 15 },
-        lamportTime: 15,
-        timestamp: 1500,
+        lt:15,
+        ts: 1500,
         ops: [
           {
-            otype: 'string.set',
+            ot: 'string.set',
             key: 'cube',
             path: 'color',
             value: 'blue',
@@ -138,13 +138,13 @@ describe('LWW Ordering Bug', () => {
       },
       {
         id: 'msg3',
-        sessionId: 'alice',
+        client: 'alice',
         clock: { alice: 20, bob: 15 },
-        lamportTime: 20,
-        timestamp: 2000,
+        lt:20,
+        ts: 2000,
         ops: [
           {
-            otype: 'string.set',
+            ot: 'string.set',
             key: 'cube',
             path: 'color',
             value: 'green',
@@ -164,7 +164,7 @@ describe('LWW Ordering Bug', () => {
     const coalescedBuggy = coalesceBuggy(messages);
     console.log('Buggy coalescing:');
     coalescedBuggy.forEach(msg => {
-      console.log(`  session=${msg.sessionId}, lamport=${msg.lamportTime}, ops=${msg.ops.length}`);
+      console.log(`  session=${msg.client}, lamport=${msg.lt}, ops=${msg.ops.length}`);
       msg.ops.forEach(op => console.log(`    ${JSON.stringify(op)}`));
     });
 
@@ -180,7 +180,7 @@ describe('LWW Ordering Bug', () => {
     const coalescedCorrect = coalesceCorrect(messages);
     console.log('\nCorrect coalescing:');
     coalescedCorrect.forEach(msg => {
-      console.log(`  session=${msg.sessionId}, lamport=${msg.lamportTime}, ops=${msg.ops.length}`);
+      console.log(`  session=${msg.client}, lamport=${msg.lt}, ops=${msg.ops.length}`);
       msg.ops.forEach(op => console.log(`    ${JSON.stringify(op)}`));
     });
 
@@ -201,37 +201,37 @@ describe('LWW Ordering Bug', () => {
     const messages: CRDTMessage[] = [
       {
         id: 'msg1',
-        sessionId: 'alice',
+        client: 'alice',
         clock: { alice: 10 },
-        lamportTime: 10,
-        timestamp: 1000,
-        ops: [{ otype: 'number.set', key: 'x', path: 'value', value: 1 }],
+        lt:10,
+        ts: 1000,
+        ops: [{ ot: 'number.set', key: 'x', path: 'value', value: 1 }],
       },
       {
         id: 'msg2',
-        sessionId: 'bob',
+        client: 'bob',
         clock: { alice: 10, bob: 15 },
-        lamportTime: 15,
-        timestamp: 1500,
-        ops: [{ otype: 'number.set', key: 'x', path: 'value', value: 2 }],
+        lt:15,
+        ts: 1500,
+        ops: [{ ot: 'number.set', key: 'x', path: 'value', value: 2 }],
       },
       {
         id: 'msg3',
-        sessionId: 'alice',
+        client: 'alice',
         clock: { alice: 20, bob: 15 },
-        lamportTime: 20,
-        timestamp: 2000,
-        ops: [{ otype: 'number.set', key: 'x', path: 'value', value: 3 }],
+        lt:20,
+        ts: 2000,
+        ops: [{ ot: 'number.set', key: 'x', path: 'value', value: 3 }],
       },
     ];
 
     const coalesced = coalesceBuggy(messages);
 
     // Find alice's coalesced message
-    const aliceMsg = coalesced.find(m => m.sessionId === 'alice')!;
+    const aliceMsg = coalesced.find(m => m.client === 'alice')!;
 
     // Bug: ALL of Alice's ops inherit lamportTime=20 from msg3
-    expect(aliceMsg.lamportTime).toBe(20);
+    expect(aliceMsg.lt).toBe(20);
     expect(aliceMsg.ops).toHaveLength(2); // Both set operations
 
     // When these ops are applied, they BOTH get lamportTime=20
@@ -239,7 +239,7 @@ describe('LWW Ordering Bug', () => {
     // instead of its original lamport=10
 
     console.log('Alice coalesced message:', {
-      lamportTime: aliceMsg.lamportTime,
+      lt:aliceMsg.lt,
       ops: aliceMsg.ops,
     });