dsh-mobile 0.8.2 → 0.8.4

package/lib/index.d.mts

@@ -1554,6 +1554,12 @@ interface FrpSettings {
   readonly vhostHttpPort?: number;
   /** Public entry port of the self-signed TCP proxy; defaults to 33080. */
   readonly publicPort?: number;
+  /**
+   * Optional frpc `user` field for shared frps services that namespace proxies
+   * per user. When set, frps registers the proxy as `<user>.<proxyName>`;
+   * the locally derived proxy name is unchanged. Absent keeps upstream behaviour.
+   */
+  readonly user?: string;
 }
 /** Safe FRP configuration fields returned to the desktop UI. */
 interface FrpConfigurationStatus {
@@ -1572,6 +1578,8 @@ interface FrpConfigurationStatus {
   readonly entryTls?: FrpEntryTls;
   /** Present only when a non-default public entry port is saved. */
   readonly publicPort?: number;
+  /** Present only when the optional frpc `user` field is saved. */
+  readonly user?: string;
 }
 /** Validate the FRP server hostname or IP address. */
 export declare function validateFrpServerAddress(value: unknown): string;

package/lib/index.mjs

@@ -8244,7 +8244,7 @@ var MobileAccessGateway = class {
 				}
 			}
 			operation.signal.throwIfAborted();
-			const headers = sanitizeResponseHeaders(index.headers, this.config.upstreamOrigin);
+			const headers = sanitizeResponseHeaders(index.headers, new URL(request.url ?? "/", this.config.upstreamOrigin));
 			delete headers["content-length"];
 			delete headers["content-encoding"];
 			delete headers.etag;
@@ -8749,7 +8749,7 @@ var MobileAccessGateway = class {
 			}
 			if (graphEvents) holder.request?.setTimeout(this.config.upstreamApiTimeoutMs);
 			setSecurityHeaders(response, this.tlsEnabled, "proxied");
