@capgo/capacitor-updater 4.0.0-alpha.39 → 4.0.0-alpha.42

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

@@ -47,7 +47,7 @@ public class CapacitorUpdater {
     private static final String bundleDirectory = "versions";
 
     public static final String TAG = "Capacitor-updater";
-    public static final String pluginVersion = "4.0.0-alpha.39";
+    public static final String pluginVersion = "4.0.0-alpha.42";
 
     public SharedPreferences.Editor editor;
     public SharedPreferences prefs;
@@ -367,6 +367,7 @@ public class CapacitorUpdater {
             json.put("version_name", version);
             json.put("plugin_version", pluginVersion);
 
+            Log.e(CapacitorUpdater.TAG, "Auto-update parameters: " + json.toString());
             // Building a request
             JsonObjectRequest request = new JsonObjectRequest(
                     Request.Method.POST,
@@ -430,25 +431,28 @@ public class CapacitorUpdater {
         }
     }
 
-    public BundleInfo getBundleInfo(String id) {
-        if(id == null) {
-            id = BundleInfo.VERSION_UNKNOWN;
+    public BundleInfo getBundleInfo(final String id) {
+        String trueId = BundleInfo.VERSION_UNKNOWN;
+        if(id != null) {
+            trueId = id;
         }
-        Log.d(TAG, "Getting info for bundle [" + id + "]");
+        Log.d(TAG, "Getting info for bundle [" + trueId + "]");
         BundleInfo result;
-        if(BundleInfo.ID_BUILTIN.equals(id)) {
-            result = new BundleInfo(id, (String) null, BundleStatus.SUCCESS, "", "");
+        if(BundleInfo.ID_BUILTIN.equals(trueId)) {
+            result = new BundleInfo(trueId, (String) null, BundleStatus.SUCCESS, "", "");
+        } else if(BundleInfo.VERSION_UNKNOWN.equals(trueId)) {
+            result = new BundleInfo(trueId, (String) null, BundleStatus.ERROR, "", "");
         } else {
             try {
-                String stored = this.prefs.getString(id + INFO_SUFFIX, "");
+                String stored = this.prefs.getString(trueId + INFO_SUFFIX, "");
                 result = BundleInfo.fromJSON(stored);
             } catch (JSONException e) {
-                Log.e(TAG, "Failed to parse info for bundle [" + id + "] ", e);
-                result = new BundleInfo(id, (String) null, BundleStatus.PENDING, "", "");
+                Log.e(TAG, "Failed to parse info for bundle [" + trueId + "] ", e);
+                result = new BundleInfo(trueId, (String) null, BundleStatus.PENDING, "", "");
             }
         }
 
-        Log.d(TAG, "Returning info [" + id + "] " + result);
+        Log.d(TAG, "Returning info [" + trueId + "] " + result);
         return result;
     }
 
@@ -539,7 +543,7 @@ public class CapacitorUpdater {
     }
 
     public BundleInfo getNextBundle() {
-        final String id = this.prefs.getString(NEXT_VERSION, BundleInfo.ID_BUILTIN);
+        final String id = this.prefs.getString(NEXT_VERSION, null);
         return this.getBundleInfo(id);
     }
 

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

@@ -608,7 +608,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
             final BundleInfo current = this.implementation.getCurrentBundle();
             final BundleInfo next = this.implementation.getNextBundle();
 
-            if (next != null && !next.isErrorStatus() && (next.getId() != current.getId())) {
+            if (next != null && !next.isErrorStatus() && next.getId() != current.getId()) {
                 // There is a next bundle waiting for activation
                 Log.d(CapacitorUpdater.TAG, "Next bundle is: " + next.getVersionName());
                 if (this.implementation.set(next) && this._reload()) {

package/ios/Plugin/BundleInfo.swift

@@ -4,7 +4,7 @@ import Foundation
 
 @objc public class BundleInfo: NSObject, Decodable, Encodable {
     public static let ID_BUILTIN: String = "builtin"
-    public static let ID_UNKNOWN: String = "unknown"
+    public static let VERSION_UNKNOWN: String = "unknown"
     public static let DOWNLOADED_BUILTIN: String = "1970-01-01T00:00:00.000Z"
 
     private let downloaded: String
@@ -34,7 +34,7 @@ import Foundation
     }
 
     public func isUnknown() -> Bool {
-        return BundleInfo.ID_UNKNOWN == self.id
+        return BundleInfo.VERSION_UNKNOWN == self.id
     }
 
     public func isErrorStatus() -> Bool {

package/ios/Plugin/CapacitorUpdater.swift

@@ -149,7 +149,7 @@ extension CustomError: LocalizedError {
     
     public let TAG = "✨  Capacitor-updater:";
     public let CAP_SERVER_PATH = "serverBasePath"
-    public let pluginVersion = "4.0.0-alpha.39"
+    public let pluginVersion = "4.0.0-alpha.42"
     public var statsUrl = ""
     public var appId = ""
     public var deviceID = UIDevice.current.identifierForVendor?.uuidString ?? ""
@@ -242,6 +242,7 @@ extension CustomError: LocalizedError {
             "plugin_version": self.pluginVersion,
             "version_name": self.getCurrentBundle().getVersionName()
         ]
+        print("\(self.TAG) Auto-update parameters: \(parameters)")
         let request = AF.request(url, method: .post,parameters: parameters, encoder: JSONParameterEncoder.default)
 
         request.validate().responseDecodable(of: AppVersionDec.self) { response in
@@ -420,7 +421,7 @@ extension CustomError: LocalizedError {
     }
     
     public func reset(isInternal: Bool) {
-        print("\(self.TAG) reset: \(internal)")
+        print("\(self.TAG) reset: \(isInternal)")
         self.setCurrentBundle(bundle: "")
         self.setFallbackBundle(fallback: Optional<BundleInfo>.none)
         let _ = self.setNextBundle(next: Optional<String>.none)
@@ -469,19 +470,27 @@ extension CustomError: LocalizedError {
         }
     }
 
-    public func getBundleInfo(id: String = BundleInfo.ID_BUILTIN) -> BundleInfo {
-        print("\(self.TAG) Getting info for bundle [\(id)]")
-        if(BundleInfo.ID_BUILTIN == id) {
-            return BundleInfo(id: id, version: "", status: BundleStatus.SUCCESS, checksum: "")
+    public func getBundleInfo(id: String?) -> BundleInfo {
+        var trueId = BundleInfo.VERSION_UNKNOWN
+        if(id != nil) {
+            trueId = id!
         }
-        do {
-            let result: BundleInfo = try UserDefaults.standard.getObj(forKey: "\(id)\(self.INFO_SUFFIX)", castTo: BundleInfo.self)
-//            print("\(self.TAG) Returning info bundle [\(id)]", result.toString())
-            return result
-        } catch {
-            print("\(self.TAG) Failed to parse info for bundle [\(id)]", error.localizedDescription)
-            return BundleInfo(id: id, version: "", status: BundleStatus.PENDING, checksum: "")
+        print("\(self.TAG) Getting info for bundle [\(trueId)]")
+        let result: BundleInfo;
+        if(BundleInfo.ID_BUILTIN == trueId) {
+            result = BundleInfo(id: trueId, version: "", status: BundleStatus.SUCCESS, checksum: "")
+        } else if (BundleInfo.VERSION_UNKNOWN == trueId) {
+            result = BundleInfo(id: trueId, version: "", status: BundleStatus.ERROR, checksum: "")
+        } else {
+            do {
+                result = try UserDefaults.standard.getObj(forKey: "\(trueId)\(self.INFO_SUFFIX)", castTo: BundleInfo.self)
+            } catch {
+                print("\(self.TAG) Failed to parse info for bundle [\(trueId)]", error.localizedDescription)
+                result = BundleInfo(id: trueId, version: "", status: BundleStatus.PENDING, checksum: "")
+            }
         }
+        print("\(self.TAG) Returning info bundle [\(result.toString())]")
+        return result;
     }
 
     public func getBundleInfoByVersionName(version: String) -> BundleInfo? {
@@ -559,7 +568,7 @@ extension CustomError: LocalizedError {
     }
 
     public func getNextBundle() -> BundleInfo? {
-        let id: String = UserDefaults.standard.string(forKey: self.NEXT_VERSION) ?? BundleInfo.ID_BUILTIN
+        let id: String? = UserDefaults.standard.string(forKey: self.NEXT_VERSION)
         return self.getBundleInfo(id: id)
     }
 

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -423,7 +423,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         let current: BundleInfo = self.implementation.getCurrentBundle()
         let next: BundleInfo? = self.implementation.getNextBundle()
 
-        if (next != nil && !next!.isErrorStatus() && (next!.getVersionName() != current.getVersionName())) {
+        if (next != nil && !next!.isErrorStatus() && next!.getVersionName() != current.getVersionName()) {
             print("\(self.implementation.TAG) Next bundle is: \(next!.toString())")
             if (self.implementation.set(bundle: next!) && self._reload()) {
                 print("\(self.implementation.TAG) Updated to bundle: \(next!.toString())")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "4.0.0-alpha.39",
+  "version": "4.0.0-alpha.42",
   "license": "AGPL-3.0-only",
   "description": "OTA update for capacitor apps",
   "main": "dist/plugin.cjs.js",