@zhin.js/adapter-onebot11 6.0.2 → 6.0.5

package/lib/wss-endpoint.js

@@ -2,14 +2,14 @@
  * OneBot11 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 { createOneBot11EndpointManagement } from './endpoint-management.js';
 import { registerOnebot11AgentEndpoint } from './onebot11-agent-deps.js';
-import { buildSendAction, formatInboundContent, formatInboundMetadata, formatInboundTarget, formatOutboundSegments, isMessageEvent, senderUserId, } from './protocol.js';
+import { buildSendAction, formatInboundContent, formatInboundMetadata, formatOutboundSegments, isMessageEvent, onebot11InboundConversation, senderDisplayName, senderUserId, } from './protocol.js';
 import { verifyOneBotAccessToken } from './wss-auth.js';
 import { callOneBot11WsAction, handleOneBot11WsMessage, rejectAllPending, startOneBot11Heartbeat, } from './ws-transport.js';
-const logger = getLogger('onebot11');
 export class OneBot11WssEndpoint {
+    #logger;
     #options;
     management = createOneBot11EndpointManagement(this);
     #ws;
@@ -21,6 +21,7 @@ export class OneBot11WssEndpoint {
     #started = false;
     #unregisterAgent;
     constructor(options) {
+        this.#logger = getAdapterLogger('onebot11', options.config.id);
         this.#options = options;
     }
     async start() {
@@ -29,21 +30,21 @@ export class OneBot11WssEndpoint {
         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);
+        this.#unregisterAgent = registerOnebot11AgentEndpoint(this.#options.config.id, this);
         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,
         }));
@@ -76,9 +77,9 @@ export class OneBot11WssEndpoint {
         }
         this.#started = false;
     }
-    async send({ target, payload }) {
+    async send({ conversation, payload }) {
         const message = formatOutboundSegments(payload);
-        const { action, params } = buildSendAction(target, message);
+        const { action, params } = buildSendAction(conversation, message);
         const data = await this.callApi(action, params);
         return data?.message_id != null ? String(data.message_id) : '';
     }
@@ -102,18 +103,25 @@ export class OneBot11WssEndpoint {
     admit(ev) {
         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),
             }));
         });
@@ -136,7 +144,7 @@ export class OneBot11WssEndpoint {
         this.#heartbeatTimer = startOneBot11Heartbeat(this.#ws, this.#options.config.heartbeat_interval, this.#heartbeatTimer);
         socket.on('message', (data) => {
             handleOneBot11WsMessage(data, {
-                endpointName: this.#options.config.name,
+                endpointId: this.#options.config.id,
                 pending: this.#pending,
                 admit: (ev) => this.admit(ev),
             });
@@ -150,8 +158,8 @@ export class OneBot11WssEndpoint {
                 }
             }
         });
-        logger.debug(formatCompact({
-            endpoint: this.#options.config.name,
+        this.#logger.debug(formatCompact({
+            endpoint: this.#options.config.id,
             mode: 'wss',
             peer: connection.request.socket.remoteAddress,
         }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-onebot11",
-  "version": "6.0.2",
+  "version": "6.0.5",
   "description": "Zhin.js OneBot 11 adapter for Plugin Runtime (WebSocket client)",
   "type": "module",
   "main": "./lib/index.js",
@@ -41,12 +41,14 @@
   },
   "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/permission": "1.0.1",
+    "@zhin.js/plugin-runtime": "1.1.5"
   },
   "devDependencies": {
     "@types/node": "^26.1.2",
@@ -54,16 +56,16 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.2",
-    "@zhin.js/host-http": "1.0.5"
+    "@zhin.js/agent": "1.1.5",
+    "@zhin.js/host-http": "1.0.8"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "1.1.4",
-    "@zhin.js/agent": "1.1.2",
-    "@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/agent": "1.1.5",
+    "@zhin.js/core": "1.5.4",
+    "@zhin.js/plugin-runtime": "1.1.5",
+    "zhin.js": "6.0.4"
   },
   "peerDependenciesMeta": {
     "zhin.js": {

package/plugin.js

@@ -1,7 +1,7 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
 import { createEndpointRuntimeState } from '@zhin.js/adapter';
 import { definePlugin } from '@zhin.js/plugin-runtime';
-import { registerDefaultScenePlatformPermitChecker } from '@zhin.js/core';
+import { permissionHostToken, createSceneRolePlatformChecker } from '@zhin.js/permission';
 import { onebot11RuntimeStateToken } from "./lib/onebot11-runtime-state.js";
 export default definePlugin({
     name: 'onebot11',
@@ -9,9 +9,10 @@ export default definePlugin({
         displayName: 'OneBot 11 Adapter',
     },
     setup(context) {
-        // 运行中 endpoint 注册表（onebot11.endpoint list 的"运行中"数据源）
         context.resources.provide(onebot11RuntimeStateToken, createEndpointRuntimeState());
-        // 平台权限门禁：scene_admin / scene_owner 由 sender role 判定（见 ws/wss-endpoint admit metadata）
-        return registerDefaultScenePlatformPermitChecker('onebot11');
+        if (context.resources.has(permissionHostToken)) {
+            const host = context.resources.use(permissionHostToken);
+            return host.registerPlatform('onebot11', createSceneRolePlatformChecker());
+        }
     },
 });

package/schema.json

@@ -20,16 +20,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": "OneBot11 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",
@@ -42,10 +74,14 @@
           "access_token": {
             "type": "string",
             "description": "OneBot access token"
+          },
+          "id": {
+            "type": "string",
+            "description": "OneBot11 bot name"
           }
         },
         "required": [
-          "name"
+          "id"
         ]
       }
     },

