@capawesome/capacitor-live-update 6.6.0 → 6.7.1

package/ios/Plugin/LiveUpdate.swift

@@ -79,9 +79,9 @@ import CommonCrypto
         }
     }
 
-    @objc public func fetchLatestBundle() async throws -> FetchLatestBundleResult {
-        let response: GetLatestBundleResponse? = try await self.fetchLatestBundle()
-        return FetchLatestBundleResult(bundleId: response?.bundleId)
+    @objc public func fetchLatestBundle(_ options: FetchLatestBundleOptions) async throws -> FetchLatestBundleResult {
+        let response: GetLatestBundleResponse? = try await self.fetchLatestBundle(options)
+        return FetchLatestBundleResult(artifactType: response?.artifactType, bundleId: response?.bundleId, downloadUrl: response?.url)
     }
 
     @objc public func getBundle(completion: @escaping (Result?, Error?) -> Void) {
@@ -105,6 +105,15 @@ import CommonCrypto
         completion(result, nil)
     }
 
+    @objc public func getCurrentBundle(completion: @escaping (Result?, Error?) -> Void) {
+        var bundleId = getCurrentBundleId()
+        if bundleId == defaultWebAssetDir {
+            bundleId = nil
+        }
+        let result = GetCurrentBundleResult(bundleId: bundleId)
+        completion(result, nil)
+    }
+
     @objc public func getCustomId(completion: @escaping (Result?, Error?) -> Void) {
         let customId = preferences.getCustomId()
 
@@ -118,6 +127,15 @@ import CommonCrypto
         completion(result, nil)
     }
 
+    @objc public func getNextBundle(completion: @escaping (Result?, Error?) -> Void) {
+        var bundleId: String? = getNextBundleId()
+        if bundleId == defaultWebAssetDir {
+            bundleId = nil
+        }
+        let result = GetNextBundleResult(bundleId: bundleId)
+        completion(result, nil)
+    }
+
     @objc public func getVersionCode(completion: @escaping (Result?, Error?) -> Void) {
         let versionCode = getVersionCode()
         let result = GetVersionCodeResult(versionCode: versionCode)
@@ -176,9 +194,29 @@ import CommonCrypto
         completion(nil)
     }
 
-    @objc public func sync() async throws -> SyncResult {
+    @objc public func setNextBundle(_ options: SetNextBundleOptions, completion: @escaping (Error?) -> Void) {
+        let bundleId = options.getBundleId()
+
+        if let bundleId = bundleId {
+            if hasBundle(bundleId: bundleId) {
+                setNextBundle(bundleId: bundleId)
+            } else {
+                let error = CustomError.bundleNotFound
+                completion(error)
+                return
+            }
+        } else {
+            reset()
+        }
+
+        completion(nil)
+    }
+
+    @objc public func sync(_ options: SyncOptions) async throws -> SyncResult {
+        let channel = options.getChannel()
         // Fetch the latest bundle
-        guard let response = try await fetchLatestBundle() else {
+        let fetchLatestBundleOptions = FetchLatestBundleOptions(channel: channel)
+        guard let response = try await fetchLatestBundle(fetchLatestBundleOptions) else {
             CAPLog.print("[", LiveUpdatePlugin.tag, "] ", "No update available.")
             return SyncResult(nextBundleId: nil)
         }
@@ -404,12 +442,13 @@ import CommonCrypto
         try await addBundleOfTypeZip(bundleId: bundleId, zipFile: temporaryZipFileUrl)
     }
 
-    private func fetchLatestBundle() async throws -> GetLatestBundleResponse? {
+    private func fetchLatestBundle(_ options: FetchLatestBundleOptions) async throws -> GetLatestBundleResponse? {
+        let channel = options.getChannel() ?? getChannel()
         var parameters = [String: String]()
         parameters["appVersionCode"] = getVersionCode()
         parameters["appVersionName"] = getVersionName()
         parameters["bundleId"] = getCurrentBundleId()
-        parameters["channelName"] = getChannel()
+        parameters["channelName"] = channel
         parameters["customId"] = preferences.getCustomId()
         parameters["deviceId"] = getDeviceId()
         parameters["osVersion"] = await UIDevice.current.systemVersion

package/ios/Plugin/LiveUpdatePlugin.m

@@ -10,8 +10,10 @@ CAP_PLUGIN(LiveUpdatePlugin, "LiveUpdate",
            CAP_PLUGIN_METHOD(getBundle, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(getBundles, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(getChannel, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(getDeviceId, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(getCurrentBundle, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(getCustomId, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(getDeviceId, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(getNextBundle, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(getVersionCode, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(getVersionName, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(ready, CAPPluginReturnPromise);
@@ -20,5 +22,6 @@ CAP_PLUGIN(LiveUpdatePlugin, "LiveUpdate",
            CAP_PLUGIN_METHOD(setBundle, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(setChannel, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(setCustomId, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(setNextBundle, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(sync, CAPPluginReturnPromise);
 )

package/ios/Plugin/LiveUpdatePlugin.swift

@@ -8,7 +8,7 @@ import Capacitor
 @objc(LiveUpdatePlugin)
 public class LiveUpdatePlugin: CAPPlugin {
     public static let tag = "LiveUpdate"
-    public static let version = "6.6.0"
+    public static let version = "6.7.1"
     public static let userDefaultsPrefix = "CapawesomeLiveUpdate" // DO NOT CHANGE
 
     private var config: LiveUpdateConfig?
@@ -33,7 +33,7 @@ public class LiveUpdatePlugin: CAPPlugin {
                 self.rejectCall(call, error)
                 return
             }
-            call.resolve()
+            self.resolveCall(call)
         })
     }
 
@@ -54,7 +54,7 @@ public class LiveUpdatePlugin: CAPPlugin {
                 let options = DownloadBundleOptions(artifactType: artifactType, bundleId: bundleId, checksum: checksum, url: url)
 
                 try await implementation?.downloadBundle(options)
-                call.resolve()
+                self.resolveCall(call)
             } catch {
                 rejectCall(call, error)
             }
@@ -64,9 +64,10 @@ public class LiveUpdatePlugin: CAPPlugin {
     @objc func fetchLatestBundle(_ call: CAPPluginCall) {
         Task {
             do {
-                let result = try await implementation?.fetchLatestBundle()
+                let options = FetchLatestBundleOptions(call)
+                let result = try await implementation?.fetchLatestBundle(options)
                 if let result = result?.toJSObject() as? JSObject {
-                    call.resolve(result)
+                    self.resolveCall(call, result)
                 }
             } catch {
                 rejectCall(call, error)
@@ -81,7 +82,7 @@ public class LiveUpdatePlugin: CAPPlugin {
                 return
             }
             if let result = result?.toJSObject() as? JSObject {
-                call.resolve(result)
+                self.resolveCall(call, result)
             }
         })
     }
@@ -93,7 +94,7 @@ public class LiveUpdatePlugin: CAPPlugin {
                 return
             }
             if let result = result?.toJSObject() as? JSObject {
-                call.resolve(result)
+                self.resolveCall(call, result)
             }
         })
     }
@@ -105,7 +106,19 @@ public class LiveUpdatePlugin: CAPPlugin {
                 return
             }
             if let result = result?.toJSObject() as? JSObject {
-                call.resolve(result)
+                self.resolveCall(call, result)
+            }
+        })
+    }
+
+    @objc func getCurrentBundle(_ call: CAPPluginCall) {
+        implementation?.getCurrentBundle(completion: { result, error in
+            if let error = error {
+                self.rejectCall(call, error)
+                return
+            }
+            if let result = result?.toJSObject() as? JSObject {
+                self.resolveCall(call, result)
             }
         })
     }
@@ -117,7 +130,7 @@ public class LiveUpdatePlugin: CAPPlugin {
                 return
             }
             if let result = result?.toJSObject() as? JSObject {
-                call.resolve(result)
+                self.resolveCall(call, result)
             }
         })
     }
@@ -129,7 +142,19 @@ public class LiveUpdatePlugin: CAPPlugin {
                 return
             }
             if let result = result?.toJSObject() as? JSObject {
-                call.resolve(result)
+                self.resolveCall(call, result)
+            }
+        })
+    }
+
+    @objc func getNextBundle(_ call: CAPPluginCall) {
+        implementation?.getNextBundle(completion: { result, error in
+            if let error = error {
+                self.rejectCall(call, error)
+                return
+            }
+            if let result = result?.toJSObject() as? JSObject {
+                self.resolveCall(call, result)
             }
         })
     }
@@ -141,7 +166,7 @@ public class LiveUpdatePlugin: CAPPlugin {
                 return
             }
             if let result = result?.toJSObject() as? JSObject {
-                call.resolve(result)
+                self.resolveCall(call, result)
             }
         })
     }
@@ -153,24 +178,24 @@ public class LiveUpdatePlugin: CAPPlugin {
                 return
             }
             if let result = result?.toJSObject() as? JSObject {
-                call.resolve(result)
+                self.resolveCall(call, result)
             }
         })
     }
 
     @objc func ready(_ call: CAPPluginCall) {
         implementation?.ready()
-        call.resolve()
+        resolveCall(call)
     }
 
     @objc func reload(_ call: CAPPluginCall) {
         implementation?.reload()
-        call.resolve()
+        resolveCall(call)
     }
 
     @objc func reset(_ call: CAPPluginCall) {
         implementation?.reset()
-        call.resolve()
+        resolveCall(call)
     }
 
     @objc func setBundle(_ call: CAPPluginCall) {
@@ -186,8 +211,8 @@ public class LiveUpdatePlugin: CAPPlugin {
                 self.rejectCall(call, error)
                 return
             }
+            self.resolveCall(call)
         })
