hotcat-bot-qq 0.1.5 → 0.1.6

package/dist/botConsole.d.ts

@@ -13,7 +13,7 @@ export type NoticeEvent = Record<string, any> & {
     sub_type?: string;
 };
 /** BotConsole 日志分类 */
-export type BotConsoleType = 'system' | 'groupMessage' | 'privateMessage' | 'error' | 'sendGroupMessage' | 'sendPrivateMessage' | 'groupMessageSelf' | 'privateMessageSelf' | 'requestFriend' | 'requestGroupAdd' | 'requestGroupInvite' | 'notice';
+export type BotConsoleType = 'system' | 'groupMessage' | 'privateMessage' | 'error' | 'sendGroupMessage' | 'sendPrivateMessage' | 'groupMessageSelf' | 'privateMessageSelf' | 'requestFriend' | 'requestGroupAdd' | 'requestGroupInvite' | 'notice' | 'plugin';
 /** ANSI 颜色/样式码 */
 export declare const colors: {
     reset: string;
@@ -66,7 +66,13 @@ export declare const formatMessage: (m: Message) => string;
  */
 export declare class BotConsole {
     type: BotConsoleType;
-    content: string | GroupMessage | GroupMessageSelf | PrivateMessage | PrivateMessageSelf | Message[] | RequestFriend | RequestGroupAdd | RequestGroupInvite | NoticeEvent;
-    constructor(type: BotConsoleType, content: string | GroupMessage | GroupMessageSelf | PrivateMessage | PrivateMessageSelf | Message[] | RequestFriend | RequestGroupAdd | RequestGroupInvite | NoticeEvent);
+    content: string | GroupMessage | GroupMessageSelf | PrivateMessage | PrivateMessageSelf | Message[] | RequestFriend | RequestGroupAdd | RequestGroupInvite | NoticeEvent | {
+        name: string;
+        msg: string;
+    };
+    constructor(type: BotConsoleType, content: string | GroupMessage | GroupMessageSelf | PrivateMessage | PrivateMessageSelf | Message[] | RequestFriend | RequestGroupAdd | RequestGroupInvite | NoticeEvent | {
+        name: string;
+        msg: string;
+    });
     log(): void;
 }

package/dist/botConsole.js

@@ -293,5 +293,9 @@ export class BotConsole {
                 ('name_new' in event ? `${colors.green}${sanitize(event.name_new)}${colors.reset}` : '') +
                 ('file' in event ? `文件:${event.file.name}` : ''));
         }
+        else if (this.type === 'plugin') {
+            const { name, msg } = this.content;
+            console.log(`${colors.magenta}[plugin:${name}]:${colors.reset} ${msg}`);
+        }
     }
 }

package/dist/botPlugin.d.ts

