node-karin 0.11.13 → 0.11.14

package/lib/core/index.js

@@ -1,10 +1,10 @@
-export * from './karin/karin.js'
-export * from './init/dir.js'
-export * from './init/init.js'
-export * from './listener/listener.js'
-export * from './plugin/base.js'
-export * from '../types/plugin/app.js'
-export * from './plugin/loader.js'
-export * from './process/process.js'
-export * from './server/server.js'
-import '../adapter/input/index.js'
+export * from './karin/karin.js';
+export * from './init/dir.js';
+export * from './init/init.js';
+export * from './listener/listener.js';
+export * from './plugin/base.js';
+export * from '../types/plugin/app.js';
+export * from './plugin/loader.js';
+export * from './process/process.js';
+export * from './server/server.js';
+import '../adapter/input/index.js';

package/lib/core/init/init.js

@@ -3,6 +3,7 @@ import { logger } from '../../utils/index.js';
  * 启动日志
  */
 logger.mark('Karin 启动中...');
+logger.mark(`当前版本: ${process.env.karin_app_version}`);
 logger.mark('https://github.com/KarinJS/Karin');
 /**
  * 设置标题

package/lib/core/process/process.js

@@ -54,7 +54,7 @@ export default class Process {
         /**
          * 使用api来检查后台
          */
-        const res = await common.axios(host + '/ping', 'get', { timeout: 100 });
+        const res = await common.axios(host + '/ping', 'get', { timeout: 2000 });
         if (!res)
             return this;
         logger.mark(logger.red('检测到后台进程 正在关闭'));

package/lib/core/server/server.js

@@ -1,8 +1,9 @@
 import fs from 'fs';
-import Process from '../process/process.js';
+import { level } from '../../db/index.js';
 import { WebSocketServer } from 'ws';
 import { createServer } from 'http';
 import { karin } from '../karin/karin.js';
+import Process from '../process/process.js';
 import express from 'express';
 import { exec, config, logger, common } from '../../utils/index.js';
 import { AdapterOneBot11 } from '../../adapter/onebot/11/index.js';
