dsh-mobile 0.4.3 → 0.4.5

package/lib/index.d.mts

@@ -597,6 +597,7 @@ declare class MobileAccessGateway {
   private readonly upstreamAuthenticatedUrl?;
   private readonly extraWebSocketPaths?;
   private readonly blockedUpgradeLog?;
+  private readonly onDiscoveryDegraded?;
   readonly access: AccessController;
   private readonly listenerTlsEnabled;
   private readonly tlsEnabled;
@@ -611,6 +612,7 @@ declare class MobileAccessGateway {
    * it, "the phone cannot find this computer" has no diagnosable cause on the host.
    */
   private discoveryError;
+  private mdnsError;
   /** Names of the bundled mobile assets that could not be read, if any. */
   private mobileAssetError;
   private bonjour;
@@ -644,10 +646,13 @@ declare class MobileAccessGateway {
   private readonly probeLimiter;
   constructor(config: ResolvedGatewayConfig, store: DeviceStore, extensions?: MobileAccessService | undefined, upstreamAuthenticatedUrl?: string | undefined, extraWebSocketPaths?: {
     has(pathname: string): boolean;
-  } | undefined, blockedUpgradeLog?: BlockedUpgradePathLog | undefined);
+  } | undefined, blockedUpgradeLog?: BlockedUpgradePathLog | undefined, onDiscoveryDegraded?: ((source: 'broadcast' | 'mdns', code: string) => void) | undefined);
   /** Initialize durable state, validate TLS, and bind the externally reachable listener. */
   start(): Promise<void>;
   private startDiscovery;
+  private reportDiscoveryDegraded;
+  private recordBroadcastFailure;
+  private recordMdnsFailure;
   private discoveryAnnouncement;
   private closeFailedStart;
   private closeBonjour;
@@ -668,6 +673,7 @@ declare class MobileAccessGateway {
     readonly broadcast: boolean;
     readonly mdns: boolean;
     readonly errorCode?: string;
+    readonly mdnsErrorCode?: string;
     readonly mobileAssetsErrorCode?: string;
   };
   private requirePolicy;
@@ -1416,6 +1422,15 @@ declare class TaskEventHub {
 }
 //#endregion
 //#region src/plugin.d.ts
+declare module '@deepseek-ai/dsh-llm' {
+  interface MessageSourceMap {
+    'plugin:dsh-mobile': {
+      kind: 'plugin:dsh-mobile';
+      form: 'notice';
+      summary: string;
+    };
+  }
+}
 /** Stable Cordis plugin name. */
 declare const name = "dsh-mobile";
 /** The stock WebServer serves the control card; Connection authenticates the loopback DSH origin. */

package/lib/index.mjs

@@ -2451,6 +2451,16 @@ const MOBILE_BOOT_SIZE_PROBE_HEADER = "x-dsh-mobile-size-probe";
 const MAX_MOBILE_BOOT_BATCHES = 8;
 const MOBILE_BOOT_UPSTREAM_ATTEMPTS = 4;
 const MOBILE_BOOT_RETRY_DELAY_MS = 150;
+function upstreamPluginBundleUrl(source, upstreamOrigin) {
+	if (!source.startsWith("/plugins/") && !source.startsWith("plugins/") || source.includes("#")) return void 0;
+	try {
+		const target = new URL(source, new URL("/", upstreamOrigin));
+		if (target.origin !== upstreamOrigin.origin || !target.pathname.startsWith("/plugins/")) return void 0;
+		return target;
+	} catch {
+		return;
+	}
+}
 const TRANSIENT_UPSTREAM_ERROR_CODES = /* @__PURE__ */ new Set([
 	"EAI_AGAIN",
 	"ECONNABORTED",
@@ -2870,8 +2880,9 @@ function shouldCompressResponse(request, response) {
 	const pathname = request.url?.split("?", 1)[0] ?? "";
 	return (request.method === "GET" && (pathname.startsWith("/plugins/") || pathname.startsWith("/assets/")) || request.method === "POST" && pathname === SESSION_HISTORY_PATH) && response.statusCode === 200 && request.headers.range === void 0 && response.headers["content-range"] === void 0 && response.headers["content-encoding"] === void 0 && acceptsGzip(request.headers["accept-encoding"]) && isCompressibleContentType(response.headers["content-type"]);
 }
-function revisionedStaticCacheControl(request) {
+function revisionedStaticCacheControl(request, statusCode) {
 	if (request.method !== "GET" && request.method !== "HEAD") return void 0;
+	if (statusCode !== 200) return void 0;
 	let target;
 	try {
 		target = new URL(request.url ?? "/", "https://dsh-mobile.invalid");
@@ -2991,6 +3002,19 @@ function discoveryBroadcastTargets(cidrs) {
 	}
 	return [...targets];
 }
+/** Keep Node's upgrade-owned socket safe after the HTTP parser removes its listener. */
+function guardUpgradeSocket(socket) {
+	socket.on("error", () => {
+		if (!socket.destroyed) socket.destroy();
+	});
+}
+function discoveryFailure(error) {
+	const code = error instanceof Error && typeof error.code === "string" ? error.code : "unknown";
+	return Object.freeze({
+		code,
+		message: error instanceof Error ? error.message : String(error)
+	});
+}
 function extensionTarget(pathname) {
 	const prefix = `${AUTH_PREFIX}/extensions`;
 	if (pathname === prefix || pathname === `${prefix}/` || pathname === `${prefix}/manifest`) return { kind: "manifest" };
@@ -3088,6 +3112,7 @@ var MobileAccessGateway = class {
 	upstreamAuthenticatedUrl;
 	extraWebSocketPaths;
 	blockedUpgradeLog;
+	onDiscoveryDegraded;
 	access;
 	listenerTlsEnabled;
 	tlsEnabled;
@@ -3102,6 +3127,7 @@ var MobileAccessGateway = class {
 	* it, "the phone cannot find this computer" has no diagnosable cause on the host.
 	*/
 	discoveryError;
+	mdnsError;
 	/** Names of the bundled mobile assets that could not be read, if any. */
 	mobileAssetError;
 	bonjour;
@@ -3133,12 +3159,13 @@ var MobileAccessGateway = class {
 	removeExtensionContentListener;
 	renewLimiter;
 	probeLimiter;
-	constructor(config, store, extensions, upstreamAuthenticatedUrl, extraWebSocketPaths, blockedUpgradeLog) {
+	constructor(config, store, extensions, upstreamAuthenticatedUrl, extraWebSocketPaths, blockedUpgradeLog, onDiscoveryDegraded) {
 		this.config = config;
 		this.extensions = extensions;
 		this.upstreamAuthenticatedUrl = upstreamAuthenticatedUrl;
 		this.extraWebSocketPaths = extraWebSocketPaths;
 		this.blockedUpgradeLog = blockedUpgradeLog;
+		this.onDiscoveryDegraded = onDiscoveryDegraded;
 		this.listenerTlsEnabled = config.tls.mode === "provided";
 		this.tlsEnabled = config.publicTls;
 		this.access = new AccessController(store, {
@@ -3215,9 +3242,11 @@ var MobileAccessGateway = class {
 				socket.destroy();
 			});
 			server.on("upgrade", (request, socket, head) => {
-				this.handleUpgrade(request, socket, head).catch((error) => {
+				const client = socket;
+				guardUpgradeSocket(client);
+				this.handleUpgrade(request, client, head).catch((error) => {
 					const mapped = mapError(error);
-					rejectUpgrade(socket, mapped.status, mapped.code);
+					rejectUpgrade(client, mapped.status, mapped.code);
 				});
 			});
 			server.on("clientError", (_error, socket) => {
@@ -3252,33 +3281,56 @@ var MobileAccessGateway = class {
 		const socket = createSocket("udp4");
 		this.discoverySocket = socket;
 		const announcement = this.discoveryAnnouncement(port);
+		let binding = true;
+		socket.on("error", (error) => {
+			if (!binding) this.recordBroadcastFailure(error, true);
+		});
+		const sendAnnouncement = (targetPort, address) => {
+			if (this.closing || this.discoveryError !== void 0) return;
+			try {
+				socket.send(announcement, targetPort, address, (error) => {
+					if (error !== null) this.recordBroadcastFailure(error, true);
+				});
+			} catch (error) {
+				this.recordBroadcastFailure(error, true);
+			}
+		};
 		socket.on("message", (message, remote) => {
-			if (this.closing || !message.equals(DISCOVERY_QUERY) || !addressAllowed(remote.address, this.config.allowedCidrs)) return;
-			socket.send(announcement, remote.port, remote.address, () => void 0);
+			if (this.closing || this.discoveryError !== void 0 || !message.equals(DISCOVERY_QUERY) || !addressAllowed(remote.address, this.config.allowedCidrs)) return;
+			sendAnnouncement(remote.port, remote.address);
 		});
 		const bindHost = isIP(this.config.listenHost) === 4 && isLoopbackAddress(this.config.listenHost) ? this.config.listenHost : "0.0.0.0";
 		if (await new Promise((resolve) => {
 			const onBindError = (error) => {
 				socket.off("error", onBindError);
-				this.discoveryError = Object.freeze({
-					code: typeof error.code === "string" ? error.code : "unknown",
-					message: typeof error.message === "string" ? error.message : String(error)
-				});
+				this.recordBroadcastFailure(error, false);
 				resolve(false);
 			};
 			socket.once("error", onBindError);
-			socket.bind(port, bindHost, () => {
-				socket.off("error", onBindError);
-				socket.setBroadcast(true);
-				resolve(true);
-			});
-		})) {
+			try {
+				socket.bind(port, bindHost, () => {
+					socket.off("error", onBindError);
+					binding = false;
+					try {
+						socket.setBroadcast(true);
+						resolve(true);
+					} catch (error) {
+						this.recordBroadcastFailure(error, true);
+						resolve(false);
+					}
+				});
+			} catch (error) {
+				onBindError(error);
+			}
+		}) && this.discoveryError === void 0) {
 			const announce = () => {
-				for (const target of discoveryBroadcastTargets(this.config.allowedCidrs)) socket.send(announcement, port, target, () => void 0);
+				for (const target of discoveryBroadcastTargets(this.config.allowedCidrs)) sendAnnouncement(port, target);
 			};
 			announce();
-			this.discoveryTimer = setInterval(announce, DISCOVERY_INTERVAL_MS);
-			this.discoveryTimer.unref();
+			if (this.discoveryError === void 0) {
+				this.discoveryTimer = setInterval(announce, DISCOVERY_INTERVAL_MS);
+				this.discoveryTimer.unref();
+			}
 		} else {
 			this.discoverySocket = void 0;
 			try {
@@ -3286,8 +3338,12 @@ var MobileAccessGateway = class {
 			} catch {}
 		}
 		const deviceName = discoveryDeviceName();
-		const bonjour = new Bonjour({ disableIPv6: true });
+		const onMdnsError = (error) => {
+			this.recordMdnsFailure(error);
+		};
+		const bonjour = new Bonjour({ disableIPv6: true }, onMdnsError);
 		this.bonjour = bonjour;
+		bonjour.server.mdns.on("error", onMdnsError);
 		bonjour.publish({
 			name: `${deviceName} (${this.config.instanceId.slice(0, 8)})`,
 			type: MDNS_SERVICE_TYPE,
@@ -3303,6 +3359,25 @@ var MobileAccessGateway = class {
 			}
 		});
 	}
+	reportDiscoveryDegraded(source, code) {
+		try {
+			this.onDiscoveryDegraded?.(source, code);
+		} catch (error) {
+			process.emitWarning(`DSH Mobile could not log ${source} discovery error: ${String(error)}`, { code: "DSH_MOBILE_DISCOVERY_LOG_FAILED" });
+		}
+	}
+	recordBroadcastFailure(error, notify) {
+		if (this.closing || this.discoveryError !== void 0) return;
+		this.discoveryError = discoveryFailure(error);
+		if (this.discoveryTimer !== void 0) clearInterval(this.discoveryTimer);
+		this.discoveryTimer = void 0;
+		if (notify) this.reportDiscoveryDegraded("broadcast", this.discoveryError.code);
+	}
+	recordMdnsFailure(error) {
+		if (this.closing || this.mdnsError !== void 0) return;
+		this.mdnsError = discoveryFailure(error);
+		this.reportDiscoveryDegraded("mdns", this.mdnsError.code);
+	}
 	discoveryAnnouncement(port) {
 		return Buffer.from(JSON.stringify({
 			deviceName: discoveryDeviceName(),
@@ -3360,8 +3435,9 @@ var MobileAccessGateway = class {
 	discoveryStatus() {
 		return Object.freeze({
 			broadcast: this.discoverySocket !== void 0 && this.discoveryTimer !== void 0,
-			mdns: this.bonjour !== void 0,
+			mdns: this.bonjour !== void 0 && this.mdnsError === void 0,
 			...this.discoveryError === void 0 ? {} : { errorCode: `discovery_broadcast_${this.discoveryError.code}` },
+			...this.mdnsError === void 0 ? {} : { mdnsErrorCode: `discovery_mdns_${this.mdnsError.code}` },
 			...this.mobileAssetError === void 0 ? {} : { mobileAssetsErrorCode: this.mobileAssetError }
 		});
 	}
@@ -4061,7 +4137,7 @@ var MobileAccessGateway = class {
 	async resolveMobileBootSizes(planEntries) {
 		const sizes = /* @__PURE__ */ new Map();
 		const passThrough = /* @__PURE__ */ new Set();
-		const candidates = planEntries.filter((entry) => entry.id !== MOBILE_LAYOUT_MODULE && entry.url.startsWith("/plugins/"));
+		const candidates = planEntries.filter((entry) => entry.id !== MOBILE_LAYOUT_MODULE && upstreamPluginBundleUrl(entry.url, this.config.upstreamOrigin) !== void 0);
 		let cursor = 0;
 		const worker = async () => {
 			while (cursor < candidates.length) {
@@ -4085,11 +4161,10 @@ var MobileAccessGateway = class {
 	* cached for a short window.
 	*/
 	async upstreamBundleSize(source) {
-		if (!source.startsWith("/plugins/") || source.includes("#")) return void 0;
+		const target = upstreamPluginBundleUrl(source, this.config.upstreamOrigin);
+		if (target === void 0) return void 0;
 		const cached = this.bootEntrySizeCache.get(source);
 		if (cached !== void 0 && Date.now() - cached.at < MOBILE_BOOT_SIZE_CACHE_TTL_MS) return cached.size;
-		const target = new URL(source, this.config.upstreamOrigin);
-		if (target.origin !== this.config.upstreamOrigin.origin) return void 0;
 		const upstreamCookie = await this.upstreamCookieHeader();
 		let upstreamRequest;
 		try {
@@ -4255,9 +4330,8 @@ var MobileAccessGateway = class {
 	}
 	async readUpstreamClientBundle(source, signal) {
 		signal.throwIfAborted();
-		if (!source.startsWith("/plugins/") || source.includes("#")) throw new HttpError(502, "upstream_unavailable");
-		const target = new URL(source, this.config.upstreamOrigin);
-		if (target.origin !== this.config.upstreamOrigin.origin) throw new HttpError(502, "upstream_unavailable");
+		const target = upstreamPluginBundleUrl(source, this.config.upstreamOrigin);
+		if (target === void 0) throw new HttpError(502, "upstream_unavailable");
 		let upstreamRequest;
 		const aborted = () => {
 			upstreamRequest?.destroy(/* @__PURE__ */ new Error("request aborted"));
@@ -4403,7 +4477,8 @@ var MobileAccessGateway = class {
 			});
 			setSecurityHeaders(response, this.tlsEnabled, "proxied");
 			const headers = sanitizeResponseHeaders(proxied.headers, this.config.upstreamOrigin);
-			const cacheControl = revisionedStaticCacheControl(request$2);
+			const statusCode = proxied.statusCode ?? 502;
+			const cacheControl = revisionedStaticCacheControl(request$2, statusCode);
 			if (cacheControl !== void 0) headers["cache-control"] = cacheControl;
 			const compressed = shouldCompressResponse(request$2, proxied);
 			if (compressed) {
@@ -4413,7 +4488,7 @@ var MobileAccessGateway = class {
 				headers["content-encoding"] = "gzip";
 				addVaryAcceptEncoding(headers);
 			}
-			response.writeHead(proxied.statusCode ?? 502, headers);
+			response.writeHead(statusCode, headers);
 			await Promise.all([bodyDone, compressed ? pipeline(proxied, createGzip(), response) : pipeline(proxied, response)]);
 		} catch (error) {
 			holder.request?.destroy();
@@ -4623,6 +4698,7 @@ var MobileAccessGateway = class {
 		const authorization = this.authorize(request);
 		if (this.activeWebSockets.size >= this.config.maxWebSockets) throw new HttpError(429, "busy");
 		const upstreamCookie = await this.upstreamCookieHeader();
+		if (client.destroyed) return;
 		const upstream = connect({
 			host: stripIpv6Brackets(this.config.upstreamOrigin.hostname),
 			port: Number(this.config.upstreamOrigin.port)
@@ -6721,10 +6797,23 @@ async function attemptDownload(request) {
 	});
 	const response = first.status >= 300 && first.status < 400 ? await followValidatedRedirect(first, request) : first;
 	if (!response.ok) throw new Error(`${request.errorPrefix}_download_http_${String(response.status)}`);
-	const declared = Number(response.headers.get("content-length"));
-	if (Number.isFinite(declared) && declared !== request.expectedBytes) throw new Error(`${request.errorPrefix}_download_size_mismatch`);
-	const bytes = new Uint8Array(await response.arrayBuffer());
-	if (bytes.byteLength !== request.expectedBytes) throw new Error(`${request.errorPrefix}_download_size_mismatch`);
+	const contentLength = response.headers.get("content-length");
+	if (contentLength !== null && (!/^\d+$/u.test(contentLength) || Number(contentLength) !== request.expectedBytes)) throw new Error(`${request.errorPrefix}_download_size_mismatch`);
+	if (response.body === null) throw new Error(`${request.errorPrefix}_download_size_mismatch`);
+	const bytes = new Uint8Array(request.expectedBytes);
+	const reader = response.body.getReader();
+	let received = 0;
+	while (true) {
+		const chunk = await reader.read();
+		if (chunk.done) break;
+		if (chunk.value.byteLength > bytes.byteLength - received) {
+			await reader.cancel();
+			throw new Error(`${request.errorPrefix}_download_size_mismatch`);
+		}
+		bytes.set(chunk.value, received);
+		received += chunk.value.byteLength;
+	}
+	if (received !== request.expectedBytes) throw new Error(`${request.errorPrefix}_download_size_mismatch`);
 	return bytes;
 }
 /**
@@ -11312,7 +11401,9 @@ async function apply(ctx, config) {
 			...candidateConfig,
 			upstreamOrigin: template.upstreamOrigin.origin
 		});
-		const candidate = new MobileAccessGateway(resolved, new JsonDeviceStore(resolved.stateFile, resolved.maxDevices), mobileAccess, upstreamLoginUrl, webSocketPaths, blockedUpgradePaths);
+		const candidate = new MobileAccessGateway(resolved, new JsonDeviceStore(resolved.stateFile, resolved.maxDevices), mobileAccess, upstreamLoginUrl, webSocketPaths, blockedUpgradePaths, (source, code) => {
+			logger.warn("%s discovery degraded while DSH remains available: %s", source, code);
+		});
 		await candidate.start();
 		lanGateway = candidate;
 		const removeTaskSink = taskEventHub.add(candidate);
@@ -11854,8 +11945,7 @@ async function apply(ctx, config) {
 						text: `${guide}\n\n用户需求：${task}`
 					}],
 					source: {
-						kind: "plugin",
-						plugin: "dsh-mobile",
+						kind: "plugin:dsh-mobile",
 						form: "notice",
 						summary: boundContextSummary(`/mobile ${task}`)
 					}