dsh-plugin-mobile-link 0.4.0 → 0.6.0

package/lib/router.js

@@ -16,6 +16,7 @@ import { FileInbox, FILE_BEGIN, FILE_CHUNK, FILE_END, isFileMethod } from './fil
 import { FileFetcher, FSGET_CANCEL } from './files-out.js'
 import { GitBridge, isGitMethod } from './git.js'
 import { isHelloMethod, helloPayload, parseClientInfo } from './hello.js'
+import { isHistoryMethod } from './history.js'
 
 /**
  * 后台大文件上传的桥接帧（relay → 连接器），名字见 `docs/relay-contract.json`
@@ -109,6 +110,9 @@ export class DeviceRouter {
       logger,
     })
     this.git = new GitBridge(logger)
+    // 历史窗口/检索（spec 007）：由 index.js 注入宿主 `sessionQuery` 后交给它。
+    // 没绑上就回 `link/unsupported`，手机端退回 `session/page`。
+    this.history = undefined
   }
 
   #changed() {
@@ -433,6 +437,24 @@ export class DeviceRouter {
       return
     }
 
+    // History reads run here too (spec 007): the Host owns a seq-exact reader but
+    // does not expose it on the remote surface the phone talks to. Answered
+    // locally when the injected `sessionQuery` is present; otherwise the phone is
+    // told plainly that the capability is missing, so it can keep using
+    // `session/page` instead of reading the failure as "no older history".
+    if (isHistoryMethod(frame.method)) {
+      let result
+      try {
+        result = this.history === undefined
+          ? { ok: false, error: errorObject('link/unsupported', 'history reads are unavailable on this connector') }
+          : await this.history.handle(frame.method, frame.args ?? {})
+      } catch (error) {
+        result = { ok: false, error: errorObject(error?.code ?? 'link/failed', messageOf(error), error?.details ?? {}) }
+      }
+      this.send(deviceId, resultFrame(frame.id, result, deviceId))
+      return
+    }
+
     let result
     try {
       result = await this.dsh.rpc(frame.method, frame.args ?? {})

package/lib/routes.js

@@ -2,8 +2,7 @@
  * HTTP routes under `/mobile-link`, registered on DSH's own web server.
  *
  *   GET  /mobile-link/status     connection + device inventory + setup state
- *   POST /mobile-link/pair-code  mint a pairing code (and its QR payload)
- *   GET  /mobile-link/qr         mint a pairing code and render it as a QR SVG
+ *   POST /mobile-link/pair-code  mint a pairing code (and its QR payload + SVG)
  *
  * All sit behind DSH's own request fence, like every other plugin route:
  * `ctx.get('connection')?.requestRejection?.(req)` performs the Host/Origin check
@@ -23,13 +22,6 @@ export function sendJson(res, status, payload) {
   res.end(JSON.stringify(payload))
 }
 
-export function sendSvg(res, status, svg) {
-  res.statusCode = status
-  res.setHeader('content-type', 'image/svg+xml; charset=utf-8')
-  res.setHeader('cache-control', 'no-store')
-  res.end(svg)
-}
-
 export async function readJsonBody(req) {
   const chunks = []
   let size = 0
@@ -55,9 +47,25 @@ export async function readJsonBody(req) {
 export function makeGuard(ctx, logger) {
   const connectionOf = () => (typeof ctx.get === 'function' ? ctx.get('connection') : undefined)
   return function guard(req, res, { requireFence = false } = {}) {
+    const connection = connectionOf()
+    const fence = connection?.requestRejection
+    // DSH's contract is "a status when refused, **undefined** when the request
+    // may proceed" — so undefined is a pass, not an absence. Reading it as an
+    // absence is what made every privileged route below answer 403 to everyone
+    // with a perfectly authenticated request: the pairing page and
+    // `POST /pair-code` never got past the guard. The service's own presence is
+    // the only thing that can tell "no fence to consult" apart from "fence says
+    // yes", so that is what is checked here.
+    if (typeof fence !== 'function') {
+      if (requireFence) {
+        sendJson(res, 403, { ok: false, message: 'the DSH connection service is unavailable; refusing a privileged request' })
+        return true
+      }
+      return false
+    }
     let rejection
     try {
-      rejection = connectionOf()?.requestRejection?.(req)
+      rejection = fence.call(connection, req)
     } catch (error) {
       logger.warn?.(`mobile-link: request fence failed: ${error}`)
       sendJson(res, 403, { ok: false, message: 'request rejected by the DSH fence' })
@@ -68,10 +76,6 @@ export function makeGuard(ctx, logger) {
       res.end()
       return true
     }
-    if (requireFence && rejection === undefined) {
-      sendJson(res, 403, { ok: false, message: 'the DSH connection service is unavailable; refusing a privileged request' })
-      return true
-    }
     return false
   }
 }
@@ -86,13 +90,44 @@ function ttlFrom(value, fallbackMs) {
  * Register the routes.
  * @returns {Array<() => void>} disposers (already wrapped by the caller in ctx.effect).
  */
