koishi-plugin-freekill-u 1.0.2 → 1.0.3

package/lib/index.js

@@ -36,7 +36,7 @@ var Config = import_koishi.Schema.object({
     username: import_koishi.Schema.string().description("SSH \u7528\u6237\u540D").default(""),
     password: import_koishi.Schema.string().role("secret").description("SSH \u5BC6\u7801").default(""),
     screenSession: import_koishi.Schema.string().description("screen \u4F1A\u8BDD\u6807\u8BC6\uFF08\u591A\u4E2A screen \u65F6\u586B\u5199\uFF0C\u7559\u7A7A\u5219\u7528 screen -r \u9ED8\u8BA4\u9009\u62E9\uFF09").default(""),
-    updateCommand: import_koishi.Schema.string().description("\u66F4\u65B0\u547D\u4EE4\uFF08\u5728\u65B0\u6708\u6740\u547D\u4EE4\u884C\u8F93\u5165\u7684\u6307\u4EE4\uFF09").default("u"),
+    restartSequence: import_koishi.Schema.string().role("textarea").description("\u91CD\u542F\u547D\u4EE4\u5E8F\u5217\uFF08quit \u540E\u6267\u884C\uFF09\u3002\u6BCF\u884C\u4E00\u6761\u547D\u4EE4\uFF0C\u7A7A\u884C = \u989D\u5916\u56DE\u8F66\u3002\u4F8B\u5982\uFF1A\nscreen\n\ncd /home/fk/freekill-asio-static\n./freekill-asio").default(""),
     operators: import_koishi.Schema.string().description("\u64CD\u4F5C\u5458 QQ \u53F7\u767D\u540D\u5355\uFF08\u591A\u4E2A\u7528\u9017\u53F7/\u7A7A\u683C\u5206\u9694\uFF0C\u7559\u7A7A\u5219\u4E0D\u9650\u5236\uFF09\u3002\u4E0D\u5728\u767D\u540D\u5355\u5185\u7684\u7528\u6237\u6267\u884C\u547D\u4EE4\u65F6\u9759\u9ED8\u5FFD\u7565").default(""),
     attachDelay: import_koishi.Schema.number().description("screen -r \u540E\u7B49\u5F85 attach \u7684\u6BEB\u79D2\u6570").default(3e3).min(500).max(3e4),
     updateWait: import_koishi.Schema.number().description("\u53D1\u9001\u66F4\u65B0\u547D\u4EE4\u540E\u7B49\u5F85\u8F93\u51FA\u7684\u6BEB\u79D2\u6570").default(3e4).min(5e3).max(3e5),
@@ -60,6 +60,17 @@ var usage = `
 - **SSH \u4FE1\u606F**\uFF1A\u4E3B\u673A\u3001\u7AEF\u53E3\u3001\u7528\u6237\u540D\u3001\u5BC6\u7801
 - **screen \u4F1A\u8BDD**\uFF1A\u6709\u591A\u4E2A screen \u65F6\u586B\u5199\u4F1A\u8BDD\u6807\u8BC6
 - **\u64CD\u4F5C\u5458\u767D\u540D\u5355**\uFF1A\u586B\u5199 QQ \u53F7\uFF08\u9017\u53F7\u5206\u9694\uFF09\uFF0C\u4E0D\u5728\u767D\u540D\u5355\u5185\u7684\u7528\u6237\u6267\u884C\u547D\u4EE4\u65F6 bot \u9759\u9ED8\u4E0D\u54CD\u5E94
+- **\u91CD\u542F\u547D\u4EE4\u5E8F\u5217**\uFF1Aquit \u540E\u7684\u91CD\u542F\u547D\u4EE4\uFF0C\u6BCF\u884C\u4E00\u6761\u547D\u4EE4\uFF0C\u7A7A\u884C=\u989D\u5916\u56DE\u8F66\uFF08\u7559\u7A7A\u5219\u7528\u4E0A\u7BAD\u5934\u56DE\u653E\u4E0A\u6B21\u547D\u4EE4\uFF09
+
+## \u91CD\u542F\u5E8F\u5217\u793A\u4F8B
+
+\`\`\`
+screen
+
+cd /home/fk/freekill-asio-static
+./freekill-asio
+\`\`\`
+\u4E0A\u65B9\u7A7A\u884C = \u591A\u6309\u4E00\u6B21\u56DE\u8F66\uFF1B\u4E0B\u9762\u4E24\u884C = cd \u548C\u542F\u52A8\u547D\u4EE4\u3002
 
 ## \u547D\u4EE4\u5217\u8868
 
@@ -68,9 +79,10 @@ var usage = `
 | \u547D\u4EE4 | \u522B\u540D | \u8BF4\u660E |
 |------|------|------|
 | \`\u670D\u52A1\u5668.u\` | \u2014 | \u8FDC\u7A0B\u66F4\u65B0\u670D\u52A1\u5668 |
-| \`\u670D\u52A1\u5668.r\` | \u2014 | \u8FDC\u7A0B\u91CD\u542F\u670D\u52A1\u5668 |
+| \`\u670D\u52A1\u5668.reboot\` | \u2014 | \u8FDC\u7A0B\u91CD\u542F\u670D\u52A1\u5668 |
+| \`\u670D\u52A1\u5668.detached\` | \u2014 | \u5F3A\u884C\u5206\u79BB\u88AB\u5360\u7528\u7684 screen |
 | \`\u670D\u52A1\u5668.stat\` | \u2014 | \u67E5\u770B\u8FD0\u884C\u72B6\u6001 |
-| \`\u670D\u52A1\u5668.reloadconf\` | \`.r\` (\u91CD\u8F7D) | \u91CD\u8F7D\u914D\u7F6E\u6587\u4EF6 |
+| \`\u670D\u52A1\u5668.reloadconf\` | \`.r\` | \u91CD\u8F7D\u914D\u7F6E\u6587\u4EF6 |
 | \`\u670D\u52A1\u5668.lsplayer\` | \u2014 | \u67E5\u770B\u5728\u7EBF\u73A9\u5BB6 |
 | \`\u670D\u52A1\u5668.lsroom [id]\` | \u2014 | \u67E5\u770B\u623F\u95F4\u5217\u8868 |
 | \`\u670D\u52A1\u5668.msg <\u5185\u5BB9>\` | \`.m\` | \u53D1\u5168\u4F53\u516C\u544A |
@@ -106,6 +118,30 @@ QQ \u7FA4\uFF1A1078815356
 `;
 function apply(ctx, config) {
   const logger = ctx.logger("freekill-u");
+  ctx.middleware(async (session, next) => {
+    const content = (session.content || "").trim();
+    if (!content) return next();
+    for (const server of config.servers) {
+      const prefix = server.name;
+      if (!prefix) continue;
+      const lower = content.toLowerCase();
+      const pfxLower = prefix.toLowerCase();
+      if (!lower.startsWith(pfxLower)) continue;
+      const rest = content.slice(prefix.length);
+      const isCommand = rest === "" || rest.startsWith(".") || rest.startsWith(" ") || rest === prefix;
+      if (!isCommand) continue;
+      if (server.operators && server.operators.trim()) {
+        const allowedIds = server.operators.split(/[,，\s]+/).map((s) => s.trim()).filter(Boolean);
+        if (allowedIds.length > 0) {
+          const userId = session.userId || "";
+          if (!allowedIds.includes(userId)) {
+            return;
+          }
+        }
+      }
+    }
+    return next();
+  });
   for (const server of config.servers) {
     registerServerCommands(ctx, config, server, logger);
   }
@@ -130,18 +166,11 @@ function registerServerCommands(ctx, config, server, logger) {
     try {
       const result = await executeShellCommand(shellCmd, server);
       const elapsed = ((Date.now() - startTime) / 1e3).toFixed(1);
-      const output = cleanShellOutput(result.output);
-      if (output.length > 1500) {
-        return `\u{1F4CB} [${prefix}] ${label}
-\u23F1 ${elapsed}s
-
-${output.slice(-1500)}
-\u2026\uFF08\u8F93\u51FA\u5DF2\u622A\u65AD\uFF09`;
-      }
+      const output = smartCleanOutput(result.output, shellCmd);
       return `\u{1F4CB} [${prefix}] ${label}
 \u23F1 ${elapsed}s
 
-${output || "(\u65E0\u8F93\u51FA)"}`;
+${output}`;
     } catch (e) {
       const elapsed = ((Date.now() - startTime) / 1e3).toFixed(1);
       logger.warn("Shell\u547D\u4EE4\u5931\u8D25", { server: prefix, cmd: shellCmd, error: e?.message || String(e) });
@@ -175,7 +204,7 @@ ${output}`);
       await session.send(`\u274C [${prefix}] \u66F4\u65B0\u5931\u8D25\uFF08${elapsed}s\uFF09\uFF1A${e?.message || String(e)}`);
     }
   });
-  ctx.command(`${prefix}.r`, `\u91CD\u542F ${prefix} \u670D\u52A1\u5668`).userFields(["authority"]).action(async ({ session }) => {
+  ctx.command(`${prefix}.reboot`, `\u91CD\u542F ${prefix} \u670D\u52A1\u5668`).userFields(["authority"]).action(async ({ session }) => {
     const err = checkAuth(session);
     if (err === void 0) return;
     if (err) return err;
@@ -201,6 +230,19 @@ ${output}`);
       await session.send(`\u274C [${prefix}] \u91CD\u542F\u5931\u8D25\uFF08${elapsed}s\uFF09\uFF1A${e?.message || String(e)}`);
     }
   });
+  ctx.command(`${prefix}.detached`, `\u5F3A\u5236\u5206\u79BB ${prefix} \u7684 screen \u4F1A\u8BDD`).userFields(["authority"]).action(async ({ session }) => {
+    const err = checkAuth(session);
+    if (err === void 0) return;
+    if (err) return err;
+    await session.send(`\u{1F50C} [${prefix}] \u6B63\u5728\u5206\u79BB screen\u2026`);
+    try {
+      await executeDetached(server);
+      await session.send(`\u2705 [${prefix}] screen \u5DF2\u5206\u79BB\u3002`);
+    } catch (e) {
+      logger.warn("\u5206\u79BBscreen\u5931\u8D25", { server: prefix, error: e?.message || String(e) });
+      await session.send(`\u274C [${prefix}] \u5206\u79BB\u5931\u8D25\uFF1A${e?.message || String(e)}`);
+    }
+  });
   ctx.command(`${prefix}.stat`, "\u67E5\u770B\u670D\u52A1\u5668\u8FD0\u884C\u72B6\u6001\uFF08GC \u7B49\uFF09").userFields(["authority"]).action(async ({ session }) => {
     const err = checkAuth(session);
     if (err === void 0) return;
@@ -208,7 +250,7 @@ ${output}`);
     await session.send(`\u{1F50C} [${prefix}] \u67E5\u8BE2\u4E2D\u2026`);
     return execShellCmd(session, "stat", "stat");
   });
-  ctx.command(`${prefix}.reloadconf`, "\u91CD\u8F7D\u670D\u52A1\u5668\u914D\u7F6E\u6587\u4EF6").userFields(["authority"]).action(async ({ session }) => {
+  ctx.command(`${prefix}.reloadconf`, "\u91CD\u8F7D\u670D\u52A1\u5668\u914D\u7F6E\u6587\u4EF6").alias(`${prefix}.r`).userFields(["authority"]).action(async ({ session }) => {
     const err = checkAuth(session);
     if (err === void 0) return;
     if (err) return err;
@@ -441,7 +483,7 @@ function executeUpdate(server) {
 ` : `screen -r
 `;
             output += await sendAndWait(screenCmd, server.attachDelay);
-            const updateOutput = await sendAndWait(server.updateCommand + "\n", server.updateWait);
+            const updateOutput = await sendAndWait("u\n", server.updateWait);
             output += updateOutput;
             checkError(updateOutput);
             stream.write("
d");
@@ -547,9 +589,18 @@ function executeRestart(server) {
             const quitOutput = await sendAndWait("quit\n", server.quitWait);
             output += quitOutput;
             checkError(quitOutput);
-            const restartOutput = await sendAndWait("\x1B[A\n", server.restartWait);
-            output += restartOutput;
-            checkError(restartOutput);
+            const reSeq = parseRestartSequence(server.restartSequence);
+            if (reSeq.length > 0) {
+              for (const cmd of reSeq) {
+                stream.write(cmd + "\n");
+                output += await collectOutput(1e3);
+              }
+              output += await collectOutput(server.restartWait);
+            } else {
+              const restartOutput = await sendAndWait("\x1B[A\n", server.restartWait);
+              output += restartOutput;
+              checkError(restartOutput);
+            }
             stream.write("
d");
             output += await collectOutput(1e3);
             stream.write("exit\n");
@@ -594,6 +645,89 @@ function executeRestart(server) {
     });
   });
 }
+function executeDetached(server) {
+  return new Promise((resolve, reject) => {
+    const conn = new Client();
+    const totalTimeout = server.attachDelay + 15e3;
+    const timer = setTimeout(() => {
+      try {
+        conn.end();
+      } catch {
+      }
+      reject(new Error("SSH \u64CD\u4F5C\u8D85\u65F6"));
+    }, totalTimeout);
+    conn.on("ready", () => {
+      conn.shell({ term: "xterm-256color", cols: 200, rows: 50 }, (err, stream) => {
+        if (err) {
+          clearTimeout(timer);
+          try {
+            conn.end();
+          } catch {
+          }
+          reject(new Error(`\u6253\u5F00 shell \u5931\u8D25: ${err.message}`));
+          return;
+        }
+        const collectOutput = (duration) => {
+          return new Promise((resolveCollected) => {
+            let buf = "";
+            const onData = (data) => {
+              buf += data.toString("utf8");
+            };
+            stream.on("data", onData);
+            setTimeout(() => {
+              stream.removeListener("data", onData);
+              resolveCollected(buf);
+            }, duration);
+          });
+        };
+        (async () => {
+          try {
+            await collectOutput(500);
+            const detachCmd = server.screenSession ? `screen -d ${server.screenSession}
+` : `screen -d
+`;
+            stream.write(detachCmd);
+            await collectOutput(1e3);
+            stream.write("exit\n");
+            await collectOutput(300);
+            clearTimeout(timer);
+            try {
+              stream.close();
+            } catch {
+            }
+            try {
+              conn.end();
+            } catch {
+            }
+            resolve();
+          } catch (e) {
+            clearTimeout(timer);
+            try {
+              stream.close();
+            } catch {
+            }
+            try {
+              conn.end();
+            } catch {
+            }
+            reject(e);
+          }
+        })();
+      });
+    });
+    conn.on("error", (err) => {
+      clearTimeout(timer);
+      reject(new Error(`SSH \u8FDE\u63A5\u9519\u8BEF: ${err.message}`));
+    });
+    conn.connect({
+      host: server.host,
+      port: server.port,
+      username: server.username,
+      password: server.password,
+      readyTimeout: 15e3
+    });
+  });
+}
 function executeShellCommand(shellCmd, server) {
   return new Promise((resolve, reject) => {
     const conn = new Client();
@@ -696,8 +830,53 @@ function executeShellCommand(shellCmd, server) {
     });
   });
 }
-function cleanShellOutput(text) {
-  return text.replace(/\[detached[^\n]*\n?/gi, "").replace(/\[screen[^\n]*\n?/gi, "").replace(/\n{3,}/g, "\n\n").trim();
+function parseRestartSequence(sequence) {
+  if (!sequence || !sequence.trim()) return [];
+  const lines = sequence.split("\n");
+  const commands = [];
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (trimmed) {
+      commands.push(trimmed);
+    } else {
+      commands.push("");
+    }
+  }
+  return commands;
+}
+function smartCleanOutput(text, shellCmd) {
+  let result = text.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "").replace(/\x1b\][^\x07]*\x07/g, "").replace(/\x1b[()][AB012]/g, "").replace(/\x1b\[\?[0-9]+[hl]/g, "").replace(/\r/g, "");
+  const lines = result.split("\n");
+  const isNoise = (line) => {
+    const trimmed = line.trim();
+    if (!trimmed) return true;
+    if (/\[detached|\[screen|\[remote/i.test(trimmed)) return true;
+    if (/^\d{2}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}/.test(trimmed)) return true;
+    if ((trimmed.match(/█/g) || []).length >= 5) return true;
+    if ((trimmed.match(/═/g) || []).length >= 5) return true;
+    if (/^(Git|Doc|Version|Build|Commit):/i.test(trimmed)) return true;
+    if (/^\w+@[\w-]+ in ~/.test(trimmed)) return true;
+    if (/^(Free|Open|Flexible)/i.test(trimmed) && trimmed.length < 20) return true;
+    if (/^\S+>\s*$/.test(trimmed)) return true;
+    if (/^\s*[#$%]\s*$/.test(trimmed)) return true;
+    if (/^\s*>\s*$/.test(trimmed)) return true;
+    if (trimmed.startsWith("fk-asio>")) return true;
+    if (/^(exit|logout|Ctrl-a d)\s*$/i.test(trimmed)) return true;
+    if (trimmed.startsWith("[?") || trimmed.startsWith("[>")) return true;
+    return false;
+  };
+  const kept = [];
+  for (const line of lines) {
+    if (!isNoise(line)) {
+      kept.push(line);
+    }
+  }
+  result = kept.join("\n").trim();
+  result = result.replace(/\n{3,}/g, "\n\n");
+  if (result.length > 1500) {
+    result = result.slice(-1500) + "\n\u2026\uFF08\u8F93\u51FA\u5DF2\u622A\u65AD\uFF09";
+  }
+  return result || "(\u65E0\u8F93\u51FA)";
 }
 function filterSensitive(text) {
   return text.replace(/\/home\/[^/\s]+/g, "/home/***").replace(/\/root\//g, "/root/***/").replace(/(token|secret|password|passwd|key|apikey)\s*[=:]\s*\S+/gi, "$1=***").replace(/\b(\d{1,3})\.(\d{1,3})\.\d{1,3}\.\d{1,3}\b/g, "$1.$2.*.*");

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "koishi-plugin-freekill-u",
   "description": "新月杀远程更新 — 通过 SSH 连接服务器自动进入 screen 会话执行更新",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
     "lib"
   ],
   "license": "MIT",
-  "scripts": {},
   "keywords": [
     "chatbot",
     "koishi",