quick-ssh-new 1.0.1 → 1.0.2

package/Quick-SSH.psm1

@@ -27,7 +27,10 @@ function Get-QuickSSHHosts {
     try {
         $raw = Get-Content -Path $Script:ConfigFile -Raw -Encoding UTF8
         if ([string]::IsNullOrWhiteSpace($raw)) { return @() }
-        return @($raw | ConvertFrom-Json)
+        $data = $raw | ConvertFrom-Json
+        # 兼容单个对象 { ... } 和数组 [{ ... }, { ... }]
+        if ($data -is [array]) { return $data }
+        return @($data)
     } catch {
         return @()
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quick-ssh-new",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "🚀 Quick-SSH - 仿 Docker 命令行风格的 PowerShell SSH 连接管理工具",
   "keywords": [
     "ssh",

package/qssh-tui.js

@@ -18,6 +18,18 @@
  */
 
 const blessed   = require("blessed");
+
+// 阻止 blessed 切换备用屏幕缓冲区，保留 PowerShell 透明背景
+if (blessed.Program) {
+    blessed.Program.prototype.alternateBuffer = function (val, cb) {
+        if (typeof val === "function") { cb = val; }
+        if (typeof cb === "function") { cb(); }
+        return this;
+    };
+    if (blessed.Program.prototype.smcup) blessed.Program.prototype.smcup = function () { return this; };
+    if (blessed.Program.prototype.rmcup) blessed.Program.prototype.rmcup = function () { return this; };
+}
+const net       = require("net");
 const fs        = require("fs");
 const path      = require("path");
 const { spawn } = require("child_process");
@@ -42,13 +54,20 @@ function loadHosts() {
     ensureConfig();
     try {
         const raw = fs.readFileSync(CONFIG_FILE, "utf-8").trim();
-        return raw ? JSON.parse(raw) : [];
-    } catch { return []; }
+        if (!raw) return [];
+        const data = JSON.parse(raw);
+        // 兼容单个对象 { ... } 和数组 [{ ... }, { ... }]
+        return Array.isArray(data) ? data : [data];
+    } catch {
+        return [];
+    }
 }
 
 function saveHosts(hosts) {
     ensureConfig();
-    fs.writeFileSync(CONFIG_FILE, JSON.stringify(hosts, null, 4), "utf-8");
+    // 确保始终保存为数组
+    const data = Array.isArray(hosts) ? hosts : [];
+    fs.writeFileSync(CONFIG_FILE, JSON.stringify(data, null, 4), "utf-8");
 }
 
 // ============================================================
@@ -95,12 +114,15 @@ let inputBox;
 let helpBox;
 let confirmBox;
 
+// 在线状态缓存
+const hostStatus = {}; // { alias: "unknown" | "online" | "offline" }
+
 let hosts        = [];
 let filteredHosts = [];
 let filterText   = "";
 
 // 模式管理
-const MODE = { NORMAL: 0, SEARCH: 1, ADD: 2, EXPORT: 3, IMPORT: 4, CONFIRM: 5, HELP: 6 };
+const MODE = { NORMAL: 0, SEARCH: 1, ADD: 2, EXPORT: 3, IMPORT: 4, CONFIRM: 5, HELP: 6, RENAME: 7 };
 let currentMode = MODE.NORMAL;
 
 // ============================================================
@@ -115,16 +137,18 @@ const MODE_LABELS = {
     [MODE.IMPORT]:  "{yellow-fg}{bold} IMPORT {/bold}{/yellow-fg}",
     [MODE.CONFIRM]: "{red-fg}{bold} CONFIRM {/bold}{/red-fg}",
     [MODE.HELP]:    "{white-fg}{bold} HELP {/bold}{/white-fg}",
+    [MODE.RENAME]:  "{cyan-fg}{bold} RENAME {/bold}{/cyan-fg}",
 };
 
 const MODE_HINTS = {
-    [MODE.NORMAL]:  " j/k ↑↓  g首 G尾  ↵连接  d删除  a添加  /搜索  e导出  i导入  r重命名  ?帮助  q退出",
+    [MODE.NORMAL]:  " j/k ↑↓  g首 G尾  ↵连接  d删除  a添加  /搜索  e导出  i导入  r重命名  p检测  P全检  ?帮助  q退出",
     [MODE.SEARCH]:  " 输入关键词过滤  Enter确认  Esc取消",
     [MODE.ADD]:     " 格式: 别名 用户@主机:端口 [--key 路径]  Enter确认  Esc取消",
     [MODE.EXPORT]:  " 输入导出文件路径 (默认: ~/.quickssh/export.json)  Enter确认  Esc取消",
     [MODE.IMPORT]:  " 输入导入文件路径  Enter确认  Esc取消",
     [MODE.CONFIRM]: " y确认  n取消",
     [MODE.HELP]:    " 按任意键返回",
+    [MODE.RENAME]:  " 输入新别名  Enter确认  Esc取消",
 };
 
 function setMode(mode, inputValue) {
@@ -137,10 +161,11 @@ function setMode(mode, inputValue) {
         if (mode === MODE.NORMAL) listBox.focus();
     }
 
-    if (mode === MODE.SEARCH || mode === MODE.ADD || mode === MODE.EXPORT || mode === MODE.IMPORT) {
+    if (mode === MODE.SEARCH || mode === MODE.ADD || mode === MODE.EXPORT || mode === MODE.IMPORT || mode === MODE.RENAME) {
         inputBox.show();
         inputBox.setValue(inputValue || "");
         inputBox.focus();
+        inputBox.readInput();
     }
 
     if (mode === MODE.CONFIRM) {
@@ -161,9 +186,16 @@ function refreshList(keepSelection) {
         : [...hosts];
 
     const prevIdx = listBox.selected;
-    listBox.setItems(filteredHosts.map(h =>
-        `${h.alias.padEnd(16)} ${h.user}@${h.host}:${h.port}`
-    ));
+    const statusIndicators = {
+        online:  "{green-fg}●{/green-fg}",
+        offline: "{red-fg}○{/red-fg}",
+        unknown: "{yellow-fg}◌{/yellow-fg}",
+    };
+    listBox.setItems(filteredHosts.map(h => {
+        const sta = hostStatus[h.alias] || "unknown";
+        const indicator = statusIndicators[sta] || statusIndicators.unknown;
+        return `${indicator} ${h.alias.padEnd(14)} ${h.user}@${h.host}:${h.port}`;
+    }));
 
     if (keepSelection && prevIdx < filteredHosts.length) {
         listBox.select(prevIdx);
@@ -189,6 +221,12 @@ function updateDetail() {
     }
 
     const h = filteredHosts[idx];
+    const sta = hostStatus[h.alias] || "unknown";
+    const statusMap = {
+        online:  "{green-fg}● 在线{/green-fg}",
+        offline: "{red-fg}○ 离线{/red-fg}",
+        unknown: "{yellow-fg}◌ 未检测{/yellow-fg}",
+    };
     detailBox.setContent(`
 {bold}{cyan-fg}  连接详情{/cyan-fg}{/bold}
 
@@ -197,14 +235,87 @@ function updateDetail() {
   {bold}账号:{/bold}     ${h.user}
   {bold}端口:{/bold}     ${h.port}
   {bold}私钥:{/bold}     ${h.key || "(默认)"}
+  {bold}状态:{/bold}     ${statusMap[sta]}
 
   {blue-fg}─────────────────────{/blue-fg}
-  {green-fg} Enter → 连接{/green-fg}
-  {red-fg} d → 删除{/red-fg}
+  {green-fg} Enter → 连接{/green-fg}     {red-fg} d → 删除{/red-fg}
+  {yellow-fg} p → 检测在线{/yellow-fg}
 `);
     screen.render();
 }
 
+// ============================================================
+// 在线检测
+// ============================================================
+
+/**
+ * 检查单台服务器是否在线（TCP 连接 SSH 端口）
+ */
+function checkHost(alias) {
+    return new Promise((resolve) => {
+        const h = hosts.find(e => e.alias === alias);
+        if (!h) { resolve(false); return; }
+
+        hostStatus[alias] = "checking";
+        refreshList();
+
+        const sock = new net.Socket();
+        const port = h.port || 22;
+        const timeout = 3000; // 3s
+
+        sock.setTimeout(timeout);
+        sock.on("connect", () => {
+            sock.destroy();
+            hostStatus[alias] = "online";
+            refreshList();
+            resolve(true);
+        });
+        sock.on("error", () => {
+            sock.destroy();
+            hostStatus[alias] = "offline";
+            refreshList();
+            resolve(false);
+        });
+        sock.on("timeout", () => {
+            sock.destroy();
+            hostStatus[alias] = "offline";
+            refreshList();
+            resolve(false);
+        });
+        sock.connect(port, h.host);
+    });
+}
+
+function checkSelectedHost() {
+    const idx = listBox.selected;
+    if (idx < 0 || idx >= filteredHosts.length) return;
+    const alias = filteredHosts[idx].alias;
+    flashMessage(`正在检测 '${alias}' ...`, "yellow");
+    checkHost(alias).then(ok => {
+        flashMessage(`'${alias}'  ${ok ? "● 在线" : "○ 离线"}`, ok ? "green" : "red");
+    });
+}
+
+function checkAllHosts() {
+    const list = filteredHosts.length > 0 ? filteredHosts : hosts;
+    if (list.length === 0) {
+        flashMessage("没有可检测的服务器", "red");
+        return;
+    }
+    flashMessage(`正在检测 ${list.length} 台服务器 ...`, "yellow");
+    let done = 0;
+    for (const h of list) {
+        checkHost(h.alias).then(() => {
+            done++;
+            if (done === list.length) {
+                const online  = list.filter(e => hostStatus[e.alias] === "online").length;
+                const offline = list.filter(e => hostStatus[e.alias] === "offline").length;
+                flashMessage(`检测完成: ${online} 在线, ${offline} 离线`, online > 0 ? "green" : "red");
+            }
+        });
+    }
+}
+
 // ============================================================
 // 操作函数
 // ============================================================
@@ -334,6 +445,28 @@ function handleInputSubmit(value) {
             setMode(MODE.NORMAL);
             break;
         }
+        case MODE.RENAME: {
+            inputBox.hide();
+            const idx = listBox.selected;
+            if (idx < 0 || idx >= filteredHosts.length) { setMode(MODE.NORMAL); break; }
+            const oldAlias = filteredHosts[idx].alias;
+            if (!val || val.trim() === oldAlias) { setMode(MODE.NORMAL); break; }
+            const newAlias = val.trim();
+            if (hosts.find(h => h.alias === newAlias)) {
+                flashMessage(`别名 '${newAlias}' 已存在`, "red");
+                setMode(MODE.NORMAL);
+                break;
+            }
+            const target = hosts.find(h => h.alias === oldAlias);
+            if (target) {
+                target.alias = newAlias;
+                saveHosts(hosts);
+                refreshList(true);
+                flashMessage(`已重命名 '${oldAlias}' → '${newAlias}'`, "green");
+            }
+            setMode(MODE.NORMAL);
+            break;
+        }
     }
 }
 
@@ -344,6 +477,7 @@ function handleInputCancel() {
         case MODE.ADD:    setMode(MODE.NORMAL); break;
         case MODE.EXPORT: setMode(MODE.NORMAL); break;
         case MODE.IMPORT: setMode(MODE.NORMAL); break;
+        case MODE.RENAME: setMode(MODE.NORMAL); break;
         default:          setMode(MODE.NORMAL); break;
     }
 }
@@ -366,7 +500,7 @@ function startTUI() {
         top: 0, left: 0, width: "100%", height: 1,
         content: "{bold} Quick-SSH {/bold}",
         tags: true,
-        style: { fg: "white", bg: "blue" },
+        style: { fg: "white", bg: -1 },
     });
 
     // 连接列表
@@ -375,11 +509,11 @@ function startTUI() {
         label: " 连接列表 ",
         border: { type: "line", fg: "cyan" },
         tags: true, keys: false, vi: false, mouse: true,
-        scrollbar: { ch: " ", bg: "cyan" },
+        scrollbar: { ch: " ", bg: -1 },
         style: {
-            fg: "white", bg: "black",
+            fg: "white", bg: -1,
             selected: { fg: "white", bg: "blue", bold: true },
-            item: { fg: "white", bg: "black" },
+            item: { fg: "white", bg: -1 },
         },
     });
 
@@ -388,14 +522,14 @@ function startTUI() {
         top: 1, right: 0, width: "40%", height: "100%-2",
         label: " 详情 ",
         border: { type: "line", fg: "cyan" },
-        tags: true, style: { fg: "white", bg: "black" },
+        tags: true, style: { fg: "white", bg: -1 },
         scrollable: true, alwaysScroll: true,
     });
 
     // 状态栏
     statusBar = blessed.box({
         bottom: 0, left: 0, width: "100%", height: 1,
-        tags: true, style: { fg: "white", bg: "black" },
+        tags: true, style: { fg: "white", bg: -1 },
     });
 
     // 输入框
