@capgo/capacitor-updater 4.14.8 → 4.14.16

package/README.md

@@ -5,6 +5,13 @@
 ![npm](https://img.shields.io/npm/dm/@capgo/capacitor-updater)
 [![GitHub latest commit](https://badgen.net/github/last-commit/Cap-go/capacitor-updater/main)](https://GitHub.com/Cap-go/capacitor-updater/commit/)
 [![https://good-labs.github.io/greater-good-affirmation/assets/images/badge.svg](https://good-labs.github.io/greater-good-affirmation/assets/images/badge.svg)](https://good-labs.github.io/greater-good-affirmation)
+[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=Cap-go_capacitor-updater&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=Cap-go_capacitor-updater)
+[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=Cap-go_capacitor-updater&metric=bugs)](https://sonarcloud.io/summary/new_code?id=Cap-go_capacitor-updater)
+[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=Cap-go_capacitor-updater&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=Cap-go_capacitor-updater)
+[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=Cap-go_capacitor-updater&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=Cap-go_capacitor-updater)
+[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=Cap-go_capacitor-updater&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=Cap-go_capacitor-updater)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=Cap-go_capacitor-updater&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=Cap-go_capacitor-updater)
+[![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=Cap-go_capacitor-updater&metric=sqale_index)](https://sonarcloud.io/summary/new_code?id=Cap-go_capacitor-updater)
 
 Update Ionic Capacitor apps without App/Play Store review (Code-push / hot-code updates).
 

package/android/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="ee.forgr.capacitor_updater">
-    <application android:allowBackup="false" android:usesCleartextTraffic="false">
+    <application android:usesCleartextTraffic="false">
         <service android:name="ee.forgr.capacitor_updater.DownloadService" />
     </application>
 </manifest>

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

@@ -63,7 +63,7 @@ public class CapacitorUpdater {
   private static final String bundleDirectory = "versions";
 
   public static final String TAG = "Capacitor-updater";
-  public static final String pluginVersion = "4.14.8";
+  public static final String pluginVersion = "4.14.16";
 
   public SharedPreferences.Editor editor;
   public SharedPreferences prefs;
@@ -278,12 +278,20 @@ public class CapacitorUpdater {
             " " +
             checksum
           );
-          CapacitorUpdater.this.finishBackground(
+          if (dest == null) {
+            CapacitorUpdater.this.sendStats(
+                "download_fail",
+                CapacitorUpdater.this.getCurrentBundle().getVersionName()
+              );
+            return;
+          }
+          CapacitorUpdater.this.finishDownload(
               id,
               dest,
               version,
               sessionKey,
-              checksum
+              checksum,
+              true
             );
         } else {
           Log.i(TAG, "Unknown action " + action);
@@ -292,19 +300,19 @@ public class CapacitorUpdater {
     }
   };
 
-  public void finishBackground(
+  public void finishDownload(
     String id,
     String dest,
     String version,
     String sessionKey,
-    String checksumRes
+    String checksumRes,
+    Boolean setNext
   ) {
     try {
       final File downloaded = new File(this.documentsDir, dest);
       this.decryptFile(downloaded, sessionKey);
       final String checksum;
       checksum = this.getChecksum(downloaded);
-
       this.notifyDownload(id, 71);
       final File unzipped = this.unzip(id, downloaded, this.randomString(10));
       downloaded.delete();
@@ -339,9 +347,15 @@ public class CapacitorUpdater {
       final JSObject ret = new JSObject();
       ret.put("bundle", info.toJSON());
       CapacitorUpdater.this.notifyListeners("updateAvailable", ret);
-      this.setNextBundle(info.getId());
+      if (setNext) {
+        this.setNextBundle(info.getId());
+      }
     } catch (IOException e) {
       e.printStackTrace();
+      CapacitorUpdater.this.sendStats(
+          "download_fail",
+          CapacitorUpdater.this.getCurrentBundle().getVersionName()
+        );
     }
   }
 
@@ -516,16 +530,10 @@ public class CapacitorUpdater {
     this.notifyDownload(id, 0);
     final String idName = bundleDirectory + "/" + id;
     this.notifyDownload(id, 5);
-    final File downloaded = this.downloadFile(id, url, this.randomString(10));
-    this.decryptFile(downloaded, sessionKey);
+    final String dest = this.randomString(10);
+    final File downloaded = this.downloadFile(id, url, dest);
     final String checksum = this.getChecksum(downloaded);
-    this.notifyDownload(id, 71);
-    final File unzipped = this.unzip(id, downloaded, this.randomString(10));
-    downloaded.delete();
-    this.notifyDownload(id, 91);
-    this.flattenAssets(unzipped, idName);
-    this.notifyDownload(id, 100);
-    this.saveBundleInfo(id, null);
+    this.finishDownload(id, dest, version, sessionKey, checksum, false);
     BundleInfo info = new BundleInfo(
       id,
       version,
@@ -685,16 +693,14 @@ public class CapacitorUpdater {
           response.data,
           HttpHeaderParser.parseCharset(response.headers)
         );
-        Log.e(TAG, message + ": " + json);
         retError.put("message", message + ": " + json);
       } catch (UnsupportedEncodingException e) {
-        Log.e(TAG, message + ": " + e.toString());
         retError.put("message", message + ": " + e.toString());
       }
     } else {
-      Log.e(TAG, message + ": " + error.toString());
       retError.put("message", message + ": " + error.toString());
     }
+    Log.e(TAG, message + ": " + retError);
     return retError;
   }
 

package/ios/Plugin/CapacitorUpdater.swift

@@ -410,19 +410,19 @@ extension CustomError: LocalizedError {
                 if let major = response.value?.major {
                     latest.major = major
                 }
-                if let message = response.value?.message {
-                    latest.message = message
-                }
                 if let error = response.value?.error {
                     latest.error = error
                 }
+                if let message = response.value?.message {
+                    latest.message = message
+                }
                 if let sessionKey = response.value?.session_key {
                     latest.sessionKey = sessionKey
                 }
             case let .failure(error):
-                print("\(self.TAG) Error getting Latest", response.value, error )
-                latest.message = "Error getting Latest \(response.value)"
-                latest.error = "fail_response"
+                print("\(self.TAG) Error getting Latest", response.value ?? "", error )
+                latest.message = "Error getting Latest \(String(describing: response.value))"
+                latest.error = "response_error"
             }
             semaphore.signal()
         }
@@ -647,7 +647,7 @@ extension CustomError: LocalizedError {
             case let .failure(error):
                 print("\(self.TAG) Error set Channel", response.value, error)
                 setChannel.message = "Error set Channel \(String(describing: response.value))"
-                setChannel.error = "fail_response"
+                setChannel.error = "response_error"
             }
             semaphore.signal()
         }
@@ -676,6 +676,9 @@ extension CustomError: LocalizedError {
                 if let error = response.value?.error {
                     getChannel.error = error
                 }
+                if let message = response.value?.message {
+                    getChannel.message = message
+                }
                 if let channel = response.value?.channel {
                     getChannel.channel = channel
                 }
@@ -683,9 +686,9 @@ extension CustomError: LocalizedError {
                     getChannel.allowSet = allowSet
                 }
             case let .failure(error):
-                print("\(self.TAG) Error get Channel", response.value, error)
+                print("\(self.TAG) Error get Channel", response.value ?? "", error)
                 getChannel.message = "Error get Channel \(String(describing: response.value)))"
-                getChannel.error = "fail_response"
+                getChannel.error = "response_error"
             }
             semaphore.signal()
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "4.14.8",
+  "version": "4.14.16",
   "packageManager": "pnpm@7.18.2",
   "license": "LGPL-3.0-only",
   "description": "Live update for capacitor apps",