@vuer-ai/vuer-rtc 0.4.2 → 0.5.0

package/dist/crdt/Rope.d.ts

@@ -6,16 +6,18 @@
  * ID lookups without invalidation.
  */
 import { type ItemTree } from './BTree.js';
-export interface ItemId {
-    agent: string;
-    seq: number;
-}
+/**
+ * ItemId - String format for efficient comparison
+ * Format: "agent:seq" (e.g., "agent-1:42")
+ */
+export type ItemId = string;
 export interface Item {
     id: ItemId;
     content: string;
     isDeleted: boolean;
     parentId: ItemId | null;
     seq: number;
+    ts: number;
 }
 interface SpanEntry {
     startSeq: number;
@@ -54,6 +56,7 @@ export interface InsertOp {
     content: string;
     parentId: ItemId | null;
     seq: number;
+    ts: number;
 }
 export interface DeleteOp {
     deletions: Array<{
@@ -69,8 +72,26 @@ export interface ReplaceOp {
     delete: DeleteOp;
     insert: InsertOp;
 }
+/**
+ * Compare two ItemIds for equality
+ */
 export declare function itemIdEquals(a: ItemId | null, b: ItemId | null): boolean;
+/**
+ * Compare two ItemIds for ordering (primarily for agent ordering)
+ * For tie-breaking by ts, use seq + ts + id comparison
+ */
 export declare function itemIdCompare(a: ItemId, b: ItemId): number;
+/**
+ * Parse an ItemId string into its components
+ */
+export declare function parseItemId(id: ItemId): {
+    agent: string;
+    seq: number;
+};
+/**
+ * Create an ItemId from agent and seq
+ */
+export declare function createItemId(agent: string, seq: number): ItemId;
 export declare function create(agentId: string): TextRope;
 export declare function getText(rope: TextRope): string;
 export declare function getLength(rope: TextRope): number;
@@ -89,12 +110,12 @@ export declare function remove(rope: TextRope, position: number, length: number)
 export declare function applyDelete(rope: TextRope, op: DeleteOp): void;
 export declare function replace(rope: TextRope, position: number, deleteLength: number, insertText: string, agentId?: string): ReplaceOp;
 export declare function applyReplace(rope: TextRope, op: ReplaceOp): void;
-export declare function move(rope: TextRope, fromPosition: number, length: number, toPosition: number): MoveOp;
+export declare function move(rope: TextRope, fromPosition: number, length: number, toPosition: number, agentId?: string): MoveOp;
 export declare function applyMove(rope: TextRope, op: MoveOp): void;
 export declare function merge(rope: TextRope, other: TextRope): void;
 export declare function snapshot(rope: TextRope): TextRope;
 export declare function compact(rope: TextRope): TextRope;
-export type RawTextRope = [string, number, number, Array<[string, number, string, string | null, number | null]>];
+export type RawTextRope = [string, number, number, Array<[string, string, string | null, number, number]>];
 export declare function toRaw(rope: TextRope): RawTextRope;
 export declare function fromRaw(raw: RawTextRope, newAgentId?: string): TextRope;
 export declare function fromSnapshot(snap: TextRope, newAgentId?: string): TextRope;

package/dist/crdt/Rope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Rope.d.ts","sourceRoot":"","sources":["../../src/crdt/Rope.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Rope.d.ts","sourceRoot":"","sources":["../../src/crdt/Rope.ts"],"names":[],"mappings":"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"}

package/dist/crdt/Rope.js

@@ -46,19 +46,38 @@ export class TextRope {
 // ============================================
 // Utilities
 // ============================================
+/**
+ * Compare two ItemIds for equality
+ */
 export function itemIdEquals(a, b) {
-    if (a === null && b === null)
-        return true;
-    if (a === null || b === null)
-        return false;
-    return a.agent === b.agent && a.seq === b.seq;
+    return a === b;
 }
+/**
+ * Compare two ItemIds for ordering (primarily for agent ordering)
+ * For tie-breaking by ts, use seq + ts + id comparison
+ */
 export function itemIdCompare(a, b) {
-    if (a.agent < b.agent)
+    if (a < b)
         return -1;
-    if (a.agent > b.agent)
+    if (a > b)
         return 1;
-    return a.seq - b.seq;
+    return 0;
+}
+/**
+ * Parse an ItemId string into its components
+ */
+export function parseItemId(id) {
+    const colonIdx = id.lastIndexOf(':');
+    return {
+        agent: id.slice(0, colonIdx),
+        seq: parseInt(id.slice(colonIdx + 1), 10),
+    };
+}
+/**
+ * Create an ItemId from agent and seq
+ */
+export function createItemId(agent, seq) {
+    return `${agent}:${seq}`;
 }
 // ============================================
 // Agent Index helpers
@@ -78,15 +97,16 @@ function aiFind(entries, seq) {
     return -1;
 }
 function aiAdd(index, item) {
+    const parsed = parseItemId(item.id);
     const entry = {
-        startSeq: item.id.seq,
-        endSeq: item.id.seq + item.content.length,
+        startSeq: parsed.seq,
+        endSeq: parsed.seq + item.content.length,
         item,
     };
-    let arr = index.get(item.id.agent);
+    let arr = index.get(parsed.agent);
     if (!arr) {
         arr = [];
-        index.set(item.id.agent, arr);
+        index.set(parsed.agent, arr);
     }
     let lo = 0, hi = arr.length;
     while (lo < hi) {
@@ -99,10 +119,11 @@ function aiAdd(index, item) {
     arr.splice(lo, 0, entry);
 }
 function aiRemove(index, item) {
-    const arr = index.get(item.id.agent);
+    const parsed = parseItemId(item.id);
+    const arr = index.get(parsed.agent);
     if (!arr)
         return;
-    const ei = aiFind(arr, item.id.seq);
+    const ei = aiFind(arr, parsed.seq);
     if (ei !== -1 && arr[ei].item === item) {
         arr.splice(ei, 1);
     }
@@ -110,12 +131,13 @@ function aiRemove(index, item) {
 function aiBuild(items) {
     const index = new Map();
     for (const item of items) {
-        let arr = index.get(item.id.agent);
+        const parsed = parseItemId(item.id);
+        let arr = index.get(parsed.agent);
         if (!arr) {
             arr = [];
-            index.set(item.id.agent, arr);
+            index.set(parsed.agent, arr);
         }
-        arr.push({ startSeq: item.id.seq, endSeq: item.id.seq + item.content.length, item });
+        arr.push({ startSeq: parsed.seq, endSeq: parsed.seq + item.content.length, item });
     }
     for (const arr of index.values()) {
         if (arr.length > 1)
@@ -146,14 +168,16 @@ export function getItems(rope) {
 export function findItemById(rope, id) {
     if (id === null)
         return -1;
-    const entries = rope._agentIndex.get(id.agent);
+    const parsed = parseItemId(id);
+    const entries = rope._agentIndex.get(parsed.agent);
     if (!entries)
         return -1;
-    const ei = aiFind(entries, id.seq);
+    const ei = aiFind(entries, parsed.seq);
     if (ei === -1)
         return -1;
     const item = entries[ei].item;
-    if (item.id.seq !== id.seq)
+    const itemParsed = parseItemId(item.id);
+    if (itemParsed.seq !== parsed.seq)
         return -1;
     return computeOrdinal(rope._tree, item);
 }
@@ -180,44 +204,49 @@ export function getStats(rope) {
 // ============================================
 function splitItem(rope, ordinal, offset) {
     const item = getAt(rope._tree, ordinal);
+    const itemParsed = parseItemId(item.id);
     const before = {
-        id: { agent: item.id.agent, seq: item.id.seq },
+        id: createItemId(itemParsed.agent, itemParsed.seq),
         content: item.content.slice(0, offset),
         isDeleted: item.isDeleted,
-        parentId: item.parentId ? { agent: item.parentId.agent, seq: item.parentId.seq } : null,
+        parentId: item.parentId,
         seq: item.seq,
+        ts: item.ts,
     };
     const after = {
-        id: { agent: item.id.agent, seq: item.id.seq + offset },
+        id: createItemId(itemParsed.agent, itemParsed.seq + offset),
         content: item.content.slice(offset),
         isDeleted: item.isDeleted,
-        parentId: { agent: item.id.agent, seq: item.id.seq + offset - 1 },
+        parentId: createItemId(itemParsed.agent, itemParsed.seq + offset - 1),
         seq: item.seq,
+        ts: item.ts,
     };
     splitAtOrdinal(rope._tree, ordinal, before, after);
     aiRemove(rope._agentIndex, item);
     aiAdd(rope._agentIndex, before);
     aiAdd(rope._agentIndex, after);
-    if (item.id.agent === rope.agentId) {
-        const maxSeqInItem = item.id.seq + item.content.length - 1;
+    if (itemParsed.agent === rope.agentId) {
+        const maxSeqInItem = itemParsed.seq + item.content.length - 1;
         if (maxSeqInItem >= rope.clock)
             rope.clock = maxSeqInItem + 1;
     }
     return before;
 }
 function containsItemId(rope, id) {
-    const entries = rope._agentIndex.get(id.agent);
+    const parsed = parseItemId(id);
+    const entries = rope._agentIndex.get(parsed.agent);
     if (!entries)
         return false;
-    return aiFind(entries, id.seq) !== -1;
+    return aiFind(entries, parsed.seq) !== -1;
 }
 function findParentOrdinal(rope, parentId) {
     if (parentId === null)
         return -1;
-    const entries = rope._agentIndex.get(parentId.agent);
+    const parsed = parseItemId(parentId);
+    const entries = rope._agentIndex.get(parsed.agent);
     if (!entries)
         return -1;
-    const ei = aiFind(entries, parentId.seq);
+    const ei = aiFind(entries, parsed.seq);
     if (ei === -1)
         return -1;
     return computeOrdinal(rope._tree, entries[ei].item);
@@ -225,15 +254,17 @@ function findParentOrdinal(rope, parentId) {
 function splitForParent(rope, parentId) {
     if (parentId === null)
         return -1;
-    const entries = rope._agentIndex.get(parentId.agent);
+    const parsedParent = parseItemId(parentId);
+    const entries = rope._agentIndex.get(parsedParent.agent);
     if (!entries)
         return -1;
-    const ei = aiFind(entries, parentId.seq);
+    const ei = aiFind(entries, parsedParent.seq);
     if (ei === -1)
         return -1;
     const item = entries[ei].item;
     const ordinal = computeOrdinal(rope._tree, item);
-    const splitOffset = parentId.seq - item.id.seq + 1;
+    const itemParsed = parseItemId(item.id);
+    const splitOffset = parsedParent.seq - itemParsed.seq + 1;
     if (splitOffset < item.content.length) {
         splitItem(rope, ordinal, splitOffset);
     }
@@ -252,7 +283,8 @@ function findInsertPosition(rope, position) {
         return null;
     const item = result.item;
     const charOffset = Math.min(result.charOffset, item.content.length - 1);
-    return { agent: item.id.agent, seq: item.id.seq + charOffset };
+    const itemParsed = parseItemId(item.id);
+    return createItemId(itemParsed.agent, itemParsed.seq + charOffset);
 }
 function findInsertPositionWithSplit(rope, position) {
     if (position === 0 || totalItems(rope._tree) === 0) {
@@ -266,7 +298,8 @@ function findInsertPositionWithSplit(rope, position) {
     }
     const item = result.item;
     const charOffset = Math.min(result.charOffset, item.content.length - 1);
-    const parentId = { agent: item.id.agent, seq: item.id.seq + charOffset };
+    const itemParsed = parseItemId(item.id);
+    const parentId = createItemId(itemParsed.agent, itemParsed.seq + charOffset);
     const needsSplit = charOffset + 1 < item.content.length;
     return { parentId, parentOrdinal: result.ordinal, needsSplit, splitOffset: charOffset + 1 };
 }
@@ -279,15 +312,28 @@ function integrate(rope, newItem, parentOrdinal) {
     if (insertOrdinal < total) {
         for (const existing of iterateFrom(rope._tree, insertOrdinal)) {
             const existingItem = existing;
+            // First, compare by Lamport timestamp (seq) - higher seq means happened later
             if (newItem.seq > existingItem.seq)
                 break;
             const existingParentOrdinal = findParentOrdinal(rope, existingItem.parentId);
-            if (existingParentOrdinal < parentOrdinal ||
-                (existingParentOrdinal === parentOrdinal &&
-                    newItem.seq === existingItem.seq &&
-                    itemIdCompare(newItem.id, existingItem.id) < 0)) {
+            // If existing item's parent is before our parent in the document, insert here
+            if (existingParentOrdinal < parentOrdinal) {
                 break;
             }
+            // If same parent and same Lamport seq, use wall-clock time (ts) for tie-breaking
+            if (existingParentOrdinal === parentOrdinal && newItem.seq === existingItem.seq) {
+                // Use ts for tie-breaking (earlier ts wins - inserts first)
+                if (newItem.ts < existingItem.ts) {
+                    break;
+                }
+                // If ts also equal (rare), fall back to ID comparison for determinism
+                if (newItem.ts === existingItem.ts && itemIdCompare(newItem.id, existingItem.id) < 0) {
+                    break;
+                }
+            }
+            // If same parent but different seq, the YATA algorithm says:
+            // Insert before items with lower seq (that happened earlier)
+            // This is already handled by the first check above
             insertOrdinal++;
         }
     }
@@ -298,15 +344,17 @@ function _applyLocal(rope, op, parentOrdinal) {
     if (op.seq > rope.maxSeq)
         rope.maxSeq = op.seq;
     const newItem = {
-        id: { agent: op.id.agent, seq: op.id.seq },
+        id: op.id,
         content: op.content,
         isDeleted: false,
-        parentId: op.parentId ? { agent: op.parentId.agent, seq: op.parentId.seq } : null,
+        parentId: op.parentId,
         seq: op.seq,
+        ts: op.ts,
     };
     integrate(rope, newItem, parentOrdinal);
-    if (op.id.agent === rope.agentId) {
-        const maxSeqInItem = op.id.seq + op.content.length - 1;
+    const idParsed = parseItemId(op.id);
+    if (idParsed.agent === rope.agentId) {
+        const maxSeqInItem = idParsed.seq + op.content.length - 1;
         if (maxSeqInItem >= rope.clock)
             rope.clock = maxSeqInItem + 1;
     }
@@ -337,10 +385,11 @@ export function insert(rope, position, content, agentId) {
         switchAgent(rope, agentId);
     const parentId = findInsertPosition(rope, position);
     const op = {
-        id: { agent: rope.agentId, seq: rope.clock },
+        id: createItemId(rope.agentId, rope.clock),
         content,
         parentId,
         seq: rope.maxSeq + 1,
+        ts: Date.now() / 1000,
     };
     const parentOrdinal = splitForParent(rope, op.parentId);
     _applyLocal(rope, op, parentOrdinal);
@@ -354,10 +403,11 @@ export function insertWithSplit(rope, position, content, agentId) {
         splitItem(rope, parentOrdinal, splitOffset);
     }
     const op = {
-        id: { agent: rope.agentId, seq: rope.clock },
+        id: createItemId(rope.agentId, rope.clock),
         content,
         parentId,
         seq: rope.maxSeq + 1,
+        ts: Date.now() / 1000,
     };
     _applyLocal(rope, op, parentOrdinal);
     return op;
@@ -369,15 +419,17 @@ export function apply(rope, op) {
         return;
     const parentOrdinal = splitForParent(rope, op.parentId);
     const newItem = {
-        id: { agent: op.id.agent, seq: op.id.seq },
+        id: op.id,
         content: op.content,
         isDeleted: false,
-        parentId: op.parentId ? { agent: op.parentId.agent, seq: op.parentId.seq } : null,
+        parentId: op.parentId,
         seq: op.seq,
+        ts: op.ts,
     };
     integrate(rope, newItem, parentOrdinal);
-    if (op.id.agent === rope.agentId) {
-        const maxSeqInItem = op.id.seq + op.content.length - 1;
+    const idParsed = parseItemId(op.id);
+    if (idParsed.agent === rope.agentId) {
+        const maxSeqInItem = idParsed.seq + op.content.length - 1;
         if (maxSeqInItem >= rope.clock)
             rope.clock = maxSeqInItem + 1;
     }
@@ -412,7 +464,7 @@ export function remove(rope, position, length) {
         // Delete the item
         item.isDeleted = true;
         recalcCountsFor(rope._tree, item);
-        deletions.push({ id: { ...item.id }, length: item.content.length });
+        deletions.push({ id: item.id, length: item.content.length });
         remaining -= toDelete;
     }
     return { deletions };
@@ -423,12 +475,13 @@ export function applyDelete(rope, op) {
     // Group and merge deletion ranges by agent
     const byAgent = new Map();
     for (const del of op.deletions) {
-        let ranges = byAgent.get(del.id.agent);
+        const parsed = parseItemId(del.id);
+        let ranges = byAgent.get(parsed.agent);
         if (!ranges) {
             ranges = [];
-            byAgent.set(del.id.agent, ranges);
+            byAgent.set(parsed.agent, ranges);
         }
-        ranges.push({ start: del.id.seq, end: del.id.seq + del.length });
+        ranges.push({ start: parsed.seq, end: parsed.seq + del.length });
     }
     for (const [, ranges] of byAgent) {
         if (ranges.length > 1) {
@@ -473,7 +526,8 @@ function applyDeleteRange(rope, agent, start, end) {
             continue;
         }
         const item = entries[ei].item;
-        const itemStart = item.id.seq;
+        const itemParsed = parseItemId(item.id);
+        const itemStart = itemParsed.seq;
         const itemEnd = itemStart + item.content.length;
         const overlapStart = Math.max(itemStart, start);
         const overlapEnd = Math.min(itemEnd, end);
@@ -513,7 +567,7 @@ export function replace(rope, position, deleteLength, insertText, agentId) {
     const deleteOp = deleteLength > 0 ? remove(rope, position, deleteLength) : { deletions: [] };
     const insertOp = insertText.length > 0
         ? insertWithSplit(rope, position, insertText)
-        : { id: { agent: rope.agentId, seq: rope.clock }, content: '', parentId: null, seq: rope.maxSeq };
+        : { id: createItemId(rope.agentId, rope.clock), content: '', parentId: null, seq: rope.maxSeq, ts: Date.now() / 1000 };
     return { delete: deleteOp, insert: insertOp };
 }
 export function applyReplace(rope, op) {
@@ -522,7 +576,9 @@ export function applyReplace(rope, op) {
         apply(rope, op.insert);
     }
 }
-export function move(rope, fromPosition, length, toPosition) {
+export function move(rope, fromPosition, length, toPosition, agentId) {
+    if (agentId !== undefined)
+        switchAgent(rope, agentId);
     // Extract content before deleting
     let content = '';
     let remaining = length;
@@ -566,6 +622,7 @@ export function merge(rope, other) {
             content: item.content,
             parentId: item.parentId,
             seq: item.seq,
+            ts: item.ts,
         });
         if (item.isDeleted) {
             applyDelete(rope, { deletions: [{ id: item.id, length: item.content.length }] });
@@ -584,9 +641,17 @@ export function compact(rope) {
         if (item.isDeleted)
             continue;
         const newItem = { ...item };
-        if (prevItem && prevItem.id.agent === newItem.id.agent &&
-            prevItem.id.seq + prevItem.content.length === newItem.id.seq) {
-            prevItem.content += newItem.content;
+        if (prevItem) {
+            const prevParsed = parseItemId(prevItem.id);
+            const newParsed = parseItemId(newItem.id);
+            if (prevParsed.agent === newParsed.agent &&
+                prevParsed.seq + prevItem.content.length === newParsed.seq) {
+                prevItem.content += newItem.content;
+            }
+            else {
+                visibleItems.push(newItem);
+                prevItem = newItem;
+            }
         }
         else {
             visibleItems.push(newItem);
@@ -599,22 +664,23 @@ export function toRaw(rope) {
     const compacted = compact(rope);
     const items = flattenItems(compacted._tree);
     const rawItems = items.map(item => [
-        item.id.agent,
-        item.id.seq,
+        item.id,
         item.content,
-        item.parentId?.agent ?? null,
-        item.parentId?.seq ?? null,
+        item.parentId,
+        item.seq,
+        item.ts,
     ]);
     return [rope.agentId, rope.clock, rope.maxSeq, rawItems];
 }
 export function fromRaw(raw, newAgentId) {
     const [agentId, clock, maxSeq, rawItems] = raw;
-    const items = rawItems.map(([agent, seq, content, parentAgent, parentSeq]) => ({
-        id: { agent, seq },
+    const items = rawItems.map(([id, content, parentId, seq, ts]) => ({
+        id,
         content,
         isDeleted: false,
-        parentId: parentAgent !== null ? { agent: parentAgent, seq: parentSeq } : null,
-        seq: maxSeq,
+        parentId,
+        seq,
+        ts,
     }));
     return new TextRope(bulkLoad(items), aiBuild(items), newAgentId ?? agentId, newAgentId ? 0 : clock, maxSeq);
 }
@@ -662,11 +728,13 @@ function extractItemsFromSerializedTree(node) {
         if (!Array.isArray(items))
             return [];
         return items.map((item) => ({
-            id: { agent: item.id.agent, seq: item.id.seq },
+            id: typeof item.id === 'string' ? item.id : createItemId(item.id.agent, item.id.seq),
             content: item.content,
             isDeleted: item.isDeleted ?? false,
-            parentId: item.parentId ? { agent: item.parentId.agent, seq: item.parentId.seq } : null,
+            parentId: item.parentId === null ? null :
+                (typeof item.parentId === 'string' ? item.parentId : createItemId(item.parentId.agent, item.parentId.seq)),
             seq: item.seq,
+            ts: item.ts ?? Date.now() / 1000,
         }));
     }
     else if (n.type === 'internal') {