@zhin.js/adapter-onebot12 6.0.0 → 6.0.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @zhin.js/adapter-onebot12
 
+## 6.0.1
+
+### Patch Changes
+
+- 4e8117c: Expose the published imhelper protocol Clients from every Endpoint, preserve native action responses, and route host-owned HTTP, WebSocket, and raw ingress through the Client APIs. Add the shared `ClientEndpoint` deep base so concrete transports inherit one open-gated Client event bridge, and move reverse WebSocket lifecycle and heartbeat cleanup onto the common lifecycle state machine.
+- 1fc78bc: Unify native platform Client access behind the literal `adapter` discriminant. Handlers infer both native events and Clients, while command, inbound/outbound middleware, and both Agent tool authoring surfaces expose the exact operation-scoped Client through a lazy `$client` getter. Definitions without `adapter` keep `$client` typed as `unknown`, and runtime dispatch rejects adapter mismatches before resolving the Client. Bundled platform tools now use this single path instead of model-provided endpoint ids and adapter-specific dependency wrappers. Every adapter registers one Client/EventMap contract, and protocol adapters including NapCat, Milky, OneBot and Satori now produce transport-independent Client objects rather than letting Endpoint instances impersonate Clients.
+- 2ca9a52: Upgrade the protocol Clients to imhelper 1.0.7, keep receiver ownership exclusively in Endpoint through manual mode, expose structured protocol errors, and support canonical non-message Client events.
+- Updated dependencies [4e8117c]
+- Updated dependencies [54bfd6b]
+- Updated dependencies [12025ee]
+- Updated dependencies [09b14d6]
+- Updated dependencies [1fc78bc]
+  - @zhin.js/adapter@1.2.1
+  - @zhin.js/core@1.5.14
+  - @zhin.js/host-http@1.0.13
+  - @zhin.js/command@1.0.16
+  - @zhin.js/logger@1.0.77
+  - zhin.js@6.0.14
+  - @zhin.js/feature-kit@1.0.13
+
 ## 6.0.0
 
 ### Patch Changes

package/README.md

