@zhin.js/adapter-onebot12 1.1.18 → 1.1.19

package/src/wss-endpoint.ts

@@ -2,13 +2,15 @@
  * OneBot12 reverse WSS endpoint — accepts inbound WebSocket from OneBot implementation.
  */
 import {
-  ClientEndpoint,
+  createEndpointSpecification, endpointSpec,
+  type Endpoint, type EndpointSpecification,
   createEndpointLifecycle,
   createRecallEndpointControl,
   type EndpointLifecycle,
   type EndpointControl,
   type EndpointManagement,
   type EndpointSendRequest,
+  type PendingRpcRequest,
 } from 'zhin.js/adapter';
 import type { HttpHost, WsConnection } from '@zhin.js/host-http';
 import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
@@ -16,6 +18,7 @@ import type { CapabilityId } from 'zhin.js';
 import { createOneBot12EndpointManagement } from './endpoint-management.js';
 import {
   buildSendMessageParams,
+  matchesOneBot12Self,
   formatInboundContent,
   formatOutboundSegments,
   isBotMentioned,
@@ -29,59 +32,70 @@ import {
 } from './protocol.js';
 import { receiveOneBot12SideEvent } from './side-event-dispatch.js';
 import { createOneBot12ContentPort } from './content-port.js';
-import { callOnebot12Client, createOnebot12EndpointClient, forwardOnebot12ClientEvents, type Onebot12Client } from './client.js';
+import { callOnebot12Client, readOnebot12Response, onebot12ClientOptions, forwardOnebot12ClientEvents, Onebot12Client } from './client.js';
 import { verifyOneBotAccessToken } from './wss-auth.js';
-import { type OneBot12PendingAction, type OneBot12WsSocket } from './ws-types.js';
-import {
-  callOneBot12WsAction,
-  handleOneBot12WsMessage,
-  rejectAllPending,
-} from './ws-transport.js';
+import { type OneBot12WsSocket } from './ws-types.js';
+import { createOneBot12Rpc, type OneBot12Rpc } from './ws-transport.js';
 
 export interface OneBot12WssEndpointOptions {
+  readonly signal?: AbortSignal;
   readonly id: CapabilityId;
   readonly http: HttpHost;
   readonly config: OneBot12WssConfig;
 }
 
-export class OneBot12WssEndpoint extends ClientEndpoint<Onebot12Client> {
-  readonly client: Onebot12Client;
+export class OneBot12WssEndpoint extends Onebot12Client implements Endpoint {
+  readonly [endpointSpec]: EndpointSpecification;
+  #open = false;
   readonly #logger!: ReturnType<typeof getAdapterLogger>;
 
   readonly #options: OneBot12WssEndpointOptions;
-  readonly management: EndpointManagement;
-  readonly control: EndpointControl = createRecallEndpointControl((id) => this.recallMessage(id));
-  readonly content;
+  readonly #management: EndpointManagement;
+  readonly #control: EndpointControl = createRecallEndpointControl((id, signal?: AbortSignal) => this.#recallMessage(id, signal));
+  readonly #content;
+  readonly #releaseClientEvents: () => void;
   #ws?: OneBot12WsSocket;
   #wsRelease?: () => void;
   readonly #connectionLifecycle: EndpointLifecycle;
   #connectionTask = Promise.resolve();
-  #requestId = { value: 0 };
-  #pending = new Map<string, OneBot12PendingAction>();
+  readonly #rpc: OneBot12Rpc;
   #started = false;
 
   constructor(options: OneBot12WssEndpointOptions) {
-    super();
+    const rpc = createOneBot12Rpc({ endpointId: options.config.id, signal: options.signal,
+      self: { platform: options.config.platform, user_id: options.config.userId },
+      socket: () => this.#connectionLifecycle.state === 'closed' ? undefined : this.#ws,
+    });
+    super(onebot12ClientOptions(options.config, (action, params) => rpc.call({ action, params })));
+    this.#rpc = rpc;
     this.#logger = getAdapterLogger('onebot12', options.config.id);
     this.#options = options;
     this.#connectionLifecycle = createEndpointLifecycle({
       name: `${options.config.id}:inbound`,
       reconnect: false,
     });
-    this.client = createOnebot12EndpointClient(options.config, (action, params) => this.#callAction(action, params ?? {}));
-    const callApi = (action: string, params?: Record<string, unknown>) => callOnebot12Client(this.client, action, params);
-    this.management = createOneBot12EndpointManagement({ callApi });
-    this.content = createOneBot12ContentPort(callApi);
-    this.bindClientEvents(
-      (receive) => forwardOnebot12ClientEvents(this.client, receive),
-      (name, payload) => {
+    const callApi = (request: PendingRpcRequest) => this.#rpc.call(request).then(readOnebot12Response);
+    this.#management = createOneBot12EndpointManagement({ callApi });
+    this.#content = createOneBot12ContentPort(callApi);
+    const readTransportState = () => this.#connectionLifecycle.state;
+    this[endpointSpec] = createEndpointSpecification(this, {
+      name: options.config.id,
+      start: () => this.#start(), open: () => { this.#open = true; },
+      close: () => { this.#open = false; }, stop: () => this.#stop(),
+      send: request => this.#send(request),
+      get transportState() { return readTransportState(); },
+      management: this.#management, control: this.#control, content: this.#content,
+    });
+    this.#releaseClientEvents = forwardOnebot12ClientEvents(this, (name, payload) => {
+      void this[endpointSpec].events.run(() => {
+        if (!this.#open && !this.#started) return;
+        void this[endpointSpec].events.platform(name, payload).catch(error => this.#warnPlatformEvent(error));
         if (name === 'event') this.#admitRaw(payload as OneBot12Event);
-      },
-      (_name, error) => this.#warnPlatformEvent(error),
-    );
+      }).catch(error => this.#warnPlatformEvent(error));
+    });
   }
 
-  async start(): Promise<void> {
+  async #start(): Promise<void> {
     if (this.#started) return;
     if (!this.#options.config.access_token) {
       // wss 模式未配 access_token 时任何连接都会被放行（verifyOneBotAccessToken 直接 return true）
@@ -113,55 +127,59 @@ export class OneBot12WssEndpoint extends ClientEndpoint<Onebot12Client> {
     }));
   }
 
-  async stop(): Promise<void> {
-    this.close();
+  async #stop(): Promise<void> {
+    this.#open = false;
     this.#wsRelease?.();
     this.#wsRelease = undefined;
-    await this.#connectionTask;
-    await this.#connectionLifecycle.stop();
-    rejectAllPending(this.#pending);
-    this.#ws = undefined;
-    this.#started = false;
+    try {
+      await this.#connectionTask;
+      await this.#connectionLifecycle.stop();
+    } finally {
+      this.#rpc.dispose();
+      this.#releaseClientEvents();
+      this.#ws = undefined;
+      this.#started = false;
+    }
   }
 
-  async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
-    const materialized = await uploadOneBot12MediaSegments(
-      payload,
-      (action, params) => callOnebot12Client(this.client, action, params),
-      (error) => {
-        this.#logger.warn(formatCompact({
-          op: 'onebot12_upload_failed',
-          endpoint: this.#options.config.id,
-          error: error instanceof Error ? error.message : String(error),
-        }));
+  async #send({ conversation, payload, signal }: EndpointSendRequest): Promise<string> {
+    const materialized = await uploadOneBot12MediaSegments({
+      payload, signal,
+      callAction: (action, params) => this.#rpc.call({ action, params, signal }).then(readOnebot12Response),
+      onUploadFailed: error => {
+        this.#logger.warn(formatCompact({ op: 'onebot12_upload_failed', endpoint: this.#options.config.id,
+          error: error instanceof Error ? error.message : String(error) }));
       },
-    );
+    });
     const message = formatOutboundSegments(materialized);
     const params = buildSendMessageParams(conversation, message);
