@zhin.js/adapter-milky 1.0.1 → 1.1.2

package/src/endpoint-ws.ts

@@ -1,296 +0,0 @@
-/**
- * Milky WebSocket 正向连接 Bot（应用连协议端 ws(s)://baseUrl/event）
- */
-import WebSocket from 'ws';
-import { EventEmitter } from 'events';
-import { clearInterval } from 'node:timers';
-import { formatCompact, Endpoint, Message, segment, SendOptions } from 'zhin.js';
-import { callApi } from './api.js';
-import type { MilkyWsConfig, MilkyEvent } from './types.js';
-import type { MilkyAdapter } from './adapter.js';
-import {
-  formatMilkyMessagePayload,
-  parseMessageReceiveData,
-  toMilkyOutgoingSegments,
-  parseMilkyMessageId,
-} from './utils.js';
-
-export class MilkyWsClient extends EventEmitter implements Endpoint<MilkyWsConfig, MilkyEvent> {
-  $connected: boolean;
-  private ws?: WebSocket;
-  private reconnectTimer?: NodeJS.Timeout;
-  private heartbeatTimer?: NodeJS.Timeout;
-
-  get logger() {
-    return this.adapter.plugin.logger;
-  }
-
-  constructor(public adapter: MilkyAdapter, public $config: MilkyWsConfig) {
-    super();
-    this.$connected = false;
-  }
-
-  get $id() {
-    return this.$config.name;
-  }
-
-  private get eventUrl(): string {
-    const base = this.$config.baseUrl.replace(/\/$/, '');
-    const url = base.replace(/^http/, 'ws') + '/event';
-    const token = this.$config.access_token;
-    if (token) return `${url}${url.includes('?') ? '&' : '?'}access_token=${encodeURIComponent(token)}`;
-    return url;
-  }
-
-  private apiOptions() {
-    return { baseUrl: this.$config.baseUrl, access_token: this.$config.access_token };
-  }
-
-  async $connect(): Promise<void> {
-    return new Promise((resolve, reject) => {
-      const headers: Record<string, string> = {};
-      if (this.$config.access_token) {
-        headers['Authorization'] = `Bearer ${this.$config.access_token}`;
-      }
-      this.ws = new WebSocket(this.eventUrl, { headers });
-
-      this.ws.on('open', () => {
-        this.$connected = true;
-        if (!this.$config.access_token) {
-          this.logger.warn(formatCompact({ endpoint: this.$id, ok: false, error: 'missing access_token' }));
-        }
-        this.logger.info(formatCompact({ endpoint: this.$id, mode: 'ws' }));
-        this.startHeartbeat();
-        resolve();
-      });
-
-      this.ws.on('message', (data) => {
-        try {
-          const event = JSON.parse(data.toString()) as MilkyEvent;
-          this.handleEvent(event);
-        } catch (error) {
-          this.emit('error', error);
-        }
-      });
-
-      this.ws.on('close', (code, reason) => {
-        this.$connected = false;
-        const reasonStr = reason?.toString?.() || String(reason);
-        const codeHint = code === 1005 ? ' [无状态，多为服务端/代理未发 close 帧即断开]' : code === 1006 ? ' [异常关闭]' : '';
-        this.logger.warn(formatCompact( {
-          op: 'disconnect',
-          endpoint: this.$config.name,
-          code,
-          error: `${reasonStr || 'closed'}${codeHint}`,
-          reconnect_ms: this.$config.reconnect_interval ?? 5000,
-        }));
-        reject(new Error(`WS closed: ${code} ${reasonStr}`));
-        this.scheduleReconnect();
-      });
-
-      this.ws.on('error', (error) => {
-        this.logger.warn(formatCompact( {
-          op: 'ws_error',
-          endpoint: this.$config.name,
-          ok: false,
-          error: error instanceof Error ? error.message : String(error),
-        }));
-        reject(error);
-      });
-    });
-  }
-
-  async $disconnect(): Promise<void> {
-    if (this.reconnectTimer) {
-      clearTimeout(this.reconnectTimer);
-      this.reconnectTimer = undefined;
-    }
-    if (this.heartbeatTimer) {
-      clearInterval(this.heartbeatTimer);
-      this.heartbeatTimer = undefined;
-    }
-    if (this.ws) {
-      this.ws.close();
-      this.ws = undefined;
-    }
-    this.$connected = false;
-  }
-
-  private handleEvent(event: MilkyEvent): void {
-    const data = parseMessageReceiveData(event);
-    if (data) {
-      const message = this.$formatMessage(event);
-      this.adapter.emit('message.receive', message);
-      this.logger.debug(
-        `${this.$config.name} recv ${message.$channel.type}(${message.$channel.id}):${segment.raw(message.$content)}`,
-      );
-    }
-    // 其他 event_type 可在此扩展 Notice / Request
-  }
-
-  $formatMessage(event: MilkyEvent): Message<MilkyEvent> {
-    const data = parseMessageReceiveData(event);
-    if (!data) {
-      return Message.from(event, {
-        $id: '',
-        $adapter: 'milky',
-        $endpoint: this.$config.name,
-        $channel: { id: '', type: 'private' },
-        $sender: { id: '', name: '' },
-        $content: [],
-        $raw: '',
-        $timestamp: event.time ?? 0,
-        $recall: async () => {},
-        $reply: async () => '',
-      });
-    }
-    const payload = formatMilkyMessagePayload(
-      event,
-      data,
-      (id) => this.$recallMessage(id),
-      (channel, content, _quote) =>
-        this.adapter.sendMessage({
-          ...channel,
-          context: 'milky',
-          endpoint: this.$config.name,
-          content: content as import('zhin.js').SendContent,
-        }),
-      'milky',
-      this.$config.name,
-    );
-    return Message.from(event, payload);
-  }
-
-  async $sendMessage(options: SendOptions): Promise<string> {
-    const content = Array.isArray(options.content) ? options.content : [options.content];
-    const segments = content.map((c) =>
-      typeof c === 'string' ? { type: 'text' as const, data: { text: c } } : (c as { type: string; data?: Record<string, unknown> }),
-    );
-    const message = toMilkyOutgoingSegments(segments);
-    if (options.type === 'group') {
-      const result = await callApi(this.apiOptions(), 'send_group_message', {
-        group_id: parseInt(options.id, 10),
-        message,
-      });
-      const seq = (result as { message_seq?: number }).message_seq;
-      this.logger.debug(`${this.$config.name} send group(${options.id}):${segment.raw(options.content)}`);
-      return seq != null ? `group:${options.id}:${seq}` : '';
-    }
-    if (options.type === 'private') {
-      const result = await callApi(this.apiOptions(), 'send_private_message', {
-        user_id: parseInt(options.id, 10),
-        message,
-      });
-      const seq = (result as { message_seq?: number }).message_seq;
-      this.logger.debug(`${this.$config.name} send private(${options.id}):${segment.raw(options.content)}`);
-      return seq != null ? `friend:${options.id}:${seq}` : '';
-    }
-    throw new Error('Either group or private must be provided');
-  }
-
-  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 callApi(this.apiOptions(), 'recall_group_message', {
-        group_id: parsed.peer_id,
-        message_seq: parsed.message_seq,
-      });
-    } else {
-      await callApi(this.apiOptions(), 'recall_private_message', {
-        user_id: parsed.peer_id,
-        message_seq: parsed.message_seq,
-      });
-    }
-  }
-
-  async kickMember(groupId: number, userId: number, rejectAddRequest = false): Promise<boolean> {
-    await callApi(this.apiOptions(), 'kick_group_member', {
-      group_id: groupId,
-      user_id: userId,
-      reject_add_request: rejectAddRequest,
-    });
-    this.logger.debug(formatCompact( { op: 'kick', endpoint: this.$id, group: groupId, user: userId }));
-    return true;
-  }
-
-  async muteMember(groupId: number, userId: number, duration = 600): Promise<boolean> {
-    await callApi(this.apiOptions(), 'set_group_member_mute', {
-      group_id: groupId,
-      user_id: userId,
-      duration,
-    });
-    this.logger.debug(formatCompact( { op: duration > 0 ? 'mute' : 'unmute', endpoint: this.$id, group: groupId, user: userId, duration }));
-    return true;
-  }
-
-  async muteAll(groupId: number, enable = true): Promise<boolean> {
-    await callApi(this.apiOptions(), 'set_group_whole_mute', { group_id: groupId, is_mute: enable });
-    this.logger.debug(formatCompact( { op: 'mute_all', endpoint: this.$id, group: groupId, enable }));
-    return true;
-  }
-
-  async setAdmin(groupId: number, userId: number, enable = true): Promise<boolean> {
-    await callApi(this.apiOptions(), 'set_group_member_admin', {
-      group_id: groupId,
-      user_id: userId,
-      is_set: enable,
-    });
-    this.logger.debug(formatCompact( { op: 'set_admin', endpoint: this.$id, group: groupId, user: userId, enable }));
-    return true;
-  }
-
-  async setCard(groupId: number, userId: number, card: string): Promise<boolean> {
-    await callApi(this.apiOptions(), 'set_group_member_card', {
-      group_id: groupId,
-      user_id: userId,
-      card,
-    });
-    this.logger.debug(formatCompact( { op: 'set_card', endpoint: this.$id, group: groupId, user: userId }));
-    return true;
-  }
-
-  async setTitle(groupId: number, userId: number, title: string): Promise<boolean> {
-    await callApi(this.apiOptions(), 'set_group_member_special_title', {
-      group_id: groupId,
-      user_id: userId,
-      special_title: title,
-    });
-    this.logger.debug(formatCompact( { op: 'set_title', endpoint: this.$id, group: groupId, user: userId }));
-    return true;
-  }
-
-  async setGroupName(groupId: number, name: string): Promise<boolean> {
-    await callApi(this.apiOptions(), 'set_group_name', { group_id: groupId, new_group_name: name });
-    this.logger.debug(formatCompact( { op: 'set_group_name', endpoint: this.$id, group: groupId }));
-    return true;
-  }
-
-  async getMemberList(groupId: number): Promise<unknown[]> {
-    return callApi(this.apiOptions(), 'get_group_member_list', { group_id: groupId }) as Promise<unknown[]>;
-  }
-
-  async getGroupInfo(groupId: number): Promise<unknown> {
-    return callApi(this.apiOptions(), 'get_group_info', { group_id: groupId });
-  }
-
-  private startHeartbeat(): void {
-    const interval = this.$config.heartbeat_interval ?? 30000;
-    if (interval <= 0) return; // 设为 0 可关闭心跳（部分网关如 onebots 对 ping 处理异常时会 1006 断连）
-    this.heartbeatTimer = setInterval(() => {
-      if (this.ws?.readyState === WebSocket.OPEN) this.ws.ping();
-    }, interval);
-  }
-
-  private scheduleReconnect(): void {
-    if (this.reconnectTimer) return;
-    const interval = this.$config.reconnect_interval ?? 5000;
-    this.reconnectTimer = setTimeout(() => {
-      this.reconnectTimer = undefined;
-      this.$connect().catch((err) => {
-        this.emit('error', err);
-        this.scheduleReconnect();
-      });
-    }, interval);
-  }
-}

