dsh-multi-chat 0.5.2 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-multi-chat",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "DSH 多对话：在官方 DeepSeek Harness Web 界面里并排运行和监控多个对话实例（多窗口墙），并内置带口令认证的手机访问网关。npx dsh-multi-chat install|start|stop",
   "license": "MIT",
   "type": "module",

package/plugin/dsh-client-ui-multi-wall/lib/client.js

@@ -242,27 +242,27 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var WallView_module_css_default = {
-			"danger": "ouhzTG_danger",
-			"action": "ouhzTG_action",
-			"confirm": "ouhzTG_confirm",
-			"field": "ouhzTG_field",
+			"paneActions": "ouhzTG_paneActions",
+			"linkBar": "ouhzTG_linkBar",
 			"wall": "ouhzTG_wall",
-			"grid": "ouhzTG_grid",
+			"action": "ouhzTG_action",
+			"danger": "ouhzTG_danger",
+			"paneBody": "ouhzTG_paneBody",
+			"title": "ouhzTG_title",
 			"hint": "ouhzTG_hint",
+			"empty": "ouhzTG_empty",
+			"zoomed": "ouhzTG_zoomed",
+			"field": "ouhzTG_field",
+			"paneHead": "ouhzTG_paneHead",
 			"status": "ouhzTG_status",
 			"paneTitle": "ouhzTG_paneTitle",
-			"controls": "ouhzTG_controls",
-			"linkText": "ouhzTG_linkText",
-			"paneHead": "ouhzTG_paneHead",
-			"paneBody": "ouhzTG_paneBody",
-			"empty": "ouhzTG_empty",
+			"grid": "ouhzTG_grid",
 			"dot": "ouhzTG_dot",
-			"toolbar": "ouhzTG_toolbar",
-			"linkBar": "ouhzTG_linkBar",
-			"title": "ouhzTG_title",
 			"pane": "ouhzTG_pane",
-			"paneActions": "ouhzTG_paneActions",
-			"zoomed": "ouhzTG_zoomed"
+			"confirm": "ouhzTG_confirm",
+			"toolbar": "ouhzTG_toolbar",
+			"controls": "ouhzTG_controls",
+			"linkText": "ouhzTG_linkText"
 		};
 		//#endregion
 		//#region src/client/WallView.tsx
@@ -294,6 +294,27 @@ window.__ModuleLoader__.load({
 		/** Embed flag appended to every pane URL; such pages register no wall UI. */
 		const EMBED_FLAG = "multi-wall=embed";
 		/**
+		* Whether this wall is being viewed through the phone gateway (a non-loopback
+		* host) rather than on the machine running DSH. When remote, pane iframes must
+		* load through the gateway's `/gw/<port>` route — a phone's `127.0.0.1` points
+		* at the phone itself, not the host.
+		*/
+		function isRemoteViewer() {
+			const host = typeof window !== "undefined" ? window.location.hostname : "";
+			return host !== "localhost" && host !== "127.0.0.1" && host !== "::1";
+		}
+		/**
+		* The iframe URL for a pane. Local viewers embed the loopback instance
+		* directly; remote (phone) viewers route through the gateway that is already
+		* serving this page, appending the port so the gateway proxies to it.
+		* @param port - target DSH instance port.
+		* @returns the pane URL.
+		*/
+		function paneUrl(port) {
+			if (isRemoteViewer()) return `${window.location.origin}/gw/${port}/?${EMBED_FLAG}`;
+			return `http://127.0.0.1:${port}/?${EMBED_FLAG}`;
+		}
+		/**
 		* One pane: header (port, liveness dot, zoom/refresh/open/stop/remove) plus
 		* the embedded original DSH UI.
 		*/
@@ -338,7 +359,7 @@ window.__ModuleLoader__.load({
 									className: WallView_module_css_default.action,
 									title: t("openTab"),
 									onClick: () => {
-										window.open(`http://127.0.0.1:${port}/`, "_blank");
+										window.open(paneUrl(port), "_blank");
 									},
 									children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconRightUpOutline16, { size: 14 })
 								}),
@@ -363,7 +384,7 @@ window.__ModuleLoader__.load({
 					className: WallView_module_css_default.paneBody,
 					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("iframe", {
 						title: `DSH :${port}`,
-						src: `http://127.0.0.1:${port}/?${EMBED_FLAG}`,
+						src: paneUrl(port),
 						loading: "lazy"
 					})
 				})]
@@ -660,8 +681,8 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var WallToggle_module_css_default = {
-			"label": "bmjS6q_label",
-			"row": "bmjS6q_row"
+			"row": "bmjS6q_row",
+			"label": "bmjS6q_label"
 		};
 		//#endregion
 		//#region src/client/WallToggle.tsx

package/plugin/dsh-client-ui-multi-wall/lib/index.js

