@capawesome/capacitor-live-update 6.8.0 → 7.0.0-dev.2633ff2.1765953041

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

@@ -1,5 +1,6 @@
 package io.capawesome.capacitorjs.plugins.liveupdate;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import java.security.Key;
 
@@ -8,50 +9,51 @@ public class LiveUpdateConfig {
     @Nullable
     private String appId = null;
 
+    private boolean autoBlockRolledBackBundles = false;
+
     private boolean autoDeleteBundles = false;
 
+    @NonNull
+    private String autoUpdateStrategy = "none";
+
     @Nullable
     private String defaultChannel = null;
 
-    private boolean enabled = true;
     private int httpTimeout = 60000;
 
-    @Nullable
-    private String location = null;
-
     @Nullable
     private String publicKey = null;
 
-    private int readyTimeout = 10000;
-    private boolean resetOnUpdate = true;
+    private int readyTimeout = 0;
+    private String serverDomain = "api.cloud.capawesome.io";
 
     @Nullable
     public String getAppId() {
         return appId;
     }
 
+    public boolean getAutoBlockRolledBackBundles() {
+        return autoBlockRolledBackBundles;
+    }
+
     public boolean getAutoDeleteBundles() {
         return autoDeleteBundles;
     }
 
+    @NonNull
+    public String getAutoUpdateStrategy() {
+        return autoUpdateStrategy;
+    }
+
     @Nullable
     public String getDefaultChannel() {
         return defaultChannel;
     }
 
-    public boolean getEnabled() {
-        return enabled;
-    }
-
     public int getHttpTimeout() {
         return httpTimeout;
     }
 
-    @Nullable
-    public String getLocation() {
-        return location;
-    }
-
     @Nullable
     public String getPublicKey() {
         return publicKey;
@@ -61,34 +63,34 @@ public class LiveUpdateConfig {
         return readyTimeout;
     }
 
-    public boolean getResetOnUpdate() {
-        return resetOnUpdate;
+    public String getServerDomain() {
+        return serverDomain;
     }
 
     public void setAppId(@Nullable String appId) {
         this.appId = appId;
     }
 
+    public void setAutoBlockRolledBackBundles(boolean autoBlockRolledBackBundles) {
+        this.autoBlockRolledBackBundles = autoBlockRolledBackBundles;
+    }
+
     public void setAutoDeleteBundles(boolean autoDeleteBundles) {
         this.autoDeleteBundles = autoDeleteBundles;
     }
 
-    public void setDefaultChannel(@Nullable String defaultChannel) {
-        this.defaultChannel = defaultChannel;
+    public void setAutoUpdateStrategy(@NonNull String autoUpdateStrategy) {
+        this.autoUpdateStrategy = autoUpdateStrategy;
     }
 
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
+    public void setDefaultChannel(@Nullable String defaultChannel) {
+        this.defaultChannel = defaultChannel;
     }
 
     public void setHttpTimeout(int httpTimeout) {
         this.httpTimeout = httpTimeout;
     }
 
-    public void setLocation(@Nullable String location) {
-        this.location = location;
-    }
-
     public void setPublicKey(@Nullable String publicKey) {
         this.publicKey = publicKey;
     }
@@ -97,7 +99,7 @@ public class LiveUpdateConfig {
         this.readyTimeout = readyTimeout;
     }
 
-    public void setResetOnUpdate(boolean resetOnUpdate) {
-        this.resetOnUpdate = resetOnUpdate;
+    public void setServerDomain(String serverDomain) {
+        this.serverDomain = serverDomain;
     }
 }

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

@@ -2,9 +2,15 @@ package io.capawesome.capacitorjs.plugins.liveupdate;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import com.getcapacitor.Logger;
+import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.DownloadProgressCallback;
+import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.EmptyCallback;
+import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.NonEmptyCallback;
 import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
+import okhttp3.Call;
+import okhttp3.Callback;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -19,6 +25,9 @@ public class LiveUpdateHttpClient {
     @NonNull
     private final LiveUpdateConfig config;
 
+    @NonNull
+    private final OkHttpClient okHttpClient;
+
     @Nullable
     public static String getChecksumFromResponse(Response response) {
         String checksum = response.header("X-Checksum");
@@ -39,20 +48,42 @@ public class LiveUpdateHttpClient {
 
     public LiveUpdateHttpClient(@NonNull LiveUpdateConfig config) {
         this.config = config;
-    }
-
-    public Response execute(String url) throws IOException {
         int httpTimeout = config.getHttpTimeout();
-        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+
+        // Increase max requests per host to allow multiple parallel downloads from the same host
+        okhttp3.Dispatcher dispatcher = new okhttp3.Dispatcher();
+        dispatcher.setMaxRequestsPerHost(30);
+
+        this.okHttpClient = new OkHttpClient.Builder()
+            .dispatcher(dispatcher)
             .connectTimeout(httpTimeout, TimeUnit.MILLISECONDS)
             .readTimeout(httpTimeout, TimeUnit.MILLISECONDS)
             .writeTimeout(httpTimeout, TimeUnit.MILLISECONDS)
             .build();
+    }
+
+    public Call enqueue(String url, NonEmptyCallback<Response> callback) {
         Request request = new Request.Builder().url(url).build();
-        return okHttpClient.newCall(request).execute();
+
+        Call call = okHttpClient.newCall(request);
+        call.enqueue(
+            new Callback() {
+                @Override
+                public void onResponse(@NonNull Call call, @NonNull Response response) {
+                    callback.success(response);
+                }
+
+                @Override
+                public void onFailure(@NonNull Call call, @NonNull IOException e) {
+                    callback.error(new Exception(e));
+                }
+            }
+        );
+        return call;
     }
 
-    public static void writeResponseBodyToFile(ResponseBody body, File file) throws IOException {
+    public static void writeResponseBodyToFile(ResponseBody body, File file, @Nullable DownloadProgressCallback callback)
+        throws IOException {
         long contentLength = body.contentLength();
         BufferedSource source = body.source();
         BufferedSink sink = Okio.buffer(Okio.sink(file));
@@ -62,7 +93,9 @@ public class LiveUpdateHttpClient {
         for (long bytesRead; (bytesRead = source.read(sinkBuffer, bufferSize)) != -1;) {
             sink.emit();
             totalBytesRead += bytesRead;
-            int progress = (int) ((totalBytesRead * 100) / contentLength);
+            if (callback != null) {
+                callback.onProgress(totalBytesRead, contentLength);
+            }
         }
         sink.flush();
         sink.close();