dsh-mobile 0.4.7 → 0.5.0

package/lib/index.d.mts

@@ -1,6 +1,7 @@
 import { X509Certificate } from "node:crypto";
 import z from "@deepseek-ai/schemastery";
 import { ChildProcessWithoutNullStreams } from "node:child_process";
+import { IncomingMessage } from "node:http";
 import { Readable } from "node:stream";
 import { Context, Service } from "@deepseek-ai/cordis";
 import { WebRoute } from "@deepseek-ai/dsh-host-webserver";
@@ -756,7 +757,7 @@ declare class MobileAccessGateway {
   blockedUpgradePathReport(): BlockedUpgradePathEntry[];
   private handleUpgrade;
   /** Loopback-only DSH WebServer route for opening pairing and managing devices. */
-  localAdminRoute(prefix?: string): WebRoute;
+  localAdminRoute(prefix?: string, authenticateDesktop?: (request: IncomingMessage) => boolean): WebRoute;
   /** Close listeners and abort all accepted work before resolving teardown. */
   close(): Promise<void>;
   private performClose;

package/lib/index.mjs

@@ -1222,9 +1222,6 @@ var MobileAccessGatewayController = class {
 		return run;
 	}
 };
-//#endregion
-//#region src/local-admin-host.ts
-/** Browser-safe desktop-admin Host checks. Do not import Node APIs here. */
 function unwrapBrackets(hostname) {
 	return hostname.startsWith("[") && hostname.endsWith("]") ? hostname.slice(1, -1) : hostname;
 }
@@ -1339,7 +1336,8 @@ function setSecurityHeaders(response, tls, framing = "gateway") {
 		"worker-src 'self' blob:",
 		...proxied ? [PROXIED_FRAME_SRC] : []
 	].join("; "));
-	response.setHeader("Permissions-Policy", "camera=(), microphone=(), geolocation=(), payment=(), usb=()");
+	const microphone = proxied ? "microphone=(self)" : "microphone=()";
+	response.setHeader("Permissions-Policy", `camera=(), ${microphone}, geolocation=(), payment=(), usb=()`);
 	response.setHeader("Referrer-Policy", "no-referrer");
 	response.setHeader("X-Content-Type-Options", "nosniff");
 	response.setHeader("X-Frame-Options", proxied ? "SAMEORIGIN" : "DENY");
@@ -1436,7 +1434,7 @@ function localAuthority(header) {
 	}
 }
 /** Protect the inner management route from non-loopback and DNS-rebinding callers. */
-function assertLocalAdminTrust(request, requireBrowserOrigin) {
+function assertLocalAdminTrust(request, requireBrowserOrigin, authenticateDesktop = () => false) {
 	if (request.socket.remoteAddress === void 0 || !isLoopbackAddress(request.socket.remoteAddress)) throw new HttpError(403, "forbidden");
 	const host = localAuthority(request.headers.host);
 	if (host === void 0 || !isLocalAdminHostname(host.hostname)) throw new HttpError(403, "forbidden");
@@ -1450,7 +1448,8 @@ function assertLocalAdminTrust(request, requireBrowserOrigin) {
 		if (error instanceof HttpError) throw error;
 		throw new HttpError(403, "forbidden");
 	}
-	if (requireBrowserOrigin && origin === void 0) throw new HttpError(403, "forbidden");
+	const desktopForward = site === void 0 && request.headers["x-dsh-mobile-desktop-admin"] === "dsh-app://app";
+	if (requireBrowserOrigin && origin === void 0 && !(desktopForward && authenticateDesktop())) throw new HttpError(403, "forbidden");
 	if (requireBrowserOrigin && site !== void 0 && site !== "same-origin") throw new HttpError(403, "forbidden");
 }
 //#endregion
@@ -2647,7 +2646,7 @@ const MOBILE_LAYOUT_DEPENDENCY_PROFILES = Object.freeze([Object.freeze({
 	])
 })]);
 const MOBILE_CSRF_FETCH_BOOTSTRAP = `(()=>{const nativeFetch=window.fetch.bind(window);window.fetch=(input,init)=>{const source=input instanceof Request?input:undefined;const method=String(init?.method??source?.method??'GET').toUpperCase();if(method==='GET'||method==='HEAD')return nativeFetch(input,init);const raw=typeof input==='string'?input:input instanceof URL?input.href:source?.url;if(raw===undefined||new URL(raw,location.href).origin!==location.origin)return nativeFetch(input,init);const headers=new Headers(init?.headers??source?.headers);if(!headers.has(${JSON.stringify(CSRF_HEADER)})){const prefix=${JSON.stringify(`${CSRF_COOKIE}=`)};const token=document.cookie.split(';').map(value=>value.trim()).find(value=>value.startsWith(prefix))?.slice(prefix.length);if(token!==undefined)headers.set(${JSON.stringify(CSRF_HEADER)},token)}return nativeFetch(input,{...init,headers})};})();`;
