@zhin.js/adapter-onebot12 5.0.1 → 5.0.4

package/lib/wss-endpoint.js

@@ -2,13 +2,13 @@
  * OneBot12 reverse WSS endpoint — accepts inbound WebSocket from OneBot implementation.
  */
 import { clearInterval } from 'node:timers';
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { createOneBot12EndpointManagement } from './endpoint-management.js';
-import { buildSendMessageParams, formatInboundContent, formatInboundTarget, formatOutboundSegments, isBotMentioned, isMessageEvent, senderNickname, senderUserId, uploadOneBot12MediaSegments, } from './protocol.js';
+import { buildSendMessageParams, formatInboundContent, formatOutboundSegments, isBotMentioned, isMessageEvent, onebot12InboundConversation, senderNickname, senderUserId, uploadOneBot12MediaSegments, } from './protocol.js';
 import { verifyOneBotAccessToken } from './wss-auth.js';
 import { WS_OPEN } from './ws-types.js';
-const logger = getLogger('onebot12');
 export class OneBot12WssEndpoint {
+    #logger;
     #options;
     management = createOneBot12EndpointManagement(this);
     #ws;
@@ -19,6 +19,7 @@ export class OneBot12WssEndpoint {
     #open = false;
     #started = false;
     constructor(options) {
+        this.#logger = getAdapterLogger('onebot12', options.config.id);
         this.#options = options;
     }
     async start() {
@@ -27,8 +28,8 @@ export class OneBot12WssEndpoint {
         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',
@@ -38,9 +39,9 @@ export class OneBot12WssEndpoint {
         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,
         }));
@@ -75,16 +76,16 @@ export class OneBot12WssEndpoint {
         }
         this.#started = false;
     }
-    async send({ target, payload }) {
+    async send({ conversation, payload }) {
         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);
         return data?.message_id ?? '';
     }
@@ -100,30 +101,30 @@ export class OneBot12WssEndpoint {
     admit(ev) {
         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),
             }));
         });
@@ -156,8 +157,8 @@ export class OneBot12WssEndpoint {
                 }
             }
         });
-        logger.debug(formatCompact({
-            endpoint: this.#options.config.name,
+        this.#logger.debug(formatCompact({
+            endpoint: this.#options.config.id,
             mode: 'wss',
             peer: connection.request.socket.remoteAddress,
         }));
@@ -188,9 +189,9 @@ export class OneBot12WssEndpoint {
             this.admit(msg);
         }
         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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-onebot12",
-  "version": "5.0.1",
+  "version": "5.0.4",
   "description": "Zhin.js OneBot 12 adapter for Plugin Runtime (WebSocket client)",
   "type": "module",
   "main": "./lib/index.js",
