koishi-plugin-spawn-modified 1.2.1 → 1.2.3

package/lib/index.js

@@ -54,7 +54,7 @@ var child_process_1 = require("child_process");
 var koishi_1 = require("koishi");
 var path_1 = __importDefault(require("path"));
 var url_1 = require("url");
-var debug_log_1 = require("./debug-log");
+var ansi_to_html_1 = __importDefault(require("ansi-to-html"));
 var encodings = ['utf8', 'utf16le', 'latin1', 'ucs2'];
 exports.Config = koishi_1.Schema.object({
     root: koishi_1.Schema.string().description('工作路径。').default(''),
@@ -75,11 +75,29 @@ exports.inject = {
 // 当前工作目录状态管理
 var sessionDirs = new Map();
 // 命令过滤：支持黑名单/白名单模式
+function buildRegex(entry) {
+    try {
+        return new RegExp(entry, 'i');
+    }
+    catch (_) {
+        // 回退为逐字匹配，防止用户写了非法正则
+        var escaped = entry.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        try {
+            return new RegExp(escaped, 'i');
+        }
+        catch (_) {
+            return null;
+        }
+    }
+}
 function isCommandBlocked(command, mode, list) {
     if (!(list === null || list === void 0 ? void 0 : list.length))
         return false;
-    var trimmedCommand = command.trim().toLowerCase();
-    var hit = list.some(function (entry) { return trimmedCommand.startsWith(entry.toLowerCase()); });
+    var trimmedCommand = command.trim();
+    var hit = list.some(function (entry) {
+        var regex = buildRegex(entry);
+        return regex ? regex.test(trimmedCommand) : false;
+    });
     return mode === 'blacklist' ? hit : !hit;
 }
 // 解析 cd 命令并验证路径
@@ -101,24 +119,36 @@ function validateCdCommand(command, currentDir, rootDir, restrictDirectory) {
 // 渲染终端输出为图片
 function renderTerminalImage(ctx, workingDir, command, output) {
     return __awaiter(this, void 0, void 0, function () {
-        var displayOutput, lines, commandLineLength, maxLineLength, charWidth, horizontalBuffer, containerWidth, fontPath, html, page, element, screenshot;
+        var ansiStrip, normalizeTabs, displayOutputRaw, displayOutput, lines, commandLineLength, visibleLineLengths, maxLineLength, charWidth, horizontalBuffer, containerWidth, ansi, coloredOutputHtml, fontPath, html, page, element, screenshot;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     if (!ctx.puppeteer) {
                         throw new Error('Puppeteer plugin is not available');
                     }
-                    displayOutput = output || '(no output)';
+                    ansiStrip = function (text) { return text.replace(/\x1B\[[0-9;]*[A-Za-z]/g, ''); };
+                    normalizeTabs = function (text) { return text.replace(/\t/g, '        '); };
+                    displayOutputRaw = normalizeTabs(output || '(no output)');
+                    displayOutput = displayOutputRaw.replace(/^\s+/, '');
                     lines = displayOutput.split(/\r?\n/);
-                    commandLineLength = "".concat(workingDir, "$ ").concat(command).length;
-                    maxLineLength = Math.max.apply(Math, __spreadArray([commandLineLength], lines.map(function (line) { return line.length; }), false)) || commandLineLength;
-                    charWidth = 7.4 // approximate width of JetBrains Mono at 13px
+                    commandLineLength = ansiStrip("".concat(workingDir, "$ ").concat(command)).length;
+                    visibleLineLengths = lines.map(function (line) { return ansiStrip(line).length; });
+                    maxLineLength = Math.max.apply(Math, __spreadArray([commandLineLength], visibleLineLengths, false)) || commandLineLength;
+                    charWidth = 7.1 // refined average width for JetBrains Mono 13px
                     ;
-                    horizontalBuffer = 48 // padding + borders + margin buffer
+                    horizontalBuffer = 56 // padding + borders + margin buffer
                     ;
-                    containerWidth = Math.max(600, Math.min(1400, Math.ceil(maxLineLength * charWidth + horizontalBuffer)));
+                    containerWidth = Math.max(600, Math.min(1600, Math.ceil(maxLineLength * charWidth + horizontalBuffer)));
+                    ansi = new ansi_to_html_1.default({
+                        fg: '#cccccc',
+                        bg: '#1e1e1e',
+                        newline: true,
+                        escapeXML: true,
+                        stream: false,
+                    });
+                    coloredOutputHtml = ansi.toHtml(displayOutput);
                     fontPath = (0, url_1.pathToFileURL)(path_1.default.resolve(__dirname, '../fonts/JetBrainsMono-Regular.ttf')).href;
-                    html = "\n<!DOCTYPE html>\n<html>\n<head>\n  <meta charset=\"UTF-8\">\n  <style>\n    @font-face {\n      font-family: 'JetBrains Mono';\n      src: url('".concat(fontPath, "') format('truetype');\n    }\n    \n    * {\n      margin: 0;\n      padding: 0;\n      box-sizing: border-box;\n    }\n    \n    body {\n      background: #1e1e1e;\n      color: #cccccc;\n      font-family: 'JetBrains Mono', 'Courier New', monospace;\n      font-weight: 400;\n      font-size: 13px;\n      padding: 0;\n      display: inline-block;\n      width: ").concat(containerWidth, "px;\n    }\n    \n    .terminal {\n      background: #1e1e1e;\n      border: 1px solid #3c3c3c;\n      border-radius: 8px;\n      overflow: hidden;\n      width: 100%;\n    }\n    \n    .title-bar {\n      background: #2d2d2d;\n      height: 35px;\n      display: flex;\n      align-items: center;\n      justify-content: space-between;\n      padding: 0 12px;\n      border-bottom: 1px solid #3c3c3c;\n    }\n    \n    .title {\n      color: #cccccc;\n      font-size: 13px;\n      font-weight: 500;\n    }\n    \n    .buttons {\n      display: flex;\n      gap: 8px;\n    }\n    \n    .button {\n      width: 12px;\n      height: 12px;\n      border-radius: 50%;\n    }\n    \n    .button.minimize { background: #ffbd2e; }\n    .button.maximize { background: #28c940; }\n    .button.close { background: #ff5f56; }\n    \n    .content {\n      padding: 10px 14px;\n      white-space: pre;\n      word-break: normal;\n      line-height: 1.25;\n      overflow-x: auto;\n    }\n    \n    .command-line {\n      display: flex;\n      gap: 4px;\n      align-items: baseline;\n      margin-bottom: 6px;\n    }\n    \n    .prompt {\n      color: #4ec9b0;\n      margin: 0;\n      flex-shrink: 0;\n    }\n    \n    .command {\n      color: #dcdcaa;\n      margin: 0;\n      word-break: normal;\n      flex: 1;\n    }\n    \n    .output {\n      color: #cccccc;\n      line-height: 1.22;\n      white-space: pre;\n      word-break: normal;\n      overflow-x: auto;\n    }\n  </style>\n</head>\n<body>\n  <div class=\"terminal\">\n    <div class=\"title-bar\">\n      <div class=\"title\">Terminal</div>\n      <div class=\"buttons\">\n        <div class=\"button minimize\"></div>\n        <div class=\"button maximize\"></div>\n        <div class=\"button close\"></div>\n      </div>\n    </div>\n    <div class=\"content\">\n      <div class=\"command-line\">\n        <div class=\"prompt\">").concat(escapeHtml(workingDir), "$</div>\n        <div class=\"command\">").concat(escapeHtml(command), "</div>\n      </div>\n      <div class=\"output\">").concat(escapeHtml(displayOutput), "</div>\n    </div>\n  </div>\n</body>\n</html>\n  ");
+                    html = "\n<!DOCTYPE html>\n<html>\n<head>\n  <meta charset=\"UTF-8\">\n  <style>\n    @font-face {\n      font-family: 'JetBrains Mono';\n      src: url('".concat(fontPath, "') format('truetype');\n    }\n    \n    * {\n      margin: 0;\n      padding: 0;\n      box-sizing: border-box;\n    }\n    \n    body {\n      background: #1e1e1e;\n      color: #cccccc;\n      font-family: 'JetBrains Mono', 'Courier New', monospace;\n      font-weight: 400;\n      font-size: 13px;\n      padding: 0;\n      display: inline-block;\n      width: ").concat(containerWidth, "px;\n      max-width: 1600px;\n      min-width: 600px;\n    }\n    \n    .terminal {\n      background: #1e1e1e;\n      border: 1px solid #3c3c3c;\n      border-radius: 8px;\n      overflow: hidden;\n      width: 100%;\n    }\n    \n    .title-bar {\n      background: #2d2d2d;\n      height: 35px;\n      display: flex;\n      align-items: center;\n      justify-content: space-between;\n      padding: 0 12px;\n      border-bottom: 1px solid #3c3c3c;\n    }\n    \n    .title {\n      color: #cccccc;\n      font-size: 13px;\n      font-weight: 500;\n    }\n    \n    .buttons {\n      display: flex;\n      gap: 8px;\n    }\n    \n    .button {\n      width: 12px;\n      height: 12px;\n      border-radius: 50%;\n    }\n    \n    .button.minimize { background: #ffbd2e; }\n    .button.maximize { background: #28c940; }\n    .button.close { background: #ff5f56; }\n    \n    .content {\n      padding: 8px 12px;\n      white-space: pre;\n      word-break: normal;\n      line-height: 1.18;\n      overflow-x: auto;\n    }\n    \n    .command-line {\n      display: flex;\n      gap: 3px;\n      align-items: baseline;\n      margin-bottom: 2px;\n    }\n    \n    .prompt {\n      color: #4ec9b0;\n      margin: 0;\n      flex-shrink: 0;\n    }\n    \n    .command {\n      color: #dcdcaa;\n      margin: 0;\n      word-break: normal;\n      flex: 1;\n    }\n    \n    .output {\n      color: #cccccc;\n      line-height: 1.12;\n      white-space: pre;\n      word-break: normal;\n      overflow-x: auto;\n    }\n  </style>\n</head>\n<body>\n  <div class=\"terminal\">\n    <div class=\"title-bar\">\n      <div class=\"title\">Terminal</div>\n      <div class=\"buttons\">\n        <div class=\"button minimize\"></div>\n        <div class=\"button maximize\"></div>\n        <div class=\"button close\"></div>\n      </div>\n    </div>\n    <div class=\"content\">\n      <div class=\"command-line\">\n        <div class=\"prompt\">").concat(escapeHtml(workingDir), "$</div>\n        <div class=\"command\">").concat(escapeHtml(command), "</div>\n      </div>\n      <div class=\"output\">").concat(coloredOutputHtml, "</div>\n    </div>\n  </div>\n</body>\n</html>\n  ");
                     return [4 /*yield*/, ctx.puppeteer.page()];
                 case 1:
                     page = _a.sent();
@@ -168,32 +198,25 @@ function apply(ctx, config) {
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
-                    (0, debug_log_1.debugLog)(ctx, 'input', { command: command });
                     if (!command) {
-                        (0, debug_log_1.debugLog)(ctx, 'expect-text', { text: session.text('.expect-text') });
                         return [2 /*return*/, session.text('.expect-text')];
                     }
                     command = (0, koishi_1.h)('', koishi_1.h.parse(command)).toString(true);
-                    (0, debug_log_1.debugLog)(ctx, 'parsed-command', { command: command });
                     filterList = (((_c = config.commandList) === null || _c === void 0 ? void 0 : _c.length) ? config.commandList : config.blockedCommands) || [];
                     filterMode = config.commandFilterMode || 'blacklist';
                     if (isCommandBlocked(command, filterMode, filterList)) {
-                        (0, debug_log_1.debugLog)(ctx, 'blocked-command', { command: command, filterMode: filterMode, filterList: filterList });
                         return [2 /*return*/, session.text('.blocked-command')];
                     }
                     sessionId = session.uid || session.channelId;
                     rootDir = path_1.default.resolve(ctx.baseDir, config.root);
                     currentDir = sessionDirs.get(sessionId) || rootDir;
                     cdValidation = validateCdCommand(command, currentDir, rootDir, config.restrictDirectory);
-                    (0, debug_log_1.debugLog)(ctx, 'cd-validation', { command: command, cdValidation: cdValidation });
                     if (!cdValidation.valid) {
-                        (0, debug_log_1.debugLog)(ctx, 'restricted-directory', { text: session.text('.restricted-directory') });
                         return [2 /*return*/, session.text('.restricted-directory')];
                     }
                     timeout = config.timeout;
                     state = { command: command, timeout: timeout, output: '' };
                     if (!!config.renderImage) return [3 /*break*/, 2];
-                    (0, debug_log_1.debugLog)(ctx, 'send-started', { text: session.text('.started', state) });
                     return [4 /*yield*/, session.send(session.text('.started', state))];
                 case 1:
                     _d.sent();
@@ -208,11 +231,9 @@ function apply(ctx, config) {
                             windowsHide: true,
                         });
                         child.stdout.on('data', function (data) {
-                            (0, debug_log_1.debugLog)(ctx, 'stdout', { data: data.toString() });
                             state.output += data.toString();
                         });
                         child.stderr.on('data', function (data) {
-                            (0, debug_log_1.debugLog)(ctx, 'stderr', { data: data.toString() });
                             state.output += data.toString();
                         });
                         child.on('close', function (code, signal) { return __awaiter(_this, void 0, void 0, function () {
@@ -224,11 +245,9 @@ function apply(ctx, config) {
                                         state.signal = signal;
                                         state.timeUsed = Date.now() - start;
                                         state.output = state.output.trim();
-                                        (0, debug_log_1.debugLog)(ctx, 'close', { code: code, signal: signal, timeUsed: state.timeUsed, output: state.output });
                                         // 更新当前目录（如果是 cd 命令且执行成功）
                                         if (cdValidation.newDir && code === 0) {
                                             sessionDirs.set(sessionId, cdValidation.newDir);
-                                            (0, debug_log_1.debugLog)(ctx, 'cd-updated', { sessionId: sessionId, newDir: cdValidation.newDir });
                                         }
                                         if (!(config.renderImage && ctx.puppeteer)) return [3 /*break*/, 5];
                                         _a.label = 1;
@@ -237,18 +256,15 @@ function apply(ctx, config) {
                                         return [4 /*yield*/, renderTerminalImage(ctx, currentDir, command, state.output || '(no output)')];
                                     case 2:
                                         image = _a.sent();
-                                        (0, debug_log_1.debugLog)(ctx, 'render-image-success');
                                         resolve(image);
                                         return [3 /*break*/, 4];
                                     case 3:
                                         error_1 = _a.sent();
                                         ctx.logger.error('Failed to render terminal image:', error_1);
-                                        (0, debug_log_1.debugLog)(ctx, 'render-image-fail', { error: error_1 });
                                         resolve(session.text('.finished', state));
                                         return [3 /*break*/, 4];
                                     case 4: return [3 /*break*/, 6];
                                     case 5:
-                                        (0, debug_log_1.debugLog)(ctx, 'send-finished', { text: session.text('.finished', state) });
                                         resolve(session.text('.finished', state));
                                         _a.label = 6;
                                     case 6: return [2 /*return*/];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-spawn-modified",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "Run shell commands with Koishi",
   "keywords": [
     "bot",
@@ -83,5 +83,8 @@
         "puppeteer"
       ]
     }
+  },
+  "dependencies": {
+    "ansi-to-html": "^0.7.2"
   }
 }

package/src/index.ts

@@ -2,7 +2,7 @@ import { exec } from 'child_process'
 import { Context, h, Schema, Time } from 'koishi'
 import path from 'path'
 import { pathToFileURL } from 'url'
-import { debugLog } from './debug-log'
+import AnsiToHtml from 'ansi-to-html'
 
 declare module 'koishi' {
   interface Context {
@@ -59,10 +59,27 @@ export const inject = {
 const sessionDirs = new Map<string, string>()
 
 // 命令过滤：支持黑名单/白名单模式
+function buildRegex(entry: string): RegExp | null {
+  try {
+    return new RegExp(entry, 'i')
+  } catch (_) {
+    // 回退为逐字匹配，防止用户写了非法正则
+    const escaped = entry.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+    try {
+      return new RegExp(escaped, 'i')
+    } catch (_) {
+      return null
+    }
+  }
+}
+
 function isCommandBlocked(command: string, mode: 'blacklist' | 'whitelist', list: string[]): boolean {
   if (!list?.length) return false
-  const trimmedCommand = command.trim().toLowerCase()
-  const hit = list.some(entry => trimmedCommand.startsWith(entry.toLowerCase()))
+  const trimmedCommand = command.trim()
+  const hit = list.some(entry => {
+    const regex = buildRegex(entry)
+    return regex ? regex.test(trimmedCommand) : false
+  })
   return mode === 'blacklist' ? hit : !hit
 }
 
@@ -91,13 +108,26 @@ async function renderTerminalImage(ctx: Context, workingDir: string, command: st
     throw new Error('Puppeteer plugin is not available')
   }
 
-  const displayOutput = output || '(no output)'
+  const ansiStrip = (text: string) => text.replace(/\x1B\[[0-9;]*[A-Za-z]/g, '')
+  const normalizeTabs = (text: string) => text.replace(/\t/g, '        ')
+  const displayOutputRaw = normalizeTabs(output || '(no output)')
+  const displayOutput = displayOutputRaw.replace(/^\s+/, '')
   const lines = displayOutput.split(/\r?\n/)
-  const commandLineLength = `${workingDir}$ ${command}`.length
-  const maxLineLength = Math.max(commandLineLength, ...lines.map(line => line.length)) || commandLineLength
-  const charWidth = 7.4 // approximate width of JetBrains Mono at 13px
-  const horizontalBuffer = 48 // padding + borders + margin buffer
-  const containerWidth = Math.max(600, Math.min(1400, Math.ceil(maxLineLength * charWidth + horizontalBuffer)))
+  const commandLineLength = ansiStrip(`${workingDir}$ ${command}`).length
+  const visibleLineLengths = lines.map(line => ansiStrip(line).length)
+  const maxLineLength = Math.max(commandLineLength, ...visibleLineLengths) || commandLineLength
+  const charWidth = 7.1 // refined average width for JetBrains Mono 13px
+  const horizontalBuffer = 56 // padding + borders + margin buffer
+  const containerWidth = Math.max(600, Math.min(1600, Math.ceil(maxLineLength * charWidth + horizontalBuffer)))
+
+  const ansi = new AnsiToHtml({
+    fg: '#cccccc',
+    bg: '#1e1e1e',
+    newline: true,
+    escapeXML: true,
+    stream: false,
+  })
+  const coloredOutputHtml = ansi.toHtml(displayOutput)
 
   const fontPath = pathToFileURL(path.resolve(__dirname, '../fonts/JetBrainsMono-Regular.ttf')).href
   
@@ -127,6 +157,8 @@ async function renderTerminalImage(ctx: Context, workingDir: string, command: st
       padding: 0;
       display: inline-block;
       width: ${containerWidth}px;
+      max-width: 1600px;
+      min-width: 600px;
     }
     
     .terminal {
@@ -169,18 +201,18 @@ async function renderTerminalImage(ctx: Context, workingDir: string, command: st
     .button.close { background: #ff5f56; }
     
     .content {
-      padding: 10px 14px;
+      padding: 8px 12px;
       white-space: pre;
       word-break: normal;
-      line-height: 1.25;
+      line-height: 1.18;
       overflow-x: auto;
     }
     
     .command-line {
       display: flex;
-      gap: 4px;
+      gap: 3px;
       align-items: baseline;
-      margin-bottom: 6px;
+      margin-bottom: 2px;
     }
     
     .prompt {
@@ -198,7 +230,7 @@ async function renderTerminalImage(ctx: Context, workingDir: string, command: st
     
     .output {
       color: #cccccc;
-      line-height: 1.22;
+      line-height: 1.12;
       white-space: pre;
       word-break: normal;
       overflow-x: auto;
@@ -220,7 +252,7 @@ async function renderTerminalImage(ctx: Context, workingDir: string, command: st
         <div class="prompt">${escapeHtml(workingDir)}$</div>
         <div class="command">${escapeHtml(command)}</div>
       </div>
-      <div class="output">${escapeHtml(displayOutput)}</div>
+      <div class="output">${coloredOutputHtml}</div>
     </div>
   </div>
 </body>
@@ -255,19 +287,15 @@ export function apply(ctx: Context, config: Config) {
 
   ctx.command('exec <command:text>', { authority: config.authority ?? 4 })
     .action(async ({ session }, command) => {
-      debugLog(ctx, 'input', { command })
       if (!command) {
-        debugLog(ctx, 'expect-text', { text: session.text('.expect-text') })
         return session.text('.expect-text')
       }
 
       command = h('', h.parse(command)).toString(true)
-      debugLog(ctx, 'parsed-command', { command })
       // 检查命令过滤（黑/白名单）
       const filterList = (config.commandList?.length ? config.commandList : config.blockedCommands) || []
       const filterMode = config.commandFilterMode || 'blacklist'
       if (isCommandBlocked(command, filterMode, filterList)) {
-        debugLog(ctx, 'blocked-command', { command, filterMode, filterList })
         return session.text('.blocked-command')
       }
       const sessionId = session.uid || session.channelId
@@ -275,15 +303,12 @@ export function apply(ctx: Context, config: Config) {
       const currentDir = sessionDirs.get(sessionId) || rootDir
       // 验证 cd 命令
       const cdValidation = validateCdCommand(command, currentDir, rootDir, config.restrictDirectory)
-      debugLog(ctx, 'cd-validation', { command, cdValidation })
       if (!cdValidation.valid) {
-        debugLog(ctx, 'restricted-directory', { text: session.text('.restricted-directory') })
         return session.text('.restricted-directory')
       }
       const { timeout } = config
       const state: State = { command, timeout, output: '' }
       if (!config.renderImage) {
-        debugLog(ctx, 'send-started', { text: session.text('.started', state) })
         await session.send(session.text('.started', state))
       }
       return new Promise((resolve) => {
@@ -296,11 +321,9 @@ export function apply(ctx: Context, config: Config) {
           windowsHide: true,
         })
         child.stdout.on('data', (data) => {
-          debugLog(ctx, 'stdout', { data: data.toString() })
           state.output += data.toString()
         })
         child.stderr.on('data', (data) => {
-          debugLog(ctx, 'stderr', { data: data.toString() })
           state.output += data.toString()
         })
         child.on('close', async (code, signal) => {
@@ -308,25 +331,20 @@ export function apply(ctx: Context, config: Config) {
           state.signal = signal
           state.timeUsed = Date.now() - start
           state.output = state.output.trim()
-          debugLog(ctx, 'close', { code, signal, timeUsed: state.timeUsed, output: state.output })
           // 更新当前目录（如果是 cd 命令且执行成功）
           if (cdValidation.newDir && code === 0) {
             sessionDirs.set(sessionId, cdValidation.newDir)
-            debugLog(ctx, 'cd-updated', { sessionId, newDir: cdValidation.newDir })
           }
           // 渲染为图片或返回文本
           if (config.renderImage && ctx.puppeteer) {
             try {
               const image = await renderTerminalImage(ctx, currentDir, command, state.output || '(no output)')
-              debugLog(ctx, 'render-image-success')
               resolve(image)
             } catch (error) {
               ctx.logger.error('Failed to render terminal image:', error)
-              debugLog(ctx, 'render-image-fail', { error })
               resolve(session.text('.finished', state))
             }
           } else {
-            debugLog(ctx, 'send-finished', { text: session.text('.finished', state) })
             resolve(session.text('.finished', state))
           }
         })