@zhin.js/adapter-napcat 1.0.0 → 2.0.0

package/src/{bot-http.ts → endpoint-http.ts}

@@ -4,14 +4,14 @@
  * 入站：挂载 webhook 路由接收 NapCat 的 HTTP POST 事件上报
  */
 import { formatCompact } from 'zhin.js';
-import { NapCatBotBase } from './bot-base.js';
+import { NapCatEndpointBase } from './endpoint-base.js';
 import type { NapCatHttpConfig, ApiResponse } from './types.js';
 import type { NapCatAdapter } from './adapter.js';
 import { registerFetchRoute, type Router, type RouterContext } from '@zhin.js/host-router/router';
 import * as crypto from 'crypto';
 import { enableTypingIndicator } from './typing-indicator.js';
 
-export class NapCatHttpBot extends NapCatBotBase {
+export class NapCatHttpEndpoint extends NapCatEndpointBase {
   private pollTimer?: NodeJS.Timeout;
 
   declare $config: NapCatHttpConfig;
@@ -26,7 +26,7 @@ export class NapCatHttpBot extends NapCatBotBase {
     this.startPoll();
     this.$connected = true;
     this.initTypingIndicator();
-    this.logger.info(formatCompact({ bot: this.$id, mode: 'http' }));
+    this.logger.info(formatCompact({ endpoint: this.$id, mode: 'http' }));
   }
 
   async $disconnect(): Promise<void> {
@@ -69,10 +69,10 @@ export class NapCatHttpBot extends NapCatBotBase {
       ctx.status = 204;
       ctx.body = '';
       try { this.dispatchEvent(body); } catch (e) {
-        this.logger.warn(formatCompact( { op: 'recv', bot: this.$id, ok: false, error: String(e) }));
+        this.logger.warn(formatCompact( { op: 'recv', endpoint: this.$id, ok: false, error: String(e) }));
       }
     });
-    this.logger.info(formatCompact( { op: 'webhook', bot: this.$id, path: postPath }));
+    this.logger.info(formatCompact( { op: 'webhook', endpoint: this.$id, path: postPath }));
   }
 
   private async checkConnection(): Promise<void> {
@@ -90,7 +90,7 @@ export class NapCatHttpBot extends NapCatBotBase {
         await this.callApi('get_status');
       } catch {
         this.$connected = false;
-        this.logger.warn(formatCompact( { op: 'heartbeat', bot: this.$id, ok: false }));
+        this.logger.warn(formatCompact( { op: 'heartbeat', endpoint: this.$id, ok: false }));
       }
     }, interval);
   }

package/src/{bot-ws-client.ts → endpoint-ws-client.ts}

@@ -3,12 +3,12 @@
  */
 import WebSocket from 'ws';
 import { formatCompact } from 'zhin.js';
-import { NapCatBotBase } from './bot-base.js';
+import { NapCatEndpointBase } from './endpoint-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 {
+export class NapCatWsClient extends NapCatEndpointBase {
   private ws?: WebSocket;
   private reconnectTimer?: NodeJS.Timeout;
   private heartbeatTimer?: NodeJS.Timeout;
@@ -40,9 +40,9 @@ export class NapCatWsClient extends NapCatBotBase {
       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.warn(formatCompact({ endpoint: this.$id, ok: false, error: 'missing access_token' }));
         }
-        this.logger.info(formatCompact({ bot: this.$id, mode: 'ws' }));
+        this.logger.info(formatCompact({ endpoint: this.$id, mode: 'ws' }));
         this.startHeartbeat();
         this.initTypingIndicator();
         resolve();
@@ -62,7 +62,7 @@ export class NapCatWsClient extends NapCatBotBase {
         const codeHint = code === 1005 ? ' [no status]' : code === 1006 ? ' [abnormal]' : '';
         this.logger.warn(formatCompact( {
           op: 'disconnect',
-          bot: this.$id,
+          endpoint: this.$id,
           code,
           error: reasonStr || 'closed',
           reconnect_ms: this.$config.reconnect_interval || 5000,
@@ -74,7 +74,7 @@ export class NapCatWsClient extends NapCatBotBase {
       this.ws.on('error', (error) => {
         this.logger.warn(formatCompact( {
           op: 'ws_error',
-          bot: this.$id,
+          endpoint: this.$id,
           ok: false,
           error: error instanceof Error ? error.message : String(error),
         }));
@@ -133,7 +133,7 @@ export class NapCatWsClient extends NapCatBotBase {
 
   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 }));
+      this.logger.info(formatCompact({ endpoint: this.$id, lifecycle: 'connect', self_id: event.self_id }));
     }
   }
 
@@ -158,7 +158,7 @@ export class NapCatWsClient extends NapCatBotBase {
           removeDelay: 5000,
         } : undefined,
       });
-      this.logger.info(formatCompact({ bot: this.$id, typingIndicator: 'enabled' }));
+      this.logger.info(formatCompact({ endpoint: this.$id, typingIndicator: 'enabled' }));
     }
   }
 }