@@ -170,11 +170,13 @@ function injectPolyfill(body) {
 * `127.0.0.1:<target-port>` so the DSH `/api` browser-trust fence sees a local
 * request. Non-upgrade requests get `connection: close` (fresh connection per
 * request keeps keep-alive from smuggling unrewritten Host headers); upgrades
-* (WebSocket) keep `connection: Upgrade`.
+* (WebSocket) keep `connection: Upgrade`. When `pathOverride` is set (a
+* `/gw/<port>` route), the request line's path becomes the de-prefixed path.
 */
-function rewriteHead(parsed, targetPort) {
+function rewriteHead(parsed, targetPort, pathOverride) {
 	const upgrade = parsed.map.upgrade !== void 0;
-	const lines = [`${parsed.method} ${parsed.target} ${parsed.version}`];
+	const requestTarget = pathOverride !== void 0 ? pathOverride : parsed.target;
+	const lines = [`${parsed.method} ${requestTarget} ${parsed.version}`];
 	for (const [name, value] of parsed.headers) if (name === "host") lines.push(`host: 127.0.0.1:${targetPort}`);
 	else if (name === "origin") lines.push(`origin: http://127.0.0.1:${targetPort}`);
 	else if (name === "connection" || name === "proxy-connection") {} else lines.push(`${name}: ${value}`);
@@ -187,7 +189,8 @@ function rewriteHead(parsed, targetPort) {
 * @returns a handle with the assigned port and token, and a close().
 */
 function startGateway(options) {
-	const { targetPort, port: requestedPort, token, name, maxAgeHours = 12, log = () => {} } = options;
+	const { targetPort, port: requestedPort, token, name, maxAgeHours = 12, routedPorts, log = () => {} } = options;
+	const allowedRouted = new Set(routedPorts ?? []);
 	const hmac = (data) => createHmac("sha256", token).update(data).digest("hex");
 	const signSession = (exp) => {
 		const payload = Buffer.from(JSON.stringify({ exp })).toString("base64url");
@@ -412,6 +415,19 @@ connection: close\r
 				handleLogin(socket, parsed, buffer.subarray(parsed.headBytes));
 				return;
 			}
+			let routePort = null;
+			let routePath;
+			const routeMatch = /^\/gw\/(\d+)(\/.*)?$/.exec(path);
+			if (routeMatch !== null) {
+				const candidate = Number(routeMatch[1]);
+				if (!Number.isInteger(candidate) || candidate <= 0 || !allowedRouted.has(candidate)) {
+					respondPlain(socket, "403", "port not routable");
+					return;
+				}
+				routePort = candidate;
+				routePath = routeMatch[2] && routeMatch[2] !== "" ? routeMatch[2] : "/";
+			}
+			const effectivePort = routePort ?? targetPort;
 			const kind = authKind(parsed);
 			if (kind === "none") {
 				respondLogin(socket, name, path === "/" ? "/" : path);
@@ -421,19 +437,19 @@ connection: close\r
 				respondSessionRedirect(socket, parsed, `dsh_gw_session=${signSession(Date.now() + maxAgeHours * 36e5)}; Path=/; HttpOnly; SameSite=Strict; Max-Age=${maxAgeHours * 3600}`);
 				return;
 			}
-			const target = connect(targetPort, "127.0.0.1");
+			const target = connect(effectivePort, "127.0.0.1");
 			const rest = buffer.subarray(parsed.headBytes);
 			let connected = false;
 			target.on("connect", () => {
 				connected = true;
-				target.write(rewriteHead(parsed, targetPort));
+				target.write(rewriteHead(parsed, effectivePort, routePath));
 				if (rest.length > 0) target.write(rest);
 				proxying = true;
 				socket.pipe(target);
 				relayTarget(socket, target);
 			});
 			target.on("error", (error) => {
-				if (!connected) respondPlain(socket, "502", `cannot reach target 127.0.0.1:${targetPort}: ${error.message}`);
+				if (!connected) respondPlain(socket, "502", `cannot reach target 127.0.0.1:${effectivePort}: ${error.message}`);
 				socket.destroy();
 			});
 			socket.on("error", () => target.destroy());
@@ -817,7 +833,8 @@ function lanAddresses() {
 			if (virtual) continue;
 			candidates.push({
 				address: iface.address,
-				physical
+				physical,
+				virtual: false
 			});
 		}
 	}
@@ -960,11 +977,15 @@ function apply(ctx, config = {}) {
 				const token = config.gatewayToken && config.gatewayToken !== "" ? config.gatewayToken : randomBytes(6).toString("hex");
 				const gatewayPort = config.gatewayPort && config.gatewayPort !== 0 ? config.gatewayPort : port + 5e3;
 				gatewayTargetPort = port;
+				const routed = [];
+				for (let p = scanFrom; p <= scanTo; p++) routed.push(p);
+				for (const p of fixedPorts) if (!routed.includes(p)) routed.push(p);
 				return startGateway({
 					targetPort: port,
 					port: gatewayPort,
 					token,
 					name: "DSH",
+					routedPorts: routed,
 					log: (msg) => ctx.logger.info(`multi-wall gateway: ${msg}`)
 				}).then((handle) => {
 					gateway = handle;