-        call.resolve()
     }
 
     @objc func setChannel(_ call: CAPPluginCall) {
@@ -200,8 +225,8 @@ public class LiveUpdatePlugin: CAPPlugin {
                 self.rejectCall(call, error)
                 return
             }
+            self.resolveCall(call)
         })
-        call.resolve()
     }
 
     @objc func setCustomId(_ call: CAPPluginCall) {
@@ -217,14 +242,25 @@ public class LiveUpdatePlugin: CAPPlugin {
                 self.rejectCall(call, error)
                 return
             }
+            self.resolveCall(call)
+        })
+    }
+
+    @objc func setNextBundle(_ call: CAPPluginCall) {
+        let options = SetNextBundleOptions(call)
+
+        implementation?.setNextBundle(options, completion: { error in
+            if let error = error {
+                self.rejectCall(call, error)
+                return
+            }
+            self.resolveCall(call)
         })
-        call.resolve()
     }
 
     @objc func sync(_ call: CAPPluginCall) {
         Task {
             do {
-
                 guard let _ = config?.appId else {
                     call.reject(CustomError.appIdMissing.localizedDescription)
                     return
@@ -236,10 +272,11 @@ public class LiveUpdatePlugin: CAPPlugin {
                 }
                 syncInProgress = true
 
-                let result = try await implementation?.sync()
+                let options = SyncOptions(call)
+                let result = try await implementation?.sync(options)
                 self.syncInProgress = false
                 if let result = result?.toJSObject() as? JSObject {
-                    call.resolve(result)
+                    resolveCall(call, result)
                 }
             } catch {
                 self.syncInProgress = false
@@ -274,4 +311,12 @@ public class LiveUpdatePlugin: CAPPlugin {
         }
         call.reject(message)
     }
+
+    private func resolveCall(_ call: CAPPluginCall) {
+        call.resolve()
+    }
+
+    private func resolveCall(_ call: CAPPluginCall, _ result: JSObject) {
+        call.resolve(result)
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capawesome/capacitor-live-update",
-  "version": "6.6.0",
+  "version": "6.7.1",
   "description": "Capacitor plugin to update your app remotely in real-time.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -67,7 +67,7 @@
     "@capacitor/android": "6.0.0",
     "@capacitor/cli": "6.0.0",
     "@capacitor/core": "6.0.0",
-    "@capacitor/docgen": "0.0.17",
+    "@capacitor/docgen": "0.3.0",
     "@capacitor/ios": "6.0.0",
     "@ionic/eslint-config": "0.3.0",
     "@ionic/prettier-config": "2.0.0",