@zhin.js/adapter-onebot11 1.1.6 → 1.1.8

package/CHANGELOG.md

@@ -1,5 +1,43 @@
 # @zhin.js/adapter-onebot11
 
+## 1.1.8
+
+### Patch Changes
+
+- 9891e66: Endpoint 新增运行期 `selfUserId` 访问器与受保护的 `reportSelfUserId()`（`EndpointImplementation` 另可声明 `selfUserId`，`EndpointActivationContext` 提供 `reportSelfUserId`），并新增进程级 Peer Registry（`getProcessPeerRegistry()` / `createPeerRegistry()`）。账号仅在 generation active 后登记，回滚 / retire / stop 后移除；`EndpointIdentity` 保持不可变。ICQQ 在 `system.online` 上报 uin；OneBot11 ws/wss 从事件 `self_id` 与 `get_login_info` 上报；Sandbox 以配置的 bot id 作为合成账号。未上报的旧 Endpoint 不进入 Registry（fail closed），不会用配置 id 兜底。OneBot12 / napcat / milky 等其余适配器留待后续。
+
+  Peer Registry 使用登记序号（新 generation 胜出），旧实例在新实例登记后再次上报不会覆盖新条目；空值或非字符串的读取查询返回未命中而不抛错；OneBot11 在 stop 时清空 `selfUserId`。
+
+  登记序号在 Endpoint 激活时通过 `PeerRegistry.reserve()` 分配，新实例先上报、旧实例晚到的首次上报不会覆盖新条目。
+
+- Updated dependencies [9891e66]
+- Updated dependencies [bf52b40]
+- Updated dependencies [bf52b40]
+- Updated dependencies [bf52b40]
+- Updated dependencies [386150d]
+- Updated dependencies [9891e66]
+- Updated dependencies [9891e66]
+- Updated dependencies [4778587]
+- Updated dependencies [40537e3]
+- Updated dependencies [681abf3]
+- Updated dependencies [9891e66]
+- Updated dependencies [9891e66]
+  - @zhin.js/adapter@1.1.18
+  - @zhin.js/core@1.1.43
+  - @zhin.js/permission@1.1.5
+  - @zhin.js/host-http@1.1.5
+  - @zhin.js/feature-kit@1.1.4
+  - @zhin.js/agent-feature@1.1.5
+  - @zhin.js/skill@1.1.5
+  - @zhin.js/tool@1.1.5
+
+## 1.1.7
+
+### Patch Changes
+
+- Updated dependencies [5ab6307]
+  - @zhin.js/core@1.1.42
+
 ## 1.1.6
 
 ### Patch Changes

package/adapters/onebot11/index.js

@@ -30,11 +30,13 @@ export default defineAdapter({
                 id: context.id,
                 http: context.use(httpHostToken),
                 config,
+                probeLoginInfo: true,
             });
         }
         return new OneBot11WsEndpoint({
             id: context.id,
             config,
+            probeLoginInfo: true,
         });
     },
 });

package/adapters/onebot11/index.ts

@@ -43,11 +43,13 @@ export default defineAdapter<OneBot11EndpointConfig>({
         id: context.id,
         http: context.use(httpHostToken),
         config,
+        probeLoginInfo: true,
       });
     }
     return new OneBot11WsEndpoint({
       id: context.id,
       config,
+      probeLoginInfo: true,
     });
   },
 });

package/lib/self-id.d.ts

@@ -0,0 +1,8 @@
+import { type Onebot11Client } from './client.js';
+/**
+ * 规范化 OneBot11 平台账号 id（`self_id` / `get_login_info.user_id`）。
+ * 非法值、空串、0 均视为未知；绝不使用 `config.id`（那是 Endpoint 名，不是平台账号）。
+ */
+export declare function resolveOnebot11SelfId(value: unknown): string | undefined;
+/** Best-effort `get_login_info`；失败返回 undefined 并交给调用方 debug，不抛错。 */
+export declare function probeOnebot11SelfId(client: Onebot11Client, onError: (error: unknown) => void): Promise<string | undefined>;

package/lib/self-id.js

