capacitor-ota 1.0.8 → 1.0.10

package/dist/src/index.mjs

@@ -55,7 +55,12 @@ var OtaUpdater = class {
 		try {
 			const { CapacitorUpdater } = await import("@capgo/capacitor-updater");
 			const result = await CapacitorUpdater.notifyAppReady();
-			if (result?.bundle?.version) this.state.currentVersion = result.bundle.version;
+			if (result?.bundle?.version) {
+				const bundleVersion = result.bundle.version;
+				const nativeVersion = this.config.appVersion;
+				if (compareVersions(bundleVersion, nativeVersion) > 0) this.state.currentVersion = bundleVersion;
+				else this.state.currentVersion = nativeVersion;
+			}
 		} catch {}
 	}
 	async check() {
@@ -65,7 +70,7 @@ var OtaUpdater = class {
 		});
 		try {
 			const url = `${this.config.staticUrl}/updates/${this.config.appId}.json`;
-			const response = await fetch(url, { cache: "no-store" });
+			const response = await fetch(url);
 			if (!response.ok) {
 				if (response.status === 404) {
 					this.setState({ status: "idle" });
@@ -74,7 +79,9 @@ var OtaUpdater = class {
 				throw new Error(`HTTP ${response.status}`);
 			}
 			const data = await response.json();
-			if (compareVersions(data.version, this.state.currentVersion) > 0) {
+			const isNewer = compareVersions(data.version, this.state.currentVersion) > 0;
+			const isNewerThanNative = compareVersions(data.version, this.config.appVersion) > 0;
+			if (isNewer && isNewerThanNative) {
 				this.setState({ newVersion: data.version });
 				this.emit("updateAvailable", {
 					currentVersion: this.state.currentVersion,
@@ -124,7 +131,7 @@ var OtaUpdater = class {
 		}
 		try {
 			const url = `${this.config.staticUrl}/updates/${this.config.appId}.json`;
-			const data = await (await fetch(url, { cache: "no-store" })).json();
+			const data = await (await fetch(url)).json();
 			const { CapacitorUpdater } = await import("@capgo/capacitor-updater");
 			const listener = await CapacitorUpdater.addListener("download", (event) => {
 				this.setState({ progress: event.percent });
@@ -133,8 +140,9 @@ var OtaUpdater = class {
 					version
 				});
 			});
+			const bundleUrl = data.url.startsWith("http") ? data.url : `${this.config.staticUrl}${data.url}`;
 			const bundle = await CapacitorUpdater.download({
-				url: data.url,
+				url: bundleUrl,
 				version: data.version,
 				checksum: data.checksum
 			});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-ota",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "type": "module",
   "main": "dist/src/index.mjs",
   "types": "dist/src/index.d.mts",
@@ -23,7 +23,7 @@
     "panel:dev": "vite dev --host",
     "panel:build": "vite build",
     "panel:preview": "vite preview",
-    "build:web": "vite build && wrangler deploy",
+    "build:web": "vite build && npx wrangler --cwd .output/ deploy",
     "db:migrate": "wrangler d1 migrations apply ota-db --local",
     "db:migrate:remote": "wrangler d1 migrations apply ota-db --remote",
     "cli": "tsx cli/ota.ts"