@capgo/capacitor-updater 5.3.14 → 5.3.21

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

@@ -72,7 +72,6 @@ public class CapacitorUpdater {
   private static final String bundleDirectory = "versions";
 
   public static final String TAG = "Capacitor-updater";
-
   public SharedPreferences.Editor editor;
   public SharedPreferences prefs;
 
@@ -83,6 +82,7 @@ public class CapacitorUpdater {
   public Activity activity;
   public String PLUGIN_VERSION = "";
   public String versionBuild = "";
+  public int periodCheckDelay = 300000;
   public String versionCode = "";
   public String versionOs = "";
 
@@ -257,11 +257,18 @@ public class CapacitorUpdater {
   }
 
   public void onResume() {
-    this.activity.registerReceiver(
-        receiver,
-        new IntentFilter(DownloadService.NOTIFICATION),
-        RECEIVER_NOT_EXPORTED
-      );
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      this.activity.registerReceiver(
+          receiver,
+          new IntentFilter(DownloadService.NOTIFICATION),
+          RECEIVER_NOT_EXPORTED
+        );
+    } else {
+      this.activity.registerReceiver(
+          receiver,
+          new IntentFilter(DownloadService.NOTIFICATION)
+        );
+    }
   }
 
   public void onPause() {

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

@@ -14,10 +14,8 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.os.Bundle;
+import android.os.Handler;
 import android.util.Log;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import com.android.volley.toolbox.Volley;
 import com.getcapacitor.CapConfig;
 import com.getcapacitor.JSArray;
@@ -39,10 +37,10 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.UUID;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Phaser;
-import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.json.JSONException;
@@ -58,7 +56,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
   private static final String channelUrlDefault =
     "https://api.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "5.3.14";
+  private final String PLUGIN_VERSION = "5.3.21";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -173,6 +171,11 @@ public class CapacitorUpdaterPlugin extends Plugin {
       this.getConfig().getString("statsUrl", statsUrlDefault);
     this.implementation.channelUrl =
       this.getConfig().getString("channelUrl", channelUrlDefault);
+    int userValue = this.getConfig().getInt("periodCheckDelay", 600);
+
+    this.implementation.periodCheckDelay =
+      (userValue == 0 ? 600 : userValue) * 1000;
+
     this.implementation.documentsDir = this.getContext().getFilesDir();
     this.implementation.prefs = this.prefs;
     this.implementation.editor = this.editor;
@@ -204,6 +207,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
     }
     final Application application = (Application) this.getContext()
       .getApplicationContext();
+
+    this.checkForUpdateAfterDelay();
     //    application.registerActivityLifecycleCallbacks(this);
   }
 
@@ -757,6 +762,44 @@ public class CapacitorUpdaterPlugin extends Plugin {
     }
   }
 
+  public void checkForUpdateAfterDelay() {
+    final Timer timer = new Timer();
+    timer.scheduleAtFixedRate(
+      new TimerTask() {
+        @Override
+        public void run() {
+          try {
+            CapacitorUpdaterPlugin.this.implementation.getLatest(
+                CapacitorUpdaterPlugin.this.updateUrl,
+                res -> {
+                  if (res.has("error")) {
+                    Log.e(CapacitorUpdater.TAG, res.getString("error"));
+                    return;
+                  } else if (res.has("version")) {
+                    String newVersion = res.getString("version");
+                    String currentVersion = String.valueOf(
+                      CapacitorUpdaterPlugin.this.implementation.getCurrentBundle()
+                    );
+                    if (!newVersion.equals(currentVersion)) {
+                      Log.i(
+                        CapacitorUpdater.TAG,
+                        "New version found: " + newVersion
+                      );
+                      CapacitorUpdaterPlugin.this.backgroundDownload();
+                    }
+                  }
+                }
+              );
+          } catch (final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Failed to check for update", e);
+          }
+        }
+      },
+      0,
+      CapacitorUpdaterPlugin.this.implementation.periodCheckDelay
+    );
+  }
+
   @PluginMethod
   public void notifyAppReady(final PluginCall call) {
     try {
@@ -1396,6 +1439,9 @@ public class CapacitorUpdaterPlugin extends Plugin {
         (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
       List<ActivityManager.AppTask> runningTasks =
         activityManager.getAppTasks();
+      if (runningTasks.isEmpty()) {
+        return false;
+      }
       ActivityManager.RecentTaskInfo runningTask = runningTasks
         .get(0)
         .getTaskInfo();

package/dist/docs.json

@@ -1651,6 +1651,18 @@
           "docs": "Make the plugin direct install the update when the app what just updated/installed. Only for autoUpdate mode.\n\nOnly available for Android and iOS.",
           "complexTypes": [],
           "type": "boolean | undefined"
+        },
+        {
+          "name": "periodCheckDelay",
+          "tags": [
+            {
+              "text": "600 // (10 minutes)",
+              "name": "default"
+            }
+          ],
+          "docs": "Configure the delay period for period update check. the unit is in seconds.\n\nOnly available for Android and iOS.",
+          "complexTypes": [],
+          "type": "number | undefined"
         }
       ],
       "docs": "These configuration values are available:"

package/dist/esm/definitions.d.ts

@@ -104,6 +104,14 @@ declare module "@capacitor/cli" {
              * @since  5.1.0
              */
             directUpdate?: boolean;
+            /**
+             * Configure the delay period for period update check. the unit is in seconds.
+             *
+             * Only available for Android and iOS.
+             *
+             * @default 600 // (10 minutes)
+             */
+            periodCheckDelay?: number;
         };
     }
 }

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.3.14"
+    private let PLUGIN_VERSION: String = "5.3.21"
     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"
