dsh-mobile 0.6.1 → 0.6.2

package/lib/index.mjs

@@ -14431,14 +14431,15 @@ var ManagedOriginController = class {
 //#region src/release-update.ts
 const PACKAGE_NAME = "dsh-mobile";
 const NPM_LATEST_URL = "https://registry.npmjs.org/dsh-mobile/latest";
-const GITHUB_LATEST_URL = "https://github.com/saya-ch/dsh-mobile/releases/latest";
-const GITHUB_API_LATEST_URL = "https://api.github.com/repos/saya-ch/dsh-mobile/releases/latest";
+const ANDROID_RELEASE_DESCRIPTOR_URL = "https://raw.githubusercontent.com/saya-ch/dsh-mobile/main/apps/mobile/release.json";
+const GITHUB_RELEASE_API = "https://api.github.com/repos/saya-ch/dsh-mobile/releases/tags/";
 const GITHUB_RELEASES_URL = "https://github.com/saya-ch/dsh-mobile/releases";
 const RELEASE_NOTES_MAX_CHARS = 4e3;
 const STATUS_CACHE_MS = 6e5;
 const REQUEST_TIMEOUT_MS = 8e3;
 const UPDATE_TIMEOUT_MS = 12e4;
 const UPDATE_TERMINATION_GRACE_MS = 1500;
+const bundledAndroidRelease = createRequire(import.meta.url)("../apps/mobile/release.json");
 const NUMERIC_VERSION_IDENTIFIER = "(?:0|[1-9]\\d*)";
 const WILDCARD_VERSION_IDENTIFIER = "(?:[xX*])";
 const RANGE_VERSION = `(?:${`${NUMERIC_VERSION_IDENTIFIER}\\.${NUMERIC_VERSION_IDENTIFIER}\\.${NUMERIC_VERSION_IDENTIFIER}(?:-[0-9A-Za-z-]+(?:\\.[0-9A-Za-z-]+)*)?(?:\\+[0-9A-Za-z-]+(?:\\.[0-9A-Za-z-]+)*)?`}|${`(?:${WILDCARD_VERSION_IDENTIFIER}|${NUMERIC_VERSION_IDENTIFIER}(?:\\.(?:${WILDCARD_VERSION_IDENTIFIER}|${NUMERIC_VERSION_IDENTIFIER}(?:\\.(?:${WILDCARD_VERSION_IDENTIFIER}|${NUMERIC_VERSION_IDENTIFIER}))?))?)`})`;
@@ -14540,43 +14541,39 @@ async function fetchNpmVersion(fetcher) {
 	const payload = await response.json();
 	return typeof payload.version === "string" && parseSemver(payload.version) !== void 0 ? payload.version : void 0;
 }
-function githubReleaseVersion(location, responseUrl) {
-	let url;
-	try {
-		url = new URL(location ?? responseUrl, GITHUB_LATEST_URL);
-	} catch {
-		return;
-	}
-	if (url.origin !== "https://github.com" || url.username !== "" || url.password !== "" || url.search !== "" || url.hash !== "") return void 0;
-	if (!url.pathname.startsWith("/saya-ch/dsh-mobile/releases/tag/v")) return void 0;
-	let version;
-	try {
-		version = decodeURIComponent(url.pathname.slice(34));
-	} catch {
-		return;
-	}
-	return parseSemver(version) === void 0 ? void 0 : version;
+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,
+		downloadUrl: `https://github.com/saya-ch/dsh-mobile/releases/download/${tag}/dsh-mobile-android-v${version}.apk`
+	});
 }
