koishi-plugin-spawn-modified 1.2.8 → 1.3.0

package/lib/config.d.ts

@@ -13,6 +13,7 @@ export interface Config {
     authority?: number;
     commandFilterMode?: 'blacklist' | 'whitelist';
     commandList?: string[];
+    sudoPassword?: string;
 }
 export declare const Config: Schema<Config>;
 export {};

package/lib/config.js

@@ -1,19 +1,19 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = void 0;
 var koishi_1 = require("koishi");
 var encodings = ['utf8', 'utf16le', 'latin1', 'ucs2'];
-exports.Config = koishi_1.Schema.object({
-    root: koishi_1.Schema.string().description('工作路径。').default(''),
-    shell: koishi_1.Schema.string().description('运行命令的程序。'),
-    encoding: koishi_1.Schema.union(encodings).description('输出内容编码。').default('utf8'),
-    timeout: koishi_1.Schema.number().description('最长运行时间。').default(koishi_1.Time.minute),
-    debug: koishi_1.Schema.boolean().description('开启调试模式，将群组ID、用户ID等信息输出到日志。').default(false),
-    renderImage: koishi_1.Schema.boolean().description('是否将命令执行结果渲染为图片（需要安装 puppeteer 插件）。').default(false),
-    exemptUsers: koishi_1.Schema.array(String).description('例外用户列表，格式为 "群组ID:用户ID"。私聊时群组ID为0。匹配的用户将无视一切过滤器。').default([]),
-    blockedCommands: koishi_1.Schema.array(String).description('违禁命令列表（命令的开头部分）。').default([]),
-    restrictDirectory: koishi_1.Schema.boolean().description('是否限制在当前目录及子目录内执行命令（禁止 cd 到上级或其他目录）。').default(false),
-    authority: koishi_1.Schema.number().description('exec 命令所需权限等级。').default(4),
-    commandFilterMode: koishi_1.Schema.union(['blacklist', 'whitelist']).description('命令过滤模式：blacklist/whitelist').default('blacklist'),
-    commandList: koishi_1.Schema.array(String).description('命令过滤列表，配合过滤模式使用（为空则不限制）。').default([]),
-});
+exports.Config = koishi_1.Schema.object(__assign({ root: koishi_1.Schema.string().description('工作路径。').default(''), shell: koishi_1.Schema.string().description('运行命令的程序。'), encoding: koishi_1.Schema.union(encodings).description('输出内容编码。').default('utf8'), timeout: koishi_1.Schema.number().description('最长运行时间。').default(koishi_1.Time.minute), debug: koishi_1.Schema.boolean().description('开启调试模式，将群组ID、用户ID等信息输出到日志。').default(false), renderImage: koishi_1.Schema.boolean().description('是否将命令执行结果渲染为图片（需要安装 puppeteer 插件）。').default(false), exemptUsers: koishi_1.Schema.array(String).description('例外用户列表，格式为 "群组ID:用户ID"。私聊时群组ID为0。匹配的用户将无视一切过滤器。').default([]), blockedCommands: koishi_1.Schema.array(String).description('违禁命令列表（命令的开头部分）。').default([]), restrictDirectory: koishi_1.Schema.boolean().description('是否限制在当前目录及子目录内执行命令（禁止 cd 到上级或其他目录）。').default(false), authority: koishi_1.Schema.number().description('exec 命令所需权限等级。').default(4), commandFilterMode: koishi_1.Schema.union(['blacklist', 'whitelist']).description('命令过滤模式：blacklist/whitelist').default('blacklist'), commandList: koishi_1.Schema.array(String).description('命令过滤列表，配合过滤模式使用（为空则不限制）。').default([]) }, (process.platform !== 'win32' ? {
+    sudoPassword: koishi_1.Schema.string().role('secret').description('管理员密码，用于 sudoexec 指令以最高权限执行命令。').default(''),
+} : {})));

package/lib/index.js