package/src/endpoint-wss.ts

@@ -1,268 +0,0 @@
-/**
- * Milky 反向 WebSocket Bot：应用开 WS 服务端，协议端来连；鉴权后收事件同正向
- */
-import { IncomingMessage } from 'http';
-import WebSocket, { WebSocketServer } from 'ws';
-import { EventEmitter } from 'events';
-import { clearInterval } from 'node:timers';
-import { formatCompact, Endpoint, Message, segment, SendOptions } from 'zhin.js';
-import type { Router } from '@zhin.js/host-router';
-import { callApi } from './api.js';
-import type { MilkyWssConfig, MilkyEvent } from './types.js';
-import type { MilkyAdapter } from './adapter.js';
-import {
-  formatMilkyMessagePayload,
-  parseMessageReceiveData,
-  toMilkyOutgoingSegments,
-  parseMilkyMessageId,
-} from './utils.js';
-
-function getAccessTokenFromWsRequest(req: IncomingMessage): string | undefined {
-  const auth = req.headers['authorization'];
-  if (typeof auth === 'string' && auth.startsWith('Bearer ')) return auth.slice(7);
-  const url = req.url ?? '';
-  const idx = url.indexOf('?');
-  if (idx >= 0) {
-    const params = new URLSearchParams(url.slice(idx));
-    return params.get('access_token') ?? undefined;
-  }
-  return undefined;
-}
-
-export class MilkyWssServer extends EventEmitter implements Endpoint<MilkyWssConfig, MilkyEvent> {
-  $connected: boolean;
-  #wss?: WebSocketServer;
-  #client?: WebSocket;
-  private heartbeatTimer?: NodeJS.Timeout;
-
-  get logger() {
-    return this.adapter.plugin.logger;
-  }
-
-  constructor(
-    public adapter: MilkyAdapter,
-    public router: Router,
-    public $config: MilkyWssConfig,
-  ) {
-    super();
-    this.$connected = false;
-  }
-
-  get $id() {
-    return this.$config.name;
-  }
-
-  private apiOptions() {
-    return { baseUrl: this.$config.baseUrl, access_token: this.$config.access_token };
-  }
-
-  async $connect(): Promise<void> {
-    const path = this.$config.path.startsWith('/') ? this.$config.path : `/${this.$config.path}`;
-    const token = this.$config.access_token;
-    if (!token) this.logger.warn(formatCompact({ endpoint: this.$id, ok: false, error: 'missing access_token' }));
-
-    this.#wss = this.router.ws(path, {
-      verifyClient: (info: { req: IncomingMessage }) => {
-        const received = getAccessTokenFromWsRequest(info.req);
-        if (token && received !== token) {
-          this.logger.error('反向 WS 鉴权失败');
-          return false;
-        }
-        return true;
-      },
-    });
-
-    this.$connected = true;
-    this.logger.info(formatCompact( { op: 'listen', endpoint: this.$id, mode: 'wss', path }));
-
-    this.#wss.on('connection', (client, req) => {
-      this.#client = client;
-      this.startHeartbeat();
-      this.logger.info(formatCompact({ endpoint: this.$id, peer: req.socket?.remoteAddress }));
-
-      client.on('message', (data) => {
-        try {
-          const event = JSON.parse(data.toString()) as MilkyEvent;
-          this.handleEvent(event);
-        } catch (err) {
-          this.emit('error', err);
-        }
-      });
-
-      client.on('close', () => {
-        this.#client = undefined;
-        this.logger.warn(formatCompact( { op: 'disconnect', endpoint: this.$id }));
-      });
-
-      client.on('error', (err) => this.logger.error('反向 WS 连接错误', err));
-    });
-  }
-
-  async $disconnect(): Promise<void> {
-    if (this.heartbeatTimer) {
-      clearInterval(this.heartbeatTimer);
-      this.heartbeatTimer = undefined;
-    }
-    this.#wss?.close();
-    this.#wss = undefined;
-    this.#client = undefined;
-    this.$connected = false;
-  }
-
-  $formatMessage(event: MilkyEvent): Message<MilkyEvent> {
-    const data = parseMessageReceiveData(event);
-    if (!data) {
-      return Message.from(event, {
-        $id: '',
-        $adapter: 'milky',
-        $endpoint: this.$config.name,
-        $channel: { id: '', type: 'private' },
-        $sender: { id: '', name: '' },
-        $content: [],
-        $raw: '',
-        $timestamp: event.time ?? 0,
-        $recall: async () => {},
-        $reply: async () => '',
-      });
-    }
-    const payload = formatMilkyMessagePayload(
-      event,
-      data,
-      (id) => this.$recallMessage(id),
-      (channel, content) =>
-        this.adapter.sendMessage({
-          ...channel,
-          context: 'milky',
-          endpoint: this.$config.name,
-          content: content as import('zhin.js').SendContent,
-        }),
-      'milky',
-      this.$config.name,
-    );
-    return Message.from(event, payload);
-  }
-
-  private handleEvent(event: MilkyEvent): void {
-    const data = parseMessageReceiveData(event);
-    if (data) {
-      const message = this.$formatMessage(event);
-      this.adapter.emit('message.receive', message);
-      this.logger.debug(
-        `${this.$config.name} recv ${message.$channel.type}(${message.$channel.id}):${segment.raw(message.$content)}`,
-      );
-    }
-  }
-
-  async $sendMessage(options: SendOptions): Promise<string> {
-    const content = Array.isArray(options.content) ? options.content : [options.content];
-    const segments = content.map((c) =>
-      typeof c === 'string' ? { type: 'text' as const, data: { text: c } } : (c as { type: string; data?: Record<string, unknown> }),
-    );
-    const message = toMilkyOutgoingSegments(segments);
-    if (options.type === 'group') {
-      const result = await callApi(this.apiOptions(), 'send_group_message', {
-        group_id: parseInt(options.id, 10),
-        message,
-      });
-      const seq = (result as { message_seq?: number }).message_seq;
-      this.logger.debug(`${this.$config.name} send group(${options.id}):${segment.raw(options.content)}`);
-      return seq != null ? `group:${options.id}:${seq}` : '';
-    }
-    if (options.type === 'private') {
-      const result = await callApi(this.apiOptions(), 'send_private_message', {
-        user_id: parseInt(options.id, 10),
-        message,
-      });
-      const seq = (result as { message_seq?: number }).message_seq;
-      this.logger.debug(`${this.$config.name} send private(${options.id}):${segment.raw(options.content)}`);
-      return seq != null ? `friend:${options.id}:${seq}` : '';
-    }
-    throw new Error('Either group or private must be provided');
-  }
-
-  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 callApi(this.apiOptions(), 'recall_group_message', {
-        group_id: parsed.peer_id,
-        message_seq: parsed.message_seq,
-      });
-    } else {
-      await callApi(this.apiOptions(), 'recall_private_message', {
-        user_id: parsed.peer_id,
-        message_seq: parsed.message_seq,
-      });
-    }
-  }
-
-  async kickMember(groupId: number, userId: number, rejectAddRequest = false): Promise<boolean> {
-    await callApi(this.apiOptions(), '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 callApi(this.apiOptions(), 'set_group_member_mute', {
-      group_id: groupId,
-      user_id: userId,
-      duration,
-    });
-    return true;
-  }
-
-  async muteAll(groupId: number, enable = true): Promise<boolean> {
-    await callApi(this.apiOptions(), 'set_group_whole_mute', { group_id: groupId, is_mute: enable });
-    return true;
-  }
-
-  async setAdmin(groupId: number, userId: number, enable = true): Promise<boolean> {
-    await callApi(this.apiOptions(), '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 callApi(this.apiOptions(), 'set_group_member_card', {
-      group_id: groupId,
-      user_id: userId,
-      card,
-    });
-    return true;
-  }
-
-  async setTitle(groupId: number, userId: number, title: string): Promise<boolean> {
-    await callApi(this.apiOptions(), '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 callApi(this.apiOptions(), 'set_group_name', { group_id: groupId, new_group_name: name });
-    return true;
-  }
-
-  async getMemberList(groupId: number): Promise<unknown[]> {
-    return callApi(this.apiOptions(), 'get_group_member_list', { group_id: groupId }) as Promise<unknown[]>;
-  }
-
-  async getGroupInfo(groupId: number): Promise<unknown> {
-    return callApi(this.apiOptions(), 'get_group_info', { group_id: groupId });
-  }
-
-  private startHeartbeat(): void {
-    const interval = this.$config.heartbeat_interval ?? 30000;
-    this.heartbeatTimer = setInterval(() => {
-      if (this.#client?.readyState === WebSocket.OPEN) this.#client.ping();
-    }, interval);
-  }
-}

package/src/types.ts

@@ -1,73 +0,0 @@
-/**
- * Milky 适配器类型与配置（与官方文档一致）
- */
-
-/** 配置公共字段；单一适配器下 context 均为 'milky'，连接方式由 connection 区分 */
-export interface MilkyConfigBase {
-  context: 'milky';
-  name: string;
-  baseUrl: string;
-  access_token?: string;
-}
-
-/** WebSocket 正向连接 */
-export interface MilkyWsConfig extends MilkyConfigBase {
-  connection: 'ws';
-  reconnect_interval?: number;
-  heartbeat_interval?: number;
-}
-
-/** SSE 连接 */
-export interface MilkySseConfig extends MilkyConfigBase {
-  connection: 'sse';
-}
-
-/** Webhook（协议端 POST 到应用） */
-export interface MilkyWebhookConfig extends MilkyConfigBase {
-  connection: 'webhook';
-  path: string;
-}
-
-/** WebSocket 反向（协议端连应用） */
-export interface MilkyWssConfig extends MilkyConfigBase {
-  connection: 'wss';
-  path: string;
-  heartbeat_interval?: number;
-}
-
-export type MilkyEndpointConfig = MilkyWsConfig | MilkySseConfig | MilkyWebhookConfig | MilkyWssConfig;
-
-/** 协议端 API 响应：status、retcode、data?、message? */
-export interface MilkyApiResponse<T = unknown> {
-  status: string;
-  retcode: number;
-  data?: T;
-  message?: string;
-}
-
-/** 事件结构：event_type、time、self_id、data */
-export interface MilkyEvent {
-  event_type: string;
-  time: number;
-  self_id: number;
-  data?: Record<string, unknown>;
-}
-
-/** 接收消息 data（message_receive）：message_scene、peer_id、message_seq、sender_id、time、segments、可选 friend/group/group_member */
-export interface MilkyIncomingMessage {
-  message_scene: 'friend' | 'group' | 'temp';
-  peer_id: number;
-  message_seq: number;
-  sender_id: number;
-  time: number;
-  segments: MilkyIncomingSegment[];
-  friend?: { user_id: number; nickname?: string };
-  group?: { group_id: number; group_name?: string };
-  group_member?: { user_id: number; nickname?: string; card?: string; role?: string };
-}
-
-/** 接收消息段：type、data */
-export interface MilkyIncomingSegment {
-  type: string;
-  data?: Record<string, unknown>;
-}