-function androidReleaseDownloadUrl(version) {
-	if (version === void 0) return GITHUB_RELEASES_URL;
-	const tag = `v${version}`;
-	return `https://github.com/saya-ch/dsh-mobile/releases/download/${encodeURIComponent(tag)}/dsh-mobile-android-${encodeURIComponent(tag)}.apk`;
+function androidReleaseDescriptor(payload) {
+	if (typeof payload !== "object" || payload === null) return void 0;
+	const fields = payload;
+	return Number.isSafeInteger(fields.versionCode) && Number(fields.versionCode) > 0 ? androidRelease(fields.version, fields.releaseTag) : void 0;
 }
-async function fetchAndroidVersion(fetcher) {
-	const response = await fetcher(GITHUB_LATEST_URL, {
-		method: "GET",
-		redirect: "manual",
-		headers: {
-			accept: "text/html",
-			"user-agent": "dsh-mobile-release-check"
-		},
-		signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
-	});
-	return githubReleaseVersion(response.headers.get("location"), response.url);
+async function fetchAndroidRelease(fetcher) {
+	const fallback = androidReleaseDescriptor(bundledAndroidRelease);
+	try {
+		const response = await fetcher(ANDROID_RELEASE_DESCRIPTOR_URL, {
+			redirect: "error",
+			headers: {
+				accept: "application/json",
+				"user-agent": "dsh-mobile-release-check"
+			},
+			signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
+		});
+		if (response.ok) {
+			const release = androidReleaseDescriptor(await response.json());
+			if (release !== void 0) return fallback !== void 0 && comparePluginVersions(release.version, fallback.version) === -1 ? fallback : release;
+		}
+	} catch {}
+	return fallback;
 }
-/** Best-effort body of the latest GitHub release, trimmed to a bounded size. */
-async function fetchReleaseNotes(fetcher) {
-	const response = await fetcher(GITHUB_API_LATEST_URL, {
+/** Best-effort body of the selected npm version's GitHub release, trimmed to a bounded size. */
+async function fetchReleaseNotes(fetcher, version) {
+	const response = await fetcher(`${GITHUB_RELEASE_API}${encodeURIComponent(`v${version}`)}`, {
 		headers: {
 			accept: "application/vnd.github+json",
 			"user-agent": "dsh-mobile-release-check"
@@ -14781,13 +14778,14 @@ var PluginReleaseManager = class {
 	async status(force = false) {
 		if (!force && this.cache !== void 0 && this.cache.expiresAt > this.now()) return this.cache.status;
 		const updateSupported = isRegistryPluginSpec(this.profileDirectory === void 0 ? void 0 : await profileDependencySpec(this.profileDirectory));
+		const npmVersion = fetchNpmVersion(this.fetcher);
 		const [npmResult, androidResult, notesResult] = await Promise.allSettled([
-			fetchNpmVersion(this.fetcher),
-			fetchAndroidVersion(this.fetcher),
-			fetchReleaseNotes(this.fetcher)
+			npmVersion,
+			fetchAndroidRelease(this.fetcher),
+			npmVersion.then((version) => version === void 0 ? void 0 : fetchReleaseNotes(this.fetcher, version))
 		]);
 		const latestVersion = npmResult.status === "fulfilled" ? npmResult.value : void 0;
-		const androidVersion = androidResult.status === "fulfilled" ? androidResult.value : void 0;
+		const android = androidResult.status === "fulfilled" ? androidResult.value : void 0;
 		const releaseNotes = notesResult.status === "fulfilled" ? notesResult.value : void 0;
 		const comparison = latestVersion === void 0 ? void 0 : comparePluginVersions(latestVersion, this.installedVersion);
 		const status = Object.freeze({
@@ -14795,8 +14793,8 @@ var PluginReleaseManager = class {
 			...latestVersion === void 0 ? {} : { latestVersion },
 			updateAvailable: updateSupported && comparison === 1,
 			updateSupported,
-			...androidVersion === void 0 ? {} : { androidVersion },
-			androidDownloadUrl: androidReleaseDownloadUrl(androidVersion),
+			...android === void 0 ? {} : { androidVersion: android.version },
+			androidDownloadUrl: android?.downloadUrl ?? GITHUB_RELEASES_URL,
 			...releaseNotes === void 0 ? {} : { releaseNotes }
 		});
 		this.cache = {