@capgo/capacitor-updater 6.1.34 → 6.2.1-beta.1

package/CapgoCapacitorUpdater.podspec

@@ -16,6 +16,5 @@ Pod::Spec.new do |s|
   s.dependency 'SSZipArchive'
   s.dependency 'Alamofire'
   s.dependency 'Version'
-  s.dependency 'SwiftyRSA'
   s.swift_version = '5.1'
 end

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

@@ -53,7 +53,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
   private static final String channelUrlDefault =
     "https://api.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "6.1.34";
+  private final String PLUGIN_VERSION = "6.2.0";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -1148,6 +1148,37 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 return;
               }
 
+              final String latestVersionName = res.getString("version");
+
+              if ("builtin".equals(latestVersionName)) {
+                Log.i(CapacitorUpdater.TAG, "Latest version is builtin");
+                if (CapacitorUpdaterPlugin.this.implementation.directUpdate) {
+                  Log.i(
+                    CapacitorUpdater.TAG,
+                    "Direct update to builtin version"
+                  );
+                  this._reset(false);
+                  CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(
+                      "Updated to builtin version",
+                      latestVersionName,
+                      CapacitorUpdaterPlugin.this.implementation.getCurrentBundle(),
+                      false
+                    );
+                } else {
+                  Log.i(CapacitorUpdater.TAG, "Setting next bundle to builtin");
+                  CapacitorUpdaterPlugin.this.implementation.setNextBundle(
+                      BundleInfo.ID_BUILTIN
+                    );
+                  CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(
+                      "Next update will be to builtin version",
+                      latestVersionName,
+                      current,
+                      false
+                    );
+                }
+                return;
+              }
+
               if (
                 !res.has("url") ||
                 !CapacitorUpdaterPlugin.this.isValidURL(res.getString("url"))
@@ -1161,7 +1192,6 @@ public class CapacitorUpdaterPlugin extends Plugin {
                   );
                 return;
               }
-              final String latestVersionName = res.getString("version");
 
               if (
                 latestVersionName != null &&

package/ios/Plugin/CapacitorUpdater.swift

@@ -8,7 +8,6 @@ import Foundation
 import SSZipArchive
 import Alamofire
 import zlib
-import SwiftyRSA
 import CryptoKit
 
 extension Collection {

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -7,16 +7,43 @@
 import Foundation
 import Capacitor
 import Version
-import SwiftyRSA
 
 /**
  * Please read the Capacitor iOS Plugin Development Guide
  * here: https://capacitorjs.com/docs/plugins/ios
  */
 @objc(CapacitorUpdaterPlugin)
-public class CapacitorUpdaterPlugin: CAPPlugin {
+public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
+    public let identifier = "CapacitorUpdaterPlugin" 
+    public let jsName = "CapacitorUpdater" 
+    public let pluginMethods: [CAPPluginMethod] = [
+        CAPPluginMethod(name: "download", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setUpdateUrl", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setStatsUrl", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setChannelUrl", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "set", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "list", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "delete", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "reset", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "current", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "reload", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "notifyAppReady", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setDelay", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setMultiDelay", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "cancelDelay", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getLatest", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setChannel", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "unsetChannel", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getChannel", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setCustomId", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getDeviceId", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getPluginVersion", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "next", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "isAutoUpdateEnabled", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getBuiltinVersion", returnType: CAPPluginReturnPromise),
+    ] 
     public var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "6.1.34"
+    private let PLUGIN_VERSION: String = "6.2.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"
@@ -696,6 +723,19 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                 self.endBackGroundTaskWithNotif(msg: res.message ?? "", latestVersionName: res.version, current: current, error: true)
                 return
             }
+            if res.version == "builtin" {
+                print("\(self.implementation.TAG) Latest version is builtin")
+                if self.directUpdate {
+                    print("\(self.implementation.TAG) Direct update to builtin version")
+                    _ = self._reset(toLastSuccessful: false)
+                    self.endBackGroundTaskWithNotif(msg: "Updated to builtin version", latestVersionName: res.version, current: self.implementation.getCurrentBundle(), error: false)
+                } else {
+                    print("\(self.implementation.TAG) Setting next bundle to builtin")
+                    _ = self.implementation.setNextBundle(next: BundleInfo.ID_BUILTIN)
+                    self.endBackGroundTaskWithNotif(msg: "Next update will be to builtin version", latestVersionName: res.version, current: current, error: false)
+                }
+                return
+            }
             let sessionKey = res.sessionKey ?? ""
             guard let downloadUrl = URL(string: res.url) else {
                 print("\(self.implementation.TAG) Error no url or wrong format")

package/package.json

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

package/ios/Plugin/CapacitorUpdaterPlugin.h

@@ -1,10 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for Plugin.
-FOUNDATION_EXPORT double PluginVersionNumber;
-
-//! Project version string for Plugin.
-FOUNDATION_EXPORT const unsigned char PluginVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <Plugin/PublicHeader.h>
-

package/ios/Plugin/CapacitorUpdaterPlugin.m

@@ -1,31 +0,0 @@
-#import <Foundation/Foundation.h>
-#import <Capacitor/Capacitor.h>
-
-// Define the plugin using the CAP_PLUGIN Macro, and
-// each method the plugin supports using the CAP_PLUGIN_METHOD macro.
-CAP_PLUGIN(CapacitorUpdaterPlugin, "CapacitorUpdater",
-           CAP_PLUGIN_METHOD(download, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(setUpdateUrl, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(setStatsUrl, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(setChannelUrl, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(set, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(list, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(delete, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(reset, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(current, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(reload, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(notifyAppReady, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(setDelay, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(setMultiDelay, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(cancelDelay, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(getLatest, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(setChannel, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(unsetChannel, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(getChannel, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(setCustomId, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(getDeviceId, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(getPluginVersion, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(next, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(isAutoUpdateEnabled, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(getBuiltinVersion, CAPPluginReturnPromise);
-)