dsh-code-server-app 0.1.31 → 0.1.32

package/lib/index.js

@@ -1,11 +1,19 @@
 /**
- * dsh-code-server — host 半部:code-server 进程的启动/停止/状态管理 + /code-server JSON API。
+ * dsh-code-server — host 半部:code-server 进程的启动/停止/状态管理 + /api/code-server JSON API。
  *
  * 零外部依赖:只用 Node 内置模块(child_process / http / fs / path / os)。
  * 静态 profile 插件,与 dsh-webproxy-router-plugin 同形态:
  *   - exports.name    = 插件名(与 cordis.patch.yml 行 id 一致)
- *   - exports.inject  = ['webServer'](硬依赖:等待 webserver 服务就绪)
- *   - apply(ctx, config) 注册 3 条 exact JSON 路由:status / start / stop
+ *   - exports.inject  = ['connection', 'settings'](connection 承载 client↔host 通道)
+ *   - apply(ctx, config) 在共享 /api 通道注册 5 条 exact Fetch 路由:
+ *     status / start / stop / setup / open-file
+ *
+ * 通道选择(重要):**不依赖 webServer**。路由经 ctx.connection.fetch.register
+ * 挂在 Connection 服务的共享 /api 通道上:
+ *   - web profile:Connection 自己把 /api 前缀挂到 webServer(带 Host/Origin + 浏览器鉴权);
+ *   - desktop profile:apps/desktop-host 把 /api/* 交给同一个 createSharedFetchHandler('/api')
+ *     (IPC 帧管道,无 HTTP 服务器)→ 插件在 desktop 下同样可用。
+ * 客户端因此只需同源 fetch('/api/code-server/<op>')(见 src/factory.js 的 api())。
  *
  * 设计要点:
  *   - 进程生命周期归本插件:启动写 pid.json,停止用树级终止(taskkill /T 或
@@ -14,13 +22,13 @@
  *     running(不重复启动);否则清理 pid.json 视为 stopped。绝不误杀别的进程。
  *   - 就绪探测轮询 /healthz;失败时 status 携带启动日志尾部与错误信息。
  *   - auth=none 仅允许回环 host;非回环强制 password(未配置 token 则拒绝启动)。
- *   - 挂载于 ctx.effect:插件销毁(host 关闭/卸载)时回收自己启动的进程。
+ *   - 挂载于 ctx.effect:插件销毁(host 关闭/卸载)时回收自己启动的进程与路由。
  *
- * API(同源 fetch,与 webproxy-plugin 的 webServer JSON API 同机制):
- *   GET  /code-server/status → { ok, running, status, port, pid, cwd, url,
- *                                version, error, logTail[, adopted] }
- *   POST /code-server/start  { cwd? } → 幂等启动(换 cwd 则先停后启) → status
- *   POST /code-server/stop   → 停止 → status
+ * API(同源 fetch;web 与 desktop 同一套路径):
+ *   GET  /api/code-server/status → { ok, running, status, port, pid, cwd, url,
+ *                                    version, error, logTail[, adopted] }
+ *   POST /api/code-server/start  { cwd? } → 幂等启动(换 cwd 则先停后启) → status
+ *   POST /api/code-server/stop   → 停止 → status
  */
 
 import { spawn, execFile, execFileSync } from 'node:child_process';
@@ -53,7 +61,9 @@ if (z === null || z === undefined) {
 }
 
 export const name = 'code-server';
-export const inject = ['webServer', 'settings'];
+// connection:client↔host 通道(web 走 webServer 的 /api,desktop 走 IPC 帧管道);
+// settings:设置卡片的数据域。两者在 web 与 desktop profile 下都存在。
+export const inject = ['connection', 'settings'];
 
 /** 设置命名空间:卡片经官方 settings 域读写,持久化到官方 settings 文档。 */
 export const SETTINGS_NS = 'code-server';
@@ -659,132 +669,113 @@ export async function apply(ctx, config) {
     });
   }
 