-export function registerMobileLinkRoutes(ctx, { agent, logger, config = {} }) {
+export function registerMobileLinkRoutes(ctx, { agent, logger, config = {}, history }) {
   const guard = makeGuard(ctx, logger)
   const STATUS_ROUTE = '/mobile-link/status'
   const PAIR_ROUTE = '/mobile-link/pair-code'
-  const QR_ROUTE = '/mobile-link/qr'
+  /// SPIKE（spec 007 / T008）：只读测量宿主窗口与检索 API 的语义。
+  /// 默认关闭，只有 `DSH_MOBILE_LINK_HISTORY_PROBE=1` 时注册——它是一次性测量工具，
+  /// 不是产品面（结论已写回 specs/007-transcript-history/plan.md 的 Phase 0）。
+  const PROBE_ROUTE = '/mobile-link/history-probe'
   const disposers = []
 
+  if (history !== undefined && process.env.DSH_MOBILE_LINK_HISTORY_PROBE === '1') {
+    disposers.push(ctx.webServer.register({
+      kind: 'exact',
+      path: PROBE_ROUTE,
+      handler: async (req, res) => {
+        if (guard(req, res)) return
+        if (req.method !== 'GET') {
+          res.statusCode = 405
+          res.setHeader('allow', 'GET')
+          res.end()
+          return
+        }
+        const url = new URL(req.url ?? '/', 'http://127.0.0.1')
+        try {
+          const result = await history.probe({
+            sessionId: url.searchParams.get('sessionId') ?? '',
+            seq: url.searchParams.get('seq') ?? undefined,
+            n: url.searchParams.get('n') ?? undefined,
+            text: url.searchParams.get('text') ?? undefined,
+          })
+          sendJson(res, 200, result)
+        } catch (error) {
+          sendJson(res, 500, { ok: false, error: String(error?.message ?? error) })
+        }
+      },
+    }))
+  }
+
   disposers.push(ctx.webServer.register({
     kind: 'exact',
     path: STATUS_ROUTE,
@@ -132,48 +167,16 @@ export function registerMobileLinkRoutes(ctx, { agent, logger, config = {} }) {
       try {
         const minted = await agent.mintPairCode({ ttlMs })
         logger.info?.(`mobile-link: minted a pairing code for ${minted.agentId}`)
-        sendJson(res, 200, { ok: true, ...minted })
-      } catch (error) {
-        sendJson(res, 502, { ok: false, code: 'relay/unavailable', message: String(error?.message ?? error) })
-      }
-    },
-  }))
-
-  // The QR a phone camera can actually read. Rendered here rather than in the
-  // desktop UI so the pairing screen is one URL: anyone can open
-  // `http://127.0.0.1:<port>/mobile-link/qr` (with DSH's own authentication)
-  // and see a scannable code, with no client-side work and no extra dependency.
-  //
-  // `?format=json` returns the payload and the code without the picture, which
-  // is what the automated tests use.
-  disposers.push(ctx.webServer.register({
-    kind: 'exact',
-    path: QR_ROUTE,
-    handler: async (req, res) => {
-      if (guard(req, res, { requireFence: true })) return
-      if (req.method !== 'GET') {
-        res.statusCode = 405
-        res.setHeader('allow', 'GET')
-        res.end()
-        return
-      }
-      const url = new URL(req.url ?? '/', 'http://127.0.0.1')
-      const ttlMs = ttlFrom(url.searchParams.get('ttlMs'), Number(config.pairTtlMs) || 10 * 60 * 1000)
-      let minted
-      try {
-        minted = await agent.mintPairCode({ ttlMs })
+        // The picture travels with the code. It used to be a route of its own
+        // (`GET /mobile-link/qr`) that a person opened in a browser; the pairing
+        // entry is now the connector's own panel in the DSH client, so the one
+        // caller left is that panel, and it wants the code and the symbol in the
+        // same answer. No caption: the panel runs its own countdown, and a
+        // server-rendered "还剩 N 分钟" freezes the moment the window is up.
+        sendJson(res, 200, { ok: true, ...minted, svg: qrSvg(minted.qrPayload) })
       } catch (error) {
         sendJson(res, 502, { ok: false, code: 'relay/unavailable', message: String(error?.message ?? error) })
-        return
-      }
-      const payload = minted.qrPayload
-      const wantsJson = (url.searchParams.get('format') ?? '').toLowerCase() === 'json'
-      logger.info?.(`mobile-link: rendered a pairing QR for ${minted.agentId}`)
-      if (wantsJson) {
-        sendJson(res, 200, { ok: true, ...minted, svg: qrSvg(payload) })
-        return
       }
-      sendSvg(res, 200, qrSvg(payload))
     },
   }))
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-mobile-link",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "Put your PC's DeepSeek Harness in your pocket: dials a relay over WSS so the native iOS client reaches this machine even without a public IP.",
   "keywords": [
     "dsh",
@@ -30,6 +30,7 @@
   },
   "exports": {
     ".": "./lib/index.js",
+    "./client": "./lib/client.js",
     "./dlp": "./lib/dlp.js",
     "./link": "./lib/link.js",
     "./cordis.patch.yml": "./cordis.patch.yml",
@@ -49,6 +50,9 @@
   "dsh": {
     "bundle": {
       "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web"
     }
   }
 }