@@ -8,7 +8,7 @@ Zhin.js [OneBot 12](https://12.onebot.dev/) 适配器（Plugin Runtime）。默
 - 约定式 `defineAdapter` / `definePlugin`（无需 `usePlugin`）
 - **正向 WebSocket**（`connection: ws`）：应用连 OneBot 实现的 WS 服务器
 - `access_token` 鉴权（Bearer + query）
-- 入站经 `messageGatewayToken`；出站 `send({ conversation, payload })`
+- 入站经 `Endpoint.emit(...)`；出站 `send({ conversation, payload })`
 
 ## 安装
 
@@ -19,13 +19,23 @@ pnpm add @zhin.js/adapter-onebot12
 ## Plugin Runtime
 
 - `@zhin.js/adapter` — 约定式 `adapters/onebot12.ts`（`defineAdapter`）
-- `@zhin.js/core` — `messageGatewayToken` 入站/出站
+- `@zhin.js/core` — `Endpoint.emit(...)` 入站、`outboundMessageToken` 出站
 - `zhin.js` — `plugin.ts`（`definePlugin`）
 - 配置经插件 `schema.json` 落到 `plugins.<instanceKey>`
 
 入站：`gateway.receive({ conversation: ConversationRef, message: { conversation, id }, content, sender, metadata })`  
 出站：`send({ conversation, payload })` → WS `send_message`（payload 已由 gateway/core 渲染；无 segment-mapper）
 
+每个 Endpoint 的 `$client` 是 `@imhelper/onebot-v12` 的 `OneBotV12Client`。业务代码直接调用
+`$client.call(action, params)` 和 Client 的公开平台能力；Webhook 使用 Client 的
+`acceptHttp()`，双工 WS 则由 Endpoint 分离 `echo` 响应后把事件交给 `ingest()`。
+
+## 前置条件
+
+1. 启动兼容 OneBot 12 的实现，并确认其支持所选 WS 或 Webhook 模式。
+2. Webhook 出站还需要可用的 `api_url`；反向连接需要实现端可达 Zhin HTTP Host。
+3. 两端配置相同的 `access_token`，生产环境必须启用鉴权。
+
 ## 最小配置
 
 ```yaml
@@ -71,6 +81,15 @@ plugins:
 - [OneBot Connect WebSocket](https://12.onebot.dev/connect/communication/websocket/)
 - [适配器概览](https://zhin.js.org/essentials/adapters)
 
+## 故障排查
+
+| 现象 | 排查 |
+| --- | --- |
+| WS 连接失败 | 核对 OneBot 版本、连接方向、URL 与端口 |
+| Webhook 能收不能发 | 检查 `api_url` 可达性与 `send_message` 支持 |
+| 401 或握手失败 | 确认 Header/query token 与实现端一致 |
+| 事件字段无法识别 | 确认实现端发送的是 OneBot 12 而非 v11 结构 |
+
 ## 许可证
 
 MIT License

package/adapters/onebot12.js

@@ -3,7 +3,6 @@
  * Convention entry: discover `adapters/onebot12.ts` → defineAdapter.
  */
 import { defineAdapter } from 'zhin.js/adapter';
-import { messageGatewayToken, sideEventGatewayToken } from '@zhin.js/core/runtime';
 import { httpHostToken } from '@zhin.js/host-http';
 import { OneBot12WebhookEndpoint } from "../lib/webhook.js";
 import { OneBot12WsEndpoint } from "../lib/ws-endpoint.js";
@@ -24,8 +23,6 @@ export default defineAdapter({
     },
     create(context) {
         const config = resolveOneBot12Config(context.config);
-        const gateway = context.use(messageGatewayToken);
-        const sideEvents = context.use(sideEventGatewayToken);
         // 注册到插件运行时状态（onebot12.endpoint list 的"运行中"数据源）
         context.use(onebot12RuntimeStateToken).endpoints.set(config.id, {
             id: config.id,
@@ -34,8 +31,6 @@ export default defineAdapter({
         if (config.connection === 'webhook') {
             return new OneBot12WebhookEndpoint({
                 id: context.id,
-                gateway,
-                sideEvents,
                 http: context.use(httpHostToken),
                 config,
             });
@@ -43,16 +38,12 @@ export default defineAdapter({
         if (config.connection === 'wss') {
             return new OneBot12WssEndpoint({
                 id: context.id,
-                gateway,
-                sideEvents,
                 http: context.use(httpHostToken),
                 config,
             });
         }
         return new OneBot12WsEndpoint({
             id: context.id,
-            gateway,
-            sideEvents,
             config,
         });
     },

package/adapters/onebot12.ts

@@ -2,7 +2,6 @@
  * Convention entry: discover `adapters/onebot12.ts` → defineAdapter.
  */
 import { defineAdapter } from 'zhin.js/adapter';
-import { messageGatewayToken, sideEventGatewayToken } from '@zhin.js/core/runtime';
 import { httpHostToken } from '@zhin.js/host-http';
 import { OneBot12WebhookEndpoint } from '../src/webhook.js';
 import { OneBot12WsEndpoint } from '../src/ws-endpoint.js';
@@ -38,8 +37,6 @@ export default defineAdapter<OneBot12AdapterConfig>({
   },
   create(context) {
     const config = resolveOneBot12Config(context.config);
-    const gateway = context.use(messageGatewayToken);
-    const sideEvents = context.use(sideEventGatewayToken);
     // 注册到插件运行时状态（onebot12.endpoint list 的"运行中"数据源）
     context.use(onebot12RuntimeStateToken).endpoints.set(config.id, {
       id: config.id,
@@ -48,8 +45,6 @@ export default defineAdapter<OneBot12AdapterConfig>({
     if (config.connection === 'webhook') {
       return new OneBot12WebhookEndpoint({
         id: context.id,
-        gateway,
-        sideEvents,
         http: context.use(httpHostToken),
         config,
       });
@@ -57,16 +52,12 @@ export default defineAdapter<OneBot12AdapterConfig>({
     if (config.connection === 'wss') {
       return new OneBot12WssEndpoint({
         id: context.id,
-        gateway,
-        sideEvents,
         http: context.use(httpHostToken),
         config,
       });
     }
     return new OneBot12WsEndpoint({
       id: context.id,
-      gateway,
-      sideEvents,
       config,
     });
   },

package/lib/client.d.ts

@@ -0,0 +1,20 @@
+import { OneBotV12Client, type OneBotV12Event as ImHelperOneBot12Event, type OneBotV12Response } from '@imhelper/onebot-v12';
+import { type EventMap, type ImHelperEventMap } from 'imhelper';
+import { type ClientEventPayloads } from 'zhin.js/adapter';
+import type { ResolvedOneBot12Config } from './protocol.js';
+export { OneBotV12Client as Onebot12Client } from '@imhelper/onebot-v12';
+export type Onebot12ApiCall = (action: string, params?: Record<string, unknown>) => Promise<OneBotV12Response>;
+type Onebot12ClientEvents = ImHelperEventMap<string, ImHelperOneBot12Event, EventMap<string>>;
+export type Onebot12ClientEventMap = ClientEventPayloads<Onebot12ClientEvents>;
+export declare function createOnebot12EndpointClient(config: ResolvedOneBot12Config, request: Onebot12ApiCall): OneBotV12Client;
+export declare function callOnebot12Client<T = unknown>(client: OneBotV12Client, action: string, params?: Record<string, unknown>): Promise<T | undefined>;
+export declare function forwardOnebot12ClientEvents(client: OneBotV12Client, receive: (name: string, payload: unknown) => void): () => void;
+declare module '@zhin.js/feature-kit' {
+    interface AdapterClientRegistry {
+        readonly onebot12: {
+            readonly client: OneBotV12Client;
+            readonly events: Onebot12ClientEventMap;
+        };
+    }
+}
+export declare const onebot12Client: import("@zhin.js/adapter").EndpointClientToken<OneBotV12Client, ClientEventPayloads<Onebot12ClientEvents>>;

package/lib/client.js

@@ -0,0 +1,33 @@
+import { OneBotV12Client, } from '@imhelper/onebot-v12';
+import { EventFactory } from 'imhelper';
+import { defineEndpointClient, forwardEndpointClientEvents, } from 'zhin.js/adapter';
+export { OneBotV12Client as Onebot12Client } from '@imhelper/onebot-v12';
+export function createOnebot12EndpointClient(config, request) {
+    const baseUrl = config.connection === 'ws'
+        ? config.url.replace(/^ws(s?):/, 'http$1:')
+        : config.connection === 'webhook' && config.api_url
+            ? config.api_url
+            : 'http://localhost';
+    return new OneBotV12Client({
+        baseUrl,
+        selfId: config.id,
+        accessToken: config.access_token,
+        receiveMode: 'manual',
+        call: request,
+    });
+}
+export async function callOnebot12Client(client, action, params) {
+    const response = await client.call(action, params);
+    if (response.status !== 'ok') {
+        throw new Error(`OneBot 12 API ${action}: retcode=${response.retcode}${response.message ? ` ${response.message}` : ''}`);
+    }
+    return response.data;
+}
+const onebot12ClientEventNames = Object.freeze([
+    ...EventFactory.getSupportedEventTypes(),
+    'event',
+]);
+export function forwardOnebot12ClientEvents(client, receive) {
+    return forwardEndpointClientEvents(client, onebot12ClientEventNames, receive);
+}
+export const onebot12Client = defineEndpointClient('onebot12');

package/lib/index.d.ts

@@ -4,3 +4,7 @@ export { OneBot12WsEndpoint, type OneBot12WsEndpointOptions, } from './ws-endpoi
 export { OneBot12WssEndpoint, type OneBot12WssEndpointOptions, } from './wss-endpoint.js';
 export type { OneBot12WsSocket, OneBot12WsCreateOptions } from './ws-types.js';
 export { verifyOneBotAccessToken } from './wss-auth.js';
+export { Onebot12Client, onebot12Client, type Onebot12ClientEventMap, } from './client.js';
+export type { OneBotV12ActionUrlResolver, OneBotV12AdapterConfig as ImHelperOneBotV12AdapterConfig, OneBotV12Call, OneBotV12ClientConfig, OneBotV12Event as ImHelperOneBotV12Event, OneBotV12Response, } from '@imhelper/onebot-v12';
+export { ProtocolError } from '@imhelper/onebot-v12';
+export type { ProtocolErrorKind, ProtocolErrorOptions } from 'imhelper';

package/lib/index.js

@@ -3,3 +3,5 @@ export { OneBot12WebhookEndpoint, } from './webhook.js';
 export { OneBot12WsEndpoint, } from './ws-endpoint.js';
 export { OneBot12WssEndpoint, } from './wss-endpoint.js';
 export { verifyOneBotAccessToken } from './wss-auth.js';
+export { Onebot12Client, onebot12Client, } from './client.js';
+export { ProtocolError } from '@imhelper/onebot-v12';

package/lib/onebot12-endpoint-commands.d.ts

@@ -1 +1 @@
-export declare const onebot12EndpointCommands: import("@zhin.js/adapter").EndpointCommands<Readonly<import("@zhin.js/command").CommandDefinition<unknown, unknown, import("@zhin.js/command").CommandMessage>>>;
+export declare const onebot12EndpointCommands: import("@zhin.js/adapter").EndpointCommands<Readonly<import("@zhin.js/command").CommandDefinition<unknown, unknown, import("@zhin.js/command").CommandMessage, string | undefined>>>;

package/lib/protocol.d.ts

@@ -66,7 +66,7 @@ export interface OneBot12Event {
     type: 'meta' | 'message' | 'notice' | 'request';
     detail_type: string;
     sub_type: string;
-    self?: OneBot12Self;
+    self: OneBot12Self;
     message_id?: string;
     message?: OneBot12Segment[];
     alt_message?: string;
@@ -115,7 +115,7 @@ export declare function getChannelId(ev: OneBot12Event): string;
  * group 容器内的 private 会话。
  */
 export declare function onebot12InboundConversation(endpointKey: string, ev: OneBot12Event): ConversationRef;
-/** Build inbound text for MessageGateway.receive */
+/** Build inbound text for OutboundMessageService.receive */
 export declare function formatInboundContent(ev: OneBot12Event): string;
 /**
  * Runtime Message sender 必须是用户 ID（agent bridge 以 sender 与 endpointMaster 比对）。

package/lib/protocol.js

@@ -103,7 +103,7 @@ export function onebot12InboundConversation(endpointKey, ev) {
             : {}),
     };
 }
-/** Build inbound text for MessageGateway.receive */
+/** Build inbound text for OutboundMessageService.receive */
 export function formatInboundContent(ev) {
     if (Array.isArray(ev.message)) {
         return ev.message

package/lib/side-event-dispatch.d.ts

@@ -1,7 +1,7 @@
-import type { SideEventGateway } from '@zhin.js/core/runtime';
+import type { EndpointEventEmitter } from 'zhin.js/adapter';
 import { type getAdapterLogger } from '@zhin.js/logger';
 import type { OneBot12Event } from './protocol.js';
 export interface OneBot12SideEventCaller {
     callApi(action: string, params?: Record<string, unknown>): Promise<unknown>;
 }
-export declare function receiveOneBot12SideEvent(sideEvents: SideEventGateway | undefined, endpointKey: string, caller: OneBot12SideEventCaller, raw: OneBot12Event, logger: ReturnType<typeof getAdapterLogger>): void;
+export declare function receiveOneBot12SideEvent(emit: EndpointEventEmitter, endpointKey: string, caller: OneBot12SideEventCaller, raw: OneBot12Event, logger: ReturnType<typeof getAdapterLogger>): void;

package/lib/side-event-dispatch.js

@@ -1,14 +1,14 @@
 import { receiveOneBotLikeSideEvent } from '@zhin.js/core';
 import { formatCompact } from '@zhin.js/logger';
-export function receiveOneBot12SideEvent(sideEvents, endpointKey, caller, raw, logger) {
-    if (!sideEvents)
+export function receiveOneBot12SideEvent(emit, endpointKey, caller, raw, logger) {
+    if (!emit)
         return;
     const record = raw;
     const eventType = String(record.type ?? record.post_type ?? '');
     const detailType = String(record.detail_type ?? '');
     const isRequest = eventType === 'request' || eventType.startsWith('request.');
     const isFriend = detailType.includes('friend') || String(record.request_type ?? '') === 'friend';
-    void receiveOneBotLikeSideEvent(sideEvents, {
+    void receiveOneBotLikeSideEvent(emit, {
         adapter: 'onebot12',
         endpointKey,
         platform: 'onebot',

package/lib/webhook.d.ts

@@ -1,29 +1,23 @@
-import { type EndpointControl, type EndpointInstance, type EndpointManagement, type EndpointSendRequest } from 'zhin.js/adapter';
-import type { MessageGateway, SideEventGateway } from '@zhin.js/core/runtime';
+import { ClientEndpoint, type EndpointControl, type EndpointManagement, type EndpointSendRequest } from 'zhin.js/adapter';
 import type { HttpHost } from '@zhin.js/host-http';
 import type { CapabilityId } from 'zhin.js';
-import { callOneBot12Action, type OneBot12Event, type OneBot12WebhookConfig } from './protocol.js';
+import { callOneBot12Action, type OneBot12WebhookConfig } from './protocol.js';
+import { type Onebot12Client } from './client.js';
 export interface OneBot12WebhookEndpointOptions {
     readonly id: CapabilityId;
-    readonly gateway: MessageGateway;
-    readonly sideEvents?: SideEventGateway;
     readonly http: HttpHost;
     readonly config: OneBot12WebhookConfig;
     readonly callAction?: typeof callOneBot12Action;
 }
-export declare class OneBot12WebhookEndpoint implements EndpointInstance {
+export declare class OneBot12WebhookEndpoint extends ClientEndpoint<Onebot12Client> {
     #private;
+    readonly client: Onebot12Client;
     readonly management: EndpointManagement;
     readonly control: EndpointControl;
     readonly content: import("@zhin.js/adapter").EndpointContentPort;
     constructor(options: OneBot12WebhookEndpointOptions);
     start(): Promise<void>;
-    open(): void;
-    close(): void;
     stop(): Promise<void>;
     send({ conversation, payload }: EndpointSendRequest): Promise<string>;
     recallMessage(messageId: string): Promise<void>;
-    /** Public API for management surface / callers；webhook 模式走 api_url。 */
-    callApi(action: string, params?: Record<string, unknown>): Promise<unknown>;
-    admit(ev: OneBot12Event): void;
 }

package/lib/webhook.js

@@ -1,23 +1,33 @@
-import { createRecallEndpointControl, } from 'zhin.js/adapter';
+import { ClientEndpoint, createRecallEndpointControl, } from 'zhin.js/adapter';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 import { createOneBot12EndpointManagement } from './endpoint-management.js';
 import { buildSendMessageParams, callOneBot12Action, formatInboundContent, formatOutboundSegments, isBotMentioned, isMessageEvent, onebot12InboundConversation, senderNickname, senderUserId, uploadOneBot12MediaSegments, } from './protocol.js';
 import { receiveOneBot12SideEvent } from './side-event-dispatch.js';
 import { createOneBot12ContentPort } from './content-port.js';
+import { callOnebot12Client, createOnebot12EndpointClient, forwardOnebot12ClientEvents } from './client.js';
 import { verifyOneBotAccessToken } from './wss-auth.js';
 const logger = getLogger('onebot12');
-export class OneBot12WebhookEndpoint {
+export class OneBot12WebhookEndpoint extends ClientEndpoint {
+    client;
     #options;
-    management = createOneBot12EndpointManagement(this);
+    management;
     control = createRecallEndpointControl((id) => this.recallMessage(id));
-    content = createOneBot12ContentPort((action, params) => this.callApi(action, params));
+    content;
     #callAction;
     #routeReleases = [];
-    #open = false;
     #started = false;
     constructor(options) {
+        super();
         this.#options = options;
         this.#callAction = options.callAction ?? callOneBot12Action;
+        this.client = createOnebot12EndpointClient(options.config, (action, params) => this.#callApi(action, params));
+        const callApi = (action, params) => callOnebot12Client(this.client, action, params);
+        this.management = createOneBot12EndpointManagement({ callApi });
+        this.content = createOneBot12ContentPort(callApi);
+        this.bindClientEvents((receive) => forwardOnebot12ClientEvents(this.client, receive), (name, payload) => {
+            if (name === 'event')
+                this.#admitRaw(payload);
+        }, (_name, error) => this.#warnPlatformEvent(error));
     }
     async start() {
         if (this.#started)
@@ -40,21 +50,15 @@ export class OneBot12WebhookEndpoint {
             path: this.#options.config.path,
         }));
     }
-    open() {
-        this.#open = true;
-    }
-    close() {
-        this.#open = false;
-    }
     async stop() {
-        this.#open = false;
+        this.close();
         for (const release of this.#routeReleases.splice(0))
             release();
         this.#started = false;
         logger.debug(formatCompact({ op: 'disconnect', endpoint: this.#options.config.id }));
     }
     async send({ conversation, payload }) {
-        const materialized = await uploadOneBot12MediaSegments(payload, (action, params) => this.callApi(action, params), (error) => {
+        const materialized = await uploadOneBot12MediaSegments(payload, (action, params) => callOnebot12Client(this.client, action, params), (error) => {
             logger.warn(formatCompact({
                 op: 'onebot12_upload_failed',
                 endpoint: this.#options.config.id,
@@ -63,7 +67,7 @@ export class OneBot12WebhookEndpoint {
         });
         const message = formatOutboundSegments(materialized);
         const params = buildSendMessageParams(conversation, message);
-        const data = await this.callApi('send_message', params);
+        const data = await callOnebot12Client(this.client, 'send_message', params);
         const messageId = data?.message_id ?? '';
         logger.debug(formatCompact({
             op: 'onebot12_send',
@@ -77,29 +81,25 @@ export class OneBot12WebhookEndpoint {
     async recallMessage(messageId) {
         if (!messageId)
             return;
-        await this.callApi('delete_message', { message_id: messageId });
+        await callOnebot12Client(this.client, 'delete_message', { message_id: messageId });
     }
-    /** Public API for management surface / callers；webhook 模式走 api_url。 */
-    async callApi(action, params = {}) {
+    async #callApi(action, params = {}) {
         const apiUrl = this.#options.config.api_url;
         if (!apiUrl) {
             throw new Error('OneBot12 connection:webhook requires api_url for outbound api');
         }
-        const resp = await this.#callAction({ url: apiUrl, access_token: this.#options.config.access_token }, action, params);
-        return resp.data;
+        return this.#callAction({ url: apiUrl, access_token: this.#options.config.access_token }, action, params);
     }
-    admit(ev) {
-        if (!this.#open)
-            return;
+    #admitRaw(ev) {
         if (!isMessageEvent(ev)) {
-            receiveOneBot12SideEvent(this.#options.sideEvents, this.#options.config.id, this, ev, logger);
+            receiveOneBot12SideEvent((name, payload) => this.emit(name, payload), this.#options.config.id, { callApi: (action, params) => callOnebot12Client(this.client, action, params) }, ev, logger);
             return;
         }
         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({
+        void this.emit('message.receive', {
             conversation,
             message: { conversation, id: ev.message_id },
             content,
@@ -124,6 +124,12 @@ export class OneBot12WebhookEndpoint {
             }));
         });
     }
+    #warnPlatformEvent(error) {
+        logger.warn(formatCompact({
+            op: 'onebot12_platform_event_failed',
+            error: error instanceof Error ? error.message : String(error),
+        }));
+    }
     #setupRoutes() {
         const path = this.#options.config.path;
         this.#routeReleases.push(this.#options.http.route('POST', path, async (request, response) => {
@@ -137,20 +143,12 @@ export class OneBot12WebhookEndpoint {
                 response.end(JSON.stringify({ message: 'Unauthorized' }));
                 return;
             }
-            const raw = await readRequestBody(request);
-            let ev;
-            try {
-                ev = JSON.parse(raw);
-            }
-            catch {
-                response.writeHead(400, { 'Content-Type': 'application/json' });
-                response.end(JSON.stringify({ message: 'Invalid JSON' }));
+            if (!this.clientEventsOpen) {
+                response.writeHead(200, { 'Content-Type': 'application/json' });
+                response.end(JSON.stringify({ status: 'ok' }));
                 return;
             }
-            if (this.#open)
-                this.admit(ev);
-            response.writeHead(200, { 'Content-Type': 'application/json' });
-            response.end(JSON.stringify({ status: 'ok' }));
+            await this.client.acceptHttp(request, response);
         }
         catch (error) {
             logger.error('OneBot12 webhook error:', error);
@@ -161,17 +159,3 @@ export class OneBot12WebhookEndpoint {
         }
     }
 }
-async function readRequestBody(request) {
-    const chunks = [];
-    let size = 0;
-    for await (const chunk of request) {
-        const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-        size += buffer.length;
-        if (size > 1_048_576) {
-            request.destroy();
-            throw new Error('Request body exceeds 1MB');
-        }
-        chunks.push(buffer);
-    }
-    return Buffer.concat(chunks).toString('utf8');
-}

package/lib/ws-endpoint.d.ts

@@ -1,29 +1,22 @@
-import { type EndpointControl, type EndpointInstance, type EndpointManagement, type EndpointSendRequest } from 'zhin.js/adapter';
-import type { MessageGateway, SideEventGateway } from '@zhin.js/core/runtime';
+import { ClientEndpoint, type EndpointControl, type EndpointManagement, type EndpointSendRequest } from 'zhin.js/adapter';
 import type { CapabilityId } from 'zhin.js';
-import { type OneBot12Event, type OneBot12WsConfig } from './protocol.js';
+import { type OneBot12WsConfig } from './protocol.js';
+import { type Onebot12Client } from './client.js';
 import { type OneBot12WsCreateOptions, type OneBot12WsSocket } from './ws-types.js';
 export interface OneBot12WsEndpointOptions {
     readonly id: CapabilityId;
-    readonly gateway: MessageGateway;
-    readonly sideEvents?: SideEventGateway;
     readonly config: OneBot12WsConfig;
     readonly createWebSocket?: (url: string, options: OneBot12WsCreateOptions) => OneBot12WsSocket;
 }
-export declare class OneBot12WsEndpoint implements EndpointInstance {
+export declare class OneBot12WsEndpoint extends ClientEndpoint<Onebot12Client> {
     #private;
+    readonly client: Onebot12Client;
     readonly management: EndpointManagement;
     readonly control: EndpointControl;
     readonly content: import("@zhin.js/adapter").EndpointContentPort;
     constructor(options: OneBot12WsEndpointOptions);
     start(): Promise<void>;
-    open(): void;
-    close(): void;
     stop(): Promise<void>;
     send({ conversation, payload }: EndpointSendRequest): Promise<string>;
     recallMessage(messageId: string): Promise<void>;
-    /** Public API for management surface / callers. */
-    callApi(action: string, params?: Record<string, unknown>): Promise<unknown>;
-    /** Test / internal: admit a parsed event when the endpoint is open. */
-    admit(ev: OneBot12Event): void;
 }