@agentunion/fastaun 0.5.6 → 0.5.9

package/dist/client/lifecycle.js

@@ -1,5 +1,25 @@
-import { StateError, ValidationError } from '../errors.js';
 import { ConnectionState } from '../types.js';
+import { AUNError, AuthError, ConnectionError, PermissionError, StateError, TimeoutError, ValidationError, } from '../errors.js';
+function shouldRetryInitialConnect(error) {
+    if (error instanceof AuthError) {
+        const message = String(error.message ?? '').toLowerCase();
+        return message.includes('long_connection_already_exists')
+            || message.includes('long connection already exists')
+            || message.includes('aid_login1_failed')
+            || message.includes('aid_login2_failed');
+    }
+    if (error instanceof PermissionError || error instanceof ValidationError || error instanceof StateError) {
+        return false;
+    }
+    if (error instanceof ConnectionError || error instanceof TimeoutError) {
+        return true;
+    }
+    if (error instanceof AUNError) {
+        return error.retryable;
+    }
+    // Node/WebSocket 底层异常不一定继承 SDK 错误类型，默认视为瞬时错误。
+    return true;
+}
 const PUBLIC_CONNECTION_OPTION_KEYS = new Set([
     'auto_reconnect',
     'connect_timeout',
@@ -73,9 +93,194 @@ export class LifecycleController {
     constructor(runtime) {
         this.runtime = runtime;
     }
+    beginConnectionAttempt() {
+        const client = this.runtime.client;
+        if (client._closing || client.state === ConnectionState.CLOSED) {
+            throw new StateError('connect not allowed on a closed client');
+        }
+        if (client._disconnecting) {
+            throw new StateError('connect not allowed while disconnect is in progress');
+        }
+        if (client._connectDone) {
+            throw new StateError('connect already in progress');
+        }
+        const owner = new AbortController();
+        let resolveDone;
+        const done = new Promise((resolve) => { resolveDone = resolve; });
+        client._connectAbort = owner;
+        client._connectDoneOwner = owner;
+        client._connectDone = done;
+        client._connectDoneResolve = resolveDone;
+        client._connectEventDispatchDepth = Number(client._connectEventDispatchDepth ?? 0);
+        return owner;
+    }
+    finishConnectionAttempt(owner) {
+        const client = this.runtime.client;
+        if (client._connectDoneOwner !== owner)
+            return;
+        const resolveDone = client._connectDoneResolve;
+        if (client._connectAbort === owner)
+            client._connectAbort = null;
+        client._connectDoneOwner = null;
+        client._connectDone = null;
+        client._connectDoneResolve = null;
+        resolveDone?.();
+    }
+    ownsConnectionAttempt(owner) {
+        if (!owner)
+            return true;
+        const client = this.runtime.client;
+        return client._connectAbort === owner
+            && !owner.signal.aborted
+            && !client._closing
+            && !client._disconnecting;
+    }
+    assertConnectionAttemptOwner(owner) {
+        if (owner && !this.ownsConnectionAttempt(owner)) {
+            throw new StateError('connection attempt superseded');
+        }
+    }
+    assertAttemptOwners(connectionOwner, reconnectOwner) {
+        this.assertConnectionAttemptOwner(connectionOwner);
+        this.runtime.client._assertReconnectOwner?.(reconnectOwner);
+    }
+    async waitForAttempt(operation, connectionOwner, reconnectOwner) {
+        const owner = connectionOwner ?? reconnectOwner;
+        if (!owner)
+            return operation;
+        this.assertAttemptOwners(connectionOwner, reconnectOwner);
+        return new Promise((resolve, reject) => {
+            let settled = false;
+            const finish = (callback) => {
+                if (settled)
+                    return;
+                settled = true;
+                owner.signal.removeEventListener('abort', onAbort);
+                callback();
+            };
+            const onAbort = () => finish(() => reject(connectionOwner
+                ? new StateError('connection attempt superseded')
+                : new ConnectionError('reconnect attempt superseded')));
+            owner.signal.addEventListener('abort', onAbort, { once: true });
+            if (owner.signal.aborted) {
+                onAbort();
+                return;
+            }
+            operation.then((value) => finish(() => {
+                try {
+                    this.assertAttemptOwners(connectionOwner, reconnectOwner);
+                    resolve(value);
+                }
+                catch (err) {
+                    reject(err);
+                }
+            }), (err) => finish(() => reject(err)));
+        });
+    }
+    async publishConnectionEvent(owner, event, payload) {
+        const client = this.runtime.client;
+        this.assertConnectionAttemptOwner(owner);
+        client._connectEventDispatchDepth = Number(client._connectEventDispatchDepth ?? 0) + 1;
+        try {
+            await client._dispatcher.publish(event, payload);
+        }
+        finally {
+            client._connectEventDispatchDepth -= 1;
+        }
+        return this.ownsConnectionAttempt(owner);
+    }
+    async cancelConnectionAttemptAndWait() {
+        const client = this.runtime.client;
+        const owner = client._connectDoneOwner;
+        const done = client._connectDone;
+        if (!owner || !done)
+            return;
+        if (client._connectAbort === owner)
+            client._connectAbort = null;
+        owner.abort();
+        client._discovery?._cancelPending?.();
+        client._auth?._cancelPending?.();
+        // READY 事件按顺序同步分发；handler 内等待所属 connect 会自锁。
+        if (Number(client._connectEventDispatchDepth ?? 0) > 0)
+            return;
+        let timeout = null;
+        try {
+            await Promise.race([
+                done,
+                new Promise((_, reject) => {
+                    timeout = setTimeout(() => reject(new StateError('timed out waiting for connect attempt to stop')), 1_000);
+                }),
+            ]);
+        }
+        finally {
+            if (timeout !== null)
+                clearTimeout(timeout);
+        }
+    }
+    lifecycleStopEventIsReentrant() {
+        const client = this.runtime.client;
+        return Boolean(client._lifecycleStopActive)
+            && Number(client._lifecycleStopEventDispatchDepth ?? 0) > 0;
+    }
+    scheduleReentrantClose() {
+        const client = this.runtime.client;
+        const tail = client._lifecycleStopTail;
+        if (!tail)
+            return;
+        void tail.then(() => this.close()).catch((err) => {
+            client._clientLog.warn(`reentrant close failed: ${formatCaughtError(err)}`);
+        });
+    }
+    async publishLifecycleStopEvent(payload) {
+        const client = this.runtime.client;
+        client._lifecycleStopEventDispatchDepth = Number(client._lifecycleStopEventDispatchDepth ?? 0) + 1;
+        try {
+            await client._dispatcher.publish('state_change', payload);
+        }
+        finally {
+            client._lifecycleStopEventDispatchDepth -= 1;
+        }
+    }
+    async withLifecycleStop(operation, kind) {
+        const client = this.runtime.client;
+        const previous = client._lifecycleStopTail;
+        let release;
+        const gate = new Promise((resolve) => { release = resolve; });
+        // 首个 stop 操作要在当前调用栈内进入清理；只有已有 stop 时才排队等待。
+        // 这样既保持 stop 之间的串行化，也不让调用方观察到无意义的额外微任务延迟。
+        const tail = previous ? previous.catch(() => { }).then(() => gate) : gate;
+        client._lifecycleStopTail = tail;
+        if (previous)
+            await previous.catch(() => { });
+        client._lifecycleStopActive = true;
+        client._lifecycleStopKind = kind;
+        try {
+            return await operation();
+        }
+        finally {
+            client._lifecycleStopActive = false;
+            client._lifecycleStopKind = null;
+            release();
+            if (client._lifecycleStopTail === tail)
+                client._lifecycleStopTail = null;
+        }
+    }
+    /** 首连后台重试使用的完整尝试；不在失败时再次创建重连任务。 */
+    async retryInitialConnect(opts, reconnectOwner) {
+        const client = this.runtime.client;
+        client._assertReconnectOwner?.(reconnectOwner);
+        this.runtime.lifecycle.setState('standby');
+        client._gatewayUrl = null;
+        client._gatewayCandidates = [];
+        return this.connect(opts, true, reconnectOwner);
+    }
     async authenticate(options = {}) {
         const client = this.runtime.client;
         const tStart = Date.now();
+        const inheritedAttempt = client._activeAuthenticateAttempt;
+        let connectionOwner = inheritedAttempt?.connectionOwner;
+        const reconnectOwner = inheritedAttempt?.reconnectOwner;
+        let ownsPublicAttempt = false;
         const target = client._currentAid?.aid ?? client._aid ?? '';
         if (!target || !client._currentAid?.isPrivateKeyValid()) {
             throw new StateError('authenticate requires a loaded AID with a valid private key');
@@ -90,11 +295,24 @@ export class LifecycleController {
         if ('aid' in options || 'access_token' in options || 'token' in options || 'kite_token' in options) {
             throw new ValidationError('authenticate options must not include aid or token fields; load an AID object first');
         }
+        if (!connectionOwner && !reconnectOwner) {
+            connectionOwner = this.beginConnectionAttempt();
+            ownsPublicAttempt = true;
+        }
+        this.assertAttemptOwners(connectionOwner, reconnectOwner);
         this.runtime.lifecycle.setState('connecting');
         try {
-            const discovered = typeof client._resolveGatewayCandidatesForAid === 'function'
-                ? await client._resolveGatewayCandidatesForAid(target)
-                : [String(client._gatewayUrl ?? await client._resolveGatewayForAid(target)).trim()];
+            let discovered;
+            if (typeof client._resolveGatewayCandidatesForAid === 'function') {
+                discovered = await this.waitForAttempt(Promise.resolve(client._resolveGatewayCandidatesForAid(target)), connectionOwner, reconnectOwner);
+            }
+            else if (client._gatewayUrl) {
+                discovered = [String(client._gatewayUrl).trim()];
+            }
+            else {
+                const gateway = await this.waitForAttempt(Promise.resolve(client._resolveGatewayForAid(target)), connectionOwner, reconnectOwner);
+                discovered = [String(gateway).trim()];
+            }
             const gateways = [...new Set(discovered
                     .map((item) => String(item ?? '').trim()).filter(Boolean))];
             if (gateways.length === 0)
@@ -104,7 +322,7 @@ export class LifecycleController {
             let lastError = null;
             for (const candidate of gateways) {
                 try {
-                    result = await client._auth.authenticate(candidate, { aid: target });
+                    result = await this.waitForAttempt(Promise.resolve(client._auth.authenticate(candidate, { aid: target })), connectionOwner, reconnectOwner);
                     gateway = candidate;
                     break;
                 }
@@ -117,6 +335,7 @@ export class LifecycleController {
             }
             if (result === null)
                 throw (lastError instanceof Error ? lastError : new Error(String(lastError)));
+            this.assertAttemptOwners(connectionOwner, reconnectOwner);
             client._gatewayCandidates = gateways;
             this.runtime.lifecycle.setGatewayUrl(gatewayFromAuthResult(result, gateway));
             let loadedIdentity = null;
@@ -133,13 +352,19 @@ export class LifecycleController {
             return result;
         }
         catch (err) {
+            this.assertAttemptOwners(connectionOwner, reconnectOwner);
             this.runtime.lifecycle.setState('standby');
             this.runtime.lifecycle.setError(err instanceof Error ? err : new Error(String(err)), 'AUTHENTICATE_FAILED');
             client._clientLog.debug(`authenticate exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
             throw err;
         }
+        finally {
+            if (ownsPublicAttempt && connectionOwner) {
+                this.finishConnectionAttempt(connectionOwner);
+            }
+        }
     }
-    async connect(opts) {
+    async connect(opts, fromInitialReconnect = false, reconnectOwner) {
         const client = this.runtime.client;
         const tStart = Date.now();
         if (opts !== undefined && opts !== null && typeof opts === 'object') {
@@ -153,183 +378,281 @@ export class LifecycleController {
         if (!target || !client._currentAid?.isPrivateKeyValid()) {
             throw new StateError('connect requires a loaded AID with a valid private key');
         }
-        const options = {};
-        if (opts?.auto_reconnect !== undefined)
-            options.auto_reconnect = opts.auto_reconnect;
-        if (opts?.heartbeat_interval !== undefined)
-            options.heartbeat_interval = opts.heartbeat_interval;
-        if (opts?.connect_timeout !== undefined || opts?.call_timeout !== undefined) {
-            options.timeouts = {
-                ...(opts.connect_timeout !== undefined ? { connect: opts.connect_timeout } : {}),
-                ...(opts.call_timeout !== undefined ? { call: opts.call_timeout } : {}),
-            };
-        }
-        if (opts?.retry !== undefined)
-            options.retry = opts.retry;
-        if (opts?.retry_initial_delay !== undefined || opts?.retry_max_delay !== undefined || opts?.retry_max_attempts !== undefined) {
-            const baseRetry = isRecord(options.retry)
-                ? { ...options.retry }
-                : { initial_delay: 1, max_delay: 64, max_attempts: 0 };
-            options.retry = {
-                ...baseRetry,
-                ...(opts.retry_initial_delay !== undefined ? { initial_delay: opts.retry_initial_delay } : {}),
-                ...(opts.retry_max_delay !== undefined ? { max_delay: opts.retry_max_delay } : {}),
-                ...(opts.retry_max_attempts !== undefined ? { max_attempts: opts.retry_max_attempts } : {}),
-            };
-        }
-        if (opts?.connection_kind !== undefined)
-            options.connection_kind = opts.connection_kind;
-        if (opts?.short_ttl_ms !== undefined)
-            options.short_ttl_ms = opts.short_ttl_ms;
-        if (opts?.delivery_mode !== undefined)
-            options.delivery_mode = opts.delivery_mode;
-        if (opts?.extra_info !== undefined)
-            options.extra_info = opts.extra_info;
-        if (opts?.background_sync !== undefined)
-            options.background_sync = opts.background_sync;
-        const publicState = client.state;
-        const allowed = new Set([
-            ConnectionState.STANDBY,
-            ConnectionState.AUTHENTICATED,
-            ConnectionState.RETRY_BACKOFF,
-            ConnectionState.CONNECTION_FAILED,
-        ]);
-        if (!allowed.has(publicState)) {
-            throw new StateError(`connect not allowed in state ${publicState}`);
-        }
-        if (publicState === ConnectionState.RETRY_BACKOFF) {
-            client._stopReconnect();
-        }
-        if (publicState === ConnectionState.CONNECTION_FAILED) {
-            this.runtime.lifecycle.setRetryAttempt(0);
-            this.runtime.lifecycle.setError(null, null);
-        }
-        this.runtime.lifecycle.setNextRetryAt(null);
-        let authResult = null;
-        if (!client._gatewayUrl) {
-            authResult = await client.authenticate();
-        }
-        this.runtime.lifecycle.setState('connecting');
-        const gateway = String(client._gatewayUrl ?? '').trim();
-        const accessToken = accessTokenFromAuthResult(authResult) || cachedAccessToken(client);
-        const params = {
-            ...options,
-            gateway,
-            ...(Array.isArray(client._gatewayCandidates) && client._gatewayCandidates.length > 0
-                ? { gateways: [...client._gatewayCandidates] }
-                : {}),
-            ...(accessToken ? { access_token: accessToken } : {}),
-        };
-        const normalized = client._normalizeConnectParams(params);
-        client._captureCapabilitiesFromConnect(normalized);
-        this.runtime.lifecycle.setSession(normalized, client._buildSessionOptions(normalized));
-        const connectTimeoutSec = client._sessionOptions.timeouts.connect;
-        client._transport.setConnectTimeout(connectTimeoutSec != null ? connectTimeoutSec * 1000 : 5_000);
-        const callTimeoutSec = client._sessionOptions.timeouts.call;
-        client._transport.setTimeout(callTimeoutSec != null ? callTimeoutSec * 1000 : 35_000);
-        this.runtime.lifecycle.setClosing(false);
-        client._clientLog.debug(`connect enter: gateway=${String(normalized.gateway ?? '')}, device_id=${client._deviceId}`);
-        const gateways = client._resolveGateways(normalized);
-        let lastErr = null;
-        for (const gw of gateways) {
-            try {
-                const gwParams = { ...normalized, gateway: gw };
-                await client._connectOnce(gwParams, true);
+        const connectionOwner = fromInitialReconnect ? undefined : this.beginConnectionAttempt();
+        try {
+            const options = {};
+            if (opts?.auto_reconnect !== undefined)
+                options.auto_reconnect = opts.auto_reconnect;
+            if (opts?.heartbeat_interval !== undefined)
+                options.heartbeat_interval = opts.heartbeat_interval;
+            if (opts?.connect_timeout !== undefined || opts?.call_timeout !== undefined) {
+                options.timeouts = {
+                    ...(opts.connect_timeout !== undefined ? { connect: opts.connect_timeout } : {}),
+                    ...(opts.call_timeout !== undefined ? { call: opts.call_timeout } : {}),
+                };
+            }
+            if (opts?.retry !== undefined)
+                options.retry = opts.retry;
+            if (opts?.retry_initial_delay !== undefined || opts?.retry_max_delay !== undefined || opts?.retry_max_attempts !== undefined) {
+                const baseRetry = isRecord(options.retry)
+                    ? { ...options.retry }
+                    : { initial_delay: 1, max_delay: 64, max_attempts: 0 };
+                options.retry = {
+                    ...baseRetry,
+                    ...(opts.retry_initial_delay !== undefined ? { initial_delay: opts.retry_initial_delay } : {}),
+                    ...(opts.retry_max_delay !== undefined ? { max_delay: opts.retry_max_delay } : {}),
+                    ...(opts.retry_max_attempts !== undefined ? { max_attempts: opts.retry_max_attempts } : {}),
+                };
+            }
+            if (opts?.connection_kind !== undefined)
+                options.connection_kind = opts.connection_kind;
+            if (opts?.short_ttl_ms !== undefined)
+                options.short_ttl_ms = opts.short_ttl_ms;
+            if (opts?.delivery_mode !== undefined)
+                options.delivery_mode = opts.delivery_mode;
+            if (opts?.extra_info !== undefined)
+                options.extra_info = opts.extra_info;
+            if (opts?.background_sync !== undefined)
+                options.background_sync = opts.background_sync;
+            const publicState = client.state;
+            const allowed = new Set([
+                ConnectionState.STANDBY,
+                ConnectionState.AUTHENTICATED,
+                ConnectionState.RETRY_BACKOFF,
+                ConnectionState.CONNECTION_FAILED,
+            ]);
+            const hasReconnectController = Boolean(client._reconnectAbort || client._reconnectActive || client._reconnectTask);
+            if (!allowed.has(publicState) && !(hasReconnectController && !fromInitialReconnect)) {
+                throw new StateError(`connect not allowed in state ${publicState}`);
+            }
+            // 显式 connect 开启新的连接意图，必须取消 standby/retry_backoff 窗口中
+            // 尚未完成的旧重连代；内部首连重试不能取消自己的控制器。
+            if (!fromInitialReconnect && hasReconnectController) {
+                await client._cancelReconnectAndWait();
+            }
+            else if (fromInitialReconnect) {
+                client._assertReconnectOwner?.(reconnectOwner);
+            }
+            if (publicState === ConnectionState.CONNECTION_FAILED) {
+                this.runtime.lifecycle.setRetryAttempt(0);
                 this.runtime.lifecycle.setError(null, null);
-                client._clientLog.debug(`connect exit: elapsed=${Date.now() - tStart}ms aid=${client._aid ?? ''}, state=${client._state}`);
-                return;
             }
-            catch (err) {
-                lastErr = err;
+            this.runtime.lifecycle.setNextRetryAt(null);
+            // 认证/发现发生在 session 参数可归一化之前，先保存会话选项，
+            // 这样首连失败也能沿用同一套退避与 auto_reconnect 配置。
+            this.runtime.lifecycle.setSession(null, client._buildSessionOptions({
+                ...options,
+                connection_kind: opts?.connection_kind ?? 'long',
+            }));
+            let authResult = null;
+            if (!client._gatewayUrl) {
+                const previousAttempt = client._activeAuthenticateAttempt;
+                client._activeAuthenticateAttempt = { connectionOwner, reconnectOwner };
                 try {
-                    await client._transport.close();
+                    authResult = await this.waitForAttempt(Promise.resolve(client.authenticate()), connectionOwner, reconnectOwner);
+                    this.assertAttemptOwners(connectionOwner, reconnectOwner);
                 }
-                catch (closeErr) {
-                    client._clientLog.debug(`connect gateway cleanup skipped: ${formatCaughtError(closeErr)}`);
+                catch (err) {
+                    this.assertAttemptOwners(connectionOwner, reconnectOwner);
+                    const connectError = err instanceof Error ? err : new Error(String(err));
+                    this.runtime.lifecycle.setError(connectError, 'CONNECT_FAILED');
+                    if (!fromInitialReconnect && client._sessionOptions?.auto_reconnect && shouldRetryInitialConnect(connectError)
+                        && typeof client._handleTransportDisconnect === 'function') {
+                        try {
+                            await client._handleTransportDisconnect(connectError, undefined, opts ?? {});
+                        }
+                        catch (reconnectErr) {
+                            client._clientLog.warn(`initial reconnect scheduling failed: ${reconnectErr instanceof Error ? reconnectErr.message : String(reconnectErr)}`);
+                        }
+                    }
+                    throw err;
                 }
-                if (gateways.length > 1) {
-                    client._clientLog.warn(`connect: gateway ${gw} failed, trying next: ${formatCaughtError(err)}`);
+                finally {
+                    if (client._activeAuthenticateAttempt?.connectionOwner === connectionOwner
+                        && client._activeAuthenticateAttempt?.reconnectOwner === reconnectOwner) {
+                        client._activeAuthenticateAttempt = previousAttempt ?? null;
+                    }
                 }
-                if (client._state !== 'closed')
-                    this.runtime.lifecycle.setState('connecting');
             }
+            this.assertAttemptOwners(connectionOwner, reconnectOwner);
+            this.runtime.lifecycle.setState('connecting');
+            const gateway = String(client._gatewayUrl ?? '').trim();
+            const accessToken = accessTokenFromAuthResult(authResult) || cachedAccessToken(client);
+            const params = {
+                ...options,
+                gateway,
+                ...(Array.isArray(client._gatewayCandidates) && client._gatewayCandidates.length > 0
+                    ? { gateways: [...client._gatewayCandidates] }
+                    : {}),
+                ...(accessToken ? { access_token: accessToken } : {}),
+            };
+            const normalized = client._normalizeConnectParams(params);
+            client._captureCapabilitiesFromConnect(normalized);
+            this.runtime.lifecycle.setSession(normalized, client._buildSessionOptions(normalized));
+            const connectTimeoutSec = client._sessionOptions.timeouts.connect;
+            client._transport.setConnectTimeout(connectTimeoutSec != null ? connectTimeoutSec * 1000 : 5_000);
+            const callTimeoutSec = client._sessionOptions.timeouts.call;
+            client._transport.setTimeout(callTimeoutSec != null ? callTimeoutSec * 1000 : 35_000);
+            this.assertAttemptOwners(connectionOwner, reconnectOwner);
+            this.runtime.lifecycle.setClosing(false);
+            client._clientLog.debug(`connect enter: gateway=${String(normalized.gateway ?? '')}, device_id=${client._deviceId}`);
+            const gateways = client._resolveGateways(normalized);
+            let lastErr = null;
+            for (const gw of gateways) {
+                try {
+                    const gwParams = { ...normalized, gateway: gw };
+                    await this.waitForAttempt(Promise.resolve(client._connectOnce(gwParams, true, reconnectOwner)), connectionOwner, reconnectOwner);
+                    this.assertAttemptOwners(connectionOwner, reconnectOwner);
+                    this.runtime.lifecycle.setError(null, null);
+                    client._clientLog.debug(`connect exit: elapsed=${Date.now() - tStart}ms aid=${client._aid ?? ''}, state=${client._state}`);
+                    return;
+                }
+                catch (err) {
+                    lastErr = err;
+                    this.assertAttemptOwners(connectionOwner, reconnectOwner);
+                    if (reconnectOwner && !client._ownsReconnect?.(reconnectOwner))
+                        throw err;
+                    try {
+                        await client._transport.close();
+                    }
+                    catch (closeErr) {
+                        client._clientLog.debug(`connect gateway cleanup skipped: ${formatCaughtError(closeErr)}`);
+                    }
+                    if (gateways.length > 1) {
+                        client._clientLog.warn(`connect: gateway ${gw} failed, trying next: ${formatCaughtError(err)}`);
+                    }
+                    if (client._state !== 'closed')
+                        this.runtime.lifecycle.setState('connecting');
+                }
+            }
+            if (client._state === 'connecting' || client._state === 'authenticating') {
+                this.runtime.lifecycle.setState(client._currentAid || client._aid ? 'standby' : 'no_identity');
+            }
+            const connectError = lastErr instanceof Error ? lastErr : new Error(String(lastErr));
+            this.runtime.lifecycle.setError(connectError, 'CONNECT_FAILED');
+            if (!fromInitialReconnect && client._sessionOptions?.auto_reconnect && shouldRetryInitialConnect(connectError)
+                && typeof client._handleTransportDisconnect === 'function') {
+                try {
+                    // 首连与已建立连接的断线共享同一重连入口，保证退避、并发闸门和取消语义一致。
+                    await client._handleTransportDisconnect(connectError, undefined, opts ?? {});
+                }
+                catch (reconnectErr) {
+                    client._clientLog.warn(`initial reconnect scheduling failed: ${formatCaughtError(reconnectErr)}`);
+                }
+            }
+            client._clientLog.error(`connect failed: ${formatCaughtError(lastErr)}`, lastErr instanceof Error ? lastErr : undefined);
+            client._clientLog.debug(`connect exit (error): elapsed=${Date.now() - tStart}ms err=${lastErr instanceof Error ? lastErr.message : String(lastErr)}`);
+            throw lastErr;
         }
-        if (client._state === 'connecting' || client._state === 'authenticating') {
-            this.runtime.lifecycle.setState(client._currentAid || client._aid ? 'standby' : 'no_identity');
+        finally {
+            if (connectionOwner)
+                this.finishConnectionAttempt(connectionOwner);
         }
-        this.runtime.lifecycle.setError(lastErr instanceof Error ? lastErr : new Error(String(lastErr)), 'CONNECT_FAILED');
-        client._clientLog.error(`connect failed: ${formatCaughtError(lastErr)}`, lastErr instanceof Error ? lastErr : undefined);
-        client._clientLog.debug(`connect exit (error): elapsed=${Date.now() - tStart}ms err=${lastErr instanceof Error ? lastErr.message : String(lastErr)}`);
-        throw lastErr;
     }
     async close() {
         const client = this.runtime.client;
         const tStart = Date.now();
         client._clientLog.debug(`close enter: state=${client._state}, aid=${client._aid ?? ''}`);
-        try {
-            this.runtime.lifecycle.setClosing(true);
-            // 不等待 transport.close，先隔离已在途的 inline Push 回调。
-            client._delivery.resetInlineAckState();
-            client._saveSeqTrackerState();
-            client._stopBackgroundTasks();
-            client._stopReconnect();
-            if (client.state === ConnectionState.NO_IDENTITY || client.state === ConnectionState.CLOSED) {
+        // 关闭意图必须在第一个 await 前生效，阻止迟到的连接/重连结果复活客户端。
+        this.runtime.lifecycle.setClosing(true);
+        client._delivery.resetInlineAckState();
+        if (this.lifecycleStopEventIsReentrant()) {
+            // 当前 stop 操作正在等待自己的 state_change handler；直接等待闸门会自锁。
+            // 先返回让 handler 完成，再由闸门尾部补做真正的 close。
+            if (client._lifecycleStopKind !== 'close')
+                this.scheduleReentrantClose();
+            return;
+        }
+        return this.withLifecycleStop(async () => {
+            try {
+                const pullInvalidation = client._rpcPipeline?.invalidatePulls?.();
+                client._rpcPipeline?.stopPullGateWatchdogs?.();
+                const reconnectCancellation = Promise.resolve(client._cancelReconnectAndWait());
+                const connectionCancellation = client._connectDone
+                    ? this.cancelConnectionAttemptAndWait()
+                    : Promise.resolve();
+                client._stopBackgroundTasks();
+                if (client.state === ConnectionState.NO_IDENTITY || client.state === ConnectionState.CLOSED) {
+                    await Promise.all([pullInvalidation, reconnectCancellation, connectionCancellation]);
+                    await client._saveSeqTrackerState();
+                    const closableStore = client._tokenStore;
+                    closableStore.close?.();
+                    this.runtime.lifecycle.setState('closed');
+                    client._logger.close();
+                    client._resetSeqTrackingState();
+                    client._clientLog.debug(`close exit: elapsed=${Date.now() - tStart}ms (was no_identity/closed)`);
+                    return;
+                }
+                await client._transport.close();
+                await Promise.all([pullInvalidation, reconnectCancellation, connectionCancellation]);
+                await client._saveSeqTrackerState();
                 const closableStore = client._tokenStore;
                 closableStore.close?.();
                 this.runtime.lifecycle.setState('closed');
                 client._logger.close();
+                await this.publishLifecycleStopEvent({ state: client._publicState(client._state) });
                 client._resetSeqTrackingState();
-                client._clientLog.debug(`close exit: elapsed=${Date.now() - tStart}ms (was no_identity/closed)`);
-                return;
+                client._clientLog.debug(`close exit: elapsed=${Date.now() - tStart}ms`);
             }
-            await client._transport.close();
-            const closableStore = client._tokenStore;
-            closableStore.close?.();
-            this.runtime.lifecycle.setState('closed');
-            client._logger.close();
-            await client._dispatcher.publish('state_change', { state: client._publicState(client._state) });
-            client._resetSeqTrackingState();
-            client._clientLog.debug(`close exit: elapsed=${Date.now() - tStart}ms`);
-        }
-        catch (err) {
-            client._clientLog.debug(`close exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-            throw err;
-        }
+            catch (err) {
+                client._clientLog.debug(`close exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
+                throw err;
+            }
+        }, 'close');
     }
     async disconnect() {
         const client = this.runtime.client;
         const tStart = Date.now();
         client._clientLog.debug(`disconnect enter: state=${client._state}, aid=${client._aid ?? ''}, closing=${client._closing}`);
+        if (client._closing || client._disconnecting || this.lifecycleStopEventIsReentrant())
+            return;
+        client._disconnecting = true;
         try {
-            if (client._closing) {
-                client._clientLog.debug(`disconnect exit: elapsed=${Date.now() - tStart}ms (closing)`);
-                return;
-            }
-            if (![
-                ConnectionState.AUTHENTICATED,
-                ConnectionState.CONNECTING,
-                ConnectionState.READY,
-                ConnectionState.RETRY_BACKOFF,
-                ConnectionState.RECONNECTING,
-                ConnectionState.CONNECTION_FAILED,
-            ].includes(client.state)) {
-                client._clientLog.debug(`disconnect exit: elapsed=${Date.now() - tStart}ms (state=${client._state})`);
-                return;
-            }
-            // 不等待 transport.close，先隔离已在途的 inline Push 回调。
-            client._delivery.resetInlineAckState();
-            client._saveSeqTrackerState();
-            client._stopBackgroundTasks();
-            client._stopReconnect();
-            await client._transport.close();
-            this.runtime.lifecycle.resetForDisconnect('standby');
-            await client._dispatcher.publish('state_change', { state: client._publicState(client._state) });
-            client._clientLog.debug(`disconnect exit: elapsed=${Date.now() - tStart}ms`);
+            return await this.withLifecycleStop(async () => {
+                if (client._closing) {
+                    client._clientLog.debug(`disconnect exit: elapsed=${Date.now() - tStart}ms (closing)`);
+                    return;
+                }
+                const hasInitialReconnect = Boolean(client._reconnectActive || client._reconnectAbort || client._reconnectTask);
+                const hasConnect = Boolean(client._connectDone);
+                if (!([
+                    ConnectionState.AUTHENTICATED,
+                    ConnectionState.CONNECTING,
+                    ConnectionState.READY,
+                    ConnectionState.RETRY_BACKOFF,
+                    ConnectionState.RECONNECTING,
+                    ConnectionState.CONNECTION_FAILED,
+                ].includes(client.state)) && !hasInitialReconnect && !hasConnect) {
+                    client._clientLog.debug(`disconnect exit: elapsed=${Date.now() - tStart}ms (state=${client._state})`);
+                    return;
+                }
+                // 不等待 transport.close，先隔离已在途的 inline Push 回调。
+                client._delivery.resetInlineAckState();
+                const pullInvalidation = client._rpcPipeline?.invalidatePulls?.();
+                client._rpcPipeline?.stopPullGateWatchdogs?.();
+                const reconnectCancellation = Promise.resolve(client._cancelReconnectAndWait());
+                const connectionCancellation = client._connectDone
+                    ? this.cancelConnectionAttemptAndWait()
+                    : Promise.resolve();
+                client._stopBackgroundTasks();
+                await client._transport.close();
+                await Promise.all([pullInvalidation, reconnectCancellation, connectionCancellation]);
+                await client._saveSeqTrackerState();
+                // close() 可能在 transport.close 等待期间抢先声明关闭意图；此时不得回写 standby。
+                if (client._closing)
+                    return;
+                this.runtime.lifecycle.resetForDisconnect('standby');
+                await this.publishLifecycleStopEvent({ state: client._publicState(client._state) });
+                client._clientLog.debug(`disconnect exit: elapsed=${Date.now() - tStart}ms`);
+            }, 'disconnect');
         }
         catch (err) {
             client._clientLog.debug(`disconnect exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
             throw err;
         }
+        finally {
+            client._disconnecting = false;
+        }
     }
 }
 //# sourceMappingURL=lifecycle.js.map