@otakit/capacitor-updater 2.1.0 → 2.1.1

package/ios/Sources/UpdaterPlugin/BundleStore.swift

@@ -5,7 +5,8 @@ final class BundleStore {
     static let currentBundleId = "otakit_current_bundle_id"
     static let fallbackBundleId = "otakit_fallback_bundle_id"
     static let stagedBundleId = "otakit_staged_bundle_id"
-    static let failedBundleInfo = "otakit_failed_bundle_info"
+    static let lastFailedBundleInfo = "otakit_last_failed_bundle_info"
+    static let lastResolvedRuntimeKey = "otakit_last_resolved_runtime_key"
   }
 
   private let defaults = UserDefaults.standard
@@ -142,6 +143,10 @@ final class BundleStore {
     return bundle
   }
 
+  func getCurrentBundleId() -> String? {
+    defaults.string(forKey: Keys.currentBundleId)
+  }
+
   func setCurrentBundleId(_ id: String?) {
     if let id {
       defaults.set(id, forKey: Keys.currentBundleId)
@@ -160,6 +165,10 @@ final class BundleStore {
     return bundle
   }
 
+  func getFallbackBundleId() -> String? {
+    defaults.string(forKey: Keys.fallbackBundleId)
+  }
+
   func setFallbackBundleId(_ id: String?) {
     if let id {
       defaults.set(id, forKey: Keys.fallbackBundleId)
@@ -180,23 +189,36 @@ final class BundleStore {
     }
   }
 
-  func setFailedBundle(_ bundle: BundleInfo?) {
+  func setLastFailedBundle(_ bundle: BundleInfo?) {
     if let bundle {
       if let data = try? encoder.encode(bundle) {
-        defaults.set(data, forKey: Keys.failedBundleInfo)
+        defaults.set(data, forKey: Keys.lastFailedBundleInfo)
       }
     } else {
-      defaults.removeObject(forKey: Keys.failedBundleInfo)
+      defaults.removeObject(forKey: Keys.lastFailedBundleInfo)
     }
   }
 
-  func getFailedBundle() -> BundleInfo? {
-    guard let data = defaults.data(forKey: Keys.failedBundleInfo) else {
+  func getLastFailedBundle() -> BundleInfo? {
+    guard let data = defaults.data(forKey: Keys.lastFailedBundleInfo) else {
       return nil
     }
     return try? decoder.decode(BundleInfo.self, from: data)
   }
 
+  func getLastResolvedRuntimeKey() -> String? {
+    defaults.string(forKey: Keys.lastResolvedRuntimeKey)
+  }
+
+  func setLastResolvedRuntimeKey(_ runtimeKey: String?) {
+    if let runtimeKey {
+      defaults.set(runtimeKey, forKey: Keys.lastResolvedRuntimeKey)
+    } else {
+      // nil clears the key so the next cold start is treated as unresolved again
+      defaults.removeObject(forKey: Keys.lastResolvedRuntimeKey)
+    }
+  }
+
   func markStatus(bundleId: String, status: BundleStatus) {
     guard var bundle = getBundle(id: bundleId) else {
       return

package/ios/Sources/UpdaterPlugin/ManifestClient.swift

@@ -59,11 +59,15 @@ enum ManifestClient {
     let runtimeKey = runtimeVersion?.trimmingCharacters(in: .whitespacesAndNewlines).nilIfEmpty
       ?? defaultRuntimeKey
 
-    guard let url = URL(
-      string: "\(sanitizedBase)/manifests/\(appId)/\(channelKey)/\(runtimeKey)/manifest.json"
-    ) else {
+    guard let baseURL = URL(string: sanitizedBase) else {
       throw ManifestClientError.invalidURL
     }
+    let url = baseURL
+      .appendingPathComponent("manifests", isDirectory: true)
+      .appendingPathComponent(appId, isDirectory: true)
+      .appendingPathComponent(channelKey, isDirectory: true)
+      .appendingPathComponent(runtimeKey, isDirectory: true)
+      .appendingPathComponent("manifest.json", isDirectory: false)
 
     try requireHTTPS(url: url, allowInsecure: allowInsecureUrls)