@capgo/capacitor-updater 6.3.18 → 6.6.3

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

@@ -14,7 +14,6 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.util.Log;
-import com.android.volley.toolbox.Volley;
 import com.getcapacitor.CapConfig;
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
@@ -32,6 +31,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
@@ -42,6 +42,8 @@ import java.util.UUID;
 import java.util.concurrent.Phaser;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
 import org.json.JSONArray;
 import org.json.JSONException;
 
@@ -49,12 +51,13 @@ import org.json.JSONException;
 public class CapacitorUpdaterPlugin extends Plugin {
 
   private static final String updateUrlDefault =
-    "https://api.capgo.app/updates";
-  private static final String statsUrlDefault = "https://api.capgo.app/stats";
+    "https://plugin.capgo.app/updates";
+  private static final String statsUrlDefault =
+    "https://plugin.capgo.app/stats";
   private static final String channelUrlDefault =
-    "https://api.capgo.app/channel_self";
+    "https://plugin.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "6.3.18";
+  private final String PLUGIN_VERSION = "6.6.3";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -135,9 +138,12 @@ public class CapacitorUpdaterPlugin extends Plugin {
         .getString("version", pInfo.versionName);
       this.implementation.PLUGIN_VERSION = this.PLUGIN_VERSION;
       this.implementation.versionCode = Integer.toString(pInfo.versionCode);
-      this.implementation.requestQueue = Volley.newRequestQueue(
-        this.getContext()
-      );
+      this.implementation.client = new OkHttpClient.Builder()
+        .protocols(Arrays.asList(Protocol.HTTP_2, Protocol.HTTP_1_1))
+        .connectTimeout(this.implementation.timeout, TimeUnit.MILLISECONDS)
+        .readTimeout(this.implementation.timeout, TimeUnit.MILLISECONDS)
+        .writeTimeout(this.implementation.timeout, TimeUnit.MILLISECONDS)
+        .build();
 
       this.implementation.directUpdate = this.getConfig()
         .getBoolean("directUpdate", false);
@@ -223,9 +229,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
     this.updateUrl = this.getConfig().getString("updateUrl", updateUrlDefault);
     this.autoUpdate = this.getConfig().getBoolean("autoUpdate", true);
     this.appReadyTimeout = this.getConfig().getInt("appReadyTimeout", 10000);
-    this.implementation.timeout = this.getConfig()
-      .getInt("responseTimeout", 20) *
-    1000;
+    this.implementation.timeout =
+      this.getConfig().getInt("responseTimeout", 20) * 1000;
     boolean resetWhenUpdate =
       this.getConfig().getBoolean("resetWhenUpdate", true);
 
@@ -1106,7 +1111,15 @@ public class CapacitorUpdaterPlugin extends Plugin {
     Boolean error
   ) {
     if (error) {
-      Log.i(CapacitorUpdater.TAG, "endBackGroundTaskWithNotif error" + error);
+      Log.i(
+        CapacitorUpdater.TAG,
+        "endBackGroundTaskWithNotif error: " +
+        error +
+        " current: " +
+        current.getVersionName() +
+        "latestVersionName: " +
+        latestVersionName
+      );
       this.implementation.sendStats("download_fail", current.getVersionName());
       final JSObject ret = new JSObject();
       ret.put("version", latestVersionName);

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

@@ -0,0 +1,28 @@
+package ee.forgr.capacitor_updater;
+
+import org.json.JSONArray;
+
+public class DataManager {
+
+  private static DataManager instance;
+  private JSONArray currentManifest;
+
+  private DataManager() {}
+
+  public static synchronized DataManager getInstance() {
+    if (instance == null) {
+      instance = new DataManager();
+    }
+    return instance;
+  }
+
+  public void setManifest(JSONArray manifest) {
+    this.currentManifest = manifest;
+  }
+
+  public JSONArray getAndClearManifest() {
+    JSONArray manifest = this.currentManifest;
+    this.currentManifest = null;
+    return manifest;
+  }
+}

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

@@ -6,14 +6,14 @@
 package ee.forgr.capacitor_updater;
 
 import android.app.IntentService;
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.content.Intent;
+import android.os.Build;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
-import com.android.volley.DefaultRetryPolicy;
-import com.android.volley.NetworkResponse;
-import com.android.volley.Request;
-import com.android.volley.Response;
-import com.android.volley.toolbox.HttpHeaderParser;
-import com.android.volley.toolbox.Volley;
 import java.io.*;
 import java.io.FileInputStream;
 import java.net.HttpURLConnection;
@@ -21,19 +21,27 @@ import java.net.URL;
 import java.nio.channels.FileChannel;
 import java.security.MessageDigest;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
+import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
 import org.brotli.dec.BrotliInputStream;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
 public class DownloadService extends IntentService {
 
+  public static final String TAG = "Capacitor-updater";
   public static final String URL = "URL";
   public static final String ID = "id";
   public static final String PERCENT = "percent";
@@ -48,11 +56,59 @@ public class DownloadService extends IntentService {
   public static final String IS_MANIFEST = "is_manifest";
   public static final String MANIFEST = "manifest";
   private static final String UPDATE_FILE = "update.dat";
+  private static final int NOTIFICATION_ID = 1;
+  private static final long NOTIFICATION_DELAY_MS = 4000; // 4 seconds
+
+  private final OkHttpClient client = new OkHttpClient.Builder()
+    .protocols(Arrays.asList(Protocol.HTTP_2, Protocol.HTTP_1_1))
+    .build();
+  private Handler handler = new Handler(Looper.getMainLooper());
+  private Runnable notificationRunnable;
+  private boolean isNotificationShown = false;
 
   public DownloadService() {
     super("Background DownloadService");
   }
 
+  @Override
+  public void onCreate() {
+    super.onCreate();
+    notificationRunnable = () -> startForeground();
+    handler.postDelayed(notificationRunnable, NOTIFICATION_DELAY_MS);
+  }
+
+  @Override
+  public void onDestroy() {
+    super.onDestroy();
+    handler.removeCallbacks(notificationRunnable);
+  }
+
+  private void startForeground() {
+    isNotificationShown = true;
+    String channelId = createNotificationChannel();
+    Notification.Builder builder = new Notification.Builder(this, channelId)
+      .setContentTitle("Downloading Update")
+      .setContentText("Download in progress")
+      .setSmallIcon(android.R.drawable.stat_sys_download)
+      .setOngoing(true);
+
+    startForeground(NOTIFICATION_ID, builder.build());
+  }
+
+  private String createNotificationChannel() {
+    String channelId = "capacitor_updater_channel";
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      NotificationChannel channel = new NotificationChannel(
+        channelId,
+        "Capacitor Updater Downloads",
+        NotificationManager.IMPORTANCE_LOW
+      );
+      NotificationManager manager = getSystemService(NotificationManager.class);
+      manager.createNotificationChannel(channel);
+    }
+    return channelId;
+  }
+
   private int calcTotalPercent(long downloadedBytes, long contentLength) {
     if (contentLength <= 0) {
       return 0;
@@ -73,18 +129,32 @@ public class DownloadService extends IntentService {
     String version = intent.getStringExtra(VERSION);
     String sessionKey = intent.getStringExtra(SESSIONKEY);
     String checksum = intent.getStringExtra(CHECKSUM);
-    String manifestString = intent.getStringExtra(MANIFEST);
-
-    Log.d("DownloadService", "onHandleIntent" + manifestString);
-    if (manifestString != null) {
-      handleManifestDownload(
-        id,
-        documentsDir,
-        dest,
-        version,
-        sessionKey,
-        manifestString
-      );
+    boolean isManifest = intent.getBooleanExtra(IS_MANIFEST, false);
+
+    Log.d(TAG + " DownloadService", "onHandleIntent isManifest: " + isManifest);
+    if (isManifest) {
+      JSONArray manifest = DataManager.getInstance().getAndClearManifest();
+      if (manifest != null) {
+        handleManifestDownload(
+          id,
+          documentsDir,
+          dest,
+          version,
+          sessionKey,
+          manifest.toString()
+        );
+      } else {
+        Log.e(TAG + " DownloadService", "Manifest is null");
+        publishResults(
+          "",
+          id,
+          version,
+          checksum,
+          sessionKey,
+          "Manifest is null",
+          false
+        );
+      }
     } else {
       handleSingleFileDownload(
         url,
@@ -107,13 +177,18 @@ public class DownloadService extends IntentService {
     String manifestString
   ) {
     try {
-      Log.d("DownloadService", "handleManifestDownload");
+      Log.d(TAG + " DownloadService", "handleManifestDownload");
       JSONArray manifest = new JSONArray(manifestString);
       File destFolder = new File(documentsDir, dest);
       File cacheFolder = new File(
         getApplicationContext().getCacheDir(),
         "capgo_downloads"
       );
+      File builtinFolder = new File(
+        getApplicationContext().getFilesDir(),
+        "public"
+      );
+
       // Ensure directories are created
       if (!destFolder.exists() && !destFolder.mkdirs()) {
         throw new IOException(
@@ -132,12 +207,9 @@ public class DownloadService extends IntentService {
       final AtomicBoolean hasError = new AtomicBoolean(false);
 
       // Use more threads for I/O-bound operations
-      int threadCount = Math.min(
-        Runtime.getRuntime().availableProcessors() * 2,
-        32
-      );
+      int threadCount = Math.min(64, Math.max(32, totalFiles));
       ExecutorService executor = Executors.newFixedThreadPool(threadCount);
-      CompletableFuture<Void>[] futures = new CompletableFuture[totalFiles];
+      List<Future<?>> futures = new ArrayList<>();
 
       for (int i = 0; i < totalFiles; i++) {
         JSONObject entry = manifest.getJSONObject(i);
@@ -150,6 +222,7 @@ public class DownloadService extends IntentService {
           cacheFolder,
           fileHash + "_" + new File(fileName).getName()
         );
+        File builtinFile = new File(builtinFolder, fileName);
 
         // Ensure parent directories of the target file exist
         if (
@@ -162,49 +235,60 @@ public class DownloadService extends IntentService {
           );
         }
 
-        futures[i] = CompletableFuture.runAsync(
-          () -> {
-            try {
-              if (cacheFile.exists()) {
-                if (verifyChecksum(cacheFile, fileHash)) {
-                  copyFile(cacheFile, targetFile);
-                  Log.d("DownloadService", "already cached " + fileName);
-                } else {
-                  cacheFile.delete();
-                  downloadAndVerify(
-                    downloadUrl,
-                    targetFile,
-                    cacheFile,
-                    fileHash,
-                    id
-                  );
-                }
-              } else {
-                downloadAndVerify(
-                  downloadUrl,
-                  targetFile,
-                  cacheFile,
-                  fileHash,
-                  id
-                );
-              }
-
-              long completed = completedFiles.incrementAndGet();
-              int percent = calcTotalPercent(completed, totalFiles);
-              notifyDownload(id, percent);
-            } catch (Exception e) {
-              Log.e("DownloadService", "Error processing file: " + fileName, e);
-              hasError.set(true);
+        Future<?> future = executor.submit(() -> {
+          try {
+            if (builtinFile.exists() && verifyChecksum(builtinFile, fileHash)) {
+              copyFile(builtinFile, targetFile);
+              Log.d(TAG + " DownloadService", "using builtin file " + fileName);
+            } else if (
+              cacheFile.exists() && verifyChecksum(cacheFile, fileHash)
+            ) {
+              copyFile(cacheFile, targetFile);
+              Log.d(TAG + " DownloadService", "already cached " + fileName);
+            } else {
+              downloadAndVerify(
+                downloadUrl,
+                targetFile,
+                cacheFile,
+                fileHash,
+                id
+              );
             }
-          },
-          executor
-        );
+
+            long completed = completedFiles.incrementAndGet();
+            int percent = calcTotalPercent(completed, totalFiles);
+            notifyDownload(id, percent);
+          } catch (Exception e) {
+            Log.e(
+              TAG + " DownloadService",
+              "Error processing file: " + fileName,
+              e
+            );
+            hasError.set(true);
+          }
+        });
+        futures.add(future);
       }
 
       // Wait for all downloads to complete
-      CompletableFuture.allOf(futures).join();
+      for (Future<?> future : futures) {
+        try {
+          future.get();
+        } catch (Exception e) {
+          Log.e(TAG + " DownloadService", "Error waiting for download", e);
+          hasError.set(true);
+        }
+      }
 
       executor.shutdown();
+      try {
+        if (!executor.awaitTermination(60, TimeUnit.SECONDS)) {
+          executor.shutdownNow();
+        }
+      } catch (InterruptedException e) {
+        executor.shutdownNow();
+        Thread.currentThread().interrupt();
+      }
 
       if (hasError.get()) {
         throw new IOException("One or more files failed to download");
@@ -212,9 +296,10 @@ public class DownloadService extends IntentService {
 
       publishResults(dest, id, version, "", sessionKey, "", true);
     } catch (Exception e) {
-      Log.e("DownloadService", "Error in handleManifestDownload", e);
+      Log.e(TAG + " DownloadService", "Error in handleManifestDownload", e);
       publishResults("", id, version, "", sessionKey, e.getMessage(), true);
     }
+    stopForegroundIfNeeded();
   }
 
   private void handleSingleFileDownload(
@@ -338,6 +423,7 @@ public class DownloadService extends IntentService {
         false
       );
     }
+    stopForegroundIfNeeded();
   }
 
   private void clearDownloadData(String docDir) {
@@ -404,10 +490,9 @@ public class DownloadService extends IntentService {
     String expectedHash,
     String id
   ) throws Exception {
-    Log.d("DownloadService", "downloadAndVerify " + downloadUrl);
-    URL url = new URL(downloadUrl);
-    HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-    connection.setRequestMethod("GET");
+    Log.d(TAG + " DownloadService", "downloadAndVerify " + downloadUrl);
+
+    Request request = new Request.Builder().url(downloadUrl).build();
 
     // Create a temporary file for the compressed data
     File compressedFile = new File(
@@ -415,79 +500,56 @@ public class DownloadService extends IntentService {
       "temp_" + targetFile.getName() + ".br"
     );
 
-    try (
-      InputStream inputStream = connection.getInputStream();
-      FileOutputStream compressedFos = new FileOutputStream(compressedFile)
-    ) {
-      byte[] buffer = new byte[8192];
-      int bytesRead;
-      while ((bytesRead = inputStream.read(buffer)) != -1) {
-        compressedFos.write(buffer, 0, bytesRead);
+    try (Response response = client.newCall(request).execute()) {
+      if (!response.isSuccessful()) {
+        throw new IOException("Unexpected response code: " + response.code());
       }
-    }
-
-    // Decompress the file
-    try (
-      FileInputStream fis = new FileInputStream(compressedFile);
-      BrotliInputStream brotliInputStream = new BrotliInputStream(fis);
-      FileOutputStream fos = new FileOutputStream(targetFile)
-    ) {
-      byte[] buffer = new byte[8192];
-      int len;
-      while ((len = brotliInputStream.read(buffer)) != -1) {
-        fos.write(buffer, 0, len);
-      }
-    }
-
-    // Delete the compressed file
-    compressedFile.delete();
 
-    // Verify checksum
-    String actualHash = calculateFileHash(targetFile);
-    if (actualHash.equals(expectedHash)) {
-      // Copy the downloaded file to cache if checksum is correct
-      copyFile(targetFile, cacheFile);
-      Log.d("DownloadService", "copied to cache " + targetFile.getName());
-    } else {
-      targetFile.delete();
-      throw new IOException(
-        "Checksum verification failed for " +
-        targetFile.getName() +
-        " " +
-        expectedHash +
-        " " +
-        actualHash
-      );
-    }
-  }
-
-  // Custom request for handling input stream
-  private class InputStreamVolleyRequest extends Request<byte[]> {
+      // Download compressed file
+      try (
+        ResponseBody responseBody = response.body();
+        FileOutputStream compressedFos = new FileOutputStream(compressedFile)
+      ) {
+        if (responseBody == null) {
+          throw new IOException("Response body is null");
+        }
 
-    private final Response.Listener<byte[]> mListener;
+        byte[] buffer = new byte[8192];
+        int bytesRead;
+        try (InputStream inputStream = responseBody.byteStream()) {
+          while ((bytesRead = inputStream.read(buffer)) != -1) {
+            compressedFos.write(buffer, 0, bytesRead);
+          }
+        }
+      }
 
-    public InputStreamVolleyRequest(
-      int method,
-      String mUrl,
-      Response.Listener<byte[]> listener,
-      Response.ErrorListener errorListener
-    ) {
-      super(method, mUrl, errorListener);
-      mListener = listener;
-    }
+      // Decompress the file
+      try (
+        FileInputStream fis = new FileInputStream(compressedFile);
+        BrotliInputStream brotliInputStream = new BrotliInputStream(fis);
+        FileOutputStream fos = new FileOutputStream(targetFile)
+      ) {
+        byte[] buffer = new byte[8192];
+        int len;
+        while ((len = brotliInputStream.read(buffer)) != -1) {
+          fos.write(buffer, 0, len);
+        }
+      }
 
-    @Override
-    protected void deliverResponse(byte[] response) {
-      mListener.onResponse(response);
-    }
+      // Delete the compressed file
+      compressedFile.delete();
 
-    @Override
-    protected Response<byte[]> parseNetworkResponse(NetworkResponse response) {
-      byte[] responseData = response.data;
-      return Response.success(
-        responseData,
-        HttpHeaderParser.parseCacheHeaders(response)
-      );
+      // Verify checksum
+      String actualHash = calculateFileHash(targetFile);
+      if (actualHash.equals(expectedHash)) {
+        // Only cache if checksum is correct
+        copyFile(targetFile, cacheFile);
+      } else {
+        targetFile.delete();
+        throw new IOException(
+          "Checksum verification failed for " + targetFile.getName()
+        );
+      }
     }
   }
 
@@ -519,4 +581,15 @@ public class DownloadService extends IntentService {
     }
     return sb.toString();
   }
+
+  private void stopForegroundIfNeeded() {
+    handler.removeCallbacks(notificationRunnable);
+    if (isNotificationShown) {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        stopForeground(STOP_FOREGROUND_REMOVE);
+      } else {
+        stopForeground(true);
+      }
+    }
+  }
 }

package/dist/docs.json

@@ -466,7 +466,7 @@
             "text": "4.7.0"
           }
         ],
-        "docs": "Sets the channel for this device. The channel has to allow for self assignment for this to work.\nDo not use this method to set the channel at boot when `autoUpdate` is enabled in the {@link PluginsConfig}.\nThis method is to set the channel after the app is ready.",
+        "docs": "Sets the channel for this device. The channel has to allow for self assignment for this to work.\nDo not use this method to set the channel at boot when `autoUpdate` is enabled in the {@link PluginsConfig}.\nThis method is to set the channel after the app is ready.\nThis methods send to Capgo backend a request to link the device ID to the channel. Capgo can accept or refuse depending of the setting of your channel.",
         "complexTypes": [
           "ChannelRes",
           "SetChannelOptions"
@@ -1908,7 +1908,7 @@
           "name": "updateUrl",
           "tags": [
             {
-              "text": "https://api.capgo.app/updates",
+              "text": "https://plugin.capgo.app/updates",
               "name": "default"
             },
             {
@@ -1924,7 +1924,7 @@
           "name": "channelUrl",
           "tags": [
             {
-              "text": "https://api.capgo.app/channel_self",
+              "text": "https://plugin.capgo.app/channel_self",
               "name": "default"
             },
             {
@@ -1940,7 +1940,7 @@
           "name": "statsUrl",
           "tags": [
             {
-              "text": "https://api.capgo.app/stats",
+              "text": "https://plugin.capgo.app/stats",
               "name": "default"
             },
             {
@@ -1960,7 +1960,7 @@
               "name": "default"
             }
           ],
-          "docs": "Configure the private key for end to end live update encryption.\n\nOnly available for Android and iOS.",
+          "docs": "Configure the private key for end to end live update encryption.\n\nOnly available for Android and iOS. Deprecated in version 6.2.0. will be removed in version 7.0.0.",
           "complexTypes": [],
           "type": "string | undefined"
         },

package/dist/esm/definitions.d.ts

@@ -64,7 +64,7 @@ declare module "@capacitor/cli" {
              *
              * Only available for Android and iOS.
              *
-             * @default https://api.capgo.app/updates
+             * @default https://plugin.capgo.app/updates
              * @example https://example.com/api/auto_update
              */
             updateUrl?: string;
@@ -73,7 +73,7 @@ declare module "@capacitor/cli" {
              *
              * Only available for Android and iOS.
              *
-             * @default https://api.capgo.app/channel_self
+             * @default https://plugin.capgo.app/channel_self
              * @example https://example.com/api/channel
              */
             channelUrl?: string;
@@ -82,14 +82,14 @@ declare module "@capacitor/cli" {
              *
              * Only available for Android and iOS. Set to "" to disable stats reporting.
              *
-             * @default https://api.capgo.app/stats
+             * @default https://plugin.capgo.app/stats
              * @example https://example.com/api/stats
              */
             statsUrl?: string;
             /**
              * Configure the private key for end to end live update encryption.
              *
-             * Only available for Android and iOS.
+             * Only available for Android and iOS. Deprecated in version 6.2.0. will be removed in version 7.0.0.
              *
              * @default undefined
              */
@@ -356,6 +356,9 @@ export interface CapacitorUpdaterPlugin {
      * Sets the channel for this device. The channel has to allow for self assignment for this to work.
      * Do not use this method to set the channel at boot when `autoUpdate` is enabled in the {@link PluginsConfig}.
      * This method is to set the channel after the app is ready.
+     * This methods send to Capgo backend a request to link the device ID to the channel. Capgo can accept or refuse depending of the setting of your channel.
+     *
+     *
      *
      * @param options Is the {@link SetChannelOptions} channel to set
      * @returns {Promise<ChannelRes>} A Promise which is resolved when the new channel is set