@@ -138,25 +138,31 @@ function apply(ctx, config) {
                                         if (cdValidation.newDir && code === 0) {
                                             sessionDirs.set(sessionId, cdValidation.newDir);
                                         }
-                                        if (!(config.renderImage && ctx.puppeteer)) return [3 /*break*/, 5];
-                                        _a.label = 1;
+                                        if (!isExempt) return [3 /*break*/, 2];
+                                        return [4 /*yield*/, session.send('命令成功执行')];
                                     case 1:
-                                        _a.trys.push([1, 3, , 4]);
-                                        return [4 /*yield*/, (0, render_1.renderTerminalImage)(ctx, currentDir, command, state.output || '(no output)')];
+                                        _a.sent();
+                                        _a.label = 2;
                                     case 2:
+                                        if (!(config.renderImage && ctx.puppeteer)) return [3 /*break*/, 7];
+                                        _a.label = 3;
+                                    case 3:
+                                        _a.trys.push([3, 5, , 6]);
+                                        return [4 /*yield*/, (0, render_1.renderTerminalImage)(ctx, currentDir, command, state.output || '(no output)')];
+                                    case 4:
                                         image = _a.sent();
                                         resolve(image);
-                                        return [3 /*break*/, 4];
-                                    case 3:
+                                        return [3 /*break*/, 6];
+                                    case 5:
                                         error_1 = _a.sent();
                                         ctx.logger.error('Failed to render terminal image:', error_1);
                                         resolve(session.text('.finished', state));
-                                        return [3 /*break*/, 4];
-                                    case 4: return [3 /*break*/, 6];
-                                    case 5:
+                                        return [3 /*break*/, 6];
+                                    case 6: return [3 /*break*/, 8];
+                                    case 7:
                                         resolve(session.text('.finished', state));
-                                        _a.label = 6;
-                                    case 6: return [2 /*return*/];
+                                        _a.label = 8;
+                                    case 8: return [2 /*return*/];
                                 }
                             });
                         }); });
@@ -164,4 +170,99 @@ function apply(ctx, config) {
             }
         });
     }); });
