node-karin 0.2.2 → 0.3.1

package/lib/core/listener.js

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'events'
-import { PluginLoader } from './plugin.loader.js'
+import { pluginLoader } from './plugin.loader.js'
 import { common, logger, config } from '../utils/index.js'
 import { MessageHandler } from '../event/message.handler.js'
 /**
@@ -24,7 +24,7 @@ export const listener = new (class Listeners extends EventEmitter {
     this.list = []
     this.adapter = []
     this.on('error', data => logger.error(data))
-    this.on('plugin', () => PluginLoader.load())
+    this.on('load.plugin', () => pluginLoader.load())
     this.on('adapter', data => {
       let path = data.path || '无'
       if (path && data.type !== 'grpc') { path = `ws://127.0.0.1:/${config.Server.http.port}${data.path}` }
@@ -164,9 +164,9 @@ export const listener = new (class Listeners extends EventEmitter {
     const reply_log = common.makeMessageLog(NewElements)
     const self_id = bot.account.uid || bot.account.uin
     if (contact.scene === 'group') {
-      logger.bot('info', self_id, `Send Proactive Group ${contact.peer}: ${reply_log}`)
+      logger.bot('info', self_id, `${logger.green('Send Proactive Group')} ${contact.peer}: ${reply_log}`)
     } else {
-      logger.bot('info', self_id, `Send Proactive private ${contact.peer}: ${reply_log}`)
+      logger.bot('info', self_id, `${logger.green('Send Proactive private')} ${contact.peer}: ${reply_log}`)
     }
     try {
       this.emit('karin:count:send', 1)

package/lib/core/plugin.d.ts

@@ -1,11 +1,11 @@
-import { PluginType as PluginType, KarinElement, KarinNodeElement, E } from '../types/index.js';
+import { PluginType, KarinElement, KarinNodeElement, EventType } from '../types/index.js';
 /**
  * 插件基类
  */
 export declare class Plugin implements PluginType {
-    e: PluginType['e'];
+    e: EventType<this>;
     init?: () => void;
-    accept?: (e: E) => Promise<void>;
+    accept?: (e: EventType<this>) => Promise<void>;
     replyCallback: PluginType['replyCallback'];
     /**
      * @param name - 插件名称
@@ -25,7 +25,7 @@ export declare class Plugin implements PluginType {
      */
     event: PluginType['event'];
     /**
-     * @param priority - 优先级 默认5000
+     * @param priority - 优先级 默认10000
      */
     priority: PluginType['priority'];
     /**
@@ -70,7 +70,7 @@ export declare class Plugin implements PluginType {
          */
         event?: PluginType['event'];
         /**
-         * - 优先级 默认为5000
+         * - 优先级 默认为10000
          */
         priority?: PluginType['priority'];
         /**

package/lib/core/plugin.js

@@ -2,6 +2,7 @@
  * 插件基类
  */
 export class Plugin {
+  // 类型 需要根据e中的event类型来确定
   e
   init
   accept
@@ -24,7 +25,7 @@ export class Plugin {
      */
   event
   /**
-     * @param priority - 优先级 默认5000
+     * @param priority - 优先级 默认10000
      */
   priority
   /**
@@ -51,7 +52,7 @@ export class Plugin {
      * @param timeout - 上下文超时
      */
   timeout
-  constructor ({ name, dsc = name, desc = name, event = 'message', priority = 5000, task = [], rule = [], handler = [], button = [] }) {
+  constructor ({ name, dsc = name, desc = name, event = 'message', priority = 10000, task = [], rule = [], handler = [], button = [] }) {
     this.name = name
     this.dsc = dsc
     this.desc = desc

package/lib/core/plugin.loader.d.ts

@@ -1,30 +1,52 @@
-import path from 'path';
 import chokidar from 'chokidar';
 import schedule from 'node-schedule';
 import { Plugin } from './plugin.js';
-import { PluginType as PluginType, PluginApps, PluginTask, dirName, fileName, AppInfo } from '../types/index.js';
+import { PluginApps, PluginTask, dirName, fileName, AppInfo } from '../types/index.js';
 /**
  * 加载插件
  */
-export declare const PluginLoader: {
+export declare const pluginLoader: {
     dir: './plugins';
     dirPath: string;
+    /**
+     * - 插件索引ID
+     */
+    index: number;
+    /**
+     * - 命令插件索引列表
+     */
+    ruleIds: Array<number>;
+    buttonIds: Array<number>;
+    /**
+     * - handler
+     */
+    handlerIds: {
+        [key: string]: {
+            index: string;
+            fnc: string | Function;
+            priority: number;
+        }[];
+    };
     /**
      * - 插件列表
      */
-    Apps: Array<PluginApps>;
+    FileList: Array<AppInfo>;
+    /**
+     * - 是否ts环境
+     */
+    isTs: boolean;
+    /**
+     * - 最终缓存的插件列表 通过index索引
+     */
+    PluginList: {
+        [key: string]: PluginApps;
+    };
     /**
      * - 定时任务
      */
     task: Array<PluginTask & {
         App: new () => Plugin;
-        /**
-         * - 定时任务
-         */
         schedule?: schedule.Job;
-        /**
-         * - 文件信息
-         */
         file: {
             dir: dirName;
             name: fileName;
@@ -41,17 +63,6 @@ export declare const PluginLoader: {
         dir: dirName;
         name?: fileName;
     }>;
-    /**
-     * - 插件索引ID
-     */
-    index: number;
-    /**
-     * - 命令插件索引列表
-     */
-    rule: Array<number>;
-    PluginList: {
-        [key: string]: PluginApps;
-    };
     /**
      * 插件初始化
      */
@@ -59,67 +70,24 @@ export declare const PluginLoader: {
     /**
      * 获取所有插件
      */
-    getPlugins(): AppInfo[];
+    getPlugins(): void;
+    /**
+     * 传入路径 语言环境 返回加载index.ts 还是 index.js
+     * @param path - 插件路径
+     * @param lang - 语言环境
+     */
+    getIndex(path: string, lang: 'js' | 'ts'): string | boolean;
     /**
      * 获取指定文件夹下的所有插件
      * @param dir - 插件包名称
      * @param isTs - 是否获取ts插件
      */
-    getApps(dir: dirName, isTs?: boolean): AppInfo[];
-    /**
-     * 构建插件信息
-     */
-    App(App: new () => Plugin, Class: PluginType, file: {
-        /**
-         * - 插件根目录名称
-         * - 例如: karin-plugin-example
-         * - 例如: karin-plugin-example/apps
-         */
-        dir: string;
-        /**
-         * - 插件名称
-         * - 例如: index.js
-         */
-        name: string;
-        /**
-         * - 插件相对路径
-         * - 从插件根目录开始
-         */
-        path: string;
-    }): {
-        App: new () => Plugin;
-        /** 插件文件信息 */
-        file: {
-            /**
-             * - 插件根目录名称
-             * - 例如: karin-plugin-example
-             * - 例如: karin-plugin-example/apps
-             */
-            dir: string;
-            /**
-             * - 插件名称
-             * - 例如: index.js
-             */
-            name: string;
-            /**
-             * - 插件相对路径
-             * - 从插件根目录开始
-             */
-            path: string;
-        };
-        name: string;
-        desc: string;
-        event: import("../types/index.js").Event | "message.group_message" | "message.friend_message" | "message.guild_message" | "message.nearby" | "message.stranger" | "message.stranger_from_group" | "message.friend_apply" | "message.group_apply" | "message.invited_group" | "message.friend_poke" | "message.friend_recall" | "message.friend_file_uploaded" | "message.group_poke" | "message.group_card_changed" | "message.group_member_unique_title_changed" | "message.group_essence_changed" | "message.group_recall" | "message.group_member_increase" | "message.group_member_decrease" | "message.group_admin_changed" | "message.group_member_ban" | "message.group_sign" | "message.group_whole_ban" | "message.group_file_uploaded" | "request.group_message" | "request.friend_message" | "request.guild_message" | "request.nearby" | "request.stranger" | "request.stranger_from_group" | "request.friend_apply" | "request.group_apply" | "request.invited_group" | "request.friend_poke" | "request.friend_recall" | "request.friend_file_uploaded" | "request.group_poke" | "request.group_card_changed" | "request.group_member_unique_title_changed" | "request.group_essence_changed" | "request.group_recall" | "request.group_member_increase" | "request.group_member_decrease" | "request.group_admin_changed" | "request.group_member_ban" | "request.group_sign" | "request.group_whole_ban" | "request.group_file_uploaded" | "notice.group_message" | "notice.friend_message" | "notice.guild_message" | "notice.nearby" | "notice.stranger" | "notice.stranger_from_group" | "notice.friend_apply" | "notice.group_apply" | "notice.invited_group" | "notice.friend_poke" | "notice.friend_recall" | "notice.friend_file_uploaded" | "notice.group_poke" | "notice.group_card_changed" | "notice.group_member_unique_title_changed" | "notice.group_essence_changed" | "notice.group_recall" | "notice.group_member_increase" | "notice.group_member_decrease" | "notice.group_admin_changed" | "notice.group_member_ban" | "notice.group_sign" | "notice.group_whole_ban" | "notice.group_file_uploaded" | "meta_event.group_message" | "meta_event.friend_message" | "meta_event.guild_message" | "meta_event.nearby" | "meta_event.stranger" | "meta_event.stranger_from_group" | "meta_event.friend_apply" | "meta_event.group_apply" | "meta_event.invited_group" | "meta_event.friend_poke" | "meta_event.friend_recall" | "meta_event.friend_file_uploaded" | "meta_event.group_poke" | "meta_event.group_card_changed" | "meta_event.group_member_unique_title_changed" | "meta_event.group_essence_changed" | "meta_event.group_recall" | "meta_event.group_member_increase" | "meta_event.group_member_decrease" | "meta_event.group_admin_changed" | "meta_event.group_member_ban" | "meta_event.group_sign" | "meta_event.group_whole_ban" | "meta_event.group_file_uploaded" | "message_sent.group_message" | "message_sent.friend_message" | "message_sent.guild_message" | "message_sent.nearby" | "message_sent.stranger" | "message_sent.stranger_from_group" | "message_sent.friend_apply" | "message_sent.group_apply" | "message_sent.invited_group" | "message_sent.friend_poke" | "message_sent.friend_recall" | "message_sent.friend_file_uploaded" | "message_sent.group_poke" | "message_sent.group_card_changed" | "message_sent.group_member_unique_title_changed" | "message_sent.group_essence_changed" | "message_sent.group_recall" | "message_sent.group_member_increase" | "message_sent.group_member_decrease" | "message_sent.group_admin_changed" | "message_sent.group_member_ban" | "message_sent.group_sign" | "message_sent.group_whole_ban" | "message_sent.group_file_uploaded";
-        priority: number;
-        accept: boolean;
-        rule: import("../types/index.js").PluginRule[];
-        type: "function" | "class";
-        task: PluginTask[];
-        handler: import("../types/index.js").PluginHandler[];
-        button: import("../types/index.js").PluginButton[];
-    };
-    /** 排序 */
-    orderBy(): void;
+    getApps(dir: dirName, isTs: boolean): void;
+    /**
+     * 排序并打印插件加兹安信息
+     * @param isPrint - 是否打印
+     */
+    orderBy(isPrint?: boolean): void;
     /**
      * 新增插件
      * @param dir - 插件包路径
@@ -131,12 +99,6 @@ export declare const PluginLoader: {
      * 卸载插件
      */
     uninstallApp(dir: dirName, name: fileName): void;
-    /** 创建定时任务 */
-    creatTask(): Promise<void>;
-    /**
-     * 卸载定时任务
-     */
-    uninstallTask(dir: dirName, name: fileName): void;
     /**
      * 监听单个文件热更新
      */
@@ -144,5 +106,5 @@ export declare const PluginLoader: {
     /**
      * 监听文件夹更新
      */
-    watchDir(dir: dirName): void;
+    watchDir(dir: dirName): Promise<true | undefined>;
 };