package/src/{bot-ws-server.ts → endpoint-ws-server.ts}

@@ -4,13 +4,13 @@
 import WebSocket, { WebSocketServer } from 'ws';
 import { formatCompact } from 'zhin.js';
 import type { IncomingMessage } from 'http';
-import { NapCatBotBase } from './bot-base.js';
+import { NapCatEndpointBase } from './endpoint-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 {
+export class NapCatWsServer extends NapCatEndpointBase {
   #wss?: WebSocketServer;
   #clientMap = new Map<string, WebSocket>();
   private heartbeatTimer?: NodeJS.Timeout;
@@ -29,7 +29,7 @@ export class NapCatWsServer extends NapCatBotBase {
 
   async $connect(): Promise<void> {
     if (!this.$config.access_token) {
-      this.logger.warn(formatCompact({ bot: this.$id, ok: false, error: 'missing access_token' }));
+      this.logger.warn(formatCompact({ endpoint: this.$id, ok: false, error: 'missing access_token' }));
     }
     this.#wss = this.router.ws(this.$config.path, {
       verifyClient: (info: { origin: string; secure: boolean; req: IncomingMessage }) => {
@@ -41,15 +41,15 @@ export class NapCatWsServer extends NapCatBotBase {
         return true;
       },
     });
-    this.logger.info(formatCompact( { op: 'listen', bot: this.$id, mode: 'wss', path: this.$config.path }));
+    this.logger.info(formatCompact( { op: 'listen', endpoint: 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 }));
+      this.logger.info(formatCompact({ endpoint: this.$id, peer: req.socket.remoteAddress }));
 
       client.on('error', (err) => this.logger.warn(formatCompact( {
         op: 'ws_error',
-        bot: this.$id,
+        endpoint: this.$id,
         ok: false,
         error: err instanceof Error ? err.message : String(err),
       })));
@@ -57,7 +57,7 @@ export class NapCatWsServer extends NapCatBotBase {
         const reasonStr = reason?.toString?.() || '';
         this.logger.warn(formatCompact( {
           op: 'disconnect',
-          bot: this.$id,
+          endpoint: this.$id,
           code,
           error: reasonStr || undefined,
         }));
@@ -119,7 +119,7 @@ export class NapCatWsServer extends NapCatBotBase {
     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.logger.info(formatCompact({ endpoint: this.$id, self_id: message.self_id }));
       this.initTypingIndicator();
       return;
     }

package/src/index.ts

@@ -10,6 +10,7 @@ import {
   type Context,
   type IGroupManagement,
   createGroupManagementTools,
+  registerDefaultGroupPlatformPermitChecker,
   type ToolFeature,
   registerAgentPromptContributor,
   unregisterAgentPromptContributor,
@@ -22,11 +23,11 @@ import { createNapCatAgentPromptContributor } from './agent-prompt.js';
 import { registerRoutes } from './routes.js';
 
 export * from './types.js';
-export { NapCatWsClient } from './bot-ws-client.js';
-export { NapCatWsServer } from './bot-ws-server.js';
-export { NapCatHttpBot } from './bot-http.js';
-export { NapCatAdapter, type NapCatBot } from './adapter.js';
-export { NapCatBotBase } from './bot-base.js';
+export { NapCatWsClient } from './endpoint-ws-client.js';
+export { NapCatWsServer } from './endpoint-ws-server.js';
+export { NapCatHttpEndpoint } from './endpoint-http.js';
+export { NapCatAdapter, type NapCatEndpoint } from './adapter.js';
+export { NapCatEndpointBase } from './endpoint-base.js';
 export {
   NapCatTypingIndicatorManager,
   enableTypingIndicator,
@@ -67,6 +68,7 @@ provide({
 // ── AI 工具注册 ────────────────────────────────────────────────────
 useContext('tool', 'napcat', (toolService: ToolFeature, napcat: NapCatAdapter) => {
   const disposers: (() => void)[] = [];
+  disposers.push(registerDefaultGroupPlatformPermitChecker('napcat'));
 
   const groupTools = createGroupManagementTools(
     napcat as unknown as IGroupManagement,

package/src/routes.ts

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