node-karin 0.3.3 → 0.3.5

package/lib/core/listener.d.ts

@@ -94,8 +94,8 @@ export declare const listener: {
      * @param options.retry_count - 重试次数
      */
     sendMsg(uid: string, contact: contact, elements: KarinElement, options?: {
-        recallMsg: number;
-        retry_count: number;
+        recallMsg?: number;
+        retry_count?: number;
     }): Promise<{
         message_id: string;
     }>;

package/lib/core/listener.js

@@ -178,7 +178,7 @@ export const listener = new (class Listeners extends EventEmitter {
       logger.bot('error', self_id, error)
     }
     /** 快速撤回 */
-    if (bot.RecallMessage && recallMsg > 0 && result?.message_id) {
+    if (recallMsg && bot.RecallMessage && recallMsg > 0 && result?.message_id) {
       setTimeout(() => bot.RecallMessage(contact, result.message_id), recallMsg * 1000)
     }
     return result

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/index.d.ts

@@ -25,7 +25,7 @@ export declare const Renderer: {
     }): number;
     unapp(index: number): boolean;
     App(id?: string): import("./types/index.js").KarinRenderApp;
-    render(options: import("./types/index.js").KarinRenderType, id: string): Promise<string | string[]>;
+    render(options: import("./types/index.js").KarinRenderType, id?: string | undefined): Promise<string | string[]>;
     renderHtml(data: string): Promise<string | string[]>;
 };
 export declare const Cfg: {
@@ -92,8 +92,8 @@ export declare const Bot: {
         path: string;
     }[] | (new () => import("./types/index.js").KarinAdapter)[];
     sendMsg(uid: string, contact: import("./types/index.js").contact, elements: import("./types/index.js").KarinElement, options?: {
-        recallMsg: number;
-        retry_count: number;
+        recallMsg?: number | undefined;
+        retry_count?: number | undefined;
     }): Promise<{
         message_id: string;
     }>;

package/lib/render/app.d.ts

@@ -31,7 +31,7 @@ declare class Renderer {
     /**
      * 调用标准渲染器
      */
-    render(options: KarinRenderType, id: string): Promise<string | string[]>;
+    render(options: KarinRenderType, id?: string): Promise<string | string[]>;
     /**
      * 快速渲染
      * @param data html路径、http地址

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/modules.d.ts

@@ -0,0 +1,14 @@
+import fs from 'fs';
+import path from 'path';
+import ws from 'ws';
+import moment from 'moment';
+import lodash from 'lodash';
+import express from 'express';
+import axios from 'axios';
+import chalk from 'chalk';
+import chokidar from 'chokidar';
+import { Level as level } from 'level';
+import schedule from 'node-schedule';
+import yaml from 'yaml';
+import log4js from 'log4js';
+export { fs, ws, path, axios, lodash, moment, express, chalk, chokidar, level, schedule, yaml, log4js, };

package/modules.js

@@ -0,0 +1,14 @@
+import fs from 'fs';
+import path from 'path';
+import ws from 'ws';
+import moment from 'moment';
+import lodash from 'lodash';
+import express from 'express';
+import axios from 'axios';
+import chalk from 'chalk';
+import chokidar from 'chokidar';
+import { Level as level } from 'level';
+import schedule from 'node-schedule';
+import yaml from 'yaml';
+import log4js from 'log4js';
+export { fs, ws, path, axios, lodash, moment, express, chalk, chokidar, level, schedule, yaml, log4js, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",
@@ -26,6 +26,8 @@
     "/lib/**/*.d.ts",
     "/config/defSet/*.yaml",
     "/config/view/*.yaml",
+    "modules.js",
+    "modules.d.ts",
     "LICENSE",
     "package.json",
     "README.md"
@@ -35,7 +37,8 @@
   ],
   "scripts": {
     "app": "node .",
-    "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json && npm run fix",
+    "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json && npm run fix && npm run cp",
+    "cp": "cp ./lib/modules.d.ts ./modules.d.ts && cp ./lib/modules.js ./modules.js",
     "delete": "pm2 delete ./config/config/pm2.yaml",
     "fix": "eslint lib/**/*.js --fix",
     "fix:all": "eslint lib/**/*.js --fix && eslint src/**/*.ts --fix",