@artenx/dshb 0.1.31 → 0.1.33

package/lib/client.js

@@ -2264,6 +2264,34 @@ window.__ModuleLoader__.load({
 				secrets
 			};
 		}
+		/**
+		* 把探测结果回填进表单：DSH_HOME 取首个命中目录（保留用户已填的显式覆盖），
+		* profile 取首个装有 dshb 的条目，Web 端口取握手命中值。仅在对应字段为空
+		* 或明显是默认值时回填，避免覆盖用户手改内容。
+		*/
+		function applyRemoteProbeToForm(form, probe) {
+			const detectedHome = probe.homes[0];
+			const detectedProfile = probe.profiles.find((profile) => profile.dshbInstalled) ?? probe.profiles[0];
+			const homeKept = form.remoteDshHome.trim() !== "" && form.remoteDshHome.trim() !== (detectedHome ?? "");
+			const profileKept = form.remoteProfile.trim() !== "" && form.remoteProfile.trim() !== "web";
+			return {
+				...form,
+				remoteDshHome: homeKept ? form.remoteDshHome : detectedHome ?? form.remoteDshHome,
+				remoteProfile: profileKept ? form.remoteProfile : detectedProfile?.name ?? form.remoteProfile,
+				remoteWebPort: probe.webPort !== void 0 ? String(probe.webPort) : form.remoteWebPort
+			};
+		}
+		/** 远端 profile 下拉选项：探测结果优先（dshb 已装的排前），并保留当前手填值。 */
+		function remoteProfileOptions(form, probe) {
+			const options = (probe?.profiles ?? []).slice().sort((left, right) => Number(right.dshbInstalled) - Number(left.dshbInstalled)).map((profile) => ({
+				name: profile.name,
+				dshbInstalled: profile.dshbInstalled
+			}));
+			const current = form.remoteProfile.trim();
+			if (current && !options.some((option) => option.name === current)) options.push({ name: current });
+			if (options.length === 0) options.push({ name: "web" });
+			return options;
+		}
 		//#endregion
 		//#region src/client/sync-peers.tsx
 		function shortenSessionId(id) {
@@ -2364,6 +2392,8 @@ window.__ModuleLoader__.load({
 			const [form, setForm] = (0, react.useState)(EMPTY_SYNC_PEER_FORM);
 			const [busy, setBusy] = (0, react.useState)(false);
 			const [probing, setProbing] = (0, react.useState)(false);
+			const [probingRemote, setProbingRemote] = (0, react.useState)(false);
+			const [remoteProbe, setRemoteProbe] = (0, react.useState)(void 0);
 			const [syncing, setSyncing] = (0, react.useState)(false);
 			const [notice, setNotice] = (0, react.useState)(void 0);
 			const [hostKeyChallenge, setHostKeyChallenge] = (0, react.useState)(void 0);
@@ -2482,6 +2512,48 @@ window.__ModuleLoader__.load({
 					setProbing(false);
 				}
 			};
+			const probeRemote = async () => {
+				const secretReady = form.authKind === "password" ? form.password !== "" : form.privateKey !== "";
+				if (selectedId === "new" && (!form.host.trim() || !form.username.trim() || !secretReady)) {
+					setNotice({
+						kind: "error",
+						text: "探测远端前请先填写 SSH 主机、系统账号和登录凭据"
+					});
+					return;
+				}
+				setProbingRemote(true);
+				setHostKeyChallenge(void 0);
+				try {
+					const useSavedCredentials = selectedId !== "new" && !secretReady;
+					const request = buildSyncPeerFormRequest(form);
+					const response = await fetch("/api/dshb/sync/peers/probe-remote", {
+						method: "POST",
+						headers: { "content-type": "application/json" },
+						body: JSON.stringify(useSavedCredentials ? { peerId: selectedId } : {
+							...request.fields,
+							secrets: request.secrets
+						})
+					});
+					const data = await readJsonResponse(response, "远端探测失败");
+					if (!response.ok || !data.ok || !data.probe) throw new Error(data.error ?? "远端探测失败");
+					const probe = data.probe;
+					setRemoteProbe(probe);
+					setForm((current) => applyRemoteProbeToForm(current, probe));
+					const profileText = probe.profiles.length > 0 ? `${probe.profiles.length} 个 profile` : "未发现 profile";
+					const portText = probe.webPort !== void 0 ? `Web 端口 ${probe.webPort}` : "未探测到运行中的 Web 端口";
+					setNotice({
+						kind: "ok",
+						text: `远端探测完成：${profileText}，${portText}${probe.instanceId ? `（实例 ${probe.instanceId.slice(0, 14)}…）` : ""}`
+					});
+				} catch (error) {
+					setNotice({
+						kind: "error",
+						text: error instanceof Error ? error.message : "远端探测失败"
+					});
+				} finally {
+					setProbingRemote(false);
+				}
+			};
 			const trustObservedHostKey = async () => {
 				if (selectedId === "new" || !hostKeyChallenge) return;
 				const confirmation = hostKeyChallenge.code === "host-key-changed" ? `远端 SSH 主机指纹已变化。\n当前保存：${hostKeyChallenge.expected}\n本次观察：${hostKeyChallenge.fingerprint}\n确认信任新指纹？` : `首次连接观察到 SSH 主机指纹：\n${hostKeyChallenge.fingerprint}\n请核对后确认信任。`;
@@ -2886,24 +2958,41 @@ window.__ModuleLoader__.load({
 								}))
 							})]
 						})] }),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							style: {
 								...groupTitle,
-								marginTop: 20
+								marginTop: 20,
+								display: "flex",
+								alignItems: "center",
+								justifyContent: "space-between"
 							},
