@agentunion/fastaun-browser 0.4.12 → 0.5.0

package/dist/client/delivery.d.ts

@@ -6,6 +6,8 @@ export declare class MessageDeliveryEngine {
     constructor(runtime: ClientRuntime);
     prunePushedSeqs(ns: string): void;
     markPublishedSeq(ns: string, seq: number): void;
+    fireGroupEventAck(groupId: string, ns: string, eventSeq: number, label: string): void;
+    fireGroupV2Ack(groupId: string, ns: string, seq: number, label: string): void;
     enqueueOrderedMessage(ns: string, event: string, seq: number, payload: EventPayload): void;
     isGroupEventNamespace(ns: string): boolean;
     publishOrderedQueueItem(ns: string, event: string, seq: number, payload: EventPayload): Promise<void>;
@@ -13,10 +15,13 @@ export declare class MessageDeliveryEngine {
     isInstanceScopedMessageEvent(event: string): boolean;
     attachCurrentInstanceContext(payload: EventPayload): EventPayload;
     normalizePublishedMessagePayload(event: string, payload: EventPayload): EventPayload;
+    private envelopeMetadata;
     appMessageEnvelope(payload: EventPayload): JsonObject;
     isGroupScopedEvent(event: string): boolean;
     appGroupEventEnvelope(payload: EventPayload): JsonObject;
     attachAppMessageEnvelope(payload: EventPayload): EventPayload;
+    sendResultEnvelope(method: string, params: RpcParams, result: unknown, encrypted: boolean): JsonObject;
+    attachSendResultEnvelope(method: string, params: RpcParams, result: unknown, encrypted: boolean): unknown;
     attachAppGroupEventEnvelope(payload: EventPayload): EventPayload;
     stripInternalSenderDeviceFields(payload: EventPayload): EventPayload;
     recallEventFromMessage(message: EventPayload): JsonObject | null;

package/dist/client/delivery.d.ts.map

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

package/dist/client/delivery.js

@@ -5,11 +5,17 @@ const PUSHED_SEQS_LIMIT = 50_000;
 const PENDING_ORDERED_LIMIT = 50_000;
 const GROUP_RECALL_SEEN_LIMIT = 10_000;
 const APP_MESSAGE_ENVELOPE_KEYS = [
-    'module_id', 'message_id', 'id', 'seq', 'msg_seq', 'message_type', 'type', 'kind', 'version',
+    'module_id', 'message_type', 'type', 'kind', 'version',
     'from', 'from_aid', 'sender_aid', 'to', 'to_aid', 'group_id',
-    'timestamp', 'created_at', 't_server', 'encrypted', 'status', 'delivery_mode',
-    'dispatch_mode', 'dispatch', 'device_id', 'slot_id',
+    'timestamp', 'created_at', 'encrypted',
+    'context', 'protected_headers', 'headers', 'payload_type',
 ];
+const APP_SEND_ENVELOPE_METHODS = new Set([
+    'message.send',
+    'group.send',
+    'message.thought.put',
+    'group.thought.put',
+]);
 const APP_GROUP_EVENT_ENVELOPE_KEYS = [
     'module_id', 'event_id', 'event_seq', 'seq', 'event_type', 'action', 'group_id',
     'actor_aid', 'sender_aid', 'member_aid', 'target_aid', 'operator_aid',
@@ -46,6 +52,34 @@ export class MessageDeliveryEngine {
             client._pushedSeqs.set(ns, new Set(keep));
         }
     }
+    fireGroupEventAck(groupId, ns, eventSeq, label) {
+        const client = this.runtime.client;
+        const ackSeq = this.clampAckSeq('group.ack_events', 'event_seq', ns, eventSeq);
+        if (ackSeq <= 0)
+            return;
+        void client.call('group.ack_events', {
+            group_id: groupId,
+            event_seq: ackSeq,
+            device_id: client._deviceId,
+            slot_id: client._slotId,
+            _rpc_background: true,
+        }).catch((e) => {
+            client._clientLog.warn(`${label} failed: group=${groupId}`, e);
+        });
+    }
+    fireGroupV2Ack(groupId, ns, seq, label) {
+        const client = this.runtime.client;
+        const ackSeq = this.clampAckSeq('group.v2.ack', 'up_to_seq', ns, seq);
+        if (ackSeq <= 0)
+            return;
+        void client._callRawV2Rpc('group.v2.ack', {
+            group_id: groupId,
+            up_to_seq: ackSeq,
+            _rpc_background: true,
+        }).catch((e) => {
+            client._clientLog.debug(`${label} failed: group=${groupId} seq=${ackSeq} err=${String(e)}`);
+        });
+    }
     enqueueOrderedMessage(ns, event, seq, payload) {
         const client = this.runtime.client;
         let queue = client._pendingOrderedMsgs.get(ns);
@@ -114,15 +148,62 @@ export class MessageDeliveryEngine {
         }
         return payload;
     }
+    envelopeMetadata(value) {
+        let source = value;
+        if (source && typeof source === 'object') {
+            const maybeHeaders = source;
+            if (typeof maybeHeaders.toObject === 'function')
+                source = maybeHeaders.toObject();
+        }
+        if (!isJsonObject(source))
+            return undefined;
+        const out = {};
+        for (const [key, item] of Object.entries(source)) {
+            if (key === '_auth')
+                continue;
+            out[key] = item;
+        }
+        return Object.keys(out).length > 0 ? out : undefined;
+    }
     appMessageEnvelope(payload) {
         if (!isJsonObject(payload))
             return {};
         const message = payload;
+        const body = isJsonObject(message.payload) ? message.payload : {};
         const envelope = {};
-        for (const key of APP_MESSAGE_ENVELOPE_KEYS) {
-            if (Object.prototype.hasOwnProperty.call(message, key))
-                envelope[key] = message[key];
-        }
+        const firstValue = (...values) => {
+            for (const value of values) {
+                if (value === undefined || value === null)
+                    continue;
+                if (typeof value === 'string' && !value.trim())
+                    continue;
+                return value;
+            }
+            return undefined;
+        };
+        const setIfPresent = (key, value) => {
+            if (value === undefined || value === null)
+                return;
+            if (typeof value === 'string' && !value.trim())
+                return;
+            envelope[key] = value;
+        };
+        setIfPresent('from', firstValue(message.from, message.from_aid, message.sender_aid));
+        setIfPresent('to', firstValue(message.to, message.to_aid));
+        setIfPresent('group_id', message.group_id);
+        setIfPresent('type', firstValue(body.type, message.type, message.message_type, message.payload_type));
+        setIfPresent('kind', firstValue(body.kind, message.kind));
+        setIfPresent('version', firstValue(body.version, message.version));
+        setIfPresent('timestamp', firstValue(message.timestamp, message.created_at, message.t_server));
+        if ('encrypted' in message)
+            envelope.encrypted = Boolean(message.encrypted);
+        const context = this.envelopeMetadata(message.context);
+        if (context)
+            envelope.context = context;
+        const protectedHeaders = this.envelopeMetadata(message.protected_headers) ?? this.envelopeMetadata(message.headers);
+        if (protectedHeaders)
+            envelope.protected_headers = protectedHeaders;
+        setIfPresent('payload_type', firstValue(message.payload_type, protectedHeaders?.payload_type));
         return envelope;
     }
     isGroupScopedEvent(event) {
@@ -147,6 +228,63 @@ export class MessageDeliveryEngine {
         result.envelope = this.appMessageEnvelope(result);
         return result;
     }
+    sendResultEnvelope(method, params, result, encrypted) {
+        if (!APP_SEND_ENVELOPE_METHODS.has(method))
+            return {};
+        const body = isJsonObject(params.payload) ? params.payload : {};
+        const resultObj = isJsonObject(result) ? result : {};
+        const envelope = {};
+        const firstValue = (...values) => {
+            for (const value of values) {
+                if (value === undefined || value === null)
+                    continue;
+                if (typeof value === 'string' && !value.trim())
+                    continue;
+                return value;
+            }
+            return undefined;
+        };
+        const setIfPresent = (key, value) => {
+            if (value === undefined || value === null)
+                return;
+            if (typeof value === 'string' && !value.trim())
+                return;
+            envelope[key] = value;
+        };
+        setIfPresent('from', this.runtime.client._aid);
+        if (method.startsWith('message.')) {
+            setIfPresent('to', params.to);
+        }
+        else {
+            setIfPresent('group_id', params.group_id);
+        }
+        setIfPresent('type', firstValue(body.type, params.type, params.message_type, params.payload_type));
+        setIfPresent('kind', firstValue(body.kind, params.kind));
+        setIfPresent('version', firstValue(body.version, params.version));
+        setIfPresent('timestamp', firstValue(params.timestamp, resultObj.timestamp, resultObj.created_at, resultObj.t_server, Date.now()));
+        envelope.encrypted = Boolean(encrypted);
+        const context = this.envelopeMetadata(params.context);
+        if (context)
+            envelope.context = context;
+        const protectedHeaders = this.envelopeMetadata(params.protected_headers) ?? this.envelopeMetadata(params.headers);
+        if (protectedHeaders)
+            envelope.protected_headers = protectedHeaders;
+        setIfPresent('payload_type', firstValue(params.payload_type, protectedHeaders?.payload_type, body.type));
+        return envelope;
+    }
+    attachSendResultEnvelope(method, params, result, encrypted) {
+        if (!APP_SEND_ENVELOPE_METHODS.has(method) || !isJsonObject(result))
+            return result;
+        const out = { ...result };
+        out.envelope = this.sendResultEnvelope(method, params, out, encrypted);
+        if ('payload' in params) {
+            out.payload = params.payload;
+        }
+        else if ('content' in params) {
+            out.payload = params.content;
+        }
+        return out;
+    }
     attachAppGroupEventEnvelope(payload) {
         if (!isJsonObject(payload))
             return payload;
@@ -368,6 +506,7 @@ export class MessageDeliveryEngine {
                 msg_seq: ackSeq,
                 device_id: client._deviceId,
                 slot_id: client._slotId,
+                _rpc_background: true,
             }).catch((e) => { client._clientLog.warn('group recall auto-ack failed: group=' + groupId, e); });
         }
         if (contig !== contigBefore)
@@ -454,6 +593,7 @@ export class MessageDeliveryEngine {
                         seq: ackSeq,
                         device_id: client._deviceId,
                         slot_id: client._slotId,
+                        _rpc_background: true,
                     }).catch((e) => { client._clientLog.warn(`P2P auto-ack failed:${String(e)}`); });
                 }
                 if (contigAfter !== contigBefore)
