node-karin 0.3.7 → 0.3.9

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

@@ -1,5 +1,3 @@
-/// <reference types="@types/ws" />
-/// <reference types="node" />
 import WebSocket from 'ws';
 import { IncomingMessage } from 'http';
 import { KarinAdapter } from '../../types/adapter.js';
@@ -131,10 +129,10 @@ export declare class OneBot11 implements KarinAdapter {
         data: {
             content: string;
             custom_template_id: string;
-            params: {
+            params: Array<{
                 key: string;
-                values: string[];
-            }[];
+                values: Array<string>;
+            }>;
             text?: undefined;
             id?: undefined;
             qq?: undefined;

package/lib/core/listener.d.ts

@@ -1,10 +1,9 @@
-/// <reference types="node" />
 import { EventEmitter } from 'events';
 import { KarinAdapter, contact, KarinElement } from '../types/index.js';
 /**
  * 监听器管理
  */
-export declare const listener: {
+declare class Listeners extends EventEmitter {
     /**
      * Bot索引
      * @type - Bot索引
@@ -24,6 +23,7 @@ export declare const listener: {
         adapter: new () => KarinAdapter;
         path: string;
     }>;
+    constructor();
     /**
      * 注册Bot 返回索引id
      */
@@ -80,7 +80,7 @@ export declare const listener: {
      * @param isType - 是否返回包含的类型列表 默认返回适配器实例列表
      */
     getAdapterAll(isType?: boolean): {
-        type: KarinAdapter['adapter']['type'];
+        type: KarinAdapter["adapter"]["type"];
         adapter: new () => KarinAdapter;
         path: string;
     }[] | (new () => KarinAdapter)[];
@@ -99,20 +99,7 @@ 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 declare const Bot: 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,6 @@ export const listener = new (class Listeners extends EventEmitter {
     }
     return result
   }
-})()
+}
+export const listener = new Listeners()
+export const Bot = listener

package/lib/core/plugin.loader.d.ts

@@ -6,7 +6,7 @@ import { PluginApps, PluginTask, dirName, fileName, AppInfo } from '../types/ind
  * 加载插件
  */
 export declare const pluginLoader: {
-    dir: './plugins';
+    dir: "./plugins";
     dirPath: string;
     /**
      * - 插件索引ID
@@ -21,11 +21,11 @@ export declare const pluginLoader: {
      * - handler
      */
     handlerIds: {
-        [key: string]: {
+        [key: string]: Array<{
             index: string;
             fnc: string | Function;
             priority: number;
-        }[];
+        }>;
     };
     /**
      * - 插件列表
@@ -76,7 +76,7 @@ export declare const pluginLoader: {
      * @param path - 插件路径
      * @param lang - 语言环境
      */
-    getIndex(path: string, lang: 'js' | 'ts'): string | boolean;
+    getIndex(path: string, lang: "js" | "ts"): string | boolean;
     /**
      * 获取指定文件夹下的所有插件
      * @param dir - 插件包名称

package/lib/index.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 export * from 'kritor-proto';
 export * from './core/index.js';
 export * from './event/index.js';
@@ -17,15 +15,15 @@ export declare const plugin: typeof Plugin;
 */
 export declare const Renderer: {
     index: number;
-    Apps: import("./types/index.js").KarinRenderApp[];
+    Apps: Array<import("./types/index.js").KarinRenderApp>;
     app(data: {
         id: string;
-        type?: string | undefined;
-        render: (options: import("./types/index.js").KarinRenderType) => Promise<string | string[]>;
+        type?: "image" | string;
+        render: import("./types/index.js").KarinRender["render"];
     }): number;
     unapp(index: number): boolean;
     App(id?: string): import("./types/index.js").KarinRenderApp;
-    render(options: import("./types/index.js").KarinRenderType, id?: string | undefined): Promise<string | string[]>;
+    render(options: import("./types/index.js").KarinRenderType, id?: string): Promise<string | string[]>;
     renderHtml(data: string): Promise<string | string[]>;
 };
 export declare const Cfg: {
@@ -39,7 +37,7 @@ export declare const Cfg: {
     initCfg(): Promise<void>;
     getPlugins(): string[];
     dirPath(name: string, plugins: string[]): Promise<void>;
-    timeout(type?: "grpc" | "ws"): number;
+    timeout(type?: "ws" | "grpc"): number;
     readonly redis: import("./types/index.js").Redis;
     readonly master: string[];
     readonly admin: string[];
@@ -55,65 +53,6 @@ export declare const Cfg: {
     change_group(): Promise<void>;
     "__#2@#review"(): Promise<void>;
 };
-export declare const Bot: {
-    index: number;
-    name: string;
-    list: {
-        index: number;
-        type: "internal" | "http" | "grpc" | "ws" | "render";
-        bot: import("./types/index.js").KarinAdapter;
-    }[];
-    adapter: {
-        type: "internal" | "http" | "grpc" | "ws" | "render";
-        adapter: new () => import("./types/index.js").KarinAdapter;
-        path: string;
-    }[];
-    addBot(data: {
-        bot: import("./types/index.js").KarinAdapter;
-        type: "internal" | "http" | "grpc" | "ws" | "render";
-    }): number | false;
-    delBot(index: number): void;
-    getBot(uid?: string): import("./types/index.js").KarinAdapter | undefined;
-    getBotByIndex(index: number): import("./types/index.js").KarinAdapter;
-    getBotCount(): number;
-    getBotAll(isIndex?: boolean): import("./types/index.js").KarinAdapter[] | {
-        index: number;
-        bot: import("./types/index.js").KarinAdapter;
-    }[];
-    addAdapter(data: {
-        type: "internal" | "http" | "grpc" | "ws" | "render";
-        adapter: new () => import("./types/index.js").KarinAdapter;
-        path?: string | undefined;
-    }): void;
-    getAdapter(path?: string): (new () => import("./types/index.js").KarinAdapter) | undefined;
-    getAdapterAll(isType?: boolean): {
-        type: "internal" | "http" | "grpc" | "ws" | "render";
-        adapter: new () => import("./types/index.js").KarinAdapter;
-        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 | undefined;
-        retry_count?: number | undefined;
-    }): 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 Update: {
     dir: string;
     getPlugins(): string[];

package/lib/index.js

@@ -30,7 +30,6 @@ export const plugin = Plugin;
 */
 export const Renderer = render;
 export const Cfg = config;
-export const Bot = listener;
 export const Update = update;
 export const karin = new Karin();
 export default karin;

package/lib/render/client.d.ts

@@ -1,4 +1,3 @@
-/// <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,5 +1,3 @@
-/// <reference types="@types/ws" />
-/// <reference types="node" />
 import WebSocket from 'ws';
 import { RenderBase } from './base.js';
 import { IncomingMessage } from 'http';

package/lib/types/adapter.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="@types/ws" />
-/// <reference types="node" />
 import { WebSocket } from 'ws';
 import { IncomingMessage } from 'http';
 import { KarinElement, KarinNodeElement } from './element.js';

package/lib/types/plugin.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import schedule from 'node-schedule';
 import { KarinNodeElement } from './element.js';
 import { Reply, replyCallback } from './reply.js';

package/lib/utils/common.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { AxiosRequestConfig } from 'axios';
 import { Readable } from 'stream';
 import { fs } from '../modules.js';
@@ -26,7 +25,7 @@ export declare const common: {
      * @param type 请求类型
      * @param param axios参数
      */
-    axios(url: string, type?: 'get' | 'post', param?: AxiosRequestConfig): Promise<any | null>;
+    axios(url: string, type?: "get" | "post", param?: AxiosRequestConfig): Promise<any | null>;
     /**
      * 递归创建目录
      * @param dirname - 要创建的文件夹路径

package/lib/utils/config.d.ts

@@ -21,7 +21,7 @@ export declare const config: {
     /**
      * 超时时间
      */
-    timeout(type?: 'ws' | 'grpc'): number;
+    timeout(type?: "ws" | "grpc"): number;
     /**
      * Redis 配置
      * 采用实时读取优化性能
@@ -58,14 +58,14 @@ export declare const config: {
     /**
      * 获取配置yaml
      */
-    getYaml(type: 'defSet' | 'config', name: string, isWatch?: boolean): any;
+    getYaml(type: "defSet" | "config", name: string, isWatch?: boolean): any;
     /**
      * 监听配置文件
      * @param {'defSet'|'config'} type 类型
      * @param {string} name 文件名称 不带后缀
      * @param {string} file 文件路径
      */
-    watch(type: 'defSet' | 'config', name: string, file: string): Promise<true | undefined>;
+    watch(type: "defSet" | "config", name: string, file: string): Promise<true | undefined>;
     change_App(): Promise<void>;
     change_config(): Promise<void>;
     change_group(): Promise<void>;

package/lib/utils/exec.d.ts

@@ -11,12 +11,12 @@ export declare const exec: (cmd: string, log?: boolean, options?: {
     /**
      * - 执行状态
      */
-    status: 'ok' | 'failed';
+    status: "ok" | "failed";
     /**
      * - 错误信息
      */
     error: Error | null;
-    stdout: string | '';
-    stderr: string | '';
+    stdout: string | "";
+    stderr: string | "";
 }>;
 export default exec;

package/lib/utils/ffmpeg.d.ts

@@ -5,8 +5,8 @@ export default function ffmpeg(): Promise<false | ((cmd: string, log?: boolean,
     cwd: string;
     encoding: string;
 }) => Promise<{
-    status: "failed" | "ok";
+    status: "ok" | "failed";
     error: Error | null;
-    stdout: string;
-    stderr: string;
+    stdout: string | "";
+    stderr: string | "";
 }>)>;

package/lib/utils/handler.d.ts

@@ -17,11 +17,11 @@ export declare const handler: {
         /**
          * 插件索引
          */
-        index: string | '';
+        index: string | "";
         /**
          * 事件键
          */
-        key: string | '';
+        key: string | "";
     }): boolean;
     /**
      * 调用事件处理器
@@ -30,7 +30,7 @@ export declare const handler: {
      */
     call(key: string, args: {
         [key: string]: any;
-        e?: import("../index.js").KarinMessage | undefined;
+        e?: EventType<unknown>;
     }): Promise<any>;
     /**
      * 检查是否存在指定键的事件处理器

package/lib/utils/segment.d.ts

@@ -45,7 +45,7 @@ export declare const segment: {
         /**
          * - 图片类型，show: 展示图片，flash: 闪照，original: 原图
          */
-        file_type?: 'show' | 'flash' | 'original';
+        file_type?: "show" | "flash" | "original";
         /**
          * - 图片名称
          */
@@ -136,7 +136,7 @@ export declare const segment: {
      * @param id - 音乐ID
      * @returns {MusicElement} 音乐元素
      */
-    music(platform: 'QQ' | 'netease' | 'custom', id: string): MusicElement;
+    music(platform: "QQ" | "netease" | "custom", id: string): MusicElement;
     /**
      * 天气
      * @param city - 城市名称
@@ -190,7 +190,7 @@ export declare const segment: {
      * @param peer - 被推荐人的QQ号或者被推荐群的群号
      * @returns {ContactElement} 分享名片元素
      */
-    contact(scene: 'group' | 'friend', peer: string): ContactElement;
+    contact(scene: "group" | "friend", peer: string): ContactElement;
     /**
      * JSON
      * @param data - JSON序列化过的字符串
@@ -260,9 +260,9 @@ export declare const segment: {
      * @param data - 按钮数据
      * @returns {ButtonElement} 按钮元素
      */
-    button(data: ButtonElement['data']): ButtonElement;
-    rows(data: Array<ButtonElement['data']>): {
-        type: 'rows';
+    button(data: ButtonElement["data"]): ButtonElement;
+    rows(data: Array<ButtonElement["data"]>): {
+        type: "rows";
         rows: Array<ButtonElement>;
     };
     /**

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "node-karin",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",
-  "types": "./lib/index.d.ts",
   "bugs": {
     "url": "https://github.com/KarinJS/Karin/issues"
   },
@@ -19,6 +18,7 @@
     "#Karin": "./lib/index.js"
   },
   "main": "./lib/index.js",
+  "types": "./lib/index.d.ts",
   "bin": {
     "init": "./lib/tools/init.js"
   },
@@ -41,12 +41,12 @@
     "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",
+    "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",
@@ -54,8 +54,7 @@
     "sort:pack": "npx sort-package-json",
     "start": "pm2 start ./config/config/pm2.yaml && pm2 monit",
     "stop": "pm2 delete ./config/config/pm2.yaml",
-    "uninstall": "node lib/tools/uninstall.js",
-    "ver": "node lib/tools/updateVersion.js"
+    "uninstall": "node lib/tools/uninstall.js"
   },
   "dependencies": {
     "@grpc/grpc-js": "1.10.10",
@@ -65,7 +64,7 @@
     "chalk": "5.3.0",
     "chokidar": "3.6.0",
     "express": "4.19.2",
-    "kritor-proto": "^0.0.6",
+    "kritor-proto": "^1.0.1",
     "level": "8.0.1",
     "lodash": "4.17.21",
     "log4js": "6.9.1",
@@ -76,18 +75,25 @@
     "yaml": "2.4.1"
   },
   "devDependencies": {
-    "@types/express": "^4.17.21",
-    "@types/lodash": "^4.17.5",
-    "@types/node": "^20.14.8",
-    "@types/node-schedule": "^2.1.7",
-    "@types/ws": "8.5.10",
-    "eslint": "9.5.0",
-    "neostandard": "^0.9.0",
-    "sort-package-json": "^2.10.0",
-    "tsc-alias": "^1.8.10",
-    "tsx": "^4.15.7",
-    "typescript": "^4.9.5"
+    "@types/express": "latest",
+    "@types/lodash": "latest",
+    "@types/node": "latest",
+    "@types/node-schedule": "latest",
+    "@types/ws": "latest",
+    "eslint": "latest",
+    "neostandard": "latest",
+    "sort-package-json": "latest",
+    "tsc-alias": "latest",
+    "tsx": "latest",
+    "typescript": "latest"
   },
+  "bundledDependencies": [
+    "@types/express",
+    "@types/lodash",
+    "@types/node",
+    "@types/node-schedule",
+    "@types/ws"
+  ],
   "engines": {
     "node": ">=18"
   },