@zhin.js/adapter-onebot11 1.1.0 → 1.1.2

package/lib/wss-endpoint.js

@@ -19,17 +19,18 @@ export class OneBot11WssEndpoint extends ClientEndpoint {
     content;
     #ws;
     #wsRelease;
-    #lifecycle;
+    #connectionLifecycle;
+    #connectionTask = Promise.resolve();
     #requestId = { value: 0 };
     #pending = new Map();
+    #started = false;
     constructor(options) {
         super();
         this.#logger = getAdapterLogger('onebot11', options.config.id);
         this.#options = options;
-        this.#lifecycle = createEndpointLifecycle({
-            name: options.config.id,
+        this.#connectionLifecycle = createEndpointLifecycle({
+            name: `${options.config.id}:inbound`,
             reconnect: false,
-            heartbeat: { intervalMs: options.config.heartbeat_interval },
         });
         this.client = createOnebot11EndpointClient(options.config, (action, params) => this.#callApi(action, params));
         const callApi = (action, params) => callOnebot11Client(this.client, action, params);
@@ -41,6 +42,8 @@ export class OneBot11WssEndpoint extends ClientEndpoint {
         }, (_name, error) => this.#warnPlatformEvent(error));
     }
     async start() {
+        if (this.#started)
+            return;
         if (!this.#options.config.access_token) {
             // wss 模式未配 access_token 时任何连接都会被放行（verifyOneBotAccessToken 直接 return true）
             this.#logger.warn(formatCompact({
@@ -50,23 +53,19 @@ export class OneBot11WssEndpoint extends ClientEndpoint {
                 error: 'missing access_token',
             }));
         }
-        await this.#lifecycle.start(async (lifecycleHandle) => {
-            const handle = this.#options.http.ws(this.#options.config.path);
-            this.#wsRelease = handle.onConnection((connection) => {
-                this.#acceptConnection(connection);
-            });
-            lifecycleHandle.onForceClose(() => {
-                this.#wsRelease?.();
-                this.#wsRelease = undefined;
-                try {
-                    this.#ws?.close();
-                }
-                catch {
-                    /* ignore */
-                }
-                this.#ws = undefined;
+        const handle = this.#options.http.ws(this.#options.config.path);
+        this.#wsRelease = handle.onConnection((connection) => {
+            this.#connectionTask = this.#connectionTask
+                .then(() => this.#acceptConnection(connection))
+                .catch((error) => {
+                this.#logger.warn(formatCompact({
+                    op: 'wss_connection_failed',
+                    endpoint: this.#options.config.id,
+                    error: error instanceof Error ? error.message : String(error),
+                }));
             });
         });
+        this.#started = true;
         this.#logger.info(formatCompact({
             op: 'listen',
             endpoint: this.#options.config.id,
@@ -76,8 +75,13 @@ export class OneBot11WssEndpoint extends ClientEndpoint {
     }
     async stop() {
         this.close();
-        await this.#lifecycle.stop();
+        this.#wsRelease?.();
+        this.#wsRelease = undefined;
+        await this.#connectionTask;
+        await this.#connectionLifecycle.stop();
         rejectAllPending(this.#pending);
+        this.#ws = undefined;
+        this.#started = false;
     }
     async send({ conversation, payload }) {
         const message = formatOutboundSegments(payload);
@@ -127,42 +131,51 @@ export class OneBot11WssEndpoint extends ClientEndpoint {
             error: error instanceof Error ? error.message : String(error),
         }));
     }
