@capawesome/capacitor-live-update 6.4.2 → 6.6.0

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/LiveUpdateHttpClient.java

@@ -0,0 +1,71 @@
+package io.capawesome.capacitorjs.plugins.liveupdate;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import java.io.File;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+import okio.Buffer;
+import okio.BufferedSink;
+import okio.BufferedSource;
+import okio.Okio;
+
+public class LiveUpdateHttpClient {
+
+    @NonNull
+    private final LiveUpdateConfig config;
+
+    @Nullable
+    public static String getChecksumFromResponse(Response response) {
+        String checksum = response.header("X-Checksum");
+        if (checksum == null) {
+            return null;
+        }
+        return checksum;
+    }
+
+    @Nullable
+    public static String getSignatureFromResponse(Response response) {
+        String signature = response.header("X-Signature");
+        if (signature == null) {
+            return null;
+        }
+        return signature;
+    }
+
+    public LiveUpdateHttpClient(@NonNull LiveUpdateConfig config) {
+        this.config = config;
+    }
+
+    public Response execute(String url) throws IOException {
+        int httpTimeout = config.getHttpTimeout();
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+            .connectTimeout(httpTimeout, TimeUnit.MILLISECONDS)
+            .readTimeout(httpTimeout, TimeUnit.MILLISECONDS)
+            .writeTimeout(httpTimeout, TimeUnit.MILLISECONDS)
+            .build();
+        Request request = new Request.Builder().url(url).build();
+        return okHttpClient.newCall(request).execute();
+    }
+
+    public static void writeResponseBodyToFile(ResponseBody body, File file) throws IOException {
+        long contentLength = body.contentLength();
+        BufferedSource source = body.source();
+        BufferedSink sink = Okio.buffer(Okio.sink(file));
+        Buffer sinkBuffer = sink.getBuffer();
+        long totalBytesRead = 0;
+        int bufferSize = 8 * 1024;
+        for (long bytesRead; (bytesRead = source.read(sinkBuffer, bufferSize)) != -1;) {
+            sink.emit();
+            totalBytesRead += bytesRead;
+            int progress = (int) ((totalBytesRead * 100) / contentLength);
+        }
+        sink.flush();
+        sink.close();
+        source.close();
+    }
+}

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/LiveUpdatePlugin.java

