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

package/tests/demo.ts

@@ -15,22 +15,22 @@ type VectorClock = Record<string, number>;
 
 interface CRDTMessage {
   id: string;
-  sessionId: string;
+  client: string;
   clock: VectorClock;
-  lamportTime: number;
-  timestamp: number;
+  lt: number;
+  ts: number;
   ops: Operation[];
 }
 
 interface BaseOp {
   key: string;
-  otype: string;
+  ot: string;
   path: string;
 }
 
 interface NodeInsertOp extends BaseOp {
   key: string;
-  otype: 'node.insert';
+  ot: 'node.insert';
   path: string;
   value: {
     key: string;
@@ -42,62 +42,62 @@ interface NodeInsertOp extends BaseOp {
 
 interface NodeRemoveOp extends BaseOp {
   key: string;
-  otype: 'node.remove';
+  ot: 'node.remove';
   path: string;
 }
 
 interface NumberSetOp extends BaseOp {
   key: string;
-  otype: 'number.set';
+  ot: 'number.set';
   path: string;
   value: number;
 }
 
 interface NumberAddOp extends BaseOp {
   key: string;
-  otype: 'number.add';
+  ot: 'number.add';
   path: string;
   value: number;
 }
 
 interface Vector3SetOp extends BaseOp {
   key: string;
-  otype: 'vector3.set';
+  ot: 'vector3.set';
   path: string;
   value: [number, number, number];
 }
 
 interface Vector3AddOp extends BaseOp {
   key: string;
-  otype: 'vector3.add';
+  ot: 'vector3.add';
   path: string;
   value: [number, number, number];
 }
 
 interface ColorSetOp extends BaseOp {
   key: string;
-  otype: 'color.set';
+  ot: 'color.set';
   path: string;
   value: string;
 }
 
 interface ArraySetOp extends BaseOp {
   key: string;
-  otype: 'array.set';
+  ot: 'array.set';
   path: string;
   value: any[];
 }
 
 interface ArrayPushOp extends BaseOp {
   key: string;
-  otype: 'array.push';
+  ot: 'array.push';
   path: string;
   value: any;
 }
 
 interface ArrayRemoveOp extends BaseOp {
   key: string;
-  otype: 'array.remove';
+  ot: 'array.remove';
   path: string;
   value: any;
 }
@@ -125,16 +125,16 @@ console.log('\n📦 Step 1: Create Scene\n');
 const msg1: CRDTMessage = {
   // === CRDT Wrapper (envelope) ===
   id: 'msg-001',
-  sessionId: 'session-server',
+  client: 'session-server',
   clock: { 'session-server': 1 },
-  lamportTime: 1,
-  timestamp: Date.now() / 1000,
+  lt: 1,
+  ts: Date.now() / 1000,
 
   // === Operations (batch) ===
   ops: [
     {
       key: 'scene',
-      otype: 'node.insert',
+      ot: 'node.insert',
       path: 'scene',
       value: {
         key: 'uuid-scene-001',
@@ -150,11 +150,11 @@ const msg1: CRDTMessage = {
 };
 
 console.log('Message 1:');
-console.log('  Envelope: id=%s, session=%s, lamport=%d', msg1.id, msg1.sessionId, msg1.lamportTime);
+console.log('  Envelope: id=%s, session=%s, lamport=%d', msg1.id, msg1.client, msg1.lt);
 console.log('  Operations: %d ops', msg1.ops.length);
 const op1 = msg1.ops[0];
-if (op1.otype === 'node.insert') {
-  console.log('    ✓ %s: %s (tag=%s)', op1.otype, op1.key, op1.value.tag);
+if (op1.ot === 'node.insert') {
+  console.log('    ✓ %s: %s (tag=%s)', op1.ot, op1.key, op1.value.tag);
 }
 
 // ========================================
@@ -164,15 +164,15 @@ console.log('\n📦 Step 2: Batch Insert - Multiple Nodes\n');
 
 const msg2: CRDTMessage = {
   id: 'msg-002',
-  sessionId: 'session-alice',
+  client: 'session-alice',
   clock: { 'session-alice': 1 },
-  lamportTime: 2,
-  timestamp: Date.now() / 1000,
+  lt: 2,
+  ts: Date.now() / 1000,
   ops: [
     // Insert cube
     {
       key: 'cube-1',
-      otype: 'node.insert',
+      ot: 'node.insert',
       path: 'cube-1',
       value: {
         key: 'uuid-cube-001',
@@ -187,7 +187,7 @@ const msg2: CRDTMessage = {
     // Insert sphere
     {
       key: 'sphere-1',
-      otype: 'node.insert',
+      ot: 'node.insert',
       path: 'sphere-1',
       value: {
         key: 'uuid-sphere-001',
@@ -202,7 +202,7 @@ const msg2: CRDTMessage = {
     // Add both to scene's children
     {
       key: 'scene',
-      otype: 'array.set',
+      ot: 'array.set',
       path: 'children',
       value: ['cube-1', 'sphere-1'],
     },
@@ -210,13 +210,13 @@ const msg2: CRDTMessage = {
 };
 
 console.log('Message 2 (BATCH):');
-console.log('  Envelope: id=%s, session=%s, lamport=%d', msg2.id, msg2.sessionId, msg2.lamportTime);
+console.log('  Envelope: id=%s, session=%s, lamport=%d', msg2.id, msg2.client, msg2.lt);
 console.log('  Operations: %d ops (BATCHED!)', msg2.ops.length);
 msg2.ops.forEach((op) => {
-  if (op.otype === 'node.insert') {
-    console.log('    ✓ %s: %s (tag=%s)', op.otype, op.key, op.value.tag);
+  if (op.ot === 'node.insert') {
+    console.log('    ✓ %s: %s (tag=%s)', op.ot, op.key, op.value.tag);
   } else {
-    console.log('    ✓ %s: %s.%s', op.otype, op.key, op.path);
+    console.log('    ✓ %s: %s.%s', op.ot, op.key, op.path);
   }
 });
 
@@ -227,14 +227,14 @@ console.log('\n🎯 Step 3: Additive Transform (Drag)\n');
 
 const msg3: CRDTMessage = {
   id: 'msg-003',
-  sessionId: 'session-alice',
+  client: 'session-alice',
   clock: { 'session-alice': 2 },
-  lamportTime: 3,
-  timestamp: Date.now() / 1000,
+  lt: 3,
+  ts: Date.now() / 1000,
   ops: [
     {
       key: 'cube-1',
-      otype: 'vector3.add', // Additive!
+      ot: 'vector3.add', // Additive!
       path: 'transform.position',
       value: [5, 0, 0], // Drag by +5 on X
     },
@@ -243,7 +243,7 @@ const msg3: CRDTMessage = {
 
 console.log('Message 3 (Additive):');
 const op3 = msg3.ops[0] as Vector3AddOp;
-console.log('  ✓ %s: %s.%s += %s', op3.otype, op3.key, op3.path, JSON.stringify(op3.value));
+console.log('  ✓ %s: %s.%s += %s', op3.ot, op3.key, op3.path, JSON.stringify(op3.value));
 console.log('  → Relative movement (position.x += 5)');
 
 // ========================================
@@ -253,14 +253,14 @@ console.log('\n🎯 Step 4: Absolute Transform (Set)\n');
 
 const msg4: CRDTMessage = {
   id: 'msg-004',
-  sessionId: 'session-bob',
+  client: 'session-bob',
   clock: { 'session-bob': 1 },
-  lamportTime: 4,
-  timestamp: Date.now() / 1000,
+  lt: 4,
+  ts: Date.now() / 1000,
   ops: [
     {
       key: 'sphere-1',
-      otype: 'vector3.set', // Absolute!
+      ot: 'vector3.set', // Absolute!
       path: 'transform.position',
       value: [0, 5, 0], // Set to the exact position
     },
@@ -269,7 +269,7 @@ const msg4: CRDTMessage = {
 
 console.log('Message 4 (Absolute):');
 const op4 = msg4.ops[0] as Vector3SetOp;
-console.log('  ✓ %s: %s.%s = %s', op4.otype, op4.key, op4.path, JSON.stringify(op4.value));
+console.log('  ✓ %s: %s.%s = %s', op4.ot, op4.key, op4.path, JSON.stringify(op4.value));
 console.log('  → Absolute position (position = [0, 5, 0])');
 
 // ========================================
@@ -279,26 +279,26 @@ console.log('\n🔄 Step 5: Batch Update - Same Node\n');
 
 const msg5: CRDTMessage = {
   id: 'msg-005',
-  sessionId: 'session-alice',
+  client: 'session-alice',
   clock: { 'session-alice': 3 },
-  lamportTime: 5,
-  timestamp: Date.now() / 1000,
+  lt: 5,
+  ts: Date.now() / 1000,
   ops: [
     {
       key: 'cube-1',
-      otype: 'color.set',
+      ot: 'color.set',
       path: 'color',
       value: '#00ff00',
     },
     {
       key: 'cube-1',
-      otype: 'number.set',
+      ot: 'number.set',
       path: 'opacity',
       value: 0.5,
     },
     {
       key: 'cube-1',
-      otype: 'vector3.add',
+      ot: 'vector3.add',
       path: 'transform.position',
       value: [0, 2, 0], // Move up by 2
     },
@@ -306,11 +306,11 @@ const msg5: CRDTMessage = {
 };
 
 console.log('Message 5 (Batch - Same Node):');
-console.log('  Envelope: lamport=%d', msg5.lamportTime);
+console.log('  Envelope: lamport=%d', msg5.lt);
 console.log('  Operations on "%s": %d ops', msg5.ops[0].key, msg5.ops.length);
 msg5.ops.forEach((op) => {
   if ('value' in op) {
-    console.log('    ✓ %s: %s = %s', op.otype, op.path, JSON.stringify(op.value));
+    console.log('    ✓ %s: %s = %s', op.ot, op.path, JSON.stringify(op.value));
   }
 });
 
@@ -321,22 +321,22 @@ console.log('\n🔀 Step 6: Compound Update - Multiple Nodes\n');
 
 const msg6: CRDTMessage = {
   id: 'msg-006',
-  sessionId: 'session-bob',
+  client: 'session-bob',
   clock: { 'session-bob': 2 },
-  lamportTime: 6,
-  timestamp: Date.now() / 1000,
+  lt: 6,
+  ts: Date.now() / 1000,
   ops: [
     // Update cube
     {
       key: 'cube-1',
-      otype: 'number.set',
+      ot: 'number.set',
       path: 'metalness',
       value: 0.8,
     },
     // Update sphere
     {
       key: 'sphere-1',
-      otype: 'color.set',
+      ot: 'color.set',
       path: 'color',
       value: '#ffff00',
     },
@@ -344,11 +344,11 @@ const msg6: CRDTMessage = {
 };
 
 console.log('Message 6 (Compound - Different Nodes):');
-console.log('  Envelope: lamport=%d', msg6.lamportTime);
+console.log('  Envelope: lamport=%d', msg6.lt);
 console.log('  Operations: %d nodes updated', new Set(msg6.ops.map((op) => op.key)).size);
 msg6.ops.forEach((op) => {
   if ('value' in op) {
-    console.log('    ✓ %s: %s.%s = %s', op.otype, op.key, op.path, JSON.stringify(op.value));
+    console.log('    ✓ %s: %s.%s = %s', op.ot, op.key, op.path, JSON.stringify(op.value));
   }
 });
 
@@ -359,20 +359,20 @@ console.log('\n🎯 Step 7: Multi-Select Drag\n');
 
 const msg7: CRDTMessage = {
   id: 'msg-007',
-  sessionId: 'session-alice',
+  client: 'session-alice',
   clock: { 'session-alice': 4 },
-  lamportTime: 7,
-  timestamp: Date.now() / 1000,
+  lt: 7,
+  ts: Date.now() / 1000,
   ops: [
     {
       key: 'cube-1',
-      otype: 'vector3.add',
+      ot: 'vector3.add',
       path: 'transform.position',
       value: [3, 0, 0],
     },
     {
       key: 'sphere-1',
-      otype: 'vector3.add',
+      ot: 'vector3.add',
       path: 'transform.position',
       value: [3, 0, 0],
     },
@@ -395,14 +395,14 @@ console.log('\n➕ Step 8: Additive Score (Concurrent)\n');
 
 const msg8a: CRDTMessage = {
   id: 'msg-008a',
-  sessionId: 'session-alice',
+  client: 'session-alice',
   clock: { 'session-alice': 5 },
-  lamportTime: 8,
-  timestamp: Date.now() / 1000,
+  lt: 8,
+  ts: Date.now() / 1000,
   ops: [
     {
       key: 'cube-1',
-      otype: 'number.add',
+      ot: 'number.add',
       path: 'score',
       value: 10,
     },
@@ -411,14 +411,14 @@ const msg8a: CRDTMessage = {
 
 const msg8b: CRDTMessage = {
   id: 'msg-008b',
-  sessionId: 'session-bob',
+  client: 'session-bob',
   clock: { 'session-bob': 3 },
-  lamportTime: 9,
-  timestamp: Date.now() / 1000,
+  lt: 9,
+  ts: Date.now() / 1000,
   ops: [
     {
       key: 'cube-1',
-      otype: 'number.add',
+      ot: 'number.add',
       path: 'score',
       value: 5,
     },
@@ -426,9 +426,9 @@ const msg8b: CRDTMessage = {
 };
 
 console.log('Message 8a (Alice):');
-console.log('  ✓ %s: cube-1.score += 10', msg8a.ops[0].otype);
+console.log('  ✓ %s: cube-1.score += 10', msg8a.ops[0].ot);
 console.log('Message 8b (Bob - concurrent):');
-console.log('  ✓ %s: cube-1.score += 5', msg8b.ops[0].otype);
+console.log('  ✓ %s: cube-1.score += 5', msg8b.ops[0].ot);
 console.log('  → Final score: 15 (both additions applied!)');
 
 // ========================================
@@ -438,15 +438,15 @@ console.log('\n🔄 Step 9: Reparent Node\n');
 
 const msg9: CRDTMessage = {
   id: 'msg-009',
-  sessionId: 'session-alice',
+  client: 'session-alice',
   clock: { 'session-alice': 6 },
-  lamportTime: 10,
-  timestamp: Date.now() / 1000,
+  lt: 10,
+  ts: Date.now() / 1000,
   ops: [
     // Create new parent
     {
       key: 'group-1',
-      otype: 'node.insert',
+      ot: 'node.insert',
       path: 'group-1',
       value: {
         key: 'uuid-group-001',
@@ -460,14 +460,14 @@ const msg9: CRDTMessage = {
     // Remove from old parent
     {
       key: 'scene',
-      otype: 'array.remove',
+      ot: 'array.remove',
       path: 'children',
       value: 'cube-1',
     },
     // Add to new parent
     {
       key: 'group-1',
-      otype: 'array.push',
+      ot: 'array.push',
       path: 'children',
       value: 'cube-1',
     },
@@ -477,11 +477,11 @@ const msg9: CRDTMessage = {
 console.log('Message 9 (Reparent - Compound):');
 console.log('  Operations: %d ops (atomic)', msg9.ops.length);
 msg9.ops.forEach((op, i) => {
-  if (op.otype === 'node.insert') {
+  if (op.ot === 'node.insert') {
     console.log('    %d. Create group: %s', i + 1, op.key);
-  } else if (op.otype === 'array.remove') {
+  } else if (op.ot === 'array.remove') {
     console.log('    %d. Remove from %s.children: "%s"', i + 1, op.key, op.value);
-  } else if (op.otype === 'array.push') {
+  } else if (op.ot === 'array.push') {
     console.log('    %d. Add to %s.children: "%s"', i + 1, op.key, op.value);
   }
 });
@@ -494,22 +494,22 @@ console.log('\n🗑️  Step 10: Delete Node\n');
 
 const msg10: CRDTMessage = {
   id: 'msg-010',
-  sessionId: 'session-bob',
+  client: 'session-bob',
   clock: { 'session-bob': 4 },
-  lamportTime: 11,
-  timestamp: Date.now() / 1000,
+  lt: 11,
+  ts: Date.now() / 1000,
   ops: [
     // Remove from parent
     {
       key: 'scene',
-      otype: 'array.remove',
+      ot: 'array.remove',
       path: 'children',
       value: 'sphere-1',
     },
     // Delete node (tombstone)
     {
       key: 'sphere-1',
-      otype: 'node.remove',
+      ot: 'node.remove',
       path: 'sphere-1',
     },
   ],
@@ -517,9 +517,9 @@ const msg10: CRDTMessage = {
 
 console.log('Message 10 (Delete):');
 msg10.ops.forEach((op, i) => {
-  if (op.otype === 'array.remove') {
+  if (op.ot === 'array.remove') {
     console.log('  %d. Remove from parent: %s', i + 1, op.value);
-  } else if (op.otype === 'node.remove') {
+  } else if (op.ot === 'node.remove') {
     console.log('  %d. Delete node: %s (tombstone)', i + 1, op.key);
   }
 });
@@ -549,7 +549,7 @@ console.log('\n' + '='.repeat(60));
 console.log('\n💡 Key Design Points:\n');
 console.log('  • CRDTMessage = envelope (metadata) + ops (batch)');
 console.log('  • Operations use `key` (human-friendly) not UUID');
-console.log('  • otype is explicit: "vector3.add" vs "vector3.set"');
+console.log('  • ot is explicit: "vector3.add" vs "vector3.set"');
 console.log('  • True batching: one message, many nodes, atomic');
 console.log('  • No nested "properties" - clean operation structure');
 console.log('\n' + '='.repeat(60));

package/tests/e2e/convergence.test.ts

@@ -16,13 +16,13 @@ import type { GraphStore } from '@vuer-ai/vuer-rtc';
 /** Insert a scene root + a mesh node so property ops have a target. */
 function seedGraph(store: GraphStore): void {
   store.edit({
-    otype: 'node.insert',
+    ot: 'node.insert',
     key: '',
     path: 'children',
     value: { key: 'scene', tag: 'Scene', name: 'Scene' },
   });
   store.edit({
-    otype: 'node.insert',
+    ot: 'node.insert',
     key: 'scene',
     path: 'children',
     value: {
@@ -62,14 +62,14 @@ describe('convergence', () => {
     // Both clients edit the same node's position concurrently
     // (before seeing each other's edits)
     clientA.store.edit({
-      otype: 'vector3.set',
+      ot: 'vector3.set',
       key: 'cube-1',
       path: 'position',
       value: [10, 0, 0],
     });
 
     clientB.store.edit({
-      otype: 'vector3.set',
+      ot: 'vector3.set',
       key: 'cube-1',
       path: 'position',
       value: [0, 20, 0],
@@ -101,7 +101,7 @@ describe('convergence', () => {
 
     // Client A inserts a new node
     clientA.store.edit({
-      otype: 'node.insert',
+      ot: 'node.insert',
       key: 'scene',
       path: 'children',
       value: {
@@ -114,7 +114,7 @@ describe('convergence', () => {
 
     // Client B edits a property on the existing node
     clientB.store.edit({
-      otype: 'vector3.set',
+      ot: 'vector3.set',
       key: 'cube-1',
       path: 'position',
       value: [99, 99, 99],
@@ -149,7 +149,7 @@ describe('convergence', () => {
 
     // Client A edits and commits
     clientA.store.edit({
-      otype: 'vector3.set',
+      ot: 'vector3.set',
       key: 'cube-1',
       path: 'position',
       value: [42, 42, 42],
@@ -187,7 +187,7 @@ describe('convergence', () => {
 
     // Client A sets position (vector3.set)
     clientA.store.edit({
-      otype: 'vector3.set',
+      ot: 'vector3.set',
       key: 'cube-1',
       path: 'position',
       value: [1, 2, 3],
@@ -195,7 +195,7 @@ describe('convergence', () => {
 
     // Client B sets opacity (number.set) on the same node
     clientB.store.edit({
-      otype: 'number.set',
+      ot: 'number.set',
       key: 'cube-1',
       path: 'opacity',
       value: 0.5,

package/tests/e2e/helpers/assertions.ts

@@ -6,6 +6,7 @@
  */
 
 import type { GraphStore, SceneGraph, SceneNode } from '@vuer-ai/vuer-rtc';
+import { getText } from '@vuer-ai/vuer-rtc';
 
 /**
  * Wait until `condition` returns true, polling every `interval` ms.
@@ -133,8 +134,29 @@ function nodeDataKeys(node: SceneNode): string[] {
     .sort();
 }
 
+/** Check if a value is a TextRope instance */
+function isTextRope(v: unknown): boolean {
+  return (
+    v != null &&
+    typeof v === 'object' &&
+    typeof (v as any).toString === 'function' &&
+    typeof (v as any).toJSON === 'function' &&
+    (v as any).agentId !== undefined &&
+    (v as any).clock !== undefined &&
+    (v as any)._tree !== undefined
+  );
+}
+
 /** Simple recursive deep equality for JSON-safe values. */
 function deepEqual(a: unknown, b: unknown): boolean {
+  // Handle TextRope instances by converting to string
+  if (isTextRope(a)) {
+    a = getText(a as any);
+  }
+  if (isTextRope(b)) {
+    b = getText(b as any);
+  }
+
   if (a === b) return true;
   if (a == null || b == null) return a === b;
   if (typeof a !== typeof b) return false;

package/tests/e2e/helpers/createTestServer.ts

@@ -46,7 +46,7 @@ export interface TestServer {
   broker: InMemoryBroker;
   server: RTCServer;
   /** Connect a new GraphStore client to a room. */
-  connectClient(roomId: string, sessionId: string, opts?: ConnectClientOptions): TestClient;
+  connectClient(roomId: string, client: string, opts?: ConnectClientOptions): TestClient;
   /** Tear down all connections and state. */
   close(): void;
 }
@@ -131,7 +131,7 @@ export function createTestServer(): TestServer {
 
   const clients: Array<{ cleanup: () => void }> = [];
 
-  function connectClient(roomId: string, sessionId: string, opts?: ConnectClientOptions): TestClient {
+  function connectClient(roomId: string, client: string, opts?: ConnectClientOptions): TestClient {
     const { client: clientWs, server: serverWs } = createFakeWsPair();
     const latency = opts?.latencyMs ?? 0;
     const dropRate = opts?.dropRate ?? 0;
@@ -142,7 +142,7 @@ export function createTestServer(): TestServer {
 
     // Create a GraphStore that sends CRDTMessages over the fake WS (msgpack)
     const store = createGraph({
-      sessionId,
+      client,
       onSend: (msg: CRDTMessage) => {
         clientWs.send(serialize({ mtype: 'crdt', msg }));
       },
@@ -170,7 +170,7 @@ export function createTestServer(): TestServer {
     });
 
     // Register the server-side WS with the RTCServer
-    rtcServer.handleConnection(serverWs, roomId, sessionId);
+    rtcServer.handleConnection(serverWs, roomId, client);
 
     const retryUnacked = () => {
       const unacked = getUnackedMessages(store.getState());