node-karin 0.11.0 → 0.11.2

package/lib/core/plugin/loader.js

@@ -208,19 +208,19 @@ class PluginLoader {
      * @param isNpm - 是否为npm插件
      */
     async loadMain(root, main, isNpm) {
-        const _path = 'file://' + path.resolve(root, main || '');
-        if (!common.exists(_path)) {
+        const _path = path.resolve(root, main || '');
+        if (!common.exists(_path) || !main) {
             if (isNpm)
                 return false;
-            const defRoot = 'file://' + path.resolve(root, 'index.js');
+            const defRoot = path.resolve(root, 'index.js');
             if (common.exists(defRoot)) {
-                await import(defRoot);
+                await import(`file://${defRoot}`);
                 return true;
             }
             logger.debug(`[插件收集][${main}] 入口文件不存在，已忽略`);
             return false;
         }
-        await import(_path);
+        await import(`file://${_path}`);
         return true;
     }
     /**
@@ -337,7 +337,7 @@ class PluginLoader {
                 logger.debug(`载入插件 [${plugin}]${_path ? `${common.getRelPath(_path)}` : ''}[${file}][${Class.name}]`);
                 if (Class.rule.length) {
                     for (const val of Class.rule) {
-                        list.push(() => {
+                        const fnc = async () => {
                             const log = val.log === false
                                 ? (id, log) => logger.debug('mark', id, log)
                                 : (id, log) => logger.bot('mark', id, log);
@@ -354,12 +354,13 @@ class PluginLoader {
                                 rank: val.priority || Class.priority || 10000,
                                 reg: val.reg instanceof RegExp ? val.reg : new RegExp(val.reg),
                             }, Fn);
-                        });
+                        };
+                        list.push(fnc());
                     }
                 }
                 if (Class.task.length) {
                     for (const val of Class.task) {
-                        list.push(() => {
+                        const fnc = async () => {
                             if (!val.name)
                                 throw TypeError(`[${plugin}][${file}] 定时任务name错误`);
                             if (!val.cron)
@@ -373,13 +374,12 @@ class PluginLoader {
                                 log,
                                 cron: val.cron,
                             }, Fn);
-                        });
+                        };
+                        list.push(fnc());
                     }
                 }
                 /** init */
-                list.push(async () => {
-                    'init' in Class && typeof Class.init === 'function' && await Class.init();
-                });
+                list.push('init' in Class && typeof Class.init === 'function' ? Class.init() : Promise.resolve());
                 return true;
             });
             await Promise.all(list);
@@ -461,7 +461,7 @@ class PluginLoader {
                     perm: info.perm,
                     rank: info.rank,
                     reg: info.reg,
-                    type: 'function',
+                    type: App ? 'class' : 'function',
                 });
                 return true;
             }

package/lib/event/handler/message.js

@@ -11,12 +11,11 @@ export class MessageHandler extends EventBaseHandler {
     constructor(e) {
         super(e);
         this.e = e;
-        const cd = this.getCd();
         this.init();
-        if (!cd)
-            return;
         // todo: emit event
         if (this.e.group_id) {
+            if (!this.getCd())
+                return;
             if (!this.getMode())
                 return;
             if (!this.getGroupEnable())

package/lib/event/handler/notice.js

@@ -10,11 +10,10 @@ export class NoticeHandler extends EventBaseHandler {
     constructor(e) {
         super(e);
         this.e = e;
-        const cd = this.getCd();
         this.init();
-        if (!cd)
-            return;
         if (this.e.group_id) {
+            if (!this.getCd())
+                return;
             if (!this.getGroupEnable())
                 return;
             if (!this.getUserEnable())

package/lib/event/handler/request.js

@@ -10,11 +10,10 @@ export class RequestHandler extends EventBaseHandler {
     constructor(e) {
         super(e);
         this.e = e;
-        const cd = this.getCd();
         this.init();
-        if (!cd)
-            return;
         if (this.e.group_id) {
+            if (!this.getCd())
+                return;
             if (!this.getGroupEnable())
                 return;
             if (!this.getUserEnable())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",