node-karin 0.3.4 → 0.3.7

package/lib/adapter/onebot/onebot11.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/ws" />
 /// <reference types="node" />
 import WebSocket from 'ws';
 import { IncomingMessage } from 'http';

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/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: {
@@ -35,7 +35,7 @@ export declare const Cfg: {
     change: Map<string, any>;
     watcher: Map<string, any>;
     review: boolean;
-    loggger: import("log4js").Logger;
+    logger: import("log4js").Logger;
     initCfg(): Promise<void>;
     getPlugins(): string[];
     dirPath(name: string, plugins: string[]): Promise<void>;
@@ -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/index.js

@@ -1,3 +1,8 @@
+/// <reference types="@types/express" />
+/// <reference types="@types/lodash" />
+/// <reference types="@types/node" />
+/// <reference types="@types/node-schedule" />
+/// <reference types="@types/ws" />
 // 基本模块
 export * from 'kritor-proto';
 export * from './core/index.js';

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

@@ -1,3 +1,4 @@
+/// <reference types="@types/ws" />
 import WebSocket from 'ws';
 import { RenderBase } from './base.js';
 import { KarinRenderType } from '../types/render.js';

package/lib/render/server.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/ws" />
 /// <reference types="node" />
 import WebSocket from 'ws';
 import { RenderBase } from './base.js';

package/lib/types/adapter.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/ws" />
 /// <reference types="node" />
 import { WebSocket } from 'ws';
 import { IncomingMessage } from 'http';

package/lib/types/render.d.ts

@@ -50,7 +50,7 @@ export interface KarinRenderType {
         /**
          * - 设备像素比
          */
-        deviceScaleFactor?: string;
+        deviceScaleFactor?: number;
     };
     /**
      * - 分页截图 传递数字则视为视窗高度 返回数组

package/lib/utils/config.d.ts

@@ -10,7 +10,7 @@ export declare const config: {
     change: Map<string, any>;
     watcher: Map<string, any>;
     review: boolean;
-    loggger: Logger;
+    logger: Logger;
     /** 初始化配置 */
     initCfg(): Promise<void>;
     getPlugins(): string[];

package/lib/utils/config.js

@@ -10,7 +10,7 @@ export const config = new (class Cfg {
   change
   watcher
   review
-  loggger
+  logger
   constructor () {
     this.dir = karinDir
     this._path = process.cwd() + '/config'
@@ -43,7 +43,7 @@ export const config = new (class Cfg {
     this.dirPath('temp', plugins)
     this.dirPath('resources', plugins)
     this.dirPath('temp/html', plugins)
-    this.loggger = (await import('./logger.js')).default
+    this.logger = (await import('./logger.js')).default
   }
 
   getPlugins () {
@@ -212,7 +212,7 @@ export const config = new (class Cfg {
     /** 监听文件变化 */
     watcher.on('change', () => {
       this.change.delete(key)
-      this.loggger.mark(`[修改配置文件][${type}][${name}]`)
+      this.logger.mark(`[修改配置文件][${type}][${name}]`)
       /** 文件修改后调用对应的方法 */
       switch (`change_${name}`) {
         case 'change_App':
@@ -236,7 +236,7 @@ export const config = new (class Cfg {
 
   async change_config () {
     /** 修改日志等级 */
-    this.loggger.level = this.Config.log4jsCfg.level
+    this.logger.level = this.Config.log4jsCfg.level
     await this.#review()
     if (this.Server.HotUpdate) {
       const { Bot } = await import('../index.js')

package/lib/utils/kritor-proto.d.ts

@@ -0,0 +1 @@
+declare module 'kritor-proto'

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,9 +1,10 @@
 {
   "name": "node-karin",
-  "version": "0.3.4",
+  "version": "0.3.7",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",
+  "types": "./lib/index.d.ts",
   "bugs": {
     "url": "https://github.com/KarinJS/Karin/issues"
   },
@@ -26,6 +27,8 @@
     "/lib/**/*.d.ts",
     "/config/defSet/*.yaml",
     "/config/view/*.yaml",
+    "modules.js",
+    "modules.d.ts",
     "LICENSE",
     "package.json",
     "README.md"
@@ -35,7 +38,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 && cp ./src/utils/kritor-proto.d.ts ./lib/utils/kritor-proto.d.ts",
     "delete": "pm2 delete ./config/config/pm2.yaml",
     "fix": "eslint lib/**/*.js --fix",
     "fix:all": "eslint lib/**/*.js --fix && eslint src/**/*.ts --fix",