@zhin.js/adapter-icqq 9.0.0 → 9.0.2

package/lib/endpoint.js

@@ -1,8 +1,9 @@
 import { Client, parseGroupMessageId, } from '@icqqjs/icqq';
 import { inspect } from 'node:util';
+import { AsyncLocalStorage } from 'node:async_hooks';
+import { Endpoint } from 'zhin.js/adapter';
 import { receiveOneBotLikeSideEvent, SystemEvent, toCanonicalSegments } from '@zhin.js/core';
 import { formatCompact, getAdapterLogger, truncatePreview } from '@zhin.js/logger';
-import { registerIcqqAgentEndpoint } from './icqq-agent-deps.js';
 import { runIcqqLoginAssistStep } from './icqq-login-assist.js';
 import { InboundMessageDeduper, findIcqqNestedMessageSource, isIcqqBotMentioned, isIcqqMessagePostType, normalizeIcqqInboundMessage, messageLookupFromIcqqSource, resolveIcqqQuoteIdFromEvent, resolveIcqqInboundMedia, shouldSkipSelfInboundMessage, } from './icqq-inbound.js';
 import { isIcqqNoticePayload, isIcqqRequestPayload, } from './icqq-inbox.js';
@@ -28,7 +29,16 @@ const BOUND_EVENTS = [
     'system.login.error',
     'system.login.auth',
 ];
