@capgo/capacitor-updater 3.2.1 → 3.3.2

package/README.md

@@ -43,7 +43,7 @@ Create account in [capgo.app](https://capgo.app) and get your [API key](https://
 ```
 - Add to your main code
 ```javascript
-  import { CapacitorUpdater } from 'capacitor-updater'
+  import { CapacitorUpdater } from '@capgo/capacitor-updater'
   CapacitorUpdater.notifyAppReady()
   // To let auto update know you app boot well.
 ```
@@ -64,7 +64,7 @@ install it when user background the app.
 In your main code :
 
 ```javascript
-  import { CapacitorUpdater } from 'capacitor-updater'
+  import { CapacitorUpdater } from '@capgo/capacitor-updater'
   import { SplashScreen } from '@capacitor/splash-screen'
   import { App } from '@capacitor/app'
 
@@ -436,7 +436,7 @@ removeAllListeners() => Promise<void>
 ### Listen to download events
 
 ```javascript
-  import { CapacitorUpdater } from 'capacitor-updater';
+  import { CapacitorUpdater } from '@capgo/capacitor-updater';
 
 CapacitorUpdater.addListener('download', (info: any) => {
   console.log('download was fired', info.percent);

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

@@ -45,11 +45,32 @@ interface Callback {
 }
 
 public class CapacitorUpdater {
-    public String statsUrl = "";
+    static final String AB = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+    static SecureRandom rnd = new SecureRandom();
+    private final String TAG = "Capacitor-updater";
+    private final Context context;
+    private final String basePathHot = "versions";
+    private final SharedPreferences prefs;
+    private final SharedPreferences.Editor editor;
+    private String versionBuild = "";
+    private String versionCode = "";
+    private String versionOs = "";
+
     public String appId = "";
     public String deviceID = "";
-    private final String pluginVersion = "3.2.1";
+    public final String pluginVersion = "3.3.2";
+    public String statsUrl = "";
 
+    public CapacitorUpdater (final Context context) throws PackageManager.NameNotFoundException {
+        this.context = context;
+        this.prefs = this.context.getSharedPreferences("CapWebViewSettings", Activity.MODE_PRIVATE);
+        this.editor = this.prefs.edit();
+        this.versionOs = Build.VERSION.RELEASE;
+        this.deviceID = Secure.getString(context.getContentResolver(), Secure.ANDROID_ID);
+        final PackageInfo pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+        this.versionBuild = pInfo.versionName;
+        this.versionCode = Integer.toString(pInfo.versionCode);
+    }
 
     private final FilenameFilter filter = new FilenameFilter() {
         @Override
@@ -58,163 +79,126 @@ public class CapacitorUpdater {
             return !name.startsWith("__MACOSX") && !name.startsWith(".") && !name.startsWith(".DS_Store");
         }
     };
-    private final Context context;
-    private final CapacitorUpdaterEvents events;
-
-    private String versionBuild = "";
-    private String versionCode = "";
-    private String versionOs = "";
-    private final String TAG = "Capacitor-updater";
-    private final String basePathHot = "versions";
-    private final SharedPreferences prefs;
-    private final SharedPreferences.Editor editor;
-
-    static final String AB = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-    static SecureRandom rnd = new SecureRandom();
 
     private int calcTotalPercent(final int percent, final int min, final int max) {
         return (percent * (max - min)) / 100 + min;
     }
 
+    void notifyDownload(final int percent) {
+        return;
+    }
+
     private String randomString(final int len){
         final StringBuilder sb = new StringBuilder(len);
         for(int i = 0; i < len; i++)
             sb.append(AB.charAt(rnd.nextInt(AB.length())));
         return sb.toString();
     }
-
-    public CapacitorUpdater(final Context context) throws PackageManager.NameNotFoundException {
-        this(context, new CapacitorUpdaterEvents() {});
-    }
-
-    public CapacitorUpdater (final Context context, final CapacitorUpdaterEvents events) throws PackageManager.NameNotFoundException {
-        this.context = context;
-        this.events = events;
-
-        this.prefs = this.context.getSharedPreferences("CapWebViewSettings", Activity.MODE_PRIVATE);
-        this.editor = this.prefs.edit();
-        this.versionOs = Build.VERSION.RELEASE;
-        this.deviceID = Secure.getString(context.getContentResolver(), Secure.ANDROID_ID);
-
-        final PackageInfo pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
-        this.versionBuild = pInfo.versionName;
-        this.versionCode = Integer.toString(pInfo.versionCode);
-    }
-
-    private Boolean unzip(final String source, final String dest) {
-        final File zipFile = new File(this.context.getFilesDir()  + "/" + source);
+    private File unzip(final File zipFile, final String dest) throws IOException {
         final File targetDirectory = new File(this.context.getFilesDir()  + "/" + dest);
-        ZipInputStream zis = null;
-        try {
-            zis = new ZipInputStream(
-                    new BufferedInputStream(new FileInputStream(zipFile)));
-        } catch (final FileNotFoundException e) {
-            e.printStackTrace();
-            return false;
-        }
+        final ZipInputStream zis = new ZipInputStream(new BufferedInputStream(new FileInputStream(zipFile)));
         try {
-            ZipEntry ze;
             int count;
-            final int buffLength = 8192;
-            final byte[] buffer = new byte[buffLength];
-            final long totalLength = zipFile.length();
-            long readLength = buffLength;
+            final int bufferSize = 8192;
+            final byte[] buffer = new byte[bufferSize];
+            final long lengthTotal = zipFile.length();
+            long lengthRead = bufferSize;
             int percent = 0;
-            this.events.notifyDownload(75);
-            while ((ze = zis.getNextEntry()) != null) {
-                final File file = new File(targetDirectory, ze.getName());
+            this.notifyDownload(75);
+
+            ZipEntry entry;
+            while ((entry = zis.getNextEntry()) != null) {
+                final File file = new File(targetDirectory, entry.getName());
                 final String canonicalPath = file.getCanonicalPath();
                 final String canonicalDir = (new File(String.valueOf(targetDirectory))).getCanonicalPath();
-                final File dir = ze.isDirectory() ? file : file.getParentFile();
+                final File dir = entry.isDirectory() ? file : file.getParentFile();
+
                 if (!canonicalPath.startsWith(canonicalDir)) {
                     throw new FileNotFoundException("SecurityException, Failed to ensure directory is the start path : " +
                             canonicalDir + " of " + canonicalPath);
                 }
-                if (!dir.isDirectory() && !dir.mkdirs())
+
+                if (!dir.isDirectory() && !dir.mkdirs()) {
                     throw new FileNotFoundException("Failed to ensure directory: " +
                             dir.getAbsolutePath());
-                if (ze.isDirectory())
+                }
+
+                if (entry.isDirectory()) {
                     continue;
-                final FileOutputStream fileOut = new FileOutputStream(file);
-                try {
+                }
+
+                try(final FileOutputStream outputStream = new FileOutputStream(file)) {
                     while ((count = zis.read(buffer)) != -1)
-                        fileOut.write(buffer, 0, count);
-                } finally {
-                    fileOut.close();
+                        outputStream.write(buffer, 0, count);
                 }
-                final int newPercent = (int)((readLength * 100) / totalLength);
-                if (totalLength > 1 && newPercent != percent) {
+
+                final int newPercent = (int)((lengthRead * 100) / lengthTotal);
+                if (lengthTotal > 1 && newPercent != percent) {
                     percent = newPercent;
-                    this.events.notifyDownload(this.calcTotalPercent(percent, 75, 90));
+                    this.notifyDownload(this.calcTotalPercent(percent, 75, 90));
                 }
-                readLength += ze.getCompressedSize();
+
+                lengthRead += entry.getCompressedSize();
             }
-        } catch (final Exception e) {
-            Log.i(this.TAG, "unzip error", e);
-            return false;
+            return targetDirectory;
         } finally {
             try {
                 zis.close();
             } catch (final IOException e) {
-                e.printStackTrace();
-                return false;
+                Log.e(this.TAG, "Failed to close zip input stream", e);
             }
-            return true;
         }
     }
 
-    private Boolean flattenAssets(final String source, final String dest) {
-        final File current = new File(this.context.getFilesDir()  + "/" + source);
-        if (!current.exists()) {
-            return false;
+    private void flattenAssets(final File sourceFile, final String dest) throws IOException {
+        if (!sourceFile.exists()) {
+            throw new FileNotFoundException("Source file not found: " + sourceFile.getPath());
         }
-        final File fDest = new File(this.context.getFilesDir()  + "/" + dest);
-        fDest.getParentFile().mkdirs();
-        final String[] pathsName = current.list(this.filter);
-        if (pathsName == null || pathsName.length == 0) {
-            return false;
+        final File destinationFile = new File(this.context.getFilesDir()  + "/" + dest);
+        destinationFile.getParentFile().mkdirs();
+        final String[] entries = sourceFile.list(this.filter);
+        if (entries == null || entries.length == 0) {
+            throw new IOException("Source file was not a directory or was empty: " + sourceFile.getPath());
         }
-        if (pathsName.length == 1 && !pathsName[0].equals("index.html")) {
-            final File newFlat =  new File(current.getPath() + "/" + pathsName[0]);
-            newFlat.renameTo(fDest);
+        if (entries.length == 1 && !entries[0].equals("index.html")) {
+            final File child = new File(sourceFile.getPath() + "/" + entries[0]);
+            child.renameTo(destinationFile);
         } else {
-            current.renameTo(fDest);
+            sourceFile.renameTo(destinationFile);
         }
-        current.delete();
-        return true;
+        sourceFile.delete();
     }
 
-    private Boolean downloadFile(final String url, final String dest) throws JSONException {
-        try {
-            final URL u = new URL(url);
-            final URLConnection uc = u.openConnection();
-            final InputStream is = u.openStream();
-            final DataInputStream dis = new DataInputStream(is);
-            final long totalLength = uc.getContentLength();
-            final int buffLength = 1024;
-            final byte[] buffer = new byte[buffLength];
-            int length;
-            final File downFile = new File(this.context.getFilesDir()  + "/" + dest);
-            downFile.getParentFile().mkdirs();
-            downFile.createNewFile();
-            final FileOutputStream fos = new FileOutputStream(downFile);
-            int readLength = buffLength;
-            int percent = 0;
-            this.events.notifyDownload(10);
-            while ((length = dis.read(buffer))>0) {
-                fos.write(buffer, 0, length);
-                final int newPercent = (int)((readLength * 100) / totalLength);
-                if (totalLength > 1 && newPercent != percent) {
-                    percent = newPercent;
-                    this.events.notifyDownload(this.calcTotalPercent(percent, 10, 70));
-                }
-                readLength += length;
+    private File downloadFile(final String url, final String dest) throws IOException {
+
+        final URL u = new URL(url);
+        final URLConnection connection = u.openConnection();
+        final InputStream is = u.openStream();
+        final DataInputStream dis = new DataInputStream(is);
+
+        final File target = new File(this.context.getFilesDir()  + "/" + dest);
+        target.getParentFile().mkdirs();
+        target.createNewFile();
+        final FileOutputStream fos = new FileOutputStream(target);
+
+        final long totalLength = connection.getContentLength();
+        final int bufferSize = 1024;
+        final byte[] buffer = new byte[bufferSize];
+        int length;
+
+        int bytesRead = bufferSize;
+        int percent = 0;
+        this.notifyDownload(10);
+        while ((length = dis.read(buffer))>0) {
+            fos.write(buffer, 0, length);
+            final int newPercent = (int)((bytesRead * 100) / totalLength);
+            if (totalLength > 1 && newPercent != percent) {
+                percent = newPercent;
+                this.notifyDownload(this.calcTotalPercent(percent, 10, 70));
             }
-        } catch (final Exception e) {
-            Log.e(this.TAG, "downloadFile error", e);
-            return false;
+            bytesRead += length;
         }
-        return true;
+        return target;
     }
 
     private void deleteDirectory(final File file) throws IOException {
@@ -231,30 +215,22 @@ public class CapacitorUpdater {
         }
     }
 
-    public String download(final String url) {
-        try {
-            this.events.notifyDownload(0);
-            final String folderNameZip = this.randomString(10);
-            final File fileZip = new File(this.context.getFilesDir()  + "/" + folderNameZip);
-            final String folderNameUnZip = this.randomString(10);
-            final String version = this.randomString(10);
-            final String folderName = this.basePathHot + "/" + version;
-            this.events.notifyDownload(5);
-            final Boolean downloaded = this.downloadFile(url, folderNameZip);
-            if(!downloaded) return "";
-            this.events.notifyDownload(71);
-            final Boolean unzipped = this.unzip(folderNameZip, folderNameUnZip);
-            if(!unzipped) return "";
-            fileZip.delete();
-            this.events.notifyDownload(91);
-            final Boolean flatt = this.flattenAssets(folderNameUnZip, folderName);
-            if(!flatt) return "";
-            this.events.notifyDownload(100);
-            return version;
-        } catch (final Exception e) {
-            Log.e(this.TAG, "updateApp error", e);
-            return "";
-        }
+    public String download(final String url) throws IOException {
+        this.notifyDownload(0);
+        final String path = this.randomString(10);
+        final File zipFile = new File(this.context.getFilesDir()  + "/" + path);
+        final String folderNameUnZip = this.randomString(10);
+        final String version = this.randomString(10);
+        final String folderName = this.basePathHot + "/" + version;
+        this.notifyDownload(5);
+        final File downloaded = this.downloadFile(url, path);
+        this.notifyDownload(71);
+        final File unzipped = this.unzip(downloaded, folderNameUnZip);
+        zipFile.delete();
+        this.notifyDownload(91);
+        this.flattenAssets(unzipped, folderName);
+        this.notifyDownload(100);
+        return version;
     }
 
     public ArrayList<String> list() {
@@ -298,8 +274,8 @@ public class CapacitorUpdater {
     }
 
     public void getLatest(final String url, final Callback callback) {
-        final String deviceID = this.deviceID;
-        final String appId = this.appId;
+        final String deviceID = this.getDeviceID();
+        final String appId = this.getAppId();
         final String versionBuild = this.versionBuild;
         final String versionCode = this.versionCode;
         final String versionOs = this.versionOs;
@@ -313,7 +289,7 @@ public class CapacitorUpdater {
                             final JSONObject jsonObject = new JSONObject(response);
                             callback.callback(jsonObject);
                         } catch (final JSONException e) {
-                            e.printStackTrace();
+                            Log.e(CapacitorUpdater.this.TAG, "Error parsing JSON", e);
                         }
                     }
                 }, new Response.ErrorListener() {
@@ -358,21 +334,21 @@ public class CapacitorUpdater {
     }
 
     public void sendStats(final String action, final String version) {
-        if (this.statsUrl == "") { return; }
+        if (this.getStatsUrl() == "") { return; }
         final URL url;
         final JSONObject json = new JSONObject();
         final String jsonString;
         try {
-            url = new URL(this.statsUrl);
+            url = new URL(this.getStatsUrl());
             json.put("platform", "android");
             json.put("action", action);
             json.put("version_name", version);
-            json.put("device_id", this.deviceID);
+            json.put("device_id", this.getDeviceID());
             json.put("version_build", this.versionBuild);
             json.put("version_code", this.versionCode);
             json.put("version_os", this.versionOs);
             json.put("plugin_version", this.pluginVersion);
-            json.put("app_id", this.appId);
+            json.put("app_id", this.getAppId());
             jsonString = json.toString();
         } catch (final Exception ex) {
             Log.e(this.TAG, "Error get stats", ex);
@@ -409,4 +385,28 @@ public class CapacitorUpdater {
             }
         }).start();
     }
+
+    public String getStatsUrl() {
+        return this.statsUrl;
+    }
+
+    public void setStatsUrl(final String statsUrl) {
+        this.statsUrl = statsUrl;
+    }
+
+    public String getAppId() {
+        return this.appId;
+    }
+
+    public void setAppId(final String appId) {
+        this.appId = appId;
+    }
+
+    public String getDeviceID() {
+        return this.deviceID;
+    }
+
+    public void setDeviceID(final String deviceID) {
+        this.deviceID = deviceID;
+    }
 }

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

@@ -5,13 +5,11 @@ import android.app.Application;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 
 import com.getcapacitor.CapConfig;
 import com.getcapacitor.JSArray;
@@ -29,42 +27,43 @@ import java.util.ArrayList;
 
 @CapacitorPlugin(name = "CapacitorUpdater")
 public class CapacitorUpdaterPlugin extends Plugin implements Application.ActivityLifecycleCallbacks {
+    private static final String autoUpdateUrlDefault = "https://capgo.app/api/auto_update";
+    private static final String statsUrlDefault = "https://capgo.app/api/stats";
     private final String TAG = "Capacitor-updater";
     private CapacitorUpdater implementation;
+
     private SharedPreferences prefs;
     private SharedPreferences.Editor editor;
-    private static final String autoUpdateUrlDefault = "https://capgo.app/api/auto_update";
-    private static final String statsUrlDefault = "https://capgo.app/api/stats";
+
     private String autoUpdateUrl = "";
     private Version currentVersionNative;
     private Boolean autoUpdate = false;
     private Boolean resetWhenUpdate = true;
 
-
     @Override
     public void load() {
         super.load();
         this.prefs = this.getContext().getSharedPreferences("CapWebViewSettings", Activity.MODE_PRIVATE);
         this.editor = this.prefs.edit();
         try {
-            this.implementation = new CapacitorUpdater(this.getContext(), new CapacitorUpdaterEvents() {
+            this.implementation = new CapacitorUpdater(this.getContext()) {
                 @Override
                 public void notifyDownload(final int percent) {
-                    CapacitorUpdaterPlugin.this.notifyDownload(percent);
+                    this.notifyDownload(percent);
                 }
-            });
+            };
             final PackageInfo pInfo = this.getContext().getPackageManager().getPackageInfo(this.getContext().getPackageName(), 0);
             this.currentVersionNative = new Version(pInfo.versionName);
         } catch (final PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
+            Log.e(this.TAG, "Error instantiating implementation", e);
             return;
         } catch (final Exception ex) {
-            Log.e(this.TAG, "Error get currentVersionNative", ex);
+            Log.e(this.TAG, "Error getting current native app version", ex);
             return;
         }
         final CapConfig config = CapConfig.loadDefault(this.getActivity());
-        this.implementation.appId = config.getString("appId", "");
-        this.implementation.statsUrl = this.getConfig().getString("statsUrl", statsUrlDefault);
+        this.implementation.setAppId(config.getString("appId", ""));
+        this.implementation.setStatsUrl(this.getConfig().getString("statsUrl", statsUrlDefault));
         this.autoUpdateUrl = this.getConfig().getString("autoUpdateUrl", autoUpdateUrlDefault);
         this.autoUpdate = this.getConfig().getBoolean("autoUpdate", false);
         this.resetWhenUpdate = this.getConfig().getBoolean("resetWhenUpdate", true);
@@ -78,16 +77,18 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
                     final ArrayList<String> res = this.implementation.list();
                     for (int i = 0; i < res.size(); i++) {
                         try {
-                            this.implementation.delete(res.get(i), "");
+                            final String version = res.get(i);
+                            this.implementation.delete(version, "");
+                            Log.i(this.TAG, "Deleted obsolete version: " + version);
                         } catch (final IOException e) {
-                            e.printStackTrace();
+                            Log.e(CapacitorUpdaterPlugin.this.TAG, "error deleting version", e);
                         }
                     }
                 }
                 this.editor.putString("LatestVersionNative", this.currentVersionNative.toString());
                 this.editor.commit();
             } catch (final Exception ex) {
-                Log.e("CapacitorUpdater", "Cannot get the current version " + ex.getMessage());
+                Log.e(this.TAG, "Cannot get the current version " + ex.getMessage());
             }
         }
         if (!this.autoUpdate || this.autoUpdateUrl.equals("")) return;
@@ -105,7 +106,14 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
     @PluginMethod
     public void getId(final PluginCall call) {
         final JSObject ret = new JSObject();
-        ret.put("id", this.implementation.deviceID);
+        ret.put("id", this.implementation.getDeviceID());
+        call.resolve(ret);
+    }
+
+    @PluginMethod
+    public void getPluginVersion(final PluginCall call) {
+        final JSObject ret = new JSObject();
+        ret.put("version", this.implementation.pluginVersion);
         call.resolve(ret);
     }
 
@@ -114,14 +122,15 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
         new Thread(new Runnable(){
             @Override
             public void run() {
-                final String url = call.getString("url");
-                final String res = CapacitorUpdaterPlugin.this.implementation.download(url);
-                if (!res.equals("")) {
+                try {
+                    final String url = call.getString("url");
+                    final String version = CapacitorUpdaterPlugin.this.implementation.download(url);
                     final JSObject ret = new JSObject();
-                    ret.put("version", res);
+                    ret.put("version", version);
                     call.resolve(ret);
-                } else {
-                    call.reject("download failed");
+                } catch (final IOException e) {
+                    Log.e(CapacitorUpdaterPlugin.this.TAG, "download failed", e);
+                    call.reject("download failed", e);
                 }
             }
         }).start();
@@ -132,7 +141,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
         this.bridge.setServerBasePath(pathHot);
         return true;
     }
-    
+
     @PluginMethod
     public void reload(final PluginCall call) {
         if (this._reload()) {
@@ -166,7 +175,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
                 call.reject("Delete failed, version " + version + " doesn't exist");
             }
         } catch(final IOException ex) {
-            Log.e("CapacitorUpdater", "An unexpected error occurred during deletion of folder. Message: " + ex.getMessage());
+            Log.e(this.TAG, "An unexpected error occurred during deletion of folder. Message: " + ex.getMessage());
             call.reject("An unexpected error occurred during deletion of folder.");
         }
     }
@@ -247,17 +256,8 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
     @Override
     public void onActivityStarted(@NonNull final Activity activity) {
 //        disableRevert disableBreaking
-        String currentVersionNative = "";
-        try {
-            final PackageInfo pInfo = this.getContext().getPackageManager().getPackageInfo(this.getContext().getPackageName(), 0);
-            currentVersionNative = pInfo.versionName;
-        } catch (final Exception ex) {
-            Log.e(this.TAG, "Error get stats", ex);
-            return;
-        }
         Log.i(this.TAG, "Check for update in the server");
         if (this.autoUpdateUrl.equals("")) return;
-        final String finalCurrentVersionNative = currentVersionNative;
         new Thread(new Runnable(){
             @Override
             public void run() {
@@ -282,7 +282,8 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
                                 @Override
                                 public void run() {
                                     try {
-                                        final String dl = CapacitorUpdaterPlugin.this.implementation.download((String) res.get("url"));
+                                        final String url = (String) res.get("url");
+                                        final String dl = CapacitorUpdaterPlugin.this.implementation.download(url);
                                         if (dl.equals("")) {
                                             Log.i(CapacitorUpdaterPlugin.this.TAG, "Download version: " + newVersion + " failed");
                                             return;
@@ -292,8 +293,8 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
                                         CapacitorUpdaterPlugin.this.editor.putString("nextVersionName", (String) res.get("version"));
                                         CapacitorUpdaterPlugin.this.editor.commit();
                                         CapacitorUpdaterPlugin.this.notifyListeners("updateAvailable", ret);
-                                    } catch (final JSONException e) {
-                                        e.printStackTrace();
+                                    } catch (final Exception e) {
+                                        Log.e(CapacitorUpdaterPlugin.this.TAG, "error downloading file", e);
                                     }
                                 }
                             }).start();
@@ -301,7 +302,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
                             Log.i(CapacitorUpdaterPlugin.this.TAG, "No need to update, " + currentVersion + " is the latest");
                         }
                     } catch (final JSONException e) {
-                        e.printStackTrace();
+                        Log.e(CapacitorUpdaterPlugin.this.TAG, "error parsing JSON", e);
                     }
                 });
             }
@@ -371,20 +372,20 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
             try {
                 final Boolean res = this.implementation.delete(curVersion, curVersionName);
                 if (res) {
-                    Log.i(this.TAG, "Delete failing version: " + curVersionName);
+                    Log.i(this.TAG, "Deleted failing version: " + curVersionName);
                 }
             } catch (final IOException e) {
-                e.printStackTrace();
+                Log.e(CapacitorUpdaterPlugin.this.TAG, "error deleting version", e);
             }
         } else if (!pastVersion.equals("")) {
             Log.i(this.TAG, "Validated version: " + curVersionName);
             try {
                 final Boolean res = this.implementation.delete(pastVersion, pastVersionName);
                 if (res) {
-                    Log.i(this.TAG, "Delete past version: " + pastVersionName);
+                    Log.i(this.TAG, "Deleted past version: " + pastVersionName);
                 }
             } catch (final IOException e) {
-                e.printStackTrace();
+                Log.e(CapacitorUpdaterPlugin.this.TAG, "error deleting version", e);
             }
             this.editor.putString("pastVersion", "");
             this.editor.putString("pastVersionName", "");

package/ios/Plugin/CapacitorUpdater.swift

@@ -36,13 +36,33 @@ extension Bundle {
     }
 }
 
+enum CustomError: Error {
+    // Throw when an unzip fail
+    case cannotUnzip
+
+    // Throw in all other cases
+    case unexpected(code: Int)
+}
+
+extension CustomError: LocalizedError {
+    public var errorDescription: String? {
+        switch self {
+        case .cannotUnzip:
+            return NSLocalizedString(
+                "The file cannot be unzip",
+                comment: "Invalid zip"
+            )
+        case .unexpected(_):
+            return NSLocalizedString(
+                "An unexpected error occurred.",
+                comment: "Unexpected Error"
+            )
+        }
+    }
+}
+
 @objc public class CapacitorUpdater: NSObject {
     
-    public var statsUrl = ""
-    public var appId = ""
-    public var deviceID = UIDevice.current.identifierForVendor?.uuidString ?? ""
-    public var notifyDownload: (Int) -> Void = { _ in }
-    public var pluginVersion = "3.2.1"
     private var versionBuild = Bundle.main.releaseVersionNumber ?? ""
     private var versionCode = Bundle.main.buildVersionNumber ?? ""
     private var versionOs = ProcessInfo().operatingSystemVersion.getFullVersion()
@@ -53,11 +73,17 @@ extension Bundle {
     private let documentsUrl = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
     private let libraryUrl = FileManager.default.urls(for: .libraryDirectory, in: .userDomainMask).first!
     
-    @objc private func calcTotalPercent(percent: Int, min: Int, max: Int) -> Int {
+    public var statsUrl = ""
+    public var appId = ""
+    public var deviceID = UIDevice.current.identifierForVendor?.uuidString ?? ""
+    public var notifyDownload: (Int) -> Void = { _ in }
+    public var pluginVersion = "3.2.0"
+
+    private func calcTotalPercent(percent: Int, min: Int, max: Int) -> Int {
         return (percent * (max - min)) / 100 + min;
     }
     
-    @objc private func randomString(length: Int) -> String {
+    private func randomString(length: Int) -> String {
         let letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
         return String((0..<length).map{ _ in letters.randomElement()! })
     }
@@ -101,17 +127,19 @@ extension Bundle {
         }
     }
     
-    private func saveDownloaded(sourceZip: URL, version: String, base: URL) {
+    private func saveDownloaded(sourceZip: URL, version: String, base: URL) throws {
         prepareFolder(source: base)
         let destHot = base.appendingPathComponent(version)
         let destUnZip = documentsUrl.appendingPathComponent(randomString(length: 10))
-        SSZipArchive.unzipFile(atPath: sourceZip.path, toDestination: destUnZip.path)
+        if (!SSZipArchive.unzipFile(atPath: sourceZip.path, toDestination: destUnZip.path)) {
+            throw CustomError.cannotUnzip
+        }
         if (unflatFolder(source: destUnZip, dest: destHot)) {
             deleteFolder(source: destUnZip)
         }
     }
 
-    @objc public func getLatest(url: URL) -> AppVersion? {
+    public func getLatest(url: URL) -> AppVersion? {
         let semaphore = DispatchSemaphore(value: 0)
         let latest = AppVersion()
         let headers: HTTPHeaders = [
@@ -150,9 +178,10 @@ extension Bundle {
         return latest.url != "" ? latest : nil
     }
     
-    @objc public func download(url: URL) -> String? {
+    public func download(url: URL) throws -> String {
         let semaphore = DispatchSemaphore(value: 0)
-        var version: String? = nil
+        var version: String = ""
+        var mainError: NSError? = nil
         let destination: DownloadRequest.Destination = { _, _ in
             let documentsURL = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0]
             let fileURL = documentsURL.appendingPathComponent(self.randomString(length: 10))
@@ -171,24 +200,32 @@ extension Bundle {
                 case .success:
                     self.notifyDownload(71);
                     version = self.randomString(length: 10)
-                    self.saveDownloaded(sourceZip: fileURL, version: version!, base: self.documentsUrl.appendingPathComponent(self.basePathHot))
-                    self.notifyDownload(85);
-                    self.saveDownloaded(sourceZip: fileURL, version: version!, base: self.libraryUrl.appendingPathComponent(self.basePathPersist))
-                    self.notifyDownload(100);
-                    self.deleteFolder(source: fileURL)
+                    do {
+                        try self.saveDownloaded(sourceZip: fileURL, version: version, base: self.documentsUrl.appendingPathComponent(self.basePathHot))
+                        self.notifyDownload(85);
+                        try self.saveDownloaded(sourceZip: fileURL, version: version, base: self.libraryUrl.appendingPathComponent(self.basePathPersist))
+                        self.notifyDownload(100);
+                        self.deleteFolder(source: fileURL)
+                    } catch {
+                        print("✨  Capacitor-updater: download unzip error", error)
+                        mainError = error as NSError
+                    }
                 case let .failure(error):
                     print("✨  Capacitor-updater: download error", error)
-                    version = nil
+                    mainError = error as NSError
                 }
             }
             semaphore.signal()
         }
         self.notifyDownload(0);
         semaphore.wait()
+        if (mainError != nil) {
+            throw mainError!
+        }
         return version
     }
 
-    @objc public func list() -> [String] {
+    public func list() -> [String] {
         let dest = documentsUrl.appendingPathComponent(basePathHot)
         do {
             let files = try FileManager.default.contentsOfDirectory(atPath: dest.path)
@@ -199,7 +236,7 @@ extension Bundle {
         }
     }
     
-    @objc public func delete(version: String, versionName: String) -> Bool {
+    public func delete(version: String, versionName: String) -> Bool {
         let destHot = documentsUrl.appendingPathComponent(basePathHot).appendingPathComponent(version)
         let destPersist = libraryUrl.appendingPathComponent(basePathPersist).appendingPathComponent(version)
         do {
@@ -217,7 +254,7 @@ extension Bundle {
         return true
     }
 
-    @objc public func set(version: String, versionName: String) -> Bool {
+    public func set(version: String, versionName: String) -> Bool {
         let destHot = documentsUrl.appendingPathComponent(basePathHot).appendingPathComponent(version)
         let indexHot = destHot.appendingPathComponent("index.html")
         let destHotPersist = libraryUrl.appendingPathComponent(basePathPersist).appendingPathComponent(version)
@@ -233,19 +270,19 @@ extension Bundle {
         return false
     }
     
-    @objc public func getLastPathHot() -> String {
+    public func getLastPathHot() -> String {
         return UserDefaults.standard.string(forKey: "lastPathHot") ?? ""
     }
     
-    @objc public func getVersionName() -> String {
+    public func getVersionName() -> String {
         return UserDefaults.standard.string(forKey: "versionName") ?? ""
     }
     
-    @objc public func getLastPathPersist() -> String {
+    public func getLastPathPersist() -> String {
         return UserDefaults.standard.string(forKey: "lastPathPersist") ?? ""
     }
     
-    @objc public func reset() {
+    public func reset() {
         let version = UserDefaults.standard.string(forKey: "versionName") ?? ""
         sendStats(action: "reset", version: version)
         UserDefaults.standard.set("", forKey: "lastPathHot")
@@ -254,7 +291,7 @@ extension Bundle {
         UserDefaults.standard.synchronize()
     }
 
-    @objc func sendStats(action: String, version: String) {
+    func sendStats(action: String, version: String) {
         if (statsUrl == "") { return }
         let parameters: [String: String] = [
             "platform": "ios",

package/ios/Plugin/CapacitorUpdaterPlugin.m

@@ -15,4 +15,5 @@ CAP_PLUGIN(CapacitorUpdaterPlugin, "CapacitorUpdater",
            CAP_PLUGIN_METHOD(notifyAppReady, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(delayUpdate, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(getId, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(getPluginVersion, CAPPluginReturnPromise);
 )

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -65,16 +65,20 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     @objc func getId(_ call: CAPPluginCall) {
         call.resolve(["id": implementation.deviceID])
     }
+
+    @objc func getPluginVersion(_ call: CAPPluginCall) {
+        call.resolve(["version": implementation.pluginVersion])
+    }
     
     @objc func download(_ call: CAPPluginCall) {
         let url = URL(string: call.getString("url") ?? "")
-        let res = implementation.download(url: url!)
-        if ((res) != nil) {
+        do {
+            let res = try implementation.download(url: url!)
             call.resolve([
-                "version": res!
+                "version": res
             ])
-        } else {
-            call.reject("download failed")
+        } catch {
+            call.reject("download failed", error.localizedDescription)
         }
     }
 
@@ -221,14 +225,14 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                 print("✨  Capacitor-updater: Cannot get version \(failingVersion) \(newVersion)")
             }
             if (newVersion != "0.0.0" && newVersion != failingVersion) {
-                let dlOp = self.implementation.download(url: downloadUrl)
-                if let dl = dlOp {
+                do {
+                    let dl = try self.implementation.download(url: downloadUrl)
                     print("✨  Capacitor-updater: New version: \(newVersion) found. Current is \(currentVersion == "" ? "builtin" : currentVersion), next backgrounding will trigger update")
                     UserDefaults.standard.set(dl, forKey: "nextVersion")
                     UserDefaults.standard.set(newVersion.description, forKey: "nextVersionName")
                     self.notifyListeners("updateAvailable", data: ["version": newVersion])
-                } else {
-                    print("✨  Capacitor-updater: Download version \(newVersion) fail")
+                } catch {
+                    print("✨  Capacitor-updater: Download version \(newVersion) fail", error.localizedDescription)
                 }
             } else {
                 print("✨  Capacitor-updater: No need to update, \(currentVersion) is the latest")

package/package.json

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

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

@@ -1,11 +0,0 @@
-package ee.forgr.capacitor_updater;
-
-public interface CapacitorUpdaterEvents {
-    /**
-     * Notify listeners of download progress.
-     * @param percent Current percentage as an integer (e.g.: N out of 100)
-     */
-    default void notifyDownload(final int percent) {
-        return;
-    }
-}