@@ -29,6 +30,7 @@ export const server = new (class Server {
         try {
             /** 防止多进程端口冲突 启动失败 */
             await Process.check();
+            level.open();
             this.WebSocketServer.on('connection', (socket, request) => {
                 const path = request.url;
                 const headers = request.headers;
@@ -75,6 +77,16 @@ export const server = new (class Server {
                     /** 关闭服务器 */
                     karin.emit('exit.grpc');
                     this.server.close();
+                    try {
+                        await level.close();
+                        const redis = (await import('../../db/index.js')).redis;
+                        if (redis && redis.id === 'RedisLevel')
+                            await redis.level.close();
+                    }
+                    catch (error) {
+                        logger.error('[服务器][HTTP] 关闭数据库失败');
+                        logger.error(error);
+                    }
                     /** 如果是pm2 获取当前pm2ID 使用 */
                     if (process.env.pm_id)
                         await exec(`pm2 delete ${process.env.pm_id}`);

package/lib/db/index.js

@@ -1,2 +1,2 @@
-export * from './level/level.js'
-export * from './redis/redis.js'
+export * from './level/level.js';
+export * from './redis/redis.js';

package/lib/db/level/level.js

@@ -34,4 +34,3 @@ export default class LevelDB extends Level {
     }
 }
 export const level = new LevelDB();
-level.open();

package/lib/db/redis/redis_level.d.ts

@@ -1,5 +1,7 @@
+import { Level } from 'level';
 export default class RedisLevel {
     #private;
+    level: Level<string, string>;
     /** 唯一标识符 用于区分不同的数据库 */
     id: string;
     constructor();

package/lib/db/redis/redis_level.js

@@ -1,14 +1,13 @@
 import { Level } from 'level';
 export default class RedisLevel {
-    #level;
+    level;
     /** 过期时间映射表 */
     #expireMap;
     /** 唯一标识符 用于区分不同的数据库 */
     id;
     constructor() {
         const path = process.cwd() + '/data/db/RedisLevel';
-        this.#level = new Level(path, { valueEncoding: 'json' });
-        this.#level.open();
+        this.level = new Level(path, { valueEncoding: 'json' });
         this.id = 'RedisLevel';
         this.#expireMap = new Map();
         this.#expireHandle();
@@ -23,7 +22,7 @@ export default class RedisLevel {
             const entries = Array.from(this.#expireMap.entries());
             for (const [key, expire] of entries) {
                 if (expire < now) {
-                    await this.#level.del(key);
+                    await this.level.del(key);
                     this.#expireMap.delete(key); // 通过代理的方式删除键值对
                 }
             }
@@ -56,6 +55,8 @@ export default class RedisLevel {
             },
         };
         this.#expireMap = new Proxy(this.#expireMap, handler);
+        /** 延迟2秒执行 */
+        setTimeout(async () => this.level.open(), 2000);
     }
     /**
      * get 获取数据
@@ -67,11 +68,11 @@ export default class RedisLevel {
             /** 先查过期时间 */
             const expire = this.#expireMap.get(key);
             if (expire && expire < Date.now()) {
-                await this.#level.del(key);
+                await this.level.del(key);
                 this.#expireMap.delete(key);
                 return null;
             }
-            return await this.#level.get(key);
+            return await this.level.get(key);
         }
         catch (error) {
             if (error.notFound)
@@ -89,7 +90,7 @@ export default class RedisLevel {
         if (options && options.EX) {
             this.#expireMap.set(key, Date.now() + options.EX * 1000);
         }
-        return await this.#level.put(key, value);
+        return await this.level.put(key, value);
     }
     /**
      * del 删除数据
@@ -97,7 +98,7 @@ export default class RedisLevel {
      */
     async del(key) {
         this.#expireMap.delete(key);
-        return await this.#level.del(key);
+        return await this.level.del(key);
     }
     /**
      * keys 获取所有键
@@ -106,7 +107,7 @@ export default class RedisLevel {
     async keys(prefix = '') {
         /** 去掉末尾的* */
         prefix = prefix.replace(/\*$/, '');
-        const list = await this.#level.keys({ gte: prefix, lt: `${prefix}\xFF` }).all();
+        const list = await this.level.keys({ gte: prefix, lt: `${prefix}\xFF` }).all();
         this.#checkKeys(list);
         return list;
     }
@@ -118,7 +119,7 @@ export default class RedisLevel {
         for (const key of keys) {
             const expire = this.#expireMap.get(key);
             if (expire && expire < Date.now()) {
-                await this.#level.del(key);
+                await this.level.del(key);
                 this.#expireMap.delete(key);
             }
         }
@@ -192,7 +193,7 @@ export default class RedisLevel {
      */
     async setEx(key, seconds, value) {
         this.#expireMap.set(key, Date.now() + seconds * 1000);
-        return await this.#level.put(key, value);
+        return await this.level.put(key, value);
     }
     /**
      * exists 判断键是否存在

package/lib/event/index.js

@@ -1,5 +1,5 @@
-export * from './handler/base.js'
-export * from './handler/message.js'
-export * from './handler/notice.js'
-export * from './handler/request.js'
-export * from './handler/review.js'
+export * from './handler/base.js';
+export * from './handler/message.js';
+export * from './handler/notice.js';
+export * from './handler/request.js';
+export * from './handler/review.js';

package/lib/modules/art-template.js

@@ -1 +1 @@
-export { default } from 'art-template'
+export { default } from 'art-template';

package/lib/modules/axios.js

@@ -1,2 +1,2 @@
-export * from 'axios'
-export { default } from 'axios'
+export * from 'axios';
+export { default } from 'axios';

package/lib/modules/chalk.js

@@ -1,2 +1,2 @@
-export * from 'chalk'
-export { default } from 'chalk'
+export * from 'chalk';
+export { default } from 'chalk';

package/lib/modules/chokidar.js

@@ -1,2 +1,2 @@
-export * from 'chokidar'
-export { default } from 'chokidar'
+export * from 'chokidar';
+export { default } from 'chokidar';

package/lib/modules/commander.js

@@ -1,2 +1,2 @@
-export * from 'commander'
-export { default } from 'commander'
+export * from 'commander';
+export { default } from 'commander';

package/lib/modules/express.js

@@ -1,3 +1,3 @@
-import { query, Router } from 'express'
-export { default } from 'express'
-export { query, Router }
+import { query, Router } from 'express';
+export { default } from 'express';
+export { query, Router };

package/lib/modules/level.js

@@ -1,2 +1,2 @@
-export * from 'level'
-export { default } from 'level'
+export * from 'level';
+export { default } from 'level';

package/lib/modules/lodash.js

@@ -1 +1 @@
-export { default } from 'lodash'
+export { default } from 'lodash';

package/lib/modules/log4js.js

@@ -1,2 +1,2 @@
-export * from 'log4js'
-export { default } from 'log4js'
+export * from 'log4js';
+export { default } from 'log4js';

package/lib/modules/moment.js

@@ -1 +1 @@
-export { default } from 'moment'
+export { default } from 'moment';

package/lib/modules/node-schedule.js

@@ -1,2 +1,2 @@
-export * from 'node-schedule'
-export { default } from 'node-schedule'
+export * from 'node-schedule';
+export { default } from 'node-schedule';

package/lib/modules/redis.js

@@ -1,2 +1,2 @@
-export * from 'redis'
-export { default } from 'redis'
+export * from 'redis';
+export { default } from 'redis';

package/lib/modules/ws.js

@@ -1,3 +1,3 @@
-import { WebSocket, WebSocketServer, createWebSocketStream } from 'ws'
-export { WebSocket, WebSocketServer, createWebSocketStream }
-export { default } from 'ws'
+import { WebSocket, WebSocketServer, createWebSocketStream } from 'ws';
+export { WebSocket, WebSocketServer, createWebSocketStream };
+export { default } from 'ws';

package/lib/modules/yaml.js

@@ -1,2 +1,2 @@
-export * from 'yaml'
-export { default } from 'yaml'
+export * from 'yaml';
+export { default } from 'yaml';

package/lib/render/app.js

@@ -1,18 +1,17 @@
-import { logger } from '../utils/index.js'
+import { logger } from '../utils/index.js';
 class Renderers {
-  index
-  Apps
-  constructor () {
-    /** 索引 */
-    this.index = 0
-    /**
+    index;
+    Apps;
+    constructor() {
+        /** 索引 */
+        this.index = 0;
+        /**
          * 渲染器列表
          * @type {APP[]}
          */
-    this.Apps = []
-  }
-
-  /**
+        this.Apps = [];
+    }
+    /**
      * 注册渲染器
      * @param data 渲染器数据
      * @param data.id 渲染器ID
@@ -20,100 +19,102 @@ class Renderers {
      * @param ata.render 渲染器标准方法
      * @returns 渲染器索引
      */
-  app (data) {
-    this.index++
-    const index = this.index
-    const { id, type = 'image', render } = data
-    if (!id) { throw new Error('[注册渲染器失败] 缺少渲染器ID') }
-    if (!type) { throw new Error('[注册渲染器失败] 缺少渲染器类型') }
-    if (!render) { throw new Error('[注册渲染器失败] 缺少渲染器标准方法') }
-    const time = Date.now()
-    const options = { index, id, type, render, time }
-    this.Apps.push(options)
-    logger.mark(`${logger.violet(`[渲染器:${index}]`)} 注册成功: ` + logger.green(id))
-    return index
-  }
-
-  /**
+    app(data) {
+        this.index++;
+        const index = this.index;
+        const { id, type = 'image', render } = data;
+        if (!id)
+            throw new Error('[注册渲染器失败] 缺少渲染器ID');
+        if (!type)
+            throw new Error('[注册渲染器失败] 缺少渲染器类型');
+        if (!render)
+            throw new Error('[注册渲染器失败] 缺少渲染器标准方法');
+        const time = Date.now();
+        const options = { index, id, type, render, time };
+        this.Apps.push(options);
+        logger.mark(`${logger.violet(`[渲染器:${index}]`)} 注册成功: ` + logger.green(id));
+        return index;
+    }
+    /**
      * 卸载渲染器
      * @param index 渲染器索引
      * @returns 是否卸载成功
      */
-  unapp (index) {
-    const app = this.Apps.find(app => app.index === index)
-    if (!app) {
-      logger.error(`[卸载渲染器失败] 未找到渲染器索引：${index}`)
-      return false
+    unapp(index) {
+        const app = this.Apps.find(app => app.index === index);
+        if (!app) {
+            logger.error(`[卸载渲染器失败] 未找到渲染器索引：${index}`);
+            return false;
+        }
+        this.Apps = this.Apps.filter(app => app.index !== index);
+        logger.mark(`[卸载渲染器] ${app.id}`);
+        return true;
     }
-    this.Apps = this.Apps.filter(app => app.index !== index)
-    logger.mark(`[卸载渲染器] ${app.id}`)
-    return true
-  }
-
-  /**
+    /**
      * 返回渲染器实例 未键入id返回第一个
      * @param id 渲染器ID
      * @returns 渲染器实例
      */
-  App (id = '') {
-    if (this.Apps.length === 0) { throw new Error('[调用渲染器失败] 渲染器列表为空') }
-    if (!id) { return this.Apps[0] }
-    /** 筛选出id一致的渲染器 */
-    const app = this.Apps.find(app => app.id === id)
-    if (!app) { throw new Error(`[调用渲染器失败] 未找到渲染器：${id}`) }
-    return app
-  }
-
-  /**
+    App(id = '') {
+        if (this.Apps.length === 0)
+            throw new Error('[调用渲染器失败] 渲染器列表为空');
+        if (!id)
+            return this.Apps[0];
+        /** 筛选出id一致的渲染器 */
+        const app = this.Apps.find(app => app.id === id);
+        if (!app)
+            throw new Error(`[调用渲染器失败] 未找到渲染器：${id}`);
+        return app;
+    }
+    /**
      * 调用标准渲染器
      */
-  async render (options, id) {
-    const res = this.App(id)
-    if (typeof options.multiPage === 'number' || options.multiPage === true) {
-      const result = await res.render(options)
-      return result
-    } else {
-      const result = await res.render(options)
-      return result
+    async render(options, id) {
+        const res = this.App(id);
+        if (typeof options.multiPage === 'number' || options.multiPage === true) {
+            const result = await res.render(options);
+            return result;
+        }
+        else {
+            const result = await res.render(options);
+            return result;
+        }
     }
-  }
-
-  /**
+    /**
      * 快速渲染
      * @param data html路径、http地址
      * @returns 返回图片base64或数组
      */
-  async renderHtml (data) {
-    return this.render({
-      file: data,
-      name: 'render',
-      pageGotoParams: {
-        waitUntil: 'networkidle2',
-      },
-    })
-  }
-
-  /**
+    async renderHtml(data) {
+        return this.render({
+            file: data,
+            name: 'render',
+            pageGotoParams: {
+                waitUntil: 'networkidle2',
+            },
+        });
+    }
+    /**
      * 快速分片渲染
      * @param data html路径、http地址
      * @param multiPage 分片高度 自动计算传true
      */
-  async renderMultiHtml (data, multiPage) {
-    return await this.render({
-      file: data,
-      name: 'render',
-      multiPage,
-      pageGotoParams: {
-        waitUntil: 'networkidle2',
-      },
-    })
-  }
+    async renderMultiHtml(data, multiPage) {
+        return await this.render({
+            file: data,
+            name: 'render',
+            multiPage,
+            pageGotoParams: {
+                waitUntil: 'networkidle2',
+            },
+        });
+    }
 }
 /**
  * 渲染器管理器
  */
-export const render = new Renderers()
+export const render = new Renderers();
 /**
  * @description 即将废弃，请使用 `render`
 */
-export const Renderer = render
+export const Renderer = render;

package/lib/render/base.js

@@ -1,69 +1,69 @@
-import fs from 'fs'
-import chokidar from 'chokidar'
-import template from 'art-template'
-import { common, logger } from '../utils/index.js'
+import fs from 'fs';
+import chokidar from 'chokidar';
+import template from 'art-template';
+import { common, logger } from '../utils/index.js';
 /**
  * 渲染器基类 所有渲染器都应该继承这个类
  */
 export class RenderBase {
-  dir
-  html
-  watcher
-  constructor () {
-    this.dir = './temp/html'
-    this.html = {}
-    this.watcher = {}
-    common.mkdir(this.dir)
-  }
-
-  /**
+    dir;
+    html;
+    watcher;
+    constructor() {
+        this.dir = './temp/html';
+        this.html = {};
+        this.watcher = {};
+        common.mkdir(this.dir);
+    }
+    /**
      * 模板渲染
      * @param options 模板名称
      * @param isAbs 是否返回绝对路径
      */
-  dealTpl (options, isAbs = true) {
-    let { name, fileID, file: tplFile } = options
-    fileID = fileID || name
-    const filePath = `./temp/html/${name}/${fileID}.html`
-    /** 读取html模板 */
-    if (!this.html[tplFile]) {
-      common.mkdir(`./temp/html/${name}`)
-      try {
-        this.html[tplFile] = fs.readFileSync(tplFile, 'utf8')
-      } catch (error) {
-        logger.error(`加载html错误：${tplFile}`)
-        return ''
-      }
-      this.watch(tplFile)
+    dealTpl(options, isAbs = true) {
+        let { name, fileID, file: tplFile } = options;
+        fileID = fileID || name;
+        const filePath = `./temp/html/${name}/${fileID}.html`;
+        /** 读取html模板 */
+        if (!this.html[tplFile]) {
+            common.mkdir(`./temp/html/${name}`);
+            try {
+                this.html[tplFile] = fs.readFileSync(tplFile, 'utf8');
+            }
+            catch (error) {
+                logger.error(`加载html错误：${tplFile}`);
+                return '';
+            }
+            this.watch(tplFile);
+        }
+        /** 替换模板 */
+        const tmpHtml = template.render(this.html[tplFile], options.data);
+        /** 保存模板 */
+        fs.writeFileSync(filePath, tmpHtml);
+        logger.debug(`[图片生成][使用模板] ${filePath}`);
+        /** 是否返回绝对路径 */
+        if (isAbs)
+            return `${process.cwd()}/temp/html/${name}/${fileID}.html`;
+        return filePath;
     }
-    /** 替换模板 */
-    const tmpHtml = template.render(this.html[tplFile], options.data)
-    /** 保存模板 */
-    fs.writeFileSync(filePath, tmpHtml)
-    logger.debug(`[图片生成][使用模板] ${filePath}`)
-    /** 是否返回绝对路径 */
-    if (isAbs) { return `${process.cwd()}/temp/html/${name}/${fileID}.html` }
-    return filePath
-  }
-
-  /**
+    /**
      * 监听模板文件
      * @param tplFile 模板文件路径
      */
-  watch (tplFile) {
-    if (this.watcher[tplFile]) { return }
-    const watcher = chokidar.watch(tplFile)
-    watcher.on('change', () => {
-      delete this.html[tplFile]
-      logger.mark(`[修改html模板] ${tplFile}`)
-    })
-    this.watcher[tplFile] = watcher
-  }
-
-  /**
+    watch(tplFile) {
+        if (this.watcher[tplFile])
+            return;
+        const watcher = chokidar.watch(tplFile);
+        watcher.on('change', () => {
+            delete this.html[tplFile];
+            logger.mark(`[修改html模板] ${tplFile}`);
+        });
+        this.watcher[tplFile] = watcher;
+    }
+    /**
      * 渲染标准方法
      */
-  async render (options) {
-    throw new Error('未实现渲染方法')
-  }
+    async render(options) {
+        throw new Error('未实现渲染方法');
+    }
 }