dsh-plugin-mobile-link 0.7.0 → 0.8.1

package/README.md

@@ -24,14 +24,14 @@ plugins/mobile-link/
 ├── package.json          # type: module, dsh.bundle.patch, bin: dsh-mobile-link
 ├── cordis.patch.yml      # bundle patch: the loader row + config reference
 ├── lib/
-│   ├── index.js          # cordis plugin: starts the agent, registers 3 routes
+│   ├── index.js          # cordis plugin: starts the agent, registers 5 routes
 │   ├── link.js           # the DLP agent transport: identity, socket, heartbeat, reconnect
 │   ├── router.js         # frames ⇄ local DSH mux streams, per-device `$events`
 │   ├── dlp.js            # DLP v1 frame codec (shared with the relay)
 │   ├── files.js          # phone → computer file transfers (`_link/file*` methods)
-│   ├── enroll.js         # invite-code redemption, writes ~/.dsh/mobile-link/agent.json
+│   ├── enroll.js         # open enrollment (no invite code), writes ~/.dsh/mobile-link/agent.json
 │   ├── journal.js        # lifecycle journal: why a relay link was dropped, after the fact
-│   ├── routes.js         # GET /mobile-link/status, POST /pair-code, GET /qr
+│   ├── routes.js         # status, enroll, pair-code, pair-code/regenerate, devices/revoke
 │   ├── qr.js             # dependency-free QR SVG
 │   └── cli.js            # dsh-mobile-link: enroll / mint-pair-code
 └── test/                 # node --test, 100+ tests (no DSH, no network)
@@ -74,29 +74,43 @@ dsh plugin --profile web add ./plugins/mobile-link
 
 ## Use
 
-1. Register this computer with a relay (once). Either redeem an invite code:
+1. Register this computer with a relay (once). Open the **移动端连接** panel at the
+   bottom of the DSH sidebar: the relay address is prefilled (editable) from the
+   installation default; click **登记**. The connector derives the computer name
+   automatically, writes `~/.dsh/mobile-link/agent.json` and reconnects in place —
+   no terminal and no DSH restart. Open enrollment is the default; the relay
+   rate-limits by source. If an installation has no panel (headless, CI), the CLI
+   still works:
 
    ```bash
-   dsh-mobile-link enroll --invite <邀请码> --relay wss://<你的站点>/dsh-link
+   dsh-mobile-link enroll --relay wss://<你的站点>/dsh-link
    ```
 
    …or register it on the relay host with `dsh-relay admin agent-register
    --write-config ~/.dsh/mobile-link/agent.json`.
 
-2. Mint a pairing code, and show it as a QR the phone camera can read:
+2. The same panel shows the pairing code and its QR once the relay link is up.
+   The CLI can still mint one directly:
 
    ```bash
    dsh-mobile-link --mint-pair-code        # prints JSON: code + relay + agentId
    ```
 
-   Or open the **移动端连接** panel at the bottom of the sidebar in the DSH client
-   (spec 010) — same code, same QR, with the validity countdown.
+   The code is persistent: it stays valid until you click 重新生成. Each paired device
+   has a quiet 撤销 action; revoking one device leaves the code and other devices alone.
 
-3. Scan it in the iOS app. After that the phone reconnects on its own — nothing
-   else has to be run by hand.
+3. Scan it in the iOS app. The code can be claimed again for another phone, a reinstall
+   or a new device; only 重新生成 revokes it (already-paired devices stay connected).
+   After that the phone reconnects on its own — nothing else has to be run by hand.
 
 `GET /mobile-link/status` reports whether the link is up, which devices are
-attached, and whether this computer is registered yet. Its `journal` block carries
+attached, and whether this computer is registered yet. Its `enroll` block also
+carries `panel` (this connector can enroll from the DSH panel), `relayPrefill`
+and `relayLocked` (the address to prefill and whether it came from config).
+`POST /mobile-link/enroll` performs that enrollment (open enrollment; no invite code); it returns the agent id and
+name, never `agentSecret`, and is behind the same DSH request fence as pairing. `GET /mobile-link/devices` lists the full paired roster (including offline) for the panel, and
+`POST /mobile-link/devices/revoke` revokes one paired device by `deviceId` through the relay; both are behind
+the fence and authenticated with the agent secret. Its `journal` block carries
 the current process's newest lifecycle events (link opened/closed with the reason,
 device attached/detached); the counters in it reset when the plugin hot-reloads, so
 the full history — across restarts — is the JSONL file at `journal.path`.
@@ -109,7 +123,8 @@ plugin's config block (`cordis.patch.yml`), not by editing this file.
 | Key | Default | Meaning |
 | --- | --- | --- |
 | `enabled` | `true` | `false` stops the outbound link without uninstalling |
-| `relayUrl` | from `agent.json` | Relay base URL; a bare deployment dials `<relay>/link/agent` |
+| `relayUrl` | from `agent.json` | Relay base URL; a bare deployment dials `<relay>/link/agent`. Pinning a real value here outranks the enrolled identity and makes the panel field read-only |
+| `defaultRelayUrl` | empty | Form-only default: prefills the panel's relay input, but never outranks the enrolled identity. Official installs set this so users can still edit it |
 | `agentId` / `agentSecret` | from `agent.json` | Override the enrolled identity |
 | `stateFile` | `~/.dsh/mobile-link/agent.json` | Where the identity lives |
 | `journalFile` | `~/.dsh/mobile-link/link-events.jsonl` | Lifecycle journal (rotated once at 256 KiB); `false` keeps it in memory only |

