@capgo/capacitor-updater 6.1.6 → 6.1.8

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

@@ -254,17 +254,13 @@ public class CapacitorUpdater {
   }
 
   public void onResume() {
+    IntentFilter filter = new IntentFilter();
+    filter.addAction(DownloadService.NOTIFICATION);
+    filter.addAction(DownloadService.PERCENTDOWNLOAD);
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-      this.activity.registerReceiver(
-          receiver,
-          new IntentFilter(DownloadService.NOTIFICATION),
-          RECEIVER_NOT_EXPORTED
-        );
+      this.activity.registerReceiver(receiver, filter, RECEIVER_NOT_EXPORTED);
     } else {
-      this.activity.registerReceiver(
-          receiver,
-          new IntentFilter(DownloadService.NOTIFICATION)
-        );
+      this.activity.registerReceiver(receiver, filter);
     }
   }
 

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

@@ -56,7 +56,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
   private static final String channelUrlDefault =
     "https://api.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "6.1.6";
+  private final String PLUGIN_VERSION = "6.1.8";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;

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

@@ -118,7 +118,7 @@ public class DownloadService extends IntentService {
 
         int bytesRead = -1;
         byte[] buffer = new byte[4096];
-        int lastPercent = 0;
+        int lastNotifiedPercent = 0;
         while ((bytesRead = inputStream.read(buffer)) != -1) {
           outputStream.write(buffer, 0, bytesRead);
           downloadedBytes += bytesRead;
@@ -128,9 +128,9 @@ public class DownloadService extends IntentService {
           }
           // Computing percentage
           int percent = calcTotalPercent(downloadedBytes, contentLength);
-          if (percent != lastPercent) {
-            notifyDownload(id, percent);
-            lastPercent = percent;
+          while (lastNotifiedPercent + 10 <= percent) {
+            lastNotifiedPercent += 10;
+            notifyDownload(id, lastNotifiedPercent);
           }
         }
 

package/ios/Plugin/CapacitorUpdater.swift

@@ -661,13 +661,13 @@ extension CustomError: LocalizedError {
                      self.savePartialData(startingAt: UInt64(totalReceivedBytes)) // Saving the received data in the package.tmp file
                      totalReceivedBytes += Int64(data.count)
                      
-                     let percent = Int((Double(totalReceivedBytes) / Double(targetSize)) * 100.0)
+                     let percent = max(10, Int((Double(totalReceivedBytes) / Double(targetSize)) * 70.0))
                      
                      print("\(self.TAG) Downloading: \(percent)%")
                      let currentMilestone = (percent / 10) * 10
                              if currentMilestone > lastSentProgress && currentMilestone <= 70 {
                                  for milestone in stride(from: lastSentProgress + 10, through: currentMilestone, by: 10) {
-                                     self.notifyDownload(id: id, percent: milestone, ignoreMultipleOfTen: true)
+                                         self.notifyDownload(id: id, percent: milestone, ignoreMultipleOfTen: false)
                                  }
                                  lastSentProgress = currentMilestone
                              }
@@ -680,6 +680,7 @@ extension CustomError: LocalizedError {
 
              case .complete(_):
                 print("\(self.TAG) Download complete, total received bytes: \(totalReceivedBytes)")
+                 self.notifyDownload(id: id, percent: 70, ignoreMultipleOfTen: true)
                 semaphore.signal()
              }
         }
@@ -727,7 +728,9 @@ extension CustomError: LocalizedError {
         
         do {
             checksum = self.calcChecksum(filePath: finalPath)
+            print("\(self.TAG) Downloading: 80% (unzipping)")
             try self.saveDownloaded(sourceZip: finalPath, id: id, base: self.libraryDir.appendingPathComponent(self.bundleDirectory), notify: true)
+            
         } catch {
             print("\(self.TAG) Failed to unzip file: \(error)")
             self.saveBundleInfo(id: id, bundle: BundleInfo(id: id, version: version, status: BundleStatus.ERROR, downloaded: Date(), checksum: checksum))
@@ -736,10 +739,13 @@ extension CustomError: LocalizedError {
             throw error
         }
         
+        self.notifyDownload(id: id, percent: 90)
+        print("\(self.TAG) Downloading: 90% (wrapping up)")
         let info = BundleInfo(id: id, version: version, status: BundleStatus.PENDING, downloaded: Date(), checksum: checksum)
         self.saveBundleInfo(id: id, bundle: info)
-        self.notifyDownload(id: id, percent: 100)
         self.cleanDlData()
+        self.notifyDownload(id: id, percent: 100)
+        print("\(self.TAG) Downloading: 100% (complete)")
         return info
     }
     private func ensureResumableFilesExist() {
@@ -1080,38 +1086,48 @@ extension CustomError: LocalizedError {
         return getChannel
     }
 
+    private let operationQueue = OperationQueue()
+
     func sendStats(action: String, versionName: String? = nil, oldVersionName: String? = "") {
         guard !statsUrl.isEmpty else {
             return
         }
+        operationQueue.maxConcurrentOperationCount = 1
 
         let versionName = versionName ?? getCurrentBundle().getVersionName()
 
         var parameters = createInfoObject()
         parameters.action = action
         parameters.version_name = versionName
-        parameters.old_version_name = oldVersionName
-
-        DispatchQueue.global(qos: .background).async {
-            let request = AF.request(
-                self.statsUrl,
-                method: .post,
-                parameters: parameters,
-                encoder: JSONParameterEncoder.default,
-                requestModifier: { $0.timeoutInterval = self.timeout }
-            )
+        parameters.old_version_name = oldVersionName ?? ""
+        
+        
+        let operation = BlockOperation {
+            let semaphore = DispatchSemaphore(value: 0)
+            AF.request(
+                 self.statsUrl,
+                 method: .post,
+                 parameters: parameters,
+                 encoder: JSONParameterEncoder.default,
+                 requestModifier: { $0.timeoutInterval = self.timeout }
+             ).responseData { response in
+                 switch response.result {
+                 case .success:
+                     print("\(self.TAG) Stats sent for \(action), version \(versionName)")
+                 case let .failure(error):
+                     print("\(self.TAG) Error sending stats: ", response.value ?? "", error.localizedDescription)
+                 }
+                 semaphore.signal()
+             }
+             semaphore.wait()
+         }
+        operationQueue.addOperation(operation)
+        
 
-            request.responseData { response in
-                switch response.result {
-                case .success:
-                    print("\(self.TAG) Stats sent for \(action), version \(versionName)")
-                case let .failure(error):
-                    print("\(self.TAG) Error sending stats: ", response.value ?? "", error)
-                }
-            }
-        }
+        
     }
 
+
     public func getBundleInfo(id: String?) -> BundleInfo {
         var trueId = BundleInfo.VERSION_UNKNOWN
         if id != nil {

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -16,7 +16,7 @@ import SwiftyRSA
 @objc(CapacitorUpdaterPlugin)
 public class CapacitorUpdaterPlugin: CAPPlugin {
     public var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "6.1.6"
+    private let PLUGIN_VERSION: String = "6.1.8"
     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"

package/package.json

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