@zhin.js/adapter-milky 7.0.0 → 7.0.1

package/src/sse-endpoint.ts

@@ -2,20 +2,19 @@
  * Milky SSE client endpoint — GET text/event-stream on /event.
  */
 import {
+  ClientEndpoint,
   createRecallEndpointControl,
   createEndpointLifecycle,
   type EndpointConnectHandle,
   type EndpointControl,
-  type EndpointInstance,
   type EndpointLifecycle,
   type EndpointManagement,
   type EndpointSendRequest,
 } from 'zhin.js/adapter';
-import type { MessageGateway, SideEventGateway } from '@zhin.js/core/runtime';
 import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import type { CapabilityId } from 'zhin.js';
 import { createMilkyEndpointManagement } from './endpoint-management.js';
-import { registerMilkyAgentEndpoint } from './milky-agent-deps.js';
+import { callMilkyClient, createMilkyEndpointClient, forwardMilkyClientEvents, type MilkyClient } from './client.js';
 import {
   buildSendAction,
   buildSseConnectOptions,
@@ -47,29 +46,38 @@ export type CreateMilkySseStream = (options: {
 
 export interface MilkySseEndpointOptions {
   readonly id: CapabilityId;
-  readonly gateway: MessageGateway;
-  readonly sideEvents?: SideEventGateway;
   readonly config: MilkySseConfig;
   readonly createSseStream?: CreateMilkySseStream;
   readonly callApi?: typeof callApi;
 }
 
-export class MilkySseEndpoint implements EndpointInstance {
+export class MilkySseEndpoint extends ClientEndpoint<MilkyClient> {
+  readonly client: MilkyClient;
   readonly #logger!: ReturnType<typeof getAdapterLogger>;
 
   readonly #options: MilkySseEndpointOptions;
   readonly #callApi: typeof callApi;
-  readonly management: EndpointManagement = createMilkyEndpointManagement(this);
+  readonly management: EndpointManagement;
   readonly control: EndpointControl = createRecallEndpointControl((id) => this.recallMessage(id));
   readonly #lifecycle: EndpointLifecycle;
   #stream?: SseClientHandle;
-  #open = false;
-  #unregisterAgent?: () => void;
 
   constructor(options: MilkySseEndpointOptions) {
+    super();
     this.#logger = getAdapterLogger('milky', options.config.id);
     this.#options = options;
     this.#callApi = options.callApi ?? callApi;
+    this.client = createMilkyEndpointClient(options.config, this.#callApi);
+    this.management = createMilkyEndpointManagement({
+      callApi: (action, params) => callMilkyClient(this.client, action, params),
+    });
+    this.bindClientEvents(
+      (receive) => forwardMilkyClientEvents(this.client, receive),
+      (name, payload) => {
+        if (name === 'event') this.#admitRaw(payload as MilkyEvent);
+      },
+      (_name, error) => this.#warnPlatformEvent(error),
+    );
     this.#lifecycle = createEndpointLifecycle({
       name: options.config.id,
       // reconnect_interval 旧语义为固定间隔：multiplier 1 + 无 jitter + 不封顶
@@ -84,30 +92,17 @@ export class MilkySseEndpoint implements EndpointInstance {
 
   async start(): Promise<void> {
     if (this.#lifecycle.started) return;
-    this.#unregisterAgent = registerMilkyAgentEndpoint(this.#options.config.id, this);
     try {
       await this.#lifecycle.start((handle) => this.#connect(handle));
     } catch (err) {
       // 与 WS 对齐：start 失败复位由基座保证；agent 反注册留在适配器侧，允许重试
-      this.#unregisterAgent?.();
-      this.#unregisterAgent = undefined;
       throw err;
     }
   }
 
-  open(): void {
-    this.#open = true;
-  }
-
-  close(): void {
-    this.#open = false;
-  }
-
   async stop(): Promise<void> {
-    this.#open = false;
+    this.close();
     await this.#lifecycle.stop();
-    this.#unregisterAgent?.();
-    this.#unregisterAgent = undefined;
     this.#stream?.close();
     this.#stream = undefined;
   }
@@ -115,7 +110,7 @@ export class MilkySseEndpoint implements EndpointInstance {
   async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
     const message = formatOutboundSegments(payload);
     const { action, params } = buildSendAction(conversation, message);
-    const data = await this.callApi(action, params) as { message_seq?: number } | undefined;
+    const data = await callMilkyClient<{ message_seq?: number }>(this.client, action, params);
     const messageId = formatOutboundMessageId(conversation, data?.message_seq);
     this.#logger.debug(formatCompact({
       op: 'milky_send',
@@ -127,100 +122,30 @@ export class MilkySseEndpoint implements EndpointInstance {
     return messageId;
   }
 
-  callApi(action: string, params: Record<string, unknown> = {}): Promise<unknown> {
-    return this.#callApi(this.apiOptions(), action, params);
-  }
-
   async recallMessage(id: string): Promise<void> {
     const parsed = parseMilkyMessageId(id);
     if (!parsed) throw new Error(`Invalid message id: ${id}`);
     if (parsed.message_scene === 'group') {
-      await this.callApi('recall_group_message', {
+      await callMilkyClient(this.client, 'recall_group_message', {
         group_id: parsed.peer_id,
         message_seq: parsed.message_seq,
       });
     } else {
-      await this.callApi('recall_private_message', {
+      await callMilkyClient(this.client, 'recall_private_message', {
         user_id: parsed.peer_id,
         message_seq: parsed.message_seq,
       });
     }
   }
 
-  async kickMember(groupId: number, userId: number, rejectAddRequest = false): Promise<boolean> {
-    await this.callApi('kick_group_member', {
-      group_id: groupId,
-      user_id: userId,
-      reject_add_request: rejectAddRequest,
-    });
-    return true;
-  }
-
-  async muteMember(groupId: number, userId: number, duration = 600): Promise<boolean> {
-    await this.callApi('set_group_member_mute', {
-      group_id: groupId,
-      user_id: userId,
-      duration,
-    });
-    return true;
-  }
-
-  async muteAll(groupId: number, enable = true): Promise<boolean> {
-    await this.callApi('set_group_whole_mute', { group_id: groupId, is_mute: enable });
-    return true;
-  }
-
-  async setAdmin(groupId: number, userId: number, enable = true): Promise<boolean> {
-    await this.callApi('set_group_member_admin', {
-      group_id: groupId,
-      user_id: userId,
-      is_set: enable,
-    });
-    return true;
-  }
-
-  async setCard(groupId: number, userId: number, card: string): Promise<boolean> {
-    await this.callApi('set_group_member_card', {
-      group_id: groupId,
-      user_id: userId,
-      card,
-    });
-    return true;
-  }
-
-  async setTitle(groupId: number, userId: number, title: string): Promise<boolean> {
-    await this.callApi('set_group_member_special_title', {
-      group_id: groupId,
-      user_id: userId,
-      special_title: title,
-    });
-    return true;
-  }
-
-  async setGroupName(groupId: number, name: string): Promise<boolean> {
-    await this.callApi('set_group_name', { group_id: groupId, new_group_name: name });
-    return true;
-  }
-
-  async getMemberList(groupId: number): Promise<unknown[]> {
-    return this.callApi('get_group_member_list', { group_id: groupId }) as Promise<unknown[]>;
-  }
-
-  async getGroupInfo(groupId: number): Promise<unknown> {
-    return this.callApi('get_group_info', { group_id: groupId });
-  }
-
-  admit(event: MilkyEvent): void {
+  #admitRaw(event: MilkyEvent): void {
     const data = parseMessageReceiveData(event);
-    if (!this.#open || !data) return;
+    if (!data) return;
     this.#admitMessage(data, event);
   }
 
-  apiOptions(): { baseUrl: string; access_token?: string } {
-    return {
-      baseUrl: this.#options.config.baseUrl,
-      access_token: this.#options.config.access_token,
-    };
+  #warnPlatformEvent(error: unknown): void {
+    this.#logger.warn(formatCompact({ op: 'milky_platform_event_failed', error: error instanceof Error ? error.message : String(error) }));
   }
 
   #admitMessage(data: MilkyIncomingMessage, event: MilkyEvent): void {
@@ -231,7 +156,7 @@ export class MilkySseEndpoint implements EndpointInstance {
     const audioUrl = extractInboundAudioUrl(data);
     const nickname = senderNickname(data);
     const mentioned = isMentioned(data, event.self_id);
-    void this.#options.gateway.receive({
+    void this.emit('message.receive', {
       conversation,
       message: { conversation, id: formatInboundMessageId(data) },
       content,
@@ -320,7 +245,7 @@ export class MilkySseEndpoint implements EndpointInstance {
   #onMessage(data: string): void {
     try {
       const event = JSON.parse(data) as MilkyEvent;
-      this.admit(event);
+      this.client.ingest(event as Parameters<MilkyClient['ingest']>[0]);
     } catch (error) {
       this.#logger.warn(formatCompact({
         op: 'milky_parse_failed',

package/src/webhook-endpoint.ts

@@ -3,19 +3,18 @@
  */
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import {
+  ClientEndpoint,
   createRecallEndpointControl,
   type EndpointControl,
-  type EndpointInstance,
   type EndpointManagement,
   type EndpointSendRequest,
 } from 'zhin.js/adapter';
-import type { MessageGateway, SideEventGateway } from '@zhin.js/core/runtime';
 import type { HttpHost, HttpRouteRegistration } from '@zhin.js/host-http';
 import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import type { CapabilityId } from 'zhin.js';
-import { readRequestBody, verifyMilkyAccessToken } from './milky-auth.js';
+import { verifyMilkyAccessToken } from './milky-auth.js';
 import { createMilkyEndpointManagement } from './endpoint-management.js';
-import { registerMilkyAgentEndpoint } from './milky-agent-deps.js';
+import { callMilkyClient, createMilkyEndpointClient, forwardMilkyClientEvents, type MilkyClient } from './client.js';
 import {
   buildSendAction,
   callApi,
@@ -37,35 +36,43 @@ import {
 
 export interface MilkyWebhookEndpointOptions {
   readonly id: CapabilityId;
-  readonly gateway: MessageGateway;
-  readonly sideEvents?: SideEventGateway;
   readonly http: HttpHost;
   readonly config: MilkyWebhookConfig;
   readonly callApi?: typeof callApi;
 }
 
-export class MilkyWebhookEndpoint implements EndpointInstance {
+export class MilkyWebhookEndpoint extends ClientEndpoint<MilkyClient> {
+  readonly client: MilkyClient;
   readonly #logger!: ReturnType<typeof getAdapterLogger>;
 
   readonly #options: MilkyWebhookEndpointOptions;
   readonly #callApi: typeof callApi;
-  readonly management: EndpointManagement = createMilkyEndpointManagement(this);
+  readonly management: EndpointManagement;
   readonly control: EndpointControl = createRecallEndpointControl((id) => this.recallMessage(id));
   #routeReleases: HttpRouteRegistration[] = [];
-  #open = false;
   #started = false;
-  #unregisterAgent?: () => void;
 
   constructor(options: MilkyWebhookEndpointOptions) {
+    super();
     this.#logger = getAdapterLogger('milky', options.config.id);
     this.#options = options;
     this.#callApi = options.callApi ?? callApi;
+    this.client = createMilkyEndpointClient(options.config, this.#callApi);
+    this.management = createMilkyEndpointManagement({
+      callApi: (action, params) => callMilkyClient(this.client, action, params),
+    });
+    this.bindClientEvents(
+      (receive) => forwardMilkyClientEvents(this.client, receive),
+      (name, payload) => {
+        if (name === 'event') this.#admitRaw(payload as MilkyEvent);
+      },
+      (_name, error) => this.#warnPlatformEvent(error),
+    );
   }
 
   async start(): Promise<void> {
     if (this.#started) return;
     this.#started = true;
-    this.#unregisterAgent = registerMilkyAgentEndpoint(this.#options.config.id, this);
     this.#setupRoutes();
     this.#logger.info(formatCompact({
       op: 'listen',
@@ -75,19 +82,9 @@ export class MilkyWebhookEndpoint implements EndpointInstance {
     }));
   }
 
-  open(): void {
-    this.#open = true;
-  }
-
-  close(): void {
-    this.#open = false;
-  }
-
   async stop(): Promise<void> {
-    this.#open = false;
+    this.close();
     for (const release of this.#routeReleases.splice(0)) release();
-    this.#unregisterAgent?.();
-    this.#unregisterAgent = undefined;
     this.#started = false;
     this.#logger.debug(formatCompact({ op: 'disconnect' }));
   }
@@ -95,7 +92,7 @@ export class MilkyWebhookEndpoint implements EndpointInstance {
   async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
     const message = formatOutboundSegments(payload);
     const { action, params } = buildSendAction(conversation, message);
-    const data = await this.callApi(action, params) as { message_seq?: number } | undefined;
+    const data = await callMilkyClient<{ message_seq?: number }>(this.client, action, params);
     const messageId = formatOutboundMessageId(conversation, data?.message_seq);
     this.#logger.debug(formatCompact({
       op: 'milky_send',
@@ -106,100 +103,30 @@ export class MilkyWebhookEndpoint implements EndpointInstance {
     return messageId;
   }
 
-  callApi(action: string, params: Record<string, unknown> = {}): Promise<unknown> {
-    return this.#callApi(this.apiOptions(), action, params);
-  }
-
   async recallMessage(id: string): Promise<void> {
     const parsed = parseMilkyMessageId(id);
     if (!parsed) throw new Error(`Invalid message id: ${id}`);
     if (parsed.message_scene === 'group') {
-      await this.callApi('recall_group_message', {
+      await callMilkyClient(this.client, 'recall_group_message', {
         group_id: parsed.peer_id,
         message_seq: parsed.message_seq,
       });
     } else {
-      await this.callApi('recall_private_message', {
+      await callMilkyClient(this.client, 'recall_private_message', {
         user_id: parsed.peer_id,
         message_seq: parsed.message_seq,
       });
     }
   }
 
-  async kickMember(groupId: number, userId: number, rejectAddRequest = false): Promise<boolean> {
-    await this.callApi('kick_group_member', {
-      group_id: groupId,
-      user_id: userId,
-      reject_add_request: rejectAddRequest,
-    });
-    return true;
-  }
-
-  async muteMember(groupId: number, userId: number, duration = 600): Promise<boolean> {
-    await this.callApi('set_group_member_mute', {
-      group_id: groupId,
-      user_id: userId,
-      duration,
-    });
-    return true;
-  }
-
-  async muteAll(groupId: number, enable = true): Promise<boolean> {
-    await this.callApi('set_group_whole_mute', { group_id: groupId, is_mute: enable });
-    return true;
-  }
-
-  async setAdmin(groupId: number, userId: number, enable = true): Promise<boolean> {
-    await this.callApi('set_group_member_admin', {
-      group_id: groupId,
-      user_id: userId,
-      is_set: enable,
-    });
-    return true;
-  }
-
-  async setCard(groupId: number, userId: number, card: string): Promise<boolean> {
-    await this.callApi('set_group_member_card', {
-      group_id: groupId,
-      user_id: userId,
-      card,
-    });
-    return true;
-  }
-
-  async setTitle(groupId: number, userId: number, title: string): Promise<boolean> {
-    await this.callApi('set_group_member_special_title', {
-      group_id: groupId,
-      user_id: userId,
-      special_title: title,
-    });
-    return true;
-  }
-
-  async setGroupName(groupId: number, name: string): Promise<boolean> {
-    await this.callApi('set_group_name', { group_id: groupId, new_group_name: name });
-    return true;
-  }
-
-  async getMemberList(groupId: number): Promise<unknown[]> {
-    return this.callApi('get_group_member_list', { group_id: groupId }) as Promise<unknown[]>;
-  }
-
-  async getGroupInfo(groupId: number): Promise<unknown> {
-    return this.callApi('get_group_info', { group_id: groupId });
-  }
-
-  admit(event: MilkyEvent): void {
+  #admitRaw(event: MilkyEvent): void {
     const data = parseMessageReceiveData(event);
-    if (!this.#open || !data) return;
+    if (!data) return;
     this.#admitMessage(data, event);
   }
 
-  apiOptions(): { baseUrl: string; access_token?: string } {
-    return {
-      baseUrl: this.#options.config.baseUrl,
-      access_token: this.#options.config.access_token,
-    };
+  #warnPlatformEvent(error: unknown): void {
+    this.#logger.warn(formatCompact({ op: 'milky_platform_event_failed', error: error instanceof Error ? error.message : String(error) }));
   }
 
   #admitMessage(data: MilkyIncomingMessage, event: MilkyEvent): void {
@@ -210,7 +137,7 @@ export class MilkyWebhookEndpoint implements EndpointInstance {
     const audioUrl = extractInboundAudioUrl(data);
     const nickname = senderNickname(data);
     const mentioned = isMentioned(data, event.self_id);
-    void this.#options.gateway.receive({
+    void this.emit('message.receive', {
       conversation,
       message: { conversation, id: formatInboundMessageId(data) },
       content,
@@ -252,18 +179,12 @@ export class MilkyWebhookEndpoint implements EndpointInstance {
         response.end(JSON.stringify({ message: 'Unauthorized' }));
         return;
       }
-      const raw = await readRequestBody(request);
-      let event: MilkyEvent;
-      try {
-        event = JSON.parse(raw) as MilkyEvent;
-      } 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(event);
-      response.writeHead(200, { 'Content-Type': 'application/json' });
-      response.end(JSON.stringify({ status: 'ok' }));
+      await this.client.acceptHttp(request, response);
     } catch (error) {
       this.#logger.error('Milky webhook error:', error);
       if (!response.headersSent) {