dsh-mobile 0.6.0 → 0.6.2

package/lib/client.js

@@ -1150,6 +1150,8 @@ window.__ModuleLoader__.load({
 			originCopyBackend: "Copy backend address",
 			originBackendCopied: "HTTP backend address copied.",
 			originPurge: "Clear proxy settings",
+			originHttpsTitle: "HTTPS remote access",
+			originHttpsMode: "HTTPS handling",
 			caddyModeManaged: "Managed Caddy (plugin handles HTTPS and certificates)",
 			caddyModeExternal: "I already run my own reverse proxy",
 			caddySectionTitle: "Managed Caddy upstream",
@@ -1205,6 +1207,8 @@ window.__ModuleLoader__.load({
 			originCopyBackend: "Copia indirizzo backend",
 			originBackendCopied: "Indirizzo backend HTTP copiato.",
 			originPurge: "Cancella impostazioni proxy",
+			originHttpsTitle: "Accesso remoto HTTPS",
+			originHttpsMode: "Gestione HTTPS",
 			caddyModeManaged: "Caddy gestito (il plugin gestisce HTTPS e certificati)",
 			caddyModeExternal: "Uso già il mio reverse proxy",
 			caddySectionTitle: "Upstream Caddy gestito",
@@ -1260,6 +1264,8 @@ window.__ModuleLoader__.load({
 			originCopyBackend: "复制后端地址",
 			originBackendCopied: "已复制 HTTP 后端地址。",
 			originPurge: "清除代理配置",
+			originHttpsTitle: "HTTPS 远程接入",
+			originHttpsMode: "HTTPS 接入方式",
 			caddyModeManaged: "托管 Caddy（插件负责 HTTPS 与证书）",
 			caddyModeExternal: "我已自行配置反向代理",
 			caddySectionTitle: "托管 Caddy 上游",
@@ -5165,8 +5171,8 @@ window.__ModuleLoader__.load({
 		function clientReleaseInfo(data) {
 			const latestVersion = releaseVersion(data.latestVersion);
 			const androidVersion = releaseVersion(data.androidVersion);
-			const expectedAndroidDownloadUrl = androidVersion === void 0 ? void 0 : `${GITHUB_RELEASES_URL}/download/v${androidVersion}/dsh-mobile-android-v${androidVersion}.apk`;
-			const androidDownloadUrl = expectedAndroidDownloadUrl !== void 0 && data.androidDownloadUrl === expectedAndroidDownloadUrl ? expectedAndroidDownloadUrl : GITHUB_RELEASES_URL;
+			const expectedAndroidDownloadUrls = androidVersion === void 0 ? [] : ["v", "android-v"].map((prefix) => `${GITHUB_RELEASES_URL}/download/${prefix}${androidVersion}/dsh-mobile-android-v${androidVersion}.apk`);
+			const androidDownloadUrl = typeof data.androidDownloadUrl === "string" && expectedAndroidDownloadUrls.includes(data.androidDownloadUrl) ? data.androidDownloadUrl : GITHUB_RELEASES_URL;
 			return {
 				updateAvailable: data.updateAvailable === true && latestVersion !== void 0,
 				...latestVersion === void 0 ? {} : { latestVersion },
@@ -6176,14 +6182,14 @@ window.__ModuleLoader__.load({
 			const originSetup = element("section", "dsh-mobile-control__origin-setup");
 			originSetup.hidden = true;
 			const originSetupTitle = element("h3", "dsh-mobile-control__section-title");
-			originSetupTitle.textContent = t("prepareOrigin");
+			originSetupTitle.textContent = t("originHttpsTitle");
 			const originHelp = element("p", "dsh-mobile-control__component-note");
 			originHelp.id = "dsh-mobile-origin-help";
 			originHelp.textContent = t("originHelp");
 			const originWarning = element("p", "dsh-mobile-control__origin-warning");
 			originWarning.textContent = t("originWarning");
 			const originFields = element("div", "dsh-mobile-control__origin-fields");
-			const originPublicLabel = element("label", "dsh-mobile-control__field");
+			const originPublicLabel = element("label", "dsh-mobile-control__field dsh-mobile-control__field--full");
 			originPublicLabel.textContent = t("originPublicOrigin");
 			const originPublic = element("input");
 			originPublic.type = "url";
@@ -6204,7 +6210,7 @@ window.__ModuleLoader__.load({
 			originPort.max = "65535";
 			originPort.step = "1";
 			originPort.value = "3444";
-			const originCidrsLabel = element("label", "dsh-mobile-control__field");
+			const originCidrsLabel = element("label", "dsh-mobile-control__field dsh-mobile-control__field--full");
 			originCidrsLabel.textContent = t("originAllowedCidrs");
 			const originCidrs = element("input");
 			originCidrs.type = "text";
@@ -6248,14 +6254,15 @@ window.__ModuleLoader__.load({
 			originCopyBackend.type = "button";
 			originCopyBackend.textContent = t("originCopyBackend");
 			originBackend.append(originBackendLabel, originBackendAddress, originCopyBackend);
-			originSetup.append(originSetupTitle, originHelp, originWarning, originFields, originFeedback, originFormActions, originBackend);
-			const caddyModeRow = element("div", "dsh-mobile-control__origin-fields");
-			const caddyModeManagedLabel = element("label", "dsh-mobile-control__field");
+			const caddyModeRow = element("fieldset", "dsh-mobile-control__origin-modes");
+			const caddyModeLegend = element("legend");
+			caddyModeLegend.textContent = t("originHttpsMode");
+			const caddyModeManagedLabel = element("label", "dsh-mobile-control__origin-mode");
 			const caddyModeManaged = element("input");
 			caddyModeManaged.type = "radio";
 			caddyModeManaged.name = "caddy-mode";
 			caddyModeManaged.value = "managed";
-			const caddyModeExternalLabel = element("label", "dsh-mobile-control__field");
+			const caddyModeExternalLabel = element("label", "dsh-mobile-control__origin-mode");
 			const caddyModeExternal = element("input");
 			caddyModeExternal.type = "radio";
 			caddyModeExternal.name = "caddy-mode";
@@ -6266,10 +6273,11 @@ window.__ModuleLoader__.load({
 			caddyExternalText.textContent = t("caddyModeExternal");
 			caddyModeManagedLabel.append(caddyModeManaged, caddyManagedText);
 			caddyModeExternalLabel.append(caddyModeExternal, caddyExternalText);
-			caddyModeRow.append(caddyModeManagedLabel, caddyModeExternalLabel);
-			const caddyForm = element("div", "dsh-mobile-control__origin-fields");
+			caddyModeRow.append(caddyModeLegend, caddyModeExternalLabel, caddyModeManagedLabel);
+			const caddyForm = element("div", "dsh-mobile-control__caddy-form");
 			caddyForm.hidden = true;
-			const caddyDomainLabel = element("label", "dsh-mobile-control__field");
+			const caddyFields = element("div", "dsh-mobile-control__origin-fields");
+			const caddyDomainLabel = element("label", "dsh-mobile-control__field dsh-mobile-control__field--full");
 			caddyDomainLabel.textContent = t("caddyDomain");
 			const caddyDomain = element("input");
 			caddyDomain.type = "url";
@@ -6277,7 +6285,7 @@ window.__ModuleLoader__.load({
 			caddyDomain.maxLength = 512;
 			caddyDomain.autocomplete = "off";
 			caddyDomain.spellcheck = false;
-			const caddyProviderLabel = element("label", "dsh-mobile-control__field");
+			const caddyProviderLabel = element("label", "dsh-mobile-control__field dsh-mobile-control__field--full");
 			caddyProviderLabel.textContent = t("caddyDnsProvider");
 			const caddyProvider = element("select");
 			const caddyProviderOption = document.createElement("option");
@@ -6296,7 +6304,7 @@ window.__ModuleLoader__.load({
 			caddySecretKey.type = "password";
 			caddySecretKey.autocomplete = "off";
 			caddySecretKey.spellcheck = false;
-			const caddyPortLabel = element("label", "dsh-mobile-control__field");
+			const caddyPortLabel = element("label", "dsh-mobile-control__field dsh-mobile-control__field--full");
 			caddyPortLabel.textContent = t("caddyListenPort");
 			const caddyPort = element("input");
 			caddyPort.type = "number";
@@ -6310,7 +6318,7 @@ window.__ModuleLoader__.load({
 			caddySecretIdLabel.append(caddySecretId);
 			caddySecretKeyLabel.append(caddySecretKey);
 			caddyPortLabel.append(caddyPort);
-			caddyForm.append(caddyDomainLabel, caddyProviderLabel, caddySecretIdLabel, caddySecretKeyLabel, caddyPortLabel);
+			caddyFields.append(caddyDomainLabel, caddyProviderLabel, caddySecretIdLabel, caddySecretKeyLabel, caddyPortLabel);
 			const caddyInstall = element("button", "dsh-mobile-control__primary");
 			caddyInstall.type = "button";
 			caddyInstall.textContent = t("caddyInstall");
@@ -6330,8 +6338,10 @@ window.__ModuleLoader__.load({
 			caddyFeedback.setAttribute("role", "status");
 			caddyFeedback.setAttribute("aria-live", "polite");
 			caddyFeedback.hidden = true;
-			caddyForm.append(caddyInstallNote, caddyInstall, caddyStatus, caddySave, caddyPurgeButton, caddyFeedback);
-			originSetup.append(caddyModeRow, caddyForm);
+			const caddyActions = element("div", "dsh-mobile-control__actions dsh-mobile-control__caddy-actions");
+			caddyActions.append(caddyInstall, caddySave, caddyPurgeButton);
+			caddyForm.append(caddyFields, caddyInstallNote, caddyStatus, caddyActions, caddyFeedback);
+			originSetup.append(originSetupTitle, caddyModeRow, originHelp, originWarning, originFields, originFeedback, originFormActions, caddyForm, originBackend);
 			const tailscaleInfo = element("details", "dsh-mobile-control__details");
 			const tailscaleInfoSummary = element("summary");
 			tailscaleInfoSummary.textContent = t("tailscaleHelp");
@@ -10036,7 +10046,11 @@ window.__ModuleLoader__.load({
 .dsh-mobile-control__manage-row{display:flex;justify-content:space-between;gap:8px;margin-top:10px}.dsh-mobile-control__manage{flex:1 1 0;min-width:0;min-height:36px;padding:6px 8px;border:1px solid var(--dsw-alias-border-l3,#cfd5dd);border-radius:10px;background:transparent;color:inherit;font:12px/1.3 system-ui;cursor:pointer}.dsh-mobile-control__devices{margin-top:10px;border:1px solid var(--dsw-alias-border-l2,#e1e5eb);border-radius:10px;padding:8px;max-height:220px;overflow-y:auto}.dsh-mobile-control__device-empty{color:var(--dsw-alias-label-secondary,#606873);font-size:12px;margin:0}.dsh-mobile-control__device{display:flex;align-items:center;gap:8px;padding:6px 2px}.dsh-mobile-control__device + .dsh-mobile-control__device{border-top:1px solid var(--dsw-alias-border-l2,#e1e5eb)}.dsh-mobile-control__device-label{flex:1 1 0;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:12px}.dsh-mobile-control__device-meta{flex:none;color:var(--dsw-alias-label-secondary,#606873);font-size:11px;white-space:nowrap}.dsh-mobile-control__device-revoke{flex:none;min-height:36px;padding:4px 8px;border:1px solid var(--dsw-alias-state-error-primary,#dc2626);border-radius:8px;background:transparent;color:var(--dsw-alias-label-primary,#dc2626);font:12px/1.2 system-ui;cursor:pointer}.dsh-mobile-control__ws-paths{margin:10px 0 0;padding:12px;border:1px solid var(--dsw-alias-border-l2,#dbe1e8);border-radius:13px;background:var(--dsw-alias-bg-layer-2,#fff)}.dsh-mobile-control__ws-paths-list{margin:0 0 8px;padding:0;list-style:none}.dsh-mobile-control__ws-paths-empty{color:var(--dsw-alias-label-secondary,#606873);font-size:12px}.dsh-mobile-control__ws-paths-item{display:flex;align-items:center;gap:8px;padding:6px 0}.dsh-mobile-control__ws-paths-item + .dsh-mobile-control__ws-paths-item{border-top:1px solid var(--dsw-alias-border-l2,#e1e5eb)}.dsh-mobile-control__ws-paths-item code{flex:1 1 0;min-width:0;overflow:hidden;font:11px/1.4 ui-monospace,SFMono-Regular,Consolas,monospace;text-overflow:ellipsis;white-space:nowrap}.dsh-mobile-control__ws-paths-remove{flex:none;min-height:36px;padding:4px 8px;border:1px solid var(--dsw-alias-border-l3,#cfd5dd);border-radius:8px;background:transparent;color:inherit;font:12px/1.2 system-ui;cursor:pointer}.dsh-mobile-control__trigger,.dsh-mobile-control__diagnostic-entry{position:relative}.dsh-mobile-control__ws-dot{position:absolute;top:2px;right:2px;z-index:1;min-width:16px;height:16px;padding:0 4px;border-radius:999px;background:var(--dsw-alias-state-error-primary,#dc2626);color:#fff;font:650 11px/16px system-ui;text-align:center;cursor:pointer}.dsh-mobile-control__ws-dot::after{content:'';position:absolute;inset:-5px}.dsh-mobile-control__ws-sr-status{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0 0 0 0);white-space:nowrap;border:0}.dsh-mobile-control__ws-paths-row{display:flex;gap:8px}.dsh-mobile-control__ws-paths-row .dsh-mobile-control__primary{width:auto;flex:none;padding:9px 14px;border-radius:10px}.dsh-mobile-control__ws-paths-group{padding:6px 0}.dsh-mobile-control__ws-paths-group + .dsh-mobile-control__ws-paths-group{border-top:1px solid var(--dsw-alias-border-l2,#e1e5eb)}.dsh-mobile-control__ws-paths-group-head{display:flex;align-items:center;gap:8px}.dsh-mobile-control__ws-count{flex:none;padding:1px 7px;border-radius:999px;background:var(--dsw-alias-state-business-tertiary,#e8f0ff);color:var(--dsw-alias-label-primary,#1d4ed8);font:650 11px/1.6 system-ui}.dsh-mobile-control__ws-paths-item.is-child{padding-left:12px}.dsh-mobile-control__ws-paths-group-head .dsh-mobile-control__primary,.dsh-mobile-control__ws-paths-item .dsh-mobile-control__primary{width:auto;flex:none;min-height:36px;padding:6px 12px;border-radius:10px}.dsh-mobile-control__ws-paths-row input{flex:1 1 0;min-width:0;box-sizing:border-box;min-height:44px;padding:9px 10px;border:1px solid var(--dsw-alias-border-l3,#cfd5dd);border-radius:10px;background:var(--dsw-alias-bg-layer-2,#fff);color:var(--dsw-alias-label-primary,#16181d);font:16px/1.4 system-ui}.dsh-mobile-control__ws-paths-row button{flex:none}.dsh-mobile-control__ws-paths-detected-title{margin:0 0 2px;font:600 12px/1.4 system-ui}.dsh-mobile-control__ws-paths-advanced{margin-top:8px}.dsh-mobile-control__ws-paths-advanced summary{cursor:pointer;color:var(--dsw-alias-label-secondary,#606873);font:12px/1.4 system-ui;user-select:none}.dsh-mobile-control__ws-paths-advanced summary:focus-visible{outline:2px solid var(--dsw-alias-state-business-primary,currentColor);outline-offset:2px;border-radius:4px}.dsh-mobile-control__ws-paths-advanced[open] summary{margin-bottom:6px}.dsh-mobile-control__ws-paths-advanced .dsh-mobile-control__status{margin:6px 0 0}
 @media (max-width:359px){.dsh-mobile-control__provider{min-height:68px}}@media (prefers-reduced-motion:reduce){.dsh-mobile-control__provider,.dsh-mobile-control__cpolar-connect{transition:none}.dsh-mobile-control__diagnostic-summary.is-running .dsh-mobile-control__diagnostic-summary-icon::before,.dsh-mobile-control__diagnostic-checks{animation:none}}
 
-.dsh-mobile-control__origin-setup{margin:0;padding:12px;border:1px solid var(--dsw-alias-border-l2,#dbe1e8);border-radius:13px;background:var(--dsw-alias-bg-layer-2,#fff)}.dsh-mobile-control__origin-setup[hidden],.dsh-mobile-control__origin-backend[hidden],.dsh-mobile-control__origin-feedback[hidden]{display:none}.dsh-mobile-control__origin-fields{display:grid;grid-template-columns:minmax(0,1fr) 110px;gap:12px}.dsh-mobile-control__origin-fields>.dsh-mobile-control__field{font-size:12px}.dsh-mobile-control__origin-fields>.dsh-mobile-control__field:nth-child(1),.dsh-mobile-control__origin-fields>.dsh-mobile-control__field:nth-child(4){grid-column:1/-1}.dsh-mobile-control__origin-fields>.dsh-mobile-control__field:nth-child(2){grid-column:1}.dsh-mobile-control__origin-fields>.dsh-mobile-control__field:nth-child(3){grid-column:2}.dsh-mobile-control__origin-warning{margin:12px 0;padding:10px 12px;border-left:3px solid var(--dsw-alias-state-warn-primary,#a56810);border-radius:4px;background:var(--dsw-alias-bg-layer-1,#f3f5f8);color:var(--dsw-alias-label-primary,#384152);font-size:12px;line-height:1.6}.dsh-mobile-control__origin-feedback{font-size:12px;line-height:1.6;overflow-wrap:anywhere}.dsh-mobile-control__origin-feedback.is-error{color:var(--dsw-alias-state-error-primary,#bc3030)}.dsh-mobile-control__origin-fields input[aria-invalid=true]{border-color:var(--dsw-alias-state-error-primary,#bc3030)}.dsh-mobile-control__origin-backend{display:flex;min-width:0;flex-direction:column;align-items:stretch;gap:8px;margin-top:12px;padding-top:12px;border-top:1px solid var(--dsw-alias-border-l2,#dbe1e8)}.dsh-mobile-control__origin-backend button{align-self:flex-start;min-height:44px}.dsh-mobile-control__self-hosted-body .is-origin{margin-top:8px}
+.dsh-mobile-control__origin-setup{margin:0;padding:12px;border:1px solid var(--dsw-alias-border-l2,#dbe1e8);border-radius:13px;background:var(--dsw-alias-bg-layer-2,#fff)}.dsh-mobile-control__origin-setup[hidden],.dsh-mobile-control__origin-setup [hidden]{display:none}
+/* Mode choices are not text fields; preserve native radio sizing and keyboard behavior. */
+.dsh-mobile-control__origin-modes{min-width:0;margin:0 0 14px;padding:0;border:0}.dsh-mobile-control__origin-modes legend{margin:0 0 8px;padding:0;color:var(--dsw-alias-label-secondary,#606873);font:600 12px/1.4 system-ui}.dsh-mobile-control__origin-mode{display:flex;box-sizing:border-box;min-height:44px;align-items:center;gap:10px;padding:10px;border:1px solid var(--dsw-alias-border-l2,#dbe1e8);border-radius:10px;background:var(--dsw-alias-bg-layer-1,#f3f5f8);font:12px/1.5 system-ui;cursor:pointer}.dsh-mobile-control__origin-mode+.dsh-mobile-control__origin-mode{margin-top:8px}.dsh-mobile-control__origin-mode:has(input:checked){border-color:var(--dsw-alias-label-primary-bluish,#2563eb)}.dsh-mobile-control__origin-mode:focus-within{outline:2px solid var(--dsw-alias-state-business-primary,#2563eb);outline-offset:2px}.dsh-mobile-control__origin-mode:has(input:disabled){cursor:wait;opacity:.55}.dsh-mobile-control__origin-mode input[type=radio]{flex:0 0 18px;box-sizing:border-box;width:18px;height:18px;min-height:18px;margin:0;padding:0;accent-color:var(--dsw-alias-label-primary-bluish,#2563eb)}.dsh-mobile-control__origin-mode span{min-width:0;overflow-wrap:anywhere}
+/* Base the columns on the card width, not the desktop viewport behind the popup. */
+.dsh-mobile-control__origin-fields{display:grid;grid-template-columns:repeat(auto-fit,minmax(min(100%,140px),1fr));gap:12px}.dsh-mobile-control__origin-fields>.dsh-mobile-control__field{min-width:0;grid-column:auto;font-size:12px}.dsh-mobile-control__origin-fields>.dsh-mobile-control__field--full{grid-column:1/-1}.dsh-mobile-control__origin-fields select{box-sizing:border-box;width:100%;min-height:44px;padding:9px 10px;border:1px solid var(--dsw-alias-border-l3,#cfd5dd);border-radius:10px;background:var(--dsw-alias-bg-layer-2,#fff);color:var(--dsw-alias-label-primary,#16181d);font:16px/1.4 system-ui}.dsh-mobile-control__origin-fields select:disabled{cursor:not-allowed;opacity:.55}.dsh-mobile-control__caddy-form{display:grid;gap:12px}.dsh-mobile-control__caddy-form>.dsh-mobile-control__component-note,.dsh-mobile-control__caddy-form>.dsh-mobile-control__component-status,.dsh-mobile-control__caddy-form>.dsh-mobile-control__origin-feedback{margin:0;overflow-wrap:anywhere}.dsh-mobile-control__origin-setup .dsh-mobile-control__actions.dsh-mobile-control__caddy-actions{grid-template-columns:minmax(0,1fr);margin:0}.dsh-mobile-control__caddy-actions button{box-sizing:border-box;min-width:0;min-height:44px;padding:10px 12px;border-radius:10px;font:600 12px/1.4 system-ui;cursor:pointer}.dsh-mobile-control__origin-warning{margin:12px 0;padding:10px 12px;border-left:3px solid var(--dsw-alias-state-warn-primary,#a56810);border-radius:4px;background:var(--dsw-alias-bg-layer-1,#f3f5f8);color:var(--dsw-alias-label-primary,#384152);font-size:12px;line-height:1.6}.dsh-mobile-control__origin-feedback{font-size:12px;line-height:1.6;overflow-wrap:anywhere}.dsh-mobile-control__origin-feedback.is-error{color:var(--dsw-alias-state-error-primary,#bc3030)}.dsh-mobile-control__origin-fields input[aria-invalid=true]{border-color:var(--dsw-alias-state-error-primary,#bc3030)}.dsh-mobile-control__origin-backend{display:flex;min-width:0;flex-direction:column;align-items:stretch;gap:8px;margin-top:12px;padding-top:12px;border-top:1px solid var(--dsw-alias-border-l2,#dbe1e8)}.dsh-mobile-control__origin-backend button{align-self:flex-start;min-height:44px}.dsh-mobile-control__self-hosted-body .is-origin{margin-top:8px}
 `;
 		/** Mount the desktop control or mobile feature enhancements. */
 		function apply(ctx) {