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

package/lib/runtime/chatSession.js

@@ -203,7 +203,16 @@ export class ChatSession {
     }
     synchronizeReading(cursor, profileId) { return this.readingOperation(() => this.reading.synchronize(cursor, profileId), false); }
     /** Explicit text-history acknowledgement; unheard audio stays unread. */
-    markRead(threadId, messages = []) { return this.readingOperation(() => this.reading.markRead(threadId, messages)); }
+    async markRead(threadId, messages) {
+        this.assertOpen();
+        const cached = messages ?? this.getSnapshot(threadId).timeline.flatMap(item => {
+            if (item.recalled || !item.message)
+                return [];
+            const candidate = this.options.readingCandidate?.(item.message);
+            return candidate ? [{ id: item.id, threadId, from: item.from, mine: item.mine, recalled: item.recalled, readPolicy: candidate.readPolicy }] : [];
+        });
+        return this.readingOperation(() => this.reading.markRead(threadId, cached));
+    }
     updateReading(transform) { return this.readingOperation(() => this.reading.update(transform)); }
     assertOpen() { if (this.withdrawn)
         throw new Error("CHAT_ACCESS_REVOKED"); if (this.closed)
@@ -252,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/createChat.d.ts

@@ -4,6 +4,7 @@ import type { ChatClient, ChatClientOptions } from "./chatClient.js";
 export type CachedChatMessage = ChatReaderSocialMessage & {
     id: string;
     timestamp: number;
+    readPolicy?: "visible" | "explicit";
 };
 export type CreateChatOptions = {
     appId: string;

package/lib/runtime/createChat.js

@@ -1,4 +1,4 @@
-import { isReadingControl } from "./readingContent.js";
+import { isReadingControl, messageRequiresPlayback, messageMentionsProfile } from "./readingContent.js";
 import { ChatSession } from "./chatSession.js";
 import { SocialReadClient } from "./socialReadClient.js";
 import { chatTeamId } from "./teamScope.js";
@@ -29,7 +29,7 @@ export function createChat(options) {
             if (!body || !["message", "quote"].includes(String(body.kind)) && !(body.kind === "contact" && ["friendRequest", "requestFriend"].includes(String(body.action))))
                 return undefined;
             return { id: message.id, threadId: message.threadId, from: message.from, mine: message.from === profileId, recalled: message.recalled, unread: message.from !== profileId,
-                readPolicy: body?.contentKind === "voice" ? "explicit" : "visible", attentionEligible: Array.isArray(body.content?.mentions) && body.content.mentions.some(mention => mention?.id === profileId) };
+                readPolicy: message.readPolicy === "explicit" || message.legacyDisplay?.kind === "voice" || messageRequiresPlayback(body) ? "explicit" : "visible", attentionEligible: messageMentionsProfile(body, profileId) };
         },
         decode: message => decodeIncoming(message, { appId, profileId, teamId }), onError,
     });

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/lib/runtime/messageTimeline.js

@@ -3,6 +3,11 @@ function content(message, appId) {
     const body = message.body;
     return body?.kind === "message" && body.content?.appId === appId ? body : undefined;
 }
+function nativeRecall(message, appId) {
+    const body = message.body;
+    return message.appId === appId && body?.kind === "recall" && typeof body.targetMessageId === "string" && body.targetMessageId.length > 0 && body.targetMessageId.length <= 256 ? body.targetMessageId : undefined;
+}
+function isControl(message, appId) { return isReadingControl(message.body, appId) || nativeRecall(message, appId) !== undefined; }
 function validReaction(value) {
     if (!value || typeof value !== "object")
         return false;
@@ -42,9 +47,9 @@ export function projectMessageTimeline(input) {
             reactions.set(key, event);
     };
     for (const { message, status } of records.values()) {
-        if (status === "failed" && isReadingControl(message.body, input.appId))
+        if (status === "failed" && isControl(message, input.appId))
             continue;
-        const envelope = message, body = content(envelope, input.appId), target = body?.content?.recall?.messageId;
+        const envelope = message, body = content(envelope, input.appId), target = nativeRecall(envelope, input.appId) ?? body?.content?.recall?.messageId;
         if (typeof target === "string" && target.length > 0 && target.length <= 256 && envelope.from) {
             if (!recalled.has(target))
                 recalled.set(target, new Set());
@@ -97,7 +102,7 @@ export function projectMessageTimeline(input) {
     const result = [];
     for (const { message, status } of records.values()) {
         const envelope = message;
-        if (isReadingControl(envelope.body, input.appId))
+        if (isControl(envelope, input.appId))
             continue;
         const mine = envelope.from === input.profileId, reading = input.reading[message.id];
         const withdrawn = Boolean(tombstones.has(message.id) || message.recalled || envelope.legacyDisplay?.recalled || envelope.from && recalled.get(message.id)?.has(envelope.from));

package/lib/runtime/readingContent.d.ts

@@ -1,2 +1,5 @@
 /** Social control envelopes do not contribute to message unread counts. */
 export declare function isReadingControl(payload: unknown, appId: string): boolean;
+/** Mirrors the server's voice policy for ordinary and quoted wire envelopes. */
+export declare function messageRequiresPlayback(body: unknown): boolean;
+export declare function messageMentionsProfile(body: unknown, profileId: string): boolean;

package/lib/runtime/readingContent.js

@@ -7,3 +7,17 @@ export function isReadingControl(payload, appId) {
         return isReadingControl(value.body, appId);
     return value.kind === "message" && value.content?.appId === appId && (value.content.reaction !== undefined || value.content.recall !== undefined);
 }
+/** Mirrors the server's voice policy for ordinary and quoted wire envelopes. */
+export function messageRequiresPlayback(body) {
+    if (!body || typeof body !== "object")
+        return false;
+    const value = body;
+    return value.contentKind === "voice" || value.content?.contentKind === "voice" || [value.content?.voice?.url, value.content?.content?.voice?.url].some(url => typeof url === "string" && url.length > 0);
+}
+export function messageMentionsProfile(body, profileId) {
+    if (!body || typeof body !== "object")
+        return false;
+    const content = body.content;
+    const mentions = content?.mentions !== undefined ? content.mentions : content?.content?.mentions;
+    return Array.isArray(mentions) && mentions.some(mention => mention?.id === profileId);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/chat-sdk",
-  "version": "0.12.0-next.32",
+  "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",