@zhin.js/adapter-onebot12 5.0.1 → 5.0.4

package/src/ws-endpoint.ts

@@ -9,19 +9,20 @@ import {
   type EndpointInstance,
   type EndpointLifecycle,
   type EndpointManagement,
+  type EndpointSendRequest,
 } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
 import { createOneBot12EndpointManagement } from './endpoint-management.js';
 import {
   buildSendMessageParams,
   buildWsConnectOptions,
   formatInboundContent,
-  formatInboundTarget,
   formatOutboundSegments,
   isBotMentioned,
   isMessageEvent,
+  onebot12InboundConversation,
   senderNickname,
   senderUserId,
   uploadOneBot12MediaSegments,
@@ -36,8 +37,6 @@ import {
   WS_OPEN,
 } from './ws-types.js';
 
-const logger = getLogger('onebot12');
-
 export interface OneBot12WsEndpointOptions {
   readonly id: CapabilityId;
   readonly gateway: MessageGateway;
@@ -49,6 +48,8 @@ export interface OneBot12WsEndpointOptions {
 }
 
 export class OneBot12WsEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: OneBot12WsEndpointOptions;
   readonly management: EndpointManagement = createOneBot12EndpointManagement(this);
   readonly #lifecycle: EndpointLifecycle;
@@ -62,10 +63,11 @@ export class OneBot12WsEndpoint implements EndpointInstance {
   #open = false;
 
   constructor(options: OneBot12WsEndpointOptions) {
+    this.#logger = getAdapterLogger('onebot12', options.config.id);
     this.#options = options;
     const { config } = options;
     this.#lifecycle = createEndpointLifecycle({
-      name: config.name,
+      name: config.id,
       reconnect: {
         initialIntervalMs: config.reconnect_interval,
         // 固定间隔（multiplier 1、无抖动），对齐旧 reconnect_interval 语义
@@ -115,26 +117,27 @@ export class OneBot12WsEndpoint implements EndpointInstance {
     this.#ws = undefined;
   }
 
-  async send({ target, payload }: { readonly target: string; readonly payload: unknown }): Promise<string> {
+  async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
     const materialized = await uploadOneBot12MediaSegments(
       payload,
       (action, params) => this.callApi(action, params),
       (error) => {
-        logger.warn(formatCompact({
+        this.#logger.warn(formatCompact({
           op: 'onebot12_upload_failed',
-          endpoint: this.#options.config.name,
+          endpoint: this.#options.config.id,
           error: error instanceof Error ? error.message : String(error),
         }));
       },
     );
     const message = formatOutboundSegments(materialized);
-    const params = buildSendMessageParams(target, message);
+    const params = buildSendMessageParams(conversation, message);
     const data = await this.#callAction('send_message', params) as { message_id?: string } | undefined;
     const messageId = data?.message_id ?? '';
-    logger.debug(formatCompact({
+    this.#logger.debug(formatCompact({
       op: 'onebot12_send',
-      endpoint: this.#options.config.name,
-      target,
+      endpoint: this.#options.config.id,
+      kind: conversation.kind,
+      conversationId: conversation.id,
       messageId,
     }));
     return messageId;
@@ -153,31 +156,31 @@ export class OneBot12WsEndpoint implements EndpointInstance {
   /** Test / internal: admit a parsed event when the endpoint is open. */
   admit(ev: OneBot12Event): void {
     if (!this.#open || !isMessageEvent(ev)) return;
-    const target = formatInboundTarget(ev);
+    const conversation = onebot12InboundConversation(String(this.#options.id), ev);
     const content = formatInboundContent(ev);
     const nickname = senderNickname(ev);
     const mentioned = isBotMentioned(ev);
     void this.#options.gateway.receive({
-      adapter: this.#options.id,
-      target,
+      conversation,
+      message: { conversation, id: ev.message_id },
       content,
-      sender: senderUserId(ev),
-      id: ev.message_id,
+      sender: { id: senderUserId(ev), name: senderNickname(ev) },
+      endpointId: this.#options.config.id,
+      ...(mentioned ? { mentioned: true } : {}),
       metadata: Object.freeze({
         detail_type: ev.detail_type,
         user_id: ev.user_id,
         group_id: ev.group_id,
         channel_id: ev.channel_id,
         guild_id: ev.guild_id,
-        endpoint: this.#options.config.name,
         time: ev.time,
         ...(nickname ? { nickname } : {}),
-        ...(mentioned ? { mentioned: true } : {}),
       }),
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'onebot12_gateway_receive_failed',
-        target,
+        kind: conversation.kind,
+        conversationId: conversation.id,
         error: err instanceof Error ? err.message : String(err),
       }));
     });
@@ -204,8 +207,8 @@ export class OneBot12WsEndpoint implements EndpointInstance {
       ws.on('open', () => {
         if (settled) return;
         settled = true;
-        logger.debug(formatCompact({
-          endpoint: this.#options.config.name,
+        this.#logger.debug(formatCompact({
+          endpoint: this.#options.config.id,
           mode: 'ws',
           url: safeUrl,
         }));
@@ -237,9 +240,9 @@ export class OneBot12WsEndpoint implements EndpointInstance {
 
       ws.on('error', (err) => {
         const error = err instanceof Error ? err : new Error(String(err));
-        logger.warn(formatCompact({
+        this.#logger.warn(formatCompact({
           op: 'ws_error',
-          endpoint: this.#options.config.name,
+          endpoint: this.#options.config.id,
           ok: false,
           error: error.message,
         }));
@@ -274,9 +277,9 @@ export class OneBot12WsEndpoint implements EndpointInstance {
       }
       this.admit(msg as OneBot12Event);
     } catch (error) {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'onebot12_parse_failed',
-        endpoint: this.#options.config.name,
+        endpoint: this.#options.config.id,
         error: error instanceof Error ? error.message : String(error),
       }));
     }

package/src/wss-endpoint.ts

@@ -2,19 +2,19 @@
  * OneBot12 reverse WSS endpoint — accepts inbound WebSocket from OneBot implementation.
  */
 import { clearInterval } from 'node:timers';
-import type { EndpointInstance, EndpointManagement } from '@zhin.js/adapter';
+import type { EndpointInstance, EndpointManagement, EndpointSendRequest } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
 import type { HttpHost, WsConnection } from '@zhin.js/host-http';
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
 import { createOneBot12EndpointManagement } from './endpoint-management.js';
 import {
   buildSendMessageParams,
   formatInboundContent,
-  formatInboundTarget,
   formatOutboundSegments,
   isBotMentioned,
   isMessageEvent,
+  onebot12InboundConversation,
   senderNickname,
   senderUserId,
   uploadOneBot12MediaSegments,
@@ -26,8 +26,6 @@ import {
 import { verifyOneBotAccessToken } from './wss-auth.js';
 import { type OneBot12WsSocket, WS_OPEN } from './ws-types.js';
 
-const logger = getLogger('onebot12');
-
 export interface OneBot12WssEndpointOptions {
   readonly id: CapabilityId;
   readonly gateway: MessageGateway;
@@ -36,6 +34,8 @@ export interface OneBot12WssEndpointOptions {
 }
 
 export class OneBot12WssEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: OneBot12WssEndpointOptions;
   readonly management: EndpointManagement = createOneBot12EndpointManagement(this);
   #ws?: OneBot12WsSocket;
@@ -51,6 +51,7 @@ export class OneBot12WssEndpoint implements EndpointInstance {
   #started = false;
 
   constructor(options: OneBot12WssEndpointOptions) {
+    this.#logger = getAdapterLogger('onebot12', options.config.id);
     this.#options = options;
   }
 
@@ -59,8 +60,8 @@ export class OneBot12WssEndpoint implements EndpointInstance {
     this.#started = true;
     if (!this.#options.config.access_token) {
       // wss 模式未配 access_token 时任何连接都会被放行（verifyOneBotAccessToken 直接 return true）
-      logger.warn(formatCompact({
-        endpoint: this.#options.config.name,
+      this.#logger.warn(formatCompact({
+        endpoint: this.#options.config.id,
         mode: 'wss',
         ok: false,
         error: 'missing access_token',
@@ -70,9 +71,9 @@ export class OneBot12WssEndpoint implements EndpointInstance {
     this.#wsRelease = handle.onConnection((connection) => {
       this.#acceptConnection(connection);
     });
-    logger.info(formatCompact({
+    this.#logger.info(formatCompact({
       op: 'listen',
-      endpoint: this.#options.config.name,
+      endpoint: this.#options.config.id,
       mode: 'wss',
       path: this.#options.config.path,
     }));
@@ -110,20 +111,20 @@ export class OneBot12WssEndpoint implements EndpointInstance {
     this.#started = false;
   }
 
-  async send({ target, payload }: { readonly target: string; readonly payload: unknown }): Promise<string> {
+  async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
     const materialized = await uploadOneBot12MediaSegments(
       payload,
       (action, params) => this.callApi(action, params),
       (error) => {
-        logger.warn(formatCompact({
+        this.#logger.warn(formatCompact({
           op: 'onebot12_upload_failed',
-          endpoint: this.#options.config.name,
+          endpoint: this.#options.config.id,
           error: error instanceof Error ? error.message : String(error),
         }));
       },
     );
     const message = formatOutboundSegments(materialized);
-    const params = buildSendMessageParams(target, message);
+    const params = buildSendMessageParams(conversation, message);
     const data = await this.#callAction('send_message', params) as { message_id?: string } | undefined;
     return data?.message_id ?? '';
   }
@@ -140,30 +141,30 @@ export class OneBot12WssEndpoint implements EndpointInstance {
 
   admit(ev: OneBot12Event): void {
     if (!this.#open || !isMessageEvent(ev)) return;
-    const target = formatInboundTarget(ev);
+    const conversation = onebot12InboundConversation(String(this.#options.id), ev);
     const nickname = senderNickname(ev);
     const mentioned = isBotMentioned(ev);
     void this.#options.gateway.receive({
-      adapter: this.#options.id,
-      target,
+      conversation,
+      message: { conversation, id: ev.message_id },
       content: formatInboundContent(ev),
-      sender: senderUserId(ev),
-      id: ev.message_id,
+      sender: { id: senderUserId(ev), name: senderNickname(ev) },
+      endpointId: this.#options.config.id,
+      ...(mentioned ? { mentioned: true } : {}),
       metadata: Object.freeze({
         detail_type: ev.detail_type,
         user_id: ev.user_id,
         group_id: ev.group_id,
         channel_id: ev.channel_id,
         guild_id: ev.guild_id,
-        endpoint: this.#options.config.name,
         time: ev.time,
         ...(nickname ? { nickname } : {}),
-        ...(mentioned ? { mentioned: true } : {}),
       }),
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'onebot12_gateway_receive_failed',
-        target,
+        kind: conversation.kind,
+        conversationId: conversation.id,
         error: err instanceof Error ? err.message : String(err),
       }));
     });
@@ -196,8 +197,8 @@ export class OneBot12WssEndpoint implements EndpointInstance {
         }
       }
     });
-    logger.debug(formatCompact({
-      endpoint: this.#options.config.name,
+    this.#logger.debug(formatCompact({
+      endpoint: this.#options.config.id,
       mode: 'wss',
       peer: connection.request.socket.remoteAddress,
     }));
@@ -226,9 +227,9 @@ export class OneBot12WssEndpoint implements EndpointInstance {
       }
       this.admit(msg as OneBot12Event);
     } catch (error) {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'onebot12_parse_failed',
-        endpoint: this.#options.config.name,
+        endpoint: this.#options.config.id,
         error: error instanceof Error ? error.message : String(error),
       }));
     }