-    const data = await callOnebot12Client<{ message_id?: string }>(this.client, 'send_message', params);
+    const data = readOnebot12Response<{ message_id?: string }>(await this.#rpc.call({ action: 'send_message', params, signal }));
     return data?.message_id ?? '';
   }
 
-  async recallMessage(messageId: string): Promise<void> {
+  async #recallMessage(messageId: string, signal?: AbortSignal): Promise<void> {
     if (!messageId) return;
-    await callOnebot12Client(this.client, 'delete_message', { message_id: messageId });
+    await this.#rpc.call({ action: 'delete_message', params: { message_id: messageId }, signal }).then(readOnebot12Response);
   }
 
   #admitRaw(ev: OneBot12Event): void {
+    if (!matchesOneBot12Self(this.#options.config, ev)) return;
+    this[endpointSpec].reportSelfUserId(ev.self.user_id);
     if (!isMessageEvent(ev)) {
-      receiveOneBot12SideEvent(
-        (name, payload) => this.emit(name, payload),
-        this.#options.config.id,
-        { callApi: (action, params) => callOnebot12Client(this.client, action, params) },
-        ev,
-        this.#logger,
-      );
+      receiveOneBot12SideEvent(ev, {
+        emit: (name, payload) => this[endpointSpec].events.emit(name, payload),
+        endpointKey: this.#options.config.id,
+        caller: { callApi: (action, params) => callOnebot12Client({ client: this, action, params }) },
+        logger: this.#logger,
+      });
       return;
     }
-    const conversation = onebot12InboundConversation(String(this.#options.id), ev);
+    const conversation = { ...onebot12InboundConversation(String(this.#options.id), ev), endpoint: this[endpointSpec].identity };
     const nickname = senderNickname(ev);
     const mentioned = isBotMentioned(ev);
-    void this.emit('message.receive', {
+    void this[endpointSpec].events.message({
+      event: ev,
+      ...(typeof ev.time === 'number' ? { platformSentAt: ev.time * 1000 } : {}),
       conversation,
       message: { conversation, id: ev.message_id },
       content: formatInboundContent(ev),
@@ -201,7 +219,7 @@ export class OneBot12WssEndpoint extends ClientEndpoint<Onebot12Client> {
     }
     const socket = connection.socket as unknown as OneBot12WsSocket;
     await this.#connectionLifecycle.stop();
-    rejectAllPending(this.#pending, '连接已替换');
+    this.#rpc.disconnect('连接已替换');
     await this.#connectionLifecycle.start(async (lifecycleHandle) => {
       this.#ws = socket;
       lifecycleHandle.onForceClose(() => {
@@ -218,18 +236,14 @@ export class OneBot12WssEndpoint extends ClientEndpoint<Onebot12Client> {
       socket.on('message', (data) => {
         if (this.#ws !== socket) return;
         this.#connectionLifecycle.notifyHeartbeatAck();
-        handleOneBot12WsMessage(data, {
-          endpointId: this.#options.config.id,
-          pending: this.#pending,
-          ingest: (event) => this.client.ingest(
-            event as Parameters<Onebot12Client['ingest']>[0],
-          ),
+        this.#rpc.receive(data, event => {
+          if (matchesOneBot12Self(this.#options.config, event)) this.ingest(event as Parameters<Onebot12Client['ingest']>[0]);
         });
       });
       socket.on('close', () => {
         if (this.#ws === socket) {
           this.#ws = undefined;
-          rejectAllPending(this.#pending);
+          this.#rpc.disconnect();
         }
         lifecycleHandle.notifyClosed(new Error('OneBot12 reverse WebSocket closed'));
       });
@@ -242,7 +256,7 @@ export class OneBot12WssEndpoint extends ClientEndpoint<Onebot12Client> {
   }
 
   #callAction(action: string, params: Record<string, unknown>) {
-    return callOneBot12WsAction(this.#ws, this.#pending, this.#requestId, action, params);
+    return this.#rpc.call({ action, params });
   }
 
 }

package/lib/onebot12-runtime-state.d.ts

@@ -1 +0,0 @@
-export declare const onebot12RuntimeStateToken: import("zhin.js").Token<import("@zhin.js/adapter").EndpointRuntimeState>;

package/lib/onebot12-runtime-state.js

@@ -1,6 +0,0 @@
-/**
- * OneBot12 插件实例的运行时状态：adapter create() 注册的 endpoint 列表。
- * 由 plugin.ts setup() provide，adapter create 与 `onebot12 endpoint` 命令共享（同一 owner generation）。
- */
-import { defineEndpointRuntimeStateToken } from 'zhin.js/adapter';
-export const onebot12RuntimeStateToken = defineEndpointRuntimeStateToken('onebot12');

package/src/onebot12-runtime-state.ts

@@ -1,7 +0,0 @@
-/**
- * OneBot12 插件实例的运行时状态：adapter create() 注册的 endpoint 列表。
- * 由 plugin.ts setup() provide，adapter create 与 `onebot12 endpoint` 命令共享（同一 owner generation）。
- */
-import { defineEndpointRuntimeStateToken } from 'zhin.js/adapter';
-
-export const onebot12RuntimeStateToken = defineEndpointRuntimeStateToken('onebot12');