dsh-mobile 0.8.0 → 0.8.1

package/lib/client.js

@@ -803,7 +803,22 @@ window.__ModuleLoader__.load({
 			lanSetupConfiguring: "Creating private certificates and local network rules…",
 			lanSetupRequired: "Local network setup has not been completed. Choose a network above to continue.",
 			lanSetupRestart: "Setup complete for {origin}. Restart DSH once to start local network access.",
-			lanSetupFailed: "Setup was not completed. Confirm the network selection and approve the Windows prompt, then try again."
+			lanSetupFailed: "Setup was not completed. Confirm the network selection and approve the Windows prompt, then try again.",
+			lanChangeTitle: "Change network",
+			lanChangeIntro: "Move local network access to another interface. The private CA and paired devices are kept; connected phones reconnect with the new address.",
+			lanChangeSelect: "New network",
+			lanChangeRefresh: "Scan again",
+			lanChangeConfirm: "Change network",
+			lanChangeBusy: "Changing network…",
+			lanChangeOk: "Network saved. If local access is stopped, enable it before connecting to the new address.",
+			lanChangeOkDisconnected: "Network changed and the listener restarted. Connected phones were disconnected; generate a new pairing QR to reconnect.",
+			lanChangeCurrent: "current",
+			lanChangeUnchanged: "That is already the current network.",
+			lanChangeUnavailable: "That network is no longer available. Scan again.",
+			lanChangeUnsupported: "This setup uses a fixed address, so it cannot change networks here.",
+			lanChangeFailed: "The change did not complete. Refresh the status before retrying; the previous configuration may have been restored.",
+			lanChangeRefreshFailed: "Could not refresh network status. A submitted change may have completed; check the current status before retrying.",
+			lanChangeRecoveryRequired: "The previous network could not be restored. Check local network configuration before enabling access again."
 		});
 		Object.assign(MOBILE_CONTROL_MESSAGES.it, {
 			lanSetupTitle: "Completa la configurazione della rete locale",
@@ -818,7 +833,22 @@ window.__ModuleLoader__.load({
 			lanSetupConfiguring: "Creazione dei certificati privati e delle regole di rete locale…",
 			lanSetupRequired: "La configurazione della rete locale non è completa. Scegli una rete qui sopra per continuare.",
 			lanSetupRestart: "Configurazione completata per {origin}. Riavvia DSH una volta per attivare l’accesso locale.",
-			lanSetupFailed: "Configurazione non completata. Controlla la rete e approva la richiesta di Windows, quindi riprova."
+			lanSetupFailed: "Configurazione non completata. Controlla la rete e approva la richiesta di Windows, quindi riprova.",
+			lanChangeTitle: "Cambia rete",
+			lanChangeIntro: "Sposta l’accesso alla rete locale su un’altra interfaccia. La CA privata e i dispositivi abbinati restano; i telefoni collegati si riconnettono con il nuovo indirizzo.",
+			lanChangeSelect: "Nuova rete",
+			lanChangeRefresh: "Cerca di nuovo",
+			lanChangeConfirm: "Cambia rete",
+			lanChangeBusy: "Cambio della rete…",
+			lanChangeOk: "Rete salvata. Se l’accesso locale è disattivato, attivalo prima di collegarti al nuovo indirizzo.",
+			lanChangeOkDisconnected: "Rete cambiata e listener riavviato. I telefoni collegati sono stati disconnessi; genera un nuovo QR di abbinamento per riconnetterti.",
+			lanChangeCurrent: "attuale",
+			lanChangeUnchanged: "Questa è già la rete attuale.",
+			lanChangeUnavailable: "La rete non è più disponibile. Cerca di nuovo.",
+			lanChangeUnsupported: "Questa configurazione usa un indirizzo fisso: non può cambiare rete qui.",
+			lanChangeFailed: "Cambio non completato. Aggiorna lo stato prima di riprovare; la configurazione precedente potrebbe essere stata ripristinata.",
+			lanChangeRefreshFailed: "Impossibile aggiornare lo stato. Una modifica inviata potrebbe essere stata completata; verifica prima di riprovare.",
+			lanChangeRecoveryRequired: "Impossibile ripristinare la rete precedente. Controlla la configurazione locale prima di riattivare l’accesso."
 		});
 		Object.assign(MOBILE_CONTROL_MESSAGES.zh, {
 			lanSetupTitle: "完成局域网配置",
@@ -833,7 +863,22 @@ window.__ModuleLoader__.load({
 			lanSetupConfiguring: "正在生成私有证书并配置局域网规则…",
 			lanSetupRequired: "尚未完成局域网配置，请选择上方网络继续。",
 			lanSetupRestart: "已为 {origin} 完成配置。请重启一次 DSH，局域网访问会自动开启。",
-			lanSetupFailed: "配置未完成。请确认网卡选择并允许 Windows 授权提示，然后重试。"
+			lanSetupFailed: "配置未完成。请确认网卡选择并允许 Windows 授权提示，然后重试。",
+			lanChangeTitle: "更换网络",
+			lanChangeIntro: "把局域网访问切换到另一块网卡。私有 CA 与已配对设备都会保留，已连接的手机需要用新地址重新连接。",
+			lanChangeSelect: "新网络",
+			lanChangeRefresh: "重新扫描",
+			lanChangeConfirm: "更换网络",
+			lanChangeBusy: "正在更换网络…",
+			lanChangeOk: "网络配置已保存。若局域网访问已关闭，请开启后再用新地址连接。",
+			lanChangeOkDisconnected: "网络已更换并重启监听，已连接的手机已断开；请生成新的配对二维码重新连接。",
+			lanChangeCurrent: "当前",
+			lanChangeUnchanged: "这已经是当前网络。",
+			lanChangeUnavailable: "该网络已不可用，请重新扫描。",
+			lanChangeUnsupported: "当前配置使用固定地址，无法在这里更换网络。",
+			lanChangeFailed: "更换未完成。请先刷新状态再决定是否重试；先前配置可能已恢复。",
+			lanChangeRefreshFailed: "无法刷新网络状态，已提交的更换可能已完成；请先确认当前状态，不要重复提交。",
+			lanChangeRecoveryRequired: "无法恢复先前网络，请先检查局域网配置，再决定是否重新开启访问。"
 		});
 		Object.assign(MOBILE_CONTROL_MESSAGES.en, {
 			selfHostedConnections: "Self-hosted connection",
@@ -3933,7 +3978,7 @@ window.__ModuleLoader__.load({
   [data-dsh-mobile-details] { position:fixed !important; z-index:250 !important; inset:0 0 0 auto !important; width:min(94vw,460px) !important; max-width:none !important; transform:translateX(100%); transition:transform var(--dsh-mobile-motion-duration) var(--dsh-mobile-motion-ease); background:var(--dsw-alias-bg-layer-1, #fff); box-shadow:-18px 0 46px rgb(15 23 42 / 18%); }
   [data-dsh-mobile-details][data-open="true"] { transform:translateX(0); }
   [data-dsh-mobile-handle] { display:none !important; }
-  [data-dsh-mobile-settings] { flex-direction:column !important; width:100vw !important; height:100dvh !important; max-width:none !important; border-radius:0 !important; animation:dsh-mobile-panel-in var(--dsh-mobile-motion-duration) var(--dsh-mobile-motion-ease); }
+  [data-dsh-mobile-settings="true"] { flex-direction:column !important; width:100vw !important; height:100dvh !important; max-width:none !important; border-radius:0 !important; animation:dsh-mobile-panel-in var(--dsh-mobile-motion-duration) var(--dsh-mobile-motion-ease); }
   [data-dsh-mobile-settings-nav] { flex:none !important; width:100% !important; padding:max(14px,env(safe-area-inset-top)) 12px 8px !important; gap:10px !important; border-bottom:1px solid var(--dsw-alias-border-l2,#e8ebef); }
   [data-dsh-mobile-settings-nav] [class*="_navTitle"] { padding:0 8px !important; font-size:18px !important; line-height:28px !important; }
   [data-dsh-mobile-settings-list] { flex-direction:row !important; gap:4px !important; overflow-x:auto !important; scrollbar-width:none; }
@@ -4150,7 +4195,17 @@ window.__ModuleLoader__.load({
 				const children = Array.from(dialog.children);
 				const nav = children.find((child) => classToken(child, "_nav"));
 				const content = children.find((child) => classToken(child, "_content"));
-				if (nav === void 0 || content === void 0) continue;
+				if (nav === void 0) continue;
+				if (content === void 0) {
+					const header = children.find((child) => classToken(child, "_header"));
+					const options = children.find((child) => classToken(child, "_options"));
+					const title = children.find((child) => classToken(child, "_navTitle"));
+					if (dialog.getAttribute("data-shortcut-modal") !== "settings" || header === void 0 || options === void 0 || title === void 0) continue;
+					dialog.dataset.dshMobileSettings = "grid";
+					header.setAttribute("data-dsh-mobile-settings-header", "true");
+					marked += 1;
+					continue;
+				}
 				dialog.dataset.dshMobileSettings = "true";
 				nav.dataset.dshMobileSettingsNav = "true";
 				content.dataset.dshMobileSettingsContent = "true";
@@ -11395,6 +11450,31 @@ dialog.dshm-picker[open]{display:grid;place-items:center}dialog.dshm-picker::bac
 			const lanSetupStatus = element("p", "dsh-mobile-control__status");
 			lanSetupStatus.setAttribute("role", "status");
 			lanSetupStatus.setAttribute("aria-live", "polite");
+			const lanChange = element("section", "dsh-mobile-control__lan-setup");
+			lanChange.hidden = true;
+			const lanChangeTitle = element("h3", "dsh-mobile-control__section-title");
+			lanChangeTitle.textContent = t("lanChangeTitle");
+			const lanChangeIntro = element("p", "dsh-mobile-control__intro");
+			lanChangeIntro.textContent = t("lanChangeIntro");
+			const lanChangeForm = element("div", "dsh-mobile-control__lan-setup-form");
+			const lanChangeLabel = element("label", "dsh-mobile-control__field");
+			lanChangeLabel.textContent = t("lanChangeSelect");
+			const lanChangeSelect = element("select");
+			lanChangeSelect.setAttribute("aria-label", t("lanChangeSelect"));
+			lanChangeLabel.append(lanChangeSelect);
+			const lanChangeActions = element("div", "dsh-mobile-control__lan-setup-actions");
+			const lanChangeRefresh = element("button", "dsh-mobile-control__secondary");
+			lanChangeRefresh.type = "button";
+			lanChangeRefresh.textContent = t("lanChangeRefresh");
+			const lanChangeConfirm = element("button", "dsh-mobile-control__primary");
+			lanChangeConfirm.type = "button";
+			lanChangeConfirm.textContent = t("lanChangeConfirm");
+			lanChangeActions.append(lanChangeRefresh, lanChangeConfirm);
+			const lanChangeStatus = element("p", "dsh-mobile-control__status");
+			lanChangeStatus.setAttribute("role", "status");
+			lanChangeStatus.setAttribute("aria-live", "polite");
+			lanChangeForm.append(lanChangeLabel, lanChangeActions);
+			lanChange.append(lanChangeTitle, lanChangeIntro, lanChangeForm, lanChangeStatus);
 			const trustedNetworks = element("details", "dsh-mobile-control__details");
 			const trustedNetworksSummary = element("summary");
 			trustedNetworksSummary.textContent = t("trustedNetworksTitle");
@@ -12730,7 +12810,7 @@ dialog.dshm-picker[open]{display:grid;place-items:center}dialog.dshm-picker::bac
 			diagnosticsDetails.append(diagnosticsDetailsSummary, diagnosticsReport);
 			header.append(title, headerActions);
 			actions.append(toggle, pair, linkPair);
-			lanView.append(lanSetup, access, qrBox, lanPairingValidity, status, extensionStatus, actions, trustedNetworks);
+			lanView.append(lanSetup, lanChange, access, qrBox, lanPairingValidity, status, extensionStatus, actions, trustedNetworks);
 			const channelPane = element("div", "dsh-mobile-control__channel-pane");
 			channelPane.append(lanView, remoteWorkspace);
 			const remoteColumns = element("div", "dsh-mobile-control__remote-columns");
@@ -12745,6 +12825,9 @@ dialog.dshm-picker[open]{display:grid;place-items:center}dialog.dshm-picker::bac
 			let lanConfigured = true;
 			let lanRestartRequired = false;
 			let lanSetupLoaded = false;
+			let lanChangeLoaded = false;
+			let lanChangeBusy = false;
+			let lanChangeRequest;
 			let remoteRunning = false;
 			let remoteReady = false;
 			let remoteProvider = "tailscale";
@@ -12961,6 +13044,8 @@ dialog.dshm-picker[open]{display:grid;place-items:center}dialog.dshm-picker::bac
 				lanChoiceBadge.textContent = running ? t("lanBadgeOn") : t("lanBadgeOff");
 				origin = running && typeof data.origin === "string" ? data.origin : "";
 				lanSetup.hidden = lanConfigured && !lanRestartRequired;
+				lanChange.hidden = !lanConfigured || lanRestartRequired || data.rebindSupported !== true;
+				if (!lanChange.hidden && !lanChangeLoaded) loadLanChange();
 				lanSetupForm.hidden = lanRestartRequired;
 				lanSetupIntro.hidden = lanRestartRequired;
 				status.hidden = !lanConfigured || lanRestartRequired;
@@ -12974,7 +13059,7 @@ dialog.dshm-picker[open]{display:grid;place-items:center}dialog.dshm-picker::bac
 				accessLink.textContent = origin;
 				accessLink.title = origin;
 				status.classList.toggle("is-running", running);
-				status.textContent = !lanConfigured ? t("lanSetupRequired") : lanRestartRequired ? t("lanSetupRestart", { origin: typeof data.pendingOrigin === "string" ? data.pendingOrigin : "" }) : running ? t("lanOn") : t("lanOff");
+				status.textContent = data.recoveryRequired === true ? t("lanChangeRecoveryRequired") : !lanConfigured ? t("lanSetupRequired") : lanRestartRequired ? t("lanSetupRestart", { origin: typeof data.pendingOrigin === "string" ? data.pendingOrigin : "" }) : running ? t("lanOn") : t("lanOff");
 				const extensionData = data.extensions;
 				if (extensionData !== null && typeof extensionData === "object") {
 					const loaded = typeof extensionData.loaded === "number" ? extensionData.loaded : 0;
@@ -13065,6 +13150,80 @@ dialog.dshm-picker[open]{display:grid;place-items:center}dialog.dshm-picker::bac
 					lanSetupConfigure.disabled = lanRestartRequired || lanSetupSelect.options.length === 0;
 				});
 			});
+			const syncLanChange = () => {
+				const waiting = lanChangeBusy || lanChangeRequest !== void 0;
+				lanChangeSelect.disabled = waiting;
+				lanChangeRefresh.disabled = waiting;
+				lanChangeConfirm.disabled = waiting || lanChangeSelect.options.length === 0;
+			};
+			const renderLanChange = (data) => {
+				const networks = Array.isArray(data.networks) ? data.networks.filter((entry) => typeof entry === "object" && entry !== null) : [];
+				lanChangeSelect.replaceChildren();
+				for (const network of networks) {
+					const name = typeof network.name === "string" ? network.name : "";
+					const address = typeof network.address === "string" ? network.address : "";
+					if (name === "") continue;
+					const option = element("option");
+					option.value = name;
+					option.textContent = `${name} · ${address}${network.current === true ? ` · ${t("lanChangeCurrent")}` : ""}`;
+					if (network.current === true) option.selected = true;
+					lanChangeSelect.append(option);
+				}
+				syncLanChange();
+			};
+			const loadLanChange = () => {
+				if (lanChangeRequest !== void 0) return lanChangeRequest;
+				lanChangeLoaded = true;
+				lanChangeRequest = Promise.all([controlRequestJson("/api/mobile-access/lan/networks"), controlRequestJson("/api/mobile-access/lan/control")]).then(([data, control]) => {
+					if (!lifecycle.signal.aborted) {
+						renderLanChange(data);
+						render(control);
+					}
+				}, () => {
+					if (!lifecycle.signal.aborted) lanChangeStatus.textContent = t("lanChangeRefreshFailed");
+				}).finally(() => {
+					lanChangeRequest = void 0;
+					if (!lifecycle.signal.aborted) syncLanChange();
+				});
+				syncLanChange();
+				return lanChangeRequest;
+			};
+			lanChangeRefresh.addEventListener("click", () => {
+				loadLanChange();
+			});
+			lanChangeSelect.addEventListener("change", syncLanChange);
+			lanChangeConfirm.addEventListener("click", () => {
+				if (lanChangeSelect.value === "" || lanChangeBusy || lanChangeRequest !== void 0) return;
+				lanChangeBusy = true;
+				syncLanChange();
+				lanChangeConfirm.textContent = t("lanChangeBusy");
+				lanChangeStatus.textContent = t("lanChangeBusy");
+				controlRequestJson("/api/mobile-access/lan/rebind", {
+					method: "POST",
+					body: JSON.stringify({ networkInterface: lanChangeSelect.value })
+				}, LONG_CONTROL_REQUEST_TIMEOUT_MS).then(async (data) => {
+					if (lifecycle.signal.aborted) return;
+					lanChangeStatus.textContent = data.disconnected === true && data.ready === true ? t("lanChangeOkDisconnected") : t("lanChangeOk");
+					try {
+						const control = await controlRequestJson("/api/mobile-access/lan/control");
+						if (lifecycle.signal.aborted) return;
+						render(control);
+						await loadLanChange();
+						if (!lifecycle.signal.aborted && data.ready === true) openPairing("key");
+					} catch {
+						if (!lifecycle.signal.aborted) lanChangeStatus.textContent = t("lanChangeRefreshFailed");
+					}
+				}, (error) => {
+					if (lifecycle.signal.aborted) return;
+					const text = String(error);
+					lanChangeStatus.textContent = text.includes("lan_rebind_unchanged") ? t("lanChangeUnchanged") : text.includes("lan_rebind_network_unavailable") ? t("lanChangeUnavailable") : text.includes("lan_rebind_unsupported") ? t("lanChangeUnsupported") : text.includes("lan_rebind_recovery_required") ? t("lanChangeRecoveryRequired") : t("lanChangeFailed");
+				}).finally(() => {
+					lanChangeBusy = false;
+					if (lifecycle.signal.aborted) return;
+					lanChangeConfirm.textContent = t("lanChangeConfirm");
+					syncLanChange();
+				});
+			});
 			const clearQrTarget = (target) => {
 				if (typeof target.replaceChildren === "function") {
 					target.replaceChildren();