@capawesome/capacitor-live-update 8.4.3 → 8.4.4

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/LiveUpdate.java

@@ -57,6 +57,7 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.SocketTimeoutException;
 import java.security.KeyFactory;
 import java.security.MessageDigest;
 import java.security.PublicKey;
@@ -180,7 +181,7 @@ public class LiveUpdate {
                 .host(config.getServerDomain())
                 .addPathSegment("v1")
                 .addPathSegment("apps")
-                .addPathSegment(getAppId())
+                .addPathSegment(requireAppId())
                 .addPathSegment("channels");
             if (options.getLimit() != null) {
                 urlBuilder.addQueryParameter("limit", String.valueOf(options.getLimit()));
@@ -739,6 +740,8 @@ public class LiveUpdate {
                             Logger.error(LiveUpdatePlugin.TAG, errorMessage, exception);
                             completionCallback.error(exception);
                         }
+                    } catch (IOException e) {
+                        handleDownloadFailure(e, completionCallback);
                     } catch (Exception e) {
                         completionCallback.error(e);
                     }
@@ -746,7 +749,7 @@ public class LiveUpdate {
 
                 @Override
                 public void error(@NonNull Exception exception) {
-                    completionCallback.error(exception);
+                    handleDownloadFailure(exception, completionCallback);
                 }
             }
         );