-  async function handleApi(req, res) {
-    const method = (req.method || 'GET').toUpperCase();
-    const payload = { ok: false, error: 'unknown route' };
+  // ---- /api/code-server 路由(Connection 共享通道;web 与 desktop 通用) ----
+  const API_BASE = '/api/code-server';
+
+  /** JSON 响应(与旧 webServer JSON API 相同的载荷形状)。 */
+  function jsonResponse(value, status = 200) {
+    return new Response(JSON.stringify(value), {
+      status,
+      headers: { 'content-type': 'application/json; charset=utf-8' },
+    });
+  }
+
+  /** 读取 JSON 请求体;空体 / 非法 JSON 回退为 {}(旧实现是逐块 best-effort 合并)。 */
+  async function readJsonBody(request) {
     try {
-      if (req.url === '/code-server/status' && method === 'GET') {
-        Object.assign(payload, snapshot());
-      } else if (req.url === '/code-server/start' && method === 'POST') {
-        let body = {};
-        for await (const chunk of req) {
-          const text = chunk.toString('utf8');
-          if (text) {
-            try {
-              body = { ...body, ...JSON.parse(text) };
-            } catch {
-              // ignore malformed fragments; keep best-effort
-            }
-          }
-        }
-        const cwd = body && typeof body.cwd === 'string' ? body.cwd : undefined;
-        Object.assign(payload, await start(cwd));
-      } else if (req.url === '/code-server/stop' && method === 'POST') {
-        await stop('user');
-        Object.assign(payload, snapshot());
-      } else if (req.url === '/code-server/setup' && method === 'POST') {
-        // 环境安装:后台执行 setup 脚本(npm 自装 code-server + native + vscode 内部依赖)
-        if (state.setup.running) {
-          // 已在安装中:同样视为"已发起"(客户端会轮询 setup 状态直至结束)
-          payload.ok = true;
-          payload.message = '环境安装已在进行中,请等待完成';
-          payload.error = null;
-        } else {
-          startSetup();
-          Object.assign(payload, snapshot());
-          payload.ok = true; // 安装任务已启动;服务态 error(如未安装)不掩盖安装态
-        }
-      } else if (req.url === '/code-server/open-file' && method === 'POST') {
-        // 打开文件:host 写信号文件,内置扩展(dshcs-open-file)在 VS Code 中打开它
-        let body = {};
-        for await (const chunk of req) {
-          const text = chunk.toString('utf8');
-          if (text) {
-            try {
-              body = { ...body, ...JSON.parse(text) };
-            } catch {
-              // ignore malformed fragments; keep best-effort
-            }
-          }
-        }
-        const file = body && typeof body.file === 'string' ? body.file : null;
-        if (file === null || file === '') {
-          payload.error = '需要 file 字段(要打开的绝对路径)';
-          payload.status = 400;
-          res.writeHead(400, { 'content-type': 'application/json; charset=utf-8' });
-          res.end(JSON.stringify(payload));
-          return;
-        }
-        const root = dataRoot(cfg);
-        const userDataDir = cfg.userDataDir || path.join(root, 'user-data');
-        const signal = openFileSignalPath(userDataDir);
-        try {
-          fs.mkdirSync(path.dirname(signal), { recursive: true });
-          fs.writeFileSync(signal, JSON.stringify({ file, ts: Date.now() }), 'utf8');
-          // 同时确保 code-server 运行(信号由扩展消费)
-          payload.ok = true;
-          payload.signal = signal;
-        } catch (err) {
-          payload.error = err && err.message ? err.message : String(err);
-        }
-      } else {
-        payload.error = 'unknown route';
-        payload.status = 404;
-        res.writeHead(404, { 'content-type': 'application/json; charset=utf-8' });
-        res.end(JSON.stringify(payload));
-        return;
+      const value = await request.json();
+      return value !== null && typeof value === 'object' && !Array.isArray(value) ? value : {};
+    } catch {
+      return {};
+    }
+  }
+
+  /** 统一的失败载荷(HTTP 200 + ok:false,客户端按 ok 判定)。 */
+  function failureResponse(err) {
+    return jsonResponse({
+      ok: false,
+      error: err && err.message ? err.message : String(err),
+      runner: 'code-server',
+    });
+  }
+
+  async function handleStatus() {
+    return jsonResponse(snapshot());
+  }
+
+  async function handleStart(request) {
+    try {
+      const body = await readJsonBody(request);
+      const cwd = typeof body.cwd === 'string' ? body.cwd : undefined;
+      return jsonResponse(await start(cwd));
+    } catch (err) {
+      return failureResponse(err);
+    }
+  }
+
+  async function handleStop() {
+    try {
+      await stop('user');
+      return jsonResponse(snapshot());
+    } catch (err) {
+      return failureResponse(err);
+    }
+  }
+
+  async function handleSetup() {
+    try {
+      // 环境安装:后台执行 setup 脚本(npm 自装 code-server + native + vscode 内部依赖)
+      if (state.setup.running) {
+        // 已在安装中:同样视为"已发起"(客户端会轮询 setup 状态直至结束)
+        return jsonResponse({ ...snapshot(), ok: true, message: '环境安装已在进行中,请等待完成', error: null });
       }
-      res.writeHead(200, { 'content-type': 'application/json; charset=utf-8' });
-      res.end(JSON.stringify(payload));
+      startSetup();
+      // 安装任务已启动;服务态 error(如未安装)不掩盖安装态
+      return jsonResponse({ ...snapshot(), ok: true });
     } catch (err) {
-      payload.ok = false;
-      payload.error = err && err.message ? err.message : String(err);
-      payload.runner = 'code-server';
-      res.writeHead(200, { 'content-type': 'application/json; charset=utf-8' });
-      res.end(JSON.stringify(payload));
+      return failureResponse(err);
     }
   }
 
-  /** 固化图标服务:返回插件携带的 code-server 官方图标(不依赖运行时安装)。
-   *  - /code-server/icon.ico → assets/favicon.ico(标签页/桌面图标)
-   *  - /code-server/icon.svg  → assets/favicon.svg(PWA/深色模式) */
-  function handleIcon(req, res) {
-    const isSvg = req.url === '/code-server/icon.svg';
-    const file = isSvg ? 'favicon.svg' : 'favicon.ico';
-    const p = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'assets', file);
+  async function handleOpenFile(request) {
     try {
-      if (!fs.existsSync(p)) {
-        res.writeHead(404, { 'content-type': 'text/plain; charset=utf-8' });
-        res.end('icon not found');
-        return;
+      // 打开文件:host 写信号文件,内置扩展(dshcs-open-file)在 VS Code 中打开它
+      const body = await readJsonBody(request);
+      const file = typeof body.file === 'string' ? body.file : null;
+      if (file === null || file === '') {
+        return jsonResponse({ ok: false, error: '需要 file 字段(要打开的绝对路径)' }, 400);
       }
-      const data = fs.readFileSync(p);
-      res.writeHead(200, {
-        'content-type': isSvg ? 'image/svg+xml' : 'image/x-icon',
-        'cache-control': 'public, max-age=86400',
-      });
-      res.end(data);
+      const root = dataRoot(cfg);
+      const userDataDir = cfg.userDataDir || path.join(root, 'user-data');
+      const signal = openFileSignalPath(userDataDir);
+      fs.mkdirSync(path.dirname(signal), { recursive: true });
+      fs.writeFileSync(signal, JSON.stringify({ file, ts: Date.now() }), 'utf8');
+      return jsonResponse({ ok: true, signal });
     } catch (err) {
-      res.writeHead(500, { 'content-type': 'application/json; charset=utf-8' });
-      res.end(JSON.stringify({ ok: false, error: err && err.message ? err.message : String(err) }));
+      return failureResponse(err);
     }
   }
 
-  const webServer = ctx.get('webServer');
-  if (webServer === undefined) {
-    console.error('[code-server] webServer service unavailable; plugin registered but idle');
+  const connection = ctx.get('connection');
+  if (connection === undefined || connection.fetch === undefined) {
+    console.error('[code-server] connection service unavailable; plugin registered but idle');
     return;
   }
 
+  // 每条操作一条 exact Fetch 路由。desktop 的 assetHandler 只把 /api/* 交给
+  // createSharedFetchHandler('/api'),所以路径必须落在 /api 下。
   const disposers = [
-    webServer.register({ kind: 'exact', path: '/code-server/status', handler: handleApi }),
-    webServer.register({ kind: 'exact', path: '/code-server/start', handler: handleApi }),
-    webServer.register({ kind: 'exact', path: '/code-server/stop', handler: handleApi }),
-    webServer.register({ kind: 'exact', path: '/code-server/setup', handler: handleApi }),
-    webServer.register({ kind: 'exact', path: '/code-server/open-file', handler: handleApi }),
-    webServer.register({ kind: 'exact', path: '/code-server/icon.ico', handler: handleIcon }),
-    webServer.register({ kind: 'exact', path: '/code-server/icon.svg', handler: handleIcon }),
-  ];
+    { path: `${API_BASE}/status`, methods: ['GET'], fetch: handleStatus },
+    { path: `${API_BASE}/start`, methods: ['POST'], fetch: handleStart },
+    { path: `${API_BASE}/stop`, methods: ['POST'], fetch: handleStop },
+    { path: `${API_BASE}/setup`, methods: ['POST'], fetch: handleSetup },
+    { path: `${API_BASE}/open-file`, methods: ['POST'], fetch: handleOpenFile },
+  ].map(route => connection.fetch.register({
+    path: route.path,
+    methods: route.methods,
+    requestBody: 'buffered',
+    fetch: route.fetch,
+  }));
 
   ctx.effect(() => {
     return () => {
@@ -792,7 +783,9 @@ export async function apply(ctx, config) {
       stopPolling();
       for (const d of disposers) {
         try {
-          d();
+          // connection.fetch.register 的 disposer 是异步的(返回 Promise);
+          // 注册本身也挂在当前 fiber 上,这里显式回收只是双保险。
+          Promise.resolve(d()).catch(() => {});
         } catch {
           // ignore
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-code-server-app",
-  "version": "0.1.31",
-  "description": "Integrate code-server (VS Code in the browser) into DSH Web: right-sidebar tab (DSH >= 0.1.5-alpha.1) with a floating-ball fallback for older hosts, over a /code-server JSON API (host-side process lifecycle).",
+  "version": "0.1.32",
+  "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": {
     "type": "git",