node-karin 0.11.13 → 0.11.15

package/lib/cli/init.js

@@ -1,21 +1,22 @@
 #!/usr/bin/env node
-import { KarinCfgInit } from '../core/init/config.js'
+import { getRegistry } from './pkg.js';
+import { KarinCfgInit } from '../core/init/config.js';
 /**
  * 休眠函数
  * @param ms 毫秒
  */
-function sleep (ms) {
-  return new Promise(resolve => setTimeout(resolve, ms))
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
 }
-async function main () {
-  /** 捕获错误 打印日志 */
-  process.on('uncaughtException', err => console.error(err))
-  process.on('unhandledRejection', err => console.error(err))
-  const init = new KarinCfgInit()
-  init.init()
-  await sleep(1000)
-  const pkg = init.getRegistry()
-  /** 结果 */
-  await init.install(pkg)
+async function main() {
+    /** 捕获错误 打印日志 */
+    process.on('uncaughtException', err => console.error(err));
+    process.on('unhandledRejection', err => console.error(err));
+    const init = new KarinCfgInit();
+    init.init();
+    await sleep(1000);
+    const pkg = getRegistry();
+    /** 结果 */
+    await init.install(pkg);
 }
-main().then(() => process.exit(0)).catch(() => process.exit(0))
+main().then(() => process.exit(0)).catch(() => process.exit(0));

package/lib/cli/karin.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
-import { program } from 'commander'
-import { KarinCli } from './index.js'
-const cli = new KarinCli()
-program.version(cli.pkg(true).version, '-v, --version', '显示版本号')
-program.command('.').description('启动karin').action(() => cli.start('prod' /* Mode.Prod */, 'js' /* Lang.Js */, 'node' /* Runner.Node */))
-program.command('start').description('启动karin').action(() => cli.start('prod' /* Mode.Prod */, 'js' /* Lang.Js */, 'node' /* Runner.Node */))
-program.command('pm2').description('后台运行karin').action(() => cli.start('prod' /* Mode.Prod */, 'js' /* Lang.Js */, 'pm2' /* Runner.Pm2 */))
-program.command('stop').description('停止后台运行').action(() => cli.stop())
-program.command('rs').description('重启pm2服务').action(() => cli.restart())
-program.command('dev').description('JavaScript开发模式').action(() => cli.start('dev' /* Mode.Dev */, 'js' /* Lang.Js */, 'node' /* Runner.Node */))
-program.command('ts').description('TypeScript开发模式').action(() => cli.start('dev' /* Mode.Dev */, 'ts' /* Lang.Ts */, 'tsx' /* Runner.Tsx */))
-program.command('log').description('查看日志').action(() => cli.log())
-program.command('up').description('更新依赖').action(() => cli.update())
-program.command('init').description('初始化karin').action(() => { import('./init.js') })
-program.parse(process.argv)
+import { program } from 'commander';
+import { KarinCli } from './index.js';
+const cli = new KarinCli();
+program.version(cli.pkg(true).version, '-v, --version', '显示版本号');
+program.command('.').description('启动karin').action(() => cli.start("prod" /* Mode.Prod */, "js" /* Lang.Js */, "node" /* Runner.Node */));
+program.command('start').description('启动karin').action(() => cli.start("prod" /* Mode.Prod */, "js" /* Lang.Js */, "node" /* Runner.Node */));
+program.command('pm2').description('后台运行karin').action(() => cli.start("prod" /* Mode.Prod */, "js" /* Lang.Js */, "pm2" /* Runner.Pm2 */));
+program.command('stop').description('停止后台运行').action(() => cli.stop());
+program.command('rs').description('重启pm2服务').action(() => cli.restart());
+program.command('dev').description('JavaScript开发模式').action(() => cli.start("dev" /* Mode.Dev */, "js" /* Lang.Js */, "node" /* Runner.Node */));
+program.command('ts').description('TypeScript开发模式').action(() => cli.start("dev" /* Mode.Dev */, "ts" /* Lang.Ts */, "tsx" /* Runner.Tsx */));
+program.command('log').description('查看日志').action(() => cli.log());
+program.command('up').description('更新依赖').action(() => cli.update());
+program.command('init').description('初始化karin').action(() => { import('./init.js'); });
+program.parse(process.argv);

package/lib/cli/pkg.d.ts

@@ -0,0 +1,4 @@
+/**
+ * 获取当前的包管理器 根据锁文件判断 优先级 pnpm > yarn > npm > cnpm
+ */
+export declare const getRegistry: () => "pnpm" | "cnpm" | "yarn" | "npm";

package/lib/cli/pkg.js

@@ -0,0 +1,14 @@
+import fs from 'fs';
+/**
+ * 获取当前的包管理器 根据锁文件判断 优先级 pnpm > yarn > npm > cnpm
+ */
+export const getRegistry = () => {
+    if (fs.existsSync('./pnpm-lock.yaml'))
+        return 'pnpm';
+    if (fs.existsSync('./yarn.lock'))
+        return 'yarn';
+    if (fs.existsSync('./package-lock.json'))
+        return 'npm';
+    // cnpm 没有锁文件
+    return 'cnpm';
+};

package/lib/cli/start.js

@@ -0,0 +1,8 @@
+import { program } from 'commander';
+import { KarinCli } from './index.js';
+const karin = new KarinCli();
+program.version(karin.pkg(true).version, '-v, --version', '显示版本号');
+program.command('.').description('启动karin').action(() => karin.start("prod" /* Mode.Prod */, "js" /* Lang.Js */, "node" /* Runner.Node */));
+program.command('start').description('启动karin').action(() => karin.start("prod" /* Mode.Prod */, "js" /* Lang.Js */, "node" /* Runner.Node */));
+program.command('dev').description('dev开发模式').action(() => karin.start("dev" /* Mode.Dev */, "js" /* Lang.Js */, "node" /* Runner.Node */));
+program.parse(process.argv);

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

@@ -40,8 +40,4 @@ export declare class KarinCfgInit {
      * @param cmd - 命令
      */
     shell(cmd: string): Promise<unknown>;
-    /**
-     * 获取当前的包管理器 根据锁文件判断
-     */
-    getRegistry(): 'pnpm' | 'cnpm' | 'yarn' | 'npm';
 }

package/lib/core/init/config.js

@@ -198,17 +198,4 @@ export class KarinCfgInit {
             });
         });
     }
