dsh-mobile 0.3.5 → 0.3.7

package/lib/index.mjs

@@ -6,13 +6,13 @@ import z from "@deepseek-ai/schemastery";
 import { connect, createServer, isIP } from "node:net";
 import { chmod, copyFile, lstat, mkdir, mkdtemp, opendir, readFile, readdir, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
 import { execFile, spawn } from "node:child_process";
-import { promisify } from "node:util";
 import { createSocket } from "node:dgram";
 import { homedir, hostname, networkInterfaces } from "node:os";
 import { createServer as createServer$1, request } from "node:http";
 import { createServer as createServer$2 } from "node:https";
 import { Transform, finished } from "node:stream";
 import { pipeline } from "node:stream/promises";
+import { promisify } from "node:util";
 import { createGzip, gzip } from "node:zlib";
 import Bonjour from "bonjour-service";
 import * as QRCode from "qrcode";
@@ -703,41 +703,50 @@ function parseGatewayConfig(raw) {
 	});
 }
 //#endregion
-//#region src/compatibility.ts
-/** DeepSeek Harness prereleases verified by this plugin release. */
-const SUPPORTED_DSH_VERSIONS = Object.freeze([
-	"0.1.0-rc.5",
-	"0.1.0-rc.6",
-	"0.1.0-rc.7",
-	"0.1.1-rc.2",
-	"0.1.2-alpha.1",
-	"0.1.2-alpha.2"
-]);
-/**
-* Reject an unverified DeepSeek Harness Host before opening the LAN listener.
-* @param version - Version reported by the installed DSH WebServer package.
-*/
-function assertSupportedDshVersion(version) {
-	if (typeof version === "string" && SUPPORTED_DSH_VERSIONS.some((candidate) => candidate === version)) return;
-	throw new Error(`unsupported DeepSeek Harness version ${typeof version === "string" ? version : "(unknown)"}; supported versions: ${SUPPORTED_DSH_VERSIONS.join(", ")}`);
+//#region src/exec-file.ts
+/** Capture both output streams even when a desktop host wraps execFile without Node's promisify metadata. */
+function execFileText(file, args, options = {}) {
+	return new Promise((resolve, reject) => {
+		execFile(file, [...args], {
+			windowsHide: true,
+			...options,
+			encoding: "utf8"
+		}, (error, stdout, stderr) => {
+			if (error !== null) {
+				reject(error);
+				return;
+			}
+			if (typeof stdout !== "string" || typeof stderr !== "string") {
+				reject(/* @__PURE__ */ new Error("subprocess returned invalid text output"));
+				return;
+			}
+			resolve({
+				stdout,
+				stderr
+			});
+		});
+	});
 }
 //#endregion
 //#region src/private-file.ts
-const execFile$3 = promisify(execFile);
 let userSidTask;
 async function currentWindowsUserSid() {
-	userSidTask ??= execFile$3("whoami.exe", [
+	userSidTask ??= execFileText("whoami.exe", [
 		"/user",
 		"/fo",
 		"csv",
 		"/nh"
 	], {
 		encoding: "utf8",
-		windowsHide: true
+		windowsHide: true,
+		timeout: 1e4
 	}).then(({ stdout }) => {
 		const match = /,"(S-\d(?:-\d+)+)"\s*$/u.exec(stdout.trim());
 		if (match?.[1] === void 0) throw new Error("unable to resolve the current Windows user SID");
 		return match[1];
+	}).catch((error) => {
+		userSidTask = void 0;
+		throw error;
 	});
 	return userSidTask;
 }
@@ -745,12 +754,11 @@ async function currentWindowsUserSid() {
 async function restrictPrivateFile(file, mode = 384) {
 	await chmod(file, mode);
 	if (process.platform !== "win32") return;
-	const userSid = await currentWindowsUserSid();
-	await execFile$3("icacls.exe", [
+	await execFileText("icacls.exe", [
 		file,
 		"/inheritance:r",
 		"/grant:r",
-		`*${userSid}:(F)`,
+		`*${await currentWindowsUserSid()}:(F)`,
 		"*S-1-5-18:(F)",
 		"*S-1-5-32-544:(F)",
 		"/remove:g",
@@ -759,7 +767,8 @@ async function restrictPrivateFile(file, mode = 384) {
 		"*S-1-5-32-545"
 	], {
 		encoding: "utf8",
-		windowsHide: true
+		windowsHide: true,
+		timeout: 1e4
 	});
 }
 //#endregion
@@ -5364,7 +5373,6 @@ var FrpController = class {
 };
 //#endregion
 //#region src/diagnostics.ts
-const execFile$2 = promisify(execFile);
 const REMOTE_ERROR_GUIDANCE = Object.freeze({
 	component_missing: "重新安装完整插件包。",
 	funnel_permission_required: "继续完成 Tailscale Funnel 授权。",
@@ -5453,7 +5461,7 @@ function defaultFirewallProbe(platform = process.platform) {
 			"if ($ready) { 'ready' } else { 'missing' }"
 		].join("; ");
 		try {
-			return { state: (await execFile$2("powershell.exe", [
+			return { state: (await execFileText("powershell.exe", [
 				"-NoProfile",
 				"-NonInteractive",
 				"-Command",
@@ -6999,7 +7007,8 @@ var PluginReleaseManager = class {
 		});
 	}
 };
-promisify(execFile);
+//#endregion
+//#region src/managed-setup.ts
 const VIRTUAL_INTERFACE_MARKERS = [
 	"bridge",
 	"docker",
@@ -7227,9 +7236,14 @@ function upstreamAuthenticatedUrl(ctx, upstreamOrigin) {
 	return typeof connection?.authenticatedUrl === "function" ? connection.authenticatedUrl(upstreamOrigin.origin) : void 0;
 }
 function installedDshVersion() {
-	const manifest = createRequire(import.meta.url)("@deepseek-ai/dsh-host-webserver/package.json");
-	if (manifest === null || typeof manifest !== "object") return void 0;
-	return manifest.version;
+	try {
+		const manifest = createRequire(import.meta.url)("@deepseek-ai/dsh-host-webserver/package.json");
+		if (manifest === null || typeof manifest !== "object") return "unknown";
+		const version = manifest.version;
+		return typeof version === "string" && version !== "" ? version : "unknown";
+	} catch {
+		return "unknown";
+	}
 }
 function mapAdminError(error) {
 	if (error instanceof HttpError) return error;
@@ -7375,7 +7389,6 @@ function remoteControlPayload(provider, status, gateway, providerStatuses, cpola
 /** Mount the resident control route and its optional authenticated LAN gateway. */
 async function apply(ctx, config) {
 	const dshVersion = installedDshVersion();
-	assertSupportedDshVersion(dshVersion);
 	const loaded = await loadSetup(config);
 	const mobileAccess = createMobileAccessService(ctx);
 	const template = loopbackTemplate(loaded);
@@ -7755,6 +7768,6 @@ async function apply(ctx, config) {
 	}, "dsh-mobile: independent LAN and selectable remote providers with /mobile command");
 }
 //#endregion
-export { AUTH_PREFIX, AccessController, AccessError, BoundedRateLimiter, CSRF_COOKIE, CSRF_HEADER, Config, FRP_VHOST_HTTP_PORT as DEFAULT_VHOST_HTTP_PORT, FRP_VHOST_HTTP_PORT, DEVICE_COOKIE, EXTENSION_LIMITS, FRP_COMPONENT_RELEASES, FrpComponentManager, FrpConfigStore, FrpController, JsonDeviceStore, JsonMobileAccessControlStore, JsonRemoteProviderStore, LOCAL_ADMIN_PREFIX, MemoryDeviceStore, MobileAccessGateway, MobileAccessGatewayController, MobileAccessService, MobileExtensionError, RequestTrustPolicy, SESSION_COOKIE, SUPPORTED_DSH_VERSIONS, WS_PATHS, addressAllowed, apply, assertExtensionId, assertSupportedDshVersion, configuredRemoteProvider, createFrpServerTemplate, createFrpcToml, createMobileAccessService, createRestrictedFrpServerTemplate, inject, isLoopbackAddress, name, parseAuthority, parseCidr, parseControlFile, parseDeviceSnapshot, parseExtensionManifest, parseFrpSettings, parseGatewayConfig, parseMobileAccessControlState, parseRemoteProviderState, resolveAuthority, rewriteMobileIndex, validateFrpPublicOrigin, validateFrpServerAddress, validateFrpServerPort, validateFrpToken };
+export { AUTH_PREFIX, AccessController, AccessError, BoundedRateLimiter, CSRF_COOKIE, CSRF_HEADER, Config, FRP_VHOST_HTTP_PORT as DEFAULT_VHOST_HTTP_PORT, FRP_VHOST_HTTP_PORT, DEVICE_COOKIE, EXTENSION_LIMITS, FRP_COMPONENT_RELEASES, FrpComponentManager, FrpConfigStore, FrpController, JsonDeviceStore, JsonMobileAccessControlStore, JsonRemoteProviderStore, LOCAL_ADMIN_PREFIX, MemoryDeviceStore, MobileAccessGateway, MobileAccessGatewayController, MobileAccessService, MobileExtensionError, RequestTrustPolicy, SESSION_COOKIE, WS_PATHS, addressAllowed, apply, assertExtensionId, configuredRemoteProvider, createFrpServerTemplate, createFrpcToml, createMobileAccessService, createRestrictedFrpServerTemplate, inject, isLoopbackAddress, name, parseAuthority, parseCidr, parseControlFile, parseDeviceSnapshot, parseExtensionManifest, parseFrpSettings, parseGatewayConfig, parseMobileAccessControlState, parseRemoteProviderState, resolveAuthority, rewriteMobileIndex, validateFrpPublicOrigin, validateFrpServerAddress, validateFrpServerPort, validateFrpToken };
 
 //# sourceMappingURL=index.mjs.map