@linxin666/dsh-ssh 0.1.18 → 0.1.20

package/lib/index.js

@@ -1,5 +1,5 @@
 import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
-import { createReadStream, createWriteStream, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, statSync, writeFileSync } from "node:fs";
+import { createReadStream, createWriteStream, existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, renameSync, statSync, writeFileSync } from "node:fs";
 import { Client } from "ssh2";
 import { homedir, tmpdir } from "node:os";
 import { basename, dirname, join, relative, resolve } from "node:path";
@@ -1272,16 +1272,35 @@ var HostStore = class {
 		};
 	}
 	skippedNames = /* @__PURE__ */ new Set();
+	/**
+	* Last parsed store keyed by file identity. list/find ride every acquire
+	* and GUI refresh; re-reading and re-parsing the whole file each call is
+	* wasted work when the file has not changed. Any save invalidates.
+	*/
+	cache;
 	load() {
-		if (!existsSync(this.path)) return {
-			version: FORMAT_VERSION,
-			hosts: []
-		};
+		let stats;
+		try {
+			stats = statSync(this.path);
+		} catch {
+			this.cache = void 0;
+			return {
+				version: FORMAT_VERSION,
+				hosts: []
+			};
+		}
+		if (this.cache !== void 0 && this.cache.mtimeMs === stats.mtimeMs && this.cache.size === stats.size) return this.cache.file;
 		try {
 			const parsed = JSON.parse(readFileSync(this.path, "utf8"));
 			if (typeof parsed !== "object" || parsed === null || !Array.isArray(parsed.hosts)) throw new Error("store file shape invalid");
+			this.cache = {
+				mtimeMs: stats.mtimeMs,
+				size: stats.size,
+				file: parsed
+			};
 			return parsed;
 		} catch {
+			this.cache = void 0;
 			try {
 				renameSync(this.path, `${this.path}.corrupt-${Date.now()}`);
 			} catch {}
@@ -1303,6 +1322,7 @@ var HostStore = class {
 			mode: 384
 		});
 		renameSync(tmp, this.path);
+		this.cache = void 0;
 	}
 };
 /** Expand a leading `~` in a filesystem path. */
@@ -1328,13 +1348,13 @@ const DEFAULTS = {
 	sftpConcurrency: 8
 };
 /** Build the ssh2 connect config for one entry (key read from disk). */
