dsh-mobile 0.4.4 → 0.4.5

package/lib/index.d.mts

@@ -1422,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,12 @@ 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({
@@ -3225,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) => {
@@ -4118,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) {
@@ -4142,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 {
@@ -4312,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"));
@@ -4460,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) {
@@ -4470,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();
@@ -4680,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)
@@ -11926,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}`)
 					}