node-karin 0.2.0 → 0.2.1

package/lib/renderer/app.js

@@ -1,8 +1,5 @@
-import logger from '../utils/logger.js'
-/**
- * 渲染器管理器
- */
-export default new (class Renderer {
+import { logger } from '../utils/index.js'
+class Renderer {
   index
   Apps
   constructor () {
@@ -17,11 +14,11 @@ export default new (class Renderer {
 
   /**
      * 注册渲染器
-     * @param {object} data 渲染器数据
-     * @param {string} data.id 渲染器ID
-     * @param {'image'|string} data.type 渲染器类型
-     * @param {RenderBase.render} data.render 渲染器标准方法
-     * @returns {number} 渲染器索引
+     * @param data 渲染器数据
+     * @param data.id 渲染器ID
+     * @param data.type 渲染器类型
+     * @param ata.render 渲染器标准方法
+     * @returns 渲染器索引
      */
   app (data) {
     this.index++
@@ -90,4 +87,8 @@ export default new (class Renderer {
       },
     })
   }
-})()
+}
+/**
+ * 渲染器管理器
+ */
+export const render = new Renderer()

package/lib/renderer/base.d.ts

@@ -3,7 +3,7 @@ import { KarinRender, KarinRenderType } from '../types/render.js';
 /**
  * 渲染器基类 所有渲染器都应该继承这个类
  */
-export default class RenderBase implements KarinRender {
+export declare class RenderBase implements KarinRender {
     dir: './temp/html';
     html: {
         [key: string]: string;

package/lib/renderer/base.js

@@ -1,12 +1,11 @@
 import fs from 'fs'
 import chokidar from 'chokidar'
 import template from 'art-template'
-import common from '../utils/common.js'
-import logger from '../utils/logger.js'
+import { common, logger } from '../utils/index.js'
 /**
  * 渲染器基类 所有渲染器都应该继承这个类
  */
-export default class RenderBase {
+export class RenderBase {
   dir
   html
   watcher

package/lib/renderer/client.d.ts

@@ -1,7 +1,7 @@
 import WebSocket from 'ws';
-import RenderBase from './base.js';
+import { RenderBase } from './base.js';
 import { KarinRenderType } from '../types/render.js';
-export default class RenderClient extends RenderBase {
+export declare class RenderClient extends RenderBase {
     url: string;
     type: string;
     id: string;

package/lib/renderer/client.js

@@ -1,12 +1,11 @@
 import fs from 'fs'
 import WebSocket from 'ws'
-import Renderer from './app.js'
-import RenderBase from './base.js'
+import { render } from './app.js'
+import { RenderBase } from './base.js'
 import { randomUUID } from 'crypto'
-import common from '../utils/common.js'
-import logger from '../utils/logger.js'
-import listener from '../core/listener.js'
-export default class RenderClient extends RenderBase {
+import { listener } from '../core/index.js'
+import { common, logger } from '../utils/index.js'
+export class RenderClient extends RenderBase {
   url
   type
   id
@@ -35,7 +34,7 @@ export default class RenderClient extends RenderBase {
       logger.mark(`[渲染器:${this.id}][WebSocket] 建立连接：${logger.green(this.url)}`)
       /** 注册渲染器 */
       try {
-        this.index = Renderer.app({ id: this.id, type: this.type, render: this.render.bind(this) })
+        this.index = render.app({ id: this.id, type: this.type, render: this.render.bind(this) })
         this.retry = 0
       } catch (error) {
         logger.error(`[渲染器:${this.id}] 注册渲染器失败：`, error)
@@ -53,7 +52,7 @@ export default class RenderClient extends RenderBase {
       /** 停止监听 */
       this.ws.removeAllListeners()
       /** 卸载渲染器 */
-      this.index && Renderer.unapp(this.index) && (this.index = 0)
+      this.index && render.unapp(this.index) && (this.index = 0)
       logger.warn(`[渲染器:${this.id}][重连次数:${this.retry}] 连接断开，5秒后将尝试重连：${this.url}`)
       await common.sleep(5000)
       await this.start()

package/lib/renderer/http.d.ts

@@ -1,6 +1,6 @@
-import RenderBase from './base.js';
+import { RenderBase } from './base.js';
 import { KarinRenderType } from '../types/render.js';
-export default class HttpRenderer extends RenderBase {
+export declare class HttpRenderer extends RenderBase {
     id: string;
     host: string;
     url: string;

package/lib/renderer/http.js

@@ -1,7 +1,7 @@
 import axios from 'axios'
-import RenderBase from './base.js'
+import { RenderBase } from './base.js'
 import logger from '../utils/logger.js'
-export default class HttpRenderer extends RenderBase {
+export class HttpRenderer extends RenderBase {
   id
   host
   url

package/lib/renderer/index.d.ts

@@ -0,0 +1,6 @@
+export * from './app.js';
+export * from './base.js';
+export * from './client.js';
+export * from './http.js';
+export * from './server.js';
+export * from './wormhole.js';

package/lib/renderer/index.js

@@ -0,0 +1,6 @@
+export * from './app.js'
+export * from './base.js'
+export * from './client.js'
+export * from './http.js'
+export * from './server.js'
+export * from './wormhole.js'

package/lib/renderer/server.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
-import RenderBase from './base.js';
 import WebSocket from 'ws';
+import { RenderBase } from './base.js';
 import { IncomingMessage } from 'http';
-import { KarinRenderType } from '../types/render.js';
+import { KarinRenderType } from '../types/index.js';
 declare class Puppeteer extends RenderBase {
     socket: WebSocket;
     id: any;
@@ -34,9 +34,9 @@ declare class Puppeteer extends RenderBase {
      */
     render(options: KarinRenderType): Promise<string | string[]>;
 }
-declare const _default: {
+export declare const RenderServer: {
     type: string;
     path: string;
     adapter: typeof Puppeteer;
 };
-export default _default;
+export {};

package/lib/renderer/server.js

@@ -1,8 +1,8 @@
-import Renderer from './app.js'
-import RenderBase from './base.js'
+import { render } from './app.js'
+import { RenderBase } from './base.js'
 import { randomUUID } from 'crypto'
-import logger from '../utils/logger.js'
-import listener from '../core/listener.js'
+import { logger } from '../utils/index.js'
+import { listener } from '../core/listener.js'
 class Puppeteer extends RenderBase {
   socket
   id
@@ -42,12 +42,12 @@ class Puppeteer extends RenderBase {
     this.socket.on('close', () => {
       logger.warn(`[渲染器:${this.id}] 连接断开：${this.url}`)
       /** 卸载渲染器 */
-      this.index && Renderer.unapp(this.index)
+      this.index && render.unapp(this.index)
       this.index = 0
     })
     /** 注册渲染器 */
     try {
-      const index = Renderer.app({
+      const index = render.app({
         id: this.id,
         type: this.type,
         render: this.render.bind(this),
@@ -105,7 +105,7 @@ class Puppeteer extends RenderBase {
     })
   }
 }
-export default {
+export const RenderServer = {
   type: 'render',
   path: '/puppeteer',
   adapter: Puppeteer,

package/lib/renderer/wormhole.d.ts

@@ -1 +1 @@
-export default function connect(): void;
+export declare function Wormhole(): void;

package/lib/renderer/wormhole.js

@@ -1,14 +1,14 @@
-import WebSocket from 'ws'
 import fs from 'fs'
 import path from 'path'
 import { URL } from 'url'
-import HttpRenderer from './http.js'
-import config from '../utils/config.js'
-import { render } from '../index.js'
+import WebSocket from 'ws'
+import { render } from './index.js'
+import { HttpRenderer } from './http.js'
+import { config } from '../utils/index.js'
 let ws
 let reConnect
 const chunkSize = 1024 * 1024 * 3 // 文件分片大小
-export default function connect () {
+export function Wormhole () {
   let heartbeat
   let index = 0
   reConnect = undefined
@@ -135,7 +135,7 @@ export default function connect () {
     }
     logger.warn('连接关闭，10秒后尝试重新连接')
     if (!reConnect) {
-      reConnect = setTimeout(connect, 10000)
+      reConnect = setTimeout(Wormhole, 10000)
     }
   })
   ws.on('error', function error () {
@@ -148,7 +148,7 @@ export default function connect () {
     }
     logger.warn('连接错误，10秒后尝试重新连接')
     if (!reConnect) {
-      reConnect = setTimeout(connect, 10000)
+      reConnect = setTimeout(Wormhole, 10000)
     }
   })
 }

package/lib/types/adapter.d.ts

@@ -2,7 +2,7 @@
 import { WebSocket } from 'ws';
 import { IncomingMessage } from 'http';
 import { KarinElement, KarinNodeElement } from './element.js';
-import { contact, PushMessageBody, EssenceMessageBody, FriendInfo, GroupInfo, GroupMemberInfo, GroupHonorInfo } from './types.js';
+import { contact, PushMessageBody, EssenceMessageBody, FriendInfo, GroupInfo, GroupMemberInfo, GroupHonorInfo } from './event.js';
 export interface KarinAdapter {
     /**
      * - 适配器版本信息

package/lib/types/config.d.ts

@@ -101,16 +101,22 @@ export interface App {
 export interface Config {
     /**
      * 日志等级
+     * @description 即将废弃，请使用log4jsCfg.level
      */
-    log_level: string;
+    log_level?: string;
     /**
      * 日志保留天数
+     * @description 即将废弃，请使用log4jsCfg.daysToKeep
      */
-    log_days_Keep: number;
+    log_days_Keep?: number;
     /**
      * 控制台触发插件日志颜色
      */
     log_color: string;
+    /**
+     * 关闭后台进程失败后是否继续启动 继续启动会导致多进程
+     */
+    multi_progress: boolean;
     /**
      * ffmpeg配置
      */
@@ -165,7 +171,7 @@ export interface Config {
         /**
          * 日志等级
          */
-        level: string;
+        level: 'trace' | 'debug' | 'info' | 'warn' | 'fatal' | 'mark' | 'error' | 'off';
         /**
          * 日志保留天数
          */

package/lib/types/{types.d.ts → event.d.ts}

@@ -1,7 +1,5 @@
 import { KarinElement } from './element.js';
-import { KarinMessage } from '../event/message.js';
-import { KarinNotice } from '../event/notice.js';
-import { KarinRequest } from '../event/request.js';
+import { KarinMessage, KarinNotice, KarinRequest } from '../event/index.js';
 /**
  * - 事件类型
  */

package/lib/types/index.d.ts

@@ -1,8 +1,9 @@
 export * from './adapter.js';
 export * from './config.js';
+export * from './element.js';
+export * from './event.js';
 export * from './logger.js';
 export * from './onebots11.js';
-export * from './plugin.js';
 export * from './render.js';
+export * from './plugin.js';
 export * from './reply.js';
-export * from './types.js';

package/lib/types/index.js

@@ -1,8 +1,9 @@
 export * from './adapter.js'
 export * from './config.js'
+export * from './element.js'
+export * from './event.js'
 export * from './logger.js'
 export * from './onebots11.js'
-export * from './plugin.js'
 export * from './render.js'
+export * from './plugin.js'
 export * from './reply.js'
-export * from './types.js'

package/lib/types/plugin.d.ts

@@ -2,7 +2,7 @@
 import schedule from 'node-schedule';
 import { KarinNodeElement } from './element.js';
 import { Reply, replyCallback } from './reply.js';
-import { E, Event, Permission, SubEvent } from './types.js';
+import { E, Event, Permission, SubEvent } from './event.js';
 /**
  * - 插件根目录名称
  * - 例如: karin-plugin-example
@@ -118,7 +118,7 @@ export interface AppInfo {
 /**
  * - 插件基类
  */
-export interface Plugin {
+export interface PluginType {
     /**
      * - 插件名称
      */
@@ -209,7 +209,7 @@ export interface Plugin {
         /**
          * - 插件实例
          */
-        plugin: Plugin;
+        plugin: PluginType;
         /**
          * - 执行方法名称
          */
@@ -223,9 +223,9 @@ export interface Plugin {
 /**
  * 上下文状态
  */
-export interface stateArr {
+export interface stateArrType {
     [key: string]: {
-        plugin: Plugin;
+        plugin: PluginType;
         fnc: string;
     };
 }
@@ -244,7 +244,7 @@ export interface PluginApps {
         /**
          * - 插件方法
          */
-        Fnc: '' | (new () => Plugin);
+        Fnc: '' | (new () => PluginType);
     };
     /**
      * - 插件名称

package/lib/utils/button.d.ts

@@ -1,8 +1,8 @@
-import { Plugin, dirName, fileName } from '../types/plugin.js';
 import { KarinMessage } from '../event/message.js';
-declare const _default: {
+import { PluginType, dirName, fileName } from '../types/plugin.js';
+export declare const button: {
     Apps: Array<{
-        App: new () => Plugin;
+        App: new () => PluginType;
         name: string;
         priority: number;
         file: {
@@ -17,8 +17,8 @@ declare const _default: {
     add({ name, dir, App, Class }: {
         dir: dirName;
         name: fileName;
-        App: new () => Plugin;
-        Class: Plugin;
+        App: new () => PluginType;
+        Class: PluginType;
     }): void;
     /**
      * 卸载按钮
@@ -26,7 +26,7 @@ declare const _default: {
      * @param {string} name 插件文件名称
      */
     del(dir: dirName, name: fileName): {
-        App: new () => Plugin;
+        App: new () => PluginType;
         name: string;
         priority: number;
         file: {
@@ -41,9 +41,8 @@ declare const _default: {
     update({ dir, name, App, Class }: {
         dir: dirName;
         name: fileName;
-        App: new () => Plugin;
-        Class: Plugin;
+        App: new () => PluginType;
+        Class: PluginType;
     }): void;
     get(e: KarinMessage): Promise<any[]>;
 };
-export default _default;

package/lib/utils/button.js

@@ -1,6 +1,6 @@
 import lodash from 'lodash'
 import logger from './logger.js'
-export default new (class Button {
+export const button = new (class Button {
   Apps
   constructor () {
     this.Apps = []

package/lib/utils/common.d.ts

@@ -1,13 +1,12 @@
 /// <reference types="node" />
-import fs from 'fs';
 import { AxiosRequestConfig } from 'axios';
 import { Readable } from 'stream';
-import { KarinElement, KarinNodeElement } from '../types/element.js';
-import { dirName } from '../types/plugin.js';
+import { fs } from '../modules.js';
+import { dirName, KarinElement, KarinNodeElement } from '../types/index.js';
 /**
  * 常用方法
  */
-declare const _default: {
+export declare const common: {
     streamPipeline: (stream1: Readable, stream2: fs.WriteStream) => Promise<void>;
     /**
      * 休眠函数
@@ -21,6 +20,13 @@ declare const _default: {
      * @param param axios参数
      */
     downFile(fileUrl: string, savePath: string, param?: AxiosRequestConfig): Promise<boolean>;
+    /**
+     * 对axios进行简单封装，超时、错误后返回null，不会抛出异常
+     * @param url 请求地址
+     * @param type 请求类型
+     * @param param axios参数
+     */
+    axios(url: string, type?: 'get' | 'post', param?: AxiosRequestConfig): Promise<any | null>;
     /**
      * 递归创建目录
      * @param dirname - 要创建的文件夹路径
@@ -120,4 +126,3 @@ declare const _default: {
      */
     makeMessageLog(message: Array<KarinElement>): string;
 };
-export default _default;

package/lib/utils/common.js

@@ -1,16 +1,12 @@
-import fs from 'fs'
-import path from 'path'
-import axios from 'axios'
 import { promisify } from 'util'
-import logger from '../utils/logger.js'
-import segment from '../utils/segment.js'
-import { pipeline, Readable } from 'stream'
-import lodash from 'lodash'
 import { fileURLToPath } from 'url'
+import { pipeline, Readable } from 'stream'
+import { logger, segment } from '../utils/index.js'
+import { fs, path, axios, lodash } from '../modules.js'
 /**
  * 常用方法
  */
-export default new (class Common {
+export const common = new (class Common {
   streamPipeline
   constructor () {
     this.streamPipeline = promisify(pipeline)
@@ -43,6 +39,22 @@ export default new (class Common {
     }
   }
 
+  /**
+     * 对axios进行简单封装，超时、错误后返回null，不会抛出异常
+     * @param url 请求地址
+     * @param type 请求类型
+     * @param param axios参数
+     */
+  async axios (url, type = 'get', param = {}) {
+    try {
+      if (type === 'post') { return await axios.post(url, param.data, param) }
+      return await axios.get(url, param)
+    } catch (error) {
+      logger.debug(error)
+      return null
+    }
+  }
+
   /**
      * 递归创建目录
      * @param dirname - 要创建的文件夹路径

package/lib/utils/config.d.ts

@@ -1,7 +1,9 @@
-import { Redis, App, Config, Server, Package, GroupCfg } from '../types/config.js';
 import { Logger } from 'log4js';
-/** 配置文件 */
-declare const _default: {
+import { Redis, App, Config, Server, Package, GroupCfg } from '../types/index.js';
+/**
+ * 配置文件
+ */
+export declare const config: {
     dir: string;
     _path: string;
     _pathDef: string;
@@ -67,6 +69,5 @@ declare const _default: {
     change_App(): Promise<void>;
     change_config(): Promise<void>;
     change_group(): Promise<void>;
-    "__#1@#review"(): Promise<void>;
+    "__#2@#review"(): Promise<void>;
 };
-export default _default;

package/lib/utils/config.js

@@ -1,9 +1,9 @@
-import fs from 'fs'
-import Yaml from 'yaml'
-import chokidar from 'chokidar'
 import { karinDir } from '../core/dir.js'
-/** 配置文件 */
-export default new (class Cfg {
+import { fs, yaml as Yaml, chokidar } from '../modules.js'
+/**
+ * 配置文件
+ */
+export const config = new (class Cfg {
   dir
   _path
   _pathDef
@@ -236,7 +236,7 @@ export default new (class Cfg {
 
   async change_config () {
     /** 修改日志等级 */
-    this.loggger.level = this.Config.log_level
+    this.loggger.level = this.Config.log4jsCfg.level
     await this.#review()
     // if (this.Server.HotUpdate) {
     //   const { Bot } = await import('../index.js')

package/lib/utils/ffmpeg.js

@@ -1,6 +1,6 @@
 import exec from './exec.js'
 import logger from './logger.js'
-import Config from './config.js'
+import { config } from './config.js'
 /**
  * 执行 ffmpeg 命令
  */
@@ -9,7 +9,7 @@ export default async function ffmpeg () {
   const { status } = await exec('ffmpeg -version', false)
   if (status !== 'ok') {
     logger.debug('ffmpeg 未安装，开始尝试读取配置文件是否存在ffmpeg路径')
-    const ffmpegPath = Config.Config.ffmpeg_path
+    const ffmpegPath = config.Config.ffmpeg_path
     if (!ffmpegPath) {
       logger.warn('ffmpeg 未安装，请安装 ffmpeg 或手动配置 ffmpeg 路径后重启')
       return false

package/lib/utils/handler.d.ts

@@ -1,9 +1,9 @@
-import Plugin from '../core/plugin.js';
-import { dirName, fileName } from '../types/plugin.js';
+import { Plugin } from '../core/index.js';
+import { dirName, fileName } from '../types/index.js';
 /**
  * 事件处理器类
  */
-declare const _default: {
+export declare const handler: {
     events: {
         [key: string]: {
             /**
@@ -73,4 +73,3 @@ declare const _default: {
      */
     has(key: string): boolean;
 };
-export default _default;

package/lib/utils/handler.js

@@ -4,7 +4,7 @@ import logger from './logger.js'
 /**
  * 事件处理器类
  */
-export default new (class EventHandler {
+export const handler = new (class EventHandler {
   events
   constructor () {
     this.events = {}

package/lib/utils/index.d.ts

@@ -0,0 +1,11 @@
+export * from './button.js';
+export * from './common.js';
+export * from './config.js';
+export * from './ffmpeg.js';
+export * from './handler.js';
+export * from './exec.js';
+export * from './segment.js';
+export * from './update.js';
+export * from './yamlEditor.js';
+export * from './logger.js';
+export * from './updateVersion.js';

package/lib/utils/index.js

@@ -0,0 +1,11 @@
+export * from './button.js'
+export * from './common.js'
+export * from './config.js'
+export * from './ffmpeg.js'
+export * from './handler.js'
+export * from './exec.js'
+export * from './segment.js'
+export * from './update.js'
+export * from './yamlEditor.js'
+export * from './logger.js'
+export * from './updateVersion.js'

package/lib/utils/logger.d.ts

@@ -1,3 +1,3 @@
 import log4js from 'log4js';
-declare const logger: log4js.Logger;
+export declare const logger: log4js.Logger;
 export default logger;