@morlay/dsh-desktop-host 0.0.1-alpha.2 → 0.0.1-alpha.4

package/lib/webserver.js

@@ -0,0 +1,264 @@
+import { EventEmitter } from "node:events";
+import { Service } from "@deepseek-ai/cordis";
+import z from "@deepseek-ai/schemastery";
+import { Readable } from "node:stream";
+import { renderIndexInjections } from "@deepseek-ai/dsh-host-webserver";
+//#region src/webserver.ts
+/**
+* 桌面形态的 `webServer` 服务：与上游同名的路由载体，但不监听任何端口。
+*
+* 上游 `@deepseek-ai/dsh-host-webserver` 在激活时 `listen`。桌面宿主自己拥有页面，
+* 没有网络入口，于是这里保留同一份服务面（register / registerFallback / registerUpgrade /
+* tapIndex / renderIndex / collectIndexInjections / port / host），把请求由 `dispatch`
+* 从字节管道直接喂进来。
+*/
+function deferred() {
+	let resolve;
+	return {
+		promise: new Promise((settle) => {
+			resolve = settle;
+		}),
+		resolve
+	};
+}
+/** 由 handler 写出的 node 风格响应：写出头部即对外可见，`end` 收尾响应体流。 */
+var SyntheticResponse = class extends EventEmitter {
+	statusCode = 200;
+	statusMessage = "";
+	headersSent = false;
+	writableEnded = false;
+	destroyed = false;
+	/** 上游中间件按 `res.socket === undefined` 识别「没有真实连接」。 */
+	socket = void 0;
+	body;
+	started;
+	done;
+	startSettle;
+	doneSettle;
+	headers = new Headers();
+	controller;
+	startedValue;
+	constructor() {
+		super();
+		this.startSettle = deferred();
+		this.doneSettle = deferred();
+		this.started = this.startSettle.promise;
+		this.done = this.doneSettle.promise;
+		this.body = new ReadableStream({
+			start: (controller) => {
+				this.controller = controller;
+			},
+			cancel: () => {
+				this.destroy();
+			}
+		});
+	}
+	setHeader(name, value) {
+		this.headers.set(name, Array.isArray(value) ? value.join(", ") : String(value));
+	}
+	getHeader(name) {
+		return this.headers.get(name);
+	}
+	getHeaders() {
+		return new Headers(this.headers);
+	}
+	removeHeader(name) {
+		this.headers.delete(name);
+	}
+	getHeaderNames() {
+		return [...this.headers.keys()];
+	}
+	writeHead(status, headers) {
+		this.statusCode = status;
+		if (headers !== void 0) for (const [name, value] of Object.entries(headers)) this.setHeader(name, value);
+		this.settleStart();
+		return this;
+	}
+	write(chunk) {
+		if (this.writableEnded) throw new Error("dsh desktop: response already ended");
+		this.settleStart();
+		if (!this.destroyed) this.controller.enqueue(toBytes(chunk));
+		return true;
+	}
+	end(chunk) {
+		if (this.writableEnded) return this;
+		this.settleStart();
+		if (chunk !== void 0 && !this.destroyed) this.controller.enqueue(toBytes(chunk));
+		this.writableEnded = true;
+		if (!this.destroyed) this.controller.close();
+		this.doneSettle.resolve();
+		this.emit("finish");
+		this.emit("close");
+		return this;
+	}
+	destroy(error) {
+		if (this.destroyed) return this;
+		this.destroyed = true;
+		if (!this.writableEnded) {
+			this.settleStart(500);
+			this.controller.error(error ?? /* @__PURE__ */ new Error("dsh desktop: response destroyed"));
+			this.doneSettle.resolve();
+		}
+		this.emit("close");
+		return this;
+	}
+	/** handler 抛错：未写头时以 500 收场，已写头则中断响应体。 */
+	fail(error) {
+		if (this.destroyed) return;
+		if (!this.headersSent) {
+			this.statusCode = 500;
+			this.settleStart();
+			this.writableEnded = true;
+			this.controller.enqueue(new TextEncoder().encode(errorMessage(error)));
+			this.controller.close();
+			this.doneSettle.resolve();
+			return;
+		}
+		this.destroy(error instanceof Error ? error : new Error(String(error)));
+	}
+	settleStart(forcedStatus) {
+		if (this.startedValue !== void 0) return;
+		this.headersSent = true;
+		if (forcedStatus !== void 0) this.statusCode = forcedStatus;
+		this.startedValue = {
+			status: this.statusCode,
+			headers: new Headers(this.headers)
+		};
+		this.startSettle.resolve(this.startedValue);
+	}
+};
+function toBytes(chunk) {
+	return typeof chunk === "string" ? new TextEncoder().encode(chunk) : chunk;
+}
+function errorMessage(error) {
+	return error instanceof Error ? error.message : String(error);
+}
+/** 把一条 Fetch 请求合成 node 风格的 req/res，供注册在这些表上的 handler 使用。 */
+function createRequest(request, url) {
+	const stream = Readable.from(request.body === null ? [] : consume(request.body));
+	const headers = {};
+	for (const [name, value] of request.headers) headers[name.toLowerCase()] = value;
+	return Object.assign(stream, {
+		url: `${url.pathname}${url.search}`,
+		method: request.method,
+		headers,
+		httpVersion: "1.1",
+		httpVersionMajor: 1,
+		httpVersionMinor: 1,
+		complete: false,
+		aborted: false
+	});
+}
+async function* consume(body) {
+	const reader = body.getReader();
+	try {
+		for (;;) {
+			const next = await reader.read();
+			if (next.done) return;
+			yield next.value;
+		}
+	} finally {
+		reader.releaseLock();
+	}
+}
+var PortlessWebServer = class extends Service {
+	config;
+	static Config = z.object({
+		host: z.union([z.const("127.0.0.1"), z.const("0.0.0.0")]).default("127.0.0.1"),
+		port: z.natural().max(65535).default(0)
+	});
+	exact = /* @__PURE__ */ new Map();
+	prefixes = /* @__PURE__ */ new Map();
+	upgrades = /* @__PURE__ */ new Map();
+	indexTaps = [];
+	fallback;
+	constructor(ctx, config) {
+		super(ctx, "webServer");
+		this.config = config;
+	}
+	/** 没有真实监听：报配置值（缺省 0），只用于拼展示用 URL。 */
+	get port() {
+		return this.config.port ?? 0;
+	}
+	get host() {
+		return this.config.host ?? "127.0.0.1";
+	}
+	register(route) {
+		const table = route.kind === "exact" ? this.exact : this.prefixes;
+		if (table.has(route.path)) throw new Error(`webserver: duplicate ${route.kind} route "${route.path}"`);
+		table.set(route.path, route);
+		return () => {
+			table.delete(route.path);
+		};
+	}
+	registerUpgrade(route) {
+		if (this.upgrades.has(route.path)) throw new Error(`webserver: duplicate upgrade route "${route.path}"`);
+		this.upgrades.set(route.path, route);
+		return () => {
+			this.upgrades.delete(route.path);
+		};
+	}
+	registerFallback(handler) {
+		if (this.fallback !== void 0) throw new Error("webserver: fallback already registered");
+		this.fallback = handler;
+		return () => {
+			this.fallback = void 0;
+		};
+	}
+	tapIndex(transform) {
+		this.indexTaps.push(transform);
+		return () => {
+			const at = this.indexTaps.indexOf(transform);
+			if (at !== -1) this.indexTaps.splice(at, 1);
+		};
+	}
+	applyIndexTaps(html) {
+		let out = html;
+		for (const transform of this.indexTaps) out = transform(out);
+		return out;
+	}
+	collectIndexInjections() {
+		const table = [];
+		this.ctx.emit("webserver/index-inject", table);
+		return table;
+	}
+	renderIndex(html) {
+		return this.applyIndexTaps(renderIndexInjections(html, this.collectIndexInjections()));
+	}
+	/** 把一条管道请求分派给注册表；没有匹配也没有 fallback 时回 404。 */
+	async dispatch(request) {
+		const url = new URL(request.url);
+		let pathname;
+		try {
+			pathname = decodeURIComponent(url.pathname);
+		} catch {
+			return new Response(null, { status: 400 });
+		}
+		const handler = this.match(pathname)?.handler ?? this.fallback;
+		if (process.env.DSH_DESKTOP_DEBUG === "1") console.error(`[dsh-desktop] dispatch ${request.method} ${pathname} → ${handler === void 0 ? "404" : "handler"}`);
+		if (handler === void 0) return new Response("not found", { status: 404 });
+		const response = new SyntheticResponse();
+		const req = createRequest(request, url);
+		Promise.resolve().then(() => handler(req, response)).catch((error) => {
+			this.ctx.logger.warn(error instanceof Error ? error : new Error(errorMessage(error)));
+			response.fail(error);
+		});
+		const started = await response.started;
+		return new Response(response.body, {
+			status: started.status,
+			headers: started.headers
+		});
+	}
+	match(pathname) {
+		const exact = this.exact.get(pathname);
+		if (exact !== void 0) return exact;
+		let best;
+		for (const [prefix, route] of this.prefixes) {
+			if (pathname !== prefix && !pathname.startsWith(`${prefix}/`)) continue;
+			if (best === void 0 || prefix.length > best.path.length) best = route;
+		}
+		return best;
+	}
+};
+//#endregion
+export { PortlessWebServer, PortlessWebServer as default };

