node-karin 0.3.5 → 0.3.8

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

@@ -4,7 +4,7 @@ import { KarinAdapter, contact, KarinElement } from '../types/index.js';
 /**
  * 监听器管理
  */
-export declare const listener: {
+declare class Listeners extends EventEmitter {
     /**
      * Bot索引
      * @type - Bot索引
@@ -24,6 +24,7 @@ export declare const listener: {
         adapter: new () => KarinAdapter;
         path: string;
     }>;
+    constructor();
     /**
      * 注册Bot 返回索引id
      */
@@ -80,7 +81,7 @@ export declare const listener: {
      * @param isType - 是否返回包含的类型列表 默认返回适配器实例列表
      */
     getAdapterAll(isType?: boolean): {
-        type: KarinAdapter['adapter']['type'];
+        type: "internal" | "http" | "grpc" | "ws" | "render";
         adapter: new () => KarinAdapter;
         path: string;
     }[] | (new () => KarinAdapter)[];
@@ -99,20 +100,6 @@ export declare const listener: {
     }): Promise<{
         message_id: string;
     }>;
-    [EventEmitter.captureRejectionSymbol]?<K>(error: Error, event: string | symbol, ...args: any[]): void;
-    addListener<K_1>(eventName: string | symbol, listener: (...args: any[]) => void): any;
-    on<K_2>(eventName: string | symbol, listener: (...args: any[]) => void): any;
-    once<K_3>(eventName: string | symbol, listener: (...args: any[]) => void): any;
-    removeListener<K_4>(eventName: string | symbol, listener: (...args: any[]) => void): any;
-    off<K_5>(eventName: string | symbol, listener: (...args: any[]) => void): any;
-    removeAllListeners(eventName?: string | symbol | undefined): any;
-    setMaxListeners(n: number): any;
-    getMaxListeners(): number;
-    listeners<K_6>(eventName: string | symbol): Function[];
-    rawListeners<K_7>(eventName: string | symbol): Function[];
-    emit<K_8>(eventName: string | symbol, ...args: any[]): boolean;
-    listenerCount<K_9>(eventName: string | symbol, listener?: Function | undefined): number;
-    prependListener<K_10>(eventName: string | symbol, listener: (...args: any[]) => void): any;
-    prependOnceListener<K_11>(eventName: string | symbol, listener: (...args: any[]) => void): any;
-    eventNames(): (string | symbol)[];
-};
+}
+export declare const listener: Listeners;
+export {};

package/lib/core/listener.js

@@ -5,7 +5,7 @@ import { MessageHandler } from '../event/message.handler.js'
 /**
  * 监听器管理
  */
-export const listener = new (class Listeners extends EventEmitter {
+class Listeners extends EventEmitter {
   /**
      * Bot索引
      * @type - Bot索引
@@ -183,4 +183,5 @@ export const listener = new (class Listeners extends EventEmitter {
     }
     return result
   }
-})()
+}
+export const listener = new Listeners()

package/lib/index.d.ts

@@ -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>;

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.3.5",
+  "version": "0.3.8",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",
@@ -18,6 +18,7 @@
     "#Karin": "./lib/index.js"
   },
   "main": "./lib/index.js",
+  "types": "./lib/index.d.ts",
   "bin": {
     "init": "./lib/tools/init.js"
   },
@@ -38,14 +39,14 @@
   "scripts": {
     "app": "node .",
     "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": "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",
+    "dev": "tsx ./lib/index.js --dev",
     "fix": "eslint lib/**/*.js --fix",
     "fix:all": "eslint lib/**/*.js --fix && eslint src/**/*.ts --fix",
     "init": "node lib/tools/install.js",
     "init:dev": "node lib/tools/install.js",
     "init:pack": "node lib/tools/install.js",
-    "dev": "tsx ./lib/index.js --dev",
     "log": "node lib/tools/pm2Log.js",
     "monit": "pm2 monit",
     "pub": "npm publish --access public",
@@ -87,6 +88,13 @@
     "tsx": "^4.15.7",
     "typescript": "^4.9.5"
   },
+  "bundledDependencies": [
+    "@types/express",
+    "@types/lodash",
+    "@types/node",
+    "@types/node-schedule",
+    "@types/ws"
+  ],
   "engines": {
     "node": ">=18"
   },