@@ -1006,7 +1009,7 @@ public class LiveUpdate {
                 .host(config.getServerDomain())
                 .addPathSegment("v1")
                 .addPathSegment("apps")
-                .addPathSegment(getAppId())
+                .addPathSegment(requireAppId())
                 .addPathSegment("bundles")
                 .addPathSegment("latest")
                 .addQueryParameter("appVersionCode", getVersionCodeAsString())
@@ -1207,6 +1210,15 @@ public class LiveUpdate {
         return getPackageInfo().versionName;
     }
 
+    private void handleDownloadFailure(@NonNull Exception exception, @NonNull EmptyCallback callback) {
+        Logger.error(LiveUpdatePlugin.TAG, exception.getMessage(), exception);
+        if (exception instanceof SocketTimeoutException) {
+            callback.error(exception);
+        } else {
+            callback.error(new Exception(LiveUpdatePlugin.ERROR_DOWNLOAD_FAILED));
+        }
+    }
+
     private boolean hasBundleById(@NonNull String bundleId) {
         File bundleDirectory = buildBundleDirectoryFor(bundleId);
         return bundleDirectory.exists();
@@ -1285,6 +1297,15 @@ public class LiveUpdate {
         sync(options, callback);
     }
 
+    @NonNull
+    private String requireAppId() throws Exception {
+        String appId = getAppId();
+        if (appId == null || appId.isEmpty()) {
+            throw new Exception(LiveUpdatePlugin.ERROR_APP_ID_MISSING);
+        }
+        return appId;
+    }
+
     private void rollback() {
         // Set the rollback flag
         rollbackPerformed = true;

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/LiveUpdateHttpClient.java

@@ -88,7 +88,7 @@ public class LiveUpdateHttpClient {
 
                 @Override
                 public void onFailure(@NonNull Call call, @NonNull IOException e) {
-                    callback.error(new Exception(e));
+                    callback.error(e);
                 }
             }
         );

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/LiveUpdatePlugin.java

@@ -37,7 +37,7 @@ import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.Result;
 public class LiveUpdatePlugin extends Plugin {
 
     public static final String TAG = "LiveUpdate";
-    public static final String VERSION = "8.4.3";
+    public static final String VERSION = "8.4.4";
     public static final String SHARED_PREFERENCES_NAME = "CapawesomeLiveUpdate"; // DO NOT CHANGE
     public static final String ERROR_APP_ID_MISSING = "appId must be configured.";
     public static final String ERROR_BUNDLE_EXISTS = "bundle already exists.";
@@ -60,9 +60,6 @@ public class LiveUpdatePlugin extends Plugin {
     public static final String EVENT_NEXT_BUNDLE_SET = "nextBundleSet";
     public static final String EVENT_RELOADED = "reloaded";
 
-    @Nullable
-    private LiveUpdateConfig config;
-
     @Nullable
     private LiveUpdate implementation;
 
@@ -70,8 +67,7 @@ public class LiveUpdatePlugin extends Plugin {
 
     public void load() {
         try {
-            config = getLiveUpdateConfig();
-            implementation = new LiveUpdate(config, this);
+            implementation = new LiveUpdate(getLiveUpdateConfig(), this);
         } catch (Exception exception) {
             Logger.error(TAG, exception.getMessage(), exception);
         }
@@ -183,12 +179,6 @@ public class LiveUpdatePlugin extends Plugin {
     @PluginMethod
     public void fetchChannels(PluginCall call) {
         try {
-            String appId = config.getAppId();
-            if (appId == null || appId.isEmpty()) {
-                call.reject(ERROR_APP_ID_MISSING);
-                return;
-            }
-
             FetchChannelsOptions options = new FetchChannelsOptions(call);
             NonEmptyCallback<FetchChannelsResult> callback = new NonEmptyCallback<>() {
                 @Override
@@ -211,12 +201,6 @@ public class LiveUpdatePlugin extends Plugin {
     @PluginMethod
     public void fetchLatestBundle(PluginCall call) {
         try {
-            String appId = config.getAppId();
-            if (appId == null || appId.isEmpty()) {
-                call.reject(ERROR_APP_ID_MISSING);
-                return;
-            }
-
             FetchLatestBundleOptions options = new FetchLatestBundleOptions(call);
             NonEmptyCallback<FetchLatestBundleResult> callback = new NonEmptyCallback<>() {
                 @Override
@@ -633,12 +617,6 @@ public class LiveUpdatePlugin extends Plugin {
     @PluginMethod
     public void sync(PluginCall call) {
         try {
-            String appId = config.getAppId();
-            if (appId == null || appId.isEmpty()) {
-                call.reject(ERROR_APP_ID_MISSING);
-                return;
-            }
-
             SyncOptions options = new SyncOptions(call);
             NonEmptyCallback<Result> callback = new NonEmptyCallback<>() {
                 @Override

package/ios/Plugin/LiveUpdate.swift

@@ -98,7 +98,8 @@ import CommonCrypto
         if let query = options.getQuery() {
             parameters["query"] = query
         }
-        var urlComponents = URLComponents(string: "https://\(config.serverDomain)/v1/apps/\(getAppId() ?? "")/channels")!
+        let appId = try requireAppId()
+        var urlComponents = URLComponents(string: "https://\(config.serverDomain)/v1/apps/\(appId)/channels")!
         if !parameters.isEmpty {
             urlComponents.queryItems = parameters.map { URLQueryItem(name: $0.key, value: $0.value) }
         }
@@ -603,7 +604,8 @@ import CommonCrypto
         parameters["osVersion"] = await UIDevice.current.systemVersion
         parameters["platform"] = "1"
         parameters["pluginVersion"] = LiveUpdatePlugin.version
-        var urlComponents = URLComponents(string: "https://\(config.serverDomain)/v1/apps/\(getAppId() ?? "")/bundles/latest")!
+        let appId = try requireAppId()
+        var urlComponents = URLComponents(string: "https://\(config.serverDomain)/v1/apps/\(appId)/bundles/latest")!
         urlComponents.queryItems = parameters.map { URLQueryItem(name: $0.key, value: $0.value) }
         let url = try urlComponents.asURL()
         CAPLog.print("[", LiveUpdatePlugin.tag, "] Fetching latest bundle: ", url)
@@ -802,6 +804,13 @@ import CommonCrypto
         }
     }
 
+    private func requireAppId() throws -> String {
+        guard let appId = getAppId(), !appId.isEmpty else {
+            throw CustomError.appIdMissing
+        }
+        return appId
+    }
+
     private func rollback() {
         // Set the rollback flag
         rollbackPerformed = true

package/ios/Plugin/LiveUpdatePlugin.swift

@@ -8,7 +8,7 @@ import Capacitor
 @objc(LiveUpdatePlugin)
 public class LiveUpdatePlugin: CAPPlugin, CAPBridgedPlugin {
     public static let tag = "LiveUpdate"
-    public static let version = "8.4.3"
+    public static let version = "8.4.4"
     public static let userDefaultsPrefix = "CapawesomeLiveUpdate" // DO NOT CHANGE
 
     public let identifier = "LiveUpdatePlugin"
@@ -46,12 +46,10 @@ public class LiveUpdatePlugin: CAPPlugin, CAPBridgedPlugin {
     private let eventNextBundleSet = "nextBundleSet"
     private let eventReloaded = "reloaded"
 
-    private var config: LiveUpdateConfig?
     private var implementation: LiveUpdate?
 
     override public func load() {
-        self.config = liveUpdateConfig()
-        self.implementation = LiveUpdate(config: config!, plugin: self)
+        self.implementation = LiveUpdate(config: liveUpdateConfig(), plugin: self)
 
         // Notify implementation about load
         implementation?.handleLoad()
@@ -115,11 +113,6 @@ public class LiveUpdatePlugin: CAPPlugin, CAPBridgedPlugin {
     @objc func fetchChannels(_ call: CAPPluginCall) {
         Task {
             do {
-                guard let appId = config?.appId, !appId.isEmpty else {
-                    call.reject(CustomError.appIdMissing.localizedDescription)
-                    return
-                }
-
                 let options = FetchChannelsOptions(call)
                 let result = try await implementation?.fetchChannels(options)
                 if let result = result?.toJSObject() as? JSObject {
@@ -134,11 +127,6 @@ public class LiveUpdatePlugin: CAPPlugin, CAPBridgedPlugin {
     @objc func fetchLatestBundle(_ call: CAPPluginCall) {
         Task {
             do {
-                guard let appId = config?.appId, !appId.isEmpty else {
-                    call.reject(CustomError.appIdMissing.localizedDescription)
-                    return
-                }
-
                 let options = FetchLatestBundleOptions(call)
                 let result = try await implementation?.fetchLatestBundle(options)
                 if let result = result?.toJSObject() as? JSObject {
@@ -373,11 +361,6 @@ public class LiveUpdatePlugin: CAPPlugin, CAPBridgedPlugin {
     @objc func sync(_ call: CAPPluginCall) {
         Task {
             do {
-                guard let appId = config?.appId, !appId.isEmpty else {
-                    call.reject(CustomError.appIdMissing.localizedDescription)
-                    return
-                }
-
                 let options = SyncOptions(call)
                 let result = try await implementation?.sync(options)
                 if let result = result?.toJSObject() as? JSObject {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capawesome/capacitor-live-update",
-  "version": "8.4.3",
+  "version": "8.4.4",
   "description": "Capacitor plugin to update your app remotely in real-time on Android and iOS.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",