@pmate/chat-sdk 0.12.0-next.33 → 0.12.0-next.34

package/lib/runtime/chatSession.js

@@ -261,7 +261,8 @@ export class ChatSession {
                 return { ...recent, messages: [], hasEarlier: false };
             if (!edge.before)
                 throw new Error("MESSAGE_SYNC_NO_PROGRESS");
-            const page = await this.getMessages(threadId, { before: edge.before });
+            const page = await this.messages.earlier(threadId, edge.before, 100, true);
+            await this.sender.confirm(page.messages.map(message => message.id));
             this.assertOpen();
             this.rememberHistoryEdge(threadId, page);
             return page;

package/lib/runtime/messageClient.d.ts

@@ -36,6 +36,7 @@ export declare class MessageClient<T extends StoredMessage> {
     private options;
     private storage;
     private watches;
+    private windowEdges;
     private accessListeners;
     private allListeners;
     private reads;
@@ -93,7 +94,7 @@ export declare class MessageClient<T extends StoredMessage> {
     earlier(thread: string, before: {
         timestamp: number;
         id: string;
-    }, limit?: number): Promise<MessageSnapshot<T>>;
+    }, limit?: number, expand?: boolean): Promise<MessageSnapshot<T>>;
     private fillWindow;
     private denyView;
     private denyScope;

package/lib/runtime/messageClient.js

@@ -6,6 +6,7 @@ export class MessageClient {
     options;
     storage;
     watches = new Map();
+    windowEdges = new Map();
     accessListeners = new Set();
     allListeners = new Set();
     reads = new Map();
@@ -252,7 +253,27 @@ export class MessageClient {
     async reload(thread, fallback = false) {
         await this.ensureScope();
         const limit = 100;
-        const page = await (fallback ? this.storage.readFallback(thread, limit) : this.storage.read(thread, limit));
+        let page = await (fallback ? this.storage.readFallback(thread, limit) : this.storage.read(thread, limit));
+        const edge = this.windowEdges.get(thread);
+        if (edge && edge.version !== (page.coverage?.resetVersion ?? 0))
+            this.windowEdges.delete(thread);
+        if (edge && edge.version === (page.coverage?.resetVersion ?? 0)) {
+            const pages = [page.messages];
+            const beforeEdge = (message) => message.timestamp < edge.timestamp || message.timestamp === edge.timestamp && message.id < edge.id;
+            let oldest = page.messages[0];
+            while (oldest && !beforeEdge(oldest) && (oldest.timestamp !== edge.timestamp || oldest.id !== edge.id) && page.hasEarlier) {
+                const next = await (fallback ? this.storage.readFallback(thread, limit, { timestamp: oldest.timestamp, id: oldest.id }) : this.storage.read(thread, limit, { timestamp: oldest.timestamp, id: oldest.id }));
+                if ((next.coverage?.resetVersion ?? 0) !== edge.version || (next.coverage?.scopeVersion ?? 0) !== (page.coverage?.scopeVersion ?? 0)) {
+                    this.windowEdges.delete(thread);
+                    return this.reload(thread, fallback);
+                }
+                pages.push(next.messages);
+                page = next;
+                oldest = next.messages[0];
+            }
+            const messages = pages.reverse().flat();
+            page = { ...page, messages: messages.filter(message => !beforeEdge(message)), hasEarlier: page.hasEarlier || messages.some(beforeEdge) };
+        }
         if (this.closed)
             throw new Error("MESSAGE_CLIENT_CLOSED");
         if ((page.coverage?.scopeVersion ?? 0) !== this.scopeVersion) {
@@ -464,7 +485,7 @@ export class MessageClient {
         this.syncing.set(thread, task);
         return task;
     }
-    async earlier(thread, before, limit = 100) {
+    async earlier(thread, before, limit = 100, expand = false) {
         await this.ensureScope();
         if (this.scopeDenied)
             throw new Error("MESSAGE_ACCESS_REVOKED");
@@ -478,7 +499,14 @@ export class MessageClient {
                     throw new Error("MESSAGE_OFFLINE_UNAVAILABLE");
                 await this.synchronize(thread);
             }
-            return await this.fillWindow(thread, limit, before);
+            const page = await this.fillWindow(thread, limit, before);
+            if (expand && page.complete && page.messages.length) {
+                const first = page.messages[0], old = this.windowEdges.get(thread);
+                if (!old || old.version !== page.resetVersion || first.timestamp < old.timestamp || first.timestamp === old.timestamp && first.id < old.id)
+                    this.windowEdges.set(thread, { timestamp: first.timestamp, id: first.id, version: page.resetVersion });
+                await this.reload(thread);
+            }
+            return page;
         }
         catch (error) {
             if (String(error).includes("MESSAGE_SCOPE_CHANGED")) {
@@ -538,6 +566,7 @@ export class MessageClient {
         return { messages: page.messages, hasEarlier: page.hasEarlier || Boolean(page.coverage?.nextBefore), resetVersion: page.coverage?.resetVersion ?? 0, complete: page.coverage?.complete ?? false };
     }
     denyView(thread, version) {
+        this.windowEdges.delete(thread);
         this.revoked.add(thread);
         const watch = this.watches.get(thread);
         const snapshot = { messages: [], hasEarlier: false, complete: false, resetVersion: Math.max(watch?.snapshot.resetVersion ?? 0, version ?? (watch?.snapshot.resetVersion ?? 0) + 1) };
@@ -619,6 +648,7 @@ export class MessageClient {
             this.abort.abort();
             this.channel?.close();
             this.watches.clear();
+            this.windowEdges.clear();
             this.allListeners.clear();
             this.accessListeners.clear();
             this.storage.close();

package/package.json

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