@zhin.js/adapter-icqq 8.0.13 → 8.0.14

package/lib/endpoint.js

@@ -1,12 +1,15 @@
 import { Client, parseGroupMessageId, } from '@icqqjs/icqq';
 import { inspect } from 'node:util';
+import { receiveOneBotLikeSideEvent, SystemEvent, toCanonicalSegments } from '@zhin.js/core';
 import { formatCompact, getAdapterLogger, truncatePreview } from '@zhin.js/logger';
 import { registerIcqqAgentEndpoint } from './icqq-agent-deps.js';
-import { InboundMessageDeduper, findIcqqNestedMessageSource, isIcqqBotMentioned, isIcqqMessagePostType, normalizeIcqqInboundMessage, quotedPayloadFromIcqqSource, resolveIcqqQuoteIdFromEvent, shouldSkipSelfInboundMessage, } from './icqq-inbound.js';
-import { buildIcqqInboxNoticeRow, buildIcqqInboxRequestRow, buildIcqqSystemRequestRow, isIcqqNoticePayload, isIcqqRequestPayload, } from './icqq-inbox.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';
 import { IcqqGuildCatalog, normalizeIcqqGuildInboundMessage, } from './icqq-guild.js';
-import { materializeOutboundBase64, resolveIcqqOutboundMediaMode, } from './outbound-media.js';
+import { prepareIcqqOutboundMedia, resolveIcqqOutboundMediaMode, } from './outbound-media.js';
 import { formatInboundContent, formatOutboundBody, icqqInboundConversation, icqqOutboundTarget, } from './protocol.js';
