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

package/.env

@@ -1 +1 @@
-DATABASE_URL="mongodb://localhost:27017/vuer"
+DATABASE_URL="mongodb://localhost:27017/vuer?replicaSet=rs0"

package/README.md

@@ -4,6 +4,62 @@ Real-time collaborative library for vuer.ai. Server is built with MongoDB persis
 
 The CRDT logic is in `@vuer-ai/vuer-rtc`. This package provides server-specific functionality.
 
+## Setup
+
+### Prerequisites
+
+MongoDB with replica set support (required for Prisma transactions).
+
+### MongoDB Setup with Docker
+
+1. **Start MongoDB and Redis containers:**
+   ```bash
+   cd ../../docker
+   docker compose up -d
+   ```
+
+   This starts:
+   - MongoDB 7 with replica set `rs0` on port 27017
+   - Redis 7 on port 6379
+
+2. **Verify replica set is initialized:**
+   ```bash
+   docker exec vuer-rtc-mongo mongosh --quiet --eval "rs.status().set"
+   ```
+
+   Should output: `rs0`
+
+3. **Configure database connection:**
+
+   Create `.env` file in `packages/vuer-rtc-server/`:
+   ```bash
+   DATABASE_URL="mongodb://localhost:27017/vuer?replicaSet=rs0"
+   ```
+
+4. **Push Prisma schema to MongoDB:**
+   ```bash
+   cd packages/vuer-rtc-server
+   npx prisma db push
+   ```
+
+5. **Run tests:**
+   ```bash
+   pnpm test
+   ```
+
+### Stopping Services
+
+```bash
+cd ../../docker
+docker compose down      # Stop containers (keep data)
+docker compose down -v   # Stop containers and remove volumes (delete all data)
+```
+
+**Note for macOS users:** If you have MongoDB installed via Homebrew, stop it first to avoid port conflicts:
+```bash
+brew services stop mongodb-community
+```
+
 ## How CRDT Works
 
 ### The Core Concept

package/dist/archive/ArchivalService.js

