@agentunion/fastaun 0.5.26 → 0.5.28

package/dist/client/delivery.js

@@ -6,6 +6,7 @@ import { normalizeGroupAid } from '../group-id.js';
 import { ConnectionState, isJsonObject } from '../types.js';
 import { validateGroupAIDFormat } from '../validators.js';
 import { hasGroupMentionModeField, normalizeGroupMentionMode } from './mention-mode.js';
+import { applicationResult, messageClassOf } from './control-messages.js';
 const PUSHED_SEQS_LIMIT = 50_000;
 const PENDING_ORDERED_LIMIT = 50_000;
 const MESSAGE_RECALL_SEEN_LIMIT = 10_000;
@@ -311,7 +312,7 @@ export class MessageDeliveryEngine {
         const completion = new Promise((done, fail) => { resolve = done; reject = fail; });
         void completion.catch(() => { });
         const handlers = snapshot ?? this.snapshotApplicationHandlers(), batchEvent = namespace.startsWith('group_event:') ? 'group.event_batch'
-            : namespace.startsWith('group:') ? 'group.message_batch' : 'message.batch';
+            : namespace.startsWith('group:') || namespace.startsWith('message_class/') && namespace.includes('/group/') ? 'group.message_batch' : 'message.batch';
         const page = { namespace, source, context: this.ensurePeerContext(), generation: this.captureInlineAckGeneration(),
             namespaceGeneration: this.captureSeqNamespaceGeneration(namespace),
             collecting: true, batching: (handlers.get(batchEvent)?.length ?? 0) > 0, handlers, reservation,
@@ -359,6 +360,10 @@ export class MessageDeliveryEngine {
     }
     applicationNamespace(event, payload) {
         const value = payload && typeof payload === 'object' ? payload : {};
+        const messageClass = value.message_class === 'sdk_control' ? 'sdk_control' : value.delivery_class ?? value.message_class;
+        if (messageClass === 'control' || messageClass === 'sdk_control') {
+            return `message_class/${messageClass}/${event.startsWith('group.') ? 'group' : 'peer'}/${String(value.group_id ?? value.group_aid ?? value.sender_aid ?? value.from_aid ?? value.from ?? '')}`;
+        }
         if (event === 'group.changed')
             return `group_event:${String(value.group_id ?? value.group_aid ?? '')}`;
         if (event.startsWith('group.'))
@@ -368,11 +373,12 @@ export class MessageDeliveryEngine {
     }
     applicationClaimKey(event, payload, namespace, context) {
         const value = payload && typeof payload === 'object' ? payload : {};
+        const messageClass = value.message_class === 'sdk_control' ? 'sdk_control' : value.delivery_class ?? value.message_class;
         const seq = Number(event === 'group.changed' ? value.event_seq : value.seq);
         const identity = event === 'message.recalled' ? this.messageRecallDedupKey(value)
             : event === 'group.message_recalled' ? this.groupRecallDedupKey(String(value.group_id ?? ''), value)
                 : Number.isSafeInteger(seq) && seq > 0 ? seq : value.volatile_cursor ?? value.message_id;
-        return identity === undefined ? '' : JSON.stringify([context, event, event.startsWith('message.') ? 'p2p' : namespace,
+        return identity === undefined ? '' : JSON.stringify([context, event, messageClass && messageClass !== 'normal' ? namespace : event.startsWith('message.') ? 'p2p' : namespace,
             value.storage === 'volatile' ? String(value.sender_aid ?? value.from_aid ?? value.from ?? '') : '', identity]);
     }
     async waitForApplicationOwner(owner) {
@@ -2188,6 +2194,8 @@ export class MessageDeliveryEngine {
         return envelope;
     }
     attachSendResultEnvelope(method, params, result, encrypted, modeSource) {
+        if (messageClassOf(params) === 'sdk_control')
+            return applicationResult({ ...result, message_class: 'sdk_control' });
         if (!APP_SEND_ENVELOPE_METHODS.has(method) || !isJsonObject(result))
             return result;
         let out = { ...result };