node-karin 0.11.13 → 0.11.15

package/lib/render/wormhole.js

@@ -1,154 +1,156 @@
-import fs from 'fs'
-import path from 'path'
-import { URL } from 'url'
-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 function Wormhole () {
-  let heartbeat
-  let index = 0
-  reConnect = undefined
-  const wsUrl = config.Server.HttpRender.WormholeClient
-  ws = new WebSocket(wsUrl)
-  ws.on('open', function open () {
-    logger.info('连接到wormhole服务器' + wsUrl)
-    // 发送心跳
-    heartbeat = setInterval(() => {
-      ws.send(JSON.stringify({ type: 'heartbeat', date: new Date() }))
-    }, 30000) // 每30秒发送一次心跳
-  })
-  ws.on('message', msg => {
-    let data = ''
-    try {
-      data = JSON.parse(msg.toString())
-    } catch (error) {
-      logger.warn(`收到非法消息${data}`)
-    }
-    const echo = data.echo
-    switch (data.type) {
-      case 'msg': {
-        const { post, token, WormholeClient } = config.Server.HttpRender
-        const parsedUrl = new URL(WormholeClient)
-        const { hostname, port, pathname } = parsedUrl
-        const ishttps = WormholeClient.includes('wss://')
-        const host = `${ishttps ? 'https' : 'http'}://${hostname}${port ? `:${port}` : ''}${pathname.replace(/ws\/(?=[^ws/]*$)/, 'web/')}${data.date}`
-        logger.mark(`web渲染器已连接，地址：${host}`)
-        /** 注册渲染器 */
-        const rd = new HttpRenderer(host, post, token)
-        index = render.app({ id: 'puppeteer', type: 'image', render: rd.render.bind(rd) })
-        break
-      }
-      case 'web':
-        if (data.path) {
-          const filePath = data.path
-          const query = data.query
-          if (query.html) {
-            ws.send(JSON.stringify({ type: 'web', command: 'redirect', path: filePath, target: query.html.startsWith('/') ? query.html.slice(1) : query.html, echo }))
-            return
-          }
-          const list = ['.css', '.html', '.ttf', '.jpg', '.jpeg', '.png', '.gif', '.bmp', '.ico', '.woff', '.woff2']
-          if (!list.some(ext => path.extname(filePath).endsWith(ext))) {
-            logger.warn(`拦截非资源文件${filePath}`)
-            ws.send(JSON.stringify({ type: 'web', state: 'error', error: '非资源文件', echo }))
-            return
-          }
-          /** 判断一下是否为html 如果是需要特殊处理 */
-          if (path.extname(filePath) === '.html') {
-            let html = filePath
-            /** 获取文件路径 对路径进行处理，去掉../、./ */
-            html = `./${html.replace(/\\/g, '/').replace(/(\.\/|\.\.\/)/g, '')}`
-            /** 判断是否为html文件且路径存在 */
-            if (!fs.existsSync(html)) {
-              return ws.send(JSON.stringify({ type: 'web', state: 'error', error: '文件不存在', echo }))
-            }
-            let content = fs.readFileSync(html, 'utf-8')
-            /** 处理所有绝对路径、相对路径 */
-            content = content.replace(new RegExp(`(${process.cwd()}|${process.cwd().replace(/\\/g, '/')})`, 'g'), '')
-            // 保存到本地
-            // filePath = './1.html'
-            // fs.writeFileSync(filePath, content, 'utf-8')
-            return ws.send(JSON.stringify({
-              type: 'web',
-              path: data.path,
-              command: 'resource',
-              data: Buffer.from(content),
-              state: 'complete',
-              part: 0,
-              echo,
-            }))
-          }
-          logger.info(`获取网页文件数据:${filePath}`)
-          // 获取文件
-          const stream = fs.createReadStream(filePath, { highWaterMark: chunkSize })
-          let part = 0
-          stream.on('data', chunk => {
-            part++
-            const message = {
-              type: 'web',
-              path: data.path,
-              command: 'resource',
-              data: chunk,
-              state: 'part',
-              part,
-              echo,
-            }
-            ws.send(JSON.stringify(message))
-          })
-          stream.on('end', () => {
-            part++
-            // 如果是最后一片段，则更新状态为 'complete'
-            if (stream.readableEnded) {
-              ws.send(JSON.stringify({
-                type: 'web',
-                path: data.path,
-                command: 'resource',
-                data: '',
-                state: 'complete',
-                part,
-                echo,
-              }))
+import fs from 'fs';
+import path from 'path';
+import { URL } from 'url';
+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 function Wormhole() {
+    let heartbeat;
+    let index = 0;
+    reConnect = undefined;
+    const wsUrl = config.Server.HttpRender.WormholeClient;
+    ws = new WebSocket(wsUrl);
+    ws.on('open', function open() {
+        logger.info('连接到wormhole服务器' + wsUrl);
+        // 发送心跳
+        heartbeat = setInterval(() => {
+            ws.send(JSON.stringify({ type: 'heartbeat', date: new Date() }));
+        }, 30000); // 每30秒发送一次心跳
+    });
+    ws.on('message', msg => {
+        let data = '';
+        try {
+            data = JSON.parse(msg.toString());
+        }
+        catch (error) {
+            logger.warn(`收到非法消息${data}`);
+        }
+        const echo = data.echo;
+        switch (data.type) {
+            case 'msg': {
+                const { post, token, WormholeClient } = config.Server.HttpRender;
+                const parsedUrl = new URL(WormholeClient);
+                const { hostname, port, pathname } = parsedUrl;
+                const ishttps = WormholeClient.includes('wss://');
+                const host = `${ishttps ? 'https' : 'http'}://${hostname}${port ? `:${port}` : ''}${pathname.replace(/ws\/(?=[^ws/]*$)/, 'web/')}${data.date}`;
+                logger.mark(`web渲染器已连接，地址：${host}`);
+                /** 注册渲染器 */
+                const rd = new HttpRenderer(host, post, token);
+                index = render.app({ id: 'puppeteer', type: 'image', render: rd.render.bind(rd) });
+                break;
             }
-          })
-          stream.on('error', err => {
-            ws.send(JSON.stringify({ type: 'web', state: 'error', error: err.message, echo }))
-          })
-        } else {
-          ws.send(JSON.stringify({ type: 'web', state: 'error', error: '错误的文件路径', echo }))
+            case 'web':
+                if (data.path) {
+                    const filePath = data.path;
+                    const query = data.query;
+                    if (query.html) {
+                        ws.send(JSON.stringify({ type: 'web', command: 'redirect', path: filePath, target: query.html.startsWith('/') ? query.html.slice(1) : query.html, echo }));
+                        return;
+                    }
+                    const list = ['.css', '.html', '.ttf', '.jpg', '.jpeg', '.png', '.gif', '.bmp', '.ico', '.woff', '.woff2'];
+                    if (!list.some(ext => path.extname(filePath).endsWith(ext))) {
+                        logger.warn(`拦截非资源文件${filePath}`);
+                        ws.send(JSON.stringify({ type: 'web', state: 'error', error: '非资源文件', echo }));
+                        return;
+                    }
+                    /** 判断一下是否为html 如果是需要特殊处理 */
+                    if (path.extname(filePath) === '.html') {
+                        let html = filePath;
+                        /** 获取文件路径 对路径进行处理，去掉../、./ */
+                        html = `./${html.replace(/\\/g, '/').replace(/(\.\/|\.\.\/)/g, '')}`;
+                        /** 判断是否为html文件且路径存在 */
+                        if (!fs.existsSync(html)) {
+                            return ws.send(JSON.stringify({ type: 'web', state: 'error', error: '文件不存在', echo }));
+                        }
+                        let content = fs.readFileSync(html, 'utf-8');
+                        /** 处理所有绝对路径、相对路径 */
+                        content = content.replace(new RegExp(`(${process.cwd()}|${process.cwd().replace(/\\/g, '/')})`, 'g'), '');
+                        // 保存到本地
+                        // filePath = './1.html'
+                        // fs.writeFileSync(filePath, content, 'utf-8')
+                        return ws.send(JSON.stringify({
+                            type: 'web',
+                            path: data.path,
+                            command: 'resource',
+                            data: Buffer.from(content),
+                            state: 'complete',
+                            part: 0,
+                            echo,
+                        }));
+                    }
+                    logger.info(`获取网页文件数据:${filePath}`);
+                    // 获取文件
+                    const stream = fs.createReadStream(filePath, { highWaterMark: chunkSize });
+                    let part = 0;
+                    stream.on('data', chunk => {
+                        part++;
+                        const message = {
+                            type: 'web',
+                            path: data.path,
+                            command: 'resource',
+                            data: chunk,
+                            state: 'part',
+                            part,
+                            echo,
+                        };
+                        ws.send(JSON.stringify(message));
+                    });
+                    stream.on('end', () => {
+                        part++;
+                        // 如果是最后一片段，则更新状态为 'complete'
+                        if (stream.readableEnded) {
+                            ws.send(JSON.stringify({
+                                type: 'web',
+                                path: data.path,
+                                command: 'resource',
+                                data: '',
+                                state: 'complete',
+                                part,
+                                echo,
+                            }));
+                        }
+                    });
+                    stream.on('error', err => {
+                        ws.send(JSON.stringify({ type: 'web', state: 'error', error: err.message, echo }));
+                    });
+                }
+                else {
+                    ws.send(JSON.stringify({ type: 'web', state: 'error', error: '错误的文件路径', echo }));
+                }
+                break;
+            default:
+                logger.warn(`未知消息类型${JSON.stringify(data)}`);
+                break;
+        }
+    });
+    ws.on('close', function close() {
+        /** 卸载渲染器 */
+        index && render.unapp(index);
+        index = 0;
+        if (heartbeat) {
+            clearInterval(heartbeat);
+            heartbeat = null;
+        }
+        logger.warn('连接关闭，10秒后尝试重新连接');
+        if (!reConnect) {
+            reConnect = setTimeout(Wormhole, 10000);
+        }
+    });
+    ws.on('error', function error() {
+        /** 卸载渲染器 */
+        index && render.unapp(index);
+        index = 0;
+        if (heartbeat) {
+            clearInterval(heartbeat);
+            heartbeat = null;
+        }
+        logger.warn('连接错误，10秒后尝试重新连接');
+        if (!reConnect) {
+            reConnect = setTimeout(Wormhole, 10000);
         }
-        break
-      default:
-        logger.warn(`未知消息类型${JSON.stringify(data)}`)
-        break
-    }
-  })
-  ws.on('close', function close () {
-    /** 卸载渲染器 */
-    index && render.unapp(index)
-    index = 0
-    if (heartbeat) {
-      clearInterval(heartbeat)
-      heartbeat = null
-    }
-    logger.warn('连接关闭，10秒后尝试重新连接')
-    if (!reConnect) {
-      reConnect = setTimeout(Wormhole, 10000)
-    }
-  })
-  ws.on('error', function error () {
-    /** 卸载渲染器 */
-    index && render.unapp(index)
-    index = 0
-    if (heartbeat) {
-      clearInterval(heartbeat)
-      heartbeat = null
-    }
-    logger.warn('连接错误，10秒后尝试重新连接')
-    if (!reConnect) {
-      reConnect = setTimeout(Wormhole, 10000)
-    }
-  })
+    });
 }

package/lib/types/config/config.d.ts

@@ -121,9 +121,9 @@ export interface Config {
      */
     log_color: string;
     /**
-     * 关闭后台进程失败后是否继续启动 继续启动会导致多进程
+     * 重启是否调用pm2 如果不调用则会直接关机 此配置适合有进程守护的程序
      */
-    multi_progress: boolean;
+    pm2Restart: boolean;
     /**
      * ffmpeg配置
      */

package/lib/types/index.js

@@ -1,13 +1,13 @@
-export * from './adapter/base.js'
-export * from './config/config.js'
-export * from './element/element.js'
-export * from './element/qqbot.js'
-export * from './event/index.js'
-export * from './logger/logger.js'
-export * from './render/render.js'
-export * from './plugin/app.js'
-export * from './plugin/plugin.js'
-export * from './event/reply.js'
-export * from './adapter/api.js'
-export * from './onebot11/index.js'
-export * from './event/index.js'
+export * from './adapter/base.js';
+export * from './config/config.js';
+export * from './element/element.js';
+export * from './element/qqbot.js';
+export * from './event/index.js';
+export * from './logger/logger.js';
+export * from './render/render.js';
+export * from './plugin/app.js';
+export * from './plugin/plugin.js';
+export * from './event/reply.js';
+export * from './adapter/api.js';
+export * from './onebot11/index.js';
+export * from './event/index.js';

package/lib/types/type/global.d.ts

@@ -14,6 +14,8 @@ declare global {
             karin_app_lang: `${Lang}`;
             /** 运行器 "node" | "tsx" | "pm2" */
             karin_app_runner: `${Runner}`;
+            /** 版本 */
+            karin_app_version: string;
         }
     }
 }

package/lib/utils/index.d.ts

@@ -9,3 +9,5 @@ export * from './tools/update.js';
 export * from './config/yamlEditor.js';
 export * from './core/logger.js';
 export * from './config/updateVersion.js';
+export * from './tools/restart.js';
+export * from './tools/stop.js';

package/lib/utils/index.js

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

package/lib/utils/tools/exec.d.ts

@@ -1,32 +1,20 @@
+import { ExecOptions } from 'child_process';
 /**
  * 执行 shell 命令
  * @param cmd 命令
  * @param log 是否打印日志
  * @param options 选项
  */
-export declare const exec: (cmd: string, log?: boolean, options?: {
-    cwd: string;
-    encoding: string;
-}) => Promise<{
-    /**
-     * - 执行状态
-     */
+export declare const exec: (cmd: string, log?: boolean, options?: ExecOptions) => Promise<{
     status: "ok" | "failed";
-    /**
-     * - 错误信息
-     */
     error: Error | null;
-    stdout: string | "";
-    stderr: string | "";
+    stdout: string;
+    stderr: string;
 }>;
 /**
  * 执行 shell 命令
  * @param cmd 命令
- * @param log 是否打印日志
  * @param options 选项
  */
-export declare const execs: (cmd: string, options?: {
-    cwd: string;
-    encoding: string;
-}) => Promise<string>;
+export declare const execs: (cmd: string, options?: ExecOptions) => Promise<string>;
 export default exec;

package/lib/utils/tools/exec.js

@@ -6,41 +6,43 @@ import { exec as execCmd } from 'child_process';
  * @param log 是否打印日志
  * @param options 选项
  */
-export const exec = (cmd, log = true, options = { cwd: process.cwd(), encoding: 'utf-8' }) => {
+export const exec = async (cmd, log = true, options = { cwd: process.cwd() }) => {
+    const logType = (status) => ({
+        start: '[exec][开始执行]',
+        ok: '[exec][执行成功]',
+        failed: '[exec][执行失败]',
+    })[status];
+    const logMessage = (status, details = '') => {
+        if (log) {
+            const colorFunc = {
+                start: logger.yellow,
+                ok: logger.green,
+                failed: logger.red,
+            }[status];
+            logger.info([
+                colorFunc(logType(status)),
+                `cmd: ${cmd}`,
+                `cwd: ${options.cwd}`,
+                details,
+                '--------',
+            ].join('\n'));
+        }
+    };
+    logMessage('start');
     return new Promise(resolve => {
-        const logMessage = (level, message) => {
-            if (log)
-                logger[level](message);
-        };
-        const logType = (status) => {
-            switch (status) {
-                case '开始执行':
-                    return logger.yellow('[exec][开始执行]');
-                case 'ok':
-                    return logger.green('[exec][执行成功]');
-                case 'failed':
-                    return logger.red('[exec][执行失败]');
-            }
-        };
-        const formatMessage = (status, details) => [logType(status), `cmd: ${cmd}`, `cwd: ${options.cwd || process.cwd()}`, details, '--------'].join('\n');
-        logMessage('info', formatMessage('开始执行', ''));
-        execCmd(cmd, options, (error, stdout, stderr) => {
-            if (error) {
-                logMessage('error', formatMessage('failed', `Error: ${error.message || error.stack || error.toString()}`));
-                return resolve({ status: 'failed', error, stdout, stderr });
-            }
-            logMessage('mark', formatMessage('ok', `stdout: ${stdout}\nstderr: ${stderr}`));
-            resolve({ status: 'ok', error, stdout, stderr });
+        execCmd(cmd, options, (error, stdout = '', stderr = '') => {
+            const status = error ? 'failed' : 'ok';
+            logMessage(status, error ? `Error: ${error.message}` : `stdout: ${stdout}\nstderr: ${stderr}`);
+            resolve({ status, error, stdout, stderr });
         });
     });
 };
 /**
  * 执行 shell 命令
  * @param cmd 命令
- * @param log 是否打印日志
  * @param options 选项
  */
-export const execs = (cmd, options = { cwd: process.cwd(), encoding: 'utf-8' }) => {
+export const execs = (cmd, options = { cwd: process.cwd() }) => {
     return new Promise((resolve, reject) => {
         execCmd(cmd, options, (error, stdout) => {
             if (error)

package/lib/utils/tools/ffmpeg.d.ts

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

package/lib/utils/tools/restart.d.ts

@@ -0,0 +1,15 @@
+import { Contact } from '../../types/index.js';
+/**
+ * 重启Bot
+ * @param self_id - 机器人的id 传e.self_id
+ * @param contact - 事件联系人信息 也就是从哪来的这条消息 传e.contact即可
+ * @param message_id - 消息id 传e.message_id
+ * @param isFront - 是否为前台重启 默认是
+ */
+export declare const restart: (self_id: string, contact: Contact, message_id: string, isFront?: boolean) => Promise<{
+    status: string;
+    data: string;
+} | {
+    status: string;
+    data: Error | null;
+}>;

package/lib/utils/tools/restart.js

@@ -0,0 +1,39 @@
+import exec from './exec.js';
+import { level } from '../../db/index.js';
+import { config } from '../config/config.js';
+/**
+ * 重启Bot
+ * @param self_id - 机器人的id 传e.self_id
+ * @param contact - 事件联系人信息 也就是从哪来的这条消息 传e.contact即可
+ * @param message_id - 消息id 传e.message_id
+ * @param isFront - 是否为前台重启 默认是
+ */
+export const restart = async (self_id, contact, message_id, isFront = true) => {
+    const options = {
+        id: self_id,
+        contact,
+        message_id,
+        time: Date.now(),
+    };
+    const key = `karin:restart:${options.id}`;
+    await level.set(key, options);
+    if (isFront) {
+        if (!process.send)
+            return { status: 'failed', data: '前台重启失败，当前环境不支持，仅支持【npx karin start】启动的环境' };
+        process.send({ action: 'result', env: process.env });
+        process.exit();
+    }
+    if (!config.Config.pm2Restart)
+        process.exit();
+    if (process.env.pm_id) {
+        const pm2 = await exec('npx karin rs');
+        if (pm2.status === 'ok')
+            process.exit();
+        return { status: 'failed', data: pm2.error };
+    }
+    /** 调用pm2启动 */
+    const pm2 = await exec('npx karin pm2');
+    if (pm2.status === 'ok')
+        process.exit();
+    return { status: 'failed', data: pm2.error };
+};

package/lib/utils/tools/stop.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 停止Bot
+ */
+export declare const stop: () => Promise<{
+    status: string;
+    data: Error | null;
+}>;

package/lib/utils/tools/stop.js

@@ -0,0 +1,13 @@
+import exec from './exec.js';
+/**
+ * 停止Bot
+ */
+export const stop = async () => {
+    if (process.env.pm_id) {
+        const pm2 = await exec('pm2 delete ' + process.env.pm_id);
+        if (pm2.status === 'ok')
+            process.exit();
+        return { status: 'failed', data: pm2.error };
+    }
+    process.exit();
+};