@capgo/capacitor-updater 5.6.14 → 5.7.0

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

@@ -187,6 +187,7 @@ public class CapacitorUpdater {
             "unzip: Windows path is not supported, please use unix path as require by zip RFC: " +
             entry.getName()
           );
+          this.sendStats("windows_path_fail");
         }
         final File file = new File(targetDirectory, entry.getName());
         final String canonicalPath = file.getCanonicalPath();
@@ -194,6 +195,7 @@ public class CapacitorUpdater {
         final File dir = entry.isDirectory() ? file : file.getParentFile();
 
         if (!canonicalPath.startsWith(canonicalDir)) {
+          this.sendStats("canonical_path_fail");
           throw new FileNotFoundException(
             "SecurityException, Failed to ensure directory is the start path : " +
             canonicalDir +
@@ -203,6 +205,8 @@ public class CapacitorUpdater {
         }
 
         if (!dir.isDirectory() && !dir.mkdirs()) {
+          final JSObject ret = new JSObject();
+          this.sendStats("directory_path_fail");
           throw new FileNotFoundException(
             "Failed to ensure directory: " + dir.getAbsolutePath()
           );
@@ -229,6 +233,9 @@ public class CapacitorUpdater {
         lengthRead += entry.getCompressedSize();
       }
       return targetDirectory;
+    } catch (IOException e) {
+      this.sendStats("unzip_fail");
+      throw new IOException("Failed to unzip: " + zipFile.getPath());
     }
   }
 
@@ -311,10 +318,7 @@ public class CapacitorUpdater {
               CapacitorUpdater.this.getCurrentBundle().getVersionName()
             );
             CapacitorUpdater.this.notifyListeners("downloadFailed", ret);
-            CapacitorUpdater.this.sendStats(
-                "download_fail",
-                CapacitorUpdater.this.getCurrentBundle().getVersionName()
-              );
+            CapacitorUpdater.this.sendStats("download_fail");
             return;
           }
           CapacitorUpdater.this.finishDownload(
@@ -370,7 +374,7 @@ public class CapacitorUpdater {
           CapacitorUpdater.TAG,
           "Error checksum " + checksumRes + " " + checksum
         );
-        this.sendStats("checksum_fail", getCurrentBundle().getVersionName());
+        this.sendStats("checksum_fail");
         final Boolean res = this.delete(id);
         if (res) {
           Log.i(
@@ -399,10 +403,7 @@ public class CapacitorUpdater {
         CapacitorUpdater.this.getCurrentBundle().getVersionName()
       );
       CapacitorUpdater.this.notifyListeners("downloadFailed", ret);
-      CapacitorUpdater.this.sendStats(
-          "download_fail",
-          CapacitorUpdater.this.getCurrentBundle().getVersionName()
-        );
+      CapacitorUpdater.this.sendStats("download_fail");
       return false;
     }
     return true;
@@ -1050,6 +1051,10 @@ public class CapacitorUpdater {
     this.requestQueue.add(setRetryPolicy(request));
   }
 
+  public void sendStats(final String action) {
+    this.sendStats(action, this.getCurrentBundle().getVersionName());
+  }
+
   public void sendStats(final String action, final String versionName) {
     String statsUrl = this.statsUrl;
     if (statsUrl == null || "".equals(statsUrl) || statsUrl.length() == 0) {

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

@@ -55,7 +55,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
   private static final String channelUrlDefault =
     "https://api.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "5.6.14";
+  private final String PLUGIN_VERSION = "5.7.0";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -606,12 +606,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
           final JSObject ret = new JSObject();
           ret.put("version", version);
           CapacitorUpdaterPlugin.this.notifyListeners("downloadFailed", ret);
-          final BundleInfo current =
-            CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
-          CapacitorUpdaterPlugin.this.implementation.sendStats(
-              "download_fail",
-              current.getVersionName()
-            );
+          CapacitorUpdaterPlugin.this.implementation.sendStats("download_fail");
         }
       });
     } catch (final Exception e) {
@@ -620,12 +615,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
       final JSObject ret = new JSObject();
       ret.put("version", version);
       CapacitorUpdaterPlugin.this.notifyListeners("downloadFailed", ret);
-      final BundleInfo current =
-        CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
-      CapacitorUpdaterPlugin.this.implementation.sendStats(
-          "download_fail",
-          current.getVersionName()
-        );
+      CapacitorUpdaterPlugin.this.implementation.sendStats("download_fail");
     }
   }
 
