node-karin 0.3.2 → 0.3.4

package/lib/core/server.js

@@ -85,18 +85,6 @@ export const server = new (class Server {
         logger.mark('[服务器][重启][HTTP] 正在重启HTTP服务器...')
         this.#restartServer()
       })
-      const { enable, WormholeClient } = config.Server.HttpRender
-      if (enable) {
-        this.static()
-        if (WormholeClient) {
-          Wormhole()
-          return this
-        }
-        const { host, post, token } = config.Server.HttpRender
-        /** 注册渲染器 */
-        const rd = new HttpRenderer(host, post, token)
-        render.app({ id: 'puppeteer', type: 'image', render: rd.render.bind(rd) })
-      }
       const renderCfg = config.Server.websocket.render
       if (Array.isArray(renderCfg) && renderCfg.length) {
         for (const url of renderCfg) {
@@ -109,6 +97,18 @@ export const server = new (class Server {
           new OneBot11().client(connect)
         }
       }
+      const { enable, WormholeClient } = config.Server.HttpRender
+      if (enable) {
+        this.static()
+        if (WormholeClient) {
+          Wormhole()
+          return this
+        }
+        const { host, post, token } = config.Server.HttpRender
+        /** 注册渲染器 */
+        const rd = new HttpRenderer(host, post, token)
+        render.app({ id: 'puppeteer', type: 'image', render: rd.render.bind(rd) })
+      }
       return this
     } catch (error) {
       logger.error('初始化HTTP服务器失败: ', error)

package/lib/event/message.handler.js

@@ -45,9 +45,8 @@ export class MessageHandler extends EventHandler {
       if (app.event && !this.filtEvent(app.event)) { continue }
       /** 正则匹配 */
       for (const v of app.rule) {
-        /** 这里的lastIndex是为了防止正则无法从头开始匹配 */
-        v.reg.lastIndex = 0
-        if (v.reg.test(this.e.msg)) {
+        const reg = v.reg
+        if (reg.test(this.e.msg)) {
           /** 检查黑白名单插件 */
           if ('GroupCD' in this.config && !review.PluginEnable(app, this.config)) { continue }
           /** 判断子事件 */

package/lib/types/plugin.d.ts

@@ -21,7 +21,7 @@ export interface PluginRule {
     /**
      * - 命令正则
      */
-    reg: RegExp;
+    reg: string | RegExp;
     /**
      * - 命令执行方法名称
      */

package/lib/utils/button.js

@@ -6,7 +6,6 @@ export const button = async (e) => {
     const info = loader.PluginList[v]
     for (const v of info.button) {
       const reg = v.reg
-      /** 这里的lastIndex是为了防止正则无法从头开始匹配 */
       if (reg.test(e.msg)) {
         try {
           let res

package/lib/utils/handler.d.ts

@@ -28,8 +28,9 @@ export declare const handler: {
      * @param key 事件键
      * @param args 自定义参数 一般用来传递e之类的
      */
-    call(key: string, args?: {
-        e?: EventType<unknown>;
+    call(key: string, args: {
+        [key: string]: any;
+        e?: import("../index.js").KarinMessage | undefined;
     }): Promise<any>;
     /**
      * 检查是否存在指定键的事件处理器

package/lib/utils/handler.js

@@ -65,7 +65,7 @@ export const handler = new (class EventHandler {
      * @param key 事件键
      * @param args 自定义参数 一般用来传递e之类的
      */
-  async call (key, args = {}) {
+  async call (key, args) {
     let res
     for (const v of loader.handlerIds[key] || []) {
       const info = loader.PluginList[v.index]

package/package.json

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