@@ -19,7 +19,7 @@ import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.Result;
 public class LiveUpdatePlugin extends Plugin {
 
     public static final String TAG = "LiveUpdate";
-    public static final String VERSION = "6.4.1";
+    public static final String VERSION = "6.6.0";
     public static final String SHARED_PREFERENCES_NAME = "CapawesomeLiveUpdate"; // DO NOT CHANGE
     public static final String ERROR_APP_ID_MISSING = "appId must be configured.";
     public static final String ERROR_BUNDLE_EXISTS = "bundle already exists.";
@@ -36,6 +36,7 @@ public class LiveUpdatePlugin extends Plugin {
     public static final String ERROR_PUBLIC_KEY_INVALID = "Invalid public key.";
     public static final String ERROR_SIGNATURE_MISSING = "Bundle does not contain a signature.";
     public static final String ERROR_SYNC_IN_PROGRESS = "Sync is already in progress.";
+    public static final String ERROR_UNKNOWN_ERROR = "An unknown error has occurred.";
 
     private boolean syncInProgress = false;
 
@@ -72,21 +73,20 @@ public class LiveUpdatePlugin extends Plugin {
 
                 @Override
                 public void error(Exception exception) {
-                    Logger.error(TAG, exception.getMessage(), exception);
-                    call.reject(exception.getMessage());
+                    rejectCall(call, exception);
                 }
             };
 
             implementation.deleteBundle(options, callback);
         } catch (Exception exception) {
-            Logger.error(TAG, exception.getMessage(), exception);
-            call.reject(exception.getMessage());
+            rejectCall(call, exception);
         }
     }
 
     @PluginMethod
     public void downloadBundle(PluginCall call) {
         try {
+            String artifactType = call.getString("artifactType", "zip");
             String bundleId = call.getString("bundleId");
             if (bundleId == null) {
                 call.reject(ERROR_BUNDLE_ID_MISSING);
@@ -99,7 +99,7 @@ public class LiveUpdatePlugin extends Plugin {
                 return;
             }
 
-            DownloadBundleOptions options = new DownloadBundleOptions(bundleId, checksum, url);
+            DownloadBundleOptions options = new DownloadBundleOptions(artifactType, bundleId, checksum, url);
             EmptyCallback callback = new EmptyCallback() {
                 @Override
                 public void success() {
@@ -108,15 +108,34 @@ public class LiveUpdatePlugin extends Plugin {
 
                 @Override
                 public void error(Exception exception) {
-                    Logger.error(TAG, exception.getMessage(), exception);
-                    call.reject(exception.getMessage());
+                    rejectCall(call, exception);
                 }
             };
 
             implementation.downloadBundle(options, callback);
         } catch (Exception exception) {
-            Logger.error(TAG, exception.getMessage(), exception);
-            call.reject(exception.getMessage());
+            rejectCall(call, exception);
+        }
+    }
+
+    @PluginMethod
+    public void fetchLatestBundle(PluginCall call) {
+        try {
+            NonEmptyCallback<Result> callback = new NonEmptyCallback<>() {
+                @Override
+                public void success(Result result) {
+                    call.resolve(result.toJSObject());
+                }
+
+                @Override
+                public void error(Exception exception) {
+                    rejectCall(call, exception);
+                }
+            };
+
+            implementation.fetchLatestBundle(callback);
+        } catch (Exception exception) {
+            rejectCall(call, exception);
         }
     }
 
@@ -131,15 +150,13 @@ public class LiveUpdatePlugin extends Plugin {
 
                 @Override
                 public void error(Exception exception) {
-                    Logger.error(TAG, exception.getMessage(), exception);
-                    call.reject(exception.getMessage());
+                    rejectCall(call, exception);
                 }
             };
 
             implementation.getBundle(callback);
         } catch (Exception exception) {
-            Logger.error(TAG, exception.getMessage(), exception);
-            call.reject(exception.getMessage());
+            rejectCall(call, exception);
         }
     }
 
@@ -154,15 +171,13 @@ public class LiveUpdatePlugin extends Plugin {
 
                 @Override
                 public void error(Exception exception) {
-                    Logger.error(TAG, exception.getMessage(), exception);
-                    call.reject(exception.getMessage());
+                    rejectCall(call, exception);
                 }
             };
 
             implementation.getBundles(callback);
         } catch (Exception exception) {
-            Logger.error(TAG, exception.getMessage(), exception);
-            call.reject(exception.getMessage());
+            rejectCall(call, exception);
         }
     }
 
@@ -177,15 +192,13 @@ public class LiveUpdatePlugin extends Plugin {
 
                 @Override
                 public void error(Exception exception) {
-                    Logger.error(TAG, exception.getMessage(), exception);
-                    call.reject(exception.getMessage());
+                    rejectCall(call, exception);
                 }
             };
 
             implementation.getChannel(callback);
         } catch (Exception exception) {
-            Logger.error(TAG, exception.getMessage(), exception);
-            call.reject(exception.getMessage());
+            rejectCall(call, exception);
         }
     }
 
@@ -200,15 +213,13 @@ public class LiveUpdatePlugin extends Plugin {
 
                 @Override
                 public void error(Exception exception) {
-                    Logger.error(TAG, exception.getMessage(), exception);
-                    call.reject(exception.getMessage());
+                    rejectCall(call, exception);
                 }
             };
 
             implementation.getCustomId(callback);
         } catch (Exception exception) {
-            Logger.error(TAG, exception.getMessage(), exception);
-            call.reject(exception.getMessage());
+            rejectCall(call, exception);
         }
     }
 