package/src/index.ts

@@ -4,13 +4,12 @@ export {
   extractQuoteId,
   formatInboundContent,
   formatInboundMetadata,
-  formatInboundTarget,
   formatOutboundSegments,
   getChannelId,
   isMessageEvent,
   isOneBot11BotMentioned,
   mediaRefToOneBotFile,
-  parseSendTarget,
+  onebot11InboundConversation,
   resolveOneBot11Config,
   senderDisplayName,
   senderNickname,
@@ -26,7 +25,6 @@ export {
   type OneBot11WireSegment,
   type OneBot11WsConfig,
   type OneBot11WssConfig,
-  type ParsedSendTarget,
   type ResolvedOneBot11Config,
 } from './protocol.js';
 

package/src/onebot11-agent-deps.ts

@@ -14,20 +14,20 @@ export interface Onebot11AgentEndpoint {
 }
 
 export interface Onebot11AgentDeps {
-  getEndpoint: (endpointId: string) => Onebot11AgentEndpoint;
+  getEndpoint: (endpointKey: string) => Onebot11AgentEndpoint;
 }
 
 const endpoints = new Map<string, Onebot11AgentEndpoint>();
 let override: Onebot11AgentDeps | null = null;
 
 export function registerOnebot11AgentEndpoint(
-  endpointId: string,
+  endpointKey: string,
   endpoint: Onebot11AgentEndpoint,
 ): () => void {
-  endpoints.set(endpointId, endpoint);
+  endpoints.set(endpointKey, endpoint);
   return () => {
-    if (endpoints.get(endpointId) === endpoint) {
-      endpoints.delete(endpointId);
+    if (endpoints.get(endpointKey) === endpoint) {
+      endpoints.delete(endpointKey);
     }
   };
 }
@@ -40,9 +40,9 @@ export function setOnebot11AgentDeps(deps: Onebot11AgentDeps): void {
 export function getOnebot11AgentDeps(): Onebot11AgentDeps {
   if (override) return override;
   return {
-    getEndpoint(endpointId: string): Onebot11AgentEndpoint {
-      const registered = endpoints.get(endpointId);
-      if (!registered) throw new Error(`Endpoint ${endpointId} 不存在`);
+    getEndpoint(endpointKey: string): Onebot11AgentEndpoint {
+      const registered = endpoints.get(endpointKey);
+      if (!registered) throw new Error(`Endpoint ${endpointKey} 不存在`);
       return registered;
     },
   };

package/src/protocol.ts

@@ -4,6 +4,7 @@
  * Spec: https://github.com/botuniverse/onebot-11
  */
 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('onebot11');
@@ -14,7 +15,7 @@ export interface OneBot11LegacyEndpointRow {
   readonly connection?: 'ws' | 'wss';
   /** Legacy alias: `type: 'ws' | 'ws_reverse'` */
   readonly type?: string;
-  readonly name?: string;
+  readonly id?: string;
   readonly access_token?: string;
   readonly url?: string;
   readonly path?: string;
@@ -25,7 +26,7 @@ export interface OneBot11LegacyEndpointRow {
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface OneBot11AdapterConfig {
   readonly connection?: 'ws' | 'wss';
-  readonly name?: string;
+  readonly id?: string;
   readonly access_token?: string;
   readonly url?: string;
   readonly path?: string;
@@ -37,7 +38,7 @@ export interface OneBot11AdapterConfig {
 
 export interface OneBot11ConfigBase {
   readonly context: 'onebot11';
-  readonly name: string;
+  readonly id: string;
   readonly access_token?: string;
 }
 
@@ -106,11 +107,6 @@ export interface OneBot11WireSegment {
   readonly data?: Record<string, unknown>;
 }
 
-export interface ParsedSendTarget {
-  readonly message_type: 'private' | 'group';
-  readonly id: string;
-}
-
 function normalizeConnection(
   connection: string | undefined,
   legacyType: string | undefined,
@@ -127,8 +123,8 @@ export function resolveOneBot11Config(config: OneBot11AdapterConfig = {}): Resol
     config.connection ?? entry?.connection,
     entry?.type,
   );
-  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.ONEBOT11_BOT_NAME
     || 'onebot11-bot';
   const access_token = config.access_token ?? entry?.access_token;
@@ -143,7 +139,7 @@ export function resolveOneBot11Config(config: OneBot11AdapterConfig = {}): Resol
     return {
       context: 'onebot11',
       connection: 'ws',
-      name,
+      id,
       access_token,
       url,
       reconnect_interval: config.reconnect_interval ?? entry?.reconnect_interval ?? 5000,
@@ -159,7 +155,7 @@ export function resolveOneBot11Config(config: OneBot11AdapterConfig = {}): Resol
     return {
       context: 'onebot11',
       connection: 'wss',
-      name,
+      id,
       access_token,
       path,
       heartbeat_interval: config.heartbeat_interval ?? entry?.heartbeat_interval ?? 30_000,
@@ -185,29 +181,19 @@ export function getChannelId(ev: OneBot11Event): string {
 }
 
 /**
- * Gateway reply target：`private:uid` / `group:gid`，便于 send() 还原动作参数。
+ * 入站归一化 → ConversationRef：OneBot 11 `group` 消息 → kind 'group'，
+ * 其余（private 及带 group_id 的非 private 事件按群处理）→ kind 'private'。
+ * OneBot 11 无 guild/temp 容器概念，不填 parent。
  */
-export function formatInboundTarget(ev: OneBot11Event): string {
-  const messageType = ev.message_type === 'group' || (ev.group_id != null && ev.message_type !== 'private')
-    ? 'group'
-    : 'private';
-  return `${messageType}:${getChannelId(ev)}`;
-}
-
-export function parseSendTarget(target: string): ParsedSendTarget {
-  const sep = target.indexOf(':');
-  if (sep <= 0) {
-    return { message_type: 'private', id: target };
-  }
-  const head = target.slice(0, sep);
-  const rest = target.slice(sep + 1);
-  if (head === 'group') {
-    return { message_type: 'group', id: rest };
-  }
-  if (head === 'private') {
-    return { message_type: 'private', id: rest };
-  }
-  return { message_type: 'private', id: target };
+export function onebot11InboundConversation(endpointKey: string, ev: OneBot11Event): ConversationRef {
+  const kind = ev.message_type === 'group' || (ev.group_id != null && ev.message_type !== 'private')
+    ? 'group' as const
+    : 'private' as const;
+  return {
+    endpoint: { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
+    kind,
+    id: getChannelId(ev),
+  };
 }
 
 /** Build inbound text for MessageGateway.receive */
@@ -273,27 +259,37 @@ export function isOneBot11BotMentioned(input: {
   });
 }
 
-/** 构造 gateway.receive 的 metadata（ws / wss 两个 endpoint 共用）。 */
+/** Inbound fields extracted from an event for gateway.receive (ws / wss 两个 endpoint 共用). */
+export interface OneBot11InboundFields {
+  readonly metadata: Readonly<Record<string, unknown>>;
+  readonly endpointId: string;
+  readonly mentioned: boolean;
+  readonly replyTo: { readonly id: string } | undefined;
+}
+
+/** 构造 gateway.receive 的 metadata 与提升字段（ws / wss 两个 endpoint 共用）。 */
 export function formatInboundMetadata(
   ev: OneBot11Event,
   endpoint: string,
-): Readonly<Record<string, unknown>> {
+): OneBot11InboundFields {
   const selfId = ev.self_id != null ? String(ev.self_id) : undefined;
   const nickname = senderNickname(ev);
   const quoteId = extractQuoteId(ev);
   const mentioned = isOneBot11BotMentioned({ selfId, message: ev.message });
-  return Object.freeze({
-    message_type: ev.message_type,
-    user_id: ev.user_id != null ? String(ev.user_id) : undefined,
-    group_id: ev.group_id != null ? String(ev.group_id) : undefined,
-    endpoint,
-    time: ev.time,
-    self_id: selfId,
-    role: ev.sender?.role,
-    ...(nickname ? { nickname } : {}),
-    ...(quoteId ? { quote_id: quoteId } : {}),
-    ...(mentioned ? { mentioned: true } : {}),
-  });
+  return {
+    metadata: Object.freeze({
+      message_type: ev.message_type,
+      user_id: ev.user_id != null ? String(ev.user_id) : undefined,
+      group_id: ev.group_id != null ? String(ev.group_id) : undefined,
+      time: ev.time,
+      self_id: selfId,
+      role: ev.sender?.role,
+      ...(nickname ? { nickname } : {}),
+    }),
+    endpointId: endpoint,
+    mentioned,
+    replyTo: quoteId ? { id: quoteId } : undefined,
+  };
 }
 
 /**
@@ -420,15 +416,14 @@ export function formatOutboundSegments(payload: unknown): OneBot11Segment[] {
 }
 
 export function buildSendAction(
-  target: string,
+  conversation: ConversationRef,
   message: OneBot11Segment[],
 ): { action: string; params: Record<string, unknown> } {
-  const parsed = parseSendTarget(target);
-  if (parsed.message_type === 'group') {
+  if (conversation.kind === 'group') {
     return {
       action: 'send_group_msg',
       params: {
-        group_id: Number(parsed.id) || parsed.id,
+        group_id: Number(conversation.id) || conversation.id,
         message,
       },
     };
@@ -436,7 +431,7 @@ export function buildSendAction(
   return {
     action: 'send_private_msg',
     params: {
-      user_id: Number(parsed.id) || parsed.id,
+      user_id: Number(conversation.id) || conversation.id,
       message,
     },
   };