@@ -35,7 +35,7 @@ export class ArchivalService {
             const metadata = {
                 documentId,
                 snapshotVersion: snapshot.journalIndex || 0,
-                lamportTime: snapshot.lamportTime || 0,
+                lamportTime: snapshot.lt || 0,
                 originalSize: compressionResult.originalSize,
                 compressedSize: compressionResult.compressedSize,
                 compressionRatio: compressionResult.ratio,

package/dist/archive/ArchivalService.js.map

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

package/dist/broker/InMemoryBroker.d.ts

@@ -15,8 +15,8 @@ export declare class InMemoryBroker implements RoomBroker {
     publish(roomId: string, msg: SequencedMessage): Promise<void>;
     subscribe(roomId: string, handler: (msg: SequencedMessage) => void): () => void;
     nextSeq(roomId: string): Promise<number>;
-    setMember(roomId: string, sessionId: string, state: MemberState): Promise<void>;
-    removeMember(roomId: string, sessionId: string): Promise<void>;
+    setMember(roomId: string, client: string, state: MemberState): Promise<void>;
+    removeMember(roomId: string, client: string): Promise<void>;
     getMembers(roomId: string): Promise<Map<string, MemberState>>;
     deleteRoom(roomId: string): Promise<void>;
     clearRoom(roomId: string): Promise<void>;

package/dist/broker/InMemoryBroker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InMemoryBroker.d.ts","sourceRoot":"","sources":["../../src/broker/InMemoryBroker.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE5E,qBAAa,cAAe,YAAW,UAAU;IAC/C,OAAO,CAAC,IAAI,CAA6B;IACzC,OAAO,CAAC,IAAI,CAA2D;IACvE,OAAO,CAAC,OAAO,CAA+C;IAExD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAQnE,SAAS,CACP,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,GACvC,MAAM,IAAI;IAcP,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAOxC,SAAS,CACb,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,WAAW,GACjB,OAAO,CAAC,IAAI,CAAC;IAOV,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9D,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAI7D,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMzC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9C,iDAAiD;IACjD,aAAa,IAAI,MAAM,EAAE;CAG1B"}
+{"version":3,"file":"InMemoryBroker.d.ts","sourceRoot":"","sources":["../../src/broker/InMemoryBroker.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE5E,qBAAa,cAAe,YAAW,UAAU;IAC/C,OAAO,CAAC,IAAI,CAA6B;IACzC,OAAO,CAAC,IAAI,CAA2D;IACvE,OAAO,CAAC,OAAO,CAA+C;IAExD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAQnE,SAAS,CACP,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,GACvC,MAAM,IAAI;IAcP,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAOxC,SAAS,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,WAAW,GACjB,OAAO,CAAC,IAAI,CAAC;IAOV,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAI7D,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMzC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9C,iDAAiD;IACjD,aAAa,IAAI,MAAM,EAAE;CAG1B"}

package/dist/broker/InMemoryBroker.js

@@ -38,14 +38,14 @@ export class InMemoryBroker {
         this.seqs.set(roomId, next);
         return next;
     }
-    async setMember(roomId, sessionId, state) {
+    async setMember(roomId, client, state) {
         if (!this.members.has(roomId)) {
             this.members.set(roomId, new Map());
         }
-        this.members.get(roomId).set(sessionId, state);
+        this.members.get(roomId).set(client, state);
     }
-    async removeMember(roomId, sessionId) {
-        this.members.get(roomId)?.delete(sessionId);
+    async removeMember(roomId, client) {
+        this.members.get(roomId)?.delete(client);
     }
     async getMembers(roomId) {
         return this.members.get(roomId) ?? new Map();

package/dist/broker/InMemoryBroker.js.map

@@ -1 +1 @@
-{"version":3,"file":"InMemoryBroker.js","sourceRoot":"","sources":["../../src/broker/InMemoryBroker.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,MAAM,OAAO,cAAc;IACjB,IAAI,GAAG,IAAI,GAAG,EAAkB,CAAC;IACjC,IAAI,GAAG,IAAI,GAAG,EAAgD,CAAC;IAC/D,OAAO,GAAG,IAAI,GAAG,EAAoC,CAAC;IAE9D,KAAK,CAAC,OAAO,CAAC,MAAc,EAAE,GAAqB;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,CAAC,QAAQ;YAAE,OAAO;QACtB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,OAAO,CAAC,GAAG,CAAC,CAAC;QACf,CAAC;IACH,CAAC;IAED,SAAS,CACP,MAAc,EACd,OAAwC;QAExC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;QACnC,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC;QACxC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtB,OAAO,GAAG,EAAE;YACV,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACzB,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;gBACxB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAAc;QAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,OAAO,GAAG,CAAC,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,SAAS,CACb,MAAc,EACd,SAAiB,EACjB,KAAkB;QAElB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAc,EAAE,SAAiB;QAClD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAc;QAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAc;QAC7B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACzB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,MAAc;QAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACzB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC5B,yDAAyD;QACzD,wDAAwD;IAC1D,CAAC;IAED,iDAAiD;IACjD,aAAa;QACX,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACzC,CAAC;CACF"}
+{"version":3,"file":"InMemoryBroker.js","sourceRoot":"","sources":["../../src/broker/InMemoryBroker.ts"],"names":[],"mappings":"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"}

package/dist/broker/types.d.ts

@@ -16,7 +16,7 @@ export interface SequencedMessage extends CRDTMessage {
  * Per-member state tracked by the broker.
  */
 export interface MemberState {
-    sessionId: string;
+    client: string;
     vectorClock: Record<string, number>;
     lastSeen: number;
     connected: boolean;
@@ -34,9 +34,9 @@ export interface RoomBroker {
     /** Get the next monotonic sequence number for a room. */
     nextSeq(roomId: string): Promise<number>;
     /** Register or update a member in a room. */
-    setMember(roomId: string, sessionId: string, state: MemberState): Promise<void>;
+    setMember(roomId: string, client: string, state: MemberState): Promise<void>;
     /** Remove a member from a room. */
-    removeMember(roomId: string, sessionId: string): Promise<void>;
+    removeMember(roomId: string, client: string): Promise<void>;
     /** Get all members in a room. */
     getMembers(roomId: string): Promise<Map<string, MemberState>>;
     /** Clean up all state for a room (used in tests). */

package/dist/broker/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/broker/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACnD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACzB,gEAAgE;IAChE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9D,wEAAwE;IACxE,SAAS,CACP,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,GACvC,MAAM,IAAI,CAAC;IAEd,yDAAyD;IACzD,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEzC,6CAA6C;IAC7C,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhF,mCAAmC;IACnC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/D,iCAAiC;IACjC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;IAE9D,qDAAqD;IACrD,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1C,+DAA+D;IAC/D,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1C"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/broker/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACnD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACzB,gEAAgE;IAChE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9D,wEAAwE;IACxE,SAAS,CACP,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,GACvC,MAAM,IAAI,CAAC;IAEd,yDAAyD;IACzD,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEzC,6CAA6C;IAC7C,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7E,mCAAmC;IACnC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5D,iCAAiC;IACjC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;IAE9D,qDAAqD;IACrD,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1C,+DAA+D;IAC/D,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1C"}

package/dist/journal/CoalescingService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CoalescingService.d.ts","sourceRoot":"","sources":["../../src/journal/CoalescingService.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAOnD;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAC7B,YAAY,GACZ,UAAU,CAAC;AAEf;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,sCAAsC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0BAA0B;IAC1B,QAAQ,CAAC,EAAE,qBAAqB,CAAC;IACjC,mDAAmD;IACnD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,yFAAyF;IACzF,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,gBAAgB;IAC/B,qDAAqD;IACrD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qDAAqD;IACrD,WAAW,CAAC,EAAE,qBAAqB,CAAC;IACpC,2DAA2D;IAC3D,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,+EAA+E;IAC/E,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IAG1D,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IACvD,KAAK,EAAE;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IACtD,SAAS,EAAE;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3D;AAueD,qBAAa,iBAAiB;IAChB,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,YAAY;IAExC;;OAEG;IACG,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,gBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC;CA0ExF"}
+{"version":3,"file":"CoalescingService.d.ts","sourceRoot":"","sources":["../../src/journal/CoalescingService.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAOnD;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAC7B,YAAY,GACZ,UAAU,CAAC;AAEf;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,sCAAsC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0BAA0B;IAC1B,QAAQ,CAAC,EAAE,qBAAqB,CAAC;IACjC,mDAAmD;IACnD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,yFAAyF;IACzF,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,gBAAgB;IAC/B,qDAAqD;IACrD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qDAAqD;IACrD,WAAW,CAAC,EAAE,qBAAqB,CAAC;IACpC,2DAA2D;IAC3D,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,+EAA+E;IAC/E,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IAG1D,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IACvD,KAAK,EAAE;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IACtD,SAAS,EAAE;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3D;AA8QD,qBAAa,iBAAiB;IAChB,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,YAAY;IAExC;;OAEG;IACG,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,gBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC;CA0ExF"}

package/dist/journal/CoalescingService.js

@@ -9,27 +9,11 @@
 // Default time threshold for set operation coalescing (ms)
 const DEFAULT_SET_THRESHOLD_MS = 5000;
 const DEFAULT_SAMPLING_INTERVAL_MS = 100;
-/**
- * Check if an operation is a position-based text insert
- */
-function isPositionTextInsertOp(op) {
-    return op.otype === 'text.insert' &&
-        typeof op.position === 'number' &&
-        typeof op.value === 'string';
-}
-/**
- * Check if an operation is a position-based text delete
- */
-function isPositionTextDeleteOp(op) {
-    return op.otype === 'text.delete' &&
-        typeof op.position === 'number' &&
-        typeof op.length === 'number';
-}
 /**
  * Check if an operation is a set operation
  */
 function isSetOp(op) {
-    return op.otype.endsWith('.set');
+    return op.ot.endsWith('.set');
 }
 /**
  * Check if an operation is an additive operation
@@ -37,179 +21,8 @@ function isSetOp(op) {
  * factors together gives a different result than applying them sequentially
  */
 function isAdditiveOp(op) {
-    return op.otype === 'vector3.add' ||
-        op.otype === 'number.add';
-}
-/**
- * Coalesce consecutive text inserts and deletes (works with timestamped ops)
- *
- * Insert coalescing: Consecutive inserts at adjacent positions
- *   insert(10, "a"), insert(11, "b"), insert(12, "c") → insert(10, "abc")
- *
- * Delete coalescing:
- *   - Forward (Delete key): Same position
- *     del(10, 1), del(10, 1), del(10, 1) → del(10, 3)
- *   - Backward (Backspace): Position moves left by length
- *     del(10, 1), del(9, 1), del(8, 1) → del(8, 3)
- */
-function coalesceTextOps(tOps) {
-    if (tOps.length === 0)
-        return tOps;
-    const result = [];
-    let pendingInsert = null;
-    let pendingDelete = null;
-    for (const tOp of tOps) {
-        const op = tOp.op;
-        if (isPositionTextInsertOp(op)) {
-            // Flush any pending delete
-            if (pendingDelete !== null) {
-                result.push({ op: pendingDelete.op, timestamp: pendingDelete.timestamp });
-                pendingDelete = null;
-            }
-            // Coalesce inserts
-            if (pendingInsert === null) {
-                pendingInsert = {
-                    op: {
-                        otype: 'text.insert',
-                        key: op.key,
-                        path: op.path,
-                        position: op.position,
-                        value: op.value,
-                    },
-                    timestamp: tOp.timestamp,
-                };
-            }
-            else if (pendingInsert.op.key === op.key &&
-                pendingInsert.op.path === op.path &&
-                pendingInsert.op.position + pendingInsert.op.value.length === op.position) {
-                // Consecutive insert - merge
-                pendingInsert = {
-                    op: {
-                        otype: 'text.insert',
-                        key: pendingInsert.op.key,
-                        path: pendingInsert.op.path,
-                        position: pendingInsert.op.position,
-                        value: pendingInsert.op.value + op.value,
-                    },
-                    timestamp: tOp.timestamp,
-                };
-            }
-            else {
-                // Non-consecutive - flush and start new
-                result.push({ op: pendingInsert.op, timestamp: pendingInsert.timestamp });
-                pendingInsert = {
-                    op: {
-                        otype: 'text.insert',
-                        key: op.key,
-                        path: op.path,
-                        position: op.position,
-                        value: op.value,
-                    },
-                    timestamp: tOp.timestamp,
-                };
-            }
-        }
-        else if (isPositionTextDeleteOp(op)) {
-            // Flush any pending insert
-            if (pendingInsert !== null) {
-                result.push({ op: pendingInsert.op, timestamp: pendingInsert.timestamp });
-                pendingInsert = null;
-            }
-            // Coalesce deletes
-            if (pendingDelete === null) {
-                pendingDelete = {
-                    op: {
-                        otype: 'text.delete',
-                        key: op.key,
-                        path: op.path,
-                        position: op.position,
-                        length: op.length,
-                    },
-                    timestamp: tOp.timestamp,
-                };
-            }
-            else if (pendingDelete.op.key === op.key &&
-                pendingDelete.op.path === op.path) {
-                // Check if this is forward deletion (same position) or backward deletion (position moves left)
-                const isForwardDelete = pendingDelete.op.position === op.position;
-                const isBackwardDelete = op.position + op.length === pendingDelete.op.position;
-                if (isForwardDelete) {
-                    // Forward delete: accumulate lengths at same position
-                    pendingDelete = {
-                        op: {
-                            otype: 'text.delete',
-                            key: pendingDelete.op.key,
-                            path: pendingDelete.op.path,
-                            position: pendingDelete.op.position,
-                            length: pendingDelete.op.length + op.length,
-                        },
-                        timestamp: tOp.timestamp,
-                    };
-                }
-                else if (isBackwardDelete) {
-                    // Backward delete: position moves left, accumulate lengths
-                    pendingDelete = {
-                        op: {
-                            otype: 'text.delete',
-                            key: pendingDelete.op.key,
-                            path: pendingDelete.op.path,
-                            position: op.position, // use new (leftmost) position
-                            length: pendingDelete.op.length + op.length,
-                        },
-                        timestamp: tOp.timestamp,
-                    };
-                }
-                else {
-                    // Non-consecutive - flush and start new
-                    result.push({ op: pendingDelete.op, timestamp: pendingDelete.timestamp });
-                    pendingDelete = {
-                        op: {
-                            otype: 'text.delete',
-                            key: op.key,
-                            path: op.path,
-                            position: op.position,
-                            length: op.length,
-                        },
-                        timestamp: tOp.timestamp,
-                    };
-                }
-            }
-            else {
-                // Different key/path - flush and start new
-                result.push({ op: pendingDelete.op, timestamp: pendingDelete.timestamp });
-                pendingDelete = {
-                    op: {
-                        otype: 'text.delete',
-                        key: op.key,
-                        path: op.path,
-                        position: op.position,
-                        length: op.length,
-                    },
-                    timestamp: tOp.timestamp,
-                };
-            }
-        }
-        else {
-            // Other operation type - flush pending
-            if (pendingInsert !== null) {
-                result.push({ op: pendingInsert.op, timestamp: pendingInsert.timestamp });
-                pendingInsert = null;
-            }
-            if (pendingDelete !== null) {
-                result.push({ op: pendingDelete.op, timestamp: pendingDelete.timestamp });
-                pendingDelete = null;
-            }
-            result.push(tOp);
-        }
-    }
-    // Flush any remaining pending ops
-    if (pendingInsert !== null) {
-        result.push({ op: pendingInsert.op, timestamp: pendingInsert.timestamp });
-    }
-    if (pendingDelete !== null) {
-        result.push({ op: pendingDelete.op, timestamp: pendingDelete.timestamp });
-    }
-    return result;
+    return op.ot === 'vector3.add' ||
+        op.ot === 'number.add';
 }
 /**
  * Coalesce set operations with configurable strategy
@@ -325,17 +138,17 @@ function coalesceAdditiveOps(tOps) {
     for (const tOp of tOps) {
         const op = tOp.op;
         if (isAdditiveOp(op)) {
-            const key = `${op.key}:${op.path}:${op.otype}`;
+            const key = `${op.key}:${op.path}:${op.ot}`;
             const existing = pendingByKey.get(key);
-            if (existing && existing.op.otype === op.otype) {
+            if (existing && existing.op.ot === op.ot) {
                 // Merge values
-                if (op.otype === 'vector3.add') {
+                if (op.ot === 'vector3.add') {
                     const va = existing.op.value;
                     const vb = op.value;
                     existing.op.value = [va[0] + vb[0], va[1] + vb[1], va[2] + vb[2]];
                     existing.timestamp = tOp.timestamp; // update to latest timestamp
                 }
-                else if (op.otype === 'number.add') {
+                else if (op.ot === 'number.add') {
                     existing.op.value = existing.op.value + op.value;
                     existing.timestamp = tOp.timestamp;
                 }
@@ -382,15 +195,15 @@ function coalesceOperations(messages, config) {
     // Group messages into consecutive runs from the same session
     const runs = [];
     let currentRun = [];
-    let lastSessionId = null;
+    let lastClient = null;
     for (const msg of messages) {
-        if (msg.sessionId !== lastSessionId && currentRun.length > 0) {
-            // Session switch - emit current run and start new one
+        if (msg.client !== lastClient && currentRun.length > 0) {
+            // Client switch - emit current run and start new one
             runs.push(currentRun);
             currentRun = [];
         }
         currentRun.push(msg);
-        lastSessionId = msg.sessionId;
+        lastClient = msg.client;
     }
     if (currentRun.length > 0) {
         runs.push(currentRun);
@@ -401,15 +214,12 @@ function coalesceOperations(messages, config) {
         // Flatten all ops from this run with embedded timestamps
         let tOps = [];
         for (const msg of run) {
-            const timestamp = msg.timestamp * 1000; // convert to ms
+            const timestamp = msg.ts * 1000; // convert to ms
             for (const op of msg.ops) {
                 tOps.push({ op, timestamp });
             }
         }
         // Apply coalescing in order
-        if (config.enableTextCoalesce !== false) {
-            tOps = coalesceTextOps(tOps);
-        }
         if (config.enableSetCoalesce !== false) {
             tOps = coalesceSetOps(tOps, config);
         }
@@ -450,10 +260,10 @@ export class CoalescingService {
         // Convert batches to messages
         const messages = batches.map(b => ({
             id: b.id,
-            sessionId: b.sessionId ?? 'unknown',
+            client: b.client ?? 'unknown',
             clock: b.vectorClock ?? {},
-            lamportTime: b.lamportTime ?? 0,
-            timestamp: b.persistedAt.getTime() / 1000,
+            lt: b.lamportTime ?? 0,
+            ts: b.persistedAt.getTime() / 1000,
             ops: (Array.isArray(b.operations) ? b.operations : []),
         }));
         // Coalesce
@@ -481,9 +291,9 @@ export class CoalescingService {
                     await tx.journalBatch.create({
                         data: {
                             documentId: docId,
-                            batchId: `coalesced-${msg.sessionId}-${Date.now()}-${i}`,
-                            lamportTime: msg.lamportTime,
-                            sessionId: msg.sessionId,
+                            batchId: `coalesced-${msg.client}-${Date.now()}-${i}`,
+                            lamportTime: msg.lt,
+                            client: msg.client,
                             vectorClock: msg.clock,
                             operations: msg.ops,
                             startTime: now,

package/dist/journal/CoalescingService.js.map

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