-    /**
-     * 获取当前的包管理器 根据锁文件判断
-     */
-    getRegistry() {
-        if (fs.existsSync('./pnpm-lock.yaml'))
-            return 'pnpm';
-        if (fs.existsSync('./yarn.lock'))
-            return 'yarn';
-        if (fs.existsSync('./package-lock.json'))
-            return 'npm';
-        // cnpm 没有锁文件
-        return 'cnpm';
-    }
 }

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/listener/listener.js

@@ -71,7 +71,7 @@ export class Listeners extends EventEmitter {
         }
         const element = [
             segment.reply(message_id),
-            segment.text(`Karin 重启成功：${restartTime}秒`),
+            segment.text(`\nKarin 重启成功：${restartTime}秒`),
         ];
         await this.sendMsg(id, contact, element);
         await level.del(key);

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('检测到后台进程 正在关闭'));
@@ -74,11 +74,7 @@ export default class Process {
          * 根据配置文件判断是否继续
          */
         logger.error(logger.red(`后台进程关闭失败，请检查是否有进程正在占用端口${config.Server.http.port}`));
-        if (!config.Config.multi_progress) {
-            logger.error(logger.red('当前配置不允许多进程运行，程序即将退出'));
-            await this.exit(1);
-        }
-        logger.error(logger.red('当前配置允许多进程运行，程序继续运行'));
+        await this.exit();
         return this;
     }
     /**

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