@capgo/capacitor-updater 7.8.11 → 7.9.1

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

@@ -59,7 +59,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private static final String statsUrlDefault = "https://plugin.capgo.app/stats";
     private static final String channelUrlDefault = "https://plugin.capgo.app/channel_self";
 
-    private final String PLUGIN_VERSION = "7.8.11";
+    private final String PLUGIN_VERSION = "7.9.1";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -233,7 +233,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         this.implementation.versionOs = Build.VERSION.RELEASE;
         this.implementation.deviceID = this.prefs.getString("appUUID", UUID.randomUUID().toString()).toLowerCase();
         this.editor.putString("appUUID", this.implementation.deviceID);
-        this.editor.commit();
+        this.editor.apply();
         logger.info("init for device " + this.implementation.deviceID);
         logger.info("version native " + this.currentVersionNative.getOriginalString());
         this.autoDeleteFailed = this.getConfig().getBoolean("autoDeleteFailed", true);
@@ -455,7 +455,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
             logger.error("Error calculating previous native version " + e.getMessage());
         }
         this.editor.putString("LatestVersionNative", this.currentVersionNative.toString());
-        this.editor.commit();
+        this.editor.apply();
     }
 
     public void notifyDownload(final String id, final int percent) {

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

@@ -304,7 +304,9 @@ public class CapgoUpdater {
             checksum,
             this.publicKey,
             manifest != null,
-            this.isEmulator()
+            this.isEmulator(),
+            this.appId,
+            this.PLUGIN_VERSION
         );
 
         if (manifest != null) {

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

@@ -27,6 +27,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
+import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
 import okhttp3.Request;
@@ -55,12 +56,31 @@ public class DownloadService extends Worker {
     public static final String CHECKSUM = "checksum";
     public static final String PUBLIC_KEY = "publickey";
     public static final String IS_MANIFEST = "is_manifest";
+    public static final String APP_ID = "app_id";
+    public static final String PLUGIN_VERSION = "plugin_version";
     private static final String UPDATE_FILE = "update.dat";
 
-    private final OkHttpClient client = new OkHttpClient.Builder().protocols(Arrays.asList(Protocol.HTTP_2, Protocol.HTTP_1_1)).build();
+    private final OkHttpClient client;
 
     public DownloadService(@NonNull Context context, @NonNull WorkerParameters params) {
         super(context, params);
+        // Get appId and plugin version from input data
+        String appId = getInputData().getString(APP_ID);
+        String pluginVersion = getInputData().getString(PLUGIN_VERSION);
+
+        // Build user agent with appId and plugin version
+        String userAgent =
+            "CapacitorUpdater/" + (pluginVersion != null ? pluginVersion : "unknown") + " (" + (appId != null ? appId : "unknown") + ")";
+
+        // Create OkHttpClient with custom user agent
+        this.client = new OkHttpClient.Builder()
+            .protocols(Arrays.asList(Protocol.HTTP_2, Protocol.HTTP_1_1))
+            .addInterceptor(chain -> {
+                Request originalRequest = chain.request();
+                Request requestWithUserAgent = originalRequest.newBuilder().header("User-Agent", userAgent).build();
+                return chain.proceed(requestWithUserAgent);
+            })
+            .build();
     }
 
     private void setProgress(int percent) {
@@ -466,14 +486,14 @@ public class DownloadService extends Worker {
 
     private String calculateFileHash(File file) throws Exception {
         MessageDigest digest = MessageDigest.getInstance("SHA-256");
-        FileInputStream fis = new FileInputStream(file);
         byte[] byteArray = new byte[1024];
         int bytesCount = 0;
 
-        while ((bytesCount = fis.read(byteArray)) != -1) {
-            digest.update(byteArray, 0, bytesCount);
+        try (FileInputStream fis = new FileInputStream(file)) {
+            while ((bytesCount = fis.read(byteArray)) != -1) {
+                digest.update(byteArray, 0, bytesCount);
+            }
         }
-        fis.close();
 
         byte[] bytes = digest.digest();
         StringBuilder sb = new StringBuilder();

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

@@ -23,6 +23,7 @@ public class DownloadWorkerManager {
 
     private static volatile boolean isInitialized = false;
     private static final Set<String> activeVersions = new HashSet<>();
+    private static final Object activeVersionsLock = new Object();
 
     private static synchronized void initializeIfNeeded(Context context) {
         if (!isInitialized) {
@@ -36,8 +37,10 @@ public class DownloadWorkerManager {
         }
     }
 
-    public static synchronized boolean isVersionDownloading(String version) {
-        return activeVersions.contains(version);
+    public static boolean isVersionDownloading(String version) {
+        synchronized (activeVersionsLock) {
+            return activeVersions.contains(version);
+        }
     }
 
     public static void enqueueDownload(
@@ -51,16 +54,20 @@ public class DownloadWorkerManager {
         String checksum,
         String publicKey,
         boolean isManifest,
-        boolean isEmulator
+        boolean isEmulator,
+        String appId,
+        String pluginVersion
     ) {
         initializeIfNeeded(context.getApplicationContext());
 
         // If version is already downloading, don't start another one
-        if (isVersionDownloading(version)) {
-            logger.info("Version " + version + " is already downloading");
-            return;
+        synchronized (activeVersionsLock) {
+            if (activeVersions.contains(version)) {
+                logger.info("Version " + version + " is already downloading");
+                return;
+            }
+            activeVersions.add(version);
         }
-        activeVersions.add(version);
 
         // Create input data
         Data inputData = new Data.Builder()
@@ -73,6 +80,8 @@ public class DownloadWorkerManager {
             .putString(DownloadService.CHECKSUM, checksum)
             .putBoolean(DownloadService.IS_MANIFEST, isManifest)
             .putString(DownloadService.PUBLIC_KEY, publicKey)
+            .putString(DownloadService.APP_ID, appId)
+            .putString(DownloadService.PLUGIN_VERSION, pluginVersion)
             .build();
 
         // Create network constraints - be more lenient on emulators
@@ -110,12 +119,16 @@ public class DownloadWorkerManager {
     public static void cancelVersionDownload(Context context, String version) {
         initializeIfNeeded(context.getApplicationContext());
         WorkManager.getInstance(context).cancelAllWorkByTag(version);
-        activeVersions.remove(version);
+        synchronized (activeVersionsLock) {
+            activeVersions.remove(version);
+        }
     }
 
     public static void cancelAllDownloads(Context context) {
         initializeIfNeeded(context.getApplicationContext());
         WorkManager.getInstance(context).cancelAllWorkByTag("capacitor_updater_download");
-        activeVersions.clear();
+        synchronized (activeVersionsLock) {
+            activeVersions.clear();
+        }
     }
 }

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -13,12 +13,12 @@ import WebKit
 class WebViewLoadDelegate: NSObject, WKNavigationDelegate {
     private let completion: (Bool) -> Void
     private var hasCompleted = false
-    
+
     init(completion: @escaping (Bool) -> Void) {
         self.completion = completion
         super.init()
     }
-    
+
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
         if !hasCompleted {
             hasCompleted = true
@@ -26,7 +26,7 @@ class WebViewLoadDelegate: NSObject, WKNavigationDelegate {
             completion(true)
         }
     }
-    
+
     func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
         if !hasCompleted {
             hasCompleted = true
@@ -34,7 +34,7 @@ class WebViewLoadDelegate: NSObject, WKNavigationDelegate {
             completion(false)
         }
     }
-    
+
     func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
         if !hasCompleted {
             hasCompleted = true
@@ -86,7 +86,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "isShakeMenuEnabled", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapgoUpdater()
-    private let PLUGIN_VERSION: String = "7.8.11"
+    private let PLUGIN_VERSION: String = "7.9.1"
     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"
@@ -445,11 +445,11 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                 logger.error("Cannot get capBridge")
                 return false
             }
-            
+
             // Use semaphore to wait for WebView load completion
             let loadSemaphore = DispatchSemaphore(value: 0)
             var loadSuccess = false
-            
+
             // Set up navigation delegate to detect when loading completes
             let navigationDelegate = WebViewLoadDelegate { [weak self] success in
                 loadSuccess = success
@@ -459,7 +459,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                 }
                 loadSemaphore.signal()
             }
-            
+
             if keepUrlPathAfterReload {
                 DispatchQueue.main.async {
                     guard let url = vc.webView?.url else {
@@ -488,10 +488,10 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                     vc.webView?.reload()
                 }
             }
-            
+
             // Wait for load completion with timeout
             let result = loadSemaphore.wait(timeout: .now() + 10) // 10 second timeout
-            
+
             if result == .timedOut {
                 logger.error("Reload timed out after 10 seconds")
                 DispatchQueue.main.async {
@@ -499,7 +499,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                 }
                 return false
             }
-            
+
             return loadSuccess
         }
         return false
@@ -1150,6 +1150,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         self.checkAppReady()
     }
 
+    private var periodicUpdateTimer: Timer?
+    
     @objc func checkForUpdateAfterDelay() {
         if periodCheckDelay == 0 || !self._isAutoUpdateEnabled() {
             return
@@ -1158,7 +1160,12 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             logger.error("Error no url or wrong format")
             return
         }
-        let timer = Timer.scheduledTimer(withTimeInterval: TimeInterval(periodCheckDelay), repeats: true) { _ in
+        
+        // Clean up any existing timer
+        periodicUpdateTimer?.invalidate()
+        
+        periodicUpdateTimer = Timer.scheduledTimer(withTimeInterval: TimeInterval(periodCheckDelay), repeats: true) { [weak self] _ in
+            guard let self = self else { return }
             DispatchQueue.global(qos: .background).async {
                 let res = self.implementation.getLatest(url: url, channel: nil)
                 let current = self.implementation.getCurrentBundle()
@@ -1169,7 +1176,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                 }
             }
         }
-        RunLoop.current.add(timer, forMode: .default)
+        RunLoop.current.add(periodicUpdateTimer!, forMode: .default)
     }
 
     @objc func appMovedToBackground() {

package/ios/Plugin/CapgoUpdater.swift

@@ -42,6 +42,16 @@ import UIKit
     public var deviceID = ""
     public var publicKey: String = ""
 
+    private var userAgent: String {
+        return "CapacitorUpdater/\(PLUGIN_VERSION) (\(appId))"
+    }
+
+    private lazy var alamofireSession: Session = {
+        let configuration = URLSessionConfiguration.default
+        configuration.httpAdditionalHeaders = ["User-Agent": self.userAgent]
+        return Session(configuration: configuration)
+    }()
+
     public var notifyDownloadRaw: (String, Int, Bool) -> Void = { _, _, _  in }
     public func notifyDownload(id: String, percent: Int, ignoreMultipleOfTen: Bool = false) {
         notifyDownloadRaw(id, percent, ignoreMultipleOfTen)
@@ -250,7 +260,7 @@ import UIKit
             parameters.defaultChannel = channel
         }
         logger.info("Auto-update parameters: \(parameters)")
-        let request = AF.request(url, method: .post, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
+        let request = alamofireSession.request(url, method: .post, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
 
         request.validate().responseDecodable(of: AppVersionDec.self) { response in
             switch response.result {
@@ -376,7 +386,7 @@ import UIKit
                 dispatchGroup.leave()
             } else {
                 // File not in cache, download, decompress, and save to both cache and destination
-                AF.download(downloadUrl).responseData { response in
+                self.alamofireSession.download(downloadUrl).responseData { response in
                     defer { dispatchGroup.leave() }
 
                     switch response.result {
@@ -601,7 +611,9 @@ import UIKit
                 mainError = error as NSError?
             }
         }
-        let session = Session(eventMonitors: [monitor])
+        let configuration = URLSessionConfiguration.default
+        configuration.httpAdditionalHeaders = ["User-Agent": self.userAgent]
+        let session = Session(configuration: configuration, eventMonitors: [monitor])
 
         let request = session.streamRequest(url, headers: requestHeaders).validate().onHTTPResponse(perform: { response  in
             if let contentLength = response.headers.value(for: "Content-Length") {
@@ -950,7 +962,7 @@ import UIKit
         let semaphore: DispatchSemaphore = DispatchSemaphore(value: 0)
         let parameters: InfoObject = self.createInfoObject()
 
-        let request = AF.request(self.channelUrl, method: .delete, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
+        let request = alamofireSession.request(self.channelUrl, method: .delete, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
 
         request.validate().responseDecodable(of: SetChannelDec.self) { response in
             switch response.result {
@@ -985,7 +997,7 @@ import UIKit
         var parameters: InfoObject = self.createInfoObject()
         parameters.channel = channel
 
-        let request = AF.request(self.channelUrl, method: .post, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
+        let request = alamofireSession.request(self.channelUrl, method: .post, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
 
         request.validate().responseDecodable(of: SetChannelDec.self) { response in
             switch response.result {
@@ -1018,7 +1030,7 @@ import UIKit
         }
         let semaphore: DispatchSemaphore = DispatchSemaphore(value: 0)
         let parameters: InfoObject = self.createInfoObject()
-        let request = AF.request(self.channelUrl, method: .put, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
+        let request = alamofireSession.request(self.channelUrl, method: .put, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
 
         request.validate().responseDecodable(of: GetChannelDec.self) { response in
             defer {
@@ -1084,7 +1096,7 @@ import UIKit
             return listChannels
         }
 
-        let request = AF.request(url, method: .get, requestModifier: { $0.timeoutInterval = self.timeout })
+        let request = alamofireSession.request(url, method: .get, requestModifier: { $0.timeoutInterval = self.timeout })
 
         request.validate().responseDecodable(of: ListChannelsDec.self) { response in
             defer {
@@ -1137,7 +1149,7 @@ import UIKit
 
         let operation = BlockOperation {
             let semaphore = DispatchSemaphore(value: 0)
-            AF.request(
+            self.alamofireSession.request(
                 self.statsUrl,
                 method: .post,
                 parameters: parameters,

package/package.json

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