koishi-plugin-terminal 1.0.2 → 1.0.4

package/lib/config.d.ts

@@ -0,0 +1,12 @@
+import { Schema } from "koishi";
+export interface Config {
+    admin?: Array<string>;
+    auth?: number;
+    root?: string;
+    shell?: string;
+    timeout?: number;
+    cols?: number;
+    rows?: number;
+    maxOutputLength: number;
+}
+export declare const Config: Schema<Config>;

package/lib/helper.d.ts

@@ -0,0 +1,4 @@
+export declare function resolveShell(shell?: string): string;
+export declare function getKey(session: any): string;
+export declare function fixNodePtyHelper(): void;
+export declare function isInteractiveCommand(command: string): boolean;

package/lib/index.d.ts

@@ -1,16 +1,7 @@
-import { Context, Schema } from 'koishi';
+import { Context } from 'koishi';
 import * as pty from "node-pty";
+import { Config } from "./config";
 export declare const name = "terminal";
-export interface Config {
-    admin?: Array<string>;
-    auth?: number;
-    root?: string;
-    shell?: string;
-    timeout?: number;
-    cols?: number;
-    rows?: number;
-    maxOutputLength: number;
-}
 export interface ShellSession {
     terminal: pty.IPty;
     buffer: string;
@@ -20,5 +11,4 @@ export interface ShellSession {
         dispose(): void;
     }>;
 }
-export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -30,7 +30,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  Config: () => Config,
   apply: () => apply,
   name: () => name
 });
@@ -38,17 +37,33 @@ module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
 var pty = __toESM(require("node-pty"));
 var import_node_timers = require("node:timers");
-var name = "terminal";
-var Config = import_koishi.Schema.object({
-  admin: import_koishi.Schema.array(String).description("超级管理员用户名单").default([]),
-  auth: import_koishi.Schema.number().description("使用本插件所需的最低权限，此外，用户也需要在超级管理员名单中。").min(1).max(4).step(1).default(4),
-  root: import_koishi.Schema.string().description("初始工作路径").default(process.env.HOME),
-  shell: import_koishi.Schema.string().description("Shell路径，留空则自动检测系统默认Shell"),
-  timeout: import_koishi.Schema.number().description("超时时长").default(import_koishi.Time.minute),
-  cols: import_koishi.Schema.number().description("终端列数").default(80),
-  rows: import_koishi.Schema.number().description("终端行数").default(24),
-  maxOutputLength: import_koishi.Schema.number().description("单次发送最大输出长度").default(16384)
-});
+
+// src/stripper.ts
+function stripBackspaces(input) {
+  const chars = [];
+  for (const char of input) {
+    if (char === "\b") {
+      chars.pop();
+    } else {
+      chars.push(char);
+    }
+  }
+  return chars.join("");
+}
+__name(stripBackspaces, "stripBackspaces");
+function stripAnsi(input) {
+  const text = stripBackspaces(input.replace(
+    // eslint-disable-next-line no-control-regex
+    /\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g,
+    ""
+  ));
+  return text.replace(/\r\n/g, "\n").split("\n").map((line) => line.split("\r").at(-1)).join("\n");
+}
+__name(stripAnsi, "stripAnsi");
+
+// src/helper.ts
+var import_node_path = require("node:path");
+var import_node_fs = require("node:fs");
 function resolveShell(shell) {
   if (shell) return shell;
   switch (process.platform) {
@@ -62,28 +77,30 @@ function resolveShell(shell) {
   return "bash";
 }
 __name(resolveShell, "resolveShell");
-function stripAnsi(input) {
-  const text = input.replace(
-    // eslint-disable-next-line no-control-regex
-    /\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g,
-    ""
-  );
-  return text.replace(/\r\n/g, "\n").split("\n").map((line) => line.split("\r").at(-1)).join("\n");
-}
-__name(stripAnsi, "stripAnsi");
 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 (/^(less|more)$/.test(name2)) return true;
   if (/^(top|htop|btop|watch)$/.test(name2)) return true;
   if (/^(tmux|screen)$/.test(name2)) return true;
-  if (/^(ssh|sftp|ftp|telnet)$/.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;
@@ -92,8 +109,12 @@ function isInteractiveCommand(command) {
   return false;
 }
 __name(isInteractiveCommand, "isInteractiveCommand");
+
+// src/index.ts
+var name = "terminal";
 var map = /* @__PURE__ */ new Map();
 function apply(ctx, config) {
+  fixNodePtyHelper();
   const allowedUsers = config.admin;
   function refreshTimeout(shellSession, key, session) {
     if (!config.timeout) return;
@@ -120,7 +141,13 @@ function apply(ctx, config) {
       cols: config.cols,
       rows: config.rows,
       cwd: config.root,
-      env: process.env
+      env: {
+        ...process.env,
+        PAGER: "cat",
+        MANPAGER: "cat",
+        GIT_PAGER: "cat",
+        LESS: "-FRX"
+      }
     });
     const shellSession = {
       terminal,
@@ -133,7 +160,7 @@ function apply(ctx, config) {
       shellSession.buffer = "";
       if (!output) return;
       const text = output.length > config.maxOutputLength ? output.slice(0, config.maxOutputLength - 1) + "\n ...Truncated output" : output;
-      await session.send(text);
+      await session.send(import_koishi.h.text(text));
     }, "flush");
     const dataDisposable = terminal.onData((data) => {
       shellSession.buffer += data;
@@ -165,7 +192,7 @@ function apply(ctx, config) {
     }
   }
   __name(cleanupSession, "cleanupSession");
-  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) => {
+  ctx.command("shell [command:text]", "Start a persistent shell session.", { authority: config.auth }).option("terminate", "-t Terminate current shell session").usage("After start up, 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.";
     }
@@ -208,7 +235,6 @@ function apply(ctx, config) {
 __name(apply, "apply");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  Config,
   apply,
   name
 });

package/lib/stripper.d.ts

@@ -0,0 +1,2 @@
+export declare function stripBackspaces(input: string): string;
+export declare function stripAnsi(input: string): string;

package/package.json

@@ -1,8 +1,12 @@
 {
     "name": "koishi-plugin-terminal",
     "description": "通过 QQ 运行持久的 Shell 终端",
-    "version": "1.0.2",
+    "version": "1.0.4",
     "main": "lib/index.js",
+    "author": {
+        "email": "ygong68@wisc.edu",
+        "name": "Jingmozhiyu"
+    },
     "typings": "lib/index.d.ts",
     "files": [
         "lib",