@@ -49,6 +49,7 @@ export declare class BotPluginSystem {
     list(): string[];
     /** 返回所有已加载的插件名列表 */
     loaded(): string[];
+    private findIndex;
     /**
      * 扫描目录，自动注册并加载所有插件
      * @param dir - 插件目录路径

package/dist/botPlugin.js

@@ -70,7 +70,7 @@ export class BotPluginSystem {
             throw new Error(`插件 "${name}" 已注册`);
         }
         this.registry.set(name, { ctor, meta });
-        new BotConsole('system', `插件 "${meta.name}" 已注册`).log();
+        new BotConsole('plugin', { name: meta.name, msg: '已注册' }).log();
     }
     /**
      * 加载插件
@@ -87,7 +87,7 @@ export class BotPluginSystem {
         const instance = record.ctor.create(this.api, this.client, record.meta);
         await instance.load();
         this.instances.set(name, instance);
-        new BotConsole('system', `插件 "${record.meta.name}" 已加载`).log();
+        new BotConsole('plugin', { name: record.meta.name, msg: '已加载' }).log();
     }
     /**
      * 卸载插件
@@ -100,7 +100,7 @@ export class BotPluginSystem {
         }
         await instance.unload();
         this.instances.delete(name);
-        new BotConsole('system', `插件 "${name}" 已卸载`).log();
+        new BotConsole('plugin', { name: this.registry.get(name)?.meta.name || name, msg: '已卸载' }).log();
     }
     /**
      * 热重载：先卸载再加载
@@ -122,6 +122,15 @@ export class BotPluginSystem {
     loaded() {
         return Array.from(this.instances.keys());
     }
+    findIndex(dir, name) {
+        const js = path.join(dir, name, 'index.js');
+        if (fs.existsSync(js))
+            return js;
+        const ts = path.join(dir, name, 'index.ts');
+        if (fs.existsSync(ts))
+            return ts;
+        return null;
+    }
     /**
      * 扫描目录，自动注册并加载所有插件
      * @param dir - 插件目录路径
@@ -137,8 +146,8 @@ export class BotPluginSystem {
             if (!entry.isDirectory())
                 continue;
             const name = entry.name;
-            const indexPath = path.join(dir, name, 'index.ts');
-            if (!fs.existsSync(indexPath))
+            const indexPath = this.findIndex(dir, name);
+            if (!indexPath)
                 continue;
             try {
                 const mod = await import(path.resolve(indexPath));
@@ -179,7 +188,7 @@ export class BotPluginSystem {
             return;
         }
         this.watched = new Set(this.list());
-        new BotConsole('system', `开始监听插件目录: ${this.watchDir}`).log();
+        new BotConsole('plugin', { name: 'watch', msg: `开始监听 ${this.watchDir}` }).log();
         this.watcher = setInterval(async () => {
             if (!fs.existsSync(this.watchDir))
                 return;
@@ -189,8 +198,8 @@ export class BotPluginSystem {
                 if (!entry.isDirectory())
                     continue;
                 const name = entry.name;
-                const indexPath = path.join(this.watchDir, name, 'index.ts');
-                if (!fs.existsSync(indexPath))
+                const indexPath = this.findIndex(this.watchDir, name);
+                if (!indexPath)
                     continue;
                 current.add(name);
                 if (!this.watched.has(name)) {
@@ -199,12 +208,13 @@ export class BotPluginSystem {
             }
             for (const name of Array.from(this.watched)) {
                 if (!current.has(name) && this.registry.has(name)) {
+                    const displayName = this.registry.get(name)?.meta.name || name;
                     try {
                         if (this.instances.has(name)) {
                             await this.unload(name);
                         }
                         this.registry.delete(name);
-                        new BotConsole('system', `插件 "${name}" 目录已删除，已移除`).log();
+                        new BotConsole('plugin', { name: displayName, msg: '目录已删除，已移除' }).log();
                     }
                     catch { }
                 }
@@ -218,11 +228,13 @@ export class BotPluginSystem {
             clearInterval(this.watcher);
             this.watcher = null;
             this.watchDir = null;
-            new BotConsole('system', '已停止插件目录监听').log();
+            new BotConsole('plugin', { name: 'watch', msg: '已停止' }).log();
         }
     }
     async scanOne(dir, name) {
-        const indexPath = path.join(dir, name, 'index.ts');
+        const indexPath = this.findIndex(dir, name);
+        if (!indexPath)
+            return;
         try {
             const mod = await import(indexPath);
             const ctor = mod[name.charAt(0).toUpperCase() + name.slice(1) + 'Plugin'] || mod.default || Object.values(mod).find((v) => typeof v === 'function' && v.create);
@@ -234,7 +246,7 @@ export class BotPluginSystem {
             };
             this.register(name, ctor, meta);
             await this.load(name);
-            new BotConsole('system', `检测到新插件 "${name}"，已自动加载`).log();
+            new BotConsole('plugin', { name: meta.name, msg: '已自动加载' }).log();
         }
         catch (e) {
             new BotConsole('error', `自动加载插件 "${name}" 失败: ${e.message || e}`).log();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hotcat-bot-qq",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "基于 node-napcat-ts 的 TypeScript QQ 机器人框架",
   "type": "module",
   "main": "dist/index.js",

package/plugins/hotCatPlugin/index.ts

@@ -7,7 +7,7 @@ import * as os from 'os'
 export class HotCatPlugin extends PluginBase {
     static meta = {
         name: 'hotCatPlugin',
-        version: '0.1.5',
+        version: '0.1.6',
         description: 'HotCat 默认插件（#hotCat 指令查询 bot 状态）',
         author: 'CHCAT1320',
     }