dsh-mobile-plugin 0.5.19 → 0.5.20

package/lib/routes/canvas-desktop.js

@@ -0,0 +1,196 @@
+'use strict';
+
+/**
+ * 桌面端画布的库读写（`/api/relay/canvas/*`）：本机信任、明文。
+ *
+ * 手机那条走的是 `/api/mobile/v1/canvas/*`，字节过设备加密信封；桌面端这一页由插件在同一个
+ * 源上吐出，同机回环直接用明文 HTTP 就够了，不必也不该把设备凭据搬到桌面。两条路由读写的
+ * 是**同一份库**（`mobile/canvas-store.js`）：清单复用它的两个 handler，字节直接落
+ * `objects/`（盘上本来就是明文）。
+ *
+ * 能力边界：客户端只给域、哈希、字节，给不了任意路径；`file-put` 只按内容哈希落库（去重），
+ * 与手机那条同一口径。
+ */
+
+const fs = require('node:fs');
+const fsp = require('node:fs/promises');
+const path = require('node:path');
+const crypto = require('node:crypto');
+const { pipeline } = require('node:stream/promises');
+
+const { sendJson, readJsonBody } = require('../shared/http-util');
+const store = require('../mobile/canvas-store');
+
+const MAX_UPLOAD_BYTES = store.MAX_OBJECT_BYTES;
+
+/** POST /api/relay/canvas/file {hash,mimeType} → 原始字节（明文）。 */
+async function handleFileGet(req, res) {
+  const body = await readJsonBody(req, 64 * 1024);
+  const hash = body && typeof body.hash === 'string' ? body.hash : '';
+  const target = store.objectPathOf(hash);
+  if (!target) return sendJson(res, 400, { ok: false, error: { code: 'bad-request', message: 'hash 形状不对' } });
+  let stat;
+  try {
+    stat = await fsp.stat(target);
+  } catch {
+    return sendJson(res, 404, { ok: false, error: { code: 'missing', message: '这份字节不在电脑上了' } });
+  }
+  if (!stat.isFile()) return sendJson(res, 404, { ok: false, error: { code: 'missing', message: '这份字节不在电脑上了' } });
+  const mime = body && typeof body.mimeType === 'string' && body.mimeType ? body.mimeType.slice(0, 120) : 'application/octet-stream';
+  res.writeHead(200, { 'content-type': mime, 'content-length': String(stat.size) });
+  try {
+    await pipeline(fs.createReadStream(target), res);
+  } catch {
+    // 头已经发出去了，只能断开让对端按截断处理（与会话文件那条一致）。
+    try { res.destroy(); } catch { /* 连接已关闭 */ }
+  }
+}
+
+/** POST /api/relay/canvas/file-put?name=… 请求体是原始字节 → { hash, bytes }。 */
+async function handleFilePut(req, res) {
+  const temp = path.join(store.rootDir(), `tmp-upload-${crypto.randomBytes(8).toString('hex')}`);
+  await fsp.mkdir(path.dirname(temp), { recursive: true });
+  let total = 0;
+  try {
+    await new Promise((resolve, reject) => {
+      const out = fs.createWriteStream(temp);
+      let aborted = false;
+      req.on('data', (chunk) => {
+        total += chunk.length;
+        if (total > MAX_UPLOAD_BYTES && !aborted) {
+          aborted = true;
+          const error = Object.assign(new Error('这份文件太大，画布库装不下'), { status: 413 });
+          req.unpipe(out);
+          out.destroy();
+          reject(error);
+        }
+      });
+      req.on('error', reject);
+      out.on('error', reject);
+      out.on('finish', resolve);
+      req.pipe(out);
+    });
+    if (total === 0) {
+      try { await fsp.unlink(temp); } catch { /* 已经不在了 */ }
+      return sendJson(res, 400, { ok: false, error: { code: 'empty', message: '请求体里没有字节' } });
+    }
+    const result = await store.storeUploadedFile(temp);
+    return sendJson(res, 200, { ok: true, hash: result.hash, bytes: result.bytes });
+  } catch (error) {
+    try { await fsp.unlink(temp); } catch { /* 已经不在了 */ }
+    if (error && error.status === 413) {
+      return sendJson(res, 413, { ok: false, error: { code: 'too-large', message: error.message } });
+    }
+    return sendJson(res, 500, { ok: false, error: { code: 'upload-failed', message: String((error && error.message) || error) } });
+  }
+}
+
+/** 转发请求体的上限（模型接口带 base64 图的 POST 也不小；给足但别让整份进内存失控）。 */
+const MAX_PROXY_BODY_BYTES = 128 * 1024 * 1024;
+/** 转发时不该带给上游的请求头：跳数头、压缩协商（交给 fetch 自己解压）。 */
+const STRIP_REQUEST_HEADERS = new Set([
+  'host', 'connection', 'accept-encoding', 'content-length', 'transfer-encoding',
+  'origin', 'referer', 'upgrade', 'keep-alive',
+]);
+/** 回给页面时不该带回来的响应头：长度与压缩由这一层重新决定（body 已解压）。 */
+const STRIP_RESPONSE_HEADERS = new Set(['content-encoding', 'content-length', 'transfer-encoding', 'connection', 'keep-alive']);
+
+function readRawBody(req) {
+  return new Promise((resolve, reject) => {
+    const chunks = [];
+    let total = 0;
+    req.on('data', (chunk) => {
+      total += chunk.length;
+      if (total > MAX_PROXY_BODY_BYTES) {
+        reject(Object.assign(new Error('请求体太大'), { status: 413 }));
+        req.destroy();
+        return;
+      }
+      chunks.push(chunk);
+    });
+    req.on('error', reject);
+    req.on('end', () => resolve(Buffer.concat(chunks)));
+  });
+}
+
+/**
+ * GET/POST /api/relay/canvas/net?u=<上游地址> —— 桌面端画布的本地转发。
+ *
+ * 和手机上那只原生环回服务同一件事：页面以为自己在请求同源地址，插件用 Node 的 fetch 去取
+ * 上游，响应边收边写回。同源请求没有预检；`accept-encoding` 剥掉让 fetch 自己解压，回写时
+ * 再把长度 / 压缩头去掉，body 交给页面按流读（SSE 那条才有用）。
+ */
+async function handleNet(req, res) {
+  let upstreamUrl;
+  try {
+    upstreamUrl = new URL(new URL(req.url, 'http://x').searchParams.get('u') || '');
+  } catch {
+    return sendJson(res, 400, { ok: false, error: { code: 'bad-request', message: '缺少或非法的上游地址' } });
+  }
+  if (upstreamUrl.protocol !== 'http:' && upstreamUrl.protocol !== 'https:') {
+    return sendJson(res, 400, { ok: false, error: { code: 'bad-request', message: '只支持 http / https' } });
+  }
+  const method = (req.method || 'GET').toUpperCase();
+  const headers = {};
+  for (const [name, value] of Object.entries(req.headers)) {
+    if (STRIP_REQUEST_HEADERS.has(name.toLowerCase())) continue;
+    if (value === undefined) continue;
+    headers[name] = Array.isArray(value) ? value.join(', ') : value;
+  }
+  let body;
+  if (method !== 'GET' && method !== 'HEAD') {
+    try {
+      body = await readRawBody(req);
+    } catch (error) {
+      return sendJson(res, error && error.status === 413 ? 413 : 400, { ok: false, error: { code: 'bad-request', message: String((error && error.message) || error) } });
+    }
+  }
+  let upstream;
+  try {
+    upstream = await fetch(upstreamUrl, { method, headers, body, redirect: 'follow' });
+  } catch (error) {
+    // 上游根本没连上：回一个带标记的 502，页面据此还原成网络错误（与手机那条一致）。
+    res.writeHead(502, { 'content-type': 'application/json', 'x-dsh-net-error': '1' });
+    return res.end(JSON.stringify({ ok: false, error: { code: 'network', message: String((error && error.message) || error) } }));
+  }
+  const outHeaders = {};
+  for (const [name, value] of upstream.headers.entries()) {
+    if (STRIP_RESPONSE_HEADERS.has(name.toLowerCase())) continue;
+    outHeaders[name] = value;
+  }
+  res.writeHead(upstream.status, outHeaders);
+  if (!upstream.body) return res.end();
+  try {
+    const reader = upstream.body.getReader();
+    for (;;) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      if (!res.write(Buffer.from(value))) {
+        await new Promise((resolve) => res.once('drain', resolve));
+      }
+    }
+    res.end();
+  } catch {
+    try { res.destroy(); } catch { /* 连接已关闭 */ }
+  }
+}
+
+/**
+ * 挂四条桌面端画布数据路由。`ctx` 原样转给 canvas-store 的 handler（它们目前不用它）。
+ *
+ * @param {{ registerRoute: Function, localOnly: Function, ctx?: object }} deps
+ */
+function registerCanvasDesktopRoutes({ registerRoute, localOnly, ctx = null }) {
+  const manifestGet = localOnly('GET', (req, res) => store.handleCanvasManifestGet(ctx, req, res));
+  const manifestSave = localOnly('POST', (req, res) => store.handleCanvasManifestSave(ctx, req, res));
+  const fileGet = localOnly('POST', (req, res) => handleFileGet(req, res));
+  const filePut = localOnly('POST', (req, res) => handleFilePut(req, res));
+  const net = localOnly(['GET', 'POST'], (req, res) => handleNet(req, res));
+  registerRoute({ kind: 'exact', path: '/api/relay/canvas/manifest', handler: manifestGet });
+  registerRoute({ kind: 'exact', path: '/api/relay/canvas/manifest/save', handler: manifestSave });
+  registerRoute({ kind: 'exact', path: '/api/relay/canvas/file', handler: fileGet });
+  registerRoute({ kind: 'exact', path: '/api/relay/canvas/file-put', handler: filePut });
+  registerRoute({ kind: 'exact', path: '/api/relay/canvas/net', handler: net });
+}
+
+module.exports = { registerCanvasDesktopRoutes };