@@ -223,15 +234,13 @@ public class LiveUpdatePlugin extends Plugin {
 
                 @Override
                 public void error(Exception exception) {
-                    Logger.error(TAG, exception.getMessage(), exception);
-                    call.reject(exception.getMessage());
+                    rejectCall(call, exception);
                 }
             };
 
             implementation.getDeviceId(callback);
         } catch (Exception exception) {
-            Logger.error(TAG, exception.getMessage(), exception);
-            call.reject(exception.getMessage());
+            rejectCall(call, exception);
         }
     }
 
@@ -246,15 +255,13 @@ public class LiveUpdatePlugin extends Plugin {
 
                 @Override
                 public void error(Exception exception) {
-                    Logger.error(TAG, exception.getMessage(), exception);
-                    call.reject(exception.getMessage());
+                    rejectCall(call, exception);
                 }
             };
 
             implementation.getVersionCode(callback);
         } catch (Exception exception) {
-            Logger.error(TAG, exception.getMessage(), exception);
-            call.reject(exception.getMessage());
+            rejectCall(call, exception);
         }
     }
 
@@ -269,15 +276,13 @@ public class LiveUpdatePlugin extends Plugin {
 
                 @Override
                 public void error(Exception exception) {
-                    Logger.error(TAG, exception.getMessage(), exception);
-                    call.reject(exception.getMessage());
+                    rejectCall(call, exception);
                 }
             };
 
             implementation.getVersionName(callback);
         } catch (Exception exception) {
-            Logger.error(TAG, exception.getMessage(), exception);
-            call.reject(exception.getMessage());
+            rejectCall(call, exception);
         }
     }
 
@@ -287,8 +292,7 @@ public class LiveUpdatePlugin extends Plugin {
             implementation.ready();
             call.resolve();
         } catch (Exception exception) {
-            Logger.error(TAG, exception.getMessage(), exception);
-            call.reject(exception.getMessage());
+            rejectCall(call, exception);
         }
     }
 
@@ -298,8 +302,7 @@ public class LiveUpdatePlugin extends Plugin {
             implementation.reload();
             call.resolve();
         } catch (Exception exception) {
-            Logger.error(TAG, exception.getMessage(), exception);
-            call.reject(exception.getMessage());
+            rejectCall(call, exception);
         }
     }
 
@@ -309,8 +312,7 @@ public class LiveUpdatePlugin extends Plugin {
             implementation.reset();
             call.resolve();
         } catch (Exception exception) {
-            Logger.error(TAG, exception.getMessage(), exception);
-            call.reject(exception.getMessage());
+            rejectCall(call, exception);
         }
     }
 
@@ -332,15 +334,13 @@ public class LiveUpdatePlugin extends Plugin {
 
                 @Override
                 public void error(Exception exception) {
-                    Logger.error(TAG, exception.getMessage(), exception);
-                    call.reject(exception.getMessage());
+                    rejectCall(call, exception);
                 }
             };
 
             implementation.setBundle(options, callback);
         } catch (Exception exception) {
-            Logger.error(TAG, exception.getMessage(), exception);
-            call.reject(exception.getMessage());
+            rejectCall(call, exception);
         }
     }
 
@@ -358,15 +358,13 @@ public class LiveUpdatePlugin extends Plugin {
 
                 @Override
                 public void error(Exception exception) {
-                    Logger.error(TAG, exception.getMessage(), exception);
-                    call.reject(exception.getMessage());
+                    rejectCall(call, exception);
                 }
             };
 
             implementation.setChannel(options, callback);
         } catch (Exception exception) {
-            Logger.error(TAG, exception.getMessage(), exception);
-            call.reject(exception.getMessage());
+            rejectCall(call, exception);
         }
     }
 
@@ -388,15 +386,13 @@ public class LiveUpdatePlugin extends Plugin {
 
                 @Override
                 public void error(Exception exception) {
-                    Logger.error(TAG, exception.getMessage(), exception);
-                    call.reject(exception.getMessage());
+                    rejectCall(call, exception);
                 }
             };
 
             implementation.setCustomId(options, callback);
         } catch (Exception exception) {
-            Logger.error(TAG, exception.getMessage(), exception);
-            call.reject(exception.getMessage());
+            rejectCall(call, exception);
         }
     }
 