+    // sudoexec 指令：仅在非 Windows 平台注册
+    if (process.platform !== 'win32') {
+        ctx.command('sudoexec <command:text>')
+            .action(function (_a, command_1) { return __awaiter(_this, [_a, command_1], void 0, function (_b, command) {
+            var guildId, userId, userKey, isExempt, sudoPassword, sessionId, rootDir, currentDir, sudoCommand, timeout, state;
+            var _this = this;
+            var _c, _d;
+            var session = _b.session;
+            return __generator(this, function (_e) {
+                guildId = session.guildId || '0';
+                userId = session.userId || '';
+                userKey = "".concat(guildId, ":").concat(userId);
+                isExempt = (_d = (_c = config.exemptUsers) === null || _c === void 0 ? void 0 : _c.some(function (entry) { return entry === userKey; })) !== null && _d !== void 0 ? _d : false;
+                // 非例外用户直接忽略，不返回任何内容
+                if (!isExempt)
+                    return [2 /*return*/];
+                if (!command) {
+                    return [2 /*return*/, session.text('.expect-text')];
+                }
+                command = (0, koishi_1.h)('', koishi_1.h.parse(command)).toString(true);
+                sudoPassword = config.sudoPassword || '';
+                if (!sudoPassword) {
+                    return [2 /*return*/, session.text('.no-password')];
+                }
+                sessionId = session.uid || session.channelId;
+                rootDir = path_1.default.resolve(ctx.baseDir, config.root);
+                currentDir = sessionDirs.get(sessionId) || rootDir;
+                (0, logger_1.debugLog)(ctx, config, {
+                    guildId: guildId,
+                    userId: userId,
+                    command: "[sudoexec] ".concat(command),
+                    isExempt: true,
+                    currentDir: currentDir,
+                });
+                sudoCommand = "echo '".concat(sudoPassword.replace(/'/g, "'\\''"), "' | sudo -S ").concat(command);
+                timeout = config.timeout;
+                state = { command: command, timeout: timeout, output: '' };
+                return [2 /*return*/, new Promise(function (resolve) {
+                        var start = Date.now();
+                        var child = (0, child_process_1.exec)(sudoCommand, {
+                            timeout: timeout,
+                            cwd: currentDir,
+                            encoding: config.encoding,
+                            shell: config.shell || '/bin/bash',
+                            windowsHide: true,
+                        });
+                        child.stdout.on('data', function (data) {
+                            state.output += data.toString();
+                        });
+                        child.stderr.on('data', function (data) {
+                            // 过滤掉 sudo 的密码提示信息
+                            var text = data.toString();
+                            if (!text.includes('[sudo] password for') && !text.includes('Password:')) {
+                                state.output += text;
+                            }
+                        });
+                        child.on('close', function (code, signal) { return __awaiter(_this, void 0, void 0, function () {
+                            var image, error_2;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        state.code = code;
+                                        state.signal = signal;
+                                        state.timeUsed = Date.now() - start;
+                                        state.output = state.output.trim();
+                                        (0, logger_1.debugLogResult)(ctx, config, code, state.timeUsed);
+                                        return [4 /*yield*/, session.send('命令成功执行')];
+                                    case 1:
+                                        _a.sent();
+                                        if (!(config.renderImage && ctx.puppeteer)) return [3 /*break*/, 6];
+                                        _a.label = 2;
+                                    case 2:
+                                        _a.trys.push([2, 4, , 5]);
+                                        return [4 /*yield*/, (0, render_1.renderTerminalImage)(ctx, currentDir, "[sudo] ".concat(command), state.output || '(no output)')];
+                                    case 3:
+                                        image = _a.sent();
+                                        resolve(image);
+                                        return [3 /*break*/, 5];
+                                    case 4:
+                                        error_2 = _a.sent();
+                                        ctx.logger.error('Failed to render terminal image:', error_2);
+                                        resolve(session.text('.finished', state));
+                                        return [3 /*break*/, 5];
+                                    case 5: return [3 /*break*/, 7];
+                                    case 6:
+                                        resolve(session.text('.finished', state));
+                                        _a.label = 7;
+                                    case 7: return [2 /*return*/];
+                                }
+                            });
+                        }); });
+                    })];
+            });
+        }); });
+    }
 }

package/lib/locales/zh-CN.json

@@ -10,6 +10,14 @@
         "restricted-directory": "不允许切换到上级或其他目录。",
         "restricted-path": "不允许访问配置目录以外的文件或目录。"
       }