package/cordis.patch.yml

@@ -17,6 +17,11 @@
 #                  ws://127.0.0.1:8787). Left unset here on purpose: a value
 #                  pinned in this file outranks both DSH_RELAY_URL and the
 #                  address already enrolled in ~/.dsh/mobile-link/agent.json.
+#   defaultRelayUrl  Form-only default for the 移动端连接 panel. It prefills the
+#                  relay input but does not outrank the identity file, so a user
+#                  can edit it and the edit survives a restart. Official installs
+#                  set this (not `relayUrl`) to prefill the real address.
+#                  Status: enroll.relayPrefill / relayLocked.
 #   agentId        overrides ~/.dsh/mobile-link/agent.json
 #   agentSecret    overrides ~/.dsh/mobile-link/agent.json
 #   stateFile      agent identity file (default ~/.dsh/mobile-link/agent.json)

package/lib/cli.js

@@ -17,7 +17,7 @@
  * prefix-preserving URL join the live agent uses.
  *
  * `enroll` is the first-run path for someone else's computer: it redeems an
- * invite code for an identity and writes `~/.dsh/mobile-link/agent.json`, then
+ * relay address for an identity and writes `~/.dsh/mobile-link/agent.json`, then
  * exits. Everything after that is the ordinary agent.
  */
 
@@ -28,6 +28,7 @@ import { MobileLinkAgent } from './link.js'
 import { mintPairCode } from './pairing.js'
 import { qrTerminal } from './qr.js'
 import { INVITE_ENV, defaultStatePath, resolveIdentity } from './state.js'
+import { T, setLanguage } from './i18n.js'
 
 /** Atomic status snapshot so readers never observe a half-written file. */
 async function writeJsonAtomic(path, value) {
@@ -60,14 +61,16 @@ function parseArgs(argv) {
 
 async function main() {
   const args = parseArgs(process.argv.slice(2))
+  if (args.lang) setLanguage(args.lang)
+  else if (process.env.DSH_LANG) setLanguage(process.env.DSH_LANG)
   if (args.help) {
-    process.stdout.write(`usage: cli.js enroll --invite <code> [--relay <ws url>] [--name <label>]
-  Redeem a one-time invite code for an identity in ${defaultStatePath()}.
-  The invite may also arrive as ${INVITE_ENV}. Exits non-zero on failure.
+    process.stdout.write(`usage: cli.js enroll [--relay <ws url>] [--name <label>]
+  Register this computer with open enrollment in ${defaultStatePath()}. Exits non-zero on failure.
 
   cli.js --relay <ws url> --agent-id <id> --agent-secret <secret>
   [--state-file <path>] [--dsh-url <url>]
   [--status-file <path>] [--heartbeat-ms <n>] [--log-level debug|info|warn]
+  [--lang en|zh-Hans|zh-Hant|ja|ko|es|pt-BR|fr|de]
 
   Note: run this inside a DSH host (plugin) when you can. A standalone process has no
   in-process context, so on the official desktop app it cannot learn the local address by
@@ -101,21 +104,16 @@ async function main() {
     // 反正人已经坐在终端前、手机就在手边，索性把配对码也申请出来、画成终端二维码：
     // 扫这一屏等于在 App 里填「中转服务器 + 配对码」，少一次开页面找端口的往返。
     // 申请失败不算失败——登记本身已经成功，退回到"去界面里的连接入口取"的说法。
-    process.stdout.write('这台电脑已登记。接下来还有两步：\n'
-      + '  1. 重启 DSH，让连接器用上这个身份；\n'
-      + '  2. 手机 App 的「扫码配对」扫下面的二维码（与 DSH 界面左下角「移动端连接」里那张等价）。\n')
+    process.stdout.write(`${T('cli.registered')}\n  ${T('cli.step1')}\n  ${T('cli.step2')}\n`)
     try {
       const identity = await resolveIdentity({ stateFile: settled.stateFile })
       const minted = await mintPairCode({ identity, ttlMs: 10 * 60 * 1000 })
       const minutes = Math.round((minted.expiresAt - Date.now()) / 60000)
       process.stdout.write('\n' + qrTerminal(minted.qrPayload) + '\n')
-      process.stdout.write(`配对码 ${minted.code}（约 ${minutes} 分钟有效，一次性）\n`)
-      process.stdout.write('也可以在这台电脑上点 DSH 界面左下角的「移动端连接」取新码；\n'
-        + '连接器还会把带令牌地址写进 ~/.dsh/mobile-link/endpoint.json。\n')
+      process.stdout.write(`${T('cli.code', { code: minted.code, minutes })}\n`)
+      process.stdout.write(`${T('cli.hint')}\n`)
     } catch (error) {
-      process.stdout.write('（这次没能预先申请配对码：' + (error?.message ?? error) + '）\n'
-        + '重启 DSH 后，在这台电脑的 DSH 界面左下角点「移动端连接」，'
-        + '用手机 App 的「扫码配对」扫里面的二维码。\n')
+      process.stdout.write(`${T('cli.prefetchFailed', { error: error?.message ?? error })}\n${T('cli.prefetchHint')}\n`)
     }
     return 0
   }