koishi-plugin-terminal 1.0.1 → 1.0.3

package/lib/index.d.ts

@@ -15,6 +15,7 @@ export interface ShellSession {
     terminal: pty.IPty;
     buffer: string;
     timer?: NodeJS.Timeout;
+    timeoutTimer?: NodeJS.Timeout;
     disposables: Array<{
         dispose(): void;
     }>;

package/lib/index.js

@@ -37,6 +37,8 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
 var pty = __toESM(require("node-pty"));
+var import_node_fs = require("node:fs");
+var import_node_path = require("node:path");
 var import_node_timers = require("node:timers");
 var name = "terminal";
 var Config = import_koishi.Schema.object({
@@ -75,10 +77,54 @@ function getKey(session) {
   return `${session.platform}:${session.userId}`;
 }
 __name(getKey, "getKey");
+function fixNodePtyHelper() {
+  if (process.platform !== "darwin") return;
+  try {
+    const root = (0, import_node_path.dirname)(require.resolve("node-pty/package.json"));
+    const helper = (0, import_node_path.join)(root, "prebuilds", `darwin-${process.arch}`, "spawn-helper");
+    const mode = (0, import_node_fs.statSync)(helper).mode;
+    if (!(mode & 73)) (0, import_node_fs.chmodSync)(helper, mode | 493);
+  } catch {
+  }
+}
+__name(fixNodePtyHelper, "fixNodePtyHelper");
+function isInteractiveCommand(command) {
+  const trimmed = command.trim();
+  if (!trimmed) return false;
+  const [name2, ...args] = trimmed.split(/\s+/);
+  if (/^(vi|vim|nvim|nano|emacs)$/.test(name2)) return true;
+  if (/^(less|more|man)$/.test(name2)) return true;
+  if (/^(top|htop|btop|watch)$/.test(name2)) return true;
+  if (/^(tmux|screen)$/.test(name2)) return true;
+  if (/^(sftp|ftp|telnet)$/.test(name2)) return true;
+  if (/^(mysql|psql|sqlite3|redis-cli|mongosh)$/.test(name2)) return true;
+  if (/^(node|python|python3|ipython|ruby|irb|php|lua|R)$/.test(name2) && !args.length) return true;
+  if (name2 === "tail" && args.includes("-f")) return true;
+  if (name2 === "docker" && args.includes("exec") && args.some((arg) => arg.includes("it"))) return true;
+  if (name2 === "kubectl" && args.includes("exec") && args.some((arg) => arg.includes("it"))) return true;
+  return false;
+}
+__name(isInteractiveCommand, "isInteractiveCommand");
 var map = /* @__PURE__ */ new Map();
 function apply(ctx, config) {
+  fixNodePtyHelper();
   const allowedUsers = config.admin;
-  function sendCommand(shellSession, command) {
+  function refreshTimeout(shellSession, key, session) {
+    if (!config.timeout) return;
+    if (shellSession.timeoutTimer) (0, import_node_timers.clearTimeout)(shellSession.timeoutTimer);
+    shellSession.timeoutTimer = setTimeout(async () => {
+      if (map.get(key) !== shellSession) return;
+      cleanupSession(shellSession, key, true);
+      await session.send("Shell session timed out.");
+    }, config.timeout);
+  }
+  __name(refreshTimeout, "refreshTimeout");
+  function sendCommand(shellSession, key, session, command) {
+    refreshTimeout(shellSession, key, session);
+    if (isInteractiveCommand(command)) {
+      shellSession.terminal.write(`echo "Interactive command is not supported in chat terminal. Use a non-interactive form, or run shell -t to restart."\r`);
+      return;
+    }
     shellSession.terminal.write(command + "\r");
   }
   __name(sendCommand, "sendCommand");
@@ -115,12 +161,14 @@ function apply(ctx, config) {
     });
     shellSession.disposables.push(dataDisposable, exitDisposable);
     map.set(key, shellSession);
+    refreshTimeout(shellSession, key, session);
     return shellSession;
   }
   __name(initSession, "initSession");
   function cleanupSession(shellSession, key, kill = true) {
     map.delete(key);
     if (shellSession.timer) (0, import_node_timers.clearTimeout)(shellSession.timer);
+    if (shellSession.timeoutTimer) (0, import_node_timers.clearTimeout)(shellSession.timeoutTimer);
     shellSession.disposables.forEach((d) => d.dispose());
     shellSession.disposables.length = 0;
     if (kill) {
@@ -131,7 +179,7 @@ function apply(ctx, config) {
     }
   }
   __name(cleanupSession, "cleanupSession");
-  ctx.command("shell [command:text]", "Start a persistent shell session", { authority: 0 }).option("terminate", "-t Terminate current shell session").usage("After start up, regular user messages will be sent to shell process.").example("shell echo Operating System: Three Easy Pieces > qljj.txt").action(async ({ session, options }, command) => {
+  ctx.command("shell [command:text]", "Start a persistent shell session", { authority: config.auth }).option("terminate", "-t Terminate current shell session").usage("After start up, regular user messages will be sent to shell process.").example("shell echo Operating System: Three Easy Pieces > qljj.txt").action(async ({ session, options }, command) => {
     if (!allowedUsers.includes(session.userId)) {
       return "Unauthorized user.";
     }
@@ -148,7 +196,7 @@ function apply(ctx, config) {
       if (!command) return "Shell session started. Send regular messages as commands. Send shell -t to terminate.";
     }
     if (!command) return "Shell session is running.";
-    sendCommand(current, command);
+    sendCommand(current, key, session, command);
   });
   ctx.middleware(async (session, next) => {
     const key = getKey(session);
@@ -159,12 +207,13 @@ function apply(ctx, config) {
       return next();
     }
     if (!content) return;
-    sendCommand(current, content);
+    sendCommand(current, key, session, content);
   }, true);
   ctx.on("dispose", () => {
     for (const current of map.values()) {
       current.disposables.forEach((d) => d.dispose());
       if (current.timer) (0, import_node_timers.clearTimeout)(current.timer);
+      if (current.timeoutTimer) (0, import_node_timers.clearTimeout)(current.timeoutTimer);
       current.terminal.kill();
     }
     map.clear();

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "koishi-plugin-terminal",
     "description": "通过 QQ 运行持久的 Shell 终端",
-    "version": "1.0.1",
+    "version": "1.0.3",
     "main": "lib/index.js",
     "typings": "lib/index.d.ts",
     "files": [