dsh-vscode-mode 0.4.4 → 0.4.6

package/lib/client.js

@@ -1529,7 +1529,7 @@ window.__ModuleLoader__.load({
 		}
 		/**
 		* 加载 Monaco Editor（AMD 构建，随插件包离线分发）：注入 loader.js → require.config → editor.main。
-		* @author ddj 2026年08月20号
+		* @author ddj 2026年08月20号 / 2026年09月22号
 		* @returns Promise<object> window.monaco
 		*/
 		function loadMonaco(onProgress) {
@@ -1537,13 +1537,58 @@ window.__ModuleLoader__.load({
 			if (!monacoPromise) {
 				publishStage("loader", MONACO_STAGES.loader.progress, MONACO_STAGES.loader.message);
 				monacoPromise = new Promise((resolve, reject) => {
+					const hasModule = Object.prototype.hasOwnProperty.call(globalThis, "module");
+					const hasExports = Object.prototype.hasOwnProperty.call(globalThis, "exports");
+					const savedModule = globalThis.module;
+					const savedExports = globalThis.exports;
+					const hideNodeGlobals = () => {
+						try {
+							delete globalThis.module;
+						} catch (error) {}
+						try {
+							delete globalThis.exports;
+						} catch (error) {}
+					};
+					const restoreNodeGlobals = () => {
+						if (hasModule) globalThis.module = savedModule;
+						else try {
+							delete globalThis.module;
+						} catch (error) {}
+						if (hasExports) globalThis.exports = savedExports;
+						else try {
+							delete globalThis.exports;
+						} catch (error) {}
+					};
+					const removeLoaderTag = () => {
+						const existing = document.querySelector("script[data-edrv-monaco-loader]");
+						if (existing?.parentNode) existing.parentNode.removeChild(existing);
+					};
 					const fail = (error) => {
 						monacoPromise = null;
+						removeLoaderTag();
+						restoreNodeGlobals();
 						publishStage("error", MONACO_STAGES.error.progress, MONACO_STAGES.error.message);
 						reject(error);
 					};
+					const inject = () => {
+						const s = document.createElement("script");
+						s.src = MONACO_BASE + "/loader.js";
+						s.dataset.edrvMonacoLoader = "1";
+						s.onload = boot;
+						s.onerror = (event) => {
+							const hint = event && event.type ? "（" + event.type + "）" : "";
+							fail(/* @__PURE__ */ new Error("Monaco loader 加载失败" + hint));
+						};
+						hideNodeGlobals();
+						document.head.appendChild(s);
+					};
 					const boot = () => {
+						restoreNodeGlobals();
 						try {
+							if (typeof window.require !== "function" || typeof window.require.config !== "function") {
+								fail(/* @__PURE__ */ new Error("Monaco loader 未挂载 window.require（可能被其他脚本注入的全局 module 干扰）"));
+								return;
+							}
 							window.require.config({ paths: { vs: MONACO_BASE } });
 							publishStage("core", MONACO_STAGES.core.progress, MONACO_STAGES.core.message);
 							window.require(["vs/editor/editor.main"], () => {
@@ -1558,15 +1603,12 @@ window.__ModuleLoader__.load({
 							fail(error);
 						}
 					};
-					if (document.querySelector("script[data-edrv-monaco-loader]")) boot();
-					else {
-						const s = document.createElement("script");
-						s.src = MONACO_BASE + "/loader.js";
-						s.dataset.edrvMonacoLoader = "1";
-						s.onload = boot;
-						s.onerror = () => fail(/* @__PURE__ */ new Error("Monaco loader 加载失败"));
-						document.head.appendChild(s);
-					}
+					const existing = document.querySelector("script[data-edrv-monaco-loader]");
+					if (existing && typeof window.require === "function" && typeof window.require.config === "function") boot();
+					else if (existing) {
+						removeLoaderTag();
+						inject();
+					} else inject();
 				});
 			}
 			return monacoPromise.finally(unsubscribe);
@@ -5720,7 +5762,7 @@ window.__ModuleLoader__.load({
 			if (!uri) return "";
 			if (uri.startsWith("edrv://")) return uri;
 			const path = relativeLspPath(uri, root);
-			return "edrv:///" + encodeURI(path);
+			return "edrv:///" + encodeURI(String(path ?? "").replace(/^\/+/, ""));
 		}
 		/**
 		* 归一化 Location 的 uri → 工作区路径（剥离 scheme，不补盘符）。
@@ -8619,7 +8661,7 @@ window.__ModuleLoader__.load({
 				const cache = modelsRef.current;
 				let model = cache.get(path);
 				if (!model) {
-					const uri = window.monaco.Uri.parse("edrv:///" + encodeURI(path));
+					const uri = window.monaco.Uri.parse("edrv:///" + encodeURI(String(path ?? "").replace(/^\/+/, "")));
 					model = window.monaco.editor.getModel(uri) || window.monaco.editor.createModel(text ?? "", langOf(path), uri);
 					rememberModel(cache, path, model);
 				} else if (text !== void 0 && model.getValue() !== text) {
@@ -10878,14 +10920,14 @@ window.__ModuleLoader__.load({
 		*/
 		function markEditorMounted() {
 			mountEpoch += 1;
-			markEditorActive$1(true);
+			markEditorActive(true);
 		}
 		/**
 		* 直接设置激活标记（正文卸载延迟判定用；测试 also 用作状态编排入口）。
 		* @author ddj 2026年09月09号
 		* @param active 是否激活
 		*/
-		function markEditorActive$1(active) {
+		function markEditorActive(active) {
 			editorTabActive = active;
 		}
 		/**
@@ -14283,8 +14325,6 @@ window.__ModuleLoader__.load({
 			const reloadDirRef = react.default.useRef(null);
 			const changedTimerRef = react.default.useRef(null);
 			const changedRelRef = react.default.useRef(/* @__PURE__ */ new Set());
-			const dirsMapRef = react.default.useRef(null);
-			dirsMapRef.current = loadDir;
 			/** 渲染取数：内存态 → 本地条目缓存 → null（显示加载态）。 */
 			const entriesOf = (rel) => dirsRef.current[rel] ?? entriesCacheGet(scope, rel) ?? null;
 			/** 预取子目录：≤4 个、排除重型目录、缓存新鲜跳过、已加载跳过、不级联。 */