@capgo/capacitor-updater 7.25.0 → 7.27.0

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 = "7.25.0";
+    private final String pluginVersion = "7.27.0";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -1304,6 +1304,9 @@ public class CapacitorUpdaterPlugin extends Plugin {
             CapacitorUpdaterPlugin.this.implementation.getLatest(CapacitorUpdaterPlugin.this.updateUrl, channel, (res) -> {
                 JSObject jsRes = mapToJSObject(res);
                 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);
                     call.reject(jsRes.getString("error"));
                     return;
                 } else if (jsRes.has("message")) {
@@ -1409,7 +1412,11 @@ public class CapacitorUpdaterPlugin extends Plugin {
                         CapacitorUpdaterPlugin.this.implementation.getLatest(CapacitorUpdaterPlugin.this.updateUrl, null, (res) -> {
                             JSObject jsRes = mapToJSObject(res);
                             if (jsRes.has("error")) {
-                                logger.error(Objects.requireNonNull(jsRes.getString("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);
                             } else if (jsRes.has("version")) {
                                 String newVersion = jsRes.getString("version");
                                 String currentVersion = String.valueOf(CapacitorUpdaterPlugin.this.implementation.getCurrentBundle());
@@ -1613,7 +1620,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
                     // Handle network errors and other failures first
                     if (jsRes.has("error")) {
                         String error = jsRes.getString("error");
-                        logger.error("getLatest failed with error: " + error);
+                        String errorMessage = jsRes.has("message") ? jsRes.getString("message") : "server did not provide a message";
+                        logger.error("getLatest failed with error: " + error + ", message: " + errorMessage);
                         String latestVersion = jsRes.has("version") ? jsRes.getString("version") : current.getVersionName();
                         if ("response_error".equals(error)) {
                             CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(

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

@@ -353,7 +353,15 @@ public class CapgoUpdater {
             manifest != null,
             this.isEmulator(),
             this.appId,
-            this.pluginVersion
+            this.pluginVersion,
+            this.isProd(),
+            this.statsUrl,
+            this.deviceID,
+            this.versionBuild,
+            this.versionCode,
+            this.versionOs,
+            this.customId,
+            this.defaultChannel
         );
 
         if (manifest != null) {
@@ -880,8 +888,12 @@ public class CapgoUpdater {
                             // Check for server-side errors first
                             if (jsonResponse.has("error")) {
                                 Map<String, Object> retError = new HashMap<>();
-                                retError.put("message", jsonResponse.getString("error"));
-                                retError.put("error", "server_error");
+                                retError.put("error", jsonResponse.getString("error"));
+                                if (jsonResponse.has("message")) {
+                                    retError.put("message", jsonResponse.getString("message"));
+                                } else {
+                                    retError.put("message", "server did not provide a message");
+                                }
                                 callback.callback(retError);
                                 return;
                             }
@@ -1008,8 +1020,12 @@ public class CapgoUpdater {
                             // Check for server-side errors first
                             if (jsonResponse.has("error")) {
                                 Map<String, Object> retError = new HashMap<>();
-                                retError.put("message", jsonResponse.getString("error"));
-                                retError.put("error", "server_error");
+                                retError.put("error", jsonResponse.getString("error"));
+                                if (jsonResponse.has("message")) {
+                                    retError.put("message", jsonResponse.getString("message"));
+                                } else {
+                                    retError.put("message", "server did not provide a message");
+                                }
                                 callback.callback(retError);
                                 return;
                             }
@@ -1161,8 +1177,12 @@ public class CapgoUpdater {
                             // Check for server-side errors first
                             if (jsonResponse.has("error")) {
                                 Map<String, Object> retError = new HashMap<>();
-                                retError.put("message", jsonResponse.getString("error"));
-                                retError.put("error", "server_error");
+                                retError.put("error", jsonResponse.getString("error"));
+                                if (jsonResponse.has("message")) {
+                                    retError.put("message", jsonResponse.getString("message"));
+                                } else {
+                                    retError.put("message", "server did not provide a message");
+                                }
                                 callback.callback(retError);
                                 return;
                             }
@@ -1289,8 +1309,12 @@ public class CapgoUpdater {
                                         JSONObject json = new JSONObject(data);
                                         if (json.has("error")) {
                                             Map<String, Object> retError = new HashMap<>();
-                                            retError.put("message", json.getString("error"));
-                                            retError.put("error", "server_error");
+                                            retError.put("error", json.getString("error"));
+                                            if (json.has("message")) {
+                                                retError.put("message", json.getString("message"));
+                                            } else {
+                                                retError.put("message", "server did not provide a message");
+                                            }
                                             callback.callback(retError);
                                             return;
                                         }

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

@@ -28,10 +28,14 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
+import okhttp3.Call;
+import okhttp3.Callback;
 import okhttp3.Interceptor;
+import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
 import okhttp3.Request;
+import okhttp3.RequestBody;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 import okio.Buffer;
@@ -64,6 +68,15 @@ public class DownloadService extends Worker {
     public static final String IS_MANIFEST = "is_manifest";
     public static final String APP_ID = "app_id";
     public static final String pluginVersion = "plugin_version";
+    public static final String STATS_URL = "stats_url";
+    public static final String DEVICE_ID = "device_id";
+    public static final String CUSTOM_ID = "custom_id";
+    public static final String VERSION_BUILD = "version_build";
+    public static final String VERSION_CODE = "version_code";
+    public static final String VERSION_OS = "version_os";
+    public static final String DEFAULT_CHANNEL = "default_channel";
+    public static final String IS_PROD = "is_prod";
+    public static final String IS_EMULATOR = "is_emulator";
     private static final String UPDATE_FILE = "update.dat";
 
     // Shared OkHttpClient to prevent resource leaks
@@ -130,6 +143,11 @@ public class DownloadService extends Worker {
         return Result.success(output);
     }
 
+    private String getInputString(String key, String fallback) {
+        String value = getInputData().getString(key);
+        return value != null ? value : fallback;
+    }
+
     @NonNull
     @Override
     public Result doWork() {
@@ -174,6 +192,62 @@ public class DownloadService extends Worker {
         return percent;
     }
 
+    private void sendStatsAsync(String action, String version) {
+        try {
+            String statsUrl = getInputData().getString(STATS_URL);
+            if (statsUrl == null || statsUrl.isEmpty()) {
+                return;
+            }
+
+            JSONObject json = new JSONObject();
+            json.put("platform", "android");
+            json.put("app_id", getInputString(APP_ID, "unknown"));
+            json.put("plugin_version", getInputString(pluginVersion, "unknown"));
+            json.put("version_name", version != null ? version : "");
+            json.put("old_version_name", "");
+            json.put("action", action);
+            json.put("device_id", getInputString(DEVICE_ID, ""));
+            json.put("custom_id", getInputString(CUSTOM_ID, ""));
+            json.put("version_build", getInputString(VERSION_BUILD, ""));
+            json.put("version_code", getInputString(VERSION_CODE, ""));
+            json.put("version_os", getInputString(VERSION_OS, currentVersionOs));
+            json.put("defaultChannel", getInputString(DEFAULT_CHANNEL, ""));
+            json.put("is_prod", getInputData().getBoolean(IS_PROD, true));
+            json.put("is_emulator", getInputData().getBoolean(IS_EMULATOR, false));
+
+            Request request = new Request.Builder()
+                .url(statsUrl)
+                .post(RequestBody.create(json.toString(), MediaType.get("application/json")))
+                .build();
+
+            sharedClient
+                .newCall(request)
+                .enqueue(
+                    new Callback() {
+                        @Override
+                        public void onFailure(@NonNull Call call, @NonNull IOException e) {
+                            if (logger != null) {
+                                logger.error("Failed to send stats: " + e.getMessage());
+                            }
+                        }
+
+                        @Override
+                        public void onResponse(@NonNull Call call, @NonNull Response response) {
+                            try (ResponseBody body = response.body()) {
+                                // nothing else to do, just closing body
+                            } catch (Exception ignored) {} finally {
+                                response.close();
+                            }
+                        }
+                    }
+                );
+        } catch (Exception e) {
+            if (logger != null) {
+                logger.error("sendStatsAsync error: " + e.getMessage());
+            }
+        }
+    }
+
     private void handleManifestDownload(
         String id,
         String documentsDir,
@@ -185,6 +259,10 @@ public class DownloadService extends Worker {
     ) {
         try {
             logger.debug("handleManifestDownload");
+
+            // Send stats for manifest download start
+            sendStatsAsync("download_manifest_start", version);
+
             JSONArray manifest = new JSONArray(manifestString);
             File destFolder = new File(documentsDir, dest);
             File cacheFolder = new File(getApplicationContext().getCacheDir(), "capgo_downloads");
@@ -252,6 +330,7 @@ public class DownloadService extends Worker {
                         setProgress(percent);
                     } catch (Exception e) {
                         logger.error("Error processing file: " + fileName + " " + e.getMessage());
+                        sendStatsAsync("download_manifest_file_fail", version + ":" + fileName);
                         hasError.set(true);
                     }
                 });
@@ -282,6 +361,9 @@ public class DownloadService extends Worker {
                 logger.error("One or more files failed to download");
                 throw new IOException("One or more files failed to download");
             }
+
+            // Send stats for manifest download complete
+            sendStatsAsync("download_manifest_complete", version);
         } catch (Exception e) {
             logger.error("Error in handleManifestDownload " + e.getMessage());
             throw new RuntimeException(e.getLocalizedMessage());
@@ -297,6 +379,9 @@ public class DownloadService extends Worker {
         String sessionKey,
         String checksum
     ) {
+        // Send stats for zip download start
+        sendStatsAsync("download_zip_start", version);
+
         File target = new File(documentsDir, dest);
         File infoFile = new File(documentsDir, UPDATE_FILE);
         File tempFile = new File(documentsDir, "temp" + ".tmp");
@@ -404,6 +489,9 @@ public class DownloadService extends Worker {
                         throw new RuntimeException("Failed to rename temp file to final destination");
                     }
                     infoFile.delete();
+
+                    // Send stats for zip download complete
+                    sendStatsAsync("download_zip_complete", version);
                 } catch (OutOfMemoryError e) {
                     logger.error("Out of memory during download: " + e.getMessage());
                     // Try to free some memory
@@ -503,6 +591,7 @@ public class DownloadService extends Worker {
 
         try (Response response = sharedClient.newCall(request).execute()) {
             if (!response.isSuccessful()) {
+                sendStatsAsync("download_manifest_file_fail", getInputData().getString(VERSION) + ":" + finalTargetFile.getName());
                 throw new IOException("Unexpected response code: " + response.code());
             }
 
@@ -526,7 +615,16 @@ public class DownloadService extends Worker {
                 try (FileInputStream fis = new FileInputStream(compressedFile)) {
                     byte[] compressedData = new byte[(int) compressedFile.length()];
                     fis.read(compressedData);
-                    byte[] decompressedData = decompressBrotli(compressedData, targetFile.getName());
+                    byte[] decompressedData;
+                    try {
+                        decompressedData = decompressBrotli(compressedData, targetFile.getName());
+                    } catch (IOException e) {
+                        sendStatsAsync(
+                            "download_manifest_brotli_fail",
+                            getInputData().getString(VERSION) + ":" + finalTargetFile.getName()
+                        );
+                        throw e;
+                    }
 
                     // Write decompressed data atomically
                     try (java.io.ByteArrayInputStream bais = new java.io.ByteArrayInputStream(decompressedData)) {
@@ -552,6 +650,7 @@ public class DownloadService extends Worker {
                 }
             } else {
                 finalTargetFile.delete();
+                sendStatsAsync("download_manifest_checksum_fail", getInputData().getString(VERSION) + ":" + finalTargetFile.getName());
                 throw new IOException(
                     "Checksum verification failed for: " +
                         downloadUrl +

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

@@ -61,7 +61,15 @@ public class DownloadWorkerManager {
         boolean isManifest,
         boolean isEmulator,
         String appId,
-        String pluginVersion
+        String pluginVersion,
+        boolean isProd,
+        String statsUrl,
+        String deviceId,
+        String versionBuild,
+        String versionCode,
+        String versionOs,
+        String customId,
+        String defaultChannel
     ) {
         initializeIfNeeded(context.getApplicationContext());
 
@@ -81,6 +89,15 @@ public class DownloadWorkerManager {
             .putString(DownloadService.PUBLIC_KEY, publicKey)
             .putString(DownloadService.APP_ID, appId)
             .putString(DownloadService.pluginVersion, pluginVersion)
+            .putString(DownloadService.STATS_URL, statsUrl)
+            .putString(DownloadService.DEVICE_ID, deviceId)
+            .putString(DownloadService.VERSION_BUILD, versionBuild)
+            .putString(DownloadService.VERSION_CODE, versionCode)
+            .putString(DownloadService.VERSION_OS, versionOs)
+            .putString(DownloadService.CUSTOM_ID, customId)
+            .putString(DownloadService.DEFAULT_CHANNEL, defaultChannel)
+            .putBoolean(DownloadService.IS_PROD, isProd)
+            .putBoolean(DownloadService.IS_EMULATOR, isEmulator)
             .build();
 
         // Create network constraints - be more lenient on emulators

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 = "7.25.0"
+    private let pluginVersion: String = "7.27.0"
     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"

package/ios/Sources/CapacitorUpdaterPlugin/CapgoUpdater.swift

@@ -409,6 +409,9 @@ import UIKit
         let bundleInfo = BundleInfo(id: id, version: version, status: BundleStatus.DOWNLOADING, downloaded: Date(), checksum: "")
         self.saveBundleInfo(id: id, bundle: bundleInfo)
 
+        // Send stats for manifest download start
+        self.sendStats(action: "download_manifest_start", versionName: version)
+
         // Notify the start of the download process
         self.notifyDownload(id: id, percent: 0, ignoreMultipleOfTen: true)
 
@@ -467,6 +470,7 @@ import UIKit
                         do {
                             let statusCode = response.response?.statusCode ?? 200
                             if statusCode < 200 || statusCode >= 300 {
+                                self.sendStats(action: "download_manifest_file_fail", versionName: "\(version):\(fileName)")
                                 if let stringData = String(data: data, encoding: .utf8) {
                                     throw NSError(domain: "StatusCodeError", code: 2, userInfo: [NSLocalizedDescriptionKey: "Failed to fetch. Status code (\(statusCode)) invalid. Data: \(stringData) for file \(fileName) at url \(downloadUrl)"])
                                 } else {
@@ -498,6 +502,7 @@ import UIKit
                             if isBrotli {
                                 // Decompress the Brotli data
                                 guard let decompressedData = self.decompressBrotli(data: finalData, fileName: fileName) else {
+                                    self.sendStats(action: "download_manifest_brotli_fail", versionName: "\(version):\(finalFileName)")
                                     throw NSError(domain: "BrotliDecompressionError", code: 1, userInfo: [NSLocalizedDescriptionKey: "Failed to decompress Brotli data for file \(fileName) at url \(downloadUrl)"])
                                 }
                                 finalData = decompressedData
@@ -508,6 +513,7 @@ import UIKit
                                 // assume that calcChecksum != null
                                 let calculatedChecksum = CryptoCipher.calcChecksum(filePath: destFilePath)
                                 if calculatedChecksum != fileHash {
+                                    self.sendStats(action: "download_manifest_checksum_fail", versionName: "\(version):\(finalFileName)")
                                     throw NSError(domain: "ChecksumError", code: 1, userInfo: [NSLocalizedDescriptionKey: "Computed checksum is not equal to required checksum (\(calculatedChecksum) != \(fileHash)) for file \(fileName) at url \(downloadUrl)"])
                                 }
                             }
@@ -523,6 +529,8 @@ import UIKit
                             self.logger.error("downloadManifest \(id) \(fileName) error: \(error.localizedDescription)")
                         }
                     case .failure(let error):
+                        downloadError = error
+                        self.sendStats(action: "download_manifest_file_fail", versionName: "\(version):\(fileName)")
                         self.logger.error("downloadManifest \(id) \(fileName) download error: \(error.localizedDescription). Debug response: \(response.debugDescription).")
                     }
                 }
@@ -542,6 +550,9 @@ import UIKit
         let updatedBundle = bundleInfo.setStatus(status: BundleStatus.PENDING.localizedString)
         self.saveBundleInfo(id: id, bundle: updatedBundle)
 
+        // Send stats for manifest download complete
+        self.sendStats(action: "download_manifest_complete", versionName: version)
+
         logger.info("downloadManifest done \(id)")
         return updatedBundle
     }
@@ -672,6 +683,10 @@ import UIKit
         var lastSentProgress = 0
         var totalReceivedBytes: Int64 = loadDownloadProgress() // Retrieving the amount of already downloaded data if exist, defined at 0 otherwise
         let requestHeaders: HTTPHeaders = ["Range": "bytes=\(totalReceivedBytes)-"]
+
+        // Send stats for zip download start
+        self.sendStats(action: "download_zip_start", versionName: version)
+
         // Opening connection for streaming the bytes
         if totalReceivedBytes == 0 {
             self.notifyDownload(id: id, percent: 0, ignoreMultipleOfTen: true)
@@ -780,6 +795,10 @@ import UIKit
         let info = BundleInfo(id: id, version: version, status: BundleStatus.PENDING, downloaded: Date(), checksum: checksum)
         self.saveBundleInfo(id: id, bundle: info)
         self.cleanDownloadData()
+
+        // Send stats for zip download complete
+        self.sendStats(action: "download_zip_complete", versionName: version)
+
         self.notifyDownload(id: id, percent: 100)
         logger.info("Downloading: 100% (complete)")
         return info

package/package.json

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