@@ -1449,11 +1439,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
   }
 
   public void appMovedToBackground() {
-    final BundleInfo current =
-      CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
     CapacitorUpdaterPlugin.this.implementation.sendStats(
-        "app_moved_to_background",
-        current.getVersionName()
+        "app_moved_to_background"
       );
     Log.i(CapacitorUpdater.TAG, "Checking for pending update");
     try {

package/ios/Plugin/CapacitorUpdater.swift

@@ -412,6 +412,7 @@ extension CustomError: LocalizedError {
         let destHot: URL = base.appendingPathComponent(id)
         let destUnZip: URL = documentsDir.appendingPathComponent(randomString(length: 10))
         if !SSZipArchive.unzipFile(atPath: sourceZip.path, toDestination: destUnZip.path) {
+            self.sendStats(action: "unzip_fail")
             throw CustomError.cannotUnzip
         }
         if try unflatFolder(source: destUnZip, dest: destHot) {
@@ -664,7 +665,7 @@ extension CustomError: LocalizedError {
         self.setFallbackBundle(fallback: Optional<BundleInfo>.none)
         _ = self.setNextBundle(next: Optional<String>.none)
         if !isInternal {
-            self.sendStats(action: "reset", versionName: self.getCurrentBundle().getVersionName())
+            self.sendStats(action: "reset")
         }
     }
 
@@ -802,18 +803,29 @@ extension CustomError: LocalizedError {
         return getChannel
     }
 
-    func sendStats(action: String, versionName: String) {
-        if (self.statsUrl ).isEmpty {
+    func sendStats(action: String, versionName: String? = nil) {
+        guard !statsUrl.isEmpty else {
             return
         }
-        var parameters: InfoObject = self.createInfoObject()
+
+        let versionName = versionName ?? getCurrentBundle().getVersionName()
+
+        var parameters = createInfoObject()
         parameters.action = action
+
         DispatchQueue.global(qos: .background).async {
-            let request = AF.request(self.statsUrl, method: .post, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
+            let request = AF.request(
+                self.statsUrl,
+                method: .post,
+                parameters: parameters,
+                encoder: JSONParameterEncoder.default,
+                requestModifier: { $0.timeoutInterval = self.timeout }
+            )
+
             request.responseData { response in
                 switch response.result {
                 case .success:
-                    print("\(self.TAG) Stats send for \(action), version \(versionName)")
+                    print("\(self.TAG) Stats sent for \(action), version \(versionName)")
                 case let .failure(error):
                     print("\(self.TAG) Error sending stats: ", response.value ?? "", error)
                 }

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -15,7 +15,7 @@ import Version
 @objc(CapacitorUpdaterPlugin)
 public class CapacitorUpdaterPlugin: CAPPlugin {
     public var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "5.6.14"
+    private let PLUGIN_VERSION: String = "5.7.0"
     static let updateUrlDefault = "https://api.capgo.app/updates"
     static let statsUrlDefault = "https://api.capgo.app/stats"
     static let channelUrlDefault = "https://api.capgo.app/channel_self"
@@ -232,8 +232,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             } catch {
                 print("\(self.implementation.TAG) Failed to download from: \(String(describing: url)) \(error.localizedDescription)")
                 self.notifyListeners("downloadFailed", data: ["version": version])
-                let current: BundleInfo = self.implementation.getCurrentBundle()
-                self.implementation.sendStats(action: "download_fail", versionName: current.getVersionName())
+                self.implementation.sendStats(action: "download_fail")
                 call.reject("Failed to download from: \(url!)", error.localizedDescription)
             }
         }
@@ -805,8 +804,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     }
 
     @objc func appMovedToBackground() {
-        let current: BundleInfo = self.implementation.getCurrentBundle()
-        self.implementation.sendStats(action: "app_moved_to_background", versionName: current.getVersionName())
+        self.implementation.sendStats(action: "app_moved_to_background")
         print("\(self.implementation.TAG) Check for pending update")
         let delayUpdatePreferences = UserDefaults.standard.string(forKey: DELAY_CONDITION_PREFERENCES) ?? "[]"
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "5.6.14",
+  "version": "5.7.0",
   "packageManager": "pnpm@8.15.4",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",