@agentunion/fastaun 0.4.11 → 0.4.13

package/dist/client.js

@@ -226,6 +226,22 @@ function _v2BytesEqual(a, b) {
 function formatCaughtError(error) {
     return error instanceof Error ? error : String(error);
 }
+const RELOGIN_REFRESH_ERRORS = new Set([
+    'missing refresh_token',
+    'invalid_or_expired_refresh_token',
+    'refresh not supported',
+]);
+function authErrorRequiresRelogin(error) {
+    const data = error.data;
+    if (isJsonObject(data)) {
+        if (data.relogin_required === true)
+            return true;
+        const code = String(data.error ?? '').trim().toLowerCase();
+        if (RELOGIN_REFRESH_ERRORS.has(code))
+            return true;
+    }
+    return RELOGIN_REFRESH_ERRORS.has(error.message.trim().toLowerCase());
+}
 function normalizeDeliveryModeConfig(raw, opts = {}) {
     const defaultMode = String(opts.defaultMode ?? 'fanout').trim().toLowerCase() || 'fanout';
     const defaultRouting = String(opts.defaultRouting ?? 'round_robin').trim().toLowerCase() || 'round_robin';
@@ -2624,6 +2640,18 @@ export class AUNClient {
                 }
                 catch (exc) {
                     if (exc instanceof AuthError) {
+                        if (authErrorRequiresRelogin(exc)) {
+                            this._clientLog.warn(`token refresh requires relogin, stopping refresh loop and triggering reconnect: ${exc.message}`);
+                            await this._dispatcher.publish('token.refresh_exhausted', {
+                                aid: this._identity?.aid ?? null,
+                                consecutive_failures: 1,
+                                last_error: String(exc),
+                                relogin_required: true,
+                            });
+                            this._tokenRefreshFailures = 0;
+                            await this._handleTransportDisconnect(new Error('token refresh relogin required, triggering reconnect'));
+                            return;
+                        }
                         this._tokenRefreshFailures++;
                         if (this._tokenRefreshFailures >= 3) {
                             this._clientLog.warn(`token refresh failed ${this._tokenRefreshFailures} consecutive times, stopping refresh loop and triggering reconnect`);
@@ -2633,7 +2661,7 @@ export class AUNClient {
                                 last_error: String(exc),
                             });
                             this._tokenRefreshFailures = 0;
-                            this._handleTransportDisconnect(new Error('token refresh exhausted, triggering reconnect'));
+                            await this._handleTransportDisconnect(new Error('token refresh exhausted, triggering reconnect'));
                             return;
                         }
                         this._clientLog.debug(`token refresh failed (${this._tokenRefreshFailures}/3), will retry: ${exc}`);
@@ -2750,10 +2778,12 @@ export class AUNClient {
                 eventPayload.code = disconnectInfo.code;
             }
             await this._dispatcher.publish('state_change', eventPayload);
+            this._reconnectActive = false;
             return;
         }
         // 1000 = 正常关闭, 1006 = 网络异常断开（无 close frame），其他 code = 服务端主动关闭
         const serverInitiated = closeCode !== undefined && closeCode !== 1000 && closeCode !== 1006;
+        this._reconnectActive = false;
         this._startReconnect(serverInitiated);
     }
     /** 启动重连循环（默认无限重试 + 指数退避 + 固定上限抖动，仅在不可重试错误、close() 或 max_attempts 耗尽时终止） */
@@ -2818,6 +2848,24 @@ export class AUNClient {
                 if (this._sessionParams === null) {
                     throw new StateError('missing connect params for reconnect');
                 }
+                // 重连前同步 identity 里的 token 状态到 sessionParams，防止用过期 token 死循环 4001
+                {
+                    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() / 1000 + 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._clientLog.debug(`reconnect success: attempt=${attempt}, aid=${this._aid ?? ''}`);