package/lib/routes/control-plane.js

@@ -53,6 +53,8 @@ const { clearCompletionForAllDevices, invalidateSessionList } = require('../mobi
 const { recordSessionRead } = require('../mobile/session-last-turn.js');
 // 收件目录的占用与清理：和移动端那条路由是同一份实现（`lib/mobile/inbox-clean.js`）。
 const { scanInbox, clearInbox, usageView, setAutoClear } = require('../mobile/inbox-clean.js');
+// 桌面端画布的库读写（本机明文，与手机共用同一份 `mobile/canvas-store.js`）。
+const { registerCanvasDesktopRoutes } = require('./canvas-desktop.js');
 
 /** 一次 desktop-read 上报最多带多少个会话 id（防灌爆；客户端半边一次最多也就几个）。 */
 const MAX_DESKTOP_READ_IDS = 200;
@@ -107,6 +109,12 @@ function createWebAccessLocalOnly({ localOnly, trustedLocalUi, webAccessWindow,
  * 版本的页面。改版式只有一条路：`React/` 里重建 → 提交产物 → 发新版本 → 完整重启 DSH。
  */
 const PANEL_FILE = path.join(__dirname, '..', 'panel', 'index.html');
+/**
+ * 桌面端画布页：与 `lib/panel/index.html` 同一个做法 —— 整页内联 HTML 整份吐给浏览器。
+ * 产物由 App 的 `scripts/build-canvas-page.mjs` 从同一份 `vendor/canvas/` 顺带生成过来，
+ * 源只有一份；这里只读不构建。
+ */
+const CANVAS_FILE = path.join(__dirname, '..', 'canvas-app.html');
 
 /** 插件包根（`<pkg>/lib/routes` 往上两级）：诊断时读它的 `package.json` 与 `React/`。 */
 const PACKAGE_DIR = path.join(__dirname, '..', '..');
@@ -129,6 +137,7 @@ function generationVersion() {
 
 /** 按 mtime 缓存：文件被换掉之后内容变了，缓存自然失效，不必手工清。 */
 let panelCache = { file: '', mtime: -1, html: '' };
+let canvasCache = { file: '', mtime: -1, html: '' };
 
 function panelHtml() {
   try {
@@ -142,6 +151,18 @@ function panelHtml() {
   }
 }
 
+function canvasHtml() {
+  try {
+    const stat = fs.statSync(CANVAS_FILE);
+    if (canvasCache.file === CANVAS_FILE && canvasCache.mtime === stat.mtimeMs) return canvasCache.html;
+    const html = fs.readFileSync(CANVAS_FILE, 'utf8');
+    canvasCache = { file: CANVAS_FILE, mtime: stat.mtimeMs, html };
+    return html;
+  } catch {
+    return '';
+  }
+}
+
 /**
  * 面板读不到时，说清楚是哪一种读不到。
  *
@@ -506,6 +527,25 @@ function registerControlPlaneRoutes(deps) {
   registerRoute({ kind: 'exact', path: '/api/relay/panel', handler: localOnly('GET', async (_req, res) => servePanel(res), { allowDocumentNavigation: true }) })
   registerRoute({ kind: 'exact', path: '/api/relay/panel/setup', handler: localOnly('GET', async (_req, res) => servePanel(res), { allowDocumentNavigation: true }) })
   registerRoute({ kind: 'exact', path: '/api/relay/panel/settings', handler: localOnly('GET', async (_req, res) => servePanel(res), { allowDocumentNavigation: true }) })
+  // 桌面端画布页：整页吐同一份内联 HTML，并在 `</head>` 前补一句「这是桌面端」的标记 ——
+  // 画布据此把路由从 BrowserRouter 换成 HashRouter（它被挂在 `/api/relay/canvas` 这种非根
+  // 路径下，BrowserRouter 的 `/` 匹配不上会 404）。手机 WebView 那份不带这个标记，一个字不改。
+  const serveCanvas = (res) => {
+    const html = canvasHtml();
+    if (!html) {
+      process.stderr.write(`[dsh-mobile-plugin] canvas page unavailable ${CANVAS_FILE}\n`);
+      return sendJson(res, 500, { ok: false, error: { code: 'canvas_missing', message: '画布页产物不在：跑 node scripts/build-canvas-page.mjs 重新生成' } });
+    }
+    const withFlag = html.replace(
+      '</head>',
+      '<script>window.__dshCanvasDesktop=true;window.__dshCanvasHostBase=location.origin;</script></head>',
+    );
+    return sendHtml(res, 200, withFlag);
+  };
+  registerRoute({ kind: 'exact', path: '/api/relay/canvas', handler: localOnly('GET', async (_req, res) => serveCanvas(res), { allowDocumentNavigation: true }) })
+  // 桌面端画布的库读写：本机信任、明文，与手机 `/api/mobile/v1/canvas/*` 共用同一份存储
+  // （`mobile/canvas-store.js`）。桌面这一页是同源的，字节没必要再过设备加密信封。
+  registerCanvasDesktopRoutes({ registerRoute, localOnly, ctx })
   // 桌面端工作区视图（侧栏展开态）的回传/读取。桌面端只把展开态记在浏览器
   // localStorage 里，宿主进程读不到，只能由页面内的客户端半边（lib/client.js）
   // 每 2s 变了就 POST 到这里；App 再经 /api/mobile/v1/desktop-view 取走。

package/lib/routes/mobile-api.js

@@ -34,6 +34,7 @@ const hostSettings = require('../mobile/host-settings.js');
 const channels = require('../mobile/channels.js');
 const modelCaps = require('../mobile/model-caps.js');
 const deepSeekAccount = require('../mobile/deepseek-account.js');
+const magpieWeb = require('../mobile/magpie-web.js');
 const skills = require('../mobile/skills.js');
 const mobileCredentials = require('../mobile/credentials.js');
 const subagents = require('../mobile/subagents.js');
@@ -426,6 +427,11 @@ function registerMobileRoutes(deps) {
   route('/api/mobile/v1/host-settings', hostSettings.handleHostSettings)
   // DeepSeek 账号只读投影：账户资料、钱包余额与官方用量/充值链接；不开放登录操作或凭据。
   route('/api/mobile/v1/deepseek-account', deepSeekAccount.handleDeepSeekAccount)
+  // magpie 自带的网页版（Agents / Providers / Routing / Usage / Settings 全在里面）。
+  // 手机那边把这一页整个嵌进来，不再自己画一套：它本来就是给手机做的，页面里写着
+  // 「加到主屏后作为独立 App 打开」。网页版是独立进程，没在跑就在这里替用户拉起来。
+  // key 是凭据，所以走 guarded，与 `host-web` 那条同一个口径。
+  route('/api/mobile/v1/magpie/web', magpieWeb.handleMagpieWeb)
   // 改设置：与桌面端同一个 settings.mutate（按路径寻址的 op + expectedRevision 乐观并发）。
   route('/api/mobile/v1/host-settings/mutate', hostSettings.handleHostSettingsMutate)
   route('/api/mobile/v1/llm/providers', hostSettings.handleLlmProviders)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mobile-plugin",
-  "version": "0.5.19",
+  "version": "0.5.20",
   "description": "Mobile API (/api/mobile/v1) and relay client for the DSH mobile app — desktop profile build (dsh 0.2.x, peers resolved by the host)",
   "license": "MIT",
   "icon": "./icon.png",