@agentunion/fastaun-browser 0.4.11 → 0.4.12

package/dist/bundle.js

@@ -454,7 +454,7 @@ var init_indexeddb_store = __esm({
 });
 
 // src/version.ts
-var VERSION = "0.4.11";
+var VERSION = "0.4.12";
 
 // src/types.ts
 var ConnectionState = /* @__PURE__ */ ((ConnectionState2) => {
@@ -3710,6 +3710,53 @@ var ClientRuntime = class {
 var PUSHED_SEQS_LIMIT = 5e4;
 var PENDING_ORDERED_LIMIT = 5e4;
 var GROUP_RECALL_SEEN_LIMIT = 1e4;
+var APP_MESSAGE_ENVELOPE_KEYS = [
+  "module_id",
+  "message_id",
+  "id",
+  "seq",
+  "msg_seq",
+  "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"
+];
+var 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",
+  "created_at",
+  "timestamp",
+  "t_server",
+  "status",
+  "device_id",
+  "slot_id"
+];
 function formatDeliveryError(error) {
   return error instanceof Error ? error : String(error);
 }
@@ -3792,8 +3839,46 @@ var MessageDeliveryEngine = class {
     return result;
   }
   normalizePublishedMessagePayload(event, payload) {
-    if (!this.isInstanceScopedMessageEvent(event)) return payload;
-    return this.stripInternalSenderDeviceFields(this.attachCurrentInstanceContext(payload));
+    if (this.isInstanceScopedMessageEvent(event)) {
+      return this.attachAppMessageEnvelope(this.stripInternalSenderDeviceFields(this.attachCurrentInstanceContext(payload)));
+    }
+    if (this.isGroupScopedEvent(event)) {
+      return this.attachAppGroupEventEnvelope(this.attachCurrentInstanceContext(payload));
+    }
+    return payload;
+  }
+  appMessageEnvelope(payload) {
+    if (!isJsonObject(payload)) return {};
+    const message = payload;
+    const envelope = {};
+    for (const key of APP_MESSAGE_ENVELOPE_KEYS) {
+      if (Object.prototype.hasOwnProperty.call(message, key)) envelope[key] = message[key];
+    }
+    return envelope;
+  }
+  isGroupScopedEvent(event) {
+    return event === "group.changed";
+  }
+  appGroupEventEnvelope(payload) {
+    if (!isJsonObject(payload)) return {};
+    const groupEvent = payload;
+    const envelope = {};
+    for (const key of APP_GROUP_EVENT_ENVELOPE_KEYS) {
+      if (Object.prototype.hasOwnProperty.call(groupEvent, key)) envelope[key] = groupEvent[key];
+    }
+    return envelope;
+  }
+  attachAppMessageEnvelope(payload) {
+    if (!isJsonObject(payload)) return payload;
+    const result = { ...payload };
+    result.envelope = this.appMessageEnvelope(result);
+    return result;
+  }
+  attachAppGroupEventEnvelope(payload) {
+    if (!isJsonObject(payload)) return payload;
+    const result = { ...payload };
+    result.envelope = this.appGroupEventEnvelope(result);
+    return result;
   }
   stripInternalSenderDeviceFields(payload) {
     if (!isJsonObject(payload)) return payload;
@@ -3813,6 +3898,11 @@ var MessageDeliveryEngine = class {
     const payloadType = String(payload.type ?? payload.kind ?? "").trim();
     if (msgType !== "message.recalled" && payloadType !== "message.recalled") return null;
     const event = { ...payload };
+    for (const key of APP_MESSAGE_ENVELOPE_KEYS) {
+      if (Object.prototype.hasOwnProperty.call(msg, key) && !(key in event)) {
+        event[key] = msg[key];
+      }
+    }
     const rawIds = event.message_ids;
     let messageIds = Array.isArray(rawIds) ? rawIds.map((item) => String(item ?? "").trim()).filter(Boolean) : [];
     if (messageIds.length === 0) {
@@ -3831,7 +3921,10 @@ var MessageDeliveryEngine = class {
     if (!("to" in event)) event.to = msg.to ?? msg.to_aid ?? "";
     if (!("timestamp" in event)) event.timestamp = msg.timestamp ?? msg.t_server ?? event.recalled_at ?? 0;
     if ("seq" in msg && !("seq" in event)) event.seq = msg.seq;
-    if ("message_id" in msg && !("tombstone_message_id" in event)) event.tombstone_message_id = msg.message_id;
+    if ("message_id" in msg) {
+      event.message_id = msg.message_id;
+      if (!("tombstone_message_id" in event)) event.tombstone_message_id = msg.message_id;
+    }
     if ("device_id" in msg && !("device_id" in event)) event.device_id = msg.device_id;
     if ("slot_id" in msg && !("slot_id" in event)) event.slot_id = msg.slot_id;
     return event;
@@ -3850,6 +3943,11 @@ var MessageDeliveryEngine = class {
     const payloadType = String(payload.type ?? payload.kind ?? "").trim();
     if (msgType !== "group.message_recalled" && payloadType !== "group.message_recalled") return null;
     const event = { ...payload };
+    for (const key of APP_MESSAGE_ENVELOPE_KEYS) {
+      if (Object.prototype.hasOwnProperty.call(msg, key) && !(key in event)) {
+        event[key] = msg[key];
+      }
+    }
     const rawIds = event.message_ids;
     let messageIds = Array.isArray(rawIds) ? rawIds.map((item) => String(item ?? "").trim()).filter(Boolean) : [];
     if (messageIds.length === 0) {
@@ -3867,7 +3965,10 @@ var MessageDeliveryEngine = class {
     if (!("group_id" in event)) event.group_id = msg.group_id ?? "";
     if (!("timestamp" in event)) event.timestamp = msg.timestamp ?? msg.t_server ?? event.recalled_at ?? 0;
     if ("seq" in msg) event.seq = msg.seq;
-    if ("message_id" in msg && !("tombstone_message_id" in event)) event.tombstone_message_id = msg.message_id;
+    if ("message_id" in msg) {
+      event.message_id = msg.message_id;
+      if (!("tombstone_message_id" in event)) event.tombstone_message_id = msg.message_id;
+    }
     return event;
   }
   groupRecallDedupKey(groupId, payload) {
@@ -4357,6 +4458,14 @@ var MessageDeliveryEngine = class {
       return;
     }
     const ns = `group_event:${groupId}`;
+    if (this.isSelfJoinGroupChanged(data)) {
+      const contig = client._seqTracker.getContiguousSeq(ns);
+      const maxSeen = client._seqTracker.getMaxSeenSeq(ns);
+      if (contig === 0 && maxSeen === 0 && eventSeq > 1) {
+        client._clientLog.debug(`group.changed self-join baseline: group=${groupId}, event_seq=${eventSeq}, baseline=${eventSeq - 1}`);
+        client._seqTracker.forceContiguousSeq(ns, eventSeq - 1);
+      }
+    }
     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}`);
@@ -4382,6 +4491,16 @@ var MessageDeliveryEngine = class {
       client._safeAsync(this.fillGroupEventGap(groupId));
     }
   }
+  isSelfJoinGroupChanged(data) {
+    const action = String(data.action ?? "").trim();
+    if (!["member_added", "joined", "join_approved", "invite_code_used"].includes(action)) return false;
+    const selfAid = String(this.runtime.client._aid ?? "").trim();
+    if (!selfAid) return false;
+    const joinedAid = String(data.joined_aid ?? data.member_aid ?? data.aid ?? "").trim();
+    if (joinedAid === selfAid) return true;
+    const actorAid = String(data.actor_aid ?? "").trim();
+    return !joinedAid && ["joined", "invite_code_used"].includes(action) && actorAid === selfAid;
+  }
   enqueueOnlineUnreadHint(data) {
     const client = this.runtime.client;
     const groupId = String(data.group_id ?? "").trim();
@@ -5482,7 +5601,8 @@ var RpcPipeline = class {
     if (!client._instanceProtectedHeaders || !PROTECTED_HEADERS_METHODS.has(method)) {
       return;
     }
-    const existing = isJsonObject(params.protected_headers) ? params.protected_headers : {};
+    const existingValue = params.protected_headers ?? params.headers;
+    const existing = isJsonObject(existingValue) ? existingValue : {};
     params.protected_headers = { ...client._instanceProtectedHeaders, ...existing };
   }
   normalizeOutboundMessagePayload(params, method = "") {
@@ -16684,6 +16804,21 @@ var _AUNClient = class _AUNClient {
         if (!this._sessionParams) {
           throw new StateError("missing connect params for reconnect");
         }
+        {
+          const identity = this._identity;
+          if (identity) {
+            const cachedToken = String(identity.access_token ?? "");
+            const expiresAt = this._auth.getAccessTokenExpiry(identity);
+            if (cachedToken && (expiresAt === null || expiresAt > Date.now() / 1e3 + 30)) {
+              this._sessionParams.access_token = cachedToken;
+            } else {
+              this._clientLog.debug(`reconnect: cached token expired or missing for aid=${this._aid ?? ""}, clearing to trigger re-login`);
+              this._sessionParams.access_token = "";
+            }
+          } else {
+            this._sessionParams.access_token = "";
+          }
+        }
         await this._connectOnce(this._sessionParams, true);
         this._lastError = null;
         this._lastErrorCode = null;
@@ -19249,6 +19384,8 @@ var ServiceProxyClient = class {
     const stats = { connection_mode: mode, connections: 0, registered: 0, handled_requests: 0, wakeup_count: 0 };
     try {
       if (mode === "persistent") {
+        const maxReconnectDelay = 6e4;
+        let _delay = Math.max(0, opts.reconnectDelaySeconds ?? 1) * 1e3;
         while (this._running) {
           try {
             await this._autoRegisterServicesWithGateway();
@@ -19261,10 +19398,21 @@ var ServiceProxyClient = class {
             stats.connections = Number(stats.connections) + 1;
             stats.registered = Number(result.registered ?? stats.registered);
             stats.handled_requests = Number(stats.handled_requests) + Number(result.handled_requests ?? 0);
+            _delay = Math.max(0, opts.reconnectDelaySeconds ?? 1) * 1e3;
           } catch (exc) {
             if (!this._running) break;
-            this._logWarn(`persistent tunnel reconnect scheduled after error: ${formatError(exc)}`);
-            await sleep(Math.max(0, opts.reconnectDelaySeconds ?? 1) * 1e3);
+            if (exc instanceof AuthError) {
+              this._logWarn(`persistent tunnel auth error, re-authenticating: ${formatError(exc)}`);
+              try {
+                await this._authenticateForAccessToken();
+              } catch (reAuthExc) {
+                this._logWarn(`re-authentication failed: ${formatError(reAuthExc)}`);
+              }
+            } else {
+              this._logWarn(`persistent tunnel reconnect scheduled after error: ${formatError(exc)}`);
+            }
+            await sleep(_delay);
+            _delay = Math.min(_delay * 2, maxReconnectDelay);
           } finally {
             this._activeTunnel?.close();
             this._activeTunnel = null;

package/dist/client/delivery.d.ts

@@ -13,6 +13,11 @@ export declare class MessageDeliveryEngine {
     isInstanceScopedMessageEvent(event: string): boolean;
     attachCurrentInstanceContext(payload: EventPayload): EventPayload;
     normalizePublishedMessagePayload(event: string, payload: EventPayload): EventPayload;
+    appMessageEnvelope(payload: EventPayload): JsonObject;
+    isGroupScopedEvent(event: string): boolean;
+    appGroupEventEnvelope(payload: EventPayload): JsonObject;
+    attachAppMessageEnvelope(payload: EventPayload): EventPayload;
+    attachAppGroupEventEnvelope(payload: EventPayload): EventPayload;
     stripInternalSenderDeviceFields(payload: EventPayload): EventPayload;
     recallEventFromMessage(message: EventPayload): JsonObject | null;
     p2pAppEventForMessage(message: EventPayload): {
@@ -34,6 +39,7 @@ export declare class MessageDeliveryEngine {
     fillGroupGap(groupId: string): Promise<void>;
     fillGroupEventGap(groupId: string): Promise<void>;
     handleGroupChangedEventSeq(data: JsonObject, groupId: string): Promise<void>;
+    isSelfJoinGroupChanged(data: JsonObject): boolean;
     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

@@ -4,6 +4,17 @@ import { isJsonObject } from '../types.js';
 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',
+    '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',
+];
+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',
+    'created_at', 'timestamp', 't_server', 'status', 'device_id', 'slot_id',
+];
 function formatDeliveryError(error) {
     return error instanceof Error ? error : String(error);
 }
@@ -95,9 +106,54 @@ export class MessageDeliveryEngine {
         return result;
     }
     normalizePublishedMessagePayload(event, payload) {
-        if (!this.isInstanceScopedMessageEvent(event))
+        if (this.isInstanceScopedMessageEvent(event)) {
+            return this.attachAppMessageEnvelope(this.stripInternalSenderDeviceFields(this.attachCurrentInstanceContext(payload)));
+        }
+        if (this.isGroupScopedEvent(event)) {
+            return this.attachAppGroupEventEnvelope(this.attachCurrentInstanceContext(payload));
+        }
+        return payload;
+    }
+    appMessageEnvelope(payload) {
+        if (!isJsonObject(payload))
+            return {};
+        const message = payload;
+        const envelope = {};
+        for (const key of APP_MESSAGE_ENVELOPE_KEYS) {
+            if (Object.prototype.hasOwnProperty.call(message, key))
+                envelope[key] = message[key];
+        }
+        return envelope;
+    }
+    isGroupScopedEvent(event) {
+        return event === 'group.changed';
+    }
+    appGroupEventEnvelope(payload) {
+        if (!isJsonObject(payload))
+            return {};
+        const groupEvent = payload;
+        const envelope = {};
+        for (const key of APP_GROUP_EVENT_ENVELOPE_KEYS) {
+            if (Object.prototype.hasOwnProperty.call(groupEvent, key))
+                envelope[key] = groupEvent[key];
+        }
+        return envelope;
+    }
+    attachAppMessageEnvelope(payload) {
+        if (!isJsonObject(payload))
             return payload;
-        return this.stripInternalSenderDeviceFields(this.attachCurrentInstanceContext(payload));
+        const result = { ...payload };
+        // 兼容期保留顶层信封字段；下一个大版本 0.5.* 将移除这些顶层别名，请通过 envelope.* 访问。
+        result.envelope = this.appMessageEnvelope(result);
+        return result;
+    }
+    attachAppGroupEventEnvelope(payload) {
+        if (!isJsonObject(payload))
+            return payload;
+        const result = { ...payload };
+        // 兼容期保留顶层群事件信封字段；下一个大版本 0.5.* 将移除这些顶层别名，请通过 envelope.* 访问。
+        result.envelope = this.appGroupEventEnvelope(result);
+        return result;
     }
     stripInternalSenderDeviceFields(payload) {
         if (!isJsonObject(payload))
@@ -120,6 +176,11 @@ export class MessageDeliveryEngine {
         if (msgType !== 'message.recalled' && payloadType !== 'message.recalled')
             return null;
         const event = { ...payload };
+        for (const key of APP_MESSAGE_ENVELOPE_KEYS) {
+            if (Object.prototype.hasOwnProperty.call(msg, key) && !(key in event)) {
+                event[key] = msg[key];
+            }
+        }
         const rawIds = event.message_ids;
         let messageIds = Array.isArray(rawIds)
             ? rawIds.map((item) => String(item ?? '').trim()).filter(Boolean)
@@ -144,8 +205,11 @@ export class MessageDeliveryEngine {
             event.timestamp = msg.timestamp ?? msg.t_server ?? event.recalled_at ?? 0;
         if ('seq' in msg && !('seq' in event))
             event.seq = msg.seq;
-        if ('message_id' in msg && !('tombstone_message_id' in event))
-            event.tombstone_message_id = msg.message_id;
+        if ('message_id' in msg) {
+            event.message_id = msg.message_id;
+            if (!('tombstone_message_id' in event))
+                event.tombstone_message_id = msg.message_id;
+        }
         if ('device_id' in msg && !('device_id' in event))
             event.device_id = msg.device_id;
         if ('slot_id' in msg && !('slot_id' in event))
@@ -169,6 +233,11 @@ export class MessageDeliveryEngine {
         if (msgType !== 'group.message_recalled' && payloadType !== 'group.message_recalled')
             return null;
         const event = { ...payload };
+        for (const key of APP_MESSAGE_ENVELOPE_KEYS) {
+            if (Object.prototype.hasOwnProperty.call(msg, key) && !(key in event)) {
+                event[key] = msg[key];
+            }
+        }
         const rawIds = event.message_ids;
         let messageIds = Array.isArray(rawIds)
             ? rawIds.map((item) => String(item ?? '').trim()).filter(Boolean)
@@ -191,8 +260,11 @@ export class MessageDeliveryEngine {
             event.timestamp = msg.timestamp ?? msg.t_server ?? event.recalled_at ?? 0;
         if ('seq' in msg)
             event.seq = msg.seq;
-        if ('message_id' in msg && !('tombstone_message_id' in event))
-            event.tombstone_message_id = msg.message_id;
+        if ('message_id' in msg) {
+            event.message_id = msg.message_id;
+            if (!('tombstone_message_id' in event))
+                event.tombstone_message_id = msg.message_id;
+        }
         return event;
     }
     groupRecallDedupKey(groupId, payload) {
@@ -740,6 +812,14 @@ export class MessageDeliveryEngine {
             return;
         }
         const ns = `group_event:${groupId}`;
+        if (this.isSelfJoinGroupChanged(data)) {
+            const contig = client._seqTracker.getContiguousSeq(ns);
+            const maxSeen = client._seqTracker.getMaxSeenSeq(ns);
+            if (contig === 0 && maxSeen === 0 && eventSeq > 1) {
+                client._clientLog.debug(`group.changed self-join baseline: group=${groupId}, event_seq=${eventSeq}, baseline=${eventSeq - 1}`);
+                client._seqTracker.forceContiguousSeq(ns, eventSeq - 1);
+            }
+        }
         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}`);
@@ -766,6 +846,19 @@ export class MessageDeliveryEngine {
             client._safeAsync(this.fillGroupEventGap(groupId));
         }
     }
+    isSelfJoinGroupChanged(data) {
+        const action = String(data.action ?? '').trim();
+        if (!['member_added', 'joined', 'join_approved', 'invite_code_used'].includes(action))
+            return false;
+        const selfAid = String(this.runtime.client._aid ?? '').trim();
+        if (!selfAid)
+            return false;
+        const joinedAid = String(data.joined_aid ?? data.member_aid ?? data.aid ?? '').trim();
+        if (joinedAid === selfAid)
+            return true;
+        const actorAid = String(data.actor_aid ?? '').trim();
+        return !joinedAid && ['joined', 'invite_code_used'].includes(action) && actorAid === selfAid;
+    }
     enqueueOnlineUnreadHint(data) {
         const client = this.runtime.client;
         const groupId = String(data.group_id ?? '').trim();