@pmate/chat-sdk 0.12.0-next.43 → 0.12.0-next.45

package/lib/runtime/durableSender.d.ts

@@ -8,8 +8,13 @@ export type OutgoingMessage = {
     message: ChatRuntimeMessage;
     status: "sending" | "failed" | "sent";
     confirmed?: boolean;
+    pendingState?: 0 | 1;
     accessVersion?: number;
     voiceBlob?: Blob;
+    voiceData?: {
+        bytes: ArrayBuffer;
+        type: string;
+    };
 };
 export type SendMessageInput = {
     to: string;

package/lib/runtime/durableSender.js

@@ -39,8 +39,11 @@ export class DurableChatSender {
         this.db = new Dexie(options.name ?? "pmate-chat-outbox", { indexedDB: options.indexedDB ?? globalThis.indexedDB, IDBKeyRange: globalThis.IDBKeyRange });
         this.db.version(1).stores({ outbox: "[scope+hash],scope,[scope+threadId]" });
         this.db.version(2).stores({ scopeEpochs: "scope" });
+        this.db.version(3).stores({ outbox: "[scope+hash],scope,[scope+threadId],[scope+pendingState+hash]" });
         this.outbox = this.db.table("outbox");
         this.epochs = this.db.table("scopeEpochs");
+        this.outbox.hook("creating", (_key, row) => { row.pendingState = row.confirmed ? 0 : 1; });
+        this.outbox.hook("updating", (changes, _key, row) => ({ pendingState: (Object.hasOwn(changes, "confirmed") ? changes.confirmed : row.confirmed) ? 0 : 1 }));
         this.db.on("versionchange", () => { this.db.close({ disableAutoOpen: false }); return false; });
         this.ready = this.restore();
         void this.ready.catch(() => { });
@@ -61,6 +64,7 @@ export class DurableChatSender {
         const key = messageScopeKey(scope), db = new Dexie(options.name ?? "pmate-chat-outbox", { indexedDB: options.indexedDB ?? globalThis.indexedDB, IDBKeyRange: globalThis.IDBKeyRange });
         db.version(1).stores({ outbox: "[scope+hash],scope,[scope+threadId]" });
         db.version(2).stores({ scopeEpochs: "scope" });
+        db.version(3).stores({ outbox: "[scope+hash],scope,[scope+threadId],[scope+pendingState+hash]" });
         try {
             return await db.transaction("r", db.table("outbox"), db.table("scopeEpochs"), async () => {
                 if (((await db.table("scopeEpochs").get(key))?.version ?? 0) !== version)
@@ -90,7 +94,9 @@ export class DurableChatSender {
                 await this.epochs.put({ scope: this.scope, version });
                 await this.deleteRows();
             }
-            return { version, advanced: version > current, records: access?.allowed === false ? [] : await this.outbox.where("scope").equals(this.scope).toArray() };
+            const total = await this.outbox.where("scope").equals(this.scope).count();
+            const indexed = await this.outbox.where("[scope+pendingState+hash]").between([this.scope, 0, Dexie.minKey], [this.scope, 1, Dexie.maxKey], true, true).count();
+            return { version, advanced: version > current, legacy: total !== indexed };
         });
         this.version = loaded.version;
         if (loaded.advanced)
@@ -100,7 +106,45 @@ export class DurableChatSender {
         const current = await this.readAccess();
         if (current && (!current.allowed || current.version !== this.version))
             return;
-        loaded.records.filter(record => !record.confirmed && (record.accessVersion ?? 0) === this.version).forEach(record => this.values.set(record.hash, record));
+        if (access?.allowed === false)
+            return;
+        let after;
+        const restored = new Map();
+        while (!this.closed && !this.withdrawn) {
+            const batch = await this.db.transaction("rw", this.outbox, this.epochs, async () => {
+                if (((await this.epochs.get(this.scope))?.version ?? 0) !== this.version)
+                    throw new Error("OUTBOX_SCOPE_CHANGED");
+                const keys = await (loaded.legacy
+                    ? this.outbox.where("[scope+hash]").between([this.scope, after ?? Dexie.minKey], [this.scope, Dexie.maxKey], after === undefined, true)
+                    : this.outbox.where("[scope+pendingState+hash]").between([this.scope, 1, after ?? Dexie.minKey], [this.scope, 1, Dexie.maxKey], after === undefined, true)).limit(128).primaryKeys();
+                if (!keys.length)
+                    return { last: undefined, records: [] };
+                const last = keys.at(-1)[1];
+                // Key-only metadata covers confirmed history without reading wire bodies.
+                // Missing metadata identifies rows written by an older SDK after upgrade.
+                const confirmed = loaded.legacy ? await this.outbox.where("[scope+pendingState+hash]").between([this.scope, 0, keys[0][1]], [this.scope, 0, last], true, true).primaryKeys() : [];
+                const confirmedHashes = new Set(confirmed.map(key => key[1]));
+                const needed = keys.filter(key => !confirmedHashes.has(key[1]));
+                const rows = (await this.outbox.bulkGet(needed)).filter((row) => Boolean(row));
+                const repairs = rows.filter(row => row.pendingState !== (row.confirmed ? 0 : 1));
+                if (repairs.length)
+                    await this.outbox.bulkPut(repairs.map(row => ({ ...row, pendingState: row.confirmed ? 0 : 1 })));
+                return { last, records: rows.filter(row => !row.confirmed && (row.accessVersion ?? 0) === this.version) };
+            });
+            for (const row of batch.records)
+                restored.set(row.hash, row);
+            if (batch.last === undefined)
+                break;
+            after = batch.last;
+            // Leave the database transaction before yielding to input/rendering work.
+            await new Promise(resolve => setTimeout(resolve, 0));
+        }
+        if (this.closed || this.withdrawn)
+            return;
+        const latest = await this.readAccess();
+        if (latest && (!latest.allowed || latest.version !== this.version))
+            return;
+        this.values = restored;
         this.emit();
     }
     async checkAccess() {
@@ -205,7 +249,7 @@ export class DurableChatSender {
                 if (!(input.voiceBlob instanceof Blob) || input.voiceBlob.size === 0 || input.voiceBlob.size > 16 * 1024 * 1024 || body.kind !== "message" || !validVoice(body.content.voice))
                     throw new Error("INVALID_VOICE_ATTACHMENT");
             }
-            const record = { ...(input.voiceBlob ? { voiceBlob: input.voiceBlob } : {}), scope: this.scope, threadId, hash: message.hash, message, status: "sending", accessVersion: this.version };
+            const record = { ...(input.voiceBlob ? { voiceData: { bytes: await input.voiceBlob.arrayBuffer(), type: input.voiceBlob.type } } : {}), scope: this.scope, threadId, hash: message.hash, message, status: "sending", accessVersion: this.version };
             await this.withEpoch("rw", async () => { await this.outbox.put(record); });
             await this.checkAccess();
             this.values.set(record.hash, record);
@@ -244,7 +288,7 @@ export class DurableChatSender {
             this.emit();
         }
         try {
-            if (record.voiceBlob) {
+            if (hasVoice(record)) {
                 record = await this.prepareVoice(record);
                 if (record.confirmed || record.status === "sent")
                     return record.message;
@@ -289,18 +333,19 @@ export class DurableChatSender {
     releaseUrls() { for (const hash of this.localUrls.keys())
         this.releaseUrl(hash); }
     localView(record) {
-        if (!record.voiceBlob || typeof URL.createObjectURL !== "function")
+        if (!hasVoice(record) || typeof URL.createObjectURL !== "function")
             return record;
         let cached = this.localViews.get(record);
         if (cached)
             return cached;
+        const blob = voiceBlob(record);
         let local = this.localUrls.get(record.hash);
-        if (!local || local.blob !== record.voiceBlob) {
+        if (!local || local.blob !== blob) {
             this.releaseUrl(record.hash);
-            local = { blob: record.voiceBlob, url: URL.createObjectURL(record.voiceBlob) };
+            local = { blob, url: URL.createObjectURL(blob) };
             this.localUrls.set(record.hash, local);
         }
-        cached = { ...record, message: withVoiceUrl(record.message, local.url) };
+        cached = { ...record, voiceBlob: blob, message: withVoiceUrl(record.message, local.url) };
         this.localViews.set(record, cached);
         return cached;
     }
@@ -319,7 +364,7 @@ export class DurableChatSender {
             const latest = await this.withEpoch("r", () => this.outbox.get([this.scope, record.hash]));
             if (!latest)
                 throw new Error("OUTGOING_MESSAGE_UNAVAILABLE");
-            if (!latest.voiceBlob || latest.confirmed || latest.status === "sent")
+            if (!hasVoice(latest) || latest.confirmed || latest.status === "sent")
                 return latest;
             if (!this.options.uploadVoice)
                 throw new Error("VOICE_UPLOAD_UNAVAILABLE");
@@ -328,7 +373,7 @@ export class DurableChatSender {
             const timeout = setTimeout(() => controller.abort(), 30_000);
             let url;
             try {
-                url = await this.options.uploadVoice(latest.voiceBlob, controller.signal);
+                url = await this.options.uploadVoice(voiceBlob(latest), controller.signal);
             }
             finally {
                 clearTimeout(timeout);
@@ -340,10 +385,10 @@ export class DurableChatSender {
             await this.checkAccess();
             if (this.closing)
                 throw new Error("CHAT_SENDER_CLOSED");
-            const { voiceBlob: _blob, ...uploaded } = latest;
+            const { voiceBlob: _blob, voiceData: _data, ...uploaded } = latest;
             const committed = await this.withEpoch("rw", async () => {
                 const current = await this.outbox.get([this.scope, record.hash]);
-                if (!current || current.confirmed || current.status === "sent" || !current.voiceBlob)
+                if (!current || current.confirmed || current.status === "sent" || !hasVoice(current))
                     return current;
                 const next = { ...uploaded, message: withVoiceUrl(latest.message, url) };
                 await this.outbox.put(next);
@@ -366,7 +411,7 @@ export class DurableChatSender {
             if (!previous || previous.confirmed || previous.status === "sent")
                 return previous;
             // A second document may already have durably replaced the Blob with its URL.
-            if (record.voiceBlob && !previous.voiceBlob)
+            if (hasVoice(record) && !hasVoice(previous))
                 return previous;
             await this.outbox.put(record);
             return record;
@@ -381,7 +426,7 @@ export class DurableChatSender {
         await this.ready;
         await this.withEpoch("rw", async () => {
             const previous = await this.outbox.bulkGet(hashes.map(hash => [this.scope, hash]));
-            const confirmed = previous.filter((record) => Boolean(record && !record.confirmed)).map(record => ({ ...record, voiceBlob: undefined, status: "sent", confirmed: true }));
+            const confirmed = previous.filter((record) => Boolean(record && !record.confirmed)).map(record => ({ ...record, voiceBlob: undefined, voiceData: undefined, status: "sent", confirmed: true }));
             if (confirmed.length)
                 await this.outbox.bulkPut(confirmed);
         });
@@ -435,3 +480,5 @@ function withVoiceUrl(message, url) {
     const body = message.body;
     return { ...message, body: { ...body, content: { ...body.content, voice: { ...body.content.voice, url } } } };
 }
+function hasVoice(record) { return Boolean(record.voiceBlob || record.voiceData); }
+function voiceBlob(record) { return record.voiceBlob ?? new Blob([record.voiceData.bytes], { type: record.voiceData.type }); }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/chat-sdk",
-  "version": "0.12.0-next.43",
+  "version": "0.12.0-next.45",
   "description": "Cross-platform PMate chat input components, voice input primitives, and ASR helpers",
   "type": "module",
   "main": "./lib/index.js",