dsh-cherry-bridge 0.1.11 → 0.2.0

package/docs/e2e-checklist.md

@@ -269,8 +269,8 @@ http://127.0.0.1:23023/cherry-remote/api/scope`（宿主换过端口就换端口
 - [ ] 该端点同样受信任 fence 约束：非回环 Host、非同源 Origin、`sec-fetch-site: cross-site`
       一律 403；无 Origin 的非浏览器客户端放行。
 - [ ] 全流程日志不含 token / invitationSecret / accessToken / 消息文本 / part 文本。
-- [ ] **上游版本核验**（桌面端为 2.1.4–2.1.6 或已比对过的更新版本；依据见 README
-      「与 Cherry Studio 版本的对应关系」）：
+- [ ] **上游版本核验**（桌面端为 2.1.4–2.1.8 或已比对过的更新版本；依据见
+      src/AGENTS.md「Protocol basis」）：
       - [ ] 桌面端**升级后无需重新配对**：设备档案直接连上，`desktopIdentity` 未变。
       - [ ] 桌面端为 2.1.5+ 且会话里有**来自手机上传的附件**时：该 part 为 `kind:"file"`
             并带 `name`/`mediaType`/`byteLength`，`content` 为空，且**没有**任何

package/lib/client.js

@@ -36,6 +36,10 @@ window.__ModuleLoader__.load({
 				"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": "确认移除",
@@ -136,6 +140,10 @@ window.__ModuleLoader__.load({
 				"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",
@@ -516,6 +524,20 @@ window.__ModuleLoader__.load({
 		function parseHosts(raw) {
 			return raw.split(",").map((entry) => entry.trim()).filter((entry) => entry !== "");
 		}
+		/** The dial port for one host: its own stored port, else the record-level one. */
+		function dialPort(device, host) {
+			return device.ports?.[host] ?? device.port;
+		}
+		/**
+		* `host:port` as one readable address.
+		*
+		* An IPv6 literal contains colons, so `fe80::1:4343` reads as an ambiguous
+		* host; stored hosts are bare (`normalizeHost` strips the brackets), so the
+		* brackets are added here, for display only.
+		*/
+		function formatAddress(host, port) {
+			return host.includes(":") ? `[${host}]:${port}` : `${host}:${port}`;
+		}
 		function DeviceCard({ device, state, onSaved, onRemoved }) {
 			const t = useT();
 			const [editor, setEditor] = (0, react.useState)("none");
@@ -615,6 +637,8 @@ window.__ModuleLoader__.load({
 					onRemoved(device.deviceId);
 				});
 			};
+			const mixedPorts = device.hosts.some((host) => dialPort(device, host) !== device.port);
+			const addressList = device.hosts.map((host) => formatAddress(host, dialPort(device, host))).join(", ");
 			const label = state === void 0 ? t("device.state.unknown") : t(STATE_KEYS[state] ?? state);
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", {
 				className: "cherry-card",
@@ -681,6 +705,10 @@ window.__ModuleLoader__.load({
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dd", { children: device.hosts.join(", ") }),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dt", { children: t("device.field.port") }),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dd", { children: device.port }),
+							mixedPorts && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dt", { children: t("device.field.ports") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("dd", {
+								className: "cherry-mono",
+								children: addressList
+							})] }),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dt", { children: t("device.field.id") }),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dd", {
 								className: "cherry-mono",
@@ -688,6 +716,10 @@ window.__ModuleLoader__.load({
 							})
 						]
 					}),
+					mixedPorts && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						className: "cherry-hint",
+						children: t("device.ports.hint")
+					}),
 					editor === "rename" && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("form", {
 						className: "cherry-inline-form",
 						onSubmit: saveName,
@@ -725,6 +757,17 @@ window.__ModuleLoader__.load({
 								className: "cherry-hint",
 								children: t("device.hosts.hint")
 							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+								className: "cherry-hint",
+								children: [
+									t("device.ports.current"),
+									" ",
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "cherry-mono",
+										children: addressList
+									})
+								]
+							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("label", {
 								htmlFor: `port-${device.deviceId}`,
 								children: t("device.field.port")
@@ -735,6 +778,10 @@ window.__ModuleLoader__.load({
 								value: portText,
 								onChange: (event) => setPortText(event.target.value)
 							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "cherry-hint",
+								children: t("device.port.hint")
+							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 								type: "submit",
 								disabled: busy,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cherry-bridge",
-  "version": "0.1.11",
+  "version": "0.2.0",
   "type": "module",
   "private": false,
   "packageManager": "npm@10.9.9",
@@ -65,8 +65,9 @@
     "prepublishOnly": "npm run typecheck && npm test && npm run build && npm run build:client && npm pack --dry-run"
   },
   "dependencies": {
-    "@cherrystudio/remote-protocol": "0.5.0",
-    "@cherrystudio/remote-transport": "0.2.1",
+    "@cherrystudio/remote-protocol": "0.7.0",
+    "@cherrystudio/remote-transport": "0.2.5",
+    "@libp2p/peer-id": "6.0.15",
     "ws": "8.22.0",
     "zod": "4.3.4"
   },