+import { normalizeForwardMsgResponse } from './forward-msg.js';
 const BOUND_EVENTS = [
     'message.private',
     'message.group',
@@ -31,11 +34,89 @@ export class IcqqEndpoint extends Client {
     endpointName;
     #guildCatalog = new IcqqGuildCatalog();
     #inboundDeduper = new InboundMessageDeduper();
-    #inboxDeduper = new InboundMessageDeduper();
+    #sideEventDeduper = new InboundMessageDeduper();
+    #loginAssistOwner = Object.freeze({});
     #open = false;
+    #retiring = false;
     #started = false;
+    #resolveStartOnline;
     #heldInbound = [];
     #unregisterAgent;
+    #inflightInbound = new Set();
+    #messageContent = new Map();
+    content = Object.freeze({
+        resolve: async (reference, context) => {
+            context.signal.throwIfAborted();
+            if (reference.kind === 'message') {
+                const cached = this.#messageContent.get(reference.message.id);
+                return cached
+                    ? Object.freeze({ status: 'resolved', reference, value: cached })
+                    : Object.freeze({ status: 'not_found', code: 'icqq_message_not_observed' });
+            }
+            if (reference.kind === 'forward') {
+                try {
+                    const entries = await this.#resolveForwardEntries(reference.forwardId, context, { remainingEntries: context.maxEntries, path: new Set() }, 0);
+                    if (entries.length === 0)
+                        return Object.freeze({ status: 'not_found', code: 'icqq_forward_not_found' });
+                    return Object.freeze({ status: 'resolved', reference, value: Object.freeze(entries) });
+                }
+                catch (error) {
+                    if (context.signal.aborted)
+                        throw error;
+                    return Object.freeze({
+                        status: 'failed',
+                        code: 'icqq_forward_fetch_failed',
+                        message: error instanceof Error ? error.message : String(error),
+                    });
+                }
+            }
+            if (reference.media.kind === 'url' || reference.media.kind === 'base64' || reference.media.kind === 'path') {
+                return Object.freeze({ status: 'resolved', reference, value: reference.media });
+            }
+            return Object.freeze({ status: 'unsupported', code: 'icqq_media_reference_unsupported' });
+        },
+    });
+    async #resolveForwardEntries(forwardId, context, state, depth) {
+        context.signal.throwIfAborted();
+        if (state.remainingEntries <= 0 || state.path.has(forwardId))
+            return Object.freeze([]);
+        state.path.add(forwardId);
+        try {
+            // 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);
+            context.signal.throwIfAborted();
+            const entries = normalizeForwardMsgResponse(raw).slice(0, state.remainingEntries);
+            state.remainingEntries -= entries.length;
+            const expanded = [];
+            for (const entry of entries) {
+                context.signal.throwIfAborted();
+                const segments = [];
+                for (const segment of entry.segments) {
+                    if (segment.type !== 'forward' || depth >= context.maxDepth) {
+                        segments.push(segment);
+                        continue;
+                    }
+                    const nestedId = String(segment.data.forward_id ?? '').trim();
+                    if (!nestedId || state.path.has(nestedId) || state.remainingEntries <= 0) {
+                        segments.push(segment);
+                        continue;
+                    }
+                    const nested = await this.#resolveForwardEntries(nestedId, context, state, depth + 1);
+                    segments.push(Object.freeze({
+                        ...segment,
+                        data: Object.freeze({ ...segment.data, ...(nested.length > 0 ? { entries: nested } : {}) }),
+                    }));
+                }
+                expanded.push(Object.freeze({ ...entry, segments: Object.freeze(segments) }));
+            }
+            return Object.freeze(expanded);
+        }
+        finally {
+            state.path.delete(forwardId);
+        }
+    }
     management = Object.freeze({
         listFriends: async () => Array.from(this.fl.values()).map((f) => ({
             user_id: f.user_id,
@@ -51,6 +132,7 @@ export class IcqqEndpoint extends Client {
             return this.#guildCatalog.getGuildChannelList();
         },
         listGroupMembers: async (groupId) => Array.from((await this.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) => {
@@ -118,18 +200,25 @@ export class IcqqEndpoint extends Client {
             }));
         });
     }
-    async start() {
+    async start(signal) {
         if (this.#started)
             return;
+        signal.throwIfAborted();
         this.#started = true;
+        let resolveOnline;
+        const onlineReady = new Promise((resolve) => {
+            resolveOnline = resolve;
+        });
+        const onAbort = () => resolveOnline();
+        this.#resolveStartOnline = resolveOnline;
+        signal.addEventListener('abort', onAbort, { once: true });
         try {
-            const onlineReady = new Promise((resolve) => {
-                this.on('system.online', () => resolve());
-            });
             this.#bindClientEvents();
-            await this.login(this.#options.config.password);
+            await raceAbort(Promise.resolve(this.login(this.#options.config.password)), signal);
             await onlineReady;
-            await this.#pullPendingSystemMessages();
+            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}`);
         }
@@ -138,18 +227,30 @@ export class IcqqEndpoint extends Client {
             this.#logger.debug(`Failed to connect ICQQ client: ${error instanceof Error ? error.stack ?? error.message : String(error)}`);
             throw error;
         }
+        finally {
+            signal.removeEventListener('abort', onAbort);
+            if (this.#resolveStartOnline === resolveOnline)
+                this.#resolveStartOnline = undefined;
+        }
     }
     open() {
+        this.#retiring = false;
         this.#open = true;
         const held = this.#heldInbound.splice(0);
         for (const msg of held)
             this.admit(msg);
     }
-    close() {
+    async close() {
+        this.#retiring = true;
         this.#open = false;
+        await Promise.allSettled([...this.#inflightInbound]);
     }
     async stop() {
+        this.#retiring = true;
         this.#open = false;
+        await Promise.allSettled([...this.#inflightInbound]);
+        this.#resolveStartOnline?.();
+        this.#options.loginAssist.cancelOwned(this.#loginAssistOwner, 'endpoint_stopped');
         this.#heldInbound.length = 0;
         this.#unregisterAgent?.();
         this.#unregisterAgent = undefined;
@@ -164,7 +265,7 @@ export class IcqqEndpoint extends Client {
         }
         catch { /* ignore */ }
         this.#inboundDeduper.clear();
-        this.#inboxDeduper.clear();
+        this.#sideEventDeduper.clear();
         this.#guildCatalog.clear();
         this.#started = false;
         this.#logger.debug(formatCompact({ op: 'disconnect' }));
@@ -173,44 +274,66 @@ export class IcqqEndpoint extends Client {
         if (!this.#started)
             throw new Error('icqq endpoint 未连接');
         const mediaMode = resolveIcqqOutboundMediaMode(this.#options.config);
-        const content = Array.isArray(payload)
-            ? materializeOutboundBase64(payload, mediaMode)
-            : payload;
-        const message = formatOutboundBody(content);
-        const parsed = icqqOutboundTarget(conversation);
-        let result;
+        const prepared = isIcqqSegmentPayload(payload)
+            ? prepareIcqqOutboundMedia(payload, mediaMode)
+            : { content: payload, dispose() { } };
         try {
-            switch (parsed.kind) {
-                case 'private':
-                    result = await this.sendPrivateMsg(parsed.userId, message);
-                    break;
-                case 'group':
-                    result = await this.sendGroupMsg(parsed.groupId, message);
-                    break;
+            const message = formatOutboundBody(prepared.content);
+            const preview = formatIcqqSendablePreview(message);
+            const parsed = icqqOutboundTarget(conversation);
+            let result;
+            try {
+                result = await this.#sendNative(parsed, message);
+            }
+            catch (error) {
+                this.#logger.warn(formatCompact({
+                    op: 'icqq_send_failed',
+                    target: `${conversation.kind}:${conversation.id}`,
+                    error: describeUnknownError(error),
+                    preview: truncatePreview(preview, 120),
+                }));
+                throw error;
+            }
+            const messageId = String(result?.message_id ?? `sent_${Date.now()}`);
+            this.#logger.info(`send ${conversation.kind}:${conversation.id} | id: ${messageId} | ${truncatePreview(preview, 80)}`);
+            return messageId;
+        }
+        finally {
+            prepared.dispose();
+        }
+    }
+    async #sendNative(target, message) {
+        if (isIcqqFileElement(message)) {
+            switch (target.kind) {
+                case 'private': {
+                    const id = await this.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);
+                    return { message_id: stat.fid };
+                }
                 case 'temp':
-                    result = await this.sendTempMsg(parsed.groupId, parsed.userId, message);
-                    break;
                 case 'channel':
-                    result = await this.sendGuildMsg(parsed.guildId, parsed.channelId, message);
-                    break;
+                    throw new TypeError(`ICQQ ${target.kind} conversation does not support file delivery`);
             }
         }
-        catch (error) {
-            this.#logger.warn(formatCompact({
-                op: 'icqq_send_failed',
-                target: `${conversation.kind}:${conversation.id}`,
-                error: describeUnknownError(error),
-                preview: truncatePreview(typeof message === 'string' ? message : String(message), 120),
-            }));
-            throw error;
+        switch (target.kind) {
+            case 'private':
+                return this.sendPrivateMsg(target.userId, message);
+            case 'group':
+                return this.sendGroupMsg(target.groupId, message);
+            case 'temp':
+                return this.sendTempMsg(target.groupId, target.userId, message);
+            case 'channel':
+                return this.sendGuildMsg(target.guildId, target.channelId, message);
         }
-        const messageId = String(result?.message_id ?? `sent_${Date.now()}`);
-        this.#logger.info(`send ${conversation.kind}:${conversation.id} | id: ${messageId} | ${truncatePreview(typeof message === 'string' ? message : String(message), 80)}`);
-        return messageId;
     }
-    admit(msg) {
+    admit(msg, admittedBeforeRetire = false) {
         const conversation = msg.conversation;
-        if (!this.#open) {
+        if (!this.#open && !admittedBeforeRetire) {
+            if (this.#retiring)
+                return;
             if (this.#heldInbound.length >= INBOUND_HOLD_LIMIT) {
                 const dropped = this.#heldInbound.shift();
                 this.#logger.warn(formatCompact({
@@ -238,8 +361,6 @@ export class IcqqEndpoint extends Client {
             + (msg.sender ? ` from ${msg.sender.name ?? msg.sender.id}` : '')
             + (mentioned ? ' (mentioned)' : '')
             + ` | ${truncatePreview(msg.content, 80)}`);
-        const quoteId = msg.metadata?.quote_id;
-        const { quote_id: _dropQuoteId, ...restMetadata } = msg.metadata ?? {};
         void this.#options.gateway.receive({
             conversation,
             message: { conversation, id: msg.id },
@@ -248,10 +369,10 @@ export class IcqqEndpoint extends Client {
             sender: msg.sender,
             endpointId: this.endpointName,
             ...(mentioned ? { mentioned: true } : {}),
-            ...(quoteId ? { replyTo: { id: String(quoteId) } } : {}),
+            ...(msg.replyTo ? { replyTo: msg.replyTo } : {}),
             metadata: Object.freeze({
                 channelType: msg.channelType,
-                ...restMetadata,
+                ...(msg.metadata ?? {}),
             }),
         }).catch((err) => {
             this.#logger.warn(formatCompact({
@@ -277,23 +398,48 @@ export class IcqqEndpoint extends Client {
                 }));
             }
         };
-        this.on('message.private', (event) => safe('message.private', () => this.#handleMessageEvent('message.private', event)));
-        this.on('message.group', (event) => safe('message.group', () => this.#handleMessageEvent('message.group', event)));
+        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.#recordInboxRequest(serializeIcqqEvent(event))));
-        this.on('request.group', (event) => safe('request.group', () => this.#recordInboxRequest(serializeIcqqEvent(event))));
-        this.on('notice.friend', (event) => safe('notice.friend', () => this.#recordInboxNotice(serializeIcqqEvent(event))));
-        this.on('notice.group', (event) => safe('notice.group', () => this.#recordInboxNotice(serializeIcqqEvent(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.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', () => {
-            this.#logger.info('icqq 收到二维码登录事件，请按 icqq 默认流程扫码后继续登录');
+        this.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.#options.loginAssist.cancelOwned(this.#loginAssistOwner, 'login_error');
+            this.#logSystemEvent('login.error', event);
+        });
+        this.on('system.login.auth', (event) => this.#handleLoginChallenge('auth', event));
+    }
+    #handleLoginChallenge(step, event) {
+        const payload = serializeIcqqEvent(event) ?? (event && typeof event === 'object'
+            ? event
+            : null);
+        this.#logSystemEvent(`login.${step}`, event);
+        void runIcqqLoginAssistStep({
+            assist: this.#options.loginAssist,
+            client: this,
+            adapter: 'icqq',
+            endpointKey: this.endpointName,
+            owner: this.#loginAssistOwner,
+            logger: this.#logger,
+            step,
+            event: payload ?? event,
         });
-        this.on('system.login.device', (event) => this.#logSystemEvent('login.device', event));
-        this.on('system.login.slider', (event) => this.#logSystemEvent('login.slider', event));
-        this.on('system.login.error', (event) => this.#logSystemEvent('login.error', event));
-        this.on('system.login.auth', (event) => this.#logSystemEvent('login.auth', event));
     }
     #logSystemEvent(type, event) {
         const payload = serializeIcqqEvent(event);
@@ -302,8 +448,56 @@ export class IcqqEndpoint extends Client {
             endpoint: this.endpointName,
             ...(payload ? { event: JSON.stringify(payload) } : {}),
         }));
+        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, {
+            adapter: 'icqq',
+            endpointKey: this.endpointName,
+            platform: 'icqq',
+            raw: payload,
+            ...(isRequest ? {
+                approve: (id, remark) => this.#approveRequest(flag || id, remark),
+                reject: (id, reason) => this.#rejectRequest(flag || id, reason),
+            } : {}),
+        }).catch((err) => {
+            this.#logger.warn(formatCompact({
+                op: 'icqq_side_event_failed',
+                endpoint: this.endpointName,
+                post_type: postType || undefined,
+                error: err instanceof Error ? err.message : String(err),
+            }));
+        });
     }
-    #handleMessageEvent(eventName, event) {
+    #dispatchIcqqSystemSideEvent(type, payload) {
+        const sideEvents = this.#options.sideEvents;
+        const { scene_type, sub_type } = parseIcqqSystemScene(type);
+        void sideEvents.receiveSystem(SystemEvent.from(payload ?? {}, {
+            $id: `system:${this.endpointName}:${type}:${Date.now()}`,
+            $adapter: 'icqq',
+            $endpoint: this.endpointName,
+            $type: 'system',
+            $scene_id: this.endpointName,
+            $scene_type: scene_type,
+            $sub_type: sub_type,
+            $timestamp: Date.now(),
+        })).catch((err) => {
+            this.#logger.warn(formatCompact({
+                op: 'icqq_system_side_event_failed',
+                endpoint: this.endpointName,
+                type,
+                error: err instanceof Error ? err.message : String(err),
+            }));
+        });
+    }
+    async #handleMessageEvent(eventName, event) {
+        if (this.#retiring)
+            return;
+        const admittedBeforeRetire = this.#open;
         const payload = serializeIcqqEvent(event);
         if (!payload || !isIcqqMessagePostType(payload)) {
             this.#logger.debug(formatCompact({
@@ -325,6 +519,15 @@ export class IcqqEndpoint extends Client {
             }));
             return;
         }
+        const contact = this.#resolveInboundContact(data);
+        if (contact) {
+            await resolveIcqqInboundMedia(data.message, {
+                getPttUrl: (element) => contact.getPttUrl(element),
+                getVideoUrl: (element) => contact.getVideoUrl(element),
+            });
+            if (!this.#started)
+                return;
+        }
         const normalized = normalizeIcqqInboundMessage(data);
         if (!normalized) {
             this.#logger.debug(formatCompact({
@@ -345,13 +548,29 @@ export class IcqqEndpoint extends Client {
             }));
             return;
         }
+        const conversation = icqqInboundConversation(String(this.#options.id), {
+            channelType: normalized.channelType,
+            channelId: normalized.channelId,
+            channelParentGroupId: normalized.channelParentGroupId,
+        });
+        const quoteId = resolveIcqqQuoteIdFromEvent(data);
+        const quoted = messageLookupFromIcqqSource(findIcqqNestedMessageSource(data));
+        if (quoteId && quoted) {
+            this.#messageContent.set(quoteId, Object.freeze({
+                ref: Object.freeze({ conversation, id: quoteId }),
+                ...(quoted.sender?.id ? { actor: Object.freeze({
+                        id: quoted.sender.id,
+                        ...(quoted.sender.name ? { displayName: quoted.sender.name } : {}),
+                    }) } : {}),
+                segments: Object.freeze(toCanonicalSegments(Array.isArray(quoted.content)
+                    ? quoted.content
+                    : [{ type: 'text', data: { text: quoted.content } }])),
+                timestamp: quoted.time ? quoted.time * (quoted.time < 1e12 ? 1000 : 1) : Date.now(),
+            }));
+        }
         this.admit({
             id: normalized.messageId,
-            conversation: icqqInboundConversation(String(this.#options.id), {
-                channelType: normalized.channelType,
-                channelId: normalized.channelId,
-                channelParentGroupId: normalized.channelParentGroupId,
-            }),
+            conversation,
             content: formatInboundContent(normalized.rawMessage),
             segments: normalized.content,
             sender: {
@@ -360,12 +579,44 @@ export class IcqqEndpoint extends Client {
                 ...(normalized.senderRole ? { roles: [normalized.senderRole] } : {}),
             },
             channelType: normalized.channelType,
-            metadata: buildIcqqQuoteMetadata(data, {
+            ...(quoteId ? { replyTo: { id: quoteId } } : {}),
+            metadata: {
                 nickname: normalized.nickname,
                 senderRole: normalized.senderRole,
-            }),
+            },
+        }, admittedBeforeRetire);
+    }
+    #startMessageEvent(eventName, event) {
+        const operation = this.#handleMessageEvent(eventName, event);
+        this.#inflightInbound.add(operation);
+        void operation.catch((error) => {
+            this.#logInboundHandlerFailure(eventName, error);
+        }).finally(() => {
+            this.#inflightInbound.delete(operation);
         });
     }
+    #resolveInboundContact(data) {
+        const userId = Number(data.user_id ?? data.from_id);
+        if (!Number.isFinite(userId) || userId <= 0)
+            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;
+        }
+        const sourceGroupId = Number(data.sender?.group_id);
+        if (Number.isFinite(sourceGroupId) && sourceGroupId > 0) {
+            return this.pickMember(sourceGroupId, userId);
+        }
+        return this.pickFriend(userId);
+    }
+    #logInboundHandlerFailure(event, error) {
+        this.#logger.warn(formatCompact({
+            op: 'icqq_inbound_handler_failed',
+            endpoint: this.endpointName,
+            event,
+            error: describeUnknownError(error),
+        }));
+    }
     #handleGuildEvent(event) {
         const payload = serializeIcqqEvent(event);
         if (!payload || typeof payload !== 'object')
@@ -406,71 +657,81 @@ export class IcqqEndpoint extends Client {
             },
         });
     }
-    #recordInboxRequest(payload) {
+    #onRequestEvent(payload) {
         if (!payload || !isIcqqRequestPayload(payload))
             return;
-        const hooks = this.#options.inbox;
-        if (!hooks)
-            return;
-        const row = buildIcqqInboxRequestRow(payload, this.#inboxBase());
-        if (!row)
+        const flag = payload.flag != null ? String(payload.flag) : (payload.seq != null ? String(payload.seq) : '');
+        if (flag && !this.#sideEventDeduper.shouldProcess(`request:${flag}`))
             return;
-        if (!this.#inboxDeduper.shouldProcess(`request:${String(row.platform_request_id)}`))
-            return;
-        void hooks.recordRequest(row);
-        hooks.publish?.('endpoint:request', row);
+        this.#dispatchIcqqSideEvent(payload);
     }
-    #recordInboxNotice(payload) {
+    #onNoticeEvent(payload) {
         if (!payload || !isIcqqNoticePayload(payload))
             return;
-        const hooks = this.#options.inbox;
-        if (!hooks)
-            return;
-        const row = buildIcqqInboxNoticeRow(payload, this.#inboxBase());
-        if (!row)
-            return;
-        if (!this.#inboxDeduper.shouldProcess(`notice:${String(row.platform_notice_id)}`))
+        const key = [
+            payload.time,
+            payload.operator_id ?? payload.user_id,
+            payload.notice_type ?? payload.type,
+            payload.sub_type,
+        ].join('_');
+        if (!this.#sideEventDeduper.shouldProcess(`notice:${key}`))
             return;
-        void hooks.recordNotice(row);
-        hooks.publish?.('endpoint:notice', row);
+        this.#dispatchIcqqSideEvent(payload);
     }
-    #inboxBase() {
-        const id = String(this.#options.id);
-        return { adapter: id.split('\0').pop() ?? id, endpointKey: this.endpointName };
+    async #listPendingRequests() {
+        const messages = await this.getSystemMsg();
+        const rows = [];
+        for (const raw of messages) {
+            const msg = raw;
+            const kind = msg.request_type === 'friend' ? 'friend' : 'group';
+            const platformRequestId = (msg.flag && String(msg.flag).trim())
+                || (msg.seq != null ? String(msg.seq) : '');
+            if (!platformRequestId || msg.user_id == null)
+                continue;
+            const createdAt = Number(msg.time);
+            rows.push(Object.freeze({
+                platform_request_id: platformRequestId,
+                type: kind,
+                scene_type: kind === 'group' ? 'group' : null,
+                scene_id: String(kind === 'group' ? (msg.group_id ?? msg.user_id) : msg.user_id),
+                sub_type: kind === 'group' ? (msg.type != null ? String(msg.type) : null) : null,
+                actor_id: String(msg.user_id),
+                actor_name: msg.nickname != null ? String(msg.nickname) : null,
+                comment: msg.comment != null ? String(msg.comment) : null,
+                created_at: Number.isFinite(createdAt) && createdAt > 0
+                    ? (createdAt < 1e12 ? createdAt * 1000 : createdAt)
+                    : Date.now(),
+            }));
+        }
+        return Object.freeze(rows);
     }
-    async #pullPendingSystemMessages() {
-        const hooks = this.#options.inbox;
-        if (!hooks)
-            return;
+    async #pullPendingSystemMessages(signal) {
         try {
-            const messages = await this.getSystemMsg();
-            const friendRequests = [];
-            const groupRequests = [];
-            for (const msg of messages) {
-                if (msg.request_type === 'friend') {
-                    friendRequests.push(msg);
-                }
-                else {
-                    groupRequests.push(msg);
-                }
-            }
-            const base = this.#inboxBase();
-            const rows = [
-                ...friendRequests.map((m) => buildIcqqSystemRequestRow(m, 'friend', base)),
-                ...groupRequests.map((m) => buildIcqqSystemRequestRow(m, 'group', base)),
-            ];
-            for (const row of rows) {
-                if (!row)
+            const messages = await raceAbort(Promise.resolve(this.getSystemMsg()), signal);
+            for (const raw of messages) {
+                signal.throwIfAborted();
+                const msg = raw;
+                const kind = msg.request_type === 'friend' ? 'friend' : 'group';
+                const flag = msg.flag != null ? String(msg.flag) : (msg.seq != null ? String(msg.seq) : '');
+                if (!flag || !this.#sideEventDeduper.shouldProcess(`request:${flag}`))
                     continue;
-                if (!this.#inboxDeduper.shouldProcess(`request:${String(row.platform_request_id)}`))
-                    continue;
-                void hooks.recordRequest(row);
-                hooks.publish?.('endpoint:request', row);
+                this.#dispatchIcqqSideEvent({
+                    post_type: 'request',
+                    request_type: kind,
+                    flag: msg.flag,
+                    user_id: msg.user_id,
+                    group_id: msg.group_id,
+                    comment: msg.comment,
+                    time: msg.time,
+                    sub_type: msg.type,
+                });
             }
         }
         catch (error) {
+            if (signal.aborted)
+                throw signal.reason ?? error;
             this.#logger.debug(formatCompact({
-                op: 'inbox_pull_system_msg',
+                op: 'side_event_pull_system_msg',
                 endpoint: this.endpointName,
                 error: error instanceof Error ? error.message : String(error),
             }));
@@ -509,6 +770,41 @@ export class IcqqEndpoint extends Client {
         }
     }
 }
+function formatIcqqSendablePreview(message) {
+    if (typeof message === 'string')
+        return message;
+    try {
+        return JSON.stringify(message, (_key, value) => Buffer.isBuffer(value) ? '<buffer>' : value);
+    }
+    catch {
+        return '[ICQQ Sendable]';
+    }
+}
+function isIcqqSegmentPayload(payload) {
+    if (Array.isArray(payload))
+        return true;
+    return typeof payload === 'object'
+        && payload !== null
+        && typeof payload.type === 'string';
+}
+function isIcqqFileElement(message) {
+    return !Array.isArray(message)
+        && typeof message !== 'string'
+        && message.type === 'file';
+}
+async function raceAbort(operation, signal) {
+    signal.throwIfAborted();
+    let rejectAbort;
+    const aborted = new Promise((_resolve, reject) => { rejectAbort = reject; });
+    const onAbort = () => rejectAbort(signal.reason ?? new Error('ICQQ operation aborted'));
+    signal.addEventListener('abort', onAbort, { once: true });
+    try {
+        return await Promise.race([operation, aborted]);
+    }
+    finally {
+        signal.removeEventListener('abort', onAbort);
+    }
+}
 function describeUnknownError(error) {
     if (error instanceof Error)
         return error.stack ?? error.message;
@@ -559,31 +855,6 @@ function resolveNativeClientConfig(config) {
         reconn_interval: config.autoReconnect ? 5 : 0,
     };
 }
-function buildIcqqQuoteMetadata(data, base) {
-    const metadata = { ...base };
-    const quoteId = resolveIcqqQuoteIdFromEvent(data);
-    if (quoteId)
-        metadata.quote_id = quoteId;
-    const quoted = quotedPayloadFromIcqqSource(findIcqqNestedMessageSource(data));
-    if (quoted?.sender?.id)
-        metadata.quote_sender_id = quoted.sender.id;
-    if (quoted?.sender?.name)
-        metadata.quote_sender_name = quoted.sender.name;
-    const quoteText = quoted
-        ? (typeof quoted.content === 'string'
-            ? quoted.content
-            : quoted.content
-                .map((seg) => seg && typeof seg === 'object' && seg.type === 'text'
-                ? String(seg.data?.text ?? '')
-                : '')
-                .join('')).trim() || quoted.raw || ''
-        : '';
-    if (quoteText)
-        metadata.quote_content = quoteText;
-    return metadata;
-}
-const INBOUND_HOLD_LIMIT = 32;
-const ICQQ_SERIALIZE_SKIP = ['group', 'member', 'friend', 'discuss', 'client'];
 function serializeIcqqEvent(event) {
     if (!event || typeof event !== 'object')
         return null;
@@ -607,3 +878,20 @@ function serializeIcqqEvent(event) {
     }
     return Object.keys(out).length > 0 ? out : null;
 }
+function parseIcqqSystemScene(type) {
+    if (type.startsWith('login.')) {
+        return { scene_type: 'login', sub_type: type.slice('login.'.length) || 'unknown' };
+    }
+    if (type.startsWith('offline.')) {
+        return { scene_type: 'offline', sub_type: type.slice('offline.'.length) || 'unknown' };
+    }
+    if (type === 'online') {
+        return { scene_type: 'online', sub_type: 'online' };
+    }
+    if (type === 'offline') {
+        return { scene_type: 'offline', sub_type: 'offline' };
+    }
+    return { scene_type: 'system', sub_type: type };
+}
+const INBOUND_HOLD_LIMIT = 32;
+const ICQQ_SERIALIZE_SKIP = ['group', 'member', 'friend', 'discuss', 'client'];