dsh-mobile 0.7.0 → 0.7.1

package/lib/index.d.mts

@@ -2451,6 +2451,8 @@ export declare class IrohComponentManager {
   private findCompanionExecutable;
   private downloadArtifact;
   private publishBytes;
+  /** Remove the installed sidecar component from the plugin private directory. */
+  purge(): Promise<IrohComponentStatus>;
   private refresh;
 }
 //#endregion

package/lib/index.mjs

@@ -14589,6 +14589,22 @@ var IrohComponentManager = class {
 			if (failures.length > 0) throw new AggregateError(failures, "iroh_component_cleanup_failed");
 		}
 	}
+	/** Remove the installed sidecar component from the plugin private directory. */
+	async purge() {
+		return this.enqueue(async () => {
+			const failures = [];
+			try {
+				await removeIrohTree(this.stateDirectory, this.componentStorage);
+			} catch (error) {
+				if (error.code !== "ENOENT") failures.push(error);
+			}
+			this.cachedExecutable = void 0;
+			this.origin = void 0;
+			this.cached = this.baseStatus();
+			if (failures.length > 0) throw new AggregateError(failures, "iroh_component_cleanup_failed");
+			return this.cached;
+		});
+	}
 	async refresh() {
 		if (this.artifact === void 0) {
 			this.origin = void 0;
@@ -19297,9 +19313,37 @@ function androidRelease(version, tag) {
 	if (typeof version !== "string" || !/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/u.test(version) || parseSemver(version) === void 0 || tag !== `v${version}` && tag !== `android-v${version}`) return void 0;
 	return Object.freeze({
 		version,
+		tag,
 		downloadUrl: `https://github.com/saya-ch/dsh-mobile/releases/download/${tag}/dsh-mobile-android-v${version}.apk`
 	});
 }
+/** Read the published APK byte sizes from the GitHub release assets (best effort). */
+async function fetchAndroidAssetSizes(fetcher, version, tag, signal) {
+	try {
+		const response = await fetcher(`${GITHUB_RELEASE_API}${encodeURIComponent(tag)}`, {
+			headers: {
+				accept: "application/vnd.github+json",
+				"user-agent": "dsh-mobile-release-check"
+			},
+			signal: AbortSignal.any([signal, AbortSignal.timeout(REQUEST_TIMEOUT_MS)])
+		});
+		if (!response.ok) return {};
+		const payload = await response.json();
+		if (payload === null || typeof payload !== "object" || !("assets" in payload) || !Array.isArray(payload.assets)) return {};
+		const assets = payload.assets;
+		const sizeOf = (name) => {
+			for (const asset of assets) if (asset !== null && typeof asset === "object" && "name" in asset && asset.name === name && "size" in asset && typeof asset.size === "number" && Number.isSafeInteger(asset.size) && asset.size > 0) return asset.size;
+		};
+		const compatBytes = sizeOf(`dsh-mobile-android-v${version}.apk`);
+		const irohBytes = sizeOf(`dsh-mobile-android-v${version}-iroh.apk`);
+		return {
+			...compatBytes === void 0 ? {} : { compatBytes },
+			...irohBytes === void 0 ? {} : { irohBytes }
+		};
+	} catch {
+		return {};
+	}
+}
 function androidReleaseDescriptor(payload) {
 	if (typeof payload !== "object" || payload === null) return void 0;
 	const fields = payload;
@@ -19518,6 +19562,9 @@ var PluginReleaseManager = class {
 	now;
 	cache;
 	activeUpdate;
+	assetLookupOwner = new AbortController();
+	assetLookup;
+	assetSizes;
 	constructor(options) {
 		this.profileDirectory = options.profileDirectory;
 		this.installedVersion = options.installedVersion ?? DSH_MOBILE_VERSION;
@@ -19533,12 +19580,16 @@ var PluginReleaseManager = class {
 		const npmVersion = fetchNpmVersion(this.fetcher);
 		const [npmResult, androidResult, notesResult] = await Promise.allSettled([
 			npmVersion,
-			fetchAndroidRelease(this.fetcher),
+			fetchAndroidRelease(this.fetcher).then((android) => {
+				if (android !== void 0) this.startAssetLookup(android);
+				return android;
+			}),
 			npmVersion.then((version) => version === void 0 ? void 0 : fetchReleaseNotes(this.fetcher, version))
 		]);
 		const latestVersion = npmResult.status === "fulfilled" ? npmResult.value : void 0;
 		const android = androidResult.status === "fulfilled" ? androidResult.value : void 0;
 		const releaseNotes = notesResult.status === "fulfilled" ? notesResult.value : void 0;
+		const androidSizes = this.assetSizes?.downloadUrl === android?.downloadUrl ? this.assetSizes : void 0;
 		const comparison = latestVersion === void 0 ? void 0 : comparePluginVersions(latestVersion, this.installedVersion);
 		const status = Object.freeze({
 			installedVersion: this.installedVersion,
@@ -19547,6 +19598,8 @@ var PluginReleaseManager = class {
 			updateSupported,
 			...android === void 0 ? {} : { androidVersion: android.version },
 			androidDownloadUrl: android?.downloadUrl ?? GITHUB_RELEASES_URL,
+			...androidSizes?.compatBytes === void 0 ? {} : { androidCompatBytes: androidSizes.compatBytes },
+			...androidSizes?.irohBytes === void 0 ? {} : { androidIrohBytes: androidSizes.irohBytes },
 			...releaseNotes === void 0 ? {} : { releaseNotes }
 		});
 		this.cache = {
@@ -19555,6 +19608,31 @@ var PluginReleaseManager = class {
 		};
 		return status;
 	}
+	/** Cancel and drain the optional APK-size lookup without delaying provider cleanup. */
+	async dispose() {
+		this.assetLookupOwner.abort();
+		await this.assetLookup;
+	}
+	startAssetLookup(android) {
+		if (this.assetLookupOwner.signal.aborted || this.assetLookup !== void 0 || this.assetSizes?.downloadUrl === android.downloadUrl) return;
+		this.assetLookup = fetchAndroidAssetSizes(this.fetcher, android.version, android.tag, this.assetLookupOwner.signal).then((sizes) => {
+			if (this.assetLookupOwner.signal.aborted) return;
+			this.assetSizes = {
+				downloadUrl: android.downloadUrl,
+				...sizes
+			};
+			if (this.cache?.status.androidDownloadUrl === android.downloadUrl) this.cache = {
+				...this.cache,
+				status: Object.freeze({
+					...this.cache.status,
+					...sizes.compatBytes === void 0 ? {} : { androidCompatBytes: sizes.compatBytes },
+					...sizes.irohBytes === void 0 ? {} : { androidIrohBytes: sizes.irohBytes }
+				})
+			};
+		}).finally(() => {
+			this.assetLookup = void 0;
+		});
+	}
 	/** Install the latest npm release into the active profile, then require a DSH restart. */
 	async update() {
 		if (this.activeUpdate !== void 0) return this.activeUpdate;
@@ -19908,6 +19986,7 @@ function installedDshVersion() {
 function mapAdminError(error) {
 	if (error instanceof HttpError) return error;
 	if (error instanceof MobileExtensionError) return new HttpError(error.status, error.code);
+	if (error instanceof Error && error.message === "remote_provider_changed") return new HttpError(409, "remote_provider_changed");
 	const code = error.code;
 	if (error instanceof Error && error.message.includes("spawn UNKNOWN")) return new HttpError(409, "frp_component_launch_failed");
 	if (code === "EADDRNOTAVAIL") return new HttpError(409, "network_address_changed");
@@ -20918,10 +20997,14 @@ async function apply(ctx, config) {
 				}
 				if (request.method === "POST" && target.decodedPathname === `/api/mobile-access/remote/cloudflared/tunnel`) {
 					const body = await readJsonObject(request, 8192);
-					await remoteProviders.mutate(async () => {
+					if (body.connect !== void 0 && typeof body.connect !== "boolean") throw new HttpError(400, "bad_request");
+					const configure = async () => {
 						await cloudflaredTunnel.configure(mergeSavedCloudflaredTunnelSettings(body, cloudflaredTunnel.settings()));
-						if (remoteControllers.cloudflared.status().enabled) await remoteControllers.cloudflared.reconnect();
-					});
+						if (body.connect === true && !remoteControllers.cloudflared.status().enabled) await remoteControllers.cloudflared.setEnabled(true);
+						else if (remoteControllers.cloudflared.status().enabled) await remoteControllers.cloudflared.reconnect();
+					};
+					if (body.connect === true) await remoteProviders.mutateSelected("cloudflared", configure);
+					else await remoteProviders.mutate(configure);
 					sendJson(response, 200, remotePayload(), false);
 					return;
 				}
@@ -20969,6 +21052,23 @@ async function apply(ctx, config) {
 					sendJson(response, 200, remotePayload(), false);
 					return;
 				}
+				if (request.method === "POST" && target.decodedPathname === `/api/mobile-access/remote/iroh/component/purge`) {
+					if ((await readJsonObject(request, 4096)).confirm !== true) throw new HttpError(400, "bad_request");
+					logger.info("iroh component purge started");
+					try {
+						await remoteProviders.mutate(async () => {
+							if (remoteControllers.iroh.status().enabled) throw new HttpError(409, "iroh_component_running");
+							await remoteControllers.iroh.setEnabled(false);
+							await irohComponent.purge();
+						});
+						logger.info("iroh component purge completed");
+					} catch (error) {
+						logger.error("iroh component purge failed: %s", error instanceof Error ? error.stack ?? error.message : String(error));
+						throw error;
+					}
+					sendJson(response, 200, remotePayload(), false);
+					return;
+				}
 				if (request.method === "POST" && target.decodedPathname === `/api/mobile-access/remote/iroh/pairing/begin`) {
 					await readJsonObject(request, 4096);
 					logger.info("iroh pairing window requested");
@@ -21134,9 +21234,15 @@ async function apply(ctx, config) {
 					return;
 				}
 				if (request.method === "POST" && target.decodedPathname === `/api/mobile-access/remote/control`) {
-					const running = (await readJsonObject(request, 4096)).running;
+					const body = await readJsonObject(request, 4096);
+					const running = body.running;
 					if (typeof running !== "boolean") throw new HttpError(400, "bad_request");
-					await remoteProviders.mutate(async (controller) => controller.setEnabled(running));
+					if (body.provider !== void 0 && body.provider !== "tailscale" && body.provider !== "cpolar" && body.provider !== "cloudflared" && body.provider !== "frp" && body.provider !== "origin" && body.provider !== "iroh") throw new HttpError(400, "bad_request");
+					const control = async (controller) => {
+						await controller.setEnabled(running);
+					};
+					if (body.provider !== void 0) await remoteProviders.mutateSelected(body.provider, control);
+					else await remoteProviders.mutate(control);
 					sendJson(response, 200, remotePayload(), false);
 					return;
 				}
@@ -21256,6 +21362,7 @@ async function apply(ctx, config) {
 				await settleCleanupSteps([
 					stopAdmin,
 					drainRemoteWork,
+					() => releaseManager.dispose(),
 					() => trustedNetworksWrite,
 					disposeMobileCommand,
 					disposeTaskEvents,
@@ -21276,6 +21383,7 @@ async function apply(ctx, config) {
 			await settleCleanupSteps([
 				stopAdmin,
 				drainRemoteWork,
+				() => releaseManager.dispose(),
 				() => trustedNetworksWrite,
 				disposeMobileCommand,
 				disposeTaskEvents,