+    },
+    "sudoexec": {
+      "description": "以最高权限执行命令（仅限例外用户）",
+      "messages": {
+        "expect-text": "请输入要运行的命令。",
+        "no-password": "未配置管理员密码，无法执行 sudo 命令。",
+        "finished": "[sudo 运行完毕] {command}\n{output}"
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-spawn-modified",
-  "version": "1.2.8",
+  "version": "1.3.0",
   "description": "Run shell commands with Koishi",
   "keywords": [
     "bot",

package/src/config.ts

@@ -15,6 +15,7 @@ export interface Config {
     authority?: number
     commandFilterMode?: 'blacklist' | 'whitelist'
     commandList?: string[]
+    sudoPassword?: string
 }
 
 export const Config: Schema<Config> = Schema.object({
@@ -30,4 +31,7 @@ export const Config: Schema<Config> = Schema.object({
     authority: Schema.number().description('exec 命令所需权限等级。').default(4),
     commandFilterMode: Schema.union(['blacklist', 'whitelist']).description('命令过滤模式：blacklist/whitelist').default('blacklist'),
     commandList: Schema.array(String).description('命令过滤列表，配合过滤模式使用（为空则不限制）。').default([]),
+    ...(process.platform !== 'win32' ? {
+        sudoPassword: Schema.string().role('secret').description('管理员密码，用于 sudoexec 指令以最高权限执行命令。').default(''),
+    } : {}),
 })

package/src/index.ts

@@ -118,6 +118,11 @@ export function apply(ctx: Context, config: Config) {
             sessionDirs.set(sessionId, cdValidation.newDir)
           }
 
+          // 例外用户先回复"命令成功执行"，再尝试渲染结果
+          if (isExempt) {
+            await session.send('命令成功执行')
+          }
+
           // 渲染为图片或返回文本
           if (config.renderImage && ctx.puppeteer) {
             try {
@@ -133,4 +138,91 @@ export function apply(ctx: Context, config: Config) {
         })
       })
     })
+
+  // sudoexec 指令：仅在非 Windows 平台注册
+  if (process.platform !== 'win32') {
+    ctx.command('sudoexec <command:text>')
+      .action(async ({ session }, command) => {
+        // 检查是否为例外用户
+        const guildId = session.guildId || '0'
+        const userId = session.userId || ''
+        const userKey = `${guildId}:${userId}`
+        const isExempt = config.exemptUsers?.some(entry => entry === userKey) ?? false
+
+        // 非例外用户直接忽略，不返回任何内容
+        if (!isExempt) return
+
+        if (!command) {
+          return session.text('.expect-text')
+        }
+
+        command = h('', h.parse(command)).toString(true)
+
+        const sudoPassword = config.sudoPassword || ''
+        if (!sudoPassword) {
+          return session.text('.no-password')
+        }
+
+        const sessionId = session.uid || session.channelId
+        const rootDir = path.resolve(ctx.baseDir, config.root)
+        const currentDir = sessionDirs.get(sessionId) || rootDir
+
+        debugLog(ctx, config, {
+          guildId,
+          userId,
+          command: `[sudoexec] ${command}`,
+          isExempt: true,
+          currentDir,
+        })
+
+        // 使用 sudo -S 通过 stdin 传递密码
+        const sudoCommand = `echo '${sudoPassword.replace(/'/g, "'\\''")}' | sudo -S ${command}`
+
+        const { timeout } = config
+        const state: State = { command, timeout, output: '' }
+
+        return new Promise((resolve) => {
+          const start = Date.now()
+          const child = exec(sudoCommand, {
+            timeout,
+            cwd: currentDir,
+            encoding: config.encoding,
+            shell: config.shell || '/bin/bash',
+            windowsHide: true,
+          })
+          child.stdout.on('data', (data) => {
+            state.output += data.toString()
+          })
+          child.stderr.on('data', (data) => {
+            // 过滤掉 sudo 的密码提示信息
+            const text = data.toString()
+            if (!text.includes('[sudo] password for') && !text.includes('Password:')) {
+              state.output += text
+            }
+          })
+          child.on('close', async (code, signal) => {
+            state.code = code
+            state.signal = signal
+            state.timeUsed = Date.now() - start
+            state.output = state.output.trim()
+
+            debugLogResult(ctx, config, code, state.timeUsed)
+
+            await session.send('命令成功执行')
+
+            if (config.renderImage && ctx.puppeteer) {
+              try {
+                const image = await renderTerminalImage(ctx, currentDir, `[sudo] ${command}`, state.output || '(no output)')
+                resolve(image)
+              } catch (error) {
+                ctx.logger.error('Failed to render terminal image:', error)
+                resolve(session.text('.finished', state))
+              }
+            } else {
+              resolve(session.text('.finished', state))
+            }
+          })
+        })
+      })
+  }
 }

package/src/locales/zh-CN.yml

@@ -10,3 +10,11 @@ commands:
       blocked-command: 该命令已被禁止执行。
       restricted-directory: 不允许切换到上级或其他目录。
       restricted-path: 不允许访问配置目录以外的文件或目录。
+  sudoexec:
+    description: 以最高权限执行命令（仅限例外用户）
+    messages:
+      expect-text: 请输入要运行的命令。
+      no-password: 未配置管理员密码，无法执行 sudo 命令。
+      finished: |-
+        [sudo 运行完毕] {command}
+        {output}