@@ -531,6 +671,7 @@ export class MessageDeliveryEngine {
                             msg_seq: ackSeq,
                             device_id: client._deviceId,
                             slot_id: client._slotId,
+                            _rpc_background: true,
                         }).catch((e) => { client._clientLog.warn('group recall auto-ack failed: group=' + groupId, e); });
                     }
                     if (contigAfter !== contigBefore)
@@ -553,6 +694,7 @@ export class MessageDeliveryEngine {
                         msg_seq: ackSeq,
                         device_id: client._deviceId,
                         slot_id: client._slotId,
+                        _rpc_background: true,
                     }).catch((e) => { client._clientLog.warn('group message auto-ack failed: group=' + groupId, e); });
                 }
                 if (contigAfter !== contigBefore)
@@ -596,7 +738,7 @@ export class MessageDeliveryEngine {
         const afterSeq = client._seqTracker.getContiguousSeq(ns);
         try {
             if (client._v2Session) {
-                await client._pullGroupV2Internal({ group_id: groupId, after_seq: afterSeq, limit: 50 });
+                await client._withBackgroundRpc(() => client._pullGroupV2Internal({ group_id: groupId, after_seq: afterSeq, limit: 50 }));
                 return;
             }
             const result = await client.call('group.pull', {
@@ -604,6 +746,7 @@ export class MessageDeliveryEngine {
                 after_message_seq: afterSeq,
                 device_id: client._deviceId,
                 limit: 50,
+                _rpc_background: true,
             });
             if (isJsonObject(result)) {
                 const messages = result.messages;
@@ -657,7 +800,7 @@ export class MessageDeliveryEngine {
         this.runtime.delivery.setGapFillActive(true);
         let filled = 0;
         try {
-            const messages = await client._pullV2(afterSeq, 50);
+            const messages = await client._withBackgroundRpc(() => client._pullV2(afterSeq, 50));
             filled = messages.length;
             this.prunePushedSeqs(ns);
         }
@@ -688,7 +831,7 @@ export class MessageDeliveryEngine {
         this.runtime.delivery.setGapFillActive(true);
         let filled = 0;
         try {
-            const messages = await client._pullGroupV2(groupId, afterSeq, 50);
+            const messages = await client._withBackgroundRpc(() => client._pullGroupV2(groupId, afterSeq, 50));
             filled = messages.length;
             this.prunePushedSeqs(ns);
         }
@@ -725,6 +868,7 @@ export class MessageDeliveryEngine {
                     after_event_seq: nextAfterSeq,
                     device_id: client._deviceId,
                     limit: 50,
+                    _rpc_background: true,
                 });
                 if (!isJsonObject(result))
                     return;
@@ -783,6 +927,7 @@ export class MessageDeliveryEngine {
                         event_seq: ackSeq,
                         device_id: client._deviceId,
                         slot_id: client._slotId,
+                        _rpc_background: true,
                     }).catch((e) => { client._clientLog.warn('group event auto-ack failed: group=' + groupId, e); });
                 }
                 const nextAfter = Math.max(eventSeqs.length > 0 ? Math.max(...eventSeqs) : nextAfterSeq, nextAfterSeq);
@@ -821,8 +966,15 @@ export class MessageDeliveryEngine {
             }
         }
         const contigBefore = client._seqTracker.getContiguousSeq(ns);
-        if (eventSeq <= contigBefore || client._pushedSeqs.get(ns)?.has(eventSeq)) {
+        const publishedDuplicate = client._pushedSeqs.get(ns)?.has(eventSeq) === true;
+        if (eventSeq <= contigBefore || publishedDuplicate) {
             client._clientLog.debug(`group.changed skipped duplicate/stale: group=${groupId}, event_seq=${eventSeq}, contiguous=${contigBefore}`);
+            if (eventSeq <= contigBefore) {
+                this.fireGroupEventAck(groupId, ns, eventSeq, 'group event covered push ack');
+            }
+            else if (contigBefore > 0) {
+                this.fireGroupEventAck(groupId, ns, contigBefore, 'group event covered push ack');
+            }
             return;
         }
         this.enqueueOrderedMessage(ns, 'group.changed', eventSeq, data);
@@ -838,6 +990,7 @@ export class MessageDeliveryEngine {
                 event_seq: ackSeq,
                 device_id: client._deviceId,
                 slot_id: client._slotId,
+                _rpc_background: true,
             }).catch((e) => {
                 client._clientLog.warn('group event push auto-ack failed: group=' + groupId, e);
             });
@@ -938,8 +1091,9 @@ export class MessageDeliveryEngine {
             const ns = `group:${groupId}`;
             client._seqTracker.updateMaxSeen(ns, seq);
             const contigBefore = client._seqTracker.getContiguousSeq(ns);
-            if (contigBefore === seq) {
+            if (contigBefore === seq || (eventKind === 'group.online_unread_hint' && contigBefore > seq)) {
                 client._clientLog.debug(`_onRawGroupV2MessageCreated duplicate push already covered: group=${groupId} seq=${seq}`);
+                this.fireGroupV2Ack(groupId, ns, seq, 'group v2 covered push ack');
                 return;
             }
             const afterSeq = client._repairPushContiguousBound(ns, seq, false, '_raw.group.v2.message_created');
@@ -951,7 +1105,7 @@ export class MessageDeliveryEngine {
             client._gapFillDone.add(dedupKey);
             try {
                 client._clientLog.debug(`_onRawGroupV2MessageCreated -> group.v2.pull group=${groupId} after_seq=${afterSeq}`);
-                const messages = await client._pullGroupV2(groupId, afterSeq, 50);
+                const messages = await client._withBackgroundRpc(() => client._pullGroupV2(groupId, afterSeq, 50));
                 client._clientLog.debug(`_onRawGroupV2MessageCreated pulled ${messages.length} msgs for group=${groupId}`);
             }
             finally {
@@ -998,7 +1152,7 @@ export class MessageDeliveryEngine {
                     if (newContig > 0 && newContig !== contigBefore) {
                         const ackSeq = this.clampAckSeq('message.v2.ack', 'up_to_seq', ns, newContig);
                         try {
-                            await client._callRawV2Rpc('message.v2.ack', { up_to_seq: ackSeq });
+                            await client._callRawV2Rpc('message.v2.ack', { up_to_seq: ackSeq, _rpc_background: true });
                         }
                         catch (e) {
                             client._clientLog.debug(`V2 P2P push-ack failed: ${e}`);
@@ -1028,7 +1182,7 @@ export class MessageDeliveryEngine {
         try {
             do {
                 this.runtime.delivery.setV2PullPending(false);
-                await client._pullV2();
+                await client._withBackgroundRpc(() => client._pullV2());
                 const newContig = ns ? client._seqTracker.getContiguousSeq(ns) : -1;
                 client._clientLog.debug(`_onV2PushNotification pull done: contiguous_seq=${contigBefore}->${newContig} (push_seq=${pushSeq || 'null'})`);
             } while (client._v2PullPending);