dsh-vscode-workbench 0.2.3 → 0.2.5

package/lib/index.js

@@ -1,5 +1,5 @@
 import { createRequire } from "node:module";
-import { chmodSync, constants, createReadStream, realpathSync, statSync } from "node:fs";
+import { constants, createReadStream } from "node:fs";
 import { access, lstat, mkdir, open, readFile, readdir, realpath, rename, rm, stat } from "node:fs/promises";
 import { basename, delimiter, dirname, extname, isAbsolute, join, normalize, relative, resolve, sep } from "node:path";
 import { execFile, spawn } from "node:child_process";
@@ -9,7 +9,6 @@ import { createHash, randomUUID } from "node:crypto";
 import { homedir, tmpdir } from "node:os";
 import { pathToFileURL } from "node:url";
 import { promisify } from "node:util";
-import * as pty from "node-pty";
 //#region src/commit-message.ts
 const DEFAULT_COMMIT_PREFERENCES = {
 	detail: "standard",
@@ -284,7 +283,7 @@ function authorize(req, res, connection) {
 }
 //#endregion
 //#region src/host.ts
-const require$1 = createRequire(import.meta.url);
+const require = createRequire(import.meta.url);
 const TEXT_LIMIT = 5242880;
 const PROCESS_TIMEOUT = 3e4;
 function cwdFor(ctx, sessionId) {
@@ -577,7 +576,7 @@ async function workspaceDownloadFile(cwd, path) {
 /** Resolve the PDF.js worker shipped with this plugin's runtime dependency. */
 function pdfWorkerAsset() {
 	return {
-		path: require$1.resolve("pdfjs-dist/legacy/build/pdf.worker.min.mjs"),
+		path: require.resolve("pdfjs-dist/legacy/build/pdf.worker.min.mjs"),
 		type: "text/javascript; charset=utf-8"
 	};
 }
@@ -638,7 +637,7 @@ async function searchWorkspace(cwd, request, signal) {
 		limited: false
 	};
 	const root = await canonicalRoot(cwd);
-	const rg = require$1("@vscode/ripgrep").rgPath;
+	const rg = require("@vscode/ripgrep").rgPath;
 	const args = [
 		"--json",
 		"--line-number",
@@ -1138,7 +1137,7 @@ async function gitAction(cwd, action, path, value) {
 }
 /** Resolve the official VS Code Codicon font shipped by @vscode/codicons. */
 function codiconAsset() {
-	const packageRoot = dirname(require$1.resolve("@vscode/codicons/package.json"));
+	const packageRoot = dirname(require.resolve("@vscode/codicons/package.json"));
 	return {
 		path: resolve(packageRoot, "dist", "codicon.ttf"),
 		type: "font/ttf"
@@ -1146,14 +1145,14 @@ function codiconAsset() {
 }
 /** Browser build of SheetJS served as an asset so the client bundle stays free of Node builtins. */
 function xlsxAsset() {
-	const packageRoot = dirname(require$1.resolve("xlsx/package.json"));
+	const packageRoot = dirname(require.resolve("xlsx/package.json"));
 	return {
 		path: resolve(packageRoot, "dist", "xlsx.full.min.js"),
 		type: "text/javascript; charset=utf-8"
 	};
 }
 function monacoAsset(raw) {
-	const packageRoot = dirname(require$1.resolve("monaco-editor/package.json"));
+	const packageRoot = dirname(require.resolve("monaco-editor/package.json"));
 	const path = resolve(packageRoot, "min", raw);
 	if (!inside(resolve(packageRoot, "min"), path)) throw new WorkbenchError("asset-invalid", "invalid Monaco asset path", 403);
 	return {
@@ -1164,7 +1163,7 @@ function monacoAsset(raw) {
 /** Resolve a vscode-icons SVG shipped by @vscode-icons/vscode-icons-api. */
 function fileIconAsset(raw) {
 	if (!/^[a-z0-9_-]+\.svg$/i.test(raw)) throw new WorkbenchError("asset-invalid", "invalid file icon path", 403);
-	const packageRoot = dirname(require$1.resolve("@vscode-icons/vscode-icons-api/package.json"));
+	const packageRoot = dirname(require.resolve("@vscode-icons/vscode-icons-api/package.json"));
 	return {
 		path: resolve(packageRoot, "icons", raw),
 		type: "image/svg+xml"
@@ -1400,7 +1399,12 @@ async function exists$1(path) {
 */
 function lspSearchDirs(env = process.env, home = homedir()) {
 	const fromPath = (env.PATH ?? env.Path ?? "").split(delimiter).filter(Boolean);
-	const extras = [
+	const extras = process.platform === "win32" ? [
+		join(home, "go", "bin"),
+		join(home, ".cargo", "bin"),
+		join(home, ".dotnet", "tools"),
+		join(home, "bin")
+	] : [
 		join(home, "go", "bin"),
 		join(home, ".cargo", "bin"),
 		join(home, ".dotnet", "tools"),
@@ -1420,7 +1424,7 @@ async function executableIn(directory, command) {
 		`${command}.exe`,
 		`${command}.cmd`,
 		`${command}.bat`,
-		command
+		`${command}.com`
 	] : [command];
 	for (const name of names) {
 		const file = join(directory, name);
@@ -1689,243 +1693,6 @@ async function officePdf(cwd, path) {
 	}
 }
 //#endregion
-//#region src/terminal.ts
-const require = createRequire(import.meta.url);
-const SENSITIVE = /(api[_-]?key|token|credential|secret|password|passwd|private[_-]?key|^dsh_.*(?:key|token|secret))/i;
-const MAX_TERMINALS = 8;
-const REPLAY_BYTES = 2097152;
-/** Remove credentials while retaining ordinary interactive-shell variables. */
-function sanitizedTerminalEnv(env) {
-	return Object.fromEntries(Object.entries(env).filter(([key, value]) => value !== void 0 && !SENSITIVE.test(key)));
-}
-/** Select the user's interactive shell with platform-specific fallbacks. */
-function defaultTerminalShell(platform = process.platform, env = process.env) {
-	if (platform === "win32") return {
-		shell: env.COMSPEC?.toLowerCase().includes("powershell") ? env.COMSPEC : "powershell.exe",
-		args: ["-NoLogo"]
-	};
-	return {
-		shell: env.SHELL || (platform === "darwin" ? "/bin/zsh" : "/bin/bash"),
-		args: ["-l"]
-	};
-}
-/** Add execute bits when a registry package extracted a native helper without them. */
-function ensureExecutable(path) {
-	if (process.platform === "win32") return true;
-	try {
-		const mode = statSync(path).mode;
-		if ((mode & 73) === 0) chmodSync(path, mode | 73);
-		return true;
-	} catch {
-		return false;
-	}
-}
-/** Repair node-pty's macOS/Linux helper, whose npm package currently loses its execute bit. */
-function repairNodePtyHelper() {
-	if (process.platform === "win32") return;
-	const packageDirectory = dirname(require.resolve("node-pty/package.json"));
-	ensureExecutable(join(packageDirectory, "build", "Release", "spawn-helper"));
-	ensureExecutable(join(packageDirectory, "prebuilds", `${process.platform}-${process.arch}`, "spawn-helper"));
-}
-/** Own interactive terminals by their canonical workspace directory. */
-var TerminalManager = class {
-	workspaces = /* @__PURE__ */ new Map();
-	constructor() {
-		repairNodePtyHelper();
-	}
-	workspace(cwd) {
-		return realpathSync(cwd);
-	}
-	list(cwd) {
-		return [...this.workspaces.get(this.workspace(cwd))?.values() ?? []].map((handle) => ({ ...handle.info }));
-	}
-	create(cwd, title) {
-		const key = this.workspace(cwd);
-		const terminals = this.workspaces.get(key) ?? /* @__PURE__ */ new Map();
-		this.workspaces.set(key, terminals);
-		if (terminals.size >= MAX_TERMINALS) throw new Error(`terminal limit reached (${MAX_TERMINALS})`);
-		const { shell, args } = defaultTerminalShell();
-		const child = pty.spawn(shell, args, {
-			name: "xterm-256color",
-			cols: 80,
-			rows: 24,
-			cwd: key,
-			env: sanitizedTerminalEnv(process.env)
-		});
-		const info = {
-			id: randomUUID(),
-			title: title || basename(shell),
-			cwd: key,
-			running: true,
-			sequence: 0
-		};
-		const handle = {
-			info,
-			process: child,
-			replay: "",
-			listeners: /* @__PURE__ */ new Set()
-		};
-		terminals.set(info.id, handle);
-		child.onData((data) => {
-			info.sequence++;
-			handle.replay += data;
-			if (Buffer.byteLength(handle.replay) > REPLAY_BYTES) handle.replay = handle.replay.slice(-2097152);
-			for (const listener of handle.listeners) listener({
-				sequence: info.sequence,
-				data
-			});
-		});
-		child.onExit(({ exitCode }) => {
-			info.running = false;
-			info.exitCode = exitCode;
-			info.sequence++;
-			const data = `\r\n[process exited with code ${exitCode}]\r\n`;
-			for (const listener of handle.listeners) listener({
-				sequence: info.sequence,
-				data
-			});
-		});
-		return { ...info };
-	}
-	get(cwd, id) {
-		return this.workspaces.get(this.workspace(cwd))?.get(id);
-	}
-	close(cwd, id) {
-		const key = this.workspace(cwd);
-		const terminals = this.workspaces.get(key);
-		const handle = terminals?.get(id);
-		if (handle === void 0 || terminals === void 0) return;
-		terminals.delete(id);
-		try {
-			handle.process.kill();
-		} catch {}
-		if (terminals.size === 0) this.workspaces.delete(key);
-	}
-	rename(cwd, id, title) {
-		const handle = this.get(cwd, id);
-		if (handle === void 0) throw new Error("terminal not found");
-		handle.info.title = title;
-		return { ...handle.info };
-	}
-	dispose() {
-		for (const [cwd, terminals] of this.workspaces) for (const id of terminals.keys()) this.close(cwd, id);
-	}
-};
-function terminalRequestAllowed(req) {
-	const host = req.headers.host;
-	if (host === void 0 || req.headers["sec-fetch-site"] === "cross-site") return false;
-	let hostname;
-	try {
-		hostname = new URL(`http://${host}`).hostname;
-	} catch {
-		return false;
-	}
-	if (hostname !== "localhost" && hostname !== "[::1]" && !hostname.startsWith("127.")) return false;
-	const origin = req.headers.origin;
-	try {
-		return origin === void 0 || new URL(origin).host === host;
-	} catch {
-		return false;
-	}
-}
-/** Register the private local terminal API and WebSocket transport. */
-function installTerminal(ctx) {
-	const manager = new TerminalManager();
-	ctx.effect(() => ctx.webServer.register({
-		kind: "prefix",
-		path: "/dsh-vscode-terminal/api",
-		handler: async (req, res) => {
-			if (!authorize(req, res, ctx.connection)) return;
-			if (!terminalRequestAllowed(req)) return send(res, 403, {
-				ok: false,
-				error: { message: "forbidden" }
-			});
-			if (req.method !== "POST") return send(res, 405, {
-				ok: false,
-				error: { message: "POST required" }
-			});
-			try {
-				const body = await readBody(req);
-				const sessionId = typeof body.sessionId === "string" ? body.sessionId : "";
-				if (sessionId === "") throw new Error("sessionId required");
-				const cwd = cwdFor(ctx, sessionId);
-				const method = new URL(req.url ?? "/", "http://dsh.local").pathname.slice(25);
-				let value;
-				if (method === "list") value = manager.list(cwd);
-				else if (method === "create") value = manager.create(cwd, typeof body.title === "string" ? body.title : void 0);
-				else if (method === "close") {
-					manager.close(cwd, typeof body.id === "string" ? body.id : "");
-					value = manager.list(cwd);
-				} else if (method === "rename") value = manager.rename(cwd, typeof body.id === "string" ? body.id : "", typeof body.title === "string" ? body.title : "");
-				else throw new Error("unknown terminal method");
-				send(res, 200, {
-					ok: true,
-					value
-				});
-			} catch (error) {
-				sendError(res, error);
-			}
-		}
-	}), "dsh-vscode-workbench: terminal API");
-	const webSocket = new WebSocketServer({ noServer: true });
-	ctx.effect(() => ctx.webServer.registerUpgrade({
-		path: "/dsh-vscode-terminal/ws",
-		handler(req, socket, head) {
-			if (ctx.connection.requestRejection(req) !== void 0 || !terminalRequestAllowed(req)) {
-				socket.destroy();
-				return;
-			}
-			webSocket.handleUpgrade(req, socket, head, (connection) => {
-				const url = new URL(req.url ?? "/", "http://dsh.local");
-				const sessionId = url.searchParams.get("sessionId");
-				const id = url.searchParams.get("id");
-				if (sessionId === null || id === null) {
-					connection.close(1008, "sessionId and id required");
-					return;
-				}
-				let handle;
-				try {
-					handle = manager.get(cwdFor(ctx, sessionId), id);
-				} catch {
-					connection.close(1008, "session workspace unavailable");
-					return;
-				}
-				if (handle === void 0) {
-					connection.close(1008, "terminal not found");
-					return;
-				}
-				if (handle.replay !== "") connection.send(JSON.stringify({
-					type: "replay",
-					sequence: handle.info.sequence,
-					data: handle.replay
-				}));
-				const listener = (output) => {
-					if (connection.readyState === WebSocket.OPEN) connection.send(JSON.stringify({
-						type: "output",
-						...output
-					}));
-				};
-				handle.listeners.add(listener);
-				connection.on("message", (raw) => {
-					const text = raw.toString();
-					try {
-						const message = JSON.parse(text);
-						if (message !== null && typeof message === "object" && "type" in message && message.type === "input" && "data" in message && typeof message.data === "string") handle.process.write(message.data);
-						else if (message !== null && typeof message === "object" && "type" in message && message.type === "resize" && "cols" in message && "rows" in message && typeof message.cols === "number" && typeof message.rows === "number") handle.process.resize(Math.max(2, Math.floor(message.cols)), Math.max(2, Math.floor(message.rows)));
-					} catch {
-						handle.process.write(text);
-					}
-				});
-				connection.on("close", () => handle.listeners.delete(listener));
-			});
-		}
-	}), "dsh-vscode-workbench: terminal WebSocket");
-	ctx.effect(() => () => {
-		webSocket.close();
-		manager.dispose();
-	}, "dsh-vscode-workbench: terminal teardown");
-}
-//#endregion
 //#region src/watch-ignore.ts
 /** Exclusion rules for the recursive workspace file watcher. */
 /** Directory names skipped by default; large dependency and build trees exhaust inotify watches. */
@@ -2082,7 +1849,6 @@ function apply(ctx) {
 			fiber.dispose?.();
 		};
 	}, "dsh-vscode-workbench: optional DSH services");
-	installTerminal(ctx);
 	ctx.effect(() => ctx.webServer.register({
 		kind: "exact",
 		path: "/dsh-vscode/codicons/codicon.ttf",