dsh-cherry-bridge 0.1.11 → 0.2.1

package/ui/src/i18n.ts

@@ -86,11 +86,24 @@ const zh: Dict = {
   'device.field.name': '设备名称',
   'device.field.hosts': '主机地址',
   'device.hosts.hint': '多个候选地址用逗号分隔（整体替换）',
+  'device.field.ports': '每地址端口',
+  'device.ports.hint': '部分候选地址的端口与上方的端口不同；在「地址维护」里改动端口会把所有候选地址改为同一端口。',
+  'device.ports.current': '当前端口映射：',
+  'device.port.hint': '保持当前值会保留各地址自己的端口；改成新值会把所有候选地址重指到该端口。',
   'device.save.name': '保存名称',
   'device.save.addresses': '保存地址',
   'device.remove.confirm': '确认移除',
   'device.remove.warning': '移除后本机将不再连接该设备，凭据保留在对方一侧。',
   'device.cancel': '取消',
+  // -- forgotten addresses (issue #204) --------------------------------------
+  'device.forget': '忘记',
+  'device.remember': '恢复',
+  'device.field.forgotten': '已忘记地址',
+  'device.forgotten.hint':
+    '已忘记的地址不会再被连接；「恢复」只解除标记，桌面下次广播该地址时会重新加入。',
+  'device.error.lastAddress': '不能忘记最后一个候选地址——先补一个地址，再忘记这个',
+  // The page-wide request ceiling (`api.ts`) reached a card action.
+  'device.error.timeout': '请求长时间没有回应，已中止——请稍后重试',
   'device.error.nameRequired': '设备名称不能为空',
   'device.error.hostsRequired': '至少需要一个主机地址',
   'device.error.portInvalid': '端口必须是 1..65535 之间的整数',
@@ -125,7 +138,17 @@ const zh: Dict = {
   // keep matching.
   'wizard.failed': '配对失败：{stage}',
   'wizard.unknownError': '未知错误',
+  // NO VERDICT WORDING. This is the run deadline, not a stage: the pairing may
+  // have been approved while its frame was lost, so it points at the list right
+  // below (which the settle refreshes) instead of asserting an outcome.
+  // The page-wide request ceiling (`api.ts`): the device list gave up waiting.
+  'app.error.timeout': '请求长时间没有回应，已中止——请确认宿主仍在运行；若反复出现，请重启宿主后再试',
+  'wizard.timedOut':
+    '没有等到配对结果——若桌面端已批准，下面的设备列表里会出现该设备；否则请在 Cherry Studio 重新生成配对码后重试',
   'wizard.error.payloadRequired': '请先粘贴扫码页显示的配对信息',
+  // The pairing POST never answered. Names the LIKELY cause (a wedged host) and
+  // nothing about pairing itself, so the user does not go re-scanning a QR code.
+  'wizard.error.timeout': '配对请求迟迟没有回应，已中止——请重试；若反复出现，宿主可能已卡住，重启后再试',
   // The stages the wizard narrates while a run is in flight.
   'wizard.stage.validate': '正在校验配对信息…',
   'wizard.stage.connect': '正在连接 Cherry Studio…',
@@ -178,6 +201,9 @@ const zh: Dict = {
   // A refusal whose code this panel has no copy for: the server's own message is
   // the best available explanation, so it is interpolated verbatim.
   'scope.saveFailed': '保存失败：{cause}',
+  // The page-wide request ceiling (`api.ts`), rendered where the server's own
+  // message would go: there is no server message when nothing answered.
+  'scope.error.timeout': '请求长时间没有回应，已中止——请稍后重试',
   'scope.serverSaid': '服务端返回 {code}（HTTP {status}）。',
   'scope.degraded.install': '隐藏层应用曾失败（install）：相关 agent 的隐藏层未生效或无法确认，启用范围对它可能不适用',
   'scope.degraded.workspace-list': '注册表列表当前读不到',
@@ -236,11 +262,26 @@ const en: Dict = {
   'device.field.name': 'Device name',
   'device.field.hosts': 'Host addresses',
   'device.hosts.hint': 'Separate candidate addresses with commas (the whole list is replaced)',
+  'device.field.ports': 'Ports per address',
+  'device.ports.hint':
+    'Some candidate addresses dial a different port than the one above; changing the port in address maintenance moves every candidate address to that one port.',
+  'device.ports.current': 'Current port map:',
+  'device.port.hint':
+    'Keeping the current value preserves each address’s own port; a new value re-points every candidate address.',
   'device.save.name': 'Save name',
   'device.save.addresses': 'Save addresses',
   'device.remove.confirm': 'Confirm removal',
   'device.remove.warning': 'This machine will stop connecting to the device. Its credentials stay on the peer.',
   'device.cancel': 'Cancel',
+  // -- forgotten addresses (issue #204) --------------------------------------
+  'device.forget': 'Forget',
+  'device.remember': 'Restore',
+  'device.field.forgotten': 'Forgotten addresses',
+  'device.forgotten.hint':
+    'Forgotten addresses are never dialed. Restore only lifts the mark — the address comes back the next time the desktop advertises it.',
+  'device.error.lastAddress': 'The last candidate address cannot be forgotten. Add one first.',
+  // See the zh entry: the page-wide request ceiling.
+  'device.error.timeout': 'The request stopped answering and was abandoned. Try again in a moment.',
   'device.error.nameRequired': 'Device name cannot be empty',
   'device.error.hostsRequired': 'At least one host address is required',
   'device.error.portInvalid': 'Port must be an integer between 1 and 65535',
@@ -267,7 +308,14 @@ const en: Dict = {
   'wizard.succeeded': 'Paired',
   'wizard.failed': 'Pairing failed: {stage}',
   'wizard.unknownError': 'Unknown error',
+  // See the zh entry: the run deadline is not a verdict.
+  // See the zh entry: the page-wide request ceiling.
+  'app.error.timeout': 'The request stopped answering and was abandoned. Check that the host is still running; if it keeps happening, restart it and try again.',
+  'wizard.timedOut':
+    'No pairing result arrived. If the desktop approved it, the device appears in the list below; otherwise generate a new pairing code in Cherry Studio and try again.',
   'wizard.error.payloadRequired': 'Paste the pairing payload shown on the scan page first',
+  // See the zh entry: the cause is the host, not the payload.
+  'wizard.error.timeout': 'The pairing request stopped answering and was abandoned. Try again; if it keeps happening the host may be stuck — restart it and retry.',
   'wizard.stage.validate': 'Validating the pairing payload…',
   'wizard.stage.connect': 'Connecting to Cherry Studio…',
   'wizard.stage.claim': 'Exchanging credentials…',
@@ -317,6 +365,7 @@ const en: Dict = {
   'scope.savedPruned': 'Saved. The server pruned these stale selections: {list}.',
   'scope.reread': 'Reload',
   'scope.saveFailed': 'Save failed: {cause}',
+  'scope.error.timeout': 'The request stopped answering and was abandoned. Try again in a moment.',
   'scope.serverSaid': 'The server answered {code} (HTTP {status}).',
   'scope.degraded.install':
     'Applying a hidden layer failed earlier (install): the affected agent’s hidden layer is not in effect or cannot be confirmed, so the tool scope may not apply to it',

package/ui/src/styles.css

@@ -227,6 +227,30 @@
   overflow-wrap: anywhere;
 }
 
+/* A per-host action list (issue #204): the address, then its own control. The
+   buttons stay small so a record with a dozen candidates stays ONE fact row
+   instead of a column of chrome. */
+.cherry-address-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 4px 10px;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+
+.cherry-address-list li {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.cherry-address-list button {
+  padding: 0 6px;
+  font-size: 11px;
+  line-height: 1.6;
+}
+
 .cherry-inline-form {
   display: flex;
   flex-direction: column;

package/ui/src/types.ts

@@ -23,7 +23,14 @@ export const API_BASE = '/cherry-remote/api'
 /** The five device states the connection layer reports. */
 export type DeviceState = 'connected' | 'connecting' | 'offline' | 'disabled' | 'identity-mismatch'
 
-/** One device exactly as `GET /devices` returns it. Never carries a credential. */
+/**
+ * One device exactly as `GET /devices` returns it. Never carries a credential.
+ *
+ * `ports` is the per-HOST dial port map: each candidate address dials its own
+ * port, and the record-level `port` is the fallback for a host the map does not
+ * carry (a stored v4 record has an entry for every host, so the card's `??` arm
+ * only fires on a malformed map). Required — `GET /devices` always emits it.
+ */
 export interface DeviceSummary {
   deviceId: string
   displayName: string
@@ -31,6 +38,14 @@ export interface DeviceSummary {
   enabled: boolean
   hosts: string[]
   port: number
+  ports: Record<string, number>
+  /**
+   * The addresses the operator has FORGOTTEN (issues #185/#204): not dialed, and
+   * not re-learned from the desktop's own advertisement until 恢复 lifts the
+   * mark. Required — `GET /devices` emits an empty list rather than omitting the
+   * key — so the card branches on `length`, never on presence.
+   */
+  forgottenHosts: string[]
 }
 
 /** A `PATCH /devices/:id` body; every field optional, `hosts` is whole-replace. */

package/src/urlHost.ts

@@ -1,15 +0,0 @@
-/**
- * Renders a host as a URL authority component. The device archive and pairing
- * flow store BARE hosts (plan-mandated normalization), so a bare IPv6 literal
- * must be bracketed before it is spliced into a URL — `ws://::1:35543/...`
- * is not a valid URL and `new WebSocket(...)` throws synchronously on it.
- *
- * Shared home for the dial sites: both `connection.ts` (per-device dial) and
- * `pairing.ts` (candidate dial) splice hosts into URLs and must bracket the
- * same way.
- */
-export function urlHost(host: string): string {
-  // A colon can only mean IPv6 here: a `host:port` pair never reaches this
-  // layer (the port travels separately).
-  return host.includes(':') ? `[${host}]` : host
-}