@capgo/capacitor-updater 6.25.8 → 6.27.11

package/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java

@@ -71,7 +71,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private static final String[] BREAKING_EVENT_NAMES = { "breakingAvailable", "majorAvailable" };
     private static final String LAST_FAILED_BUNDLE_PREF_KEY = "CapacitorUpdater.lastFailedBundle";
 
-    private final String pluginVersion = "6.25.8";
+    private final String pluginVersion = "6.27.11";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -1572,7 +1572,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     }
 
     private void endBackGroundTaskWithNotif(String msg, String latestVersionName, BundleInfo current, Boolean error) {
-        endBackGroundTaskWithNotif(msg, latestVersionName, current, error, false, "download_fail", "downloadFailed");
+        endBackGroundTaskWithNotif(msg, latestVersionName, current, error, false, "download_fail", "downloadFailed", true);
     }
 
     private void endBackGroundTaskWithNotif(
@@ -1582,7 +1582,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         Boolean error,
         Boolean isDirectUpdate
     ) {
-        endBackGroundTaskWithNotif(msg, latestVersionName, current, error, isDirectUpdate, "download_fail", "downloadFailed");
+        endBackGroundTaskWithNotif(msg, latestVersionName, current, error, isDirectUpdate, "download_fail", "downloadFailed", true);
     }
 
     private void endBackGroundTaskWithNotif(
@@ -1593,6 +1593,19 @@ public class CapacitorUpdaterPlugin extends Plugin {
         Boolean isDirectUpdate,
         String failureAction,
         String failureEvent
+    ) {
+        endBackGroundTaskWithNotif(msg, latestVersionName, current, error, isDirectUpdate, failureAction, failureEvent, true);
+    }
+
+    private void endBackGroundTaskWithNotif(
+        String msg,
+        String latestVersionName,
+        BundleInfo current,
+        Boolean error,
+        Boolean isDirectUpdate,
+        String failureAction,
+        String failureEvent,
+        boolean shouldSendStats
     ) {
         if (error) {
             logger.info(
@@ -1603,7 +1616,9 @@ public class CapacitorUpdaterPlugin extends Plugin {
                     "latestVersionName: " +
                     latestVersionName
             );
-            this.implementation.sendStats(failureAction, current.getVersionName());
+            if (shouldSendStats) {
+                this.implementation.sendStats(failureAction, current.getVersionName());
+            }
             final JSObject ret = new JSObject();
             ret.put("version", latestVersionName);
             this.notifyListeners(failureEvent, ret);
@@ -1634,14 +1649,23 @@ public class CapacitorUpdaterPlugin extends Plugin {
                     if (jsRes.has("error")) {
                         String error = jsRes.getString("error");
                         String errorMessage = jsRes.has("message") ? jsRes.getString("message") : "server did not provide a message";
-                        logger.error("getLatest failed with error: " + error + ", message: " + errorMessage);
+                        int statusCode = jsRes.has("statusCode") ? jsRes.optInt("statusCode", 0) : 0;
+                        boolean responseIsOk = statusCode >= 200 && statusCode < 300;
+
+                        logger.error(
+                            "getLatest failed with error: " + error + ", message: " + errorMessage + ", statusCode: " + statusCode
+                        );
                         String latestVersion = jsRes.has("version") ? jsRes.getString("version") : current.getVersionName();
+
                         CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(
                             errorMessage,
                             latestVersion,
                             current,
                             true,
-                            plannedDirectUpdate
+                            plannedDirectUpdate,
+                            "download_fail",
+                            "downloadFailed",
+                            !responseIsOk
                         );
                         return;
                     }

package/android/src/main/java/ee/forgr/capacitor_updater/CapgoUpdater.java

@@ -871,11 +871,13 @@ public class CapgoUpdater {
                     @Override
                     public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
                         try (ResponseBody responseBody = response.body()) {
+                            final int statusCode = response.code();
                             // Check for 429 rate limit
                             if (checkAndHandleRateLimitResponse(response)) {
                                 Map<String, Object> retError = new HashMap<>();
                                 retError.put("message", "Rate limit exceeded");
                                 retError.put("error", "rate_limit_exceeded");
+                                retError.put("statusCode", statusCode);
                                 callback.callback(retError);
                                 return;
                             }
@@ -884,6 +886,7 @@ public class CapgoUpdater {
                                 Map<String, Object> retError = new HashMap<>();
                                 retError.put("message", "Server error: " + response.code());
                                 retError.put("error", "response_error");
+                                retError.put("statusCode", statusCode);
                                 callback.callback(retError);
                                 return;
                             }
@@ -901,11 +904,13 @@ public class CapgoUpdater {
                                 } else {
                                     retError.put("message", "server did not provide a message");
                                 }
+                                retError.put("statusCode", statusCode);
                                 callback.callback(retError);
                                 return;
                             }
 
                             Map<String, Object> ret = new HashMap<>();
+                            ret.put("statusCode", statusCode);
 
                             Iterator<String> keys = jsonResponse.keys();
                             while (keys.hasNext()) {
@@ -1237,18 +1242,32 @@ public class CapgoUpdater {
             return;
         }
 
-        // Auto-detect values
-        String appId = this.appId;
-        String platform = "android";
-        boolean isEmulator = this.isEmulator();
-        boolean isProd = this.isProd();
+        JSONObject json;
+        try {
+            json = this.createInfoObject();
+        } catch (JSONException e) {
+            logger.error("Error creating info object: " + e.getMessage());
+            final Map<String, Object> retError = new HashMap<>();
+            retError.put("message", "Cannot get info: " + e);
+            retError.put("error", "json_error");
+            callback.callback(retError);
+            return;
+        }
 
-        // Build URL with query parameters
+        // Build URL with query parameters from JSON
         HttpUrl.Builder urlBuilder = HttpUrl.parse(channelUrl).newBuilder();
-        urlBuilder.addQueryParameter("app_id", appId);
-        urlBuilder.addQueryParameter("platform", platform);
-        urlBuilder.addQueryParameter("is_emulator", String.valueOf(isEmulator));
-        urlBuilder.addQueryParameter("is_prod", String.valueOf(isProd));
+        try {
+            Iterator<String> keys = json.keys();
+            while (keys.hasNext()) {
+                String key = keys.next();
+                Object value = json.get(key);
+                if (value != null) {
+                    urlBuilder.addQueryParameter(key, value.toString());
+                }
+            }
+        } catch (JSONException e) {
+            logger.error("Error adding query parameters: " + e.getMessage());
+        }
 
         Request request = new Request.Builder().url(urlBuilder.build()).get().build();
 

package/ios/Sources/CapacitorUpdaterPlugin/CapacitorUpdaterPlugin.swift

@@ -54,7 +54,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "isShakeMenuEnabled", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapgoUpdater()
-    private let pluginVersion: String = "6.25.8"
+    private let pluginVersion: String = "6.27.11"
     static let updateUrlDefault = "https://plugin.capgo.app/updates"
     static let statsUrlDefault = "https://plugin.capgo.app/stats"
     static let channelUrlDefault = "https://plugin.capgo.app/channel_self"
@@ -1234,10 +1234,13 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         current: BundleInfo,
         error: Bool = true,
         failureAction: String = "download_fail",
-        failureEvent: String = "downloadFailed"
+        failureEvent: String = "downloadFailed",
+        sendStats: Bool = true
     ) {
         if error {
-            self.implementation.sendStats(action: failureAction, versionName: current.getVersionName())
+            if sendStats {
+                self.implementation.sendStats(action: failureAction, versionName: current.getVersionName())
+            }
             self.notifyListeners(failureEvent, data: ["version": latestVersionName])
         }
         self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
@@ -1265,11 +1268,14 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             // Handle network errors and other failures first
             if let backendError = res.error, !backendError.isEmpty {
                 self.logger.error("getLatest failed with error: \(backendError)")
+                let statusCode = res.statusCode
+                let responseIsOk = statusCode >= 200 && statusCode < 300
                 self.endBackGroundTaskWithNotif(
                     msg: res.message ?? backendError,
                     latestVersionName: res.version,
                     current: current,
-                    error: true
+                    error: true,
+                    sendStats: !responseIsOk
                 )
                 return
             }

package/ios/Sources/CapacitorUpdaterPlugin/CapgoUpdater.swift

@@ -343,6 +343,7 @@ import UIKit
         request.validate().responseDecodable(of: AppVersionDec.self) { response in
             switch response.result {
             case .success:
+                latest.statusCode = response.response?.statusCode ?? 0
                 if let url = response.value?.url {
                     latest.url = url
                 }
@@ -377,6 +378,7 @@ import UIKit
                 self.logger.error("Error getting Latest \(response.value.debugDescription) \(error)")
                 latest.message = "Error getting Latest \(String(describing: response.value))"
                 latest.error = "response_error"
+                latest.statusCode = response.response?.statusCode ?? 0
             }
             semaphore.signal()
         }
@@ -1299,20 +1301,28 @@ import UIKit
 
         let semaphore: DispatchSemaphore = DispatchSemaphore(value: 0)
 
-        // Auto-detect values
-        let appId = self.appId
-        let platform = "ios"
-        let isEmulator = self.isEmulator()
-        let isProd = self.isProd()
+        // Create info object and convert to query parameters
+        let infoObject = self.createInfoObject()
 
-        // Create query parameters
+        // Create query parameters from InfoObject
         var urlComponents = URLComponents(string: self.channelUrl)
-        urlComponents?.queryItems = [
-            URLQueryItem(name: "app_id", value: appId),
-            URLQueryItem(name: "platform", value: platform),
-            URLQueryItem(name: "is_emulator", value: String(isEmulator)),
-            URLQueryItem(name: "is_prod", value: String(isProd))
-        ]
+        var queryItems: [URLQueryItem] = []
+
+        // Convert InfoObject to dictionary using Mirror
+        let mirror = Mirror(reflecting: infoObject)
+        for child in mirror.children {
+            if let key = child.label, let value = child.value as? CustomStringConvertible {
+                queryItems.append(URLQueryItem(name: key, value: String(describing: value)))
+            } else if let key = child.label {
+                // Handle optional values
+                let mirror = Mirror(reflecting: child.value)
+                if let value = mirror.children.first?.value {
+                    queryItems.append(URLQueryItem(name: key, value: String(describing: value)))
+                }
+            }
+        }
+
+        urlComponents?.queryItems = queryItems
 
         guard let url = urlComponents?.url else {
             logger.error("Invalid channel URL")

package/ios/Sources/CapacitorUpdaterPlugin/InternalUtils.swift

@@ -160,6 +160,7 @@ struct AppVersionDec: Decodable {
     let breaking: Bool?
     let data: [String: String]?
     let manifest: [ManifestEntry]?
+    // The HTTP status code is captured separately in CapgoUpdater; this struct only mirrors JSON.
 }
 
 public class AppVersion: NSObject {
@@ -173,6 +174,7 @@ public class AppVersion: NSObject {
     var breaking: Bool?
     var data: [String: String]?
     var manifest: [ManifestEntry]?
+    var statusCode: Int = 0
 }
 
 extension AppVersion {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "6.25.8",
+  "version": "6.27.11",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",