@agentunion/fastaun-browser 0.4.10 → 0.4.11

package/dist/bundle.js

@@ -454,7 +454,7 @@ var init_indexeddb_store = __esm({
 });
 
 // src/version.ts
-var VERSION = "0.4.10";
+var VERSION = "0.4.11";
 
 // src/types.ts
 var ConnectionState = /* @__PURE__ */ ((ConnectionState2) => {
@@ -3753,6 +3753,29 @@ var MessageDeliveryEngine = class {
       for (const oldSeq of drop) queue.delete(oldSeq);
     }
   }
+  isGroupEventNamespace(ns) {
+    return ns.startsWith("group_event:");
+  }
+  async publishOrderedQueueItem(ns, event, seq, payload) {
+    const client = this.runtime.client;
+    if (event === "group.changed" && this.isGroupEventNamespace(ns)) {
+      await this.publishOrderedGroupChanged(payload);
+      return;
+    }
+    await client._publishAppEvent(event, payload);
+  }
+  async publishOrderedGroupChanged(payload) {
+    const client = this.runtime.client;
+    if (isJsonObject(payload)) {
+      const eventPayload = payload;
+      client._groupState?.handleGroupChangedV2Membership?.(eventPayload);
+      if (eventPayload.action === "dissolved") {
+        const groupId = normalizeGroupId(String(eventPayload.group_id ?? "")) || String(eventPayload.group_id ?? "").trim();
+        if (groupId) client._cleanupDissolvedGroup?.(groupId);
+      }
+    }
+    await client._publishAppEvent("group.changed", payload);
+  }
   isInstanceScopedMessageEvent(event) {
     return event === "message.received" || event === "message.recalled" || event === "message.undecryptable" || event === "group.message_created" || event === "group.message_recalled" || event === "group.message_undecryptable";
   }
@@ -4273,10 +4296,12 @@ var MessageDeliveryEngine = class {
           }
         }
         const eventSeqs = [];
+        let hasDissolvedEvent = false;
         for (const evt of eventObjects) {
           const eventSeq = Number(evt.event_seq ?? 0);
           if (Number.isFinite(eventSeq) && eventSeq > 0) eventSeqs.push(eventSeq);
           evt._from_gap_fill = true;
+          if (evt.action === "dissolved") hasDissolvedEvent = true;
           const et = String(evt.event_type ?? "");
           if (et === "group.message_created") continue;
           const cs = evt.client_signature;
@@ -4284,17 +4309,21 @@ var MessageDeliveryEngine = class {
             if (client._shouldSkipEventSignature(evt)) {
               delete evt.client_signature;
             } else {
-              evt._verified = await client._verifyEventSignature(evt, cs);
+              const verified = await client._verifyEventSignature(evt, cs);
+              evt._verified = client._isEventSignatureVerified(verified);
             }
           }
-          await client._dispatcher.publish("group.changed", evt);
+          if (Number.isFinite(eventSeq) && eventSeq > 0 && !client._pushedSeqs.get(ns)?.has(eventSeq)) {
+            this.enqueueOrderedMessage(ns, "group.changed", eventSeq, evt);
+          }
         }