-			const headers = sanitizeResponseHeaders(proxied.headers, this.config.upstreamOrigin);
+			const headers = sanitizeResponseHeaders(proxied.headers, new URL(request$2.url ?? "/", this.config.upstreamOrigin));
 			if (graphEvents) {
 				if (proxied.headers["content-encoding"] !== void 0 && proxied.headers["content-encoding"] !== "identity") throw new HttpError(502, "upstream_unavailable");
 				delete headers["content-length"];
@@ -10954,7 +10954,8 @@ const FRP_SETTINGS_KEYS = /* @__PURE__ */ new Set([
 	"mode",
 	"entryTls",
 	"vhostHttpPort",
-	"publicPort"
+	"publicPort",
+	"user"
 ]);
 function hostname$2(value) {
 	if (value.length > 253 || !value.includes(".")) return false;
@@ -10977,6 +10978,11 @@ function validateFrpToken(value) {
 	if (typeof value !== "string" || value.length < 16 || value.length > 512 || /[\s\u0000-\u001f\u007f]/u.test(value)) throw new Error("frp_token_invalid");
 	return value;
 }
+/** Validate the optional frpc `user` field; it must stay one safe TOML token. */
+function validateFrpUser(value) {
+	if (typeof value !== "string" || value.length < 1 || value.length > 128 || !/^[A-Za-z0-9._-]+$/u.test(value)) throw new Error("frp_user_invalid");
+	return value;
+}
 /** Validate the public HTTPS origin used by Caddy and Android pairing. */
 function validateFrpPublicOrigin(value) {
 	if (typeof value !== "string" || value.length > 512) throw new Error("frp_public_origin_invalid");
@@ -11067,6 +11073,7 @@ function parseFrpSettings(value) {
 	const entryTls = record.entryTls === void 0 ? void 0 : validateFrpEntryTls(record.entryTls);
 	const vhostHttpPort = record.vhostHttpPort === void 0 ? void 0 : validateFrpVhostHttpPort(record.vhostHttpPort);
 	const publicPort = record.publicPort === void 0 ? void 0 : validateFrpPublicPort(record.publicPort);
+	const user = record.user === void 0 || record.user === "" ? void 0 : validateFrpUser(record.user);
 	const resolvedMode = mode ?? "deploy";
 	const resolvedEntryTls = entryTls ?? "public-ip-cert";
 	if (resolvedEntryTls === "self-signed" && resolvedMode !== "attach") throw new Error("frp_entry_tls_invalid");
@@ -11082,7 +11089,8 @@ function parseFrpSettings(value) {
 		...mode === void 0 ? {} : { mode },
 		...entryTls === void 0 ? {} : { entryTls },
 		...vhostHttpPort === void 0 ? {} : { vhostHttpPort },
-		...publicPort === void 0 ? {} : { publicPort }
+		...publicPort === void 0 ? {} : { publicPort },
+		...user === void 0 ? {} : { user }
 	});
 }
 /**
@@ -11101,6 +11109,7 @@ function mergeSavedFrpSettings(partial, saved) {
 	const entryTls = pick("entryTls");
 	const vhostHttpPort = pick("vhostHttpPort");
 	const publicPort = pick("publicPort");
+	const user = partial.user === void 0 ? saved?.user : partial.user;
 	const merged = {
 		serverAddress: partial.serverAddress === "" || partial.serverAddress === void 0 ? saved?.serverAddress : partial.serverAddress,
 		serverPort: typeof partial.serverPort === "number" && Number.isSafeInteger(partial.serverPort) && partial.serverPort >= 1 ? partial.serverPort : saved?.serverPort,
@@ -11109,7 +11118,8 @@ function mergeSavedFrpSettings(partial, saved) {
 		...mode === "" || mode === void 0 ? {} : { mode },
 		...entryTls === "" || entryTls === void 0 ? {} : { entryTls },
 		...vhostHttpPort === "" || vhostHttpPort === void 0 ? {} : { vhostHttpPort },
-		...publicPort === "" || publicPort === void 0 ? {} : { publicPort }
+		...publicPort === "" || publicPort === void 0 ? {} : { publicPort },
+		...user === "" || user === void 0 ? {} : { user }
 	};
 	if (merged.serverAddress === void 0 && merged.serverPort === void 0 && merged.token === void 0 && merged.publicOrigin === void 0) throw new Error("frp_config_missing");
 	return parseFrpSettings(merged);
@@ -11179,6 +11189,7 @@ function createFrpcToml(settings, localPort, proxyName = FRP_DEFAULT_PROXY_NAME)
 		`serverPort = ${String(settings.serverPort)}`,
 		"auth.method = \"token\"",
 		`auth.token = ${tomlString(settings.token)}`,
+		...settings.user === void 0 ? [] : [`user = ${tomlString(settings.user)}`],
 		"transport.tls.enable = true",
 		"",
 		"[[proxies]]",
@@ -11291,7 +11302,8 @@ var FrpConfigStore = class {
 			...this.errorCode === void 0 ? {} : { errorCode: this.errorCode },
 			...mode === void 0 || mode === "deploy" ? {} : { mode },
 			...entryTls === void 0 || entryTls === "public-ip-cert" ? {} : { entryTls },
-			...settings?.publicPort === void 0 ? {} : { publicPort: settings.publicPort }
+			...settings?.publicPort === void 0 ? {} : { publicPort: settings.publicPort },
+			...settings?.user === void 0 ? {} : { user: settings.user }
 		});
 	}
 	/** Return private settings only to the provider lifecycle. */
@@ -13652,7 +13664,7 @@ var OriginController = class {
 const MAX_ARCHIVE_LIST_BYTES = 1048576;
 const MAX_ARCHIVE_ENTRIES = 256;
 const DOWNLOAD_TIMEOUT_MS = 3e5;
-const CLOUDFLARED_VERSION = "2026.9.1";
+const CLOUDFLARED_VERSION = "2026.10.7";
 /** Pinned official cloudflared release metadata for supported desktop targets. */
 const CLOUDFLARED_COMPONENT_RELEASES = Object.freeze(Object.fromEntries([
 	{
@@ -13660,44 +13672,44 @@ const CLOUDFLARED_COMPONENT_RELEASES = Object.freeze(Object.fromEntries([
 		platform: "win32",
 		arch: "x64",
 		downloadUrl: `https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-windows-amd64.exe`,
-		downloadBytes: 54976432,
-		downloadSha256: "2837888cc0f5d58f15b6dc478376de90b4d3ba5241c7947455d1e0a0df429712",
+		downloadBytes: 55390512,
+		downloadSha256: "2493dbc168923bb3e59e5e7716f71deced92992eea9acd6e9d74f84ac7751343",
 		executableName: "cloudflared.exe",
-		executableBytes: 54976432,
-		executableSha256: "2837888cc0f5d58f15b6dc478376de90b4d3ba5241c7947455d1e0a0df429712"
+		executableBytes: 55390512,
+		executableSha256: "2493dbc168923bb3e59e5e7716f71deced92992eea9acd6e9d74f84ac7751343"
 	},
 	{
 		version: CLOUDFLARED_VERSION,
 		platform: "linux",
 		arch: "x64",
 		downloadUrl: `https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-amd64`,
-		downloadBytes: 39838488,
-		downloadSha256: "03f1f25d1cc93b9ad6c60569d44060bc4f17ed97075760ed8cfca4b12dcd68cc",
+		downloadBytes: 40274445,
+		downloadSha256: "1f99fb518b83dec2ba8d870a7cc991d82a77e6196295a3d2754ba17ab9f91872",
 		executableName: "cloudflared",
-		executableBytes: 39838488,
-		executableSha256: "03f1f25d1cc93b9ad6c60569d44060bc4f17ed97075760ed8cfca4b12dcd68cc"
+		executableBytes: 40274445,
+		executableSha256: "1f99fb518b83dec2ba8d870a7cc991d82a77e6196295a3d2754ba17ab9f91872"
 	},
 	{
 		version: CLOUDFLARED_VERSION,
 		platform: "linux",
 		arch: "arm64",
 		downloadUrl: `https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-arm64`,
-		downloadBytes: 37466252,
-		downloadSha256: "3d97437c71848bd8df68041e12436b484a661d95073ea1937f01a845ce88faa3",
+		downloadBytes: 37667293,
+		downloadSha256: "3df43aedc9ff291d1735b5cb576cb97e0b157488796db2e32b28aecabb445775",
 		executableName: "cloudflared",
-		executableBytes: 37466252,
-		executableSha256: "3d97437c71848bd8df68041e12436b484a661d95073ea1937f01a845ce88faa3"
+		executableBytes: 37667293,
+		executableSha256: "3df43aedc9ff291d1735b5cb576cb97e0b157488796db2e32b28aecabb445775"
 	},
 	{
 		version: CLOUDFLARED_VERSION,
 		platform: "darwin",
 		arch: "x64",
 		downloadUrl: `https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-darwin-amd64.tgz`,
-		downloadBytes: 21118723,
-		downloadSha256: "ff0d3b51d5ff70eceef89d6b32145fee985018a2174596a5dbe405e2766e2ac4",
+		downloadBytes: 21834416,
+		downloadSha256: "02f3edfd87684dd5b705607688e4eb4b323f6e777b81e7b3a85af556aa356848",
 		executableName: "cloudflared",
-		executableBytes: 41731488,
-		executableSha256: "1ea07ae775b03236bd6be18ca1848d6bdc4af2f4f3bce398823b5a36e5761b75",
+		executableBytes: 42430512,
+		executableSha256: "5c55e77da7012cebca19170357e196176c48c9647cc2ead404702fa125ddbd86",
 		archive: {
 			format: "tgz",
 			member: "cloudflared"
@@ -13708,11 +13720,11 @@ const CLOUDFLARED_COMPONENT_RELEASES = Object.freeze(Object.fromEntries([
 		platform: "darwin",
 		arch: "arm64",
 		downloadUrl: `https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-darwin-arm64.tgz`,
-		downloadBytes: 19217478,
-		downloadSha256: "c27ab8fd0aa489449e3d201eb02f957ef460a13b613662928b1b23394bf1bcfe",
+		downloadBytes: 19847161,
+		downloadSha256: "3586ccf397e98e5f437e60e7c307ca6ac463e110580503af8bb8e6f9ebf831bd",
 		executableName: "cloudflared",
-		executableBytes: 38893072,
-		executableSha256: "9a0b19f67dc7a3011bc6b972c7ce06a5fcea8784ac6bd599ffa382ea4aeb5a6e",
+		executableBytes: 39487168,
+		executableSha256: "2136431d5eb467bf447d2ee514b713e192719b143aec1d9e09bf7dc290d5bb12",
 		archive: {
 			format: "tgz",
 			member: "cloudflared"
@@ -15378,6 +15390,14 @@ function validatePairingDescriptor(value, options = {}) {
 function encodePairingDescriptor(value, options = {}) {
 	return JSON.stringify(validatePairingDescriptor(value, options));
 }
+/** Draw the canonical pairing payload with its four-module quiet zone inside the SVG. */
+function renderIrohPairingQr(encoded) {
+	return QRCode.toString(encoded, {
+		type: "svg",
+		margin: 4,
+		errorCorrectionLevel: "M"
+	});
+}
 /** Decode untrusted QR text, validating its expiry and public CA before use. */
 function decodePairingDescriptor(encoded, options = {}) {
 	if (typeof encoded !== "string" || Buffer.byteLength(encoded, "utf8") > 2200) reject("pairing_descriptor_too_large");
@@ -24368,7 +24388,8 @@ async function apply(ctx, config) {
 		}, cpolarComponent.status(), cloudflaredComponent.status(), cloudflaredTunnel.status(), frpComponent.status(), frpConfig.status(), originConfig.status(), caddyComponent.status(), irohComponent.status()),
 		originMode: originController.mode(),
 		caddyConfiguration: caddyConfig.status(),
-		caddyState: caddyController.status()
+		caddyState: caddyController.status(),
+		...process.platform === "darwin" ? { macosHost: true } : {}
 	});
 	const lanPayload = () => ({
 		...loaded.kind === "unconfigured" ? {
@@ -24866,7 +24887,12 @@ async function apply(ctx, config) {
 				if (request.method === "POST" && target.decodedPathname === `/api/mobile-access/remote/frp/configure`) {
 					const body = await readJsonObject(request, 4096);
 					await remoteProviders.mutate(async () => {
-						await frpConfig.configure(body);
+						const saved = frpConfig.settings();
+						const reuseToken = body.token === "" && saved !== void 0 && body.serverAddress === saved.serverAddress && body.serverPort === saved.serverPort;
+						await frpConfig.configure(reuseToken ? {
+							...body,
+							token: saved.token
+						} : body);
 						if (remoteControllers.frp.status().enabled) await remoteControllers.frp.reconnect();
 					});
 					sendJson(response, 200, remotePayload(), false);
@@ -24913,10 +24939,7 @@ async function apply(ctx, config) {
 					});
 					let qrSvg = "";
 					try {
-						qrSvg = await QRCode.toString(pairing.encoded, {
-							type: "svg",
-							margin: 1
-						});
+						qrSvg = await renderIrohPairingQr(pairing.encoded);
 					} catch {}
 					logger.info("iroh pairing window opened");
 					sendJson(response, 201, {