-const MOBILE_AUTHENTICATED_TRANSPORT_BOOTSTRAP = `(()=>{if(window.__DSH_TRANSPORT__!==undefined)throw new Error('DSH Mobile cannot replace an existing transport override');window.__DSH_TRANSPORT__={fetch:(input,init)=>window.fetch(input,init),ownsHost:true}})();`;
+const MOBILE_AUTHENTICATED_TRANSPORT_BOOTSTRAP = `(()=>{if(window.__DSH_TRANSPORT__!==undefined)throw new Error('DSH Mobile cannot replace an existing transport override');window.__DSH_TRANSPORT__={fetch:(input,init)=>window.fetch(input,init),ownsHost:true},window.__DSH_FILE_UPLOAD__={fetch:(input,init)=>window.fetch(input,init)}})();`;
 /** Use this page's gateway health, rather than OS internet validation, for DSH reconnects. */
 const MOBILE_GATEWAY_REACHABILITY_BOOTSTRAP = `(()=>{
   const view=globalThis;
@@ -5085,14 +5084,14 @@ var MobileAccessGateway = class {
 		}
 	}
 	/** Loopback-only DSH WebServer route for opening pairing and managing devices. */
-	localAdminRoute(prefix = LOCAL_ADMIN_PREFIX) {
+	localAdminRoute(prefix = LOCAL_ADMIN_PREFIX, authenticateDesktop) {
 		return {
 			kind: "prefix",
 			path: prefix,
 			handler: async (request, response) => {
 				try {
 					const target = parseRequestTarget(request.url);
-					assertLocalAdminTrust(request, request.method === "POST");
+					assertLocalAdminTrust(request, request.method === "POST", () => authenticateDesktop?.(request) === true);
 					if (target.search !== "") throw new HttpError(400, "bad_request");
 					if (request.method === "GET" && target.decodedPathname === `${prefix}/status`) {
 						sendJson(response, 200, {
@@ -9509,6 +9508,10 @@ var TaskEventHub = class {
 };
 //#endregion
 //#region src/diagnostics.ts
+/** Recognize the active remote-web-ui boot hook without evaluating or modifying it. */
+function hasCompetingRemoteChannelBoot(rows) {
+	return rows.some((row) => row.kind === "script" && row.text?.includes("__DSH_REMOTE_CHANNEL_BOOT__") === true);
+}
 const REMOTE_ERROR_GUIDANCE = Object.freeze({
 	component_missing: "重新安装完整插件包。",
 	funnel_permission_required: "继续完成 Tailscale Funnel 授权。",
@@ -9903,6 +9906,7 @@ async function collectConnectionDiagnostics(snapshot, probes = {}) {
 	const remoteProbe = snapshot.remote.provider !== "origin" && snapshot.remote.running && snapshot.remote.state === "ready" && snapshot.remote.origin !== void 0 ? (probes.remote ?? defaultRemoteProbe)(snapshot.remote.origin) : Promise.resolve({ state: "not-applicable" });
 	const [firewall, remoteObservation] = await Promise.all([(probes.firewall ?? defaultFirewallProbe())(snapshot.lan.port), remoteProbe]);
 	checks.push(check("versions", "ok", "versions-current", "版本兼容", `插件 ${DSH_MOBILE_VERSION}，DSH ${snapshot.dshVersion}，Android App 最低 ${MINIMUM_ANDROID_APP_VERSION}。`));
+	if (snapshot.competingRemoteChannelBoot === true) checks.push(check("remote-plugin-conflict", "warning", "competing-remote-channel", "第三方远程插件", "检测到另一套远程请求通道脚本；手机页面可能进入该插件自己的配对流程。", "在电脑端关闭 dsh-remote-web-ui 的远程访问后刷新，再使用 DSH Mobile 当前二维码配对；不要混用两种配对码。"));
 	if (snapshot.lan.configured === false) checks.push(check("network", "error", "lan-setup-required", "局域网配置", "尚未完成局域网初始化。", "返回局域网页选择网卡并完成配置。"));
 	else if (snapshot.lan.networkError !== void 0) checks.push(check("network", "error", "network-unavailable", "局域网网卡", "已保存的网卡当前不可用。", "重新运行 dsh-mobile setup。"));
 	else if (snapshot.lan.configuredInterface !== void 0) {
@@ -11851,6 +11855,87 @@ async function regularFile(file, expectedBytes) {
 		throw error;
 	}
 }
+async function installStep(code, operation) {
+	try {
+		return await operation();
+	} catch (error) {
+		if (error instanceof Error && error.message.startsWith("cpolar_")) throw error;
+		throw new Error(code, { cause: error });
+	}
+}
+async function pathExists(path) {
+	try {
+		await lstat(path);
+		return true;
+	} catch (error) {
+		if (error.code === "ENOENT") return false;
+		throw error;
+	}
+}
+/** Replace only this version's verified binary, retaining the previous directory until promotion succeeds. */
+async function publishVerifiedCpolarExecutable(extracted, componentRoot, componentStorage, executableName, operations = {}) {
+	if (dirname(componentStorage) !== componentRoot || !inside(componentRoot, componentStorage) || basename(executableName) !== executableName || executableName === "." || executableName === "..") throw new Error("cpolar component storage escaped its private root");
+	const move = operations.move ?? rename;
+	const remove = operations.remove ?? ((path) => rm(path, {
+		recursive: true,
+		force: true
+	}));
+	const candidate = join(componentRoot, `.install-${randomBytes(12).toString("hex")}`);
+	const backup = join(componentRoot, `.previous-${randomBytes(12).toString("hex")}`);
+	let backupContainsPrevious = false;
+	let replacementInstalled = false;
+	try {
+		await mkdir(candidate, {
+			recursive: true,
+			mode: 448
+		});
+		await copyFile(extracted, join(candidate, executableName));
+		await chmod(join(candidate, executableName), 448);
+		if (await pathExists(componentStorage)) {
+			await move(componentStorage, backup);
+			backupContainsPrevious = true;
+		}
+		try {
+			await move(candidate, componentStorage);
+			replacementInstalled = true;
+		} catch (error) {
+			if (backupContainsPrevious) try {
+				await move(backup, componentStorage);
+				backupContainsPrevious = false;
+			} catch (rollbackError) {
+				process.emitWarning(`cpolar previous component remains at ${backup}; automatic rollback failed`, { code: "DSH_MOBILE_CPOLAR_ROLLBACK_FAILED" });
+				throw new Error("cpolar_storage_failed", { cause: new AggregateError([error, rollbackError]) });
+			}
+			throw error;
+		}
+	} finally {
+		try {
+			await remove(candidate);
+		} catch {
+			process.emitWarning(`cpolar temporary component remains at ${candidate}; cleanup failed`, { code: "DSH_MOBILE_CPOLAR_CLEANUP_FAILED" });
+		}
+		if (replacementInstalled && backupContainsPrevious) try {
+			await remove(backup);
+		} catch {
+			process.emitWarning(`cpolar previous component remains at ${backup}; cleanup failed`, { code: "DSH_MOBILE_CPOLAR_CLEANUP_FAILED" });
+		}
+	}
+}
+/** Remove only this install's staging directory without replacing a preceding failure. */
+async function cleanupCpolarInstallStaging(staging, installFailed, remove = (path) => rm(path, {
+	recursive: true,
+	force: true
+})) {
+	try {
+		await remove(staging);
+	} catch (error) {
+		if (installFailed) {
+			process.emitWarning(`cpolar staging directory remains at ${staging}; cleanup failed`, { code: "DSH_MOBILE_CPOLAR_CLEANUP_FAILED" });
+			return;
+		}
+		throw new Error("cpolar_storage_failed", { cause: error });
+	}
+}
 async function run(file, args) {
 	await new Promise((resolveRun, reject) => {
 		execFile(file, [...args], {
@@ -12005,11 +12090,14 @@ var CpolarComponentManager = class {
 		return this.enqueue(async () => {
 			const release = this.release;
 			if (release === void 0) throw new Error("cpolar_component_unsupported");
-			await mkdir(this.stagingRoot, {
-				recursive: true,
-				mode: 448
+			const staging = await installStep("cpolar_storage_failed", async () => {
+				await mkdir(this.stagingRoot, {
+					recursive: true,
+					mode: 448
+				});
+				return mkdtemp(join(this.stagingRoot, "install-"));
 			});
-			const staging = await mkdtemp(join(this.stagingRoot, "install-"));
+			let installFailed = false;
 			try {
 				const controller = new AbortController();
 				const timeout = setTimeout(() => {
@@ -12018,38 +12106,35 @@ var CpolarComponentManager = class {
 				timeout.unref();
 				let bytes;
 				try {
-					bytes = await this.fetchArtifact(release.downloadUrl, controller.signal);
+					bytes = await installStep("cpolar_download_failed", () => this.fetchArtifact(release.downloadUrl, controller.signal));
+				} catch (error) {
+					if (controller.signal.aborted) throw new Error("cpolar_download_timeout", { cause: error });
+					throw error;
 				} finally {
 					clearTimeout(timeout);
 				}
 				if (createHash("sha256").update(bytes).digest("hex") !== release.downloadSha256) throw new Error("cpolar_download_hash_mismatch");
 				const archive = join(staging, release.archiveKind === "tar.gz" ? "cpolar.tar.gz" : "cpolar.zip");
-				await writeFile(archive, bytes, {
+				await installStep("cpolar_storage_failed", () => writeFile(archive, bytes, {
 					flag: "wx",
 					mode: 384
-				});
-				await this.extractArtifact(archive, staging);
+				}));
+				await installStep("cpolar_extract_failed", () => this.extractArtifact(archive, staging));
 				const extracted = join(staging, release.executableName);
-				if (!await regularFile(extracted, release.executableBytes) || await sha256(extracted) !== release.executableSha256) throw new Error("cpolar_executable_hash_mismatch");
-				const candidate = join(this.componentRoot, `.install-${randomBytes(12).toString("hex")}`);
-				await mkdir(candidate, {
-					recursive: true,
-					mode: 448
-				});
-				await copyFile(extracted, join(candidate, release.executableName));
-				await chmod(join(candidate, release.executableName), 448);
-				await rm(this.componentStorage, {
-					recursive: true,
-					force: true
-				});
-				await rename(candidate, this.componentStorage);
+				if (!await installStep("cpolar_extract_failed", async () => await regularFile(extracted, release.executableBytes) && await sha256(extracted) === release.executableSha256)) throw new Error("cpolar_executable_hash_mismatch");
+				await installStep("cpolar_storage_failed", () => publishVerifiedCpolarExecutable(extracted, this.componentRoot, this.componentStorage, release.executableName));
 				this.installed = true;
 				this.errorCode = void 0;
+			} catch (error) {
+				installFailed = true;
+				try {
+					this.installed = await regularFile(this.executable, release.executableBytes) && await sha256(this.executable) === release.executableSha256;
+				} catch (_inspectionError) {
+					this.installed = false;
+				}
+				throw error;
 			} finally {
-				await rm(staging, {
-					recursive: true,
-					force: true
-				});
+				await cleanupCpolarInstallStaging(staging, installFailed);
 			}
 		});
 	}
@@ -13223,6 +13308,7 @@ async function apply(ctx, config) {
 		} : void 0;
 		return collectConnectionDiagnostics({
 			dshVersion,
+			competingRemoteChannelBoot: hasCompetingRemoteChannelBoot(ctx.webServer.collectIndexInjections?.() ?? []),
 			lan: {
 				configured: loaded.kind !== "unconfigured" || preparedLanSetup !== void 0,
 				running: lanController.isRunning(),
@@ -13246,13 +13332,17 @@ async function apply(ctx, config) {
 			}
 		}, pinnedFrpProbe === void 0 ? {} : { remote: pinnedFrpProbe });
 	};
+	const authenticateDesktopAdmin = (request) => {
+		const connection = ctx.connection;
+		return typeof connection?.requestRejection === "function" && connection.requestRejection(request) === void 0;
+	};
 	const adminRoute = {
 		kind: "prefix",
 		path: LOCAL_ADMIN_PREFIX,
 		handler: async (request, response) => {
 			try {
 				const target = parseRequestTarget(request.url);
-				assertLocalAdminTrust(request, request.method === "POST");
+				assertLocalAdminTrust(request, request.method === "POST", () => authenticateDesktopAdmin(request));
 				if (target.search !== "") throw new HttpError(400, "bad_request");
 				const lanControl = target.decodedPathname === `/api/mobile-access/control` || target.decodedPathname === `/api/mobile-access/lan/control`;
 				if (request.method === "GET" && lanControl) {
@@ -13341,7 +13431,15 @@ async function apply(ctx, config) {
 				}
 				if (request.method === "POST" && target.decodedPathname === `/api/mobile-access/remote/cpolar/component/install`) {
 					if ((await readJsonObject(request, 4096)).confirm !== true) throw new HttpError(400, "bad_request");
-					await remoteProviders.mutate(async () => cpolarComponent.install());
+					logger.info("cpolar component install started");
+					try {
+						await remoteProviders.mutate(async () => cpolarComponent.install());
+						logger.info("cpolar component install completed");
+					} catch (error) {
+						const cause = error instanceof Error && error.cause instanceof Error ? error.cause : void 0;
+						logger.error("cpolar component install failed: %s%s", error instanceof Error ? error.stack ?? error.message : String(error), cause === void 0 ? "" : `; cause: ${cause.message}`);
+						throw error;
+					}
 					sendJson(response, 200, remotePayload(), false);
 					return;
 				}
@@ -13584,18 +13682,18 @@ async function apply(ctx, config) {
 				if (target.decodedPathname.startsWith(`/api/mobile-access/remote/`)) {
 					const active = remoteController().gateway();
 					if (active === void 0) throw new HttpError(409, "gateway_stopped");
-					await active.localAdminRoute(`${LOCAL_ADMIN_PREFIX}/remote`).handler(request, response);
+					await active.localAdminRoute(`${LOCAL_ADMIN_PREFIX}/remote`, authenticateDesktopAdmin).handler(request, response);
 					return;
 				}
 				if (target.decodedPathname.startsWith(`/api/mobile-access/lan/`)) {
 					const active = lanGateway;
 					if (active === void 0) throw new HttpError(409, "gateway_stopped");
-					await active.localAdminRoute(`${LOCAL_ADMIN_PREFIX}/lan`).handler(request, response);
+					await active.localAdminRoute(`${LOCAL_ADMIN_PREFIX}/lan`, authenticateDesktopAdmin).handler(request, response);
 					return;
 				}
 				const active = lanGateway;
 				if (active === void 0) throw new HttpError(409, "gateway_stopped");
-				await active.localAdminRoute().handler(request, response);
+				await active.localAdminRoute(LOCAL_ADMIN_PREFIX, authenticateDesktopAdmin).handler(request, response);
 			} catch (error) {
 				const mapped = mapAdminError(error);
 				if (response.headersSent) response.destroy();