@@ -425,16 +421,14 @@ public class LiveUpdatePlugin extends Plugin {
                 @Override
                 public void error(Exception exception) {
                     syncInProgress = false;
-                    Logger.error(TAG, exception.getMessage(), exception);
-                    call.reject(exception.getMessage());
+                    rejectCall(call, exception);
                 }
             };
 
             implementation.sync(callback);
         } catch (Exception exception) {
             syncInProgress = false;
-            Logger.error(TAG, exception.getMessage(), exception);
-            call.reject(exception.getMessage());
+            rejectCall(call, exception);
         }
     }
 
@@ -462,4 +456,15 @@ public class LiveUpdatePlugin extends Plugin {
 
         return config;
     }
+
+    private void rejectCall(PluginCall call, Exception exception) {
+        String message = exception.getMessage();
+        if (exception instanceof java.net.SocketTimeoutException) {
+            message = ERROR_HTTP_TIMEOUT;
+        } else {
+            message = message == null ? ERROR_UNKNOWN_ERROR : message;
+        }
+        Logger.error(TAG, message, exception);
+        call.reject(message);
+    }
 }

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/classes/Manifest.java

@@ -0,0 +1,58 @@
+package io.capawesome.capacitorjs.plugins.liveupdate.classes;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.json.JSONArray;
+import org.json.JSONException;
+
+public class Manifest {
+
+    private List<ManifestItem> items = new ArrayList<>();
+
+    public Manifest(JSONArray jsonArray) throws JSONException {
+        for (int i = 0; i < jsonArray.length(); i++) {
+            ManifestItem manifestItem = new ManifestItem(jsonArray.getJSONObject(i));
+            items.add(manifestItem);
+        }
+    }
+
+    public List<ManifestItem> getItems() {
+        return items;
+    }
+
+    public static List<ManifestItem> findDuplicateItems(Manifest manifest1, Manifest manifest2) {
+        List<ManifestItem> duplicateItems = new ArrayList<>();
+        Set<String> checksums = new HashSet<>();
+
+        for (ManifestItem item : manifest2.getItems()) {
+            checksums.add(item.getChecksum());
+        }
+
+        for (ManifestItem item : manifest1.getItems()) {
+            if (checksums.contains(item.getChecksum())) {
+                duplicateItems.add(item);
+            }
+        }
+
+        return duplicateItems;
+    }
+
+    public static List<ManifestItem> findMissingItems(Manifest manifest1, Manifest manifest2) {
+        List<ManifestItem> missingItems = new ArrayList<>();
+        Set<String> checksums = new HashSet<>();
+
+        for (ManifestItem item : manifest2.getItems()) {
+            checksums.add(item.getChecksum());
+        }
+
+        for (ManifestItem item : manifest1.getItems()) {
+            if (!checksums.contains(item.getChecksum())) {
+                missingItems.add(item);
+            }
+        }
+
+        return missingItems;
+    }
+}

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/classes/ManifestItem.java

@@ -0,0 +1,37 @@
+package io.capawesome.capacitorjs.plugins.liveupdate.classes;
+
+import androidx.annotation.NonNull;
+import org.json.JSONObject;
+
+public class ManifestItem {
+
+    @NonNull
+    private String checksum;
+
+    @NonNull
+    private String href;
+
+    @NonNull
+    private int sizeInBytes;
+
+    public ManifestItem(JSONObject json) {
+        this.href = json.optString("href");
+        this.checksum = json.optString("checksum");
+        this.sizeInBytes = json.optInt("sizeInBytes");
+    }
+
+    @NonNull
+    public String getHref() {
+        return href;
+    }
+
+    @NonNull
+    public String getChecksum() {
+        return checksum;
+    }
+
+    @NonNull
+    public int getSizeInBytes() {
+        return sizeInBytes;
+    }
+}

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/classes/api/GetLatestBundleResponse.java

