@linxin666/dsh-remote-web-ui 0.2.7 → 0.2.9

package/lib/index.js

@@ -14,7 +14,7 @@ import http, { request } from "node:http";
 import { connect } from "node:net";
 import { Tunnel, bin, install } from "cloudflared";
 import { spawn } from "node:child_process";
-//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-settings@0.1.1-rc.1_@deepseek-ai+cordis@4.0.1_@deepseek-ai+dsh-brand@0_8fb97b2935e1a5982886bc1738874e4d/node_modules/@deepseek-ai/dsh-settings/lib/index.js
+//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-settings@0.1.1-rc.2_@deepseek-ai+cordis@4.0.1_@deepseek-ai+dsh-brand@0_02aaf429ec98c58247037e2222c17a8f/node_modules/@deepseek-ai/dsh-settings/lib/index.js
 /**
 * Structural secret redaction for settings values. `role('secret')` fields are
 * removed from a value before it crosses a wire boundary; a sidecar records
@@ -975,7 +975,8 @@ var PairingEventsStream = class {
 * @returns the exact routes to register on webServer.
 */
 function makeRoutes(deps) {
-	const { service, lanAddresses } = deps;
+	const { service, lanAddresses, requirePairingForLan = true } = deps;
+	const pairingRequired = () => typeof requirePairingForLan === "function" ? requirePairingForLan() : requirePairingForLan;
 	const events = new PairingEventsStream(service);
 	/** Loopback-only fence: the desktop panel's control endpoints. */
 	const loopbackFence = (req) => isTrustedApiRequest(req, []);
@@ -1182,14 +1183,16 @@ function makeRoutes(deps) {
 		const paired = deviceId !== void 0 && service.hasDevice(deviceId);
 		const snapshot = service.snapshot();
 		const { devices: _devices, ...rest } = snapshot;
+		const visible = paired ? rest : {
+			phase: snapshot.phase,
+			lanAvailable: snapshot.lanAvailable,
+			lanAddresses: snapshot.lanAddresses
+		};
 		writeJson(res, 200, {
 			ok: true,
 			paired,
-			...paired ? rest : {
-				phase: snapshot.phase,
-				lanAvailable: snapshot.lanAvailable,
-				lanAddresses: snapshot.lanAddresses
-			}
+			requirePairingForLan: pairingRequired(),
+			...visible
 		});
 	};
 	const handleEvents = (req, res) => {
@@ -1986,17 +1989,19 @@ function loopbackOnlyDenial(innerPath) {
 }
 /**
 * Build the remote desktop channel HTTP routes.
-* @param deps - pairing service + local port.
+* @param deps - pairing service + local port + live pairing policy.
 * @returns the routes to register on webServer.
 */
 function makeRemoteApiRoutes(deps) {
-	const { service, port } = deps;
+	const { service, port, requirePairingForLan = true } = deps;
 	const handler = (req, res) => {
-		const deviceId = readCookie(req.headers.cookie, service.config.cookieName);
-		if (!(deviceId !== void 0 && service.touchDevice(deviceId))) {
-			req.resume();
-			envelopeError(res, 403, "invalid-request", "unpaired", "this device is not paired with the desktop");
-			return;
+		if (typeof requirePairingForLan === "function" ? requirePairingForLan() : requirePairingForLan) {
+			const deviceId = readCookie(req.headers.cookie, service.config.cookieName);
+			if (!(deviceId !== void 0 && service.touchDevice(deviceId))) {
+				req.resume();
+				envelopeError(res, 403, "invalid-request", "unpaired", "this device is not paired with the desktop");
+				return;
+			}
 		}
 		const method = req.method ?? "GET";
 		if (!ALLOWED_METHODS.has(method)) {
@@ -2043,17 +2048,19 @@ function upgradeInnerPath(reqUrl, fallbackPath) {
 /**
 * Build the WebSocket upgrade routes for the event streams and known plugin
 * sockets. webServer matches upgrades by exact path.
-* @param deps - pairing service + local port.
+* @param deps - pairing service + local port + live pairing policy.
 * @returns the upgrade routes to register on webServer.
 */
 function makeRemoteApiUpgradeRoutes(deps) {
-	const { service, port } = deps;
+	const { service, port, requirePairingForLan = true } = deps;
 	const handlerFor = (fallbackPath) => (req, socket, head) => {
-		const deviceId = readCookie(req.headers.cookie, service.config.cookieName);
-		if (deviceId === void 0 || !service.touchDevice(deviceId)) {
-			socket.write("HTTP/1.1 403 Forbidden\r\nConnection: close\r\n\r\n");
-			socket.destroy();
-			return;
+		if (typeof requirePairingForLan === "function" ? requirePairingForLan() : requirePairingForLan) {
+			const deviceId = readCookie(req.headers.cookie, service.config.cookieName);
+			if (deviceId === void 0 || !service.touchDevice(deviceId)) {
+				socket.write("HTTP/1.1 403 Forbidden\r\nConnection: close\r\n\r\n");
+				socket.destroy();
+				return;
+			}
 		}
 		const inner = upgradeInnerPath(req.url, fallbackPath);
 		if (loopbackOnlyDenial(inner.split("?")[0] ?? inner) !== void 0) {
@@ -3184,7 +3191,8 @@ function applyImpl(ctx, config) {
 	const routes = [
 		...makeRoutes({
 			service,
-			lanAddresses
+			lanAddresses,
+			requirePairingForLan: () => resolve().requirePairingForLan
 		}),
 		...makeMobileRoutes(),
 		...apiProxy !== void 0 ? makeMobileApiRoutes({
@@ -3194,13 +3202,15 @@ function applyImpl(ctx, config) {
 		}) : [],
 		...makeRemoteApiRoutes({
 			service,
-			port: ctx.webServer.port
+			port: ctx.webServer.port,
+			requirePairingForLan: () => resolve().requirePairingForLan
 		}),
 		...updateRoutes
 	];
 	const upgrades = makeRemoteApiUpgradeRoutes({
 		service,
-		port: ctx.webServer.port
+		port: ctx.webServer.port,
+		requirePairingForLan: () => resolve().requirePairingForLan
 	});
 	const gate = makeGateListener(service, () => resolve().requirePairingForLan, () => resolve().enabled);
 	ctx.effect(() => ctx.on("api/gate", gate), "remote-web-ui: api gate");

package/lib/mobile.js

@@ -11962,7 +11962,7 @@ function superRefine(fn, params) {
 	return /* @__PURE__ */ _superRefine(fn, params);
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-host-apiproxy@0.1.1-rc.1_220c5e0fb3d45fbbe711d0f1a490a443/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/rpc.schema.js
+//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-host-apiproxy@0.1.1-rc.2_73bb34f881f3291b26a2607af4c34648/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/rpc.schema.js
 /**
 * Message-layer zod schemas: the four wire full forms + error body +
 * carrier receipt. The payload slot is unknown in the full-form schemas — business payloads
@@ -12271,7 +12271,7 @@ union([object({ accepted: literal(true) }), object({
 	reason: union([literal("not-pending"), literal("bad-response")])
 })]);
 //#endregion
-//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-host-apiproxy@0.1.1-rc.1_220c5e0fb3d45fbbe711d0f1a490a443/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/session-search.js
+//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-host-apiproxy@0.1.1-rc.2_73bb34f881f3291b26a2607af4c34648/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/session-search.js
 /**
 * Return the longest prefix containing at most `maximum` Unicode code points.
 * @param value - text to bound.
@@ -12289,7 +12289,7 @@ function truncateUnicodeCodePoints(value, maximum) {
 	return value;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-host-apiproxy@0.1.1-rc.1_220c5e0fb3d45fbbe711d0f1a490a443/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/sessions.schema.js
+//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-host-apiproxy@0.1.1-rc.2_73bb34f881f3291b26a2607af4c34648/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/sessions.schema.js
 /**
 * sessions domain zod schemas (names derived from map keys: sessionListRequestSchema /
 * sessionListValueSchema). SessionEvent passthrough = strict envelope (type/seq/time) + wide
@@ -12343,9 +12343,8 @@ object({
 	workspaceId: workspaceIdSchema.optional(),
 	cwd: string().optional(),
 	sessionId: sessionIdSchema.optional(),
-	agentPreset: string().optional(),
-	reuseWorkspaceBlank: literal(true).optional()
-}).refine((payload) => payload.workspaceId === void 0 || payload.cwd === void 0, { message: "session.create accepts workspaceId or cwd, not both" }).refine((payload) => payload.reuseWorkspaceBlank !== true || payload.workspaceId !== void 0 && payload.sessionId !== void 0, { message: "session.create reuseWorkspaceBlank requires workspaceId and sessionId" });
+	agentPreset: string().optional()
+}).refine((payload) => payload.workspaceId === void 0 || payload.cwd === void 0, { message: "session.create accepts workspaceId or cwd, not both" });
 object({
 	sessionId: sessionIdSchema,
 	agentPreset: string().optional()
@@ -12527,7 +12526,7 @@ object({ accepted: literal(true) });
 object({ sessionId: sessionIdSchema });
 object({ accepted: literal(true) });
 //#endregion
-//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-host-apiproxy@0.1.1-rc.1_220c5e0fb3d45fbbe711d0f1a490a443/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/approvals.schema.js
+//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-host-apiproxy@0.1.1-rc.2_73bb34f881f3291b26a2607af4c34648/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/approvals.schema.js
 /**
 * approvals domain zod schemas (respond is a client-response; the payload schema serves
 * the /api/respond endpoint's second parse after routing via the pending table).
@@ -12561,7 +12560,7 @@ const taskViewSchema = object({
 	finishedAt: number().int().nonnegative().optional()
 });
 //#endregion
-//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-host-apiproxy@0.1.1-rc.1_220c5e0fb3d45fbbe711d0f1a490a443/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/workspace.schema.js
+//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-host-apiproxy@0.1.1-rc.2_73bb34f881f3291b26a2607af4c34648/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/workspace.schema.js
 /**
 * workspace domain zod schemas (names derived from map keys). The
 * WorkspaceId brand cast lives in sessions.schema (see the note there) and
@@ -12607,7 +12606,7 @@ object({ workspace: workspaceViewSchema });
 object({ sessionId: sessionIdSchema });
 object({ archivedSessionIds: array(sessionIdSchema) });
 //#endregion
-//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-host-apiproxy@0.1.1-rc.1_220c5e0fb3d45fbbe711d0f1a490a443/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/events.schema.js
+//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-host-apiproxy@0.1.1-rc.2_73bb34f881f3291b26a2607af4c34648/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/events.schema.js
 /**
 * events domain zod schemas: MuxFrame / HostFrame unions (discriminatedUnion('type')).
 * A frame is the payload slot of the ServerRequest full form; the SessionEvent inside
@@ -12771,6 +12770,8 @@ function browserSource(url) {
 }
 const DEFAULT_POLL_INTERVAL_MS = 3e3;
 const DEFAULT_STALL_THRESHOLD_MS = 12e3;
+const LIVE_SSE_STALL_MULTIPLIER = 3;
+const MAX_POLL_BACKOFF_MS = 6e4;
 /**
 * Stall-check granularity: the single scheduler tick runs at least this
 * often so fallback arms within a second of the stall threshold passing,
@@ -12801,8 +12802,8 @@ var MuxClient = class {
 	lastDataAt = 0;
 	/**
 	* Whether the SSE channel has ever delivered a frame in this stream (a
-	* delivered frame proves the tunnel forwards SSE; silence alone then means
-	* the agent idle, not a dead channel — only an onerror re-arms fallback).
+	* delivered frame proves the tunnel can forward SSE; sustained silence may
+	* still mean a suspended mobile tunnel, so polling re-arms after 3 windows).
 	*/
 	sseAlive = false;
 	/** Per-session highest event seq already emitted, for poll dedup. */
@@ -12812,6 +12813,8 @@ var MuxClient = class {
 	polling = false;
 	/** Epoch ms of the next due poll while polling (kept on the same tick timer). */
 	nextPollAt = 0;
+	/** Adaptive delay: productive polls reset it; empty/error polls add one base interval up to one minute. */
+	pollDelayMs;
 	/**
 	* @param url - the mobile events endpoint (browser-relative).
 	* @param options - seams.
@@ -12821,6 +12824,7 @@ var MuxClient = class {
 		this.sourceFactory = options.sourceFactory ?? browserSource;
 		this.pollLatest = options.pollLatest ?? ((sessionId) => history(sessionId, void 0, DEFAULT_POLL_PAGE_SIZE));
 		this.pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
+		this.pollDelayMs = this.pollIntervalMs;
 		this.stallThresholdMs = options.stallThresholdMs ?? DEFAULT_STALL_THRESHOLD_MS;
 		this.now = options.now ?? (() => Date.now());
 	}
@@ -12858,7 +12862,7 @@ var MuxClient = class {
 			this.stopPolling();
 			return;
 		}
-		if (!this.polling && !this.stopped && !this.sseAlive && this.now() - this.lastDataAt > this.stallThresholdMs) this.startPolling();
+		if (!this.polling && !this.stopped && this.isSseStalled()) this.startPolling();
 	}
 	connect() {
 		this.sseAlive = false;
@@ -12900,22 +12904,28 @@ var MuxClient = class {
 		if (this.observeSessionId === void 0) return;
 		if (this.polling) {
 			if (this.now() >= this.nextPollAt) {
-				this.nextPollAt = this.now() + this.pollIntervalMs;
+				this.nextPollAt = Number.POSITIVE_INFINITY;
 				this.pollTick();
 			}
 			return;
 		}
-		if (this.sseAlive) return;
-		if (this.now() - this.lastDataAt > this.stallThresholdMs) this.startPolling();
+		if (this.isSseStalled()) this.startPolling();
+	}
+	isSseStalled() {
+		const windowMs = this.sseAlive ? this.stallThresholdMs * LIVE_SSE_STALL_MULTIPLIER : this.stallThresholdMs;
+		return this.now() - this.lastDataAt > windowMs;
 	}
 	startPolling() {
 		if (this.polling || this.stopped) return;
 		this.polling = true;
-		this.nextPollAt = this.now() + this.pollIntervalMs;
+		this.pollDelayMs = this.pollIntervalMs;
+		this.nextPollAt = Number.POSITIVE_INFINITY;
 		this.pollTick();
 	}
 	stopPolling() {
 		this.polling = false;
+		this.pollDelayMs = this.pollIntervalMs;
+		this.nextPollAt = 0;
 	}
 	/**
 	* Fetch the latest history page for the observed session and re-emit any
@@ -12928,14 +12938,19 @@ var MuxClient = class {
 			this.stopPolling();
 			return;
 		}
+		let emitted = 0;
 		try {
 			const page = await this.pollLatest(sessionId);
 			let maxSeq = this.pollWatermark.get(sessionId) ?? -1;
-			for (const entry of page.events) {
+			const ordered = [...page.events].sort((left, right) => {
+				return (typeof left.event?.seq === "number" ? left.event.seq : -1) - (typeof right.event?.seq === "number" ? right.event.seq : -1);
+			});
+			for (const entry of ordered) {
 				const event = entry.event;
 				const seq = typeof event?.seq === "number" ? event.seq : -1;
 				if (seq <= maxSeq) continue;
 				maxSeq = seq;
+				emitted += 1;
 				this.emit({
 					type: "session/event",
 					sessionId,
@@ -12943,7 +12958,11 @@ var MuxClient = class {
 				});
 			}
 			this.pollWatermark.set(sessionId, maxSeq);
-		} catch {}
+		} catch {} finally {
+			if (emitted > 0) this.pollDelayMs = this.pollIntervalMs;
+			else this.pollDelayMs = Math.min(MAX_POLL_BACKOFF_MS, this.pollDelayMs + this.pollIntervalMs);
+			if (this.polling && this.observeSessionId === sessionId) this.nextPollAt = this.now() + this.pollDelayMs;
+		}
 	}
 	handleMessage(data) {
 		if (typeof data !== "string" || data === "") return;
@@ -13406,7 +13425,6 @@ function applyTurnEnd(state, event) {
 			...message,
 			...wasPending ? { pending: false } : {},
 			...failed ? { failed: true } : {},
-			seq: Math.max(message.seq, event.seq),
 			time: event.time
 		});
 	}
@@ -13475,12 +13493,12 @@ function snapshotOf(state) {
 	for (let index = 1; index < out.length; index += 1) {
 		const prev = out[index - 1];
 		const current = out[index];
-		if (prev.seq > current.seq || prev.seq === current.seq && prev.id >= current.id) {
+		if (prev.seq > current.seq) {
 			ordered = false;
 			break;
 		}
 	}
-	return ordered ? out : out.sort((a, b) => a.seq - b.seq || (a.id < b.id ? -1 : 1));
+	return ordered ? out : out.sort((a, b) => a.seq - b.seq);
 }
 //#endregion
 //#region src/mobile/markdown.ts