@@ -0,0 +1,25 @@
+import { callOnebot11Client } from './client.js';
+/**
+ * 规范化 OneBot11 平台账号 id（`self_id` / `get_login_info.user_id`）。
+ * 非法值、空串、0 均视为未知；绝不使用 `config.id`（那是 Endpoint 名，不是平台账号）。
+ */
+export function resolveOnebot11SelfId(value) {
+    if (typeof value === 'number') {
+        return Number.isSafeInteger(value) && value > 0 ? String(value) : undefined;
+    }
+    if (typeof value !== 'string')
+        return undefined;
+    const trimmed = value.trim();
+    return trimmed === '' || trimmed === '0' ? undefined : trimmed;
+}
+/** Best-effort `get_login_info`；失败返回 undefined 并交给调用方 debug，不抛错。 */
+export async function probeOnebot11SelfId(client, onError) {
+    try {
+        const data = await callOnebot11Client(client, 'get_login_info');
+        return resolveOnebot11SelfId(data?.user_id);
+    }
+    catch (error) {
+        onError(error);
+        return undefined;
+    }
+}

package/lib/ws-endpoint.d.ts

@@ -5,6 +5,8 @@ import { type OneBot11WsCreateOptions, type OneBot11WsSocket } from './ws-types.
 import { type Onebot11Client } from './client.js';
 export interface OneBot11WsEndpointOptions {
     readonly id: CapabilityId;
+    /** 连接后 best-effort 调用 get_login_info 上报账号（Adapter 工厂开启；默认关闭以免占用首个 echo）。 */
+    readonly probeLoginInfo?: boolean;
     readonly config: OneBot11WsConfig;
     readonly createWebSocket?: (url: string, options: OneBot11WsCreateOptions) => OneBot11WsSocket;
 }

package/lib/ws-endpoint.js

