dsh-vscode-workbench 0.1.11 → 0.1.14

package/lib/index.js

@@ -1,11 +1,11 @@
 import { createRequire } from "node:module";
-import { access, lstat, mkdir, open, readFile, readdir, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
+import { access, lstat, mkdir, open, readFile, readdir, realpath, rename, rm, stat } from "node:fs/promises";
 import { basename, dirname, extname, isAbsolute, join, normalize, relative, resolve, sep } from "node:path";
 import chokidar from "chokidar";
 import { WebSocket, WebSocketServer } from "ws";
 import { createHash, randomUUID } from "node:crypto";
 import { spawn } from "node:child_process";
-import { constants, realpathSync } from "node:fs";
+import { chmodSync, constants, realpathSync, statSync } from "node:fs";
 import * as pty from "node-pty";
 //#region src/wire.ts
 var WorkbenchError = class extends Error {
@@ -84,7 +84,7 @@ function authorize(req, res, connection) {
 }
 //#endregion
 //#region src/host.ts
-const require = createRequire(import.meta.url);
+const require$1 = createRequire(import.meta.url);
 const TEXT_LIMIT = 5242880;
 const PROCESS_TIMEOUT = 3e4;
 function cwdFor(ctx, sessionId) {
@@ -173,21 +173,44 @@ async function readDocument(cwd, path) {
 		await handle.close();
 	}
 }
+const pendingSaves = /* @__PURE__ */ new Map();
 async function saveDocument(cwd, path, content, expected) {
-	const { absolute } = await workspacePath(cwd, path);
-	if ((await readDocument(cwd, path)).revision !== expected) throw new WorkbenchError("revision-conflict", "file changed on disk; reload before saving", 409);
-	const temp = join(dirname(absolute), `.${randomUUID()}.dsh-vscode.tmp`);
-	await writeFile(temp, content, {
-		encoding: "utf8",
-		flag: "wx"
+	const resolved = await workspacePath(cwd, path);
+	const absolute = await realpath(resolved.absolute);
+	const previous = pendingSaves.get(absolute) ?? Promise.resolve();
+	let release;
+	const pending = new Promise((resolve) => {
+		release = resolve;
 	});
+	pendingSaves.set(absolute, pending);
+	await previous;
+	let temp;
 	try {
+		const checkRevision = async () => {
+			const checked = await workspacePath(cwd, path);
+			if (await realpath(checked.absolute) !== absolute || (await readDocument(cwd, path)).revision !== expected) throw new WorkbenchError("revision-conflict", "file changed on disk; reload before saving", 409);
+		};
+		await checkRevision();
+		const info = await stat(absolute);
+		temp = join(dirname(absolute), `.${randomUUID()}.dsh-vscode.tmp`);
+		const handle = await open(temp, "wx", info.mode & 511);
+		try {
+			await handle.writeFile(content, { encoding: "utf8" });
+			await handle.chmod(info.mode & 511);
+		} finally {
+			await handle.close();
+		}
+		await checkRevision();
 		await rename(temp, absolute);
-	} catch (error) {
-		await rm(temp, { force: true });
-		throw error;
+		return await readDocument(cwd, path);
+	} finally {
+		try {
+			if (temp !== void 0) await rm(temp, { force: true });
+		} finally {
+			release();
+			if (pendingSaves.get(absolute) === pending) pendingSaves.delete(absolute);
+		}
 	}
-	return readDocument(cwd, path);
 }
 async function createEntry(cwd, path, kind) {
 	const { absolute } = await workspacePath(cwd, path, true);
@@ -222,8 +245,8 @@ async function renameEntry(cwd, path, nextPath) {
 	await rename(source.absolute, target.absolute);
 }
 async function deleteEntry(cwd, path) {
-	if (path === "") throw new WorkbenchError("root-delete", "cannot delete workspace root", 403);
-	const { absolute } = await workspacePath(cwd, path);
+	const { root, absolute } = await workspacePath(cwd, path);
+	if (absolute === root) throw new WorkbenchError("root-delete", "cannot delete workspace root", 403);
 	await rm(absolute, {
 		recursive: true,
 		force: false
@@ -257,7 +280,7 @@ async function workspacePreviewFile(cwd, path) {
 /** Resolve the PDF.js worker shipped with this plugin's runtime dependency. */
 function pdfWorkerAsset() {
 	return {
-		path: require.resolve("pdfjs-dist/legacy/build/pdf.worker.min.mjs"),
+		path: require$1.resolve("pdfjs-dist/legacy/build/pdf.worker.min.mjs"),
 		type: "text/javascript; charset=utf-8"
 	};
 }
@@ -318,7 +341,7 @@ async function searchWorkspace(cwd, request, signal) {
 		limited: false
 	};
 	const root = await canonicalRoot(cwd);
-	const rg = require("@vscode/ripgrep").rgPath;
+	const rg = require$1("@vscode/ripgrep").rgPath;
 	const args = [
 		"--json",
 		"--line-number",
@@ -443,29 +466,36 @@ async function gitStatus(cwd) {
 	let ahead = 0;
 	let behind = 0;
 	const changes = [];
-	for (const record of result.stdout.split("\0")) if (record.startsWith("# branch.head ")) branch = record.slice(14);
-	else if (record.startsWith("# branch.ab ")) {
-		const match = /\+(\d+) -(\d+)/.exec(record);
-		ahead = Number(match?.[1] ?? 0);
-		behind = Number(match?.[2] ?? 0);
-	} else if (record.startsWith("? ")) changes.push({
-		path: record.slice(2),
-		index: "?",
-		worktree: "?",
-		staged: false,
-		untracked: true
-	});
-	else if (record.startsWith("1 ") || record.startsWith("2 ")) {
-		const parts = record.split(" ");
-		const xy = parts[1] ?? "..";
-		const path = parts.slice(record.startsWith("2 ") ? 9 : 8).join(" ");
-		changes.push({
-			path,
-			index: xy[0] ?? ".",
-			worktree: xy[1] ?? ".",
-			staged: xy[0] !== ".",
-			untracked: false
+	const records = result.stdout.split("\0");
+	for (let index = 0; index < records.length; index++) {
+		const record = records[index];
+		if (record.startsWith("# branch.head ")) branch = record.slice(14);
+		else if (record.startsWith("# branch.ab ")) {
+			const match = /\+(\d+) -(\d+)/.exec(record);
+			ahead = Number(match?.[1] ?? 0);
+			behind = Number(match?.[2] ?? 0);
+		} else if (record.startsWith("? ")) changes.push({
+			path: record.slice(2),
+			index: "?",
+			worktree: "?",
+			staged: false,
+			untracked: true
 		});
+		else if (record.startsWith("1 ") || record.startsWith("2 ") || record.startsWith("u ")) {
+			const renamed = record.startsWith("2 ");
+			const parts = record.split(" ");
+			const xy = parts[1] ?? "..";
+			const path = parts.slice(renamed ? 9 : record.startsWith("u ") ? 10 : 8).join(" ");
+			const originalPath = renamed ? records[++index] : void 0;
+			changes.push({
+				path,
+				...originalPath === void 0 ? {} : { originalPath },
+				index: xy[0] ?? ".",
+				worktree: xy[1] ?? ".",
+				staged: xy[0] !== ".",
+				untracked: false
+			});
+		}
 	}
 	return {
 		repository,
@@ -685,14 +715,14 @@ async function gitAction(cwd, action, path, value) {
 }
 /** Resolve the official VS Code Codicon font shipped by @vscode/codicons. */
 function codiconAsset() {
-	const packageRoot = dirname(require.resolve("@vscode/codicons/package.json"));
+	const packageRoot = dirname(require$1.resolve("@vscode/codicons/package.json"));
 	return {
 		path: resolve(packageRoot, "dist", "codicon.ttf"),
 		type: "font/ttf"
 	};
 }
 function monacoAsset(raw) {
-	const packageRoot = dirname(require.resolve("monaco-editor/package.json"));
+	const packageRoot = dirname(require$1.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 {
@@ -702,6 +732,7 @@ function monacoAsset(raw) {
 }
 //#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;
@@ -720,9 +751,30 @@ function defaultTerminalShell(platform = process.platform, env = process.env) {
 		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);
 	}
@@ -916,6 +968,87 @@ function installTerminal(ctx) {
 	}, "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. */
+const DEFAULT_WATCH_IGNORES = [
+	".git",
+	".hg",
+	".svn",
+	"node_modules",
+	"bower_components",
+	".pnpm-store",
+	".yarn",
+	".next",
+	".nuxt",
+	".turbo",
+	".vite",
+	".cache",
+	"coverage",
+	"vendor",
+	"third_party",
+	"third-party",
+	"third_part",
+	"third-part",
+	"build",
+	"dist",
+	"out",
+	"target",
+	".venv",
+	"venv",
+	"__pycache__",
+	".mypy_cache",
+	".pytest_cache",
+	".ruff_cache",
+	".gradle",
+	".idea",
+	".vs",
+	"Pods"
+];
+function normalize$1(entry) {
+	return entry.trim().replace(/\\/g, "/").replace(/^\.\//, "").replace(/\/+$/, "");
+}
+function segmentsOf(entry) {
+	return normalize$1(entry).split("/").filter((part) => part !== "" && part !== ".");
+}
+/** Parse a newline- or comma-separated exclusion list, dropping blanks, comments and unsafe paths. */
+function parseWatchIgnores(value) {
+	if (value === null || value === void 0) return [];
+	const entries = /* @__PURE__ */ new Set();
+	for (const raw of value.split(/[\n,]+/)) {
+		const entry = normalize$1(raw);
+		const parts = segmentsOf(entry);
+		if (parts.length === 0 || parts.includes("..") || entry.startsWith("#")) continue;
+		entries.add(parts.slice(0, 8).join("/").slice(0, 200));
+		if (entries.size >= 200) break;
+	}
+	return [...entries];
+}
+/** Return true when a workspace-relative path contains one of the excluded segment sequences. */
+function isIgnoredPath(relativePath, patterns) {
+	const segments = relativePath.split(/[\\/]+/).filter(Boolean).map((segment) => segment.toLowerCase());
+	if (segments.length === 0) return false;
+	for (const pattern of patterns) {
+		const parts = segmentsOf(pattern).map((part) => part.toLowerCase());
+		if (parts.length === 0 || parts.includes("..")) continue;
+		if (parts.length === 1) {
+			if (segments.includes(parts[0])) return true;
+			continue;
+		}
+		for (let index = 0; index + parts.length <= segments.length; index++) if (parts.every((part, offset) => segments[index + offset] === part)) return true;
+	}
+	return false;
+}
+/** Build a chokidar `ignored` predicate for one workspace and the user's extra exclusions. */
+function watchIgnore(workspace, extra) {
+	const patterns = [...DEFAULT_WATCH_IGNORES, ...extra];
+	return (path) => {
+		const path_ = relative(workspace, path);
+		if (path_ === "" || path_.startsWith("..") || isAbsolute(path_)) return false;
+		return isIgnoredPath(path_.split(sep).join("/"), patterns);
+	};
+}
+//#endregion
 //#region src/index.ts
 /** DSH host plugin for the VS Code workbench. */
 const name = "dsh-vscode-workbench";
@@ -1079,7 +1212,8 @@ function apply(ctx) {
 				return;
 			}
 			wss.handleUpgrade(req, socket, head, (ws) => {
-				const sessionId = new URL(req.url ?? "/", "http://dsh.local").searchParams.get("sessionId");
+				const search = new URL(req.url ?? "/", "http://dsh.local").searchParams;
+				const sessionId = search.get("sessionId");
 				if (sessionId === null) {
 					ws.close(1008, "sessionId required");
 					return;
@@ -1093,12 +1227,20 @@ function apply(ctx) {
 				}
 				const watcher = chokidar.watch(workspace, {
 					ignoreInitial: true,
-					ignored: /(^|[/\\])(\.git|node_modules|\.next|\.nuxt|\.turbo|\.vite|coverage)([/\\]|$)/,
+					ignored: watchIgnore(workspace, parseWatchIgnores(search.get("ignore"))),
 					awaitWriteFinish: {
 						stabilityThreshold: 100,
 						pollInterval: 25
 					}
 				});
+				watcher.on("error", (error) => {
+					console.warn("[dsh-vscode-workbench] file watcher stopped:", error);
+					if (ws.readyState === WebSocket.OPEN) ws.send(JSON.stringify({
+						type: "files.watch-error",
+						message: String(error)
+					}));
+					watcher.close();
+				});
 				let paths = /* @__PURE__ */ new Set();
 				let timer;
 				watcher.on("all", (_event, path) => {