@capgo/capacitor-updater 8.47.5 → 8.47.6

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

@@ -115,15 +115,13 @@ public class DownloadService extends Worker {
         }
 
         StringBuilder sanitized = new StringBuilder();
-        value
-            .codePoints()
-            .forEach((cp) -> {
-                boolean isVisibleAscii = cp >= 0x20 && cp <= 0x7E;
-                boolean isIso88591 = cp >= 0xA0 && cp <= 0xFF;
-                if (isVisibleAscii || isIso88591) {
-                    sanitized.appendCodePoint(cp);
-                }
-            });
+        value.codePoints().forEach((cp) -> {
+            boolean isVisibleAscii = cp >= 0x20 && cp <= 0x7E;
+            boolean isIso88591 = cp >= 0xA0 && cp <= 0xFF;
+            if (isVisibleAscii || isIso88591) {
+                sanitized.appendCodePoint(cp);
+            }
+        });
 
         String result = sanitized.toString().trim();
         return result.isEmpty() ? "unknown" : result;
@@ -255,27 +253,26 @@ public class DownloadService extends Worker {
                 .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());
-                            }
+            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();
-                            }
+                    @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());

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

@@ -111,49 +111,43 @@ public class ShakeMenu implements ShakeDetector.Listener {
                 AlertDialog dialog = builder.create();
                 dialog.setOnDismissListener((dialogInterface) -> isShowing = false);
                 dialog.show();
-                dialog
-                    .getButton(AlertDialog.BUTTON_POSITIVE)
-                    .setOnClickListener((view) -> {
-                        setPreviewMenuButtonsEnabled(dialog, false);
-                        new Thread(() -> {
-                            try {
-                                if (!plugin.leavePreviewSessionFromShakeMenu()) {
-                                    activity.runOnUiThread(() -> showError("Could not leave the test app."));
-                                }
-                            } catch (Exception e) {
-                                logger.error("Error leaving test app: " + e.getMessage());
-                                activity.runOnUiThread(() -> showError("Error leaving test app: " + e.getMessage()));
-                            } finally {
-                                activity.runOnUiThread(() -> {
-                                    dialog.dismiss();
-                                    isShowing = false;
-                                });
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener((view) -> {
+                    setPreviewMenuButtonsEnabled(dialog, false);
+                    new Thread(() -> {
+                        try {
+                            if (!plugin.leavePreviewSessionFromShakeMenu()) {
+                                activity.runOnUiThread(() -> showError("Could not leave the test app."));
                             }
-                        })
-                            .start();
-                    });
-                dialog
-                    .getButton(AlertDialog.BUTTON_NEUTRAL)
-                    .setOnClickListener((view) -> {
-                        setPreviewMenuButtonsEnabled(dialog, false);
-                        new Thread(() -> {
-                            try {
-                                logger.info("Reloading webview");
-                                if (!plugin.reloadPreviewSessionFromShakeMenu()) {
-                                    activity.runOnUiThread(() -> showError("Could not reload the test app."));
-                                }
-                            } catch (Exception e) {
-                                logger.error("Error in Reload action: " + e.getMessage());
-                                activity.runOnUiThread(() -> showError("Error reloading test app: " + e.getMessage()));
-                            } finally {
-                                activity.runOnUiThread(() -> {
-                                    dialog.dismiss();
-                                    isShowing = false;
-                                });
+                        } catch (Exception e) {
+                            logger.error("Error leaving test app: " + e.getMessage());
+                            activity.runOnUiThread(() -> showError("Error leaving test app: " + e.getMessage()));
+                        } finally {
+                            activity.runOnUiThread(() -> {
+                                dialog.dismiss();
+                                isShowing = false;
+                            });
+                        }
+                    }).start();
+                });
+                dialog.getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener((view) -> {
+                    setPreviewMenuButtonsEnabled(dialog, false);
+                    new Thread(() -> {
+                        try {
+                            logger.info("Reloading webview");
+                            if (!plugin.reloadPreviewSessionFromShakeMenu()) {
+                                activity.runOnUiThread(() -> showError("Could not reload the test app."));
                             }
-                        })
-                            .start();
-                    });
+                        } catch (Exception e) {
+                            logger.error("Error in Reload action: " + e.getMessage());
+                            activity.runOnUiThread(() -> showError("Error reloading test app: " + e.getMessage()));
+                        } finally {
+                            activity.runOnUiThread(() -> {
+                                dialog.dismiss();
+                                isShowing = false;
+                            });
+                        }
+                    }).start();
+                });
             } catch (Exception e) {
                 logger.error("Error showing shake menu: " + e.getMessage());
                 isShowing = false;
@@ -351,8 +345,7 @@ public class ShakeMenu implements ShakeDetector.Listener {
                             presentChannelPicker(channels);
                         });
                     });
