dsh-code-server-app 0.1.42 → 0.1.43

package/lib/native.js

@@ -13,7 +13,7 @@
 //   2. 从 code-server 运行位置出发校验这些模块是否真的能 require 到;
 //   3. 必要时在 code-server 树里补齐别名 junction(ESM import 不认 NODE_PATH,只能靠目录链)。
 import { createRequire } from 'node:module';
-import { existsSync, readFileSync, mkdirSync, symlinkSync } from 'node:fs';
+import { existsSync, readFileSync, mkdirSync, symlinkSync, lstatSync, rmSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { PACKAGE_ROOT, codeServerRoot, profileRootOf } from './vendor.js';
 
@@ -163,21 +163,44 @@ export function ensureAliasLinks() {
   return { created, failed };
 }
 
-/** 从**插件依赖图**解析(插件 node_modules → <profile>/node_modules),即包管理器装出来的真实包目录。
+/** 从**插件依赖图**解析(插件 node_modules → <profile>/node_modules),返回**真正的包根目录**
+ *  (有些包 `exports` 不暴露 `./package.json`,只能从入口文件往上找 name 匹配的目录)。
  *  与 `resolveNativeDir` 的区别:不走 code-server 树(树里可能有别的同名版本,例如 code-server 自带的
- *  typescript 5.9.3,而 VS Code 要的是 inner deps 里那份 6.0.3)。 */
-function resolveFromPlugin(name) {
+ *  typescript 5.9.3,而 VS Code 要的是 inner deps 里那份)。 */
+function packageRootFromPlugin(name) {
+  let from;
   try {
-    const from = createRequire(join(PACKAGE_ROOT, 'package.json'));
-    for (const spec of [`${name}/package.json`, name]) {
+    from = createRequire(join(PACKAGE_ROOT, 'package.json'));
+  } catch { return null; }
+  try {
+    return dirname(from.resolve(`${name}/package.json`));
+  } catch { /* exports 未暴露 package.json → 退回入口文件 */ }
+  try {
+    let dir = dirname(from.resolve(name));
+    for (let i = 0; i < 8; i += 1) {
       try {
-        return dirname(from.resolve(spec));
-      } catch { /* 试下一个 */ }
+        const manifest = JSON.parse(readFileSync(join(dir, 'package.json'), 'utf8'));
+        if (manifest.name === name) return dir;
+      } catch { /* 继续往上 */ }
+      const parent = dirname(dir);
+      if (parent === dir) break;
+      dir = parent;
     }
-  } catch { /* 忽略 */ }
+  } catch { /* 解析不了 */ }
   return null;
 }
 
+/** 路径上是否已有东西(**包括断链的 junction**:code-server 树被 pnpm 重装后旧链接会变成断链,
+ *  `existsSync` 对断链返回 false,直接再建会 EPERM)。 */
+function pathEntryExists(target) {
+  try {
+    lstatSync(target);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 /** 把 VS Code 的「内部依赖目录」用 junction 补回老布局。
  *
  *  为什么需要:老模型里 `lib/vscode/node_modules` 与 `lib/vscode/extensions/node_modules` 是 npm 在树里
@@ -204,15 +227,24 @@ export function ensureInnerModuleLinks() {
     } catch { continue; }
     for (const name of Object.keys(deps)) {
       const link = join(dir, name);
-      if (existsSync(join(link, 'package.json'))) continue; // 已在位(真实目录或链接)
-      const target = resolveFromPlugin(name);
+      if (existsSync(join(link, 'package.json'))) continue; // 链接有效(真实目录或有效 junction)
+      if (pathEntryExists(link)) {
+        // 断链(树被重装过)→ 清掉重建
+        try {
+          rmSync(link, { recursive: true, force: true });
+        } catch (error) {
+          failed.push(`${name}: 旧链接清理失败 ${error && error.code ? error.code : error}`);
+          continue;
+        }
+      }
+      const target = packageRootFromPlugin(name);
       if (target === null) continue; // 该依赖没装(envCheck 会另行报告)
       try {
         mkdirSync(dirname(link), { recursive: true });
         symlinkSync(target, link, process.platform === 'win32' ? 'junction' : 'dir');
         created.push(name);
       } catch (error) {
-        failed.push(`${name}: ${error && error.message ? error.message : String(error)}`);
+        failed.push(`${name}: ${error && error.code ? error.code : error}`);
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-code-server-app",
-  "version": "0.1.42",
+  "version": "0.1.43",
   "description": "Integrate code-server (VS Code in the browser) into DSH Web and Desktop: right-sidebar tab (DSH >= 0.1.5-alpha.1) with a floating-ball fallback for older hosts, over the Connection /api channel (ctx.connection.fetch; no webServer dependency) with host-side process lifecycle.",
   "homepage": "https://github.com/jinsiyu/dsh-code-server-app",
   "repository": {

package/vendor/VENDOR.json

@@ -1,6 +1,6 @@
 {
   "codeServerVersion": "4.136.2",
-  "preparedAt": "2026-09-10T07:11:10.362Z",
+  "preparedAt": "2026-09-10T07:13:09.707Z",
   "source": "registry",
   "node": "v24.13.1",
   "platform": "win32",