@@ -10,6 +10,7 @@ import { buildSendAction, buildWsConnectOptions, formatInboundContent, formatInb
 import { receiveOneBot11SideEvent } from './side-event-dispatch.js';
 import { createOneBot11ContentPort } from './content-port.js';
 import { callOneBot11WsAction, handleOneBot11WsMessage, rejectAllPending, } from './ws-transport.js';
+import { probeOnebot11SelfId, resolveOnebot11SelfId } from './self-id.js';
 import { callOnebot11Client, createOnebot11EndpointClient, forwardOnebot11ClientEvents } from './client.js';
 export class OneBot11WsEndpoint extends ClientEndpoint {
     client;
@@ -20,6 +21,7 @@ export class OneBot11WsEndpoint extends ClientEndpoint {
     content;
     #lifecycle;
     #ws;
+    #stopped = false;
     #requestId = { value: 0 };
     #pending = new Map();
     constructor(options) {
@@ -53,8 +55,11 @@ export class OneBot11WsEndpoint extends ClientEndpoint {
     async start() {
         if (this.#lifecycle.started)
             return;
+        this.#stopped = false;
         try {
             await this.#lifecycle.start((handle) => this.#connect(handle));
+            if (this.#options.probeLoginInfo)
+                void this.#probeSelfUserId();
         }
         catch (err) {
             // start 失败必须清理现场（状态复位由基座保证）
@@ -71,11 +76,13 @@ export class OneBot11WsEndpoint extends ClientEndpoint {
         }
     }
     async stop() {
+        this.#stopped = true;
         this.close();
         // 基座负责：清重连/心跳定时器、强关 ws、唤醒 stop-during-connect 竞态
         await this.#lifecycle.stop();
         rejectAllPending(this.#pending);
         this.#ws = undefined;
+        this.reportSelfUserId(undefined);
     }
     async send({ conversation, payload }) {
         const message = formatOutboundSegments(payload);
@@ -103,6 +110,9 @@ export class OneBot11WsEndpoint extends ClientEndpoint {
         return callOneBot11WsAction(this.#lifecycle.state === 'open' ? this.#ws : undefined, this.#pending, this.#requestId, action, params);
     }
     #admitRaw(ev) {
+        const selfId = resolveOnebot11SelfId(ev.self_id);
+        if (!this.#stopped && selfId && selfId !== this.selfUserId)
+            this.reportSelfUserId(selfId);
         if (!isMessageEvent(ev)) {
             receiveOneBot11SideEvent((name, payload) => this.emit(name, payload), this.#options.config.id, { callApi: (action, params) => callOnebot11Client(this.client, action, params) }, ev, this.#logger);
             return;
@@ -131,6 +141,19 @@ export class OneBot11WsEndpoint extends ClientEndpoint {
             }));
         });
     }
+    /** Best-effort 登录账号探测；失败仅 debug，不影响连接。 */
+    async #probeSelfUserId() {
+        const selfId = await probeOnebot11SelfId(this.client, (error) => {
+            this.#logger.debug(formatCompact({
+                op: 'onebot11_get_login_info_failed',
+                error: error instanceof Error ? error.message : String(error),
+            }));
+        });
+        if (this.#stopped || this.transportState !== 'open')
+            return;
+        if (selfId && selfId !== this.selfUserId)
+            this.reportSelfUserId(selfId);
+    }
     #warnPlatformEvent(error) {
         this.#logger.warn(formatCompact({
             op: 'onebot11_platform_event_failed',

package/lib/wss-endpoint.d.ts

@@ -8,6 +8,8 @@ import { type OneBot11WssConfig } from './protocol.js';
 import { type Onebot11Client } from './client.js';
 export interface OneBot11WssEndpointOptions {
     readonly id: CapabilityId;
+    /** 连接后 best-effort 调用 get_login_info 上报账号（Adapter 工厂开启）。 */
+    readonly probeLoginInfo?: boolean;
     readonly http: HttpHost;
     readonly config: OneBot11WssConfig;
 }

package/lib/wss-endpoint.js

@@ -10,6 +10,7 @@ import { receiveOneBot11SideEvent } from './side-event-dispatch.js';
 import { createOneBot11ContentPort } from './content-port.js';
 import { verifyOneBotAccessToken } from './wss-auth.js';
 import { callOneBot11WsAction, handleOneBot11WsMessage, rejectAllPending, } from './ws-transport.js';
+import { probeOnebot11SelfId, resolveOnebot11SelfId } from './self-id.js';
 import { callOnebot11Client, createOnebot11EndpointClient, forwardOnebot11ClientEvents } from './client.js';
 export class OneBot11WssEndpoint extends ClientEndpoint {
     client;
@@ -98,6 +99,7 @@ export class OneBot11WssEndpoint extends ClientEndpoint {
         rejectAllPending(this.#pending);
         this.#ws = undefined;
         this.#started = false;
+        this.reportSelfUserId(undefined);
     }
     async send({ conversation, payload }) {
         const message = formatOutboundSegments(payload);
@@ -118,6 +120,9 @@ export class OneBot11WssEndpoint extends ClientEndpoint {
         return callOneBot11WsAction(this.#connectionLifecycle.state === 'closed' ? undefined : this.#ws, this.#pending, this.#requestId, action, params);
     }
     #admitRaw(ev) {
+        const selfId = resolveOnebot11SelfId(ev.self_id);
+        if (!this.#stopped && selfId && selfId !== this.selfUserId)
+            this.reportSelfUserId(selfId);
         if (!isMessageEvent(ev)) {
             receiveOneBot11SideEvent((name, payload) => this.emit(name, payload), this.#options.config.id, { callApi: (action, params) => callOnebot11Client(this.client, action, params) }, ev, this.#logger);
             return;
@@ -145,6 +150,19 @@ export class OneBot11WssEndpoint extends ClientEndpoint {
             }));
         });
     }
+    /** Best-effort 登录账号探测；失败仅 debug，不影响连接。 */
+    async #probeSelfUserId() {
+        const selfId = await probeOnebot11SelfId(this.client, (error) => {
+            this.#logger.debug(formatCompact({
+                op: 'onebot11_get_login_info_failed',
+                error: error instanceof Error ? error.message : String(error),
+            }));
+        });
+        if (this.#stopped || this.transportState !== 'open')
+            return;
+        if (selfId && selfId !== this.selfUserId)
+            this.reportSelfUserId(selfId);
+    }
     #warnPlatformEvent(error) {
         this.#logger.warn(formatCompact({
             op: 'onebot11_platform_event_failed',
@@ -215,6 +233,8 @@ export class OneBot11WssEndpoint extends ClientEndpoint {
                 lifecycleHandle.notifyClosed(new Error('OneBot11 reverse WebSocket closed'));
             });
         });
+        if (this.#options.probeLoginInfo)
+            void this.#probeSelfUserId();
         this.#logger.debug(formatCompact({
             endpoint: this.#options.config.id,
             mode: 'wss',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-onebot11",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "Zhin.js OneBot 11 adapter for Plugin Runtime (WebSocket client)",
   "type": "module",
   "main": "./lib/index.js",
@@ -45,16 +45,16 @@
     "@imhelper/onebot-v11": "1.0.7",
     "imhelper": "1.0.7",
     "ws": "^8.21.1",
-    "@zhin.js/adapter": "1.1.17",
-    "@zhin.js/agent-feature": "1.1.4",
-    "@zhin.js/core": "1.1.41",
-    "@zhin.js/feature-kit": "1.1.3",
-    "@zhin.js/host-http": "1.1.4",
+    "@zhin.js/adapter": "1.1.18",
+    "@zhin.js/agent-feature": "1.1.5",
+    "@zhin.js/core": "1.1.43",
+    "@zhin.js/feature-kit": "1.1.4",
+    "@zhin.js/host-http": "1.1.5",
     "@zhin.js/im-contract": "1.1.3",
     "@zhin.js/logger": "1.1.1",
-    "@zhin.js/permission": "1.1.4",
-    "@zhin.js/skill": "1.1.4",
-    "@zhin.js/tool": "1.1.4"
+    "@zhin.js/permission": "1.1.5",
+    "@zhin.js/skill": "1.1.5",
+    "@zhin.js/tool": "1.1.5"
   },
   "devDependencies": {
     "@types/node": "^26.1.2",
@@ -62,15 +62,15 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/host-http": "1.1.4",
-    "zhin.js": "1.1.6"
+    "@zhin.js/host-http": "1.1.5",
+    "zhin.js": "1.1.8"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "^1.1.17",
-    "@zhin.js/command": "^1.1.5",
-    "@zhin.js/core": "^1.1.41",
-    "zhin.js": "^1.1.6"
+    "@zhin.js/adapter": "^1.1.18",
+    "@zhin.js/command": "^1.1.6",
+    "@zhin.js/core": "^1.1.43",
+    "zhin.js": "^1.1.8"
   },
   "peerDependenciesMeta": {
     "@zhin.js/command": {

package/src/self-id.ts

@@ -0,0 +1,28 @@
+import { callOnebot11Client, type Onebot11Client } from './client.js';
+
+/**
+ * 规范化 OneBot11 平台账号 id（`self_id` / `get_login_info.user_id`）。
+ * 非法值、空串、0 均视为未知；绝不使用 `config.id`（那是 Endpoint 名，不是平台账号）。
+ */
+export function resolveOnebot11SelfId(value: unknown): string | undefined {
+  if (typeof value === 'number') {
+    return Number.isSafeInteger(value) && value > 0 ? String(value) : undefined;
+  }
+  if (typeof value !== 'string') return undefined;
+  const trimmed = value.trim();
+  return trimmed === '' || trimmed === '0' ? undefined : trimmed;
+}
+
+/** Best-effort `get_login_info`；失败返回 undefined 并交给调用方 debug，不抛错。 */
+export async function probeOnebot11SelfId(
+  client: Onebot11Client,
+  onError: (error: unknown) => void,
+): Promise<string | undefined> {
+  try {
+    const data = await callOnebot11Client<{ user_id?: number | string }>(client, 'get_login_info');
+    return resolveOnebot11SelfId(data?.user_id);
+  } catch (error) {
+    onError(error);
+    return undefined;
+  }
+}

package/src/ws-endpoint.ts

@@ -42,10 +42,13 @@ import {
   type OneBot11WsCreateOptions,
   type OneBot11WsSocket,
 } from './ws-types.js';
+import { probeOnebot11SelfId, resolveOnebot11SelfId } from './self-id.js';
 import { callOnebot11Client, createOnebot11EndpointClient, forwardOnebot11ClientEvents, type Onebot11Client } from './client.js';
 
 export interface OneBot11WsEndpointOptions {
   readonly id: CapabilityId;
+  /** 连接后 best-effort 调用 get_login_info 上报账号（Adapter 工厂开启；默认关闭以免占用首个 echo）。 */
+  readonly probeLoginInfo?: boolean;
   readonly config: OneBot11WsConfig;
   readonly createWebSocket?: (
     url: string,
@@ -63,6 +66,7 @@ export class OneBot11WsEndpoint extends ClientEndpoint<Onebot11Client> {
   readonly content;
   readonly #lifecycle: EndpointLifecycle;
   #ws?: OneBot11WsSocket;
+  #stopped = false;
   #requestId = { value: 0 };
   #pending = new Map<string, OneBot11PendingAction>();
 
@@ -101,8 +105,10 @@ export class OneBot11WsEndpoint extends ClientEndpoint<Onebot11Client> {
 
   async start(): Promise<void> {
     if (this.#lifecycle.started) return;
+    this.#stopped = false;
     try {
       await this.#lifecycle.start((handle) => this.#connect(handle));
+      if (this.#options.probeLoginInfo) void this.#probeSelfUserId();
     } catch (err) {
       // start 失败必须清理现场（状态复位由基座保证）
       if (this.#ws) {
@@ -118,11 +124,13 @@ export class OneBot11WsEndpoint extends ClientEndpoint<Onebot11Client> {
   }
 
   async stop(): Promise<void> {
+    this.#stopped = true;
     this.close();
     // 基座负责：清重连/心跳定时器、强关 ws、唤醒 stop-during-connect 竞态
     await this.#lifecycle.stop();
     rejectAllPending(this.#pending);
     this.#ws = undefined;
+    this.reportSelfUserId(undefined);
   }
 
   async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
@@ -156,6 +164,8 @@ export class OneBot11WsEndpoint extends ClientEndpoint<Onebot11Client> {
   }
 
   #admitRaw(ev: OneBot11Event): void {
+    const selfId = resolveOnebot11SelfId(ev.self_id);
+    if (!this.#stopped && selfId && selfId !== this.selfUserId) this.reportSelfUserId(selfId);
     if (!isMessageEvent(ev)) {
       receiveOneBot11SideEvent(
         (name, payload) => this.emit(name, payload),
@@ -191,6 +201,18 @@ export class OneBot11WsEndpoint extends ClientEndpoint<Onebot11Client> {
     });
   }
 
+  /** Best-effort 登录账号探测；失败仅 debug，不影响连接。 */
+  async #probeSelfUserId(): Promise<void> {
+    const selfId = await probeOnebot11SelfId(this.client, (error) => {
+      this.#logger.debug(formatCompact({
+        op: 'onebot11_get_login_info_failed',
+        error: error instanceof Error ? error.message : String(error),
+      }));
+    });
+    if (this.#stopped || this.transportState !== 'open') return;
+    if (selfId && selfId !== this.selfUserId) this.reportSelfUserId(selfId);
+  }
+
   #warnPlatformEvent(error: unknown): void {
     this.#logger.warn(formatCompact({
       op: 'onebot11_platform_event_failed',

package/src/wss-endpoint.ts

@@ -41,10 +41,13 @@ import {
   type OneBot11PendingAction,
   type OneBot11WsSocket,
 } from './ws-types.js';
+import { probeOnebot11SelfId, resolveOnebot11SelfId } from './self-id.js';
 import { callOnebot11Client, createOnebot11EndpointClient, forwardOnebot11ClientEvents, type Onebot11Client } from './client.js';
 
 export interface OneBot11WssEndpointOptions {
   readonly id: CapabilityId;
+  /** 连接后 best-effort 调用 get_login_info 上报账号（Adapter 工厂开启）。 */
+  readonly probeLoginInfo?: boolean;
   readonly http: HttpHost;
   readonly config: OneBot11WssConfig;
 }
@@ -139,6 +142,7 @@ export class OneBot11WssEndpoint extends ClientEndpoint<Onebot11Client> {
     rejectAllPending(this.#pending);
     this.#ws = undefined;
     this.#started = false;
+    this.reportSelfUserId(undefined);
   }
 
   async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
@@ -165,6 +169,8 @@ export class OneBot11WssEndpoint extends ClientEndpoint<Onebot11Client> {
   }
 
   #admitRaw(ev: OneBot11Event): void {
+    const selfId = resolveOnebot11SelfId(ev.self_id);
+    if (!this.#stopped && selfId && selfId !== this.selfUserId) this.reportSelfUserId(selfId);
     if (!isMessageEvent(ev)) {
       receiveOneBot11SideEvent(
         (name, payload) => this.emit(name, payload),
@@ -199,6 +205,18 @@ export class OneBot11WssEndpoint extends ClientEndpoint<Onebot11Client> {
     });
   }
 
+  /** Best-effort 登录账号探测；失败仅 debug，不影响连接。 */
+  async #probeSelfUserId(): Promise<void> {
+    const selfId = await probeOnebot11SelfId(this.client, (error) => {
+      this.#logger.debug(formatCompact({
+        op: 'onebot11_get_login_info_failed',
+        error: error instanceof Error ? error.message : String(error),
+      }));
+    });
+    if (this.#stopped || this.transportState !== 'open') return;
+    if (selfId && selfId !== this.selfUserId) this.reportSelfUserId(selfId);
+  }
+
   #warnPlatformEvent(error: unknown): void {
     this.#logger.warn(formatCompact({
       op: 'onebot11_platform_event_failed',
@@ -263,6 +281,7 @@ export class OneBot11WssEndpoint extends ClientEndpoint<Onebot11Client> {
         lifecycleHandle.notifyClosed(new Error('OneBot11 reverse WebSocket closed'));
       });
     });
+    if (this.#options.probeLoginInfo) void this.#probeSelfUserId();
     this.#logger.debug(formatCompact({
       endpoint: this.#options.config.id,
       mode: 'wss',