@@ -40,25 +40,26 @@
   },
   "dependencies": {
     "ws": "^8.21.1",
-    "@zhin.js/adapter": "1.1.4",
-    "@zhin.js/command": "1.0.6",
-    "@zhin.js/core": "1.5.1",
-    "@zhin.js/host-http": "1.0.5",
-    "@zhin.js/logger": "1.0.75",
-    "@zhin.js/plugin-runtime": "1.1.2"
+    "@zhin.js/adapter": "1.1.7",
+    "@zhin.js/command": "1.0.9",
+    "@zhin.js/core": "1.5.4",
+    "@zhin.js/host-http": "1.0.8",
+    "@zhin.js/im-contract": "1.0.3",
+    "@zhin.js/logger": "1.0.76",
+    "@zhin.js/plugin-runtime": "1.1.5"
   },
   "devDependencies": {
     "@types/node": "^26.1.2",
     "@types/ws": "^8.18.1",
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
-    "@zhin.js/host-http": "1.0.5"
+    "@zhin.js/host-http": "1.0.8"
   },
   "peerDependencies": {
-    "@zhin.js/adapter": "1.1.4",
-    "@zhin.js/core": "1.5.1",
-    "@zhin.js/plugin-runtime": "1.1.2",
-    "zhin.js": "6.0.1"
+    "@zhin.js/adapter": "1.1.7",
+    "@zhin.js/core": "1.5.4",
+    "@zhin.js/plugin-runtime": "1.1.5",
+    "zhin.js": "6.0.4"
   },
   "peerDependenciesMeta": {
     "zhin.js": {

package/schema.json

@@ -21,16 +21,48 @@
       "type": "number",
       "default": 30000
     },
+    "master": {
+      "type": [
+        "string",
+        "number"
+      ],
+      "description": "框架 master（platform user id；AI/工具权限、endpoint 管理）。endpoints[i].master 可逐项覆盖"
+    },
+    "trusted": {
+      "type": "array",
+      "items": {
+        "type": [
+          "string",
+          "number"
+        ],
+        "description": "Trusted platform user id"
+      },
+      "description": "框架 trusted 用户列表（弱于 master）。endpoints[i].trusted 可逐项追加"
+    },
     "endpoints": {
       "type": "array",
-      "description": "多账号：一个插件实例挂多个 endpoint。每项与顶层字段同构（name 必填，其余覆盖顶层）",
+      "description": "多账号：一个插件实例挂多个 endpoint。每项与顶层字段同构（id 必填，其余覆盖顶层）",
       "items": {
         "type": "object",
         "additionalProperties": true,
         "properties": {
-          "name": {
-            "type": "string",
-            "description": "OneBot12 bot name"
+          "master": {
+            "type": [
+              "string",
+              "number"
+            ],
+            "description": "本 endpoint 的框架 master（platform user id）；覆盖顶层 master"
+          },
+          "trusted": {
+            "type": "array",
+            "items": {
+              "type": [
+                "string",
+                "number"
+              ],
+              "description": "Trusted platform user id"
+            },
+            "description": "本 endpoint 的 trusted 列表"
           },
           "url": {
             "type": "string",
@@ -47,10 +79,14 @@
           "access_token": {
             "type": "string",
             "description": "OneBot access token"
+          },
+          "id": {
+            "type": "string",
+            "description": "OneBot12 bot name"
           }
         },
         "required": [
-          "name"
+          "id"
         ]
       }
     },

package/src/index.ts

@@ -3,14 +3,13 @@ export {
   buildWsConnectOptions,
   callOneBot12Action,
   formatInboundContent,
-  formatInboundTarget,
   formatOutboundSegments,
   getChannelId,
   isBotMentioned,
   isMessageEvent,
   mediaRefToOneBot12Fields,
   mediaRefToOneBot12UploadParams,
-  parseSendTarget,
+  onebot12InboundConversation,
   resolveOneBot12Config,
   senderNickname,
   senderUserId,
@@ -29,7 +28,6 @@ export {
   type OneBot12WireSegment,
   type OneBot12WsConfig,
   type OneBot12WssConfig,
-  type ParsedSendTarget,
   type ResolvedOneBot12Config,
 } from './protocol.js';
 

package/src/protocol.ts

@@ -4,6 +4,7 @@
  * Spec: https://12.onebot.dev/
  */
 import { isMediaRef, type MediaRef } from '@zhin.js/core';
+import type { ConversationRef } from '@zhin.js/im-contract';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 
 const logger = getLogger('onebot12');
@@ -12,7 +13,7 @@ const logger = getLogger('onebot12');
 export interface OneBot12LegacyEndpointRow {
   readonly context?: string;
   readonly connection?: 'ws' | 'webhook' | 'wss';
-  readonly name?: string;
+  readonly id?: string;
   readonly access_token?: string;
   readonly url?: string;
   readonly path?: string;
@@ -24,7 +25,7 @@ export interface OneBot12LegacyEndpointRow {
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface OneBot12AdapterConfig {
   readonly connection?: 'ws' | 'webhook' | 'wss';
-  readonly name?: string;
+  readonly id?: string;
   readonly access_token?: string;
   readonly url?: string;
   readonly path?: string;
@@ -37,7 +38,7 @@ export interface OneBot12AdapterConfig {
 
 export interface OneBot12ConfigBase {
   readonly context: 'onebot12';
-  readonly name: string;
+  readonly id: string;
   readonly access_token?: string;
 }
 
@@ -118,19 +119,13 @@ export interface OneBot12WireSegment {
   readonly data?: Record<string, unknown>;
 }
 
-export interface ParsedSendTarget {
-  readonly detail_type: 'private' | 'group' | 'channel';
-  readonly id: string;
-  readonly guild_id?: string;
-}
-
 export function resolveOneBot12Config(config: OneBot12AdapterConfig = {}): ResolvedOneBot12Config {
   const entry = config.endpoints?.find((item) => item.context === 'onebot12');
   const connection = config.connection
     ?? entry?.connection
     ?? 'ws';
-  const name = (typeof config.name === 'string' && config.name)
-    || (typeof entry?.name === 'string' && entry.name)
+  const id = (typeof config.id === 'string' && config.id)
+    || (typeof entry?.id === 'string' && entry.id)
     || process.env.ONEBOT12_BOT_NAME
     || 'onebot12-bot';
   const access_token = config.access_token ?? entry?.access_token;
@@ -145,7 +140,7 @@ export function resolveOneBot12Config(config: OneBot12AdapterConfig = {}): Resol
     return {
       context: 'onebot12',
       connection: 'ws',
-      name,
+      id,
       access_token,
       url,
       reconnect_interval: config.reconnect_interval ?? entry?.reconnect_interval ?? 5000,
@@ -161,7 +156,7 @@ export function resolveOneBot12Config(config: OneBot12AdapterConfig = {}): Resol
     return {
       context: 'onebot12',
       connection: 'webhook',
-      name,
+      id,
       access_token,
       path,
       api_url: config.api_url ?? entry?.api_url,
@@ -176,7 +171,7 @@ export function resolveOneBot12Config(config: OneBot12AdapterConfig = {}): Resol
     return {
       context: 'onebot12',
       connection: 'wss',
-      name,
+      id,
       access_token,
       path,
       heartbeat_interval: config.heartbeat_interval ?? entry?.heartbeat_interval ?? 30_000,
@@ -204,37 +199,31 @@ export function getChannelId(ev: OneBot12Event): string {
 }
 
 /**
- * Gateway reply target：`detail_type:channelId`，便于 send() 还原动作参数。
+ * 入站归一化 → ConversationRef：`detail_type` 直映射 kind；channel 的 guild 容器
+ * 进 `parent`（kind 'channel'）；私聊临时会话（private 事件携带 group_id）映射为
+ * group 容器内的 private 会话。
  */
-export function formatInboundTarget(ev: OneBot12Event): string {
-  const detail = ev.detail_type === 'private' || ev.detail_type === 'group' || ev.detail_type === 'channel'
-    ? ev.detail_type
-    : 'private';
-  return `${detail}:${getChannelId(ev)}`;
-}
-
-export function parseSendTarget(target: string): ParsedSendTarget {
-  const sep = target.indexOf(':');
-  if (sep <= 0) {
-    return { detail_type: 'private', id: target };
-  }
-  const head = target.slice(0, sep);
-  const rest = target.slice(sep + 1);
-  if (head === 'private' || head === 'group') {
-    return { detail_type: head, id: rest };
+export function onebot12InboundConversation(endpointKey: string, ev: OneBot12Event): ConversationRef {
+  const endpoint = { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey };
+  if (ev.detail_type === 'group' && ev.group_id) {
+    return { endpoint, kind: 'group', id: ev.group_id };
   }
-  if (head === 'channel') {
-    const guildSep = rest.indexOf(':');
-    if (guildSep > 0) {
-      return {
-        detail_type: 'channel',
-        guild_id: rest.slice(0, guildSep),
-        id: rest.slice(guildSep + 1),
-      };
-    }
-    return { detail_type: 'channel', id: rest };
+  if (ev.detail_type === 'channel' && ev.channel_id) {
+    return {
+      endpoint,
+      kind: 'channel',
+      id: ev.channel_id,
+      ...(ev.guild_id ? { parent: { kind: 'channel' as const, id: ev.guild_id } } : {}),
+    };
   }
-  return { detail_type: 'private', id: target };
+  return {
+    endpoint,
+    kind: 'private',
+    id: ev.user_id ?? ev.group_id ?? '',
+    ...(ev.detail_type === 'private' && ev.group_id
+      ? { parent: { kind: 'group' as const, id: ev.group_id } }
+      : {}),
+  };
 }
 
 /** Build inbound text for MessageGateway.receive */
@@ -501,22 +490,25 @@ export async function uploadOneBot12MediaSegments(
   return uploadOneMediaSegment(payload, callAction, onUploadFailed);
 }
 
+/**
+ * 结构化会话 → OB12 `send_message` 动作参数：kind 直映射 detail_type；
+ * channel 的 guild 容器取自 `conversation.parent`（kind 'channel'）。
+ */
 export function buildSendMessageParams(
-  target: string,
+  conversation: ConversationRef,
   message: OneBot12Segment[],
 ): Record<string, unknown> {
-  const parsed = parseSendTarget(target);
   const params: Record<string, unknown> = {
     message,
-    detail_type: parsed.detail_type,
+    detail_type: conversation.kind,
   };
-  if (parsed.detail_type === 'private') {
-    params.user_id = parsed.id;
-  } else if (parsed.detail_type === 'group') {
-    params.group_id = parsed.id;
+  if (conversation.kind === 'private') {
+    params.user_id = conversation.id;
+  } else if (conversation.kind === 'group') {
+    params.group_id = conversation.id;
   } else {
-    params.channel_id = parsed.id;
-    if (parsed.guild_id) params.guild_id = parsed.guild_id;
+    params.channel_id = conversation.id;
+    if (conversation.parent?.kind === 'channel') params.guild_id = conversation.parent.id;
   }
   return params;
 }

package/src/webhook.ts

@@ -2,7 +2,7 @@
  * OneBot12 HTTP webhook endpoint — POST inbound + api_url outbound.
  */
 import type { IncomingMessage, ServerResponse } from 'node:http';
-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, HttpRouteRegistration } from '@zhin.js/host-http';
 import { formatCompact, getLogger } from '@zhin.js/logger';
@@ -12,10 +12,10 @@ import {
   buildSendMessageParams,
   callOneBot12Action,
   formatInboundContent,
-  formatInboundTarget,
   formatOutboundSegments,
   isBotMentioned,
   isMessageEvent,
+  onebot12InboundConversation,
   senderNickname,
   senderUserId,
   uploadOneBot12MediaSegments,
@@ -53,7 +53,7 @@ export class OneBot12WebhookEndpoint implements EndpointInstance {
     if (!this.#options.config.access_token) {
       // webhook 模式未配 access_token 时任何 POST 都会被放行（verifyOneBotAccessToken 直接 return true）
       logger.warn(formatCompact({
-        endpoint: this.#options.config.name,
+        endpoint: this.#options.config.id,
         mode: 'webhook',
         ok: false,
         error: 'missing access_token',
@@ -62,7 +62,7 @@ export class OneBot12WebhookEndpoint implements EndpointInstance {
     this.#setupRoutes();
     logger.info(formatCompact({
       op: 'listen',
-      endpoint: this.#options.config.name,
+      endpoint: this.#options.config.id,
       mode: 'webhook',
       path: this.#options.config.path,
     }));
@@ -80,29 +80,30 @@ export class OneBot12WebhookEndpoint implements EndpointInstance {
     this.#open = false;
     for (const release of this.#routeReleases.splice(0)) release();
     this.#started = false;
-    logger.debug(formatCompact({ op: 'disconnect', endpoint: this.#options.config.name }));
+    logger.debug(formatCompact({ op: 'disconnect', endpoint: this.#options.config.id }));
   }
 
-  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({
           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.callApi('send_message', params) as { message_id?: string } | undefined;
     const messageId = data?.message_id ?? '';
     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;
@@ -124,31 +125,31 @@ export class OneBot12WebhookEndpoint 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 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), ...(nickname ? { name: nickname } : {}) },
+      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({
         op: 'onebot12_gateway_receive_failed',
-        target,
+        kind: conversation.kind,
+        conversationId: conversation.id,
         error: err instanceof Error ? err.message : String(err),
       }));
     });