-                })
-                    .start();
+                }).start();
             } catch (Exception e) {
                 logger.error("Error showing channel selector: " + e.getMessage());
                 isShowing = false;
@@ -543,13 +536,14 @@ public class ShakeMenu implements ShakeDetector.Listener {
                                 String latestKind = getString(latestRes, "kind");
                                 String latestMessage = getString(latestRes, "message");
 
-                                String detail = latestMessage != null && !latestMessage.isEmpty()
-                                    ? latestMessage
-                                    : latestError != null && !latestError.isEmpty()
-                                        ? latestError
-                                        : latestKind != null && !latestKind.isEmpty()
-                                            ? latestKind
-                                            : "server did not provide a message";
+                                String detail =
+                                    latestMessage != null && !latestMessage.isEmpty()
+                                        ? latestMessage
+                                        : latestError != null && !latestError.isEmpty()
+                                            ? latestError
+                                            : latestKind != null && !latestKind.isEmpty()
+                                                ? latestKind
+                                                : "server did not provide a message";
 
                                 // Handle update errors first (before "no new version" check)
                                 if (
@@ -668,8 +662,7 @@ public class ShakeMenu implements ShakeDetector.Listener {
                             });
                         }
                     );
-                })
-                    .start();
+                }).start();
             } catch (Exception e) {
                 logger.error("Error selecting channel: " + e.getMessage());
                 isShowing = false;

package/ios/Sources/CapacitorUpdaterPlugin/CapacitorUpdaterPlugin.swift

@@ -79,7 +79,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "completeFlexibleUpdate", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapgoUpdater()
-    private let pluginVersion: String = "8.47.5"
+    private let pluginVersion: String = "8.47.6"
     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"
@@ -165,6 +165,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     public var previewSessionEnabled = false
     private var previewSessionAlertPending = false
     private var isLeavingPreviewForIncomingLink = false
+    private var previewTransitionClearWorkItem: DispatchWorkItem?
     let semaphoreReady = DispatchSemaphore(value: 0)
 
     private var delayUpdateUtils: DelayUpdateUtils!
@@ -986,7 +987,10 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         let current: BundleInfo = self.implementation.getCurrentBundle()
         let next: BundleInfo? = self.implementation.getNextBundle()
 
-        if let next = next, !next.isErrorStatus(), next.getId() != current.getId() {
+        if !self.isPreviewSessionStateActive(),
+           let next = next,
+           !next.isErrorStatus(),
+           next.getId() != current.getId() {
             let previousState = self.implementation.captureResetState()
             let previousBundleName = self.implementation.getCurrentBundle().getVersionName()
             logger.info("Applying pending bundle before reload: \(next.toString())")
@@ -1025,6 +1029,28 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
+    private func applyDownloadedBundleForDirectUpdate(_ next: BundleInfo) -> Bool {
+        let previousState = self.implementation.captureResetState()
+        let previousBundleName = self.implementation.getCurrentBundle().getVersionName()
+
+        guard self.implementation.stagePendingReload(bundle: next) else {
+            self.implementation.restoreResetState(previousState)
+            logger.error("Direct update failed to stage downloaded bundle: \(next.toString())")
+            return false
+        }
+
+        if self._reload() {
+            self.implementation.finalizePendingReload(bundle: next, previousBundleName: previousBundleName)
+            _ = self.implementation.setNextBundle(next: Optional<String>.none)
+            return true
+        }
+
+        self.implementation.restoreResetState(previousState)
+        self.restoreLiveBundleStateAfterFailedReload()
+        logger.error("Direct update reload failed after staging bundle: \(next.toString())")
+        return false
+    }
+
     @objc func next(_ call: CAPPluginCall) {
         guard let id = call.getString("id") else {
             logger.error("Next called without id")
@@ -1060,6 +1086,37 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
+    private func isPreviewSessionStateActive() -> Bool {
+        self.previewSessionEnabled || self.isLeavingPreviewForIncomingLink || self.implementation.previewSession
+    }
+
+    private func shouldBlockAutoUpdateForPreviewSession() -> Bool {
+        guard self.isPreviewSessionStateActive() else {
+            return false
+        }
+
+        logger.info("Preview session is active. Skipping normal auto-update work.")
+        return true
+    }
+
+    private func clearIncomingPreviewTransition() {
+        self.previewTransitionClearWorkItem?.cancel()
+        self.previewTransitionClearWorkItem = nil
+        self.isLeavingPreviewForIncomingLink = false
+        if !self.previewSessionEnabled {
+            self.implementation.previewSession = false
+        }
+    }
+
+    private func scheduleIncomingPreviewTransitionFallbackClear() {
+        self.previewTransitionClearWorkItem?.cancel()
+        let workItem = DispatchWorkItem { [weak self] in
+            self?.clearIncomingPreviewTransition()
+        }
+        self.previewTransitionClearWorkItem = workItem
+        DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(self.appReadyTimeout), execute: workItem)
+    }
+
     @objc func startPreviewSession(_ call: CAPPluginCall) {
         guard self.allowPreview else {
             logger.error("startPreviewSession called without allowPreview")
@@ -1117,6 +1174,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             UserDefaults.standard.removeObject(forKey: self.previewPayloadUrlDefaultsKey)
         }
 
+        self.clearIncomingPreviewTransition()
         self.previewSessionEnabled = true
         self.previewSessionAlertPending = true
         self.implementation.previewSession = true
@@ -1159,7 +1217,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
-    private func leavePreviewSessionWithoutReload() -> Bool {
+    private func leavePreviewSessionWithoutReload(keepPreviewGuard: Bool = false) -> Bool {
         let previewBundle = self.implementation.getCurrentBundle()
         guard let previewFallbackBundle = self.implementation.getPreviewFallbackBundle(), !previewFallbackBundle.isErrorStatus() else {
             logger.error("No preview fallback bundle available")
@@ -1174,12 +1232,50 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             return false
         }
 
-        self.endPreviewSession()
+        self.endPreviewSession(keepPreviewGuard: keepPreviewGuard)
         let restoredNextBundle = self.implementation.getNextBundle()
         self.deletePreviewBundleIfUnused(previewBundle, previewFallbackBundle: previewFallbackBundle, restoredNextBundle: restoredNextBundle)
         return true
     }
 
+    private func leavePreviewSessionForIncomingPreviewLink() -> Bool {
+        let previewBundle = self.implementation.getCurrentBundle()
+        guard let previewFallbackBundle = self.implementation.getPreviewFallbackBundle(), !previewFallbackBundle.isErrorStatus() else {
+            logger.error("No preview fallback bundle available")
+            self.clearIncomingPreviewTransition()
+            return false
+        }
+        guard self.implementation.canSet(bundle: previewFallbackBundle) else {
+            logger.error("Preview fallback bundle is not installable")
+            self.clearIncomingPreviewTransition()
+            return false
+        }
+
+        let previousState = self.implementation.captureResetState()
+        guard self.implementation.stagePreviewFallbackReload(bundle: previewFallbackBundle) else {
+            logger.error("Could not stage preview fallback bundle")
+            self.clearIncomingPreviewTransition()
+            return false
+        }
+
+        let didReload = self._reload()
+        if didReload {
+            self.endPreviewSession(keepPreviewGuard: true)
+            let restoredNextBundle = self.implementation.getNextBundle()
+            self.deletePreviewBundleIfUnused(
+                previewBundle,
+                previewFallbackBundle: previewFallbackBundle,
+                restoredNextBundle: restoredNextBundle
+            )
+            self.scheduleIncomingPreviewTransitionFallbackClear()
+        } else {
+            self.implementation.restoreResetState(previousState)
+            self.restoreLiveBundleStateAfterFailedReload()
+            self.clearIncomingPreviewTransition()
+        }
+        return didReload
+    }
+
     private func deletePreviewBundleIfUnused(
         _ previewBundle: BundleInfo,
         previewFallbackBundle: BundleInfo?,
@@ -1228,7 +1324,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         return false
     }
 
-    private func endPreviewSession() {
+    private func endPreviewSession(keepPreviewGuard: Bool = false) {
         let previousShakeMenuEnabled = UserDefaults.standard.object(forKey: self.previewPreviousShakeMenuDefaultsKey) as? Bool
             ?? getConfig().getBoolean("shakeMenu", false)
         let previousShakeChannelSelectorEnabled = UserDefaults.standard.object(forKey: self.previewPreviousShakeChannelSelectorDefaultsKey) as? Bool
@@ -1239,8 +1335,11 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
 
         self.previewSessionEnabled = false
         self.previewSessionAlertPending = false
-        self.isLeavingPreviewForIncomingLink = false
-        self.implementation.previewSession = false
+        if keepPreviewGuard {
+            self.implementation.previewSession = true
+        } else {
+            self.clearIncomingPreviewTransition()
+        }
         self.shakeMenuEnabled = previousShakeMenuEnabled
         self.shakeChannelSelectorEnabled = previousShakeChannelSelectorEnabled
         _ = self.implementation.setPreviewFallbackBundle(fallback: nil)
@@ -1395,7 +1494,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         self.isLeavingPreviewForIncomingLink = true
         logger.info("Preview deeplink received while preview session is active; restoring fallback before routing")
         DispatchQueue.global(qos: .userInitiated).async {
-            let didLeave = self.leavePreviewSessionFromShakeMenu()
+            let didLeave = self.leavePreviewSessionForIncomingPreviewLink()
             if !didLeave {
                 self.logger.error("Could not leave preview session before routing incoming preview deeplink")
                 self.isLeavingPreviewForIncomingLink = false
@@ -1701,6 +1800,9 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             logger.error("Error no url or wrong format")
             return "unavailable"
         }
+        if self.shouldBlockAutoUpdateForPreviewSession() {
+            return "preview_session"
+        }
         if self.isDownloadStuckOrTimedOut() {
             logger.info("Download already in progress, skipping duplicate download request")
             return "already_running"
@@ -1937,6 +2039,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         let bundle = self.implementation.getCurrentBundle()
         self.implementation.setSuccess(bundle: bundle, autoDeletePrevious: self.autoDeletePrevious)
         logger.info("Current bundle loaded successfully. [notifyAppReady was called] \(bundle.toString())")
+        self.clearIncomingPreviewTransition()
 
         call.resolve(["bundle": bundle.toJSON()])
     }
@@ -1987,6 +2090,9 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     // Note: _checkCancelDelay method has been moved to DelayUpdateUtils class
 
     private func _isAutoUpdateEnabled() -> Bool {
+        if self.isPreviewSessionStateActive() {
+            return false
+        }
         let instanceDescriptor = (self.bridge?.viewController as? CAPBridgeViewController)?.instanceDescriptor()
         if instanceDescriptor?.serverURL != nil {
             logger.warn("AutoUpdate is automatic disabled when serverUrl is set.")
@@ -2024,6 +2130,10 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             logger.info("Built-in bundle is active. We skip the check for notifyAppReady.")
             return
         }
+        if self.isPreviewSessionStateActive() {
+            logger.info("Preview session is active. We skip the check for notifyAppReady.")
+            return
+        }
 
         logger.info("Current bundle is: \(current.toString())")
 
@@ -2693,6 +2803,13 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         return true
     }
 
+    private func clearDownloadInProgressState() {
+        downloadLock.lock()
+        defer { downloadLock.unlock() }
+        downloadInProgress = false
+        downloadStartTime = nil
+    }
+
     func runBackgroundDownloadWork(_ work: @escaping () -> Void) {
         // Live update checks/downloads are user-visible work. Using `.background`
         // lets the scheduler starve them for minutes while the app is active.
@@ -2718,6 +2835,9 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     func backgroundDownload() {
+        if self.shouldBlockAutoUpdateForPreviewSession() {
+            return
+        }
         // Set download in progress flag (thread-safe)
         downloadLock.lock()
         downloadInProgress = true
@@ -2746,10 +2866,19 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         self.runBackgroundDownloadWork {
             // Wait for cleanup to complete before starting download
             self.waitForCleanupIfNeeded()
+            if self.shouldBlockAutoUpdateForPreviewSession() {
+                self.clearDownloadInProgressState()
+                return
+            }
             self.beginDownloadBackgroundTask()
             self.logger.info("Check for update via \(self.updateUrl)")
             let res = self.implementation.getLatest(url: url, channel: nil)
             let current = self.implementation.getCurrentBundle()
+            if self.shouldBlockAutoUpdateForPreviewSession() {
+                self.clearDownloadInProgressState()
+                self.endBackGroundTask()
+                return
+            }
 
             // Handle network errors and other failures first
             let backendError = res.error ?? ""
@@ -2861,6 +2990,11 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                         )
                         return
                     }
+                    if self.shouldBlockAutoUpdateForPreviewSession() {
+                        self.clearDownloadInProgressState()
+                        self.endBackGroundTask()
+                        return
+                    }
                     res.checksum = try CryptoCipher.decryptChecksum(checksum: res.checksum, publicKey: self.implementation.publicKey)
                     CryptoCipher.logChecksumInfo(label: "Bundle checksum", hexChecksum: next.getChecksum())
                     CryptoCipher.logChecksumInfo(label: "Expected checksum", hexChecksum: res.checksum)
@@ -2880,6 +3014,11 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                         )
                         return
                     }
+                    if self.shouldBlockAutoUpdateForPreviewSession() {
+                        self.clearDownloadInProgressState()
+                        self.endBackGroundTask()
+                        return
+                    }
                     let directUpdateAllowed = plannedDirectUpdate && !self.autoSplashscreenTimedOut
                     if directUpdateAllowed {
                         let delayUpdatePreferences = UserDefaults.standard.string(forKey: DelayUpdateUtils.DELAY_CONDITION_PREFERENCES) ?? "[]"
@@ -2899,7 +3038,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                             )
                             return
                         }
-                        if self.implementation.set(bundle: next) && self._reload() {
+                        if self.applyDownloadedBundleForDirectUpdate(next) {
                             self.notifyBundleSet(next)
                             self.endBackGroundTaskWithNotif(
                                 msg: "update installed",
@@ -2909,10 +3048,13 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                                 plannedDirectUpdate: plannedDirectUpdate
                             )
                         } else {
+                            _ = self.implementation.setNextBundle(next: next.getId())
+                            self.notifyListeners("updateAvailable", data: ["bundle": next.toJSON()])
                             self.endBackGroundTaskWithNotif(
-                                msg: "Update install failed",
+                                msg: "Direct update reload failed, update will install next background",
                                 latestVersionName: latestVersionName,
-                                current: next,
+                                current: self.implementation.getCurrentBundle(),
+                                error: false,
                                 plannedDirectUpdate: plannedDirectUpdate
                             )
                         }
@@ -2968,6 +3110,9 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     private func installNext() {
+        if self.shouldBlockAutoUpdateForPreviewSession() {
+            return
+        }
         let delayUpdatePreferences = UserDefaults.standard.string(forKey: DelayUpdateUtils.DELAY_CONDITION_PREFERENCES) ?? "[]"
         let delayConditionList: [DelayCondition] = fromJsonArr(json: delayUpdatePreferences).map { obj -> DelayCondition in
             let kind: String = obj.value(forKey: "kind") as! String
@@ -3059,8 +3204,14 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                 return
             }
             DispatchQueue.global(qos: .utility).async {
+                if self.shouldBlockAutoUpdateForPreviewSession() {
+                    return
+                }
                 let res = self.implementation.getLatest(url: url, channel: nil)
                 let current = self.implementation.getCurrentBundle()
+                if self.shouldBlockAutoUpdateForPreviewSession() {
+                    return
+                }
 
                 if res.version != current.getVersionName() {
                     self.logger.info("New version found: \(res.version)")

package/package.json

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