dsh-code-server-app 0.1.20 → 0.1.24

package/lib/index.js

@@ -66,6 +66,9 @@ export const Config = z.object({
   /** windowedOpen=false(默认)点击悬浮球打开内部浮动窗口;
    *  true 时改为在浏览器新标签页打开 code-server(自动启动并跟随工作区)。 */
   windowedOpen: z.boolean().default(false),
+  /** installGuideDismissed=false(默认)环境未就绪时弹出安装指引;
+   *  true = 用户已永久关闭安装指引(不再弹出;设置卡可重新打开)。 */
+  installGuideDismissed: z.boolean().default(false),
 });
 
 const DEFAULT_CONFIG = {
@@ -281,6 +284,7 @@ export async function apply(ctx, config) {
   const settingsSvc = ctx.get('settings');
   let reserveComposer = true;
   let windowedOpen = false;
+  let installGuideDismissed = false;
   if (settingsSvc !== undefined && typeof settingsSvc.register === 'function') {
     try {
       const scope = settingsSvc.register(SETTINGS_NS, Config);
@@ -289,6 +293,7 @@ export async function apply(ctx, config) {
         const resolved = scope.get();
         reserveComposer = resolved && typeof resolved.reserveComposer === 'boolean' ? resolved.reserveComposer : true;
         windowedOpen = resolved && typeof resolved.windowedOpen === 'boolean' ? resolved.windowedOpen : false;
+        installGuideDismissed = resolved && typeof resolved.installGuideDismissed === 'boolean' ? resolved.installGuideDismissed : false;
       }
       scope.watch((next) => {
         if (next != null && typeof next.reserveComposer === 'boolean') {
@@ -299,6 +304,10 @@ export async function apply(ctx, config) {
           windowedOpen = next.windowedOpen;
           console.log(`[code-server] windowedOpen updated: ${windowedOpen}`);
         }
+        if (next != null && typeof next.installGuideDismissed === 'boolean') {
+          installGuideDismissed = next.installGuideDismissed;
+          console.log(`[code-server] installGuideDismissed updated: ${installGuideDismissed}`);
+        }
       });
     } catch (error) {
       console.error(`[code-server] settings unavailable; using defaults (reserveComposer=true, windowedOpen=false): ${error.message}`);
@@ -340,6 +349,7 @@ export async function apply(ctx, config) {
       adopted: state.adopted,
       reserveComposer,
       windowedOpen,
+      installGuideDismissed,
       env: state.env,
       setup: {
         running: state.setup.running,
@@ -347,9 +357,30 @@ export async function apply(ctx, config) {
         ok: state.setup.ok,
         logTail: state.setup.logTail.slice(-LOG_TAIL_MAX),
       },
+      lastSetupError: readLastSetupError(),
     };
   }
 
+  /** 读 setup 失败标记文件(postinstall 失败时写入;成功则不存在)→ 用户可查看。
+   *  标记在安装根:<profile>\.code-server-app\last-setup-error.json。 */
+  function readLastSetupError() {
+    try {
+      const here = path.dirname(fileURLToPath(import.meta.url));
+      // 插件目录 <profile>\node_modules\<name> 向上两级 = <profile> 根
+      const profileRoot = path.join(here, '..', '..');
+      const marker = path.join(profileRoot, '.code-server-app', 'last-setup-error.json');
+      if (!fs.existsSync(marker)) return null;
+      const raw = fs.readFileSync(marker, 'utf8');
+      const j = JSON.parse(raw);
+      return {
+        at: j && typeof j.at === 'string' ? j.at : null,
+        error: j && typeof j.error === 'string' ? j.error : '安装脚本失败(无详情)',
+      };
+    } catch {
+      return null;
+    }
+  }
+
   function appendLog(chunk) {
     try {
       const text = typeof chunk === 'string' ? chunk : chunk.toString('utf8');

package/package.json

@@ -1,56 +1,57 @@
-{
-  "name": "dsh-code-server-app",
-  "version": "0.1.20",
-  "description": "Integrate code-server (VS Code in the browser) into DSH Web: floating ball entry + fullscreen overlay, host-side process lifecycle over a /code-server JSON API (motion-based spring window animations).",
-  "homepage": "https://github.com/jinsiyu/dsh-code-server-app",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/jinsiyu/dsh-code-server-app.git"
-  },
-  "type": "module",
-  "main": "lib/index.js",
-  "exports": {
-    ".": "./lib/index.js",
-    "./client": "./lib/client.js",
-    "./package.json": "./package.json"
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "platform": "web",
-      "inject": [
-        "@deepseek-ai/dsh-client-connection",
-        "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-ui-settings"
-      ]
-    }
-  },
-  "files": [
-    "lib/index.js",
-    "lib/client.js",
-    "assets/favicon.ico",
-    "assets/favicon.svg",
-    "assets/extensions/dshcs-open-file",
-    "scripts/setup-code-server.mjs",
-    "cordis.patch.yml",
-    "LICENSE",
-    "README.md"
-  ],
-  "scripts": {
-    "postinstall": "node scripts/setup-code-server.mjs",
-    "setup:code-server": "node scripts/setup-code-server.mjs",
-    "build:client": "node scripts/build-client.mjs"
-  },
-  "devDependencies": {
-    "esbuild": "^0.25.0",
-    "motion": "^12.0.0"
-  },
-  "license": "MIT",
-  "allowScripts": {
-    "code-server": false,
-    "argon2@0.44.0": true,
-    "unrs-resolver@1.11.1": true
-  }
-}
+{
+  "name": "dsh-code-server-app",
+  "version": "0.1.24",
+  "description": "Integrate code-server (VS Code in the browser) into DSH Web: floating ball entry + fullscreen overlay, host-side process lifecycle over a /code-server JSON API (motion-based spring window animations).",
+  "homepage": "https://github.com/jinsiyu/dsh-code-server-app",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jinsiyu/dsh-code-server-app.git"
+  },
+  "type": "module",
+  "main": "lib/index.js",
+  "exports": {
+    ".": "./lib/index.js",
+    "./client": "./lib/client.js",
+    "./package.json": "./package.json"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web",
+      "inject": [
+        "@deepseek-ai/dsh-client-connection",
+        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-ui-settings"
+      ]
+    }
+  },
+  "files": [
+    "lib/index.js",
+    "lib/client.js",
+    "assets/favicon.ico",
+    "assets/favicon.svg",
+    "assets/extensions/dshcs-open-file",
+    "scripts/setup-code-server.mjs",
+    "cordis.patch.yml",
+    "LICENSE",
+    "README.md",
+    "README.en.md"
+  ],
+  "scripts": {
+    "postinstall": "node scripts/setup-code-server.mjs",
+    "setup:code-server": "node scripts/setup-code-server.mjs",
+    "build:client": "node scripts/build-client.mjs"
+  },
+  "devDependencies": {
+    "esbuild": "^0.25.0",
+    "motion": "^12.0.0"
+  },
+  "license": "MIT",
+  "allowScripts": {
+    "code-server": false,
+    "argon2": true,
+    "unrs-resolver": true
+  }
+}

package/scripts/setup-code-server.mjs

@@ -11,14 +11,15 @@
 // 幂等:code-server 已实例化(entry + VS Code 内部依赖 + argon2 native 均在)则跳过;
 // pnpm 重装插件后会重跑 postinstall → 自动重新自装(自愈)。
 import { spawnSync } from 'node:child_process';
-import { existsSync, mkdirSync, writeFileSync, copyFileSync, readdirSync } from 'node:fs';
+import { existsSync, mkdirSync, writeFileSync, readFileSync, copyFileSync, readdirSync, rmSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 const here = dirname(fileURLToPath(import.meta.url)); // .../dsh-code-server/scripts
 const pkgRoot = join(here, '..'); // <profile>\node_modules\dsh-code-server
 
-const CODE_SERVER_VERSION = '4.134.0';
+// 不锁定 code-server 版本:安装时总是取 npm 最新版(latest)。
+// 可用环境变量 DSHCS_CODE_SERVER_VERSION 显式锁版本(如 "4.134.0"),缺省为空 = latest。
 
 function run(cmd, args, cwd) {
   const useShell = process.platform === 'win32';
@@ -30,6 +31,43 @@ function npm(cmdArgs, cwd) {
   run(process.platform === 'win32' ? 'npm.cmd' : 'npm', cmdArgs, cwd);
 }
 
+/** 查询 npm 最新 code-server 版本;失败(离线/网络/权限)返回 null。
+ *  优先直连 registry JSON API(子进程 Node ESM,无 npm 缓存写);失败再试 npm view。 */
+function latestCodeServerVersion() {
+  try {
+    const code = "const r=await fetch('https://registry.npmjs.org/code-server/latest');const j=await r.json();process.stdout.write(j&&j.version||'')";
+    const res = spawnSync(process.execPath, ['--input-type=module', '-e', code], { encoding: 'utf8' });
+    const v = String(res.stdout || '').trim();
+    if (v !== '' && /^\d+\./.test(v)) return v;
+  } catch { /* fall through */ }
+  try {
+    const npmBin = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+    const res = spawnSync(npmBin, ['view', 'code-server', 'version'], { encoding: 'utf8', shell: process.platform === 'win32' });
+    if (res.status === 0) {
+      const v = String(res.stdout || '').trim();
+      if (v !== '' && /^\d+\./.test(v)) return v;
+    }
+  } catch { /* fall through */ }
+  return null;
+}
+
+/** 待安装的版本:DSHCS_CODE_SERVER_VERSION 优先(显式锁定),否则 latest 查询,再否则 latest 安装。 */
+function desiredVersion() {
+  const locked = process.env.DSHCS_CODE_SERVER_VERSION;
+  if (typeof locked === 'string' && locked.trim() !== '') return locked.trim();
+  return latestCodeServerVersion(); // null → npm install code-server(不带版本)=latest
+}
+
+/** 已安装版本(读 cs/package.json);读取失败返回 null。 */
+function installedVersion(cs) {
+  try {
+    const pkg = JSON.parse(readFileSync(join(cs, 'package.json'), 'utf8'));
+    return typeof pkg.version === 'string' ? pkg.version : null;
+  } catch {
+    return null;
+  }
+}
+
 function ensureNpmDeps(dir) {
   if (!existsSync(join(dir, 'package.json'))) return;
   // --omit=dev:只装生产依赖(native 模块在依赖 postinstall 内建)
@@ -83,10 +121,14 @@ function installPrefix() {
 
 function installCodeServer() {
   const prefix = installPrefix();
-  console.log(`[setup-code-server] npm 自装 code-server@${CODE_SERVER_VERSION}(target: ${prefix} → node_modules/code-server)${
+  const want = desiredVersion();
+  const versionSpec = typeof want === 'string' && want !== '' ? `code-server@${want}` : 'code-server';
+  console.log(`[setup-code-server] npm 自装 ${versionSpec}(latest)${
+    want != null ? '' : ''}(target: ${prefix} → node_modules/code-server)${
     prefix === pkgRoot ? '(包内回退)' : '(profile 专用目录)'}…`);
   // npm 读取 prefix 项目自己的 package.json 的 allowScripts;在安装根写一个最小配置,
   // 让 code-server:false(跳过官方 sh postinstall)、argon2/unrs:true(native 构建)生效。
+  // allowScripts 不带版本号(任何 argon2/unrs 版本都构建 native,避免版本变化后失配)。
   const appPkg = join(prefix, 'package.json');
   if (!existsSync(appPkg)) {
     try {
@@ -95,22 +137,30 @@ function installCodeServer() {
         name: 'dsh-code-server-app',
         private: true,
         version: '0.0.0',
-        allowScripts: { 'code-server': false, 'argon2@0.44.0': true, 'unrs-resolver@1.11.1': true },
+        allowScripts: { 'code-server': false, 'argon2': true, 'unrs-resolver': true },
       }, null, 2), 'utf8');
     } catch (e) {
       console.warn('[setup-code-server] 安装根 package.json 写入失败(allowScripts 可能不生效):', e.message);
     }
   }
   npm([
-    'install', `code-server@${CODE_SERVER_VERSION}`,
+    'install', versionSpec,
     '--no-save', '--no-audit', '--no-fund', '--prefix', prefix,
   ], prefix);
 }
 
 function main() {
   let cs = findCodeServer();
-  if (cs !== null && isComplete(cs)) {
-    console.log('[setup-code-server] code-server 已实例化(entry + 内部依赖 + native 均在),跳过');
+  const want = desiredVersion();
+  const have = cs !== null ? installedVersion(cs) : null;
+  // 升级判定独立于 isComplete:已有实例且(有 latest 且版本不同)→ 重装到最新。
+  if (want != null && have !== null && have !== want) {
+    console.log(`[setup-code-server] 当前 code-server@${have},最新 ${want}——自动升级…`);
+    installCodeServer();
+    cs = findCodeServer();
+  } else if (cs !== null && isComplete(cs)) {
+    console.log(`[setup-code-server] code-server 已实例化(entry + 内部依赖 + native 均在),跳过${
+      have !== null ? `(版本 ${have})` : ''}` + (want != null ? `;latest: ${want}` : ''));
     return;
   }
   if (cs === null || !existsSync(join(cs, 'out', 'node', 'entry.js'))) {
@@ -147,9 +197,40 @@ function main() {
   console.log('[setup-code-server] 完成;entry:', existsSync(join(cs, 'out', 'node', 'entry.js')));
 }
 
+/** 错误标记文件:安装失败时写入(host status 读取 → client 弹窗给用户查看),
+ *  成功安装后删除。位置 = 安装根(与安装产物同目录,独立于 pnpm 日志)。 */
+function errorMarkerPath() {
+  return join(installPrefix(), 'last-setup-error.json');
+}
+
+function writeErrorMarker(err) {
+  try {
+    const p = errorMarkerPath();
+    mkdirSync(dirname(p), { recursive: true });
+    writeFileSync(p, JSON.stringify({
+      at: new Date().toISOString(),
+      error: err && err.message ? err.message : String(err),
+    }, null, 2), 'utf8');
+  } catch { /* 标记失败不影响主流程 */ }
+}
+
+function clearErrorMarker() {
+  try {
+    const p = errorMarkerPath();
+    if (existsSync(p)) rmSync(p, { force: true });
+  } catch { /* ignore */ }
+}
+
 try {
   main();
+  clearErrorMarker();
 } catch (e) {
-  console.error('[setup-code-server] 安装失败(插件仍可启动;README 有恢复指引):', e.message);
+  const msg = errText(e);
+  console.error('[setup-code-server] 安装失败(插件仍可启动;README 有恢复指引):', msg);
+  writeErrorMarker(e);
   process.exitCode = 0; // 不阻断 pnpm/npm install
 }
+
+function errText(e) {
+  return e && e.message ? e.message : String(e);
+}