@zhin.js/adapter-onebot11 6.0.2 → 6.0.5

package/src/ws-endpoint.ts

@@ -8,9 +8,10 @@ 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 { createOneBot11EndpointManagement } from './endpoint-management.js';
 import { registerOnebot11AgentEndpoint } from './onebot11-agent-deps.js';
@@ -19,9 +20,10 @@ import {
   buildWsConnectOptions,
   formatInboundContent,
   formatInboundMetadata,
-  formatInboundTarget,
   formatOutboundSegments,
   isMessageEvent,
+  onebot11InboundConversation,
+  senderDisplayName,
   senderUserId,
   type OneBot11Event,
   type OneBot11WsConfig,
@@ -37,8 +39,6 @@ import {
   type OneBot11WsSocket,
 } from './ws-types.js';
 
-const logger = getLogger('onebot11');
-
 export interface OneBot11WsEndpointOptions {
   readonly id: CapabilityId;
   readonly gateway: MessageGateway;
@@ -50,6 +50,8 @@ export interface OneBot11WsEndpointOptions {
 }
 
 export class OneBot11WsEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: OneBot11WsEndpointOptions;
   readonly management: EndpointManagement = createOneBot11EndpointManagement(this);
   readonly #lifecycle: EndpointLifecycle;
@@ -60,10 +62,11 @@ export class OneBot11WsEndpoint implements EndpointInstance {
   #unregisterAgent?: () => void;
 
   constructor(options: OneBot11WsEndpointOptions) {
+    this.#logger = getAdapterLogger('onebot11', 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 语义
@@ -78,7 +81,7 @@ export class OneBot11WsEndpoint implements EndpointInstance {
   async start(): Promise<void> {
     if (this.#lifecycle.started) return;
     // agent 注册/反注册是适配器专有依赖，留在适配器侧（见 endpoint-lifecycle 迁移指引）
-    this.#unregisterAgent = registerOnebot11AgentEndpoint(this.#options.config.name, this);
+    this.#unregisterAgent = registerOnebot11AgentEndpoint(this.#options.config.id, this);
     try {
       await this.#lifecycle.start((handle) => this.#connect(handle));
     } catch (err) {
@@ -115,15 +118,15 @@ export class OneBot11WsEndpoint 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 message = formatOutboundSegments(payload);
-    const { action, params } = buildSendAction(target, message);
+    const { action, params } = buildSendAction(conversation, message);
     const data = await this.callApi(action, params) as { message_id?: number | string } | undefined;
     const messageId = data?.message_id != null ? String(data.message_id) : '';
-    logger.debug(formatCompact({
+    this.#logger.debug(formatCompact({
       op: 'onebot11_send',
-      endpoint: this.#options.config.name,
-      target,
+      endpoint: this.#options.config.id,
+      target: `${conversation.kind}:${conversation.id}`,
       messageId,
     }));
     return messageId;
@@ -157,19 +160,26 @@ export class OneBot11WsEndpoint implements EndpointInstance {
   /** Test / internal: admit a parsed event when the endpoint is open. */
   admit(ev: OneBot11Event): void {
     if (!this.#open || !isMessageEvent(ev)) return;
-    const target = formatInboundTarget(ev);
+    const conversation = onebot11InboundConversation(String(this.#options.id), ev);
     const content = formatInboundContent(ev);
+    const inbound = formatInboundMetadata(ev, this.#options.config.id);
     void this.#options.gateway.receive({
-      adapter: this.#options.id,
-      target,
+      conversation,
+      message: { conversation, id: String(ev.message_id) },
       content,
-      sender: senderUserId(ev),
-      id: String(ev.message_id),
-      metadata: formatInboundMetadata(ev, this.#options.config.name),
+      sender: {
+        id: senderUserId(ev),
+        name: senderDisplayName(ev) || undefined,
+        ...(ev.sender?.role ? { roles: [ev.sender.role] } : {}),
+      },
+      endpointId: inbound.endpointId,
+      ...(inbound.mentioned ? { mentioned: true } : {}),
+      ...(inbound.replyTo ? { replyTo: inbound.replyTo } : {}),
+      metadata: inbound.metadata,
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'onebot11_gateway_receive_failed',
-        target,
+        target: `${conversation.kind}:${conversation.id}`,
         error: err instanceof Error ? err.message : String(err),
       }));
     });
@@ -197,14 +207,14 @@ export class OneBot11WsEndpoint implements EndpointInstance {
         if (settled) return;
         settled = true;
         if (!this.#options.config.access_token) {
-          logger.warn(formatCompact({
-            endpoint: this.#options.config.name,
+          this.#logger.warn(formatCompact({
+            endpoint: this.#options.config.id,
             ok: false,
             error: 'missing access_token',
           }));
         }
-        logger.debug(formatCompact({
-          endpoint: this.#options.config.name,
+        this.#logger.debug(formatCompact({
+          endpoint: this.#options.config.id,
           mode: 'ws',
           url: safeUrl,
         }));
@@ -214,7 +224,7 @@ export class OneBot11WsEndpoint implements EndpointInstance {
 
       ws.on('message', (data) => {
         handleOneBot11WsMessage(data, {
-          endpointName: this.#options.config.name,
+          endpointId: this.#options.config.id,
           pending: this.#pending,
           admit: (ev) => this.admit(ev),
         });
@@ -243,9 +253,9 @@ export class OneBot11WsEndpoint 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,
         }));

package/src/ws-transport.ts

@@ -23,7 +23,7 @@ export function decodeWsPayload(data: unknown): string {
 export function handleOneBot11WsMessage(
   data: unknown,
   options: {
-    readonly endpointName: string;
+    readonly endpointId: string;
     readonly pending: Map<string, OneBot11PendingAction>;
     readonly admit: (ev: OneBot11Event) => void;
   },
@@ -46,7 +46,7 @@ export function handleOneBot11WsMessage(
   } catch (error) {
     logger.warn(formatCompact({
       op: 'onebot11_parse_failed',
-      endpoint: options.endpointName,
+      endpoint: options.endpointId,
       error: error instanceof Error ? error.message : String(error),
     }));
   }

package/src/wss-endpoint.ts

@@ -2,10 +2,10 @@
  * OneBot11 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 { createOneBot11EndpointManagement } from './endpoint-management.js';
 import { registerOnebot11AgentEndpoint } from './onebot11-agent-deps.js';
@@ -13,9 +13,10 @@ import {
   buildSendAction,
   formatInboundContent,
   formatInboundMetadata,
-  formatInboundTarget,
   formatOutboundSegments,
   isMessageEvent,
+  onebot11InboundConversation,
+  senderDisplayName,
   senderUserId,
   type OneBot11Event,
   type OneBot11WssConfig,
@@ -33,8 +34,6 @@ import {
   type OneBot11WsSocket,
 } from './ws-types.js';
 
-const logger = getLogger('onebot11');
-
 export interface OneBot11WssEndpointOptions {
   readonly id: CapabilityId;
   readonly gateway: MessageGateway;
@@ -43,6 +42,8 @@ export interface OneBot11WssEndpointOptions {
 }
 
 export class OneBot11WssEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: OneBot11WssEndpointOptions;
   readonly management: EndpointManagement = createOneBot11EndpointManagement(this);
   #ws?: OneBot11WsSocket;
@@ -55,6 +56,7 @@ export class OneBot11WssEndpoint implements EndpointInstance {
   #unregisterAgent?: () => void;
 
   constructor(options: OneBot11WssEndpointOptions) {
+    this.#logger = getAdapterLogger('onebot11', options.config.id);
     this.#options = options;
   }
 
@@ -63,24 +65,24 @@ export class OneBot11WssEndpoint 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',
       }));
     }
     this.#unregisterAgent = registerOnebot11AgentEndpoint(
-      this.#options.config.name,
+      this.#options.config.id,
       this as unknown as OneBot11WsEndpoint,
     );
     const handle = this.#options.http.ws(this.#options.config.path);
     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,
     }));
@@ -116,9 +118,9 @@ export class OneBot11WssEndpoint 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 message = formatOutboundSegments(payload);
-    const { action, params } = buildSendAction(target, message);
+    const { action, params } = buildSendAction(conversation, message);
     const data = await this.callApi(action, params) as { message_id?: number | string } | undefined;
     return data?.message_id != null ? String(data.message_id) : '';
   }
@@ -144,18 +146,25 @@ export class OneBot11WssEndpoint implements EndpointInstance {
 
   admit(ev: OneBot11Event): void {
     if (!this.#open || !isMessageEvent(ev)) return;
-    const target = formatInboundTarget(ev);
+    const conversation = onebot11InboundConversation(String(this.#options.id), ev);
+    const inbound = formatInboundMetadata(ev, this.#options.config.id);
     void this.#options.gateway.receive({
-      adapter: this.#options.id,
-      target,
+      conversation,
+      message: { conversation, id: String(ev.message_id) },
       content: formatInboundContent(ev),
-      sender: senderUserId(ev),
-      id: String(ev.message_id),
-      metadata: formatInboundMetadata(ev, this.#options.config.name),
+      sender: {
+        id: senderUserId(ev),
+        name: senderDisplayName(ev) || undefined,
+        ...(ev.sender?.role ? { roles: [ev.sender.role] } : {}),
+      },
+      endpointId: inbound.endpointId,
+      ...(inbound.mentioned ? { mentioned: true } : {}),
+      ...(inbound.replyTo ? { replyTo: inbound.replyTo } : {}),
+      metadata: inbound.metadata,
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'onebot11_gateway_receive_failed',
-        target,
+        target: `${conversation.kind}:${conversation.id}`,
         error: err instanceof Error ? err.message : String(err),
       }));
     });
@@ -182,7 +191,7 @@ export class OneBot11WssEndpoint implements EndpointInstance {
     );
     socket.on('message', (data) => {
       handleOneBot11WsMessage(data, {
-        endpointName: this.#options.config.name,
+        endpointId: this.#options.config.id,
         pending: this.#pending,
         admit: (ev) => this.admit(ev),
       });
@@ -196,8 +205,8 @@ export class OneBot11WssEndpoint 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,
     }));