-        const contig = client._seqTracker.getContiguousSeq(ns);
-        if (contig !== pageContigBefore) {
+        const ackContig = client._seqTracker.getContiguousSeq(ns);
+        await this.drainOrderedMessages(ns);
+        if (ackContig !== pageContigBefore && !hasDissolvedEvent) {
           this.saveSeqTrackerState();
         }
-        if (eventObjects.length > 0 && contig > 0 && contig !== pageContigBefore) {
-          const ackSeq = this.clampAckSeq("group.ack_events", "event_seq", ns, contig);
+        if (eventObjects.length > 0 && ackContig > 0 && ackContig !== pageContigBefore) {
+          const ackSeq = this.clampAckSeq("group.ack_events", "event_seq", ns, ackContig);
           client._transport.call("group.ack_events", {
             group_id: groupId,
             event_seq: ackSeq,
@@ -4318,15 +4347,36 @@ var MessageDeliveryEngine = class {
       this.runtime.delivery.setGapFillActive(false);
     }
   }
-  handleGroupChangedEventSeq(data, groupId) {
+  async handleGroupChangedEventSeq(data, groupId) {
     const client = this.runtime.client;
     let needPull = false;
     const rawEventSeq = data.event_seq;
-    if (rawEventSeq != null && groupId) {
-      const es = Number(rawEventSeq);
-      if (Number.isFinite(es) && es > 0) {
-        needPull = client._seqTracker.onMessageSeq(`group_event:${groupId}`, es);
-      }
+    const eventSeq = Number(rawEventSeq);
+    if (!groupId || !Number.isFinite(eventSeq) || !Number.isInteger(eventSeq) || eventSeq <= 0) {
+      await this.publishOrderedGroupChanged(data);
+      return;
+    }
+    const ns = `group_event:${groupId}`;
+    const contigBefore = client._seqTracker.getContiguousSeq(ns);
+    if (eventSeq <= contigBefore || client._pushedSeqs.get(ns)?.has(eventSeq)) {
+      client._clientLog.debug(`group.changed skipped duplicate/stale: group=${groupId}, event_seq=${eventSeq}, contiguous=${contigBefore}`);
+      return;
+    }
+    this.enqueueOrderedMessage(ns, "group.changed", eventSeq, data);
+    needPull = client._seqTracker.onMessageSeq(ns, eventSeq);
+    const ackContig = client._seqTracker.getContiguousSeq(ns);
+    await this.drainOrderedMessages(ns);
+    if (ackContig > 0 && ackContig !== contigBefore) {
+      if (data.action !== "dissolved") this.saveSeqTrackerState();
+      const ackSeq = this.clampAckSeq("group.ack_events", "event_seq", ns, ackContig);
+      client._transport.call("group.ack_events", {
+        group_id: groupId,
+        event_seq: ackSeq,
+        device_id: client._deviceId,
+        slot_id: client._slotId
+      }).catch((e) => {
+        client._clientLog.warn("group event push auto-ack failed: group=" + groupId, e);
+      });
     }
     if (needPull && groupId && !data._from_gap_fill) {
       client._safeAsync(this.fillGroupEventGap(groupId));
@@ -4750,7 +4800,7 @@ var MessageDeliveryEngine = class {
       const item = queue.get(seq);
       queue.delete(seq);
       if (!item || client._pushedSeqs.get(ns)?.has(seq)) continue;
-      await client._publishAppEvent(item.event, item.payload);
+      await this.publishOrderedQueueItem(ns, item.event, seq, item.payload);
       this.markPublishedSeq(ns, seq);
     }
     if (queue.size === 0) client._pendingOrderedMsgs.delete(ns);
@@ -4759,7 +4809,7 @@ var MessageDeliveryEngine = class {
     const client = this.runtime.client;
     const seqNum = Number(seq);
     if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0) {
-      await client._publishAppEvent(event, payload);
+      await this.publishOrderedQueueItem(ns, event, seqNum, payload);
       return true;
     }
     if (client._pushedSeqs.get(ns)?.has(seqNum)) {
@@ -4778,7 +4828,7 @@ var MessageDeliveryEngine = class {
     const queue = client._pendingOrderedMsgs.get(ns);
     queue?.delete(seqNum);
     if (queue && queue.size === 0) client._pendingOrderedMsgs.delete(ns);
-    await client._publishAppEvent(event, payload);
+    await this.publishOrderedQueueItem(ns, event, seqNum, payload);
     this.markPublishedSeq(ns, seqNum);
     await this.drainOrderedMessages(ns);
     return true;
@@ -5173,12 +5223,37 @@ var SIGNED_METHODS = /* @__PURE__ */ new Set([
   "message.thought.put",
   "group.set_settings",
   "group.resources.put",
+  "group.resources.create_folder",
+  "group.resources.rename",
+  "group.resources.move",
+  "group.resources.mount_object",
   "group.resources.update",
   "group.resources.delete",
+  "group.resources.cleanup_by_storage_ref",
   "group.resources.request_add",
+  "group.resources.request_mount_object",
   "group.resources.direct_add",
   "group.resources.approve_request",
   "group.resources.reject_request",
+  "group.resources.unmount",
+  "group.resources.get_access",
+  "group.resources.resolve_access_ticket",
+  "storage.put_object",
+  "storage.delete_object",
+  "storage.get_by_share",
+  "storage.create_share_link",
+  "storage.revoke_share_link",
+  "storage.create_upload_session",
+  "storage.complete_upload",
+  "storage.create_folder",
+  "storage.rename_folder",
+  "storage.move_folder",
+  "storage.delete_folder",
+  "storage.move_object",
+  "storage.copy_object",
+  "storage.batch_delete",
+  "storage.set_object_meta",
+  "storage.append_object",
   "group.commit_state",
   "group.ban",
   "group.unban",
@@ -5201,15 +5276,44 @@ var NON_IDEMPOTENT_METHODS = /* @__PURE__ */ new Set([
   "group.update_avatar",
   "group.update_announcement",
   "group.update_settings",
+  "storage.put_object",
+  "storage.delete_object",
+  "storage.create_share_link",
+  "storage.revoke_share_link",
+  "storage.get_by_share",
   "storage.create_upload_session",
   "storage.complete_upload",
-  "storage.delete_object",
+  "storage.create_folder",
+  "storage.rename_folder",
+  "storage.move_folder",
+  "storage.delete_folder",
+  "storage.move_object",
+  "storage.copy_object",
+  "storage.batch_delete",
+  "storage.set_object_meta",
+  "storage.append_object",
   "auth.create_aid",
   "auth.renew_cert",
   "auth.rekey",
   "message.thought.put",
   "group.thought.put",
-  "group.add_member"
+  "group.add_member",
+  "group.resources.put",
+  "group.resources.create_folder",
+  "group.resources.rename",
+  "group.resources.move",
+  "group.resources.mount_object",
+  "group.resources.update",
+  "group.resources.delete",
+  "group.resources.cleanup_by_storage_ref",
+  "group.resources.request_add",
+  "group.resources.request_mount_object",
+  "group.resources.direct_add",
+  "group.resources.approve_request",
+  "group.resources.reject_request",
+  "group.resources.unmount",
+  "group.resources.get_access",
+  "group.resources.resolve_access_ticket"
 ]);
 var RpcPipeline = class {
   constructor(runtime) {
@@ -8670,7 +8774,7 @@ function normalizeProtectedHeaders(headers, payload) {
     normalized["payload_type"] = payloadType;
   }
   normalized.sdk_lang = E2EE_SDK_LANG;
-  delete normalized.sdk_vesion;
+  delete normalized.sdk_version;
   normalized.sdk_version = VERSION;
   return normalized;
 }
@@ -9484,19 +9588,18 @@ var V2KeyStore = class _V2KeyStore {
       public_key: pubDer,
       created_at: Date.now()
     };
-    await new Promise((resolve, reject) => {
-      const req = this.store("readwrite").put(record);
-      req.onsuccess = () => resolve();
-      req.onerror = () => reject(req.error);
-    });
+    const aliasKeyId = await spkIdForPubDer(pubDer);
     const alias = {
       ...record,
-      key_id: await spkIdForPubDer(pubDer)
+      key_id: aliasKeyId
     };
     return new Promise((resolve, reject) => {
-      const req = this.store("readwrite").put(alias);
-      req.onsuccess = () => resolve();
-      req.onerror = () => reject(req.error);
+      const tx = this.db.transaction(V2_STORE_NAME, "readwrite");
+      const store = tx.objectStore(V2_STORE_NAME);
+      store.put(record);
+      store.put(alias);
+      tx.oncomplete = () => resolve();
+      tx.onerror = () => reject(tx.error);
     });
   }
   async loadIK(deviceId) {
@@ -9584,6 +9687,7 @@ var V2Session = class {
     __publicField(this, "_oldSPKMaxSeq", /* @__PURE__ */ new Map());
     __publicField(this, "_spkCache", /* @__PURE__ */ new Map());
     __publicField(this, "_nowFn", () => Date.now());
+    __publicField(this, "_registeringPromise", null);
     if (!ikPriv || !ikPubDer) {
       throw new Error("V2Session requires AID priv/pub keys (IK = AID identity)");
     }
@@ -9664,9 +9768,21 @@ var V2Session = class {
       spk_timestamp: spkTimestamp
     });
   }
-  /** 注册本设备 SPK 到服务端。IK = AID 长期密钥，无需注册。幂等。 */
+  /** 注册本设备 SPK 到服务端。IK = AID 长期密钥，无需注册。幂等，并发安全。 */
   async ensureRegistered(callFn) {
     if (this._registered) return;
+    if (this._registeringPromise) {
+      await this._registeringPromise;
+      return;
+    }
+    this._registeringPromise = this._doRegister(callFn);
+    try {
+      await this._registeringPromise;
+    } finally {
+      this._registeringPromise = null;
+    }
+  }
+  async _doRegister(callFn) {
     await this.ensureKeys();
     const uploadedSPKId = await this._store.loadLatestUploadedSPKId(this._storeDeviceId);
     if (uploadedSPKId) {
@@ -9777,8 +9893,8 @@ var V2Session = class {
       if (now - info.lastSeenAt < DESTROY_DELAY_MS) continue;
       if (recentKeep.has(spkId)) continue;
       try {
-        await this._store.deleteSPK(this._deviceId, spkId);
         await this._store.deleteSPK(this._storeDeviceId, spkId);
+        await this._store.deleteSPK(this._deviceId, spkId);
       } catch (err) {
         console.warn("[V2Session] deleteSPK failed", { spkId, err });
         continue;
@@ -9797,7 +9913,8 @@ var V2Session = class {
         try {
           await this._store.deleteSPK(this._storeDeviceId, spkId);
           await this._store.deleteSPK(this._deviceId, spkId);
-        } catch {
+        } catch (err) {
+          console.warn("[V2Session] deleteSPK (hard-limit) failed", { spkId, err });
           continue;
         }
         this._oldSPKMaxSeq.delete(spkId);
@@ -10214,7 +10331,7 @@ var V2E2EECoordinator = class {
     const gid = String(groupId ?? "").trim();
     if (!gid || !client._v2Session) return;
     const inflight = this.runtime.v2.groupSpkRegistrationInflight;
-    if (inflight.has(gid)) return;
+    if (inflight.has(gid) || this.runtime.v2.groupSpkRotationInflight.has(gid)) return;
     inflight.add(gid);
     client._safeAsync((async () => {
       try {
@@ -10232,7 +10349,7 @@ var V2E2EECoordinator = class {
     const gid = String(groupId ?? "").trim();
     if (!gid || !client._v2Session) return;
     const inflight = this.runtime.v2.groupSpkRotationInflight;
-    if (inflight.has(gid)) return;
+    if (inflight.has(gid) || this.runtime.v2.groupSpkRegistrationInflight.has(gid)) return;
     inflight.add(gid);
     client._safeAsync((async () => {
       try {
@@ -10352,6 +10469,13 @@ var V2E2EECoordinator = class {
         client._v2SenderIKPending.delete(key);
         if (plaintext === null) {
           client._clientLog.debug(`V2 sender IK pending retry failed: key=${key}`);
+          client.emit("message.undecryptable", {
+            from: entry.fromAid,
+            sender_device_id: entry.senderDeviceId,
+            group_id: entry.groupId || void 0,
+            seq: Number(entry.msg.seq ?? 0),
+            reason: "sender_ik_retry_failed"
+          });
           continue;
         }
         const seq = Number(entry.msg.seq ?? 0);
@@ -11787,11 +11911,11 @@ var GroupStateCoordinator = class {
           delete data.client_signature;
         } else {
           const verified = await client._verifyEventSignature(data, cs);
-          if (verified === false) {
+          if (!client._isEventSignatureVerified(verified)) {
             client._clientLog.warn(`state_committed committer signature verify failed group=%s${String(groupId)}`);
             return;
           }
-          data._verified = verified;
+          data._verified = true;
         }
       }
       const stateVersion = Number(data.state_version ?? 0);
@@ -15828,18 +15952,12 @@ var _AUNClient = class _AUNClient {
           if (this._shouldSkipEventSignature(d)) {
             delete d.client_signature;
           } else {
-            d._verified = await this._verifyEventSignature(d, cs);
+            const verified = await this._verifyEventSignature(d, cs);
+            d._verified = this._isEventSignatureVerified(verified);
           }
         }
-        await this._dispatcher.publish("group.changed", d);
         const groupId = d.group_id ?? "";
-        this._groupState.handleGroupChangedV2Membership(d);
-        this._delivery.handleGroupChangedEventSeq(d, groupId);
-        if (d.action === "dissolved") {
-          if (groupId) {
-            this._cleanupDissolvedGroup(groupId);
-          }
-        }
+        await this._delivery.handleGroupChangedEventSeq(d, groupId);
       } else {
         await this._dispatcher.publish("group.changed", data);
       }
@@ -15878,6 +15996,7 @@ var _AUNClient = class _AUNClient {
     this._pushedSeqs.delete(`group:${groupId}`);
     this._pushedSeqs.delete(`group_event:${groupId}`);
     this._pendingOrderedMsgs.delete(`group:${groupId}`);
+    this._pendingOrderedMsgs.delete(`group_event:${groupId}`);
     this._clientLog.info(`cleanup dissolved group ${groupId}  local state`);
   }
   async _verifyEventSignature(_event, cs) {
@@ -15926,6 +16045,9 @@ var _AUNClient = class _AUNClient {
       return false;
     }
   }
+  _isEventSignatureVerified(value) {
+    return value === true;
+  }
   _protectedHeadersFromParams(params) {
     const value = params.protected_headers ?? params.headers;
     if (value == null) return null;

package/dist/client/delivery.d.ts

@@ -7,6 +7,9 @@ export declare class MessageDeliveryEngine {
     prunePushedSeqs(ns: string): void;
     markPublishedSeq(ns: string, seq: number): 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>;
+    publishOrderedGroupChanged(payload: EventPayload): Promise<void>;
     isInstanceScopedMessageEvent(event: string): boolean;
     attachCurrentInstanceContext(payload: EventPayload): EventPayload;
     normalizePublishedMessagePayload(event: string, payload: EventPayload): EventPayload;
@@ -30,7 +33,7 @@ export declare class MessageDeliveryEngine {
     fillP2pGap(): Promise<void>;
     fillGroupGap(groupId: string): Promise<void>;
     fillGroupEventGap(groupId: string): Promise<void>;
-    handleGroupChangedEventSeq(data: JsonObject, groupId: string): void;
+    handleGroupChangedEventSeq(data: JsonObject, groupId: string): Promise<void>;
     enqueueOnlineUnreadHint(data: JsonObject): void;
     drainOnlineUnreadHints(): Promise<void>;
     onRawGroupV2MessageCreated(data: EventPayload): Promise<void>;

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

@@ -49,6 +49,30 @@ export class MessageDeliveryEngine {
                 queue.delete(oldSeq);
         }
     }
+    isGroupEventNamespace(ns) {
+        return ns.startsWith('group_event:');
+    }
+    async publishOrderedQueueItem(ns, event, seq, payload) {
+        const client = this.runtime.client;
+        if (event === 'group.changed' && this.isGroupEventNamespace(ns)) {
+            await this.publishOrderedGroupChanged(payload);
+            return;
+        }
+        await client._publishAppEvent(event, payload);
+    }
+    async publishOrderedGroupChanged(payload) {
+        const client = this.runtime.client;
+        if (isJsonObject(payload)) {
+            const eventPayload = payload;
+            client._groupState?.handleGroupChangedV2Membership?.(eventPayload);
+            if (eventPayload.action === 'dissolved') {
+                const groupId = normalizeGroupId(String(eventPayload.group_id ?? '')) || String(eventPayload.group_id ?? '').trim();
+                if (groupId)
+                    client._cleanupDissolvedGroup?.(groupId);
+            }
+        }
+        await client._publishAppEvent('group.changed', payload);
+    }
     isInstanceScopedMessageEvent(event) {
         return event === 'message.received'
             || event === 'message.recalled'
@@ -650,11 +674,14 @@ export class MessageDeliveryEngine {
                     }
                 }
                 const eventSeqs = [];
+                let hasDissolvedEvent = false;
                 for (const evt of eventObjects) {
                     const eventSeq = Number(evt.event_seq ?? 0);
                     if (Number.isFinite(eventSeq) && eventSeq > 0)
                         eventSeqs.push(eventSeq);
                     evt._from_gap_fill = true;
+                    if (evt.action === 'dissolved')
+                        hasDissolvedEvent = true;
                     const et = String(evt.event_type ?? '');
                     if (et === 'group.message_created')
                         continue;
@@ -664,17 +691,21 @@ export class MessageDeliveryEngine {
                             delete evt.client_signature;
                         }
                         else {
-                            evt._verified = await client._verifyEventSignature(evt, cs);
+                            const verified = await client._verifyEventSignature(evt, cs);
+                            evt._verified = client._isEventSignatureVerified(verified);
                         }
                     }
-                    await client._dispatcher.publish('group.changed', evt);
+                    if (Number.isFinite(eventSeq) && eventSeq > 0 && !client._pushedSeqs.get(ns)?.has(eventSeq)) {
+                        this.enqueueOrderedMessage(ns, 'group.changed', eventSeq, evt);
+                    }
                 }
-                const contig = client._seqTracker.getContiguousSeq(ns);
-                if (contig !== pageContigBefore) {
+                const ackContig = client._seqTracker.getContiguousSeq(ns);
+                await this.drainOrderedMessages(ns);
+                if (ackContig !== pageContigBefore && !hasDissolvedEvent) {
                     this.saveSeqTrackerState();
                 }
-                if (eventObjects.length > 0 && contig > 0 && contig !== pageContigBefore) {
-                    const ackSeq = this.clampAckSeq('group.ack_events', 'event_seq', ns, contig);
+                if (eventObjects.length > 0 && ackContig > 0 && ackContig !== pageContigBefore) {
+                    const ackSeq = this.clampAckSeq('group.ack_events', 'event_seq', ns, ackContig);
                     client._transport.call('group.ack_events', {
                         group_id: groupId,
                         event_seq: ackSeq,
@@ -699,15 +730,37 @@ export class MessageDeliveryEngine {
             this.runtime.delivery.setGapFillActive(false);
         }
     }
-    handleGroupChangedEventSeq(data, groupId) {
+    async handleGroupChangedEventSeq(data, groupId) {
         const client = this.runtime.client;
         let needPull = false;
         const rawEventSeq = data.event_seq;
-        if (rawEventSeq != null && groupId) {
-            const es = Number(rawEventSeq);
-            if (Number.isFinite(es) && es > 0) {
-                needPull = client._seqTracker.onMessageSeq(`group_event:${groupId}`, es);
-            }
+        const eventSeq = Number(rawEventSeq);
+        if (!groupId || !Number.isFinite(eventSeq) || !Number.isInteger(eventSeq) || eventSeq <= 0) {
+            await this.publishOrderedGroupChanged(data);
+            return;
+        }
+        const ns = `group_event:${groupId}`;
+        const contigBefore = client._seqTracker.getContiguousSeq(ns);
+        if (eventSeq <= contigBefore || client._pushedSeqs.get(ns)?.has(eventSeq)) {
+            client._clientLog.debug(`group.changed skipped duplicate/stale: group=${groupId}, event_seq=${eventSeq}, contiguous=${contigBefore}`);
+            return;
+        }
+        this.enqueueOrderedMessage(ns, 'group.changed', eventSeq, data);
+        needPull = client._seqTracker.onMessageSeq(ns, eventSeq);
+        const ackContig = client._seqTracker.getContiguousSeq(ns);
+        await this.drainOrderedMessages(ns);
+        if (ackContig > 0 && ackContig !== contigBefore) {
+            if (data.action !== 'dissolved')
+                this.saveSeqTrackerState();
+            const ackSeq = this.clampAckSeq('group.ack_events', 'event_seq', ns, ackContig);
+            client._transport.call('group.ack_events', {
+                group_id: groupId,
+                event_seq: ackSeq,
+                device_id: client._deviceId,
+                slot_id: client._slotId,
+            }).catch((e) => {
+                client._clientLog.warn('group event push auto-ack failed: group=' + groupId, e);
+            });
         }
         if (needPull && groupId && !data._from_gap_fill) {
             client._safeAsync(this.fillGroupEventGap(groupId));
@@ -1144,7 +1197,7 @@ export class MessageDeliveryEngine {
             queue.delete(seq);
             if (!item || client._pushedSeqs.get(ns)?.has(seq))
                 continue;
-            await client._publishAppEvent(item.event, item.payload);
+            await this.publishOrderedQueueItem(ns, item.event, seq, item.payload);
             this.markPublishedSeq(ns, seq);
         }
         if (queue.size === 0)
@@ -1154,7 +1207,7 @@ export class MessageDeliveryEngine {
         const client = this.runtime.client;
         const seqNum = Number(seq);
         if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0) {
-            await client._publishAppEvent(event, payload);
+            await this.publishOrderedQueueItem(ns, event, seqNum, payload);
             return true;
         }
         if (client._pushedSeqs.get(ns)?.has(seqNum)) {
@@ -1176,7 +1229,7 @@ export class MessageDeliveryEngine {
         queue?.delete(seqNum);
         if (queue && queue.size === 0)
             client._pendingOrderedMsgs.delete(ns);
-        await client._publishAppEvent(event, payload);
+        await this.publishOrderedQueueItem(ns, event, seqNum, payload);
         this.markPublishedSeq(ns, seqNum);
         await this.drainOrderedMessages(ns);
         return true;