package/lib/wire.js

@@ -0,0 +1,245 @@
+//#region src/wire.ts
+/**
+* 桌面 host 与 Electron 壳之间的字节管道协议：请求帧（壳 → host，FD 3）与响应帧（host → 壳，FD 4）。
+*
+* 帧头 13 字节：magic(4) | type(1) | streamId(4) | payloadLength(4)。data 帧是原始字节，
+* 其余帧是 JSON 或空载荷。两侧共用这一份实现，避免编解码各写一遍。
+*/
+const DESKTOP_HOST_PROTOCOL_VERSION = 1;
+/** 桌面流的宿主路径：页面/主进程都用它（两侧共享一份，避免路径写两处）。 */
+const DESKTOP_STREAM_PATH = "/.dsh/remote-stream";
+/** 壳写请求帧的管道描述符。 */
+const DESKTOP_REQUEST_PIPE_FD = 3;
+/** host 写响应帧的管道描述符。 */
+const DESKTOP_RESPONSE_PIPE_FD = 4;
+/** Node 生命周期 IPC 通道的描述符（ready / fatal / shutdown）。 */
+const DESKTOP_CONTROL_IPC_FD = 5;
+/** 单个 data 帧携带的最大原始字节数。 */
+const DESKTOP_PIPE_CHUNK_BYTES = 65536;
+const FRAME_MAGIC = 1146308659;
+const FRAME_HEADER_BYTES = 13;
+const MAX_CONTROL_PAYLOAD_BYTES = 1048576;
+const REQUEST_FRAME_START = 1;
+const REQUEST_FRAME_DATA = 2;
+const REQUEST_FRAME_END = 3;
+const REQUEST_FRAME_CANCEL = 4;
+const RESPONSE_FRAME_START = 1;
+const RESPONSE_FRAME_DATA = 2;
+const RESPONSE_FRAME_END = 3;
+const RESPONSE_FRAME_ERROR = 4;
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isHeaders(value) {
+	return Array.isArray(value) && value.every((header) => Array.isArray(header) && header.length === 2 && typeof header[0] === "string" && typeof header[1] === "string");
+}
+function assertStreamId(streamId) {
+	if (!Number.isInteger(streamId) || streamId < 1 || streamId > 4294967295) throw new Error(`dsh desktop: invalid pipe stream id ${String(streamId)}`);
+}
+function encodeFrame(type, streamId, payload, dataType, direction) {
+	assertStreamId(streamId);
+	const limit = type === dataType ? DESKTOP_PIPE_CHUNK_BYTES : MAX_CONTROL_PAYLOAD_BYTES;
+	if (payload.byteLength > limit) throw new Error(`dsh desktop: ${direction} pipe frame exceeds the ${String(limit)}-byte limit`);
+	const frame = Buffer.allocUnsafe(FRAME_HEADER_BYTES + payload.byteLength);
+	frame.writeUInt32BE(FRAME_MAGIC, 0);
+	frame.writeUInt8(type, 4);
+	frame.writeUInt32BE(streamId, 5);
+	frame.writeUInt32BE(payload.byteLength, 9);
+	payload.copy(frame, FRAME_HEADER_BYTES);
+	return frame;
+}
+function jsonPayload(type, streamId, value, dataType, direction) {
+	return encodeFrame(type, streamId, Buffer.from(JSON.stringify(value), "utf8"), dataType, direction);
+}
+/** 编码开启一个请求流的元数据帧（壳侧）。 */
+function encodeDesktopRequestStart(streamId, request) {
+	return jsonPayload(REQUEST_FRAME_START, streamId, request, REQUEST_FRAME_DATA, "request");
+}
+/** 编码一个受限的请求体原始分片（壳侧）。 */
+function encodeDesktopRequestData(streamId, data) {
+	return encodeFrame(REQUEST_FRAME_DATA, streamId, Buffer.from(data), REQUEST_FRAME_DATA, "request");
+}
+/** 编码请求体正常结束（壳侧）。 */
+function encodeDesktopRequestEnd(streamId) {
+	return encodeFrame(REQUEST_FRAME_END, streamId, Buffer.alloc(0), REQUEST_FRAME_DATA, "request");
+}
+/** 编码取消一个请求及其响应（壳侧）。 */
+function encodeDesktopRequestCancel(streamId) {
+	return encodeFrame(REQUEST_FRAME_CANCEL, streamId, Buffer.alloc(0), REQUEST_FRAME_DATA, "request");
+}
+/** 编码响应元数据帧（host 侧）。 */
+function encodeDesktopResponseStart(streamId, response) {
+	return jsonPayload(RESPONSE_FRAME_START, streamId, response, RESPONSE_FRAME_DATA, "response");
+}
+/** 编码一个受限的响应体原始分片（host 侧）。 */
+function encodeDesktopResponseData(streamId, data) {
+	return encodeFrame(RESPONSE_FRAME_DATA, streamId, Buffer.from(data), RESPONSE_FRAME_DATA, "response");
+}
+/** 编码响应正常结束（host 侧）。 */
+function encodeDesktopResponseEnd(streamId) {
+	return encodeFrame(RESPONSE_FRAME_END, streamId, Buffer.alloc(0), RESPONSE_FRAME_DATA, "response");
+}
+/** 编码一次响应失败，不把 Error 对象跨进程传递（host 侧）。 */
+function encodeDesktopResponseError(streamId, message) {
+	return jsonPayload(RESPONSE_FRAME_ERROR, streamId, { message }, RESPONSE_FRAME_DATA, "response");
+}
+function frameLength(buffer, dataType, direction) {
+	if (buffer.byteLength < FRAME_HEADER_BYTES) return void 0;
+	if (buffer.readUInt32BE(0) !== FRAME_MAGIC) throw new Error(`dsh desktop: invalid ${direction} frame marker`);
+	const type = buffer.readUInt8(4);
+	const streamId = buffer.readUInt32BE(5);
+	const payloadLength = buffer.readUInt32BE(9);
+	assertStreamId(streamId);
+	const limit = type === dataType ? DESKTOP_PIPE_CHUNK_BYTES : MAX_CONTROL_PAYLOAD_BYTES;
+	if (payloadLength > limit) throw new Error(`dsh desktop: ${direction} frame exceeds the ${String(limit)}-byte limit`);
+	const total = FRAME_HEADER_BYTES + payloadLength;
+	return buffer.byteLength < total ? void 0 : total;
+}
+function parseJson(payload, subject) {
+	try {
+		return JSON.parse(payload.toString("utf8"));
+	} catch (error) {
+		throw new Error(`dsh desktop: ${subject} payload is not JSON: ${error instanceof Error ? error.message : String(error)}`);
+	}
+}
+function assertEmpty(payload, subject) {
+	if (payload.byteLength !== 0) throw new Error(`dsh desktop: ${subject} frame carried a payload`);
+}
+/** 增量解码 host 侧从请求管道收到的请求帧。 */
+var DesktopHostRequestDecoder = class {
+	buffer = Buffer.alloc(0);
+	/** 追加字节并返回所有已完整的请求帧。 */
+	push(chunk) {
+		this.buffer = this.buffer.byteLength === 0 ? chunk : Buffer.concat([this.buffer, chunk]);
+		const frames = [];
+		for (;;) {
+			const frame = this.next();
+			if (frame === void 0) return frames;
+			frames.push(frame);
+		}
+	}
+	/** EOF 落在帧中间时报错。 */
+	finish() {
+		if (this.buffer.byteLength !== 0) throw new Error("dsh desktop: request pipe ended inside a frame");
+	}
+	next() {
+		const total = frameLength(this.buffer, REQUEST_FRAME_DATA, "request");
+		if (total === void 0) return void 0;
+		const type = this.buffer.readUInt8(4);
+		const streamId = this.buffer.readUInt32BE(5);
+		const payload = this.buffer.subarray(FRAME_HEADER_BYTES, total);
+		this.buffer = this.buffer.subarray(total);
+		switch (type) {
+			case REQUEST_FRAME_START: return {
+				type: "start",
+				streamId,
+				...this.parseStart(payload)
+			};
+			case REQUEST_FRAME_DATA: return {
+				type: "data",
+				streamId,
+				data: Buffer.from(payload)
+			};
+			case REQUEST_FRAME_END:
+				assertEmpty(payload, "request end");
+				return {
+					type: "end",
+					streamId
+				};
+			case REQUEST_FRAME_CANCEL:
+				assertEmpty(payload, "request cancel");
+				return {
+					type: "cancel",
+					streamId
+				};
+			default: throw new Error(`dsh desktop: unknown request frame type ${String(type)}`);
+		}
+	}
+	parseStart(payload) {
+		const value = parseJson(payload, "request start");
+		if (!isRecord(value) || typeof value.url !== "string" || typeof value.method !== "string" || !isHeaders(value.headers) || typeof value.hasBody !== "boolean") throw new Error("dsh desktop: invalid request start payload");
+		return {
+			url: value.url,
+			method: value.method,
+			headers: value.headers,
+			hasBody: value.hasBody
+		};
+	}
+};
+/** 增量解码壳侧从响应管道收到的响应帧。 */
+var DesktopHostResponseDecoder = class {
+	buffer = Buffer.alloc(0);
+	/** 追加字节并返回所有已完整的响应帧。 */
+	push(chunk) {
+		this.buffer = this.buffer.byteLength === 0 ? chunk : Buffer.concat([this.buffer, chunk]);
+		const frames = [];
+		for (;;) {
+			const frame = this.next();
+			if (frame === void 0) return frames;
+			frames.push(frame);
+		}
+	}
+	/** EOF 落在帧中间时报错。 */
+	finish() {
+		if (this.buffer.byteLength !== 0) throw new Error("dsh desktop: response pipe ended inside a frame");
+	}
+	next() {
+		const total = frameLength(this.buffer, RESPONSE_FRAME_DATA, "response");
+		if (total === void 0) return void 0;
+		const type = this.buffer.readUInt8(4);
+		const streamId = this.buffer.readUInt32BE(5);
+		const payload = this.buffer.subarray(FRAME_HEADER_BYTES, total);
+		this.buffer = this.buffer.subarray(total);
+		switch (type) {
+			case RESPONSE_FRAME_START: return {
+				type: "start",
+				streamId,
+				...this.parseStart(payload)
+			};
+			case RESPONSE_FRAME_DATA: return {
+				type: "data",
+				streamId,
+				data: Buffer.from(payload)
+			};
+			case RESPONSE_FRAME_END:
+				assertEmpty(payload, "response end");
+				return {
+					type: "end",
+					streamId
+				};
+			case RESPONSE_FRAME_ERROR: return {
+				type: "error",
+				streamId,
+				...this.parseError(payload)
+			};
+			default: throw new Error(`dsh desktop: unknown response frame type ${String(type)}`);
+		}
+	}
+	parseStart(payload) {
+		const value = parseJson(payload, "response start");
+		if (!isRecord(value) || !Number.isInteger(value.status) || value.status < 100 || value.status > 599 || !isHeaders(value.headers) || typeof value.hasBody !== "boolean") throw new Error("dsh desktop: invalid response start payload");
+		return {
+			status: value.status,
+			headers: value.headers,
+			hasBody: value.hasBody
+		};
+	}
+	parseError(payload) {
+		const value = parseJson(payload, "response error");
+		if (!isRecord(value) || typeof value.message !== "string") throw new Error("dsh desktop: invalid response error payload");
+		return { message: value.message };
+	}
+};
+/** IPC 事件校验（壳侧）。 */
+function isDesktopHostEvent(value) {
+	if (!isRecord(value)) return false;
+	if (value.type === "ready") return value.protocolVersion === 1;
+	if (value.type === "fatal") return typeof value.message === "string";
+	return false;
+}
+/** IPC 命令校验（host 侧）。 */
+function isDesktopHostCommand(value) {
+	return isRecord(value) && value.type === "shutdown";
+}
+//#endregion
+export { DESKTOP_CONTROL_IPC_FD, DESKTOP_HOST_PROTOCOL_VERSION, DESKTOP_PIPE_CHUNK_BYTES, DESKTOP_REQUEST_PIPE_FD, DESKTOP_RESPONSE_PIPE_FD, DESKTOP_STREAM_PATH, DesktopHostRequestDecoder, DesktopHostResponseDecoder, encodeDesktopRequestCancel, encodeDesktopRequestData, encodeDesktopRequestEnd, encodeDesktopRequestStart, encodeDesktopResponseData, encodeDesktopResponseEnd, encodeDesktopResponseError, encodeDesktopResponseStart, isDesktopHostCommand, isDesktopHostEvent };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@morlay/dsh-desktop-host",
-  "version": "0.0.1-alpha.2",
-  "description": "Desktop host process for dsh-desktopify: boots the Web application as the desktop profile and reports its URL to the Electron shell over IPC — upstream apps/desktop-host with the Office skill mount removed.",
+  "version": "0.0.1-alpha.4",
+  "description": "Desktop host process for dsh-desktopify: boots the desktop profile and serves it through an in-process, portless webServer over byte pipes — upstream apps/desktop-host with the web carrier taken over and the Office skill mount removed.",
   "keywords": [
     "desktop",
     "dsh",
@@ -16,27 +16,41 @@
     "url": "https://github.com/morlay/dsh-plugin.git"
   },
   "files": [
-    "lib"
+    "lib",
+    "config/desktop.cordis.patch.yml"
   ],
   "type": "module",
   "main": "./lib/index.js",
   "exports": {
-    ".": "./lib/index.js",
+    ".": {
+      "types": "./src/index.ts",
+      "default": "./lib/index.js"
+    },
+    "./webserver": {
+      "types": "./src/webserver.ts",
+      "default": "./lib/webserver.js"
+    },
+    "./wire": {
+      "types": "./src/wire.ts",
+      "default": "./lib/wire.js"
+    },
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@deepseek-ai/dsh": "^0.1.6-alpha.2",
-    "@deepseek-ai/dsh-app-boot": "^0.1.6-alpha.2",
-    "@deepseek-ai/dsh-home-paths": "^0.1.6-alpha.2"
+    "@deepseek-ai/dsh": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-app-boot": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-home-paths": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-host-webserver": "0.1.6-alpha.2",
+    "@deepseek-ai/schemastery": "3.18.2"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-client-connection": "^0.1.6-alpha.2",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.6-alpha.2",
+    "@deepseek-ai/cordis": "4.0.2",
+    "@deepseek-ai/dsh-api-gateway": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-connection": "0.1.6-alpha.2",
     "@types/node": "^26.5.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.2"
+    "@deepseek-ai/cordis": "4.0.2"
   },
   "engines": {
     "node": ">=24.11.0"