-export class IcqqEndpoint extends Client {
+class ManagedIcqqClient extends Client {
+    cancelReconnect() {
+        if (!this.login_timer)
+            return;
+        clearTimeout(this.login_timer);
+        this.login_timer = null;
+    }
+}
+export class IcqqEndpoint extends Endpoint {
+    client;
     #logger;
     #options;
     endpointName;
@@ -39,10 +49,13 @@ export class IcqqEndpoint extends Client {
     #open = false;
     #retiring = false;
     #started = false;
+    #retirementEpoch = 0;
+    #retirementArmed = false;
+    #disposeNativeEvents;
     #resolveStartOnline;
     #heldInbound = [];
-    #unregisterAgent;
     #inflightInbound = new Set();
+    #inboundOwner = new AsyncLocalStorage();
     #messageContent = new Map();
     content = Object.freeze({
         resolve: async (reference, context) => {
@@ -85,7 +98,7 @@ export class IcqqEndpoint extends Client {
             // ICQQ does not expose a cancellable getForwardMsg API. Keep the caller's
             // generation lease until the native operation actually settles, then honor
             // cancellation before publishing any resolved content.
-            const raw = await this.getForwardMsg(forwardId);
+            const raw = await this.client.getForwardMsg(forwardId);
             context.signal.throwIfAborted();
             const entries = normalizeForwardMsgResponse(raw).slice(0, state.remainingEntries);
             state.remainingEntries -= entries.length;
@@ -118,41 +131,41 @@ export class IcqqEndpoint extends Client {
         }
     }
     management = Object.freeze({
-        listFriends: async () => Array.from(this.fl.values()).map((f) => ({
+        listFriends: async () => Array.from(this.client.fl.values()).map((f) => ({
             user_id: f.user_id,
             nickname: f.nickname,
             remark: f.remark ?? '',
         })),
-        listGroups: async () => Array.from(this.gl.values()).map((g) => ({
+        listGroups: async () => Array.from(this.client.gl.values()).map((g) => ({
             group_id: g.group_id,
             name: g.group_name,
         })),
         listChannels: async () => {
-            await this.#guildCatalog.syncAll(this);
+            await this.#guildCatalog.syncAll(this.client);
             return this.#guildCatalog.getGuildChannelList();
         },
-        listGroupMembers: async (groupId) => Array.from((await this.getGroupMemberList(Number(groupId))).values()),
+        listGroupMembers: async (groupId) => Array.from((await this.client.getGroupMemberList(Number(groupId))).values()),
         listRequests: () => this.#listPendingRequests(),
         approveRequest: (requestId, remark) => this.#approveRequest(requestId, remark),
         rejectRequest: (requestId, reason) => this.#rejectRequest(requestId, reason),
         kickGroupMember: async (groupId, userId) => {
-            await this.setGroupKick(Number(groupId), Number(userId));
+            await this.client.setGroupKick(Number(groupId), Number(userId));
         },
         muteGroupMember: async (groupId, userId, duration) => {
-            await this.setGroupBan(Number(groupId), Number(userId), duration);
+            await this.client.setGroupBan(Number(groupId), Number(userId), duration);
         },
         setGroupAdmin: async (groupId, userId, enabled) => {
-            await this.setGroupAdmin(Number(groupId), Number(userId), enabled);
+            await this.client.setGroupAdmin(Number(groupId), Number(userId), enabled);
         },
         deleteFriend: async (userId) => {
-            await this.deleteFriend(Number(userId));
+            await this.client.deleteFriend(Number(userId));
         },
     });
     control = Object.freeze({
         recall: async (message) => {
             if (!message.id || message.id.startsWith('outbound:'))
                 return;
-            await this.deleteMsg(message.id);
+            await this.client.deleteMsg(message.id);
         },
         addReaction: async (message, emoji) => {
             const target = resolveIcqqGroupReactionTarget(message);
@@ -160,7 +173,7 @@ export class IcqqEndpoint extends Client {
                 return null;
             try {
                 // Do not await protocol ACK — packet timeout must not stall the AI reply.
-                this.#ignoreReactionAck('add', this.pickGroup(target.groupId).setReaction(target.seq, emoji));
+                this.#ignoreReactionAck('add', this.client.pickGroup(target.groupId).setReaction(target.seq, emoji));
             }
             catch (error) {
                 this.#logger.debug(formatCompact({
@@ -175,7 +188,7 @@ export class IcqqEndpoint extends Client {
             if (!target)
                 return;
             try {
-                this.#ignoreReactionAck('remove', this.pickGroup(target.groupId).delReaction(target.seq, reactionId));
+                this.#ignoreReactionAck('remove', this.client.pickGroup(target.groupId).delReaction(target.seq, reactionId));
             }
             catch (error) {
                 this.#logger.debug(formatCompact({
@@ -186,8 +199,9 @@ export class IcqqEndpoint extends Client {
         },
     });
     constructor(options) {
+        super();
         const nativeConfig = resolveNativeClientConfig(options.config);
-        super(Number(options.config.id), nativeConfig);
+        this.client = new ManagedIcqqClient(Number(options.config.id), nativeConfig);
         this.#logger = getAdapterLogger('icqq', options.config.id);
         this.#options = options;
         this.endpointName = options.config.id;
@@ -204,6 +218,12 @@ export class IcqqEndpoint extends Client {
         if (this.#started)
             return;
         signal.throwIfAborted();
+        // Invalidate a guard left by a prior lifecycle epoch before admitting a
+        // new login attempt on this endpoint instance.
+        this.#retirementEpoch += 1;
+        this.#retirementArmed = false;
+        this.#retiring = false;
+        this.client.off('system.online');
         this.#started = true;
         let resolveOnline;
         const onlineReady = new Promise((resolve) => {
@@ -214,13 +234,12 @@ export class IcqqEndpoint extends Client {
         signal.addEventListener('abort', onAbort, { once: true });
         try {
             this.#bindClientEvents();
-            await raceAbort(Promise.resolve(this.login(this.#options.config.password)), signal);
+            await raceAbort(Promise.resolve(this.client.login(this.#options.config.password)), signal);
             await onlineReady;
             signal.throwIfAborted();
             await this.#pullPendingSystemMessages(signal);
             signal.throwIfAborted();
-            this.#unregisterAgent = registerIcqqAgentEndpoint(this.endpointName, this);
-            this.#logger.info(`connected (direct) | friends: ${this.fl.size} | groups: ${this.gl.size}`);
+            this.#logger.info(`connected (direct) | friends: ${this.client.fl.size} | groups: ${this.client.gl.size}`);
         }
         catch (error) {
             await this.stop();
@@ -234,34 +253,48 @@ export class IcqqEndpoint extends Client {
         }
     }
     open() {
+        if (this.#retirementArmed) {
+            this.#retirementEpoch += 1;
+            this.#retirementArmed = false;
+            this.client.off('system.online');
+            this.#bindSystemOnlineEvent();
+        }
         this.#retiring = false;
         this.#open = true;
         const held = this.#heldInbound.splice(0);
-        for (const msg of held)
-            this.admit(msg);
+        for (const msg of held) {
+            void this.admit(msg).catch((error) => {
+                this.#logInboundHandlerFailure('held', error);
+            });
+        }
     }
     async close() {
-        this.#retiring = true;
-        this.#open = false;
+        this.#assertExternalLifecycle('close');
+        this.#armRetirementFence();
         await Promise.allSettled([...this.#inflightInbound]);
     }
     async stop() {
-        this.#retiring = true;
-        this.#open = false;
+        this.#assertExternalLifecycle('stop');
+        this.#armRetirementFence();
         await Promise.allSettled([...this.#inflightInbound]);
         this.#resolveStartOnline?.();
         this.#options.loginAssist.cancelOwned(this.#loginAssistOwner, 'endpoint_stopped');
         this.#heldInbound.length = 0;
-        this.#unregisterAgent?.();
-        this.#unregisterAgent = undefined;
-        for (const event of BOUND_EVENTS)
-            this.off(event);
-        try {
-            await this.logout?.();
+        this.#disposeNativeEvents?.();
+        this.#disposeNativeEvents = undefined;
+        for (const event of BOUND_EVENTS) {
+            // The retirement guard owns this matcher until a late login handshake
+            // has finished. start()/open() replace it with the normal listener.
+            if (event !== 'system.online')
+                this.client.off(event);
         }
-        catch { /* ignore */ }
+        // `Client.logout()` sends an account-level unregister packet before it
+        // closes this transport. During config HMR the replacement endpoint for
+        // the same UIN is already online, so unregistering the retiring generation
+        // also closes the replacement session. Endpoint ownership is transport
+        // scoped: retire only this Client's TCP connection.
         try {
-            this.terminate();
+            this.client.terminate();
         }
         catch { /* ignore */ }
         this.#inboundDeduper.clear();
@@ -270,6 +303,30 @@ export class IcqqEndpoint extends Client {
         this.#started = false;
         this.#logger.debug(formatCompact({ op: 'disconnect' }));
     }
+    #armRetirementFence() {
+        this.#retiring = true;
+        this.#open = false;
+        if (this.#retirementArmed)
+            return;
+        this.#retirementArmed = true;
+        const retirementEpoch = ++this.#retirementEpoch;
+        // ICQQ owns reconnect through this per-Client timer. Clear it before any
+        // asynchronous drain so a queued callback cannot enter while close waits.
+        this.client.cancelReconnect();
+        // A login callback may already be inside the SDK handshake, which has no
+        // abort API. Replace the normal online listener with an epoch-owned guard
+        // before draining inbound work. Transport termination is account-local;
+        // logout would also unregister an HMR replacement using the same UIN.
+        this.client.off('system.online');
+        this.client.on('system.online', () => {
+            if (this.#retirementEpoch !== retirementEpoch || !this.#retiring)
+                return;
+            try {
+                this.client.terminate();
+            }
+            catch { /* already closed */ }
+        });
+    }
     async send({ conversation, payload }) {
         if (!this.#started)
             throw new Error('icqq endpoint 未连接');
@@ -306,11 +363,11 @@ export class IcqqEndpoint extends Client {
         if (isIcqqFileElement(message)) {
             switch (target.kind) {
                 case 'private': {
-                    const id = await this.pickFriend(target.userId).sendFile(message.file, message.name);
+                    const id = await this.client.pickFriend(target.userId).sendFile(message.file, message.name);
                     return { message_id: id };
                 }
                 case 'group': {
-                    const stat = await this.pickGroup(target.groupId).sendFile(message.file, '/', message.name);
+                    const stat = await this.client.pickGroup(target.groupId).sendFile(message.file, '/', message.name);
                     return { message_id: stat.fid };
                 }
                 case 'temp':
@@ -320,16 +377,43 @@ export class IcqqEndpoint extends Client {
         }
         switch (target.kind) {
             case 'private':
-                return this.sendPrivateMsg(target.userId, message);
+                return this.client.sendPrivateMsg(target.userId, message);
             case 'group':
-                return this.sendGroupMsg(target.groupId, message);
+                return this.client.sendGroupMsg(target.groupId, message);
             case 'temp':
-                return this.sendTempMsg(target.groupId, target.userId, message);
+                return this.client.sendTempMsg(target.groupId, target.userId, message);
             case 'channel':
-                return this.sendGuildMsg(target.guildId, target.channelId, message);
+                return this.client.sendGuildMsg(target.guildId, target.channelId, message);
+        }
+    }
+    admit(msg) {
+        return this.#trackInbound(() => this.#deliverInbound(msg));
+    }
+    #trackInbound(run) {
+        const owner = Symbol('icqq-inbound');
+        let settle;
+        const settlement = new Promise((resolve) => { settle = resolve; });
+        this.#inflightInbound.add(settlement);
+        let operation;
+        try {
+            operation = this.#inboundOwner.run(owner, run);
+        }
+        catch (error) {
+            this.#inflightInbound.delete(settlement);
+            settle();
+            return Promise.reject(error);
         }
+        return operation.finally(() => {
+            this.#inflightInbound.delete(settlement);
+            settle();
+        });
     }
-    admit(msg, admittedBeforeRetire = false) {
+    #assertExternalLifecycle(operation) {
+        if (!this.#inboundOwner.getStore())
+            return;
+        throw new Error(`ICQQ endpoint ${operation} cannot run inside its own inbound receive; invoke it from the owning lifecycle`);
+    }
+    async #deliverInbound(msg, admittedBeforeRetire = false) {
         const conversation = msg.conversation;
         if (!this.#open && !admittedBeforeRetire) {
             if (this.#retiring)
@@ -361,7 +445,7 @@ export class IcqqEndpoint extends Client {
             + (msg.sender ? ` from ${msg.sender.name ?? msg.sender.id}` : '')
             + (mentioned ? ' (mentioned)' : '')
             + ` | ${truncatePreview(msg.content, 80)}`);
-        void this.#options.gateway.receive({
+        await this.emit('message.receive', {
             conversation,
             message: { conversation, id: msg.id },
             content: msg.content,
@@ -385,6 +469,7 @@ export class IcqqEndpoint extends Client {
         });
     }
     #bindClientEvents() {
+        this.#bindNativeEvents();
         const safe = (label, fn) => {
             try {
                 fn();
@@ -398,32 +483,101 @@ export class IcqqEndpoint extends Client {
                 }));
             }
         };
-        this.on('message.private', (event) => this.#startMessageEvent('message.private', event));
-        this.on('message.group', (event) => this.#startMessageEvent('message.group', event));
-        this.on('message.guild', (event) => safe('message.guild', () => this.#handleGuildEvent(event)));
-        this.on('request.friend', (event) => safe('request.friend', () => this.#onRequestEvent(serializeIcqqEvent(event))));
-        this.on('request.group', (event) => safe('request.group', () => this.#onRequestEvent(serializeIcqqEvent(event))));
-        this.on('notice.friend', (event) => safe('notice.friend', () => this.#onNoticeEvent(serializeIcqqEvent(event))));
-        this.on('notice.group', (event) => safe('notice.group', () => this.#onNoticeEvent(serializeIcqqEvent(event))));
-        this.on('system.online', (event) => safe('system.online', () => {
-            this.#resolveStartOnline?.();
-            this.#options.loginAssist.cancelOwned(this.#loginAssistOwner, 'online');
-            this.#logSystemEvent('online', event);
+        this.client.on('message.private', (event) => {
+            this.#startMessageEvent('message.private', event);
+        });
+        this.client.on('message.group', (event) => {
+            this.#startMessageEvent('message.group', event);
+        });
+        this.client.on('message.guild', (event) => {
+            void this.#handleGuildEvent(event).catch((error) => {
+                this.#logInboundHandlerFailure('message.guild', error);
+            });
+        });
+        this.client.on('request.friend', (event) => safe('request.friend', () => {
+            this.#onRequestEvent(serializeIcqqEvent(event));
+        }));
+        this.client.on('request.group', (event) => safe('request.group', () => {
+            this.#onRequestEvent(serializeIcqqEvent(event));
+        }));
+        this.client.on('notice.friend', (event) => safe('notice.friend', () => {
+            this.#onNoticeEvent(serializeIcqqEvent(event));
         }));
-        this.on('system.offline', (event) => this.#logSystemEvent('offline', event));
-        this.on('system.offline.network', (event) => this.#logSystemEvent('offline.network', event));
-        this.on('system.offline.kickoff', (event) => this.#logSystemEvent('offline.kickoff', event));
-        this.on('system.login.qrcode', (event) => {
+        this.client.on('notice.group', (event) => safe('notice.group', () => {
+            this.#onNoticeEvent(serializeIcqqEvent(event));
+        }));
+        this.#bindSystemOnlineEvent();
+        this.client.on('system.offline', (event) => {
+            this.#logSystemEvent('offline', event);
+        });
+        this.client.on('system.offline.network', (event) => {
+            this.#logSystemEvent('offline.network', event);
+        });
+        this.client.on('system.offline.kickoff', (event) => {
+            this.#logSystemEvent('offline.kickoff', event);
+        });
+        this.client.on('system.login.qrcode', (event) => {
             this.#logger.info('icqq 收到二维码登录事件，等待 LoginAssist / 终端确认后继续');
             this.#handleLoginChallenge('qrcode', event);
         });
-        this.on('system.login.device', (event) => this.#handleLoginChallenge('device', event));
-        this.on('system.login.slider', (event) => this.#handleLoginChallenge('slider', event));
-        this.on('system.login.error', (event) => {
+        this.client.on('system.login.device', (event) => {
+            this.#handleLoginChallenge('device', event);
+        });
+        this.client.on('system.login.slider', (event) => {
+            this.#handleLoginChallenge('slider', event);
+        });
+        this.client.on('system.login.error', (event) => {
             this.#options.loginAssist.cancelOwned(this.#loginAssistOwner, 'login_error');
             this.#logSystemEvent('login.error', event);
         });
-        this.on('system.login.auth', (event) => this.#handleLoginChallenge('auth', event));
+        this.client.on('system.login.auth', (event) => {
+            this.#handleLoginChallenge('auth', event);
+        });
+    }
+    #bindSystemOnlineEvent() {
+        this.client.on('system.online', (event) => {
+            if (this.#retiring)
+                return;
+            try {
+                this.#resolveStartOnline?.();
+                this.#options.loginAssist.cancelOwned(this.#loginAssistOwner, 'online');
+                this.#logSystemEvent('online', event);
+            }
+            catch (error) {
+                this.#logger.warn(formatCompact({
+                    op: 'icqq_event_handler',
+                    endpoint: this.endpointName,
+                    event: 'system.online',
+                    error: error instanceof Error ? error.message : String(error),
+                }));
+            }
+        });
+    }
+    /** Forward every public SDK event, including protocol extensions unknown to Zhin. */
+    #bindNativeEvents() {
+        this.#disposeNativeEvents?.();
+        let matchedName;
+        const registration = this.client.on((eventName) => {
+            matchedName = typeof eventName === 'string' && !eventName.startsWith('internal.')
+                ? eventName
+                : undefined;
+            return matchedName !== undefined;
+        }, (event) => {
+            const name = matchedName;
+            if (name)
+                this.#emitNativeEvent(name, event);
+        });
+        this.#disposeNativeEvents = () => registration();
+    }
+    #emitNativeEvent(name, event) {
+        void this.emitPlatform(name, event).catch((error) => {
+            this.#logger.warn(formatCompact({
+                op: 'icqq_platform_event_failed',
+                endpoint: this.endpointName,
+                event: name,
+                error: error instanceof Error ? error.message : String(error),
+            }));
+        });
     }
     #handleLoginChallenge(step, event) {
         const payload = serializeIcqqEvent(event) ?? (event && typeof event === 'object'
@@ -432,7 +586,7 @@ export class IcqqEndpoint extends Client {
         this.#logSystemEvent(`login.${step}`, event);
         void runIcqqLoginAssistStep({
             assist: this.#options.loginAssist,
-            client: this,
+            client: this.client,
             adapter: 'icqq',
             endpointKey: this.endpointName,
             owner: this.#loginAssistOwner,
@@ -451,11 +605,10 @@ export class IcqqEndpoint extends Client {
         this.#dispatchIcqqSystemSideEvent(type, payload);
     }
     #dispatchIcqqSideEvent(payload) {
-        const sideEvents = this.#options.sideEvents;
         const postType = String(payload.post_type ?? '');
         const isRequest = postType === 'request' || postType.startsWith('request.');
         const flag = payload.flag != null ? String(payload.flag) : '';
-        void receiveOneBotLikeSideEvent(sideEvents, {
+        void receiveOneBotLikeSideEvent((name, payload) => this.emit(name, payload), {
             adapter: 'icqq',
             endpointKey: this.endpointName,
             platform: 'icqq',
@@ -474,9 +627,8 @@ export class IcqqEndpoint extends Client {
         });
     }
     #dispatchIcqqSystemSideEvent(type, payload) {
-        const sideEvents = this.#options.sideEvents;
         const { scene_type, sub_type } = parseIcqqSystemScene(type);
-        void sideEvents.receiveSystem(SystemEvent.from(payload ?? {}, {
+        void this.emit('system.receive', SystemEvent.from(payload ?? {}, {
             $id: `system:${this.endpointName}:${type}:${Date.now()}`,
             $adapter: 'icqq',
             $endpoint: this.endpointName,
@@ -568,7 +720,7 @@ export class IcqqEndpoint extends Client {
                 timestamp: quoted.time ? quoted.time * (quoted.time < 1e12 ? 1000 : 1) : Date.now(),
             }));
         }
-        this.admit({
+        await this.#deliverInbound({
             id: normalized.messageId,
             conversation,
             content: formatInboundContent(normalized.rawMessage),
@@ -587,12 +739,9 @@ export class IcqqEndpoint extends Client {
         }, admittedBeforeRetire);
     }
     #startMessageEvent(eventName, event) {
-        const operation = this.#handleMessageEvent(eventName, event);
-        this.#inflightInbound.add(operation);
+        const operation = this.#trackInbound(() => this.#handleMessageEvent(eventName, event));
         void operation.catch((error) => {
             this.#logInboundHandlerFailure(eventName, error);
-        }).finally(() => {
-            this.#inflightInbound.delete(operation);
         });
     }
     #resolveInboundContact(data) {
@@ -601,13 +750,13 @@ export class IcqqEndpoint extends Client {
             return null;
         if (data.message_type === 'group' || data.group_id != null) {
             const groupId = Number(data.group_id);
-            return Number.isFinite(groupId) && groupId > 0 ? this.pickGroup(groupId) : null;
+            return Number.isFinite(groupId) && groupId > 0 ? this.client.pickGroup(groupId) : null;
         }
         const sourceGroupId = Number(data.sender?.group_id);
         if (Number.isFinite(sourceGroupId) && sourceGroupId > 0) {
-            return this.pickMember(sourceGroupId, userId);
+            return this.client.pickMember(sourceGroupId, userId);
         }
-        return this.pickFriend(userId);
+        return this.client.pickFriend(userId);
     }
     #logInboundHandlerFailure(event, error) {
         this.#logger.warn(formatCompact({
@@ -617,7 +766,7 @@ export class IcqqEndpoint extends Client {
             error: describeUnknownError(error),
         }));
     }
-    #handleGuildEvent(event) {
+    async #handleGuildEvent(event) {
         const payload = serializeIcqqEvent(event);
         if (!payload || typeof payload !== 'object')
             return;
@@ -640,7 +789,7 @@ export class IcqqEndpoint extends Client {
             }));
             return;
         }
-        this.admit({
+        await this.admit({
             id: normalized.messageId,
             conversation: icqqInboundConversation(String(this.#options.id), {
                 channelType: 'channel',
@@ -679,7 +828,7 @@ export class IcqqEndpoint extends Client {
         this.#dispatchIcqqSideEvent(payload);
     }
     async #listPendingRequests() {
-        const messages = await this.getSystemMsg();
+        const messages = await this.client.getSystemMsg();
         const rows = [];
         for (const raw of messages) {
             const msg = raw;
@@ -707,7 +856,7 @@ export class IcqqEndpoint extends Client {
     }
     async #pullPendingSystemMessages(signal) {
         try {
-            const messages = await raceAbort(Promise.resolve(this.getSystemMsg()), signal);
+            const messages = await raceAbort(Promise.resolve(this.client.getSystemMsg()), signal);
             for (const raw of messages) {
                 signal.throwIfAborted();
                 const msg = raw;
@@ -738,7 +887,7 @@ export class IcqqEndpoint extends Client {
         }
     }
     async #approveRequest(id, remark) {
-        const messages = await this.getSystemMsg();
+        const messages = await this.client.getSystemMsg();
         const target = messages.find((m) => {
             const msg = m;
             return msg.flag === id || (msg.seq != null && String(msg.seq) === id);
@@ -747,14 +896,14 @@ export class IcqqEndpoint extends Client {
             throw new Error(`icqq 未找到待处理请求: ${id}`);
         }
         if (target.request_type === 'friend') {
-            await this.setFriendAddRequest(target.flag, true, remark);
+            await this.client.setFriendAddRequest(target.flag, true, remark);
         }
         else {
-            await this.setGroupAddRequest(target.flag, true);
+            await this.client.setGroupAddRequest(target.flag, true);
         }
     }
     async #rejectRequest(id, reason) {
-        const messages = await this.getSystemMsg();
+        const messages = await this.client.getSystemMsg();
         const target = messages.find((m) => {
             const msg = m;
             return msg.flag === id || (msg.seq != null && String(msg.seq) === id);
@@ -763,10 +912,10 @@ export class IcqqEndpoint extends Client {
             throw new Error(`icqq 未找到待处理请求: ${id}`);
         }
         if (target.request_type === 'friend') {
-            await this.setFriendAddRequest(target.flag, false);
+            await this.client.setFriendAddRequest(target.flag, false);
         }
         else {
-            await this.setGroupAddRequest(target.flag, false, reason);
+            await this.client.setGroupAddRequest(target.flag, false, reason);
         }
     }
 }

package/lib/icqq-endpoint-commands.d.ts

@@ -1 +1 @@
-export declare const icqqEndpointCommands: import("@zhin.js/adapter").EndpointCommands<Readonly<import("@zhin.js/command").CommandDefinition<unknown, unknown, import("@zhin.js/command").CommandMessage>>>;
+export declare const icqqEndpointCommands: import("@zhin.js/adapter").EndpointCommands<Readonly<import("@zhin.js/command").CommandDefinition<unknown, unknown, import("@zhin.js/command").CommandMessage, string | undefined>>>;

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 export { Actions, formatInboundContent, formatOutboundBody, icqqInboundConversation, icqqOutboundTarget, type ActionResult, type IcqqAdapterConfig, type IcqqInboundMessage, type IcqqWireSegment, type ParsedIcqqSendTarget, type ResolvedIcqqConfig, } from './protocol.js';
 export { IcqqEndpoint, type IcqqEndpointOptions, } from './endpoint.js';
 export * from './types.js';
-export { getIcqqAgentDeps, registerIcqqAgentEndpoint, setIcqqAgentDeps, type IcqqAgentDeps, type IcqqAgentEndpoint, } from './icqq-agent-deps.js';
+export { icqqClient, type IcqqClient, type IcqqClientEventMap, } from './client.js';
 export { resolveIcqqInboundMessageId, } from './icqq-inbound.js';

package/lib/index.js

@@ -1,5 +1,5 @@
 export { Actions, formatInboundContent, formatOutboundBody, icqqInboundConversation, icqqOutboundTarget, } from './protocol.js';
 export { IcqqEndpoint, } from './endpoint.js';
 export * from './types.js';
-export { getIcqqAgentDeps, registerIcqqAgentEndpoint, setIcqqAgentDeps, } from './icqq-agent-deps.js';
+export { icqqClient, } from './client.js';
 export { resolveIcqqInboundMessageId, } from './icqq-inbound.js';

package/lib/protocol.js

@@ -180,7 +180,7 @@ export function resolveIcqqConfig(config = {}) {
     }
     const autoReconnect = config.autoReconnect ?? entry?.autoReconnect ?? true;
     const outboundMedia = config.outboundMedia ?? entry?.outboundMedia;
-    const password = entry?.password;
+    const password = config.password ?? entry?.password;
     const platform = config.platform ?? entry?.platform ?? 2;
     const ver = config.ver ?? entry?.ver ?? '9.1.70';
     const dataDir = config.dataDir ?? entry?.dataDir ?? `data/icqq/${id}`;