@zhin.js/adapter-napcat 1.0.0 → 1.1.0

package/src/bot-ws-client.ts

@@ -1,164 +0,0 @@
-/**
- * NapCat 正向 WebSocket 连接
- */
-import WebSocket from 'ws';
-import { formatCompact } from 'zhin.js';
-import { NapCatBotBase } from './bot-base.js';
-import type { NapCatWsClientConfig, ApiResponse } from './types.js';
-import type { NapCatAdapter } from './adapter.js';
-import { enableTypingIndicator } from './typing-indicator.js';
-
-export class NapCatWsClient extends NapCatBotBase {
-  private ws?: WebSocket;
-  private reconnectTimer?: NodeJS.Timeout;
-  private heartbeatTimer?: NodeJS.Timeout;
-  private requestId = 0;
-  private pendingRequests = new Map<string, {
-    resolve: (value: any) => void;
-    reject: (error: Error) => void;
-    timeout: NodeJS.Timeout;
-  }>();
-
-  declare $config: NapCatWsClientConfig;
-
-  constructor(adapter: NapCatAdapter, config: NapCatWsClientConfig) {
-    super(adapter, config);
-  }
-
-  async $connect(): Promise<void> {
-    return new Promise((resolve, reject) => {
-      const headers: Record<string, string> = {};
-      let url = this.$config.url;
-      if (this.$config.access_token) {
-        headers['Authorization'] = `Bearer ${this.$config.access_token}`;
-        const u = new URL(url);
-        u.searchParams.set('access_token', this.$config.access_token);
-        url = u.toString();
-      }
-      this.ws = new WebSocket(url, { headers });
-
-      this.ws.on('open', () => {
-        this.$connected = true;
-        if (!this.$config.access_token) {
-          this.logger.warn(formatCompact({ bot: this.$id, ok: false, error: 'missing access_token' }));
-        }
-        this.logger.info(formatCompact({ bot: this.$id, mode: 'ws' }));
-        this.startHeartbeat();
-        this.initTypingIndicator();
-        resolve();
-      });
-
-      this.ws.on('message', (data) => {
-        try {
-          this.handleWsMessage(JSON.parse(data.toString()));
-        } catch (error) {
-          this.emit('error', error);
-        }
-      });
-
-      this.ws.on('close', (code, reason) => {
-        this.$connected = false;
-        const reasonStr = reason?.toString?.() || '';
-        const codeHint = code === 1005 ? ' [no status]' : code === 1006 ? ' [abnormal]' : '';
-        this.logger.warn(formatCompact( {
-          op: 'disconnect',
-          bot: this.$id,
-          code,
-          error: reasonStr || 'closed',
-          reconnect_ms: this.$config.reconnect_interval || 5000,
-        }));
-        reject({ code, reason });
-        this.scheduleReconnect();
-      });
-
-      this.ws.on('error', (error) => {
-        this.logger.warn(formatCompact( {
-          op: 'ws_error',
-          bot: this.$id,
-          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; }
-    for (const [, req] of this.pendingRequests) { clearTimeout(req.timeout); req.reject(new Error('Connection closed')); }
-    this.pendingRequests.clear();
-    if (this.ws) { this.ws.close(); this.ws = undefined; }
-    this.inboundDeduper.clear();
-    this.$connected = false;
-  }
-
-  async callApi<T = any>(action: string, params: Record<string, any> = {}): Promise<T> {
-    if (!this.ws || this.ws.readyState !== WebSocket.OPEN) throw new Error('WebSocket is not connected');
-    const echo = `req_${++this.requestId}`;
-    return new Promise((resolve, reject) => {
-      const timeout = setTimeout(() => { this.pendingRequests.delete(echo); reject(new Error(`API call timeout: ${action}`)); }, 30000);
-      this.pendingRequests.set(echo, { resolve, reject, timeout });
-      this.ws!.send(JSON.stringify({ action, params, echo }));
-    });
-  }
-
-  private handleWsMessage(message: any): void {
-    if (message.echo && this.pendingRequests.has(message.echo)) {
-      const req = this.pendingRequests.get(message.echo)!;
-      this.pendingRequests.delete(message.echo);
-      clearTimeout(req.timeout);
-      const resp = message as ApiResponse;
-      if (resp.status === 'ok') return req.resolve(resp.data);
-      return req.reject(new Error(`API error [${resp.retcode}]: ${resp.message || resp.wording || 'unknown'}`));
-    }
-    this.dispatchEvent(message);
-  }
-
-  private startHeartbeat(): void {
-    const interval = this.$config.heartbeat_interval || 30000;
-    this.heartbeatTimer = setInterval(() => {
-      if (this.ws && 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(async () => {
-      this.reconnectTimer = undefined;
-      try { await this.$connect(); } catch { this.scheduleReconnect(); }
-    }, interval);
-  }
-
-  protected handleMeta(event: any): void {
-    if (event.meta_event_type === 'lifecycle' && event.sub_type === 'connect') {
-      this.logger.info(formatCompact({ bot: this.$id, lifecycle: 'connect', self_id: event.self_id }));
-    }
-  }
-
-  private initTypingIndicator(): void {
-    const tiConfig = this.$config.typingIndicator;
-    if (tiConfig && tiConfig.enabled !== false) {
-      enableTypingIndicator(this, {
-        enabled: tiConfig.enabled ?? true,
-        defaultEmoji: tiConfig.defaultEmoji || '128516',
-        autoRemove: true,
-        removeDelay: 5000,
-        privateConfig: tiConfig.privateConfig ? {
-          type: tiConfig.privateConfig.type || 'message',
-          message: tiConfig.privateConfig.message || '正在思考中...',
-          autoRemove: true,
-          removeDelay: 3000,
-        } : undefined,
-        groupConfig: tiConfig.groupConfig ? {
-          type: tiConfig.groupConfig.type || 'reaction',
-          emoji: tiConfig.groupConfig.emoji || '128516',
-          autoRemove: true,
-          removeDelay: 5000,
-        } : undefined,
-      });
-      this.logger.info(formatCompact({ bot: this.$id, typingIndicator: 'enabled' }));
-    }
-  }
-}

package/src/bot-ws-server.ts

@@ -1,150 +0,0 @@
-/**
- * NapCat 反向 WebSocket 连接
- */
-import WebSocket, { WebSocketServer } from 'ws';
-import { formatCompact } from 'zhin.js';
-import type { IncomingMessage } from 'http';
-import { NapCatBotBase } from './bot-base.js';
-import type { NapCatWsServerConfig, ApiResponse } from './types.js';
-import type { NapCatAdapter } from './adapter.js';
-import type { Router } from '@zhin.js/host-router';
-import { enableTypingIndicator } from './typing-indicator.js';
-
-export class NapCatWsServer extends NapCatBotBase {
-  #wss?: WebSocketServer;
-  #clientMap = new Map<string, WebSocket>();
-  private heartbeatTimer?: NodeJS.Timeout;
-  private requestId = 0;
-  private pendingRequests = new Map<string, {
-    resolve: (value: any) => void;
-    reject: (error: Error) => void;
-    timeout: NodeJS.Timeout;
-  }>();
-
-  declare $config: NapCatWsServerConfig;
-
-  constructor(adapter: NapCatAdapter, public router: Router, config: NapCatWsServerConfig) {
-    super(adapter, config);
-  }
-
-  async $connect(): Promise<void> {
-    if (!this.$config.access_token) {
-      this.logger.warn(formatCompact({ bot: this.$id, ok: false, error: 'missing access_token' }));
-    }
-    this.#wss = this.router.ws(this.$config.path, {
-      verifyClient: (info: { origin: string; secure: boolean; req: IncomingMessage }) => {
-        const authorization = info.req.headers['authorization'] || '';
-        if (this.$config.access_token && authorization !== `Bearer ${this.$config.access_token}`) {
-          this.logger.error(`[${this.$id}] auth failed`);
-          return false;
-        }
-        return true;
-      },
-    });
-    this.logger.info(formatCompact( { op: 'listen', bot: this.$id, mode: 'wss', path: this.$config.path }));
-
-    this.#wss.on('connection', (client, req) => {
-      this.startHeartbeat();
-      this.logger.info(formatCompact({ bot: this.$id, peer: req.socket.remoteAddress }));
-
-      client.on('error', (err) => this.logger.warn(formatCompact( {
-        op: 'ws_error',
-        bot: this.$id,
-        ok: false,
-        error: err instanceof Error ? err.message : String(err),
-      })));
-      client.on('close', (code, reason) => {
-        const reasonStr = reason?.toString?.() || '';
-        this.logger.warn(formatCompact( {
-          op: 'disconnect',
-          bot: this.$id,
-          code,
-          error: reasonStr || undefined,
-        }));
-        for (const [key, val] of this.#clientMap) {
-          if (val === client) this.#clientMap.delete(key);
-        }
-        if (this.#clientMap.size === 0) this.$connected = false;
-      });
-      client.on('message', (data) => {
-        try { this.handleWsMessage(client, JSON.parse(data.toString())); } catch (e) { this.emit('error', e); }
-      });
-    });
-  }
-
-  async $disconnect(): Promise<void> {
-    this.#wss?.close();
-    if (this.heartbeatTimer) { clearInterval(this.heartbeatTimer); this.heartbeatTimer = undefined; }
-    for (const [, req] of this.pendingRequests) { clearTimeout(req.timeout); req.reject(new Error('Connection closed')); }
-    this.pendingRequests.clear();
-    this.inboundDeduper.clear();
-    this.$connected = false;
-  }
-
-  async callApi<T = any>(action: string, params: Record<string, any> = {}): Promise<T> {
-    const selfId = this.getFirstSelfId();
-    const client = this.#clientMap.get(selfId);
-    if (!client || client.readyState !== WebSocket.OPEN) throw new Error('WebSocket is not connected');
-    const echo = `req_${++this.requestId}`;
-    return new Promise((resolve, reject) => {
-      const timeout = setTimeout(() => { this.pendingRequests.delete(echo); reject(new Error(`API call timeout: ${action}`)); }, 30000);
-      this.pendingRequests.set(echo, { resolve, reject, timeout });
-      client.send(JSON.stringify({ action, params, echo }));
-    });
-  }
-
-  private getFirstSelfId(): string {
-    const first = this.#clientMap.keys().next().value;
-    if (!first) throw new Error('No NapCat client connected to reverse WS');
-    return first;
-  }
-
-  private handleWsMessage(client: WebSocket, message: any): void {
-    if (message.self_id != null) {
-      const selfIdStr = String(message.self_id);
-      if (!this.#clientMap.has(selfIdStr) || this.#clientMap.get(selfIdStr) !== client) {
-        this.#clientMap.set(selfIdStr, client);
-        if (!this.$connected) this.$connected = true;
-      }
-    }
-    if (message.echo && this.pendingRequests.has(message.echo)) {
-      const req = this.pendingRequests.get(message.echo)!;
-      this.pendingRequests.delete(message.echo);
-      clearTimeout(req.timeout);
-      const resp = message as ApiResponse;
-      if (resp.status === 'ok') return req.resolve(resp.data);
-      return req.reject(new Error(`API error [${resp.retcode}]: ${resp.message || resp.wording || 'unknown'}`));
-    }
-
-    if (message.post_type === 'meta_event' && message.sub_type === 'connect') {
-      this.#clientMap.set(String(message.self_id), client);
-      this.$connected = true;
-      this.logger.info(formatCompact({ bot: this.$id, self_id: message.self_id }));
-      this.initTypingIndicator();
-      return;
-    }
-    this.dispatchEvent(message);
-  }
-
-  private startHeartbeat(): void {
-    if (this.heartbeatTimer) return;
-    const interval = this.$config.heartbeat_interval || 30000;
-    this.heartbeatTimer = setInterval(() => {
-      for (const client of this.#wss?.clients || []) {
-        if (client.readyState === WebSocket.OPEN) client.ping();
-      }
-    }, interval);
-  }
-
-  private initTypingIndicator(): void {
-    const tiConfig = (this.$config as any).typingIndicator;
-    if (tiConfig && tiConfig.enabled !== false) {
-      enableTypingIndicator(this, {
-        enabled: true,
-        defaultEmoji: tiConfig.defaultEmoji || '128516',
-        autoRemove: true,
-        removeDelay: 5000,
-      });
-    }
-  }
-}

package/src/routes.ts

@@ -1,61 +0,0 @@
-import type { Router } from '@zhin.js/host-router';
-import type { NapCatAdapter } from './adapter.js';
-
-export function registerRoutes(router: Router, napcat: NapCatAdapter): void {
-  router.get('/api/napcat/bots', async (ctx) => {
-    try {
-      const bots = Array.from(napcat.bots.values());
-      if (bots.length === 0) {
-        ctx.body = { success: true, data: [], message: '暂无 NapCat 机器人实例' };
-        return;
-      }
-      const result = await Promise.all(
-        bots.map(async (bot) => {
-          try {
-            const connection = (bot.$config as any).connection ?? 'ws';
-            const base: Record<string, unknown> = {
-              name: bot.$config.name,
-              connected: bot.$connected || false,
-              connection,
-              status: bot.$connected ? 'online' : 'offline',
-              lastActivity: new Date().toISOString(),
-            };
-            if (bot.$connected) {
-              try {
-                const friends = await bot.getFriendList();
-                const groups = await bot.getGroupList();
-                base.friendCount = Array.isArray(friends) ? friends.length : 0;
-                base.groupCount = Array.isArray(groups) ? groups.length : 0;
-              } catch {
-                base.friendCount = 0;
-                base.groupCount = 0;
-              }
-            } else {
-              base.friendCount = 0;
-              base.groupCount = 0;
-            }
-            return base;
-          } catch {
-            return {
-              name: bot.$config.name,
-              connected: false,
-              connection: 'unknown',
-              status: 'error',
-              friendCount: 0,
-              groupCount: 0,
-            };
-          }
-        }),
-      );
-      ctx.body = { success: true, data: result, timestamp: new Date().toISOString() };
-    } catch (error) {
-      ctx.status = 500;
-      ctx.body = {
-        success: false,
-        error: 'NAPCAT_API_ERROR',
-        message: '获取机器人数据失败',
-        details: process.env.NODE_ENV === 'development' ? (error as Error).message : undefined,
-      };
-    }
-  });
-}