@zhin.js/adapter-napcat 7.0.0 → 7.0.1

package/src/wss-endpoint.ts

@@ -1,3 +1,4 @@
+import { Endpoint } from 'zhin.js/adapter';
 /**
  * NapCat reverse WSS endpoint — accepts inbound WebSocket from NapCat.
  */
@@ -5,16 +6,13 @@ import { clearInterval } from 'node:timers';
 import {
   createRecallEndpointControl,
   type EndpointControl,
-  type EndpointInstance,
   type EndpointManagement,
   type EndpointSendRequest,
 } from 'zhin.js/adapter';
-import type { MessageGateway, SideEventGateway } from '@zhin.js/core/runtime';
 import type { HttpHost, WsConnection } from '@zhin.js/host-http';
 import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import type { CapabilityId } from 'zhin.js';
 import { createNapCatEndpointManagement } from './endpoint-management.js';
-import { registerNapcatAgentEndpoint } from './napcat-agent-deps.js';
 import {
   InboundMessageDeduper,
   isNapCatBotMentioned,
@@ -35,6 +33,7 @@ import {
 } 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,
@@ -50,20 +49,19 @@ import { verifyNapCatAccessToken } from './wss-auth.js';
 
 export interface NapCatWssEndpointOptions {
   readonly id: CapabilityId;
-  readonly gateway: MessageGateway;
-  readonly sideEvents?: SideEventGateway;
   readonly http: HttpHost;
   readonly config: NapCatWssConfig;
 }
 
-export class NapCatWssEndpoint implements EndpointInstance {
+export class NapCatWssEndpoint extends Endpoint<NapcatClient> {
+  readonly client = new NapcatClient((action, params) => this.#callApi(action, params));
   readonly #logger!: ReturnType<typeof getAdapterLogger>;
 
   readonly #options: NapCatWssEndpointOptions;
   readonly #inboundDeduper = new InboundMessageDeduper();
-  readonly management: EndpointManagement = createNapCatEndpointManagement(this);
+  readonly management: EndpointManagement = createNapCatEndpointManagement(this.client);
   readonly control: EndpointControl = createRecallEndpointControl((id) => this.recallMessage(id));
-  readonly content = createNapCatContentPort((action, params) => this.callApi(action, params));
+  readonly content = createNapCatContentPort((action, params) => this.client.callApi(action, params));
   #ws?: NapCatWsSocket;
   #wsRelease?: () => void;
   #heartbeatTimer?: NodeJS.Timeout;
@@ -71,9 +69,9 @@ export class NapCatWssEndpoint implements EndpointInstance {
   #pending = new Map<string, NapCatPendingAction>();
   #open = false;
   #started = false;
-  #unregisterAgent?: () => void;
 
   constructor(options: NapCatWssEndpointOptions) {
+    super();
     this.#logger = getAdapterLogger('napcat', options.config.id);
     this.#options = options;
   }
@@ -81,10 +79,6 @@ export class NapCatWssEndpoint implements EndpointInstance {
   async start(): Promise<void> {
     if (this.#started) return;
     this.#started = true;
-    this.#unregisterAgent = registerNapcatAgentEndpoint(
-      this.#options.config.id,
-      this as unknown as NapCatWsEndpoint,
-    );
     const handle = this.#options.http.ws(this.#options.config.path);
     this.#wsRelease = handle.onConnection((connection) => {
       this.#acceptConnection(connection);
@@ -107,8 +101,6 @@ export class NapCatWssEndpoint implements EndpointInstance {
 
   async stop(): Promise<void> {
     this.#open = false;
-    this.#unregisterAgent?.();
-    this.#unregisterAgent = undefined;
     this.#wsRelease?.();
     this.#wsRelease = undefined;
     if (this.#heartbeatTimer) {
@@ -131,26 +123,32 @@ export class NapCatWssEndpoint implements EndpointInstance {
   async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
     const message = formatOutboundSegments(payload);
     const { action, params } = buildSendAction(napcatOutboundTarget(conversation), message);
-    const data = await this.callApi(action, params) as { message_id?: number | string } | undefined;
+    const data = await this.client.callApi(action, params) as { message_id?: number | string } | undefined;
     return data?.message_id != null ? String(data.message_id) : '';
   }
 
   async recallMessage(messageId: string): Promise<void> {
     if (!messageId) return;
-    await this.callApi('delete_msg', { message_id: Number(messageId) });
+    await this.client.callApi('delete_msg', { message_id: Number(messageId) });
   }
 
-  callApi(action: string, params: Record<string, unknown> = {}): Promise<unknown> {
+  #callApi(action: string, params: Record<string, unknown> = {}): Promise<unknown> {
     return callNapCatWsAction(this.#ws, this.#pending, this.#requestId, action, params);
   }
 
   admit(ev: NapCatEvent): void {
     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,
+        (name, payload) => this.emit(name, payload),
         this.#options.config.id,
-        this,
+        this.client,
         ev,
         this.#logger,
       );
@@ -165,7 +163,7 @@ export class NapCatWssEndpoint implements EndpointInstance {
     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),
@@ -236,3 +234,9 @@ export class NapCatWssEndpoint implements EndpointInstance {
     }));
   }
 }
+
+function napCatPlatformEventName(ev: NapCatEvent): string {
+  return [ev.post_type, ev.message_type ?? ev.notice_type ?? ev.request_type, ev.sub_type]
+    .filter(Boolean)
+    .join('.');
+}

package/lib/napcat-agent-deps.js

@@ -1,33 +0,0 @@
-/**
- * Agent tool deps for napcat.
- * Endpoints register themselves on start; tools look up by config name / endpoint id.
- */
-const endpoints = new Map();
-let override = null;
-export function registerNapcatAgentEndpoint(endpointKey, endpoint) {
-    endpoints.set(endpointKey, endpoint);
-    return () => {
-        if (endpoints.get(endpointKey) === endpoint) {
-            endpoints.delete(endpointKey);
-        }
-    };
-}
-/** Optional override used by tests / transitional callers. Pass `null` to clear. */
-export function setNapcatAgentDeps(deps) {
-    override = deps;
-}
-function lookup(endpointKey) {
-    const registered = endpoints.get(endpointKey);
-    if (!registered)
-        throw new Error(`Endpoint ${endpointKey} not found`);
-    return registered;
-}
-export function getNapcatAgentDeps() {
-    if (override)
-        return override;
-    return { getEndpoint: lookup };
-}
-/** Convenience for agent/tools (unchanged call sites). */
-export function getEndpoint(endpointKey) {
-    return getNapcatAgentDeps().getEndpoint(endpointKey);
-}

package/src/napcat-agent-deps.ts

@@ -1,95 +0,0 @@
-/**
- * Agent tool deps for napcat.
- * Endpoints register themselves on start; tools look up by config name / endpoint id.
- */
-
-export interface NapcatAgentEndpoint {
-  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>;
-}
-
-export interface NapcatAgentDeps {
-  getEndpoint: (endpointKey: string) => NapcatAgentEndpoint;
-}
-
-const endpoints = new Map<string, NapcatAgentEndpoint>();
-let override: NapcatAgentDeps | null = null;
-
-export function registerNapcatAgentEndpoint(
-  endpointKey: string,
-  endpoint: NapcatAgentEndpoint,
-): () => void {
-  endpoints.set(endpointKey, endpoint);
-  return () => {
-    if (endpoints.get(endpointKey) === endpoint) {
-      endpoints.delete(endpointKey);
-    }
-  };
-}
-
-/** Optional override used by tests / transitional callers. Pass `null` to clear. */
-export function setNapcatAgentDeps(deps: NapcatAgentDeps | null): void {
-  override = deps;
-}
-
-function lookup(endpointKey: string): NapcatAgentEndpoint {
-  const registered = endpoints.get(endpointKey);
-  if (!registered) throw new Error(`Endpoint ${endpointKey} not found`);
-  return registered;
-}
-
-export function getNapcatAgentDeps(): NapcatAgentDeps {
-  if (override) return override;
-  return { getEndpoint: lookup };
-}
-
-/** Convenience for agent/tools (unchanged call sites). */
-export function getEndpoint(endpointKey: string): NapcatAgentEndpoint {
-  return getNapcatAgentDeps().getEndpoint(endpointKey);
-}