-							children: "远端配置"
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: "远端配置" }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								style: probingRemote ? secondaryBtn : secondaryBtn,
+								disabled: probingRemote,
+								onClick: () => {
+									probeRemote();
+								},
+								children: probingRemote ? "探测中…" : "通过 SSH 探测远端"
+							})]
 						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							style: field,
 							children: [
-								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 									style: label,
-									children: "远端 DSH_HOME"
+									children: ["远端 DSH_HOME", remoteProbe?.homes.length ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										style: {
+											fontWeight: 400,
+											opacity: .55
+										},
+										children: "（已探测）"
+									}) : void 0]
 								}),
 								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
 									style: inputStyle$1,
 									value: form.remoteDshHome,
-									placeholder: "默认使用 SSH 账号的 ~/.dsh",
+									placeholder: "点击上方按钮通过 SSH 自动探测",
 									onChange: (e) => setForm((c) => ({
 										...c,
 										remoteDshHome: e.target.value
@@ -2911,7 +3000,7 @@ window.__ModuleLoader__.load({
 								}),
 								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 									style: hint,
-									children: "远端 DSH 数据目录，留空使用默认路径"
+									children: remoteProbe?.homes.length ? `探测到 ${remoteProbe.homes.length} 个候选目录，已回填首个命中` : "留空时由探测自动发现；也可手动填写远端 DSH 数据目录"
 								})
 							]
 						}),
@@ -2919,24 +3008,46 @@ window.__ModuleLoader__.load({
 							className: "dshb-sync-two-col",
 							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 								style: field,
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-									style: label,
-									children: "远端 profile"
-								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-									style: inputStyle$1,
-									value: form.remoteProfile,
-									placeholder: "web",
-									onChange: (e) => setForm((c) => ({
-										...c,
-										remoteProfile: e.target.value
-									}))
-								})]
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+										style: label,
+										children: ["远端 profile", remoteProbe?.profiles.length ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+											style: {
+												fontWeight: 400,
+												opacity: .55
+											},
+											children: "（已探测）"
+										}) : void 0]
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("select", {
+										style: inputStyle$1,
+										value: form.remoteProfile,
+										onChange: (e) => setForm((c) => ({
+											...c,
+											remoteProfile: e.target.value
+										})),
+										children: remoteProfileOptions(form, remoteProbe).map((option) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("option", {
+											value: option.name,
+											children: [option.name, option.dshbInstalled === true ? "（DSHB 已安装）" : option.dshbInstalled === false ? "（未安装 DSHB）" : ""]
+										}, option.name))
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+										style: hint,
+										children: "由探测列出；未探测时默认 web"
+									})
+								]
 							}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 								style: field,
 								children: [
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 										style: label,
-										children: "远端 Web 端口"
+										children: ["远端 Web 端口", remoteProbe?.webPort !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+											style: {
+												fontWeight: 400,
+												opacity: .55
+											},
+											children: "（已探测）"
+										}) : void 0]
 									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
 										style: inputStyle$1,
@@ -2950,7 +3061,7 @@ window.__ModuleLoader__.load({
 									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 										style: hint,
-										children: "留空使用默认 3080"
+										children: remoteProbe?.webPort !== void 0 ? `已回填 ${remoteProbe.webPort}${remoteProbe.instanceId ? `（实例 ${remoteProbe.instanceId.slice(0, 14)}…）` : ""}${(remoteProbe.handshakes?.length ?? 0) > 1 ? `；同机检测到多个实例：${remoteProbe.handshakes?.map((hit) => hit.port).join("、") ?? ""}` : ""}` : "留空使用默认 3080；桌面版远端也走本机回环，无需公网暴露"
 									})
 								]
 							})]