@@ -1,49 +1,41 @@
 package io.capawesome.capacitorjs.plugins.liveupdate.classes.api;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import io.capawesome.capacitorjs.plugins.liveupdate.enums.ArtifactType;
+import java.util.ArrayList;
+import java.util.List;
+import org.json.JSONArray;
 import org.json.JSONObject;
 
 public class GetLatestBundleResponse {
 
-    private String bundleId;
-
-    @Nullable
-    private String checksum;
+    @NonNull
+    private ArtifactType artifactType;
 
-    @Nullable
-    private String signature;
+    @NonNull
+    private String bundleId;
 
+    @NonNull
     private String url;
 
     public GetLatestBundleResponse(JSONObject responseJson) {
-        this.bundleId = responseJson.optString("bundleId");
-        String checksum = responseJson.optString("checksum", "null");
-        if (checksum.equals("null")) {
-            this.checksum = null;
+        String artifactType = responseJson.optString("artifactType");
+        if (artifactType.equals("manifest")) {
+            this.artifactType = ArtifactType.MANIFEST;
         } else {
-            this.checksum = checksum;
-        }
-        String signature = responseJson.optString("signature", "null");
-        if (signature.equals("null")) {
-            this.signature = null;
-        } else {
-            this.signature = signature;
+            this.artifactType = ArtifactType.ZIP;
         }
+        this.bundleId = responseJson.optString("bundleId");
         this.url = responseJson.optString("url");
     }
 
-    public String getBundleId() {
-        return bundleId;
-    }
-
-    @Nullable
-    public String getChecksum() {
-        return checksum;
+    public ArtifactType getArtifactType() {
+        return artifactType;
     }
 
-    @Nullable
-    public String getSignature() {
-        return signature;
+    public String getBundleId() {
+        return bundleId;
     }
 
     public String getUrl() {

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/classes/options/DownloadBundleOptions.java

@@ -2,9 +2,13 @@ package io.capawesome.capacitorjs.plugins.liveupdate.classes.options;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import io.capawesome.capacitorjs.plugins.liveupdate.enums.ArtifactType;
 
 public class DownloadBundleOptions {
 
+    @NonNull
+    private ArtifactType artifactType;
+
     @NonNull
     private String bundleId;
 
@@ -14,12 +18,22 @@ public class DownloadBundleOptions {
     @NonNull
     private String url;
 
-    public DownloadBundleOptions(@NonNull String bundleId, @Nullable String checksum, @NonNull String url) {
+    public DownloadBundleOptions(@NonNull String artifactType, @NonNull String bundleId, @Nullable String checksum, @NonNull String url) {
+        if (artifactType.equals("manifest")) {
+            this.artifactType = ArtifactType.MANIFEST;
+        } else {
+            this.artifactType = ArtifactType.ZIP;
+        }
         this.bundleId = bundleId;
         this.checksum = checksum;
         this.url = url;
     }
 
+    @NonNull
+    public ArtifactType getArtifactType() {
+        return artifactType;
+    }
+
     @NonNull
     public String getBundleId() {
         return bundleId;

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/classes/results/FetchLatestBundleResult.java

@@ -0,0 +1,22 @@
+package io.capawesome.capacitorjs.plugins.liveupdate.classes.results;
+
+import androidx.annotation.Nullable;
+import com.getcapacitor.JSObject;
+import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.Result;
+import org.json.JSONObject;
+
+public class FetchLatestBundleResult implements Result {
+
+    @Nullable
+    private String bundleId;
+
+    public FetchLatestBundleResult(@Nullable String bundleId) {
+        this.bundleId = bundleId;
+    }
+
+    public JSObject toJSObject() {
+        JSObject result = new JSObject();
+        result.put("bundleId", bundleId == null ? JSONObject.NULL : bundleId);
+        return result;
+    }
+}

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/enums/ArtifactType.java

@@ -0,0 +1,6 @@
+package io.capawesome.capacitorjs.plugins.liveupdate.enums;
+
+public enum ArtifactType {
+    MANIFEST,
+    ZIP
+}