-    #acceptConnection(connection) {
+    async #acceptConnection(connection) {
         if (!verifyOneBotAccessToken(this.#options.config.access_token, connection.request)) {
             connection.socket.close(4003, 'Unauthorized');
             return;
         }
         const socket = connection.socket;
-        if (this.#ws) {
-            try {
-                this.#ws.close();
-            }
-            catch {
-                /* ignore */
-            }
-        }
-        this.#ws = socket;
-        this.#lifecycle.startHeartbeat(() => {
-            try {
-                this.#ws?.ping?.();
-            }
-            catch {
-                /* ignore */
-            }
-        });
-        socket.on('message', (data) => {
-            this.#lifecycle.notifyHeartbeatAck();
-            handleOneBot11WsMessage(data, {
-                endpointId: this.#options.config.id,
-                pending: this.#pending,
-                ingest: (ev) => this.client.ingest(ev),
+        await this.#connectionLifecycle.stop();
+        rejectAllPending(this.#pending, '连接已替换');
+        await this.#connectionLifecycle.start(async (lifecycleHandle) => {
+            this.#ws = socket;
+            lifecycleHandle.onForceClose(() => {
+                try {
+                    socket.close();
+                }
+                catch {
+                    /* ignore */
+                }
+                if (this.#ws === socket)
+                    this.#ws = undefined;
+            });
+            this.#connectionLifecycle.startHeartbeat(() => {
+                try {
+                    socket.ping?.();
+                }
+                catch {
+                    /* ignore */
+                }
+            }, this.#options.config.heartbeat_interval);
+            socket.on('message', (data) => {
+                if (this.#ws !== socket)
+                    return;
+                this.#connectionLifecycle.notifyHeartbeatAck();
+                handleOneBot11WsMessage(data, {
+                    endpointId: this.#options.config.id,
+                    pending: this.#pending,
+                    ingest: (ev) => this.client.ingest(ev),
+                });
+            });
+            socket.on('close', () => {
+                if (this.#ws === socket) {
+                    this.#ws = undefined;
+                    rejectAllPending(this.#pending);
+                }
+                lifecycleHandle.notifyClosed(new Error('OneBot11 reverse WebSocket closed'));
             });
-        });
-        socket.on('close', () => {
-            if (this.#ws === socket) {
-                this.#ws = undefined;
-                this.#lifecycle.stopHeartbeat();
-            }
         });
         this.#logger.debug(formatCompact({
             endpoint: this.#options.config.id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-onebot11",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Zhin.js OneBot 11 adapter for Plugin Runtime (WebSocket client)",
   "type": "module",
   "main": "./lib/index.js",
@@ -19,9 +19,11 @@
     "schema.json",
     "src",
     "lib",
-    "agent",
+    "tools",
+    "agents",
     "README.md",
-    "CHANGELOG.md"
+    "CHANGELOG.md",
+    "PERMITS.md"
   ],
   "keywords": [
     "zhin",
@@ -43,13 +45,16 @@
     "@imhelper/onebot-v11": "1.0.7",
     "imhelper": "1.0.7",
     "ws": "^8.21.1",
-    "@zhin.js/adapter": "1.1.12",
-    "@zhin.js/core": "1.1.35",
-    "@zhin.js/feature-kit": "1.1.0",
-    "@zhin.js/host-http": "1.1.0",
-    "@zhin.js/im-contract": "1.1.0",
-    "@zhin.js/logger": "1.1.0",
-    "@zhin.js/permission": "1.1.0"
+    "@zhin.js/adapter": "1.1.14",
+    "@zhin.js/agent-feature": "1.1.1",
+    "@zhin.js/core": "1.1.37",
+    "@zhin.js/feature-kit": "1.1.1",
+    "@zhin.js/host-http": "1.1.1",
+    "@zhin.js/im-contract": "1.1.1",
+    "@zhin.js/logger": "1.1.1",
+    "@zhin.js/permission": "1.1.1",
+    "@zhin.js/skill": "1.1.1",
+    "@zhin.js/tool": "1.1.1"
   },
   "devDependencies": {
     "@types/node": "^26.1.2",
@@ -57,22 +62,17 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.23",
-    "@zhin.js/host-http": "1.1.0",
-    "zhin.js": "1.1.0"
+    "@zhin.js/host-http": "1.1.1",
+    "zhin.js": "1.1.2"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "^1.1.12",
-    "@zhin.js/agent": "^1.1.23",
-    "@zhin.js/command": "^1.1.0",
-    "@zhin.js/core": "^1.1.35",
-    "zhin.js": "^1.1.0"
+    "@zhin.js/adapter": "^1.1.14",
+    "@zhin.js/command": "^1.1.1",
+    "@zhin.js/core": "^1.1.37",
+    "zhin.js": "^1.1.2"
   },
   "peerDependenciesMeta": {
-    "@zhin.js/agent": {
-      "optional": true
-    },
     "@zhin.js/command": {
       "optional": true
     },
@@ -109,6 +109,18 @@
       {
         "package": "@zhin.js/command",
         "api": "^1.0.0"
+      },
+      {
+        "package": "@zhin.js/tool",
+        "api": "^1.0.0"
+      },
+      {
+        "package": "@zhin.js/skill",
+        "api": "^1.0.0"
+      },
+      {
+        "package": "@zhin.js/agent-feature",
+        "api": "^1.0.0"
       }
     ],
     "plugins": []

package/schema.json

@@ -40,10 +40,11 @@
     },
     "endpoints": {
       "type": "array",
+      "minItems": 1,
       "description": "多账号：一个插件实例挂多个 endpoint。每项与顶层字段同构（id 必填，其余覆盖顶层）",
       "items": {
         "type": "object",
-        "additionalProperties": true,
+        "additionalProperties": false,
         "properties": {
           "master": {
             "type": [
@@ -63,6 +64,13 @@
             },
             "description": "本 endpoint 的 trusted 列表"
           },
+          "connection": {
+            "type": "string",
+            "enum": [
+              "ws",
+              "wss"
+            ]
+          },
           "url": {
             "type": "string",
             "description": "OneBot implementation WebSocket URL (required for connection: ws)"
@@ -75,6 +83,15 @@
             "type": "string",
             "description": "OneBot access token"
           },
+          "reconnect_interval": {
+            "type": "number"
+          },
+          "heartbeat_interval": {
+            "type": "number"
+          },
+          "commandPrefix": {
+            "type": "string"
+          },
           "id": {
             "type": "string",
             "description": "OneBot11 bot name"

package/src/index.ts

@@ -16,7 +16,6 @@ export {
   senderUserId,
   type OneBot11ActionRequest,
   type OneBot11ActionResponse,
-  type OneBot11AdapterConfig,
   type OneBot11ConfigBase,
   type OneBot11EndpointConfig,
   type OneBot11Event,
@@ -45,7 +44,6 @@ export {
   decodeWsPayload,
   handleOneBot11WsMessage,
   rejectAllPending,
-  startOneBot11Heartbeat,
 } from './ws-transport.js';
 
 export { verifyOneBotAccessToken } from './wss-auth.js';

package/src/onebot11-runtime-state.ts

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

package/src/protocol.ts

@@ -3,37 +3,20 @@
  * Canonicalization is owned by gateway/core before endpoint.send.
  * Spec: https://github.com/botuniverse/onebot-11
  */
-import { isMediaRef, type MediaRef } from '@zhin.js/core';
-import type { ConversationRef } from '@zhin.js/im-contract';
+import { isMediaRef, type MediaRef, type ConversationRef } from '@zhin.js/im-contract';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 
 const logger = getLogger('onebot11');
 
-/** Transitional legacy endpoint row (`endpoints[]` with `context: onebot11`). */
-export interface OneBot11LegacyEndpointRow {
-  readonly context?: string;
+/** One endpoint config after AdapterIndex expands `plugins.<instanceKey>.endpoints`. */
+export interface OneBot11EndpointConfig {
   readonly connection?: 'ws' | 'wss';
-  /** Legacy alias: `type: 'ws' | 'ws_reverse'` */
-  readonly type?: string;
-  readonly id?: string;
-  readonly access_token?: string;
-  readonly url?: string;
-  readonly path?: string;
-  readonly reconnect_interval?: number;
-  readonly heartbeat_interval?: number;
-}
-
-/** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
-export interface OneBot11AdapterConfig {
-  readonly connection?: 'ws' | 'wss';
-  readonly id?: string;
+  readonly id: string;
   readonly access_token?: string;
   readonly url?: string;
   readonly path?: string;
   readonly reconnect_interval?: number;
   readonly heartbeat_interval?: number;
-  /** Transitional: legacy root `endpoints[]` with `context: onebot11`. */
-  readonly endpoints?: ReadonlyArray<OneBot11LegacyEndpointRow>;
 }
 
 export interface OneBot11ConfigBase {
@@ -58,7 +41,6 @@ export interface OneBot11WssConfig extends OneBot11ConfigBase {
 }
 
 export type ResolvedOneBot11Config = OneBot11WsConfig | OneBot11WssConfig;
-export type OneBot11EndpointConfig = ResolvedOneBot11Config;
 
 export interface OneBot11Sender {
   readonly role?: string;
@@ -110,62 +92,59 @@ export interface OneBot11WireSegment {
 
 function normalizeConnection(
   connection: string | undefined,
-  legacyType: string | undefined,
 ): 'ws' | 'wss' {
   if (connection === 'ws' || connection === 'wss') return connection;
-  if (legacyType === 'ws_reverse' || legacyType === 'wss') return 'wss';
-  if (legacyType === 'ws') return 'ws';
   return 'ws';
 }
 
-export function resolveOneBot11Config(config: OneBot11AdapterConfig = {}): ResolvedOneBot11Config {
-  const entry = config.endpoints?.find((item) => item.context === 'onebot11');
-  const connection = normalizeConnection(
-    config.connection ?? entry?.connection,
-    entry?.type,
-  );
-  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;
+export function resolveOneBot11Config(config: OneBot11EndpointConfig): ResolvedOneBot11Config {
+  const connection = normalizeConnection(config.connection);
+  const id = requiredEndpointField(config.id, 'id');
+  const access_token = optionalEndpointField(config.access_token);
 
   if (connection === 'ws') {
-    const url = config.url ?? entry?.url;
-    if (!url) {
-      throw new TypeError(
-        'OneBot11 connection:ws requires url (plugins.<key>.url or endpoints with context: onebot11)',
-      );
-    }
+    const url = requiredEndpointField(config.url, 'url');
     return {
       context: 'onebot11',
       connection: 'ws',
       id,
       access_token,
       url,
-      reconnect_interval: config.reconnect_interval ?? entry?.reconnect_interval ?? 5000,
-      heartbeat_interval: config.heartbeat_interval ?? entry?.heartbeat_interval ?? 30_000,
+      reconnect_interval: config.reconnect_interval ?? 5000,
+      heartbeat_interval: config.heartbeat_interval ?? 30_000,
     };
   }
 
   if (connection === 'wss') {
-    const path = config.path ?? entry?.path;
-    if (!path) {
-      throw new TypeError('OneBot11 connection:wss requires path');
-    }
+    const path = requiredEndpointField(config.path, 'path');
     return {
       context: 'onebot11',
       connection: 'wss',
       id,
       access_token,
       path,
-      heartbeat_interval: config.heartbeat_interval ?? entry?.heartbeat_interval ?? 30_000,
+      heartbeat_interval: config.heartbeat_interval ?? 30_000,
     };
   }
 
   throw new TypeError(`Unknown OneBot11 connection: ${String(connection)}`);
 }
 
+function requiredEndpointField(
+  value: unknown,
+  field: 'id' | 'url' | 'path',
+): string {
+  const resolved = optionalEndpointField(value);
+  if (!resolved) {
+    throw new TypeError(`OneBot11 endpoint requires a non-empty ${field}`);
+  }
+  return resolved;
+}
+
+function optionalEndpointField(value: unknown): string | undefined {
+  return typeof value === 'string' && value.trim() ? value.trim() : undefined;
+}
+
 /** 判断是否为消息事件（post_type=message） */
 export function isMessageEvent(
   ev: OneBot11Event,
@@ -205,10 +184,24 @@ export function formatInboundContent(ev: OneBot11Event): string {
       .join('');
   }
   return typeof ev.raw_message === 'string'
-    ? ev.raw_message.replace(/\[CQ:[^\]]+\]/g, '').trim()
+    ? stripCqCodes(ev.raw_message).trim()
     : '';
 }
 
+function stripCqCodes(input: string): string {
+  let result = '';
+  let cursor = 0;
+  while (cursor < input.length) {
+    const start = input.indexOf('[CQ:', cursor);
+    if (start < 0) return result + input.slice(cursor);
+    result += input.slice(cursor, start);
+    const end = input.indexOf(']', start + 4);
+    if (end < 0) return result + input.slice(start);
+    cursor = end + 1;
+  }
+  return result;
+}
+
 export function senderDisplayName(ev: OneBot11Event): string {
   const name = ev.sender?.card || ev.sender?.nickname;
   if (typeof name === 'string' && name) return name;

package/src/ws-transport.ts

@@ -1,4 +1,4 @@
-import { clearInterval, clearTimeout, setInterval, setTimeout } from 'node:timers';
+import { clearTimeout, setTimeout } from 'node:timers';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 import {
   type OneBot11ActionRequest,
@@ -73,21 +73,6 @@ export function callOneBot11WsAction(
   });
 }
 
-export function startOneBot11Heartbeat(
-  ws: OneBot11WsSocket | undefined,
-  intervalMs: number,
-  existingTimer?: NodeJS.Timeout,
-): NodeJS.Timeout {
-  if (existingTimer) clearInterval(existingTimer);
-  return setInterval(() => {
-    try {
-      ws?.ping?.();
-    } catch {
-      /* ignore */
-    }
-  }, intervalMs);
-}
-
 export function rejectAllPending(
   pending: Map<string, OneBot11PendingAction>,
   message = '连接已关闭',

package/src/wss-endpoint.ts

@@ -57,18 +57,19 @@ export class OneBot11WssEndpoint extends ClientEndpoint<Onebot11Client> {
   readonly content;
   #ws?: OneBot11WsSocket;
   #wsRelease?: () => void;
-  readonly #lifecycle: EndpointLifecycle;
+  readonly #connectionLifecycle: EndpointLifecycle;
+  #connectionTask = Promise.resolve();
   #requestId = { value: 0 };
   #pending = new Map<string, OneBot11PendingAction>();
+  #started = false;
 
   constructor(options: OneBot11WssEndpointOptions) {
     super();
     this.#logger = getAdapterLogger('onebot11', options.config.id);
     this.#options = options;
-    this.#lifecycle = createEndpointLifecycle({
-      name: options.config.id,
+    this.#connectionLifecycle = createEndpointLifecycle({
+      name: `${options.config.id}:inbound`,
       reconnect: false,
-      heartbeat: { intervalMs: options.config.heartbeat_interval },
     });
     this.client = createOnebot11EndpointClient(options.config, (action, params) => this.#callApi(action, params));
     const callApi = (action: string, params?: Record<string, unknown>) => callOnebot11Client(this.client, action, params);
@@ -84,6 +85,7 @@ export class OneBot11WssEndpoint extends ClientEndpoint<Onebot11Client> {
   }
 
   async start(): Promise<void> {
+    if (this.#started) return;
     if (!this.#options.config.access_token) {
       // wss 模式未配 access_token 时任何连接都会被放行（verifyOneBotAccessToken 直接 return true）
       this.#logger.warn(formatCompact({
@@ -93,22 +95,19 @@ export class OneBot11WssEndpoint extends ClientEndpoint<Onebot11Client> {
         error: 'missing access_token',
       }));
     }
-    await this.#lifecycle.start(async (lifecycleHandle) => {
-      const handle = this.#options.http.ws(this.#options.config.path);
-      this.#wsRelease = handle.onConnection((connection) => {
-        this.#acceptConnection(connection);
-      });
-      lifecycleHandle.onForceClose(() => {
-        this.#wsRelease?.();
-        this.#wsRelease = undefined;
-        try {
-          this.#ws?.close();
-        } catch {
-          /* ignore */
-        }
-        this.#ws = undefined;
-      });
+    const handle = this.#options.http.ws(this.#options.config.path);
+    this.#wsRelease = handle.onConnection((connection) => {
+      this.#connectionTask = this.#connectionTask
+        .then(() => this.#acceptConnection(connection))
+        .catch((error) => {
+          this.#logger.warn(formatCompact({
+            op: 'wss_connection_failed',
+            endpoint: this.#options.config.id,
+            error: error instanceof Error ? error.message : String(error),
+          }));
+        });
     });
+    this.#started = true;
     this.#logger.info(formatCompact({
       op: 'listen',
       endpoint: this.#options.config.id,
@@ -119,8 +118,13 @@ export class OneBot11WssEndpoint extends ClientEndpoint<Onebot11Client> {
 
   async stop(): Promise<void> {
     this.close();
-    await this.#lifecycle.stop();
+    this.#wsRelease?.();
+    this.#wsRelease = undefined;
+    await this.#connectionTask;
+    await this.#connectionLifecycle.stop();
     rejectAllPending(this.#pending);
+    this.#ws = undefined;
+    this.#started = false;
   }
 
   async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
@@ -184,40 +188,47 @@ export class OneBot11WssEndpoint extends ClientEndpoint<Onebot11Client> {
     }));
   }
 
-  #acceptConnection(connection: WsConnection): void {
+  async #acceptConnection(connection: WsConnection): Promise<void> {
     if (!verifyOneBotAccessToken(this.#options.config.access_token, connection.request)) {
       connection.socket.close(4003, 'Unauthorized');
       return;
     }
     const socket = connection.socket as unknown as OneBot11WsSocket;
-    if (this.#ws) {
-      try {
-        this.#ws.close();
-      } catch {
-        /* ignore */
-      }
-    }
-    this.#ws = socket;
-    this.#lifecycle.startHeartbeat(() => {
-      try {
-        this.#ws?.ping?.();
-      } catch {
-        /* ignore */
-      }
-    });
-    socket.on('message', (data) => {
-      this.#lifecycle.notifyHeartbeatAck();
-      handleOneBot11WsMessage(data, {
-        endpointId: this.#options.config.id,
-        pending: this.#pending,
-        ingest: (ev) => this.client.ingest(ev as Parameters<Onebot11Client['ingest']>[0]),
+    await this.#connectionLifecycle.stop();
+    rejectAllPending(this.#pending, '连接已替换');
+    await this.#connectionLifecycle.start(async (lifecycleHandle) => {
+      this.#ws = socket;
+      lifecycleHandle.onForceClose(() => {
+        try {
+          socket.close();
+        } catch {
+          /* ignore */
+        }
+        if (this.#ws === socket) this.#ws = undefined;
+      });
+      this.#connectionLifecycle.startHeartbeat(() => {
+        try {
+          socket.ping?.();
+        } catch {
+          /* ignore */
+        }
+      }, this.#options.config.heartbeat_interval);
+      socket.on('message', (data) => {
+        if (this.#ws !== socket) return;
+        this.#connectionLifecycle.notifyHeartbeatAck();
+        handleOneBot11WsMessage(data, {
+          endpointId: this.#options.config.id,
+          pending: this.#pending,
+          ingest: (ev) => this.client.ingest(ev as Parameters<Onebot11Client['ingest']>[0]),
+        });
+      });
+      socket.on('close', () => {
+        if (this.#ws === socket) {
+          this.#ws = undefined;
+          rejectAllPending(this.#pending);
+        }
+        lifecycleHandle.notifyClosed(new Error('OneBot11 reverse WebSocket closed'));
       });
-    });
-    socket.on('close', () => {
-      if (this.#ws === socket) {
-        this.#ws = undefined;
-        this.#lifecycle.stopHeartbeat();
-      }
     });
     this.#logger.debug(formatCompact({
       endpoint: this.#options.config.id,