@zhin.js/adapter-napcat 6.0.14 → 7.0.1

package/lib/http-endpoint.js

@@ -1,24 +1,28 @@
+import { Endpoint } from 'zhin.js/adapter';
+import { createRecallEndpointControl, } from 'zhin.js/adapter';
 import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { createNapCatEndpointManagement } from './endpoint-management.js';
-import { registerNapcatAgentEndpoint } from './napcat-agent-deps.js';
 import { InboundMessageDeduper, isNapCatBotMentioned, isSelfMessage, normalizeMessage, } from './napcat-inbound.js';
 import { buildSendAction, callNapCatHttpAction, formatInboundContent, formatOutboundSegments, isMessageEvent, napcatInboundConversation, napcatOutboundTarget, senderNickname, senderUserId, } from './protocol.js';
 import { receiveNapCatSideEvent } from './side-event-dispatch.js';
 import { createNapCatContentPort } from './onebot-get-msg.js';
+import { NapcatClient } from './client.js';
 import { readRequestBody } from './webhook.js';
 import { verifyNapCatAccessToken } from './wss-auth.js';
-export class NapCatHttpEndpoint {
+export class NapCatHttpEndpoint extends Endpoint {
+    client = new NapcatClient((action, params) => this.#callApi(action, params));
     #logger;
     #options;
     #inboundDeduper = new InboundMessageDeduper();
-    management = createNapCatEndpointManagement(this);
-    content = createNapCatContentPort((action, params) => this.callApi(action, params));
+    management = createNapCatEndpointManagement(this.client);
+    control = createRecallEndpointControl((id) => this.recallMessage(id));
+    content = createNapCatContentPort((action, params) => this.client.callApi(action, params));
     #callHttpAction;
     #routeReleases = [];
     #open = false;
     #started = false;
-    #unregisterAgent;
     constructor(options) {
+        super();
         this.#logger = getAdapterLogger('napcat', options.config.id);
         this.#options = options;
         this.#callHttpAction = options.callHttpAction ?? callNapCatHttpAction;
@@ -27,7 +31,6 @@ export class NapCatHttpEndpoint {
         if (this.#started)
             return;
         this.#started = true;
-        this.#unregisterAgent = registerNapcatAgentEndpoint(this.#options.config.id, this);
         this.#setupRoutes();
         this.#logger.info(formatCompact({
             op: 'listen',
@@ -46,8 +49,6 @@ export class NapCatHttpEndpoint {
         this.#open = false;
         for (const release of this.#routeReleases.splice(0))
             release();
-        this.#unregisterAgent?.();
-        this.#unregisterAgent = undefined;
         this.#inboundDeduper.clear();
         this.#started = false;
         this.#logger.debug(formatCompact({ op: 'disconnect' }));
@@ -72,9 +73,9 @@ export class NapCatHttpEndpoint {
     async recallMessage(messageId) {
         if (!messageId)
             return;
-        await this.callApi('delete_msg', { message_id: Number(messageId) });
+        await this.client.callApi('delete_msg', { message_id: Number(messageId) });
     }
-    callApi(action, params = {}) {
+    #callApi(action, params = {}) {
         return this.#callHttpAction({
             http_url: this.#options.config.http_url,
             access_token: this.#options.config.access_token,
@@ -83,8 +84,14 @@ export class NapCatHttpEndpoint {
     admit(ev) {
         if (!this.#open)
             return;
+        void this.emitPlatform(napCatPlatformEventName(ev), ev).catch((error) => {
+            this.#logger.warn(formatCompact({
+                op: 'napcat_platform_event_failed',
+                error: error instanceof Error ? error.message : String(error),
+            }));
+        });
         if (!isMessageEvent(ev)) {
-            receiveNapCatSideEvent(this.#options.sideEvents, this.#options.config.id, this, ev, this.#logger);
+            receiveNapCatSideEvent((name, payload) => this.emit(name, payload), this.#options.config.id, this.client, ev, this.#logger);
             return;
         }
         if (isSelfMessage(ev))
@@ -98,7 +105,7 @@ export class NapCatHttpEndpoint {
         const conversation = napcatInboundConversation(String(this.#options.id), ev);
         const nickname = senderNickname(ev);
         const mentioned = isNapCatBotMentioned(ev);
-        void this.#options.gateway.receive({
+        void this.emit('message.receive', {
             conversation,
             message: { conversation, id: msgId },
             content: formatInboundContent(ev),
@@ -163,3 +170,8 @@ export class NapCatHttpEndpoint {
         }
     }
 }
+function napCatPlatformEventName(ev) {
+    return [ev.post_type, ev.message_type ?? ev.notice_type ?? ev.request_type, ev.sub_type]
+        .filter(Boolean)
+        .join('.');
+}

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 export { buildSendAction, buildWsConnectOptions, callNapCatHttpAction, formatInboundContent, formatOutboundSegments, getChannelId, isMessageEvent, mediaRefToOneBotFile, napcatInboundConversation, napcatOutboundTarget, resolveNapCatConfig, senderNickname, senderUserId, type MessageSegment, type NapCatActionRequest, type NapCatActionResponse, type NapCatAdapterConfig, type NapCatConfigBase, type NapCatEndpointConfig, type NapCatEvent, type NapCatHttpConfig, type NapCatMessageEvent, type NapCatSender, type NapCatWireSegment, type NapCatWsConfig, type NapCatWssConfig, type ParsedSendTarget, type ResolvedNapCatConfig, } from './protocol.js';
 export { InboundMessageDeduper, isNapCatBotMentioned, isSelfMessage, normalizeMessage, } from './napcat-inbound.js';
-export { getEndpoint, getNapcatAgentDeps, registerNapcatAgentEndpoint, setNapcatAgentDeps, type NapcatAgentDeps, type NapcatAgentEndpoint, } from './napcat-agent-deps.js';
+export { napcatClient, type NapcatClient, type NapcatClientEventMap, } from './client.js';
 export { parseOneBotGetMsgResponse } from './onebot-get-msg.js';
 export { NapCatWsEndpoint, type NapCatWsEndpointOptions, } from './ws-endpoint.js';
 export { NapCatWssEndpoint, type NapCatWssEndpointOptions, } from './wss-endpoint.js';

package/lib/index.js

@@ -1,6 +1,6 @@
 export { buildSendAction, buildWsConnectOptions, callNapCatHttpAction, formatInboundContent, formatOutboundSegments, getChannelId, isMessageEvent, mediaRefToOneBotFile, napcatInboundConversation, napcatOutboundTarget, resolveNapCatConfig, senderNickname, senderUserId, } from './protocol.js';
 export { InboundMessageDeduper, isNapCatBotMentioned, isSelfMessage, normalizeMessage, } from './napcat-inbound.js';
-export { getEndpoint, getNapcatAgentDeps, registerNapcatAgentEndpoint, setNapcatAgentDeps, } from './napcat-agent-deps.js';
+export { napcatClient, } from './client.js';
 export { parseOneBotGetMsgResponse } from './onebot-get-msg.js';
 export { NapCatWsEndpoint, } from './ws-endpoint.js';
 export { NapCatWssEndpoint, } from './wss-endpoint.js';

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

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

package/lib/side-event-dispatch.d.ts

@@ -1,7 +1,7 @@
-import type { SideEventGateway } from '@zhin.js/core/runtime';
+import type { EndpointEventEmitter } from 'zhin.js/adapter';
 import { type getAdapterLogger } from '@zhin.js/logger';
 import type { NapCatEvent } from './protocol.js';
 export interface NapCatSideEventCaller {
     callApi(action: string, params?: Record<string, unknown>): Promise<unknown>;
 }
-export declare function receiveNapCatSideEvent(sideEvents: SideEventGateway | undefined, endpointKey: string, caller: NapCatSideEventCaller, raw: NapCatEvent, logger: ReturnType<typeof getAdapterLogger>): void;
+export declare function receiveNapCatSideEvent(emit: EndpointEventEmitter, endpointKey: string, caller: NapCatSideEventCaller, raw: NapCatEvent, logger: ReturnType<typeof getAdapterLogger>): void;

package/lib/side-event-dispatch.js

@@ -1,14 +1,14 @@
 import { receiveOneBotLikeSideEvent } from '@zhin.js/core';
 import { formatCompact } from '@zhin.js/logger';
-export function receiveNapCatSideEvent(sideEvents, endpointKey, caller, raw, logger) {
-    if (!sideEvents)
+export function receiveNapCatSideEvent(emit, endpointKey, caller, raw, logger) {
+    if (!emit)
         return;
     const record = raw;
     const postType = String(record.post_type ?? '');
     const requestType = String(record.request_type ?? '');
     const isRequest = postType === 'request' || postType.startsWith('request.');
     const isFriend = requestType === 'friend' || postType.includes('friend');
-    void receiveOneBotLikeSideEvent(sideEvents, {
+    void receiveOneBotLikeSideEvent(emit, {
         adapter: 'napcat',
         endpointKey,
         platform: 'napcat',

package/lib/ws-endpoint.d.ts

@@ -1,18 +1,19 @@
-import { type EndpointInstance, type EndpointManagement, type EndpointSendRequest } from 'zhin.js/adapter';
-import type { MessageGateway, SideEventGateway } from '@zhin.js/core/runtime';
+import { Endpoint } from 'zhin.js/adapter';
+import { type EndpointControl, type EndpointManagement, type EndpointSendRequest } from 'zhin.js/adapter';
 import type { CapabilityId } from 'zhin.js';
 import { type NapCatEvent, type NapCatWsConfig } from './protocol.js';
 import { type NapCatWsCreateOptions, type NapCatWsSocket } from './ws-types.js';
+import { NapcatClient } from './client.js';
 export interface NapCatWsEndpointOptions {
     readonly id: CapabilityId;
-    readonly gateway: MessageGateway;
-    readonly sideEvents?: SideEventGateway;
     readonly config: NapCatWsConfig;
     readonly createWebSocket?: (url: string, options: NapCatWsCreateOptions) => NapCatWsSocket;
 }
-export declare class NapCatWsEndpoint implements EndpointInstance {
+export declare class NapCatWsEndpoint extends Endpoint<NapcatClient> {
     #private;
+    readonly client: NapcatClient;
     readonly management: EndpointManagement;
+    readonly control: EndpointControl;
     readonly content: import("@zhin.js/adapter").EndpointContentPort;
     constructor(options: NapCatWsEndpointOptions);
     start(): Promise<void>;
@@ -21,42 +22,6 @@ export declare class NapCatWsEndpoint implements EndpointInstance {
     stop(): Promise<void>;
     send({ conversation, payload }: EndpointSendRequest): Promise<string>;
     recallMessage(messageId: string): Promise<void>;
-    callApi(action: string, params?: Record<string, unknown>): Promise<unknown>;
-    setTitle(groupId: number, userId: number, title: string, duration?: number): Promise<boolean>;
-    sendLike(userId: number, times?: number): Promise<unknown>;
-    deleteFriend(userId: number): Promise<unknown>;
-    markMsgAsRead(messageId: number): Promise<unknown>;
-    ocrImage(image: string): Promise<unknown>;
-    setQQProfile(nickname: string, company?: string, email?: string, college?: string, personalNote?: string): Promise<unknown>;
-    setGroupPortrait(groupId: number, file: string): Promise<unknown>;
-    setEssenceMsg(messageId: number): Promise<unknown>;
-    deleteEssenceMsg(messageId: number): Promise<unknown>;
-    getEssenceMsgList(groupId: number): Promise<unknown>;
-    sendGroupSign(groupId: number): Promise<unknown>;
-    sendGroupNotice(groupId: number, content: string, image?: string): Promise<unknown>;
-    getGroupNotice(groupId: number): Promise<unknown>;
-    deleteGroupNotice(groupId: number, noticeId: string): Promise<unknown>;
-    uploadGroupFile(groupId: number, file: string, name: string, folder?: string): Promise<unknown>;
-    getGroupRootFiles(groupId: number): Promise<unknown>;
-    getGroupFileUrl(groupId: number, fileId: string, busid: number): Promise<unknown>;
-    downloadFile(url: string, threadCount?: number, headers?: string[]): Promise<unknown>;
-    setOnlineStatus(status: number, extStatus: number): Promise<unknown>;
-    setQQAvatar(file: string): Promise<unknown>;
-    forwardFriendSingleMsg(userId: number, messageId: number): Promise<unknown>;
-    forwardGroupSingleMsg(groupId: number, messageId: number): Promise<unknown>;
-    translateEn2Zh(sourceText: string): Promise<unknown>;
-    setMsgEmojiLike(messageId: number, emojiId: string): Promise<unknown>;
-    sendForwardMsg(messageType: 'private' | 'group', id: number, messages: unknown[]): Promise<unknown>;
-    getFriendMsgHistory(userId: number, messageSeq?: number, count?: number): Promise<unknown>;
-    getGroupMsgHistory(groupId: number, messageSeq?: number, count?: number): Promise<unknown>;
-    setSelfLongnick(longnick: string): Promise<unknown>;
-    getGroupInfoEx(groupId: number): Promise<unknown>;
-    sendPoke(userId: number, groupId?: number): Promise<unknown>;
-    ncGetUserStatus(userId: number): Promise<unknown>;
-    getGroupShutList(groupId: number): Promise<unknown>;
-    getMiniAppArk(type: string, title: string, desc: string, picUrl: string, jumpUrl: string): Promise<unknown>;
-    getAiCharacters(groupId: number): Promise<unknown>;
-    sendGroupAiRecord(groupId: number, characterId: string, text: string): Promise<unknown>;
     /** Test / internal: admit a parsed event when the endpoint is open. */
     admit(ev: NapCatEvent): void;
 }

package/lib/ws-endpoint.js

@@ -1,29 +1,32 @@
+import { Endpoint } from 'zhin.js/adapter';
 /**
  * NapCat WS client endpoint — outbound connect to NapCat.
  */
 import WebSocket from 'ws';
-import { createEndpointLifecycle, } from 'zhin.js/adapter';
+import { createRecallEndpointControl, createEndpointLifecycle, } from 'zhin.js/adapter';
 import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { createNapCatEndpointManagement } from './endpoint-management.js';
-import { registerNapcatAgentEndpoint } from './napcat-agent-deps.js';
 import { InboundMessageDeduper, isNapCatBotMentioned, isSelfMessage, normalizeMessage, } from './napcat-inbound.js';
 import { buildSendAction, buildWsConnectOptions, formatInboundContent, formatOutboundSegments, isMessageEvent, napcatInboundConversation, napcatOutboundTarget, senderNickname, senderUserId, } from './protocol.js';
 import { receiveNapCatSideEvent } from './side-event-dispatch.js';
 import { callNapCatWsAction, handleNapCatWsMessage, rejectAllPending, } from './ws-transport.js';
 import { createNapCatContentPort } from './onebot-get-msg.js';
-export class NapCatWsEndpoint {
+import { NapcatClient } from './client.js';
+export class NapCatWsEndpoint extends Endpoint {
+    client = new NapcatClient((action, params) => this.#callApi(action, params));
     #logger;
     #options;
     #inboundDeduper = new InboundMessageDeduper();
-    management = createNapCatEndpointManagement(this);
-    content = createNapCatContentPort((action, params) => this.callApi(action, params));
+    management = createNapCatEndpointManagement(this.client);
+    control = createRecallEndpointControl((id) => this.recallMessage(id));
+    content = createNapCatContentPort((action, params) => this.client.callApi(action, params));
     #lifecycle;
     #ws;
     #requestId = { value: 0 };
     #pending = new Map();
     #open = false;
-    #unregisterAgent;
     constructor(options) {
+        super();
         this.#logger = getAdapterLogger('napcat', options.config.id);
         this.#options = options;
         this.#lifecycle = createEndpointLifecycle({
@@ -40,16 +43,7 @@ export class NapCatWsEndpoint {
     async start() {
         if (this.#lifecycle.started)
             return;
-        this.#unregisterAgent = registerNapcatAgentEndpoint(this.#options.config.id, this);
-        try {
-            await this.#lifecycle.start((handle) => this.#connect(handle));
-        }
-        catch (err) {
-            // start 失败复位由基座保证；agent 注册/反注册是适配器专有依赖，留在适配器侧
-            this.#unregisterAgent?.();
-            this.#unregisterAgent = undefined;
-            throw err;
-        }
+        await this.#lifecycle.start((handle) => this.#connect(handle));
     }
     open() {
         this.#open = true;
@@ -60,8 +54,6 @@ export class NapCatWsEndpoint {
     async stop() {
         this.#open = false;
         await this.#lifecycle.stop();
-        this.#unregisterAgent?.();
-        this.#unregisterAgent = undefined;
         rejectAllPending(this.#pending);
         this.#inboundDeduper.clear();
         if (this.#ws) {
@@ -77,7 +69,7 @@ export class NapCatWsEndpoint {
     async send({ conversation, payload }) {
         const message = formatOutboundSegments(payload);
         const { action, params } = buildSendAction(napcatOutboundTarget(conversation), message);
-        const data = await this.callApi(action, params);
+        const data = await this.client.callApi(action, params);
         const messageId = data?.message_id != null ? String(data.message_id) : '';
         this.#logger.debug(formatCompact({
             op: 'napcat_send',
@@ -90,151 +82,23 @@ export class NapCatWsEndpoint {
     async recallMessage(messageId) {
         if (!messageId)
             return;
-        await this.callApi('delete_msg', { message_id: Number(messageId) });
+        await this.client.callApi('delete_msg', { message_id: Number(messageId) });
     }
-    callApi(action, params = {}) {
+    #callApi(action, params = {}) {
         return callNapCatWsAction(this.#ws, this.#pending, this.#requestId, action, params);
     }
-    // ── Agent-facing API wrappers ─────────────────────────────────────
-    async setTitle(groupId, userId, title, duration = -1) {
-        await this.callApi('set_group_special_title', {
-            group_id: groupId,
-            user_id: userId,
-            special_title: title,
-            duration,
-        });
-        return true;
-    }
-    sendLike(userId, times = 1) {
-        return this.callApi('send_like', { user_id: userId, times });
-    }
-    deleteFriend(userId) {
-        return this.callApi('delete_friend', { user_id: userId });
-    }
-    markMsgAsRead(messageId) {
-        return this.callApi('mark_msg_as_read', { message_id: messageId });
-    }
-    ocrImage(image) {
-        return this.callApi('ocr_image', { image });
-    }
-    setQQProfile(nickname, company, email, college, personalNote) {
-        return this.callApi('set_qq_profile', {
-            nickname,
-            company,
-            email,
-            college,
-            personal_note: personalNote,
-        });
-    }
-    setGroupPortrait(groupId, file) {
-        return this.callApi('set_group_portrait', { group_id: groupId, file });
-    }
-    setEssenceMsg(messageId) {
-        return this.callApi('set_essence_msg', { message_id: messageId });
-    }
-    deleteEssenceMsg(messageId) {
-        return this.callApi('delete_essence_msg', { message_id: messageId });
-    }
-    getEssenceMsgList(groupId) {
-        return this.callApi('get_essence_msg_list', { group_id: groupId });
-    }
-    sendGroupSign(groupId) {
-        return this.callApi('send_group_sign', { group_id: groupId });
-    }
-    sendGroupNotice(groupId, content, image) {
-        return this.callApi('_send_group_notice', { group_id: groupId, content, image });
-    }
-    getGroupNotice(groupId) {
-        return this.callApi('_get_group_notice', { group_id: groupId });
-    }
-    deleteGroupNotice(groupId, noticeId) {
-        return this.callApi('_del_group_notice', { group_id: groupId, notice_id: noticeId });
-    }
-    uploadGroupFile(groupId, file, name, folder) {
-        return this.callApi('upload_group_file', { group_id: groupId, file, name, folder });
-    }
-    getGroupRootFiles(groupId) {
-        return this.callApi('get_group_root_files', { group_id: groupId });
-    }
-    getGroupFileUrl(groupId, fileId, busid) {
-        return this.callApi('get_group_file_url', { group_id: groupId, file_id: fileId, busid });
-    }
-    downloadFile(url, threadCount = 1, headers) {
-        return this.callApi('download_file', { url, thread_count: threadCount, headers });
-    }
-    setOnlineStatus(status, extStatus) {
-        return this.callApi('set_online_status', { status, ext_status: extStatus });
-    }
-    setQQAvatar(file) {
-        return this.callApi('set_qq_avatar', { file });
-    }
-    forwardFriendSingleMsg(userId, messageId) {
-        return this.callApi('forward_friend_single_msg', { user_id: userId, message_id: messageId });
-    }
-    forwardGroupSingleMsg(groupId, messageId) {
-        return this.callApi('forward_group_single_msg', { group_id: groupId, message_id: messageId });
-    }
-    translateEn2Zh(sourceText) {
-        return this.callApi('translate_en2zh', { source_text: sourceText });
-    }
-    setMsgEmojiLike(messageId, emojiId) {
-        return this.callApi('set_msg_emoji_like', { message_id: messageId, emoji_id: emojiId });
-    }
-    sendForwardMsg(messageType, id, messages) {
-        return this.callApi('send_forward_msg', {
-            message_type: messageType,
-            [messageType === 'group' ? 'group_id' : 'user_id']: id,
-            messages,
-        });
-    }
-    getFriendMsgHistory(userId, messageSeq, count) {
-        return this.callApi('get_friend_msg_history', {
-            user_id: userId,
-            message_seq: messageSeq,
-            count,
-        });
-    }
-    getGroupMsgHistory(groupId, messageSeq, count) {
-        return this.callApi('get_group_msg_history', {
-            group_id: groupId,
-            message_seq: messageSeq,
-            count,
-        });
-    }
-    setSelfLongnick(longnick) {
-        return this.callApi('set_self_longnick', { longNick: longnick });
-    }
-    getGroupInfoEx(groupId) {
-        return this.callApi('get_group_info_ex', { group_id: groupId });
-    }
-    sendPoke(userId, groupId) {
-        return this.callApi('send_poke', { user_id: userId, group_id: groupId });
-    }
-    ncGetUserStatus(userId) {
-        return this.callApi('nc_get_user_status', { user_id: userId });
-    }
-    getGroupShutList(groupId) {
-        return this.callApi('get_group_shut_list', { group_id: groupId });
-    }
-    getMiniAppArk(type, title, desc, picUrl, jumpUrl) {
-        return this.callApi('get_mini_app_ark', { type, title, desc, picUrl, jumpUrl });
-    }
-    getAiCharacters(groupId) {
-        return this.callApi('get_ai_characters', { group_id: groupId });
-    }
-    sendGroupAiRecord(groupId, characterId, text) {
-        return this.callApi('send_group_ai_record', {
-            group_id: groupId,
-            character: characterId,
-            text,
-        });
-    }
     /** Test / internal: admit a parsed event when the endpoint is open. */
     admit(ev) {
         if (!this.#open)
             return;
+        void this.emitPlatform(napCatPlatformEventName(ev), ev).catch((error) => {
+            this.#logger.warn(formatCompact({
+                op: 'napcat_platform_event_failed',
+                error: error instanceof Error ? error.message : String(error),
+            }));
+        });
         if (!isMessageEvent(ev)) {
-            receiveNapCatSideEvent(this.#options.sideEvents, this.#options.config.id, this, ev, this.#logger);
+            receiveNapCatSideEvent((name, payload) => this.emit(name, payload), this.#options.config.id, this.client, ev, this.#logger);
             return;
         }
         if (isSelfMessage(ev))
@@ -249,7 +113,7 @@ export class NapCatWsEndpoint {
         const content = formatInboundContent(ev);
         const nickname = senderNickname(ev);
         const mentioned = isNapCatBotMentioned(ev);
-        void this.#options.gateway.receive({
+        void this.emit('message.receive', {
             conversation,
             message: { conversation, id: msgId },
             content,
@@ -370,3 +234,8 @@ export class NapCatWsEndpoint {
         });
     }
 }
+function napCatPlatformEventName(ev) {
+    return [ev.post_type, ev.message_type ?? ev.notice_type ?? ev.request_type, ev.sub_type]
+        .filter(Boolean)
+        .join('.');
+}

package/lib/wss-endpoint.d.ts

@@ -1,18 +1,19 @@
-import type { EndpointInstance, EndpointManagement, EndpointSendRequest } from 'zhin.js/adapter';
-import type { MessageGateway, SideEventGateway } from '@zhin.js/core/runtime';
+import { Endpoint } from 'zhin.js/adapter';
+import { type EndpointControl, type EndpointManagement, type EndpointSendRequest } from 'zhin.js/adapter';
 import type { HttpHost } from '@zhin.js/host-http';
 import type { CapabilityId } from 'zhin.js';
 import { type NapCatEvent, type NapCatWssConfig } from './protocol.js';
+import { NapcatClient } from './client.js';
 export interface NapCatWssEndpointOptions {
     readonly id: CapabilityId;
-    readonly gateway: MessageGateway;
-    readonly sideEvents?: SideEventGateway;
     readonly http: HttpHost;
     readonly config: NapCatWssConfig;
 }
-export declare class NapCatWssEndpoint implements EndpointInstance {
+export declare class NapCatWssEndpoint extends Endpoint<NapcatClient> {
     #private;
+    readonly client: NapcatClient;
     readonly management: EndpointManagement;
+    readonly control: EndpointControl;
     readonly content: import("@zhin.js/adapter").EndpointContentPort;
     constructor(options: NapCatWssEndpointOptions);
     start(): Promise<void>;
@@ -21,6 +22,5 @@ export declare class NapCatWssEndpoint implements EndpointInstance {
     stop(): Promise<void>;
     send({ conversation, payload }: EndpointSendRequest): Promise<string>;
     recallMessage(messageId: string): Promise<void>;
-    callApi(action: string, params?: Record<string, unknown>): Promise<unknown>;
     admit(ev: NapCatEvent): void;
 }

package/lib/wss-endpoint.js

@@ -1,22 +1,26 @@
+import { Endpoint } from 'zhin.js/adapter';
 /**
  * NapCat reverse WSS endpoint — accepts inbound WebSocket from NapCat.
  */
 import { clearInterval } from 'node:timers';
+import { createRecallEndpointControl, } from 'zhin.js/adapter';
 import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { createNapCatEndpointManagement } from './endpoint-management.js';
-import { registerNapcatAgentEndpoint } from './napcat-agent-deps.js';
 import { InboundMessageDeduper, isNapCatBotMentioned, isSelfMessage, normalizeMessage, } from './napcat-inbound.js';
 import { buildSendAction, formatInboundContent, formatOutboundSegments, isMessageEvent, napcatInboundConversation, napcatOutboundTarget, senderNickname, senderUserId, } from './protocol.js';
 import { receiveNapCatSideEvent } from './side-event-dispatch.js';
 import { createNapCatContentPort } from './onebot-get-msg.js';
+import { NapcatClient } from './client.js';
 import { callNapCatWsAction, handleNapCatWsMessage, rejectAllPending, startNapCatHeartbeat, } from './ws-transport.js';
 import { verifyNapCatAccessToken } from './wss-auth.js';
-export class NapCatWssEndpoint {
+export class NapCatWssEndpoint extends Endpoint {
+    client = new NapcatClient((action, params) => this.#callApi(action, params));
     #logger;
     #options;
     #inboundDeduper = new InboundMessageDeduper();
-    management = createNapCatEndpointManagement(this);
-    content = createNapCatContentPort((action, params) => this.callApi(action, params));
+    management = createNapCatEndpointManagement(this.client);
+    control = createRecallEndpointControl((id) => this.recallMessage(id));
+    content = createNapCatContentPort((action, params) => this.client.callApi(action, params));
     #ws;
     #wsRelease;
     #heartbeatTimer;
@@ -24,8 +28,8 @@ export class NapCatWssEndpoint {
     #pending = new Map();
     #open = false;
     #started = false;
-    #unregisterAgent;
     constructor(options) {
+        super();
         this.#logger = getAdapterLogger('napcat', options.config.id);
         this.#options = options;
     }
@@ -33,7 +37,6 @@ export class NapCatWssEndpoint {
         if (this.#started)
             return;
         this.#started = true;
-        this.#unregisterAgent = registerNapcatAgentEndpoint(this.#options.config.id, this);
         const handle = this.#options.http.ws(this.#options.config.path);
         this.#wsRelease = handle.onConnection((connection) => {
             this.#acceptConnection(connection);
@@ -53,8 +56,6 @@ export class NapCatWssEndpoint {
     }
     async stop() {
         this.#open = false;
-        this.#unregisterAgent?.();
-        this.#unregisterAgent = undefined;
         this.#wsRelease?.();
         this.#wsRelease = undefined;
         if (this.#heartbeatTimer) {
@@ -77,22 +78,28 @@ export class NapCatWssEndpoint {
     async send({ conversation, payload }) {
         const message = formatOutboundSegments(payload);
         const { action, params } = buildSendAction(napcatOutboundTarget(conversation), message);
-        const data = await this.callApi(action, params);
+        const data = await this.client.callApi(action, params);
         return data?.message_id != null ? String(data.message_id) : '';
     }
     async recallMessage(messageId) {
         if (!messageId)
             return;
-        await this.callApi('delete_msg', { message_id: Number(messageId) });
+        await this.client.callApi('delete_msg', { message_id: Number(messageId) });
     }
-    callApi(action, params = {}) {
+    #callApi(action, params = {}) {
         return callNapCatWsAction(this.#ws, this.#pending, this.#requestId, action, params);
     }
     admit(ev) {
         if (!this.#open)
             return;
+        void this.emitPlatform(napCatPlatformEventName(ev), ev).catch((error) => {
+            this.#logger.warn(formatCompact({
+                op: 'napcat_platform_event_failed',
+                error: error instanceof Error ? error.message : String(error),
+            }));
+        });
         if (!isMessageEvent(ev)) {
-            receiveNapCatSideEvent(this.#options.sideEvents, this.#options.config.id, this, ev, this.#logger);
+            receiveNapCatSideEvent((name, payload) => this.emit(name, payload), this.#options.config.id, this.client, ev, this.#logger);
             return;
         }
         if (isSelfMessage(ev))
@@ -106,7 +113,7 @@ export class NapCatWssEndpoint {
         const conversation = napcatInboundConversation(String(this.#options.id), ev);
         const nickname = senderNickname(ev);
         const mentioned = isNapCatBotMentioned(ev);
-        void this.#options.gateway.receive({
+        void this.emit('message.receive', {
             conversation,
             message: { conversation, id: msgId },
             content: formatInboundContent(ev),
@@ -173,3 +180,8 @@ export class NapCatWssEndpoint {
         }));
     }
 }
+function napCatPlatformEventName(ev) {
+    return [ev.post_type, ev.message_type ?? ev.notice_type ?? ev.request_type, ev.sub_type]
+        .filter(Boolean)
+        .join('.');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-napcat",
-  "version": "6.0.14",
+  "version": "7.0.1",
   "description": "Zhin.js NapCat adapter for Plugin Runtime (WebSocket client, OneBot11 + NapCat extensions)",
   "type": "module",
   "main": "./lib/index.js",
@@ -43,12 +43,13 @@
   },
   "dependencies": {
     "ws": "^8.21.1",
-    "@zhin.js/adapter": "1.1.11",
-    "@zhin.js/core": "1.5.12",
-    "@zhin.js/host-http": "1.0.11",
+    "@zhin.js/adapter": "1.2.1",
+    "@zhin.js/core": "1.5.14",
+    "@zhin.js/feature-kit": "1.0.13",
+    "@zhin.js/host-http": "1.0.13",
     "@zhin.js/im-contract": "1.0.4",
-    "@zhin.js/logger": "1.0.76",
-    "@zhin.js/permission": "1.0.3"
+    "@zhin.js/logger": "1.0.77",
+    "@zhin.js/permission": "1.0.4"
   },
   "devDependencies": {
     "@types/node": "^26.1.2",
@@ -56,17 +57,17 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.14",
-    "@zhin.js/host-http": "1.0.11",
-    "zhin.js": "6.0.12"
+    "@zhin.js/agent": "1.1.16",
+    "@zhin.js/host-http": "1.0.13",
+    "zhin.js": "6.0.14"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "1.1.11",
-    "@zhin.js/agent": "1.1.14",
-    "@zhin.js/command": "1.0.15",
-    "@zhin.js/core": "1.5.12",
-    "zhin.js": "6.0.12"
+    "@zhin.js/adapter": "1.2.1",
+    "@zhin.js/agent": "1.1.16",
+    "@zhin.js/command": "1.0.16",
+    "@zhin.js/core": "1.5.14",
+    "zhin.js": "6.0.14"
   },
   "peerDependenciesMeta": {
     "@zhin.js/agent": {