-function buildConnectConfig(entry, sock) {
+function buildConnectConfig(entry, sock, opts) {
 	const config = {
 		host: entry.host,
 		port: entry.port,
 		username: entry.user,
-		readyTimeout: 15e3,
-		keepaliveInterval: 15e3,
+		readyTimeout: opts.connectTimeoutMs,
+		keepaliveInterval: opts.keepaliveIntervalMs,
 		keepaliveCountMax: 3
 	};
 	if (sock !== void 0) config.sock = sock;
@@ -1401,7 +1421,7 @@ async function connectChain(engine, entry) {
 			for (const client of hops) client.end();
 			throw new Error("proxyJump alias '" + hopAlias + "' not found — create it first");
 		}
-		const hopClient = await connectClient(buildConnectConfig(hop, sock));
+		const hopClient = await connectClient(buildConnectConfig(hop, sock, engine.opts));
 		hops.push(hopClient);
 		const next = index + 1 < chain.length ? engine.store.find(chain[index + 1]) : void 0;
 		const nextHost = next !== void 0 ? next.host : entry.host;
@@ -1417,7 +1437,7 @@ async function connectChain(engine, entry) {
 	}
 	let target;
 	try {
-		target = await connectClient(buildConnectConfig(entry, sock));
+		target = await connectClient(buildConnectConfig(entry, sock, engine.opts));
 		return {
 			client: target,
 			hops
@@ -1473,10 +1493,14 @@ function disposeRecord(engine, alias, record) {
 	if (record !== void 0 && current !== record) return;
 	if (current === void 0) return;
 	engine.pool.delete(alias);
+	endRecordChain(current);
+}
+/** End one record's client and hop chain (best-effort, safe to repeat). */
+function endRecordChain(record) {
 	try {
-		current.client.end();
+		record.client.end();
 	} catch {}
-	for (const hop of current.hops) try {
+	for (const hop of record.hops) try {
 		hop.end();
 	} catch {}
 }
@@ -1503,6 +1527,10 @@ async function withClient(engine, alias, fn, attempts = 3) {
 			const result = await fn(record.client);
 			record.idleAt = Date.now();
 			return result;
+		} catch (error) {
+			lastError = error;
+			if (!record.broken) throw error;
+			disposeRecord(engine, alias, record);
 		} finally {
 			record.inFlight -= 1;
 		}
@@ -1560,8 +1588,12 @@ async function execCommand(engine, alias, command, timeoutMs) {
 					if (settled) return;
 					settled = true;
 					clearTimeout(timer);
+					if (typeof code !== "number" && !timedOut) {
+						reject(/* @__PURE__ */ new Error("ssh: connection lost mid-flight (channel closed without an exit status)"));
+						return;
+					}
 					resolve({
-						success: code === 0 && !timedOut,
+						success: code === 0,
 						exitCode: code,
 						timedOut,
 						stdout: stdout.text,
@@ -1673,7 +1705,8 @@ function walkLocalDir(root) {
 	const visit = (dir) => {
 		for (const name of readdirSync(dir)) {
 			const full = join(dir, name);
-			const stat = statSync(full);
+			const stat = lstatSync(full);
+			if (stat.isSymbolicLink()) continue;
 			if (stat.isDirectory()) visit(full);
 			else if (stat.isFile()) files.push(relative(root, full));
 		}
@@ -1797,40 +1830,41 @@ function ensureRemoteDir(sftp, remote) {
 		walk(0);
 	});
 }
-function fastPut(sftp, src, dst, concurrency, onProgress) {
+/** One fastPut/fastGet transfer with throttled progress (the two directions share everything but the verb). */
+function fastTransfer(sftp, kind, src, dst, concurrency, onProgress) {
 	return new Promise((resolve, reject) => {
+		const file = kind === "put" ? dst : src;
+		const finalSize = () => statSync(kind === "put" ? src : dst).size;
 		let last = 0;
 		let lastEmit = 0;
 		const started = Date.now();
-		onProgress?.({
+		if (kind === "put") onProgress?.({
 			phase: "transferring",
-			file: dst,
+			file,
 			transferred: 0,
 			total: statSync(src).size,
 			percent: 0
 		});
-		sftp.fastPut(src, dst, {
-			concurrency,
-			step: (transferred, _chunk, total) => {
-				const now = Date.now();
-				if (now - lastEmit < 100 && transferred < total) return;
-				lastEmit = now;
-				const elapsed = (now - started) / 1e3;
-				onProgress?.({
-					phase: "transferring",
-					file: dst,
-					transferred,
-					total,
-					percent: total > 0 ? Math.round(transferred / total * 1e3) / 10 : 0,
-					speedBps: elapsed > 0 ? Math.round((transferred - last) / elapsed) : void 0
-				});
-				last = transferred;
-			}
-		}, (error) => {
+		const step = (transferred, _chunk, total) => {
+			const now = Date.now();
+			if (now - lastEmit < 100 && transferred < total) return;
+			lastEmit = now;
+			const elapsed = (now - started) / 1e3;
+			onProgress?.({
+				phase: "transferring",
+				file,
+				transferred,
+				total,
+				percent: total > 0 ? Math.round(transferred / total * 1e3) / 10 : 0,
+				speedBps: elapsed > 0 ? Math.round((transferred - last) / elapsed) : void 0
+			});
+			last = transferred;
+		};
+		const done = (error) => {
 			if (error !== void 0) {
 				onProgress?.({
 					phase: "error",
-					file: dst,
+					file,
 					transferred: 0,
 					total: 0,
 					percent: 0,
@@ -1840,61 +1874,29 @@ function fastPut(sftp, src, dst, concurrency, onProgress) {
 			} else {
 				onProgress?.({
 					phase: "done",
-					file: dst,
-					transferred: statSync(src).size,
-					total: statSync(src).size,
+					file,
+					transferred: finalSize(),
+					total: finalSize(),
 					percent: 100
 				});
 				resolve();
 			}
-		});
+		};
+		if (kind === "put") sftp.fastPut(src, dst, {
+			concurrency,
+			step
+		}, done);
+		else sftp.fastGet(src, dst, {
+			concurrency,
+			step
+		}, done);
 	});
 }
+function fastPut(sftp, src, dst, concurrency, onProgress) {
+	return fastTransfer(sftp, "put", src, dst, concurrency, onProgress);
+}
 function fastGet(sftp, src, dst, concurrency, onProgress) {
-	return new Promise((resolve, reject) => {
-		let last = 0;
-		let lastEmit = 0;
-		const started = Date.now();
-		sftp.fastGet(src, dst, {
-			concurrency,
-			step: (transferred, _chunk, total) => {
-				const now = Date.now();
-				if (now - lastEmit < 100 && transferred < total) return;
-				lastEmit = now;
-				const elapsed = (now - started) / 1e3;
-				onProgress?.({
-					phase: "transferring",
-					file: src,
-					transferred,
-					total,
-					percent: total > 0 ? Math.round(transferred / total * 1e3) / 10 : 0,
-					speedBps: elapsed > 0 ? Math.round((transferred - last) / elapsed) : void 0
-				});
-				last = transferred;
-			}
-		}, (error) => {
-			if (error !== void 0) {
-				onProgress?.({
-					phase: "error",
-					file: src,
-					transferred: 0,
-					total: 0,
-					percent: 0,
-					error: String(error)
-				});
-				reject(error);
-			} else {
-				onProgress?.({
-					phase: "done",
-					file: src,
-					transferred: statSync(dst).size,
-					total: statSync(dst).size,
-					percent: 100
-				});
-				resolve();
-			}
-		});
-	});
+	return fastTransfer(sftp, "get", src, dst, concurrency, onProgress);
 }
 //#endregion
 //#region src/engine/tunnel.ts
@@ -1920,7 +1922,9 @@ async function startTunnel(engine, alias, options) {
 		state: "connecting",
 		startedAt: Date.now()
 	};
-	const record = await acquire(engine, alias);
+	const existing = engine.pool.get(alias);
+	if (existing !== void 0 && existing.broken) disposeRecord(engine, alias, existing);
+	const record = engine.pool.get(alias) ?? await acquire(engine, alias);
 	const client = record.client;
 	const sockets = /* @__PURE__ */ new Set();
 	const server = createServer((socket) => {
@@ -1968,6 +1972,7 @@ async function startTunnel(engine, alias, options) {
 		info,
 		server,
 		alias,
+		record,
 		sockets
 	});
 	return info;
@@ -1988,7 +1993,8 @@ function stopTunnel(engine, id) {
 		socket.destroy();
 	} catch {}
 	tunnel.sockets.clear();
-	disposeRecord(engine, tunnel.alias);
+	if (![...engine.tunnels.values()].some((candidate) => candidate.record === tunnel.record)) if (engine.pool.get(tunnel.alias) === tunnel.record) disposeRecord(engine, tunnel.alias, tunnel.record);
+	else endRecordChain(tunnel.record);
 	return true;
 }
 /** Stop all tunnels (optionally for one alias). */
@@ -2116,6 +2122,16 @@ var SshEngine = class {
 	stopAllTunnels(alias) {
 		return stopAllTunnels(this, alias);
 	}
+	/**
+	* Drop every live artifact bound to one alias: stop its tunnels and close
+	* the pooled connection. Host entries that are deleted or whose connection
+	* fields change must never keep serving a stale, previously authenticated
+	* connection — the next operation re-connects from the current config.
+	*/
+	dropAlias(alias) {
+		stopAllTunnels(this, alias);
+		disposeRecord(this, alias);
+	}
 	/** Probe connectivity: connect, run `true`, close. */
 	async test(alias) {
 		const started = Date.now();
@@ -2145,6 +2161,51 @@ var SshEngine = class {
 	}
 };
 //#endregion
+//#region src/loopback.ts
+/** IPv4 127/8 predicate (four decimal octets, first == 127). */
+function isIPv4Loopback(v4) {
+	const parts = v4.split(".");
+	return parts.length === 4 && parts[0] === "127" && parts.every((part) => /^\d{1,3}$/.test(part) && Number(part) <= 255);
+}
+/** Whether a socket remote address names the loopback range (127/8, ::1, IPv4-mapped). */
+function isLoopbackAddress(address) {
+	if (address === void 0) return false;
+	const normalized = address.toLowerCase();
+	if (normalized === "::1") return true;
+	if (normalized.startsWith("::ffff:")) return isIPv4Loopback(normalized.slice(7));
+	return isIPv4Loopback(normalized);
+}
+/** Whether a normalized URL hostname names the loopback authority (localhost, [::1], 127/8). */
+function isLoopbackHostname(hostname) {
+	if (hostname === "localhost" || hostname === "[::1]") return true;
+	return isIPv4Loopback(hostname);
+}
+/**
+* Request-level trust fence: a loopback socket address AND a loopback Host
+* header, plus browser same-origin markers. The socket address is
+* authoritative; X-Forwarded-For is never trusted.
+*/
+function isLoopbackRequest(request) {
+	if (!isLoopbackAddress(request.socket.remoteAddress)) return false;
+	const host = request.headers.host;
+	if (typeof host !== "string") return false;
+	let hostUrl;
+	try {
+		hostUrl = new URL("http://" + host);
+	} catch {
+		return false;
+	}
+	if (!isLoopbackHostname(hostUrl.hostname)) return false;
+	if (request.headers["sec-fetch-site"] === "cross-site") return false;
+	const origin = request.headers.origin;
+	if (origin === void 0) return true;
+	try {
+		return new URL(origin).host === hostUrl.host;
+	} catch {
+		return false;
+	}
+}
+//#endregion
 //#region src/protocol.ts
 const SSH_API = {
 	hosts: "/api/dsh-ssh/hosts",
@@ -2182,28 +2243,6 @@ const terminalWss = new WebSocketServer({ noServer: true });
 const BACKPRESSURE_HIGH_WATER = 1024 * 1024;
 /** …and resume once it drains below this. */
 const BACKPRESSURE_LOW_WATER = 512 * 1024;
-/** Loopback literal check plus browser same-origin markers (mirrors the pairing routes' fence). */
-function isLoopbackRequest(request) {
-	const address = request.socket.remoteAddress;
-	if (address !== "127.0.0.1" && address !== "::1" && address !== "::ffff:127.0.0.1") return false;
-	const host = request.headers.host;
-	if (typeof host !== "string") return false;
-	let hostUrl;
-	try {
-		hostUrl = new URL(`http://${host}`);
-	} catch {
-		return false;
-	}
-	if (hostUrl.hostname !== "127.0.0.1" && hostUrl.hostname !== "localhost" && hostUrl.hostname !== "[::1]") return false;
-	if (request.headers["sec-fetch-site"] === "cross-site") return false;
-	const origin = request.headers.origin;
-	if (origin === void 0) return true;
-	try {
-		return new URL(origin).host === hostUrl.host;
-	} catch {
-		return false;
-	}
-}
 /** One JSON response. */
 function writeJson(res, status, body) {
 	const payload = JSON.stringify(body);
@@ -2243,6 +2282,7 @@ function queryParam(url, name) {
 function makeRoutes(deps) {
 	const { store, engine } = deps;
 	const staging = deps.stagingDir ?? join(tmpdir(), "dsh-ssh-uploads");
+	const maxUploadBytes = deps.maxUploadBytes ?? MAX_UPLOAD_BYTES;
 	mkdirSync(staging, { recursive: true });
 	/** Guard helper: fence + method check. */
 	const guard = (req, res, method) => {
@@ -2303,6 +2343,14 @@ function makeRoutes(deps) {
 						}
 						try {
 							const entry = store.update(alias, body);
+							const patch = body;
+							if ([
+								"host",
+								"port",
+								"user",
+								"auth",
+								"proxyJump"
+							].some((key) => patch[key] !== void 0)) engine.dropAlias(alias);
 							writeJson(res, 200, { host: store.summarize(entry) });
 						} catch (error) {
 							writeJson(res, 400, { error: error instanceof Error ? error.message : String(error) });
@@ -2311,7 +2359,7 @@ function makeRoutes(deps) {
 					}
 					if (method === "DELETE") {
 						try {
-							engine.stopAllTunnels(alias);
+							engine.dropAlias(alias);
 							store.delete(alias);
 							writeJson(res, 200, { ok: true });
 						} catch (error) {
@@ -2480,7 +2528,7 @@ function makeRoutes(deps) {
 						return;
 					}
 					const declared = Number(req.headers["content-length"]);
-					if (Number.isFinite(declared) && declared > MAX_UPLOAD_BYTES) {
+					if (Number.isFinite(declared) && declared > maxUploadBytes) {
 						writeJson(res, 413, { error: "upload body too large" });
 						return;
 					}
@@ -2527,6 +2575,16 @@ function makeRoutes(deps) {
 					res.on("close", () => {
 						if (!res.writableEnded) fail("connection closed");
 					});
+					let received = 0;
+					req.on("data", (chunk) => {
+						received += chunk.byteLength;
+						if (received > maxUploadBytes) {
+							fail("upload body too large");
+							try {
+								req.destroy();
+							} catch {}
+						}
+					});
 					req.pipe(sink);
 					sink.on("finish", async () => {
 						if (settled) return;
@@ -3278,6 +3336,47 @@ function sshClusterTool(engine) {
 	});
 }
 //#endregion
+//#region src/mount-once.ts
+/**
+* Host single-instance guard shared by the plugin family. The family bundle
+* (dsh-web-ui-all / dsh-skins) namespaces every child row id (web-ui-*), so
+* the loader accepts a standalone install of the same package side by side;
+* without this guard the second instance would still re-register the same
+* webserver routes, tools, settings namespaces, and system-prompt sections
+* and fail the boot. mountOnce makes the second host apply a no-op for the
+* lifetime of the first instance (the browser half is already deduped by
+* package name in the client module host).
+*
+* The registry rides a global symbol so two module instances of the same
+* package (npm copy vs repository link) still share one verdict. cordis
+* `ctx.effect` runs its callback immediately and treats the callback's
+* return value as the fiber disposer, so the unmarker is returned, not run.
+*/
+const MOUNTED = Symbol.for("dsh-web-ui.mounted-plugins");
+function mountedSet() {
+	const registry = globalThis;
+	return registry[MOUNTED] ??= /* @__PURE__ */ new Set();
+}
+/**
+* Wrap a cordis plugin apply so the package runs at most once per process.
+* The first mount registers normally and unmarks when its fiber disposes;
+* any later mount of the same package name is a no-op.
+* @param packageName - npm package identity shared by every install source.
+* @param fn - the original plugin apply.
+* @returns an apply of the same shape.
+*/
+function mountOnce(packageName, fn) {
+	return ((...args) => {
+		const mounted = mountedSet();
+		if (mounted.has(packageName)) return;
+		mounted.add(packageName);
+		args[0]?.effect?.(() => () => {
+			mounted.delete(packageName);
+		});
+		return fn(...args);
+	});
+}
+//#endregion
 //#region src/index.ts
 /** Stable cordis plugin name. */
 const name = "ssh";
@@ -3308,7 +3407,8 @@ const SSH_GUIDANCE = "本机已安装 dsh-ssh 插件（DSH 远程 SSH 运维）
 * @param ctx - host plugin context carrying webServer/tools/systemPrompt.
 * @param config - resolved plugin config (schema defaults applied by the loader).
 */
-function apply(ctx, config) {
+const apply = mountOnce("@linxin666/dsh-ssh", applyImpl);
+function applyImpl(ctx, config) {
 	let current = () => config ?? {};
 	const resolve = () => {
 		const value = current();