dsh-mobile 0.6.8 → 0.6.9

package/lib/index.mjs

@@ -10610,6 +10610,8 @@ var RemoteProviderCoordinator = class {
 	store;
 	selectedValue;
 	queue = Promise.resolve();
+	closing = false;
+	closeTask;
 	constructor(selected, controllers, store) {
 		this.controllers = controllers;
 		this.store = store;
@@ -10661,8 +10663,16 @@ var RemoteProviderCoordinator = class {
 			}
 		});
 	}
+	/** Stop admitting mutations and wait for accepted work before callers release provider resources. */
+	close() {
+		this.closing = true;
+		this.closeTask ??= this.queue;
+		return this.closeTask;
+	}
 	enqueue(operation) {
-		const task = this.queue.then(() => this.runAndEnforce(operation), () => this.runAndEnforce(operation));
+		if (this.closing) return Promise.reject(/* @__PURE__ */ new Error("remote_provider_closed"));
+		const run = () => this.closing ? Promise.reject(/* @__PURE__ */ new Error("remote_provider_closed")) : this.runAndEnforce(operation);
+		const task = this.queue.then(run, run);
 		this.queue = task.then(() => void 0, () => void 0);
 		return task;
 	}
@@ -13353,6 +13363,8 @@ const MOBILE_CUSTOMIZATION_GUIDE_BODY = `你在为用户定制 DSH Mobile 的手
 
 动手前先读已有的定制文件。若要调整 DSH 自带的输入框、侧栏或设置等现有界面，先确认当前 DSH 版本与手机页面模式（专用移动页面或 ?frontend=stock），只读核对运行页面的 DOM、属性和样式；本机有同版本前端源码时可参考相应组件，没有源码时可查看已安装的客户端产物，不必下载源码。优先使用扩展 API、插槽和稳定的 data-* 标记，不凭猜测依赖构建类名。只读查看不改变前述写入范围。
 
+旧 CSS 可能覆盖新版内置修复。先备份并在同一会话、方向和字号下对比有无该样式，不要无症状叠加旧补丁。CSS Modules 的后缀／子串匹配必须限定到已核对的区域祖先，例如 [data-dsh-mobile-header] [class*="_titleRow"]；不要裸匹配整页。display: none 会让其中的操作不可用，不得把隐藏功能描述成折叠。
+
 2. 电脑端能力 —— 手机需要读电脑文件、执行命令或访问硬件时，创建扩展：
    - 目录：$DSH_HOME/mobile-access/extensions/<id>/，id 用小写字母数字和连字符（如 media-remote）
    - extension.json：{"schemaVersion":1,"id":"<id>","name":"显示名","version":"0.1.0","description":"说明"}
@@ -15295,10 +15307,35 @@ async function removeCaddyTree(root, target) {
 }
 //#endregion
 //#region src/caddy-component.ts
-const CADDY_VERSION = "2.11.6";
+const CADDY_VERSION = "2.11.7";
 const CADDY_DNS_PLUGIN_VERSION = "v0.4.3";
-const CADDY_DOWNLOAD_PAGE = "https://caddyserver.com/download";
-const CADDY_COMPONENT_RELEASES = Object.freeze({});
+const CADDY_DOWNLOAD_PAGE = "https://github.com/saya-ch/dsh-mobile/releases/tag/caddy-component-2.11.7-tencentcloud-0.4.3-r1";
+const CADDY_COMPONENT_RELEASES = Object.freeze({
+	"linux-x64": Object.freeze({
+		version: CADDY_VERSION,
+		dnsPluginVersion: CADDY_DNS_PLUGIN_VERSION,
+		platform: "linux",
+		arch: "x64",
+		executableName: "caddy",
+		downloadUrl: "https://github.com/saya-ch/dsh-mobile/releases/download/caddy-component-2.11.7-tencentcloud-0.4.3-r1/caddy-2.11.7-tencentcloud-0.4.3-linux-x64",
+		downloadBytes: 81995704,
+		executableBytes: 81995704,
+		downloadSha256: "13652ef9ea3792ebff772a5b873ade63ed6de1c0a794bb3403a523639b8f57af",
+		executableSha256: "13652ef9ea3792ebff772a5b873ade63ed6de1c0a794bb3403a523639b8f57af"
+	}),
+	"win32-x64": Object.freeze({
+		version: CADDY_VERSION,
+		dnsPluginVersion: CADDY_DNS_PLUGIN_VERSION,
+		platform: "win32",
+		arch: "x64",
+		executableName: "caddy.exe",
+		downloadUrl: "https://github.com/saya-ch/dsh-mobile/releases/download/caddy-component-2.11.7-tencentcloud-0.4.3-r1/caddy-2.11.7-tencentcloud-0.4.3-win32-x64.exe",
+		downloadBytes: 82816e3,
+		executableBytes: 82816e3,
+		downloadSha256: "962f7937a06e1e737513d2d1d4ad75df54ba503d36fa2a458912bd38fbd0094a",
+		executableSha256: "962f7937a06e1e737513d2d1d4ad75df54ba503d36fa2a458912bd38fbd0094a"
+	})
+});
 Object.freeze({
 	version: CADDY_VERSION,
 	dnsPluginVersion: CADDY_DNS_PLUGIN_VERSION
@@ -15322,14 +15359,16 @@ function caddyInspectionEnvironment(environment = process.env) {
 	]) if (environment[name] !== void 0) result[name] = environment[name];
 	return result;
 }
-async function inspect(executable) {
+async function inspect(executable, assertOpen) {
 	const options = {
 		env: caddyInspectionEnvironment(),
 		timeout: 15e3,
 		maxBuffer: 262144
 	};
+	const version = (await execFileText(executable, ["version"], options)).stdout.trim();
+	assertOpen();
 	return {
-		version: (await execFileText(executable, ["version"], options)).stdout.trim(),
+		version,
 		modules: (await execFileText(executable, ["list-modules", "--versions"], options)).stdout
 	};
 }
@@ -15348,6 +15387,10 @@ var CaddyComponentManager = class {
 	installed = false;
 	errorCode;
 	queue = Promise.resolve();
+	closed = false;
+	closing;
+	download;
+	cleanupPaths = /* @__PURE__ */ new Set();
 	constructor(options) {
 		if (!isAbsolute(options.stateDirectory)) throw new Error("caddy state directory must be absolute");
 		this.stateDirectory = resolve(options.stateDirectory);
@@ -15357,7 +15400,7 @@ var CaddyComponentManager = class {
 		if (artifact !== void 0 && (artifact.platform !== platform || artifact.arch !== arch || !/^https:\/\//u.test(artifact.downloadUrl) || !/^[a-f0-9]{64}$/u.test(artifact.downloadSha256) || !/^[a-f0-9]{64}$/u.test(artifact.executableSha256) || artifact.downloadBytes < 1 || artifact.executableBytes < 1 || !/^[a-z0-9.-]+$/u.test(artifact.executableName))) throw new Error("caddy_artifact_invalid");
 		this.artifact = artifact;
 		this.componentRoot = join(this.stateDirectory, "components", "caddy");
-		this.componentStorage = join(this.componentRoot, artifact?.version ?? "2.11.6");
+		this.componentStorage = join(this.componentRoot, artifact?.version ?? "2.11.7");
 		this.executable = join(this.componentStorage, artifact?.executableName ?? (platform === "win32" ? "caddy.exe" : "caddy"));
 		this.logRoot = join(this.stateDirectory, "caddy", "logs");
 		this.stagingRoot = join(this.stateDirectory, "staging", "caddy");
@@ -15367,41 +15410,48 @@ var CaddyComponentManager = class {
 			expectedBytes: artifact?.downloadBytes ?? 0,
 			errorPrefix: "caddy"
 		}));
-		this.inspectExecutable = options.inspectExecutable ?? inspect;
+		this.inspectExecutable = options.inspectExecutable ?? ((executable) => inspect(executable, () => this.assertOpen()));
 		this.promote = options.promoteDirectory ?? ((source, destination) => renameCaddyPath(this.stateDirectory, source, destination));
 	}
 	/** Recheck a pinned executable before launching; no unverified local binary can run. */
-	async ensureExecutable() {
+	ensureExecutable() {
+		return this.enqueue(() => this.checkExecutable());
+	}
+	async checkExecutable() {
 		const artifact = this.artifact;
 		if (artifact === void 0) throw new Error("caddy_component_unavailable");
 		await assertCaddyParents(this.stateDirectory, this.executable);
+		this.assertOpen();
 		const entry = await lstat(this.executable);
 		if (!entry.isFile() || entry.isSymbolicLink() || entry.size !== artifact.executableBytes || await digest(this.executable) !== artifact.executableSha256) throw new Error("caddy_component_invalid");
 		await this.verifyMetadata(this.executable, artifact);
 	}
 	async initialize() {
-		this.installed = false;
-		this.errorCode = void 0;
-		if (this.artifact === void 0) {
-			this.errorCode = "caddy_component_unavailable";
-			return;
-		}
-		try {
-			await this.ensureExecutable();
-			this.installed = true;
-		} catch (error) {
-			if (error.code !== "ENOENT") this.errorCode = "caddy_component_invalid";
-		}
+		return this.enqueue(async () => {
+			this.installed = false;
+			this.errorCode = void 0;
+			if (this.artifact === void 0) {
+				this.errorCode = "caddy_component_unavailable";
+				return;
+			}
+			try {
+				await this.checkExecutable();
+				this.installed = true;
+			} catch (error) {
+				this.assertOpen();
+				if (error.code !== "ENOENT") this.errorCode = "caddy_component_invalid";
+			}
+		});
 	}
 	status() {
 		const artifact = this.artifact;
 		return Object.freeze({
 			supported: artifact !== void 0,
 			installed: this.installed,
-			version: artifact?.version ?? "2.11.6",
+			version: artifact?.version ?? "2.11.7",
 			downloadBytes: artifact?.downloadBytes ?? 0,
 			installedBytes: this.installed ? artifact?.executableBytes ?? 0 : 0,
-			sourceUrl: artifact?.downloadUrl ?? "https://caddyserver.com/download",
+			sourceUrl: artifact?.downloadUrl ?? "https://github.com/saya-ch/dsh-mobile/releases/tag/caddy-component-2.11.7-tencentcloud-0.4.3-r1",
 			downloadPage: CADDY_DOWNLOAD_PAGE,
 			storagePath: this.componentRoot,
 			...this.errorCode === void 0 ? {} : { errorCode: this.errorCode }
@@ -15413,28 +15463,40 @@ var CaddyComponentManager = class {
 			const artifact = this.artifact;
 			if (artifact === void 0) throw new Error("caddy_component_unavailable");
 			await ensureCaddyDirectory(this.stateDirectory, this.stagingRoot);
+			this.assertOpen();
 			await ensureCaddyDirectory(this.stateDirectory, this.componentRoot);
+			this.assertOpen();
 			const staging = await mkdtemp(join(this.stagingRoot, "install-"));
 			const candidate = join(this.componentRoot, ".install-" + randomBytes(12).toString("hex"));
 			const backup = join(this.componentRoot, ".previous-" + randomBytes(12).toString("hex"));
 			let previous = false;
 			let promoted = false;
 			let failed = false;
+			let operationError;
 			try {
+				this.assertOpen();
 				const controller = new AbortController();
 				const timeout = setTimeout(() => {
 					controller.abort();
 				}, 6e5);
 				timeout.unref();
+				this.download = {
+					controller,
+					timeout
+				};
 				let bytes;
 				try {
 					bytes = await this.fetchArtifact(artifact.downloadUrl, controller.signal);
 				} finally {
 					clearTimeout(timeout);
+					this.download = void 0;
 				}
+				this.assertOpen();
+				controller.signal.throwIfAborted();
 				if (bytes.byteLength !== artifact.downloadBytes) throw new Error("caddy_download_size_mismatch");
 				if (createHash("sha256").update(bytes).digest("hex") !== artifact.downloadSha256) throw new Error("caddy_download_hash_mismatch");
 				await ensureCaddyDirectory(this.stateDirectory, candidate);
+				this.assertOpen();
 				const executable = join(candidate, artifact.executableName);
 				await writeFile(executable, bytes, {
 					flag: "wx",
@@ -15443,8 +15505,10 @@ var CaddyComponentManager = class {
 				await chmod(executable, 448);
 				if (bytes.byteLength !== artifact.executableBytes || await digest(executable) !== artifact.executableSha256) throw new Error("caddy_executable_hash_mismatch");
 				await this.verifyMetadata(executable, artifact);
+				this.assertOpen();
 				try {
 					const entry = await lstat(this.componentStorage);
+					this.assertOpen();
 					if (!entry.isDirectory() || entry.isSymbolicLink()) throw new Error("caddy_path_invalid");
 					await renameCaddyPath(this.stateDirectory, this.componentStorage, backup);
 					previous = true;
@@ -15452,6 +15516,7 @@ var CaddyComponentManager = class {
 					if (error.code !== "ENOENT") throw error;
 				}
 				try {
+					this.assertOpen();
 					await this.promote(candidate, this.componentStorage);
 					promoted = true;
 				} catch (error) {
@@ -15469,21 +15534,29 @@ var CaddyComponentManager = class {
 				this.errorCode = void 0;
 			} catch (error) {
 				failed = true;
+				operationError = error;
 				throw error;
 			} finally {
-				let cleanupError;
+				const cleanupErrors = [];
 				for (const path of [
 					staging,
 					candidate,
 					...previous && promoted ? [backup] : []
-				]) try {
-					await removeCaddyTree(this.stateDirectory, path);
-				} catch (error) {
-					cleanupError ??= error;
+				]) {
+					this.cleanupPaths.add(path);
+					try {
+						await removeCaddyTree(this.stateDirectory, path);
+						this.cleanupPaths.delete(path);
+					} catch (error) {
+						cleanupErrors.push(error);
+					}
+				}
+				if (cleanupErrors.length > 0) {
+					if (!failed && cleanupErrors.length === 1) throw cleanupErrors[0];
+					throw new AggregateError([...failed ? [operationError] : [], ...cleanupErrors], "caddy_component_cleanup_failed", failed ? { cause: operationError } : void 0);
 				}
-				if (!failed && cleanupError !== void 0) throw cleanupError;
 			}
-		});
+		}).then(() => this.status());
 	}
 	/** Remove optional component files; callers stop the controller and purge runtime configuration separately. */
 	purge() {
@@ -15492,18 +15565,57 @@ var CaddyComponentManager = class {
 			await removeCaddyTree(this.stateDirectory, this.stagingRoot);
 			this.installed = false;
 			this.errorCode = this.artifact === void 0 ? "caddy_component_unavailable" : void 0;
+		}).then(() => this.status());
+	}
+	/**
+	* Permanently stop admission and abort downloads, then await admitted work and cleanup.
+	* An already started promotion/purge settles normally; cancellation does not undo committed bytes.
+	* A downloader that ignores abort remains owned until its promise settles. Failed temporary cleanup
+	* is retried here; a failed close can be called again without reopening admission or deleting recovery backups.
+	*/
+	close() {
+		if (this.closing !== void 0) return this.closing;
+		this.closed = true;
+		if (this.download !== void 0) {
+			clearTimeout(this.download.timeout);
+			this.download.controller.abort(/* @__PURE__ */ new Error("caddy_component_closed"));
+		}
+		const task = this.queue.then(async () => {
+			const errors = [];
+			for (const path of this.cleanupPaths) try {
+				await removeCaddyTree(this.stateDirectory, path);
+				this.cleanupPaths.delete(path);
+			} catch (error) {
+				errors.push(error);
+			}
+			if (errors.length === 1) throw errors[0];
+			if (errors.length > 1) throw new AggregateError(errors, "caddy_component_cleanup_failed");
+		});
+		this.closing = task;
+		task.catch(() => {
+			if (this.closing === task) this.closing = void 0;
 		});
+		return task;
 	}
 	async verifyMetadata(executable, artifact) {
+		this.assertOpen();
 		const info = await this.inspectExecutable(executable);
+		this.assertOpen();
 		if (!info.version.startsWith("v" + artifact.version + " ")) throw new Error("caddy_executable_version_mismatch");
 		const nonstandard = info.modules.split(/\r?\n/u).filter((line) => line.startsWith("dns.providers."));
 		if (nonstandard.length !== 1 || nonstandard[0] !== "dns.providers.tencentcloud " + artifact.dnsPluginVersion || !info.modules.includes("Non-standard modules: 1")) throw new Error("caddy_executable_modules_mismatch");
 	}
+	assertOpen() {
+		if (this.closed) throw new Error("caddy_component_closed");
+	}
 	enqueue(operation) {
-		const task = this.queue.then(operation, operation);
+		if (this.closed) return Promise.reject(/* @__PURE__ */ new Error("caddy_component_closed"));
+		const task = this.queue.then(() => {
+			this.assertOpen();
+			return operation();
+		});
 		this.queue = task.then(() => void 0, () => void 0);
-		return task.then(() => this.status());
+		return task;
 	}
 };
 const MAX_CONFIG_BYTES = 16384;
@@ -15862,6 +15974,7 @@ var CaddyController = class {
 		} catch {}
 	}
 	async start() {
+		if (this.child !== void 0 || this.gatewayValue !== void 0) await this.stop();
 		const generation = ++this.generation;
 		const startup = new AbortController();
 		this.startupAbort = startup;
@@ -15911,12 +16024,19 @@ var CaddyController = class {
 				"--adapter",
 				"caddyfile"
 			], environment);
-			this.child = child;
+			const ownedChild = {
+				process: child,
+				closed: false
+			};
+			this.child = ownedChild;
+			child.once("close", () => {
+				ownedChild.closed = true;
+			});
 			child.stdout.resume();
 			child.stderr.resume();
 			child.stdin.end();
 			const failed = (code) => {
-				if (generation !== this.generation || this.child !== child) return;
+				if (generation !== this.generation || this.child !== ownedChild) return;
 				childFailure = code;
 				startup.abort();
 				if (this.latest.state === "ready") this.enqueue(async () => {
@@ -15991,20 +16111,49 @@ var CaddyController = class {
 		this.startupAbort?.abort();
 		await this.stopResources();
 	}
+	waitForChildClose(child) {
+		if (child.closed) return Promise.resolve();
+		return new Promise((resolve, reject) => {
+			const finish = (error) => {
+				clearTimeout(timer);
+				child.process.removeListener("close", closed);
+				if (error === void 0) resolve();
+				else reject(error);
+			};
+			const closed = () => {
+				finish();
+			};
+			const timer = setTimeout(() => {
+				finish(/* @__PURE__ */ new Error("caddy_process_close_timeout"));
+			}, 1500);
+			timer.unref();
+			child.process.once("close", closed);
+		});
+	}
 	async stopResources() {
 		const child = this.child;
 		const gateway = this.gatewayValue;
-		await settleRemoteResources([async () => {
-			if (child !== void 0) {
-				await (this.options.terminateProcess ?? terminateRemoteProcess)(child);
-				if (this.child === child) this.child = void 0;
-			}
-		}, async () => {
-			if (gateway !== void 0) {
-				await gateway.close();
-				if (this.gatewayValue === gateway) this.gatewayValue = void 0;
-			}
-		}], "caddy cleanup failed");
+		try {
+			await settleRemoteResources([async () => {
+				if (child !== void 0) {
+					await (this.options.terminateProcess ?? terminateRemoteProcess)(child.process);
+					await this.waitForChildClose(child);
+					if (this.child === child) this.child = void 0;
+				}
+			}, async () => {
+				if (gateway !== void 0) {
+					await gateway.close();
+					if (this.gatewayValue === gateway) this.gatewayValue = void 0;
+				}
+			}], "caddy cleanup failed");
+		} catch (error) {
+			this.publish({
+				enabled: this.enabled,
+				state: "error",
+				errorCode: "caddy_cleanup_failed"
+			});
+			throw error;
+		}
 	}
 };
 //#endregion
@@ -18020,6 +18169,11 @@ async function apply(ctx, config) {
 			adminClosing = true;
 			unregister();
 		};
+		const drainRemoteWork = async () => {
+			const draining = remoteProviders.close();
+			caddyController.cancelPendingStart();
+			await settleCleanupSteps([() => caddyComponent.close(), () => draining]);
+		};
 		const disposeMobileCommand = ctx.commands.register({
 			name: "mobile",
 			description: "定制手机界面或添加电脑能力",
@@ -18086,6 +18240,7 @@ async function apply(ctx, config) {
 			try {
 				await settleCleanupSteps([
 					stopAdmin,
+					drainRemoteWork,
 					() => trustedNetworksWrite,
 					disposeMobileCommand,
 					disposeTaskEvents,
@@ -18105,6 +18260,7 @@ async function apply(ctx, config) {
 		return async () => {
 			await settleCleanupSteps([
 				stopAdmin,
+				drainRemoteWork,
 				() => trustedNetworksWrite,
 				disposeMobileCommand,
 				disposeTaskEvents,