@@ -34,6 +34,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     private var autoDeletePrevious = false
     private var backgroundWork: DispatchWorkItem?
     private var taskRunning = false
+    private var periodCheckDelay = 300
     let semaphoreReady = DispatchSemaphore(value: 0)
 
     override public func load() {
@@ -54,6 +55,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         appReadyTimeout = getConfig().getInt("appReadyTimeout", 10000)
         implementation.timeout = Double(getConfig().getInt("responseTimeout", 20))
         resetWhenUpdate = getConfig().getBoolean("resetWhenUpdate", true)
+        let periodCheckDelayValue = getConfig().getInt("periodCheckDelay", 600)
+        periodCheckDelay = (periodCheckDelayValue == 0) ? 600 : periodCheckDelayValue
 
         implementation.privateKey = getConfig().getString("privateKey", self.defaultPrivateKey)!
         implementation.notifyDownload = notifyDownload
@@ -78,6 +81,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         nc.addObserver(self, selector: #selector(appMovedToForeground), name: UIApplication.willEnterForegroundNotification, object: nil)
         nc.addObserver(self, selector: #selector(appKilled), name: UIApplication.willTerminateNotification, object: nil)
         self.appMovedToForeground()
+        self.checkForUpdateAfterDelay()
     }
 
     private func semaphoreWait(waitTime: Int) {
@@ -722,6 +726,20 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         self.checkAppReady()
     }
 
+    @objc func checkForUpdateAfterDelay() {
+        let timer = Timer.scheduledTimer(withTimeInterval: TimeInterval(periodCheckDelay), repeats: true) { _ in
+            let url = URL(string: self.updateUrl)!
+            let res = self.implementation.getLatest(url: url)
+            let current = self.implementation.getCurrentBundle()
+
+            if res.version != current.getVersionName() {
+                print("\(self.implementation.TAG) New version found: \(res.version)")
+                self.backgroundDownload()
+            }
+        }
+        RunLoop.current.add(timer, forMode: .default)
+    }
+
     @objc func appMovedToBackground() {
         let current: BundleInfo = self.implementation.getCurrentBundle()
         self.implementation.sendStats(action: "app_moved_to_background", versionName: current.getVersionName())

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "5.3.14",
-  "packageManager": "pnpm@8.8.0",
+  "version": "5.3.21",
+  "packageManager": "pnpm@8.9.2",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",
@@ -60,11 +60,11 @@
     "@capacitor/docgen": "^0.2.1",
     "@capacitor/ios": "^5.0.3",
     "@ionic/eslint-config": "^0.3.0",
-    "@ionic/prettier-config": "^3.0.0",
+    "@ionic/prettier-config": "^4.0.0",
     "@ionic/swiftlint-config": "^1.1.2",
     "@types/node": "^20.2.3",
-    "@typescript-eslint/eslint-plugin": "^5.59.7",
-    "@typescript-eslint/parser": "^5.59.7",
+    "@typescript-eslint/eslint-plugin": "^6.0.0",
+    "@typescript-eslint/parser": "^6.0.0",
     "eslint": "^8.41.0",
     "eslint-plugin-import": "^2.27.5",
     "prettier": "^2.8.8",