@@ -404,7 +538,7 @@ function startTUI() {
         label: " 输入 ",
         border: { type: "line", fg: "cyan" },
         hidden: true, keys: true, vi: false,
-        style: { fg: "white", bg: "black", border: { fg: "cyan" } },
+        style: { fg: "white", bg: -1, border: { fg: "cyan" } },
     });
 
     // 确认框
@@ -412,7 +546,7 @@ function startTUI() {
         top: "50%-3", left: "30%", width: "40%", height: 3,
         border: { type: "line", fg: "red" },
         tags: true, hidden: true,
-        style: { fg: "white", bg: "black" },
+        style: { fg: "white", bg: -1 },
     });
 
     // 帮助弹窗
@@ -422,14 +556,14 @@ function startTUI() {
         border: { type: "line", fg: "yellow" },
         tags: true, hidden: true, scrollable: true, alwaysScroll: true,
         keys: true, vi: false,
-        style: { fg: "white", bg: "black" },
+        style: { fg: "white", bg: -1 },
         content: `
 {bold}{yellow-fg}Quick-SSH TUI — 快捷键帮助{/yellow-fg}{/bold}
 
 {cyan-fg}━━━━━━━━━ 导航 ━━━━━━━━━{/cyan-fg}
   {green-fg}j{/green-fg} / {green-fg}↓{/green-fg}      向下移动
   {green-fg}k{/green-fg} / {green-fg}↑{/green-fg}      向上移动
-  {green-fg}g{/green-fg}            跳转到第一个
+  {green-ff}g{/green-fg}            跳转到第一个
   {green-fg}G{/green-fg}            跳转到最后一个
 
 {cyan-fg}━━━━━━━━━ 操作 ━━━━━━━━━{/cyan-fg}
@@ -439,6 +573,10 @@ function startTUI() {
   {green-fg}/ {/green-fg}           搜索 / 筛选
   {green-fg}Esc{/green-fg}          取消 / 返回普通模式
 
+{cyan-fg}━━━━━━━━━ 在线检测 ━━━━━━━━━{/cyan-fg}
+  {green-fg}p{/green-fg}            检测选中服务器是否在线
+  {green-fg}P{/green-fg} / {green-fg}C-p{/green-fg}  检测全部服务器
+
 {cyan-fg}━━━━━━━━━ 导入导出 ━━━━━━━━━{/cyan-fg}
   {green-fg}e{/green-fg}            导出全部配置
   {green-fg}i{/green-fg}            从 JSON 文件导入
@@ -464,7 +602,11 @@ function startTUI() {
     // ============================================================
 
     // ----- 全局键 -----
-    screen.key(["C-c"], () => { screen.destroy(); process.exit(0); });
+    screen.key(["C-c"], () => {
+        process.stdout.write("\x1b[2J\x1b[H");
+        screen.destroy();
+        process.exit(0);
+    });
 
     screen.key(["escape"], () => {
         if (currentMode === MODE.HELP) {
@@ -479,7 +621,11 @@ function startTUI() {
 
     // ----- NORMAL 模式 -----
     screen.key(["q"], () => {
-        if (currentMode === MODE.NORMAL) { screen.destroy(); process.exit(0); }
+        if (currentMode === MODE.NORMAL) {
+            process.stdout.write("\x1b[2J\x1b[H");
+            screen.destroy();
+            process.exit(0);
+        }
     });
 
     screen.key(["/"], () => {
@@ -514,6 +660,24 @@ function startTUI() {
         if (currentMode === MODE.NORMAL) setMode(MODE.IMPORT);
     });
 
+    screen.key(["p"], () => {
+        if (currentMode === MODE.NORMAL) checkSelectedHost();
+    });
+
+    // 全检: P(Shift) / S-p / C-p(备选，部分终端会拦截 Shift)
+    screen.key(["P", "S-p", "C-p"], () => {
+        if (currentMode === MODE.NORMAL) checkAllHosts();
+    });
+
+    screen.key(["r"], () => {
+        if (currentMode === MODE.NORMAL) {
+            const idx = listBox.selected;
+            if (idx >= 0 && idx < filteredHosts.length) {
+                setMode(MODE.RENAME, filteredHosts[idx].alias);
+            }
+        }
+    });
+
     screen.key(["?", "h"], () => {
         if (currentMode === MODE.NORMAL) { helpBox.show(); helpBox.focus(); setMode(MODE.HELP); }
     });