@morlay/dsh-desktop-host 0.0.1-alpha.5 → 0.0.1-alpha.7

package/lib/webserver.js

@@ -1,7 +1,7 @@
 import { EventEmitter } from "node:events";
+import { Readable } from "node:stream";
 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
 /**

package/lib/wire.js

@@ -1,3 +1,4 @@
+import { StringDecoder } from "node:string_decoder";
 //#region src/wire.ts
 /**
 * 桌面 host 与 Electron 壳之间的字节管道协议：请求帧（壳 → host，FD 3）与响应帧（host → 壳，FD 4）。
@@ -8,6 +9,20 @@
 const DESKTOP_HOST_PROTOCOL_VERSION = 1;
 /** 桌面流的宿主路径：页面/主进程都用它（两侧共享一份，避免路径写两处）。 */
 const DESKTOP_STREAM_PATH = "/.dsh/remote-stream";
+/**
+* 桌面流请求体的首行：定下这条逻辑流的 endpoint 与 payload，后续行都是上行项
+* （客户端 → 宿主；`$events` 这类宿主自己的流被上游释放，不会读到它们）。
+*/
+function encodeDesktopStreamOpen(endpoint, payload) {
+	return `${JSON.stringify({
+		endpoint,
+		payload
+	})}\n`;
+}
+/** 桌面流请求体里的一道上行项。 */
+function encodeDesktopStreamItem(item) {
+	return `${JSON.stringify(item)}\n`;
+}
 /** 壳写请求帧的管道描述符。 */
 const DESKTOP_REQUEST_PIPE_FD = 3;
 /** host 写响应帧的管道描述符。 */
@@ -105,6 +120,47 @@ function parseJson(payload, subject) {
 function assertEmpty(payload, subject) {
 	if (payload.byteLength !== 0) throw new Error(`dsh desktop: ${subject} frame carried a payload`);
 }
+/**
+* 增量解码桌面流请求体：按行取 JSON，首行是 `open`（endpoint / payload），后续每行是一道上行项。
+* 字节边界可能切开多字节字符，所以先过 `StringDecoder` 再切行。
+*/
+var DesktopStreamBodyDecoder = class {
+	text = new StringDecoder("utf8");
+	buffer = "";
+	/** 追加字节并返回所有已完整的行的解析值（空行忽略）。 */
+	push(chunk) {
+		this.buffer += this.text.write(Buffer.from(chunk));
+		return this.take(false);
+	}
+	/** 请求体结束：交付末行（没有换行收尾时也存在）。 */
+	finish() {
+		this.buffer += this.text.end();
+		return this.take(true);
+	}
+	take(last) {
+		const values = [];
+		for (;;) {
+			const at = this.buffer.indexOf("\n");
+			if (at === -1) {
+				if (!last) return values;
+				const tail = this.buffer;
+				this.buffer = "";
+				if (tail.trim() !== "") values.push(parseStreamLine(tail));
+				return values;
+			}
+			const line = this.buffer.slice(0, at);
+			this.buffer = this.buffer.slice(at + 1);
+			if (line.trim() !== "") values.push(parseStreamLine(line));
+		}
+	}
+};
+function parseStreamLine(line) {
+	try {
+		return JSON.parse(line);
+	} catch (error) {
+		throw new Error(`dsh desktop: stream body line is not JSON: ${error instanceof Error ? error.message : String(error)}`);
+	}
+}
 /** 增量解码 host 侧从请求管道收到的请求帧。 */
 var DesktopHostRequestDecoder = class {
 	buffer = Buffer.alloc(0);
@@ -234,7 +290,7 @@ var DesktopHostResponseDecoder = class {
 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";
+	if (value.type === "fatal") return typeof value.message === "string" && (value.diagnostic === void 0 || typeof value.diagnostic === "string");
 	return false;
 }
 /** IPC 命令校验（host 侧）。 */
@@ -242,4 +298,4 @@ 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 };
+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, DesktopStreamBodyDecoder, encodeDesktopRequestCancel, encodeDesktopRequestData, encodeDesktopRequestEnd, encodeDesktopRequestStart, encodeDesktopResponseData, encodeDesktopResponseEnd, encodeDesktopResponseError, encodeDesktopResponseStart, encodeDesktopStreamItem, encodeDesktopStreamOpen, isDesktopHostCommand, isDesktopHostEvent };

package/locale/en.json

@@ -0,0 +1,6 @@
+{
+  "meta": {
+    "title": "Desktop Host",
+    "description": "Desktop host process: boots the desktop profile and serves it through an in-process, portless webServer over byte pipes."
+  }
+}

package/locale/zh.json

@@ -0,0 +1,6 @@
+{
+  "meta": {
+    "title": "桌面宿主进程",
+    "description": "桌面部署的 host 进程：按 desktop profile 装配，经字节管道交给宿主内无端口的 webServer。"
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/dsh-desktop-host",
-  "version": "0.0.1-alpha.5",
+  "version": "0.0.1-alpha.7",
   "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",
@@ -16,41 +16,31 @@
     "url": "https://github.com/morlay/dsh-plugin.git"
   },
   "files": [
+    "locale/*.json",
     "lib",
     "config/desktop.cordis.patch.yml"
   ],
   "type": "module",
   "main": "./lib/index.js",
   "exports": {
-    ".": {
-      "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"
+    "./locale/*.json": "./locale/*.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-host-webserver": "0.1.6-alpha.2",
-    "@deepseek-ai/schemastery": "3.18.2"
+    "@deepseek-ai/dsh": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-app-boot": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-home-paths": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-host-webserver": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-tool-workspace-dependencies": "0.1.7-alpha.2",
+    "@deepseek-ai/schemastery": "3.18.4"
   },
   "devDependencies": {
-    "@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",
+    "@deepseek-ai/cordis": "4.0.4",
+    "@deepseek-ai/dsh-api-gateway": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-client-connection": "0.1.7-alpha.2",
     "@types/node": "^26.5.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "4.0.2"
+    "@deepseek-ai/cordis": "4.0.4"
   },
   "engines": {
     "node": ">=24.11.0"