@capgo/capacitor-updater 6.7.5 → 6.7.7-alpha.1

package/android/src/main/AndroidManifest.xml

@@ -1,5 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    
     <application>
-        <service android:name="ee.forgr.capacitor_updater.DownloadService" />
+        <service 
+            android:name="ee.forgr.capacitor_updater.DownloadService"
+            android:exported="false" />
     </application>
 </manifest>

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

@@ -482,11 +482,7 @@ public class CapacitorUpdater {
       intent.putExtra(DownloadService.IS_MANIFEST, true);
     }
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      this.activity.startForegroundService(intent);
-    } else {
-      this.activity.startService(intent);
-    }
+    this.activity.startService(intent);
   }
 
   private void downloadFile(
@@ -502,28 +498,27 @@ public class CapacitorUpdater {
     target.createNewFile();
 
     final long totalLength = connection.getContentLength();
-    final int bufferSize = 1024;
-    final byte[] buffer = new byte[bufferSize];
-    int length;
-
-    int bytesRead = bufferSize;
+    int bytesRead = 0;
     int percent = 0;
     this.notifyDownload(id, 10);
+
     try (
-      final InputStream is = connection.getInputStream();
-      final DataInputStream dis = new DataInputStream(is);
-      final FileOutputStream fos = new FileOutputStream(target)
+      InputStream is = connection.getInputStream();
+      DataInputStream dis = new DataInputStream(is);
+      FileOutputStream fos = new FileOutputStream(target)
     ) {
+      byte[] buffer = new byte[8192];
+      int length;
       while ((length = dis.read(buffer)) > 0) {
         fos.write(buffer, 0, length);
+        bytesRead += length;
         final int newPercent = (int) ((bytesRead / (float) totalLength) * 100);
         if (totalLength > 1 && newPercent != percent) {
           percent = newPercent;
           this.notifyDownload(id, this.calcTotalPercent(percent, 10, 70));
         }
-        bytesRead += length;
       }
-      if (bytesRead == bufferSize) {
+      if (bytesRead == 0) {
         throw new IOException("Failed to download: No data read from URL");
       }
     } catch (OutOfMemoryError e) {

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

@@ -57,7 +57,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
   private static final String channelUrlDefault =
     "https://plugin.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "6.7.5";
+  private final String PLUGIN_VERSION = "6.7.7-alpha.1";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;

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

@@ -6,13 +6,8 @@
 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.os.PowerManager;
 import android.util.Log;
 import java.io.*;
 import java.io.FileInputStream;
@@ -23,7 +18,6 @@ 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;
@@ -56,15 +50,11 @@ 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;
+  private PowerManager.WakeLock wakeLock;
 
   public DownloadService() {
     super("Background DownloadService");
@@ -73,40 +63,20 @@ public class DownloadService extends IntentService {
   @Override
   public void onCreate() {
     super.onCreate();
-    notificationRunnable = () -> startForeground();
-    handler.postDelayed(notificationRunnable, NOTIFICATION_DELAY_MS);
+    PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE);
+    wakeLock = powerManager.newWakeLock(
+      PowerManager.PARTIAL_WAKE_LOCK,
+      "CapacitorUpdater::DownloadWakeLock"
+    );
   }
 
   @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);
+    Log.w(TAG + " DownloadService", "DownloadService killed/destroyed");
+    if (wakeLock != null && wakeLock.isHeld()) {
+      wakeLock.release();
     }
-    return channelId;
   }
 
   private int calcTotalPercent(long downloadedBytes, long contentLength) {
@@ -121,50 +91,58 @@ public class DownloadService extends IntentService {
 
   @Override
   protected void onHandleIntent(Intent intent) {
-    assert intent != null;
-    String url = intent.getStringExtra(URL);
-    String id = intent.getStringExtra(ID);
-    String documentsDir = intent.getStringExtra(DOCDIR);
-    String dest = intent.getStringExtra(FILEDEST);
-    String version = intent.getStringExtra(VERSION);
-    String sessionKey = intent.getStringExtra(SESSIONKEY);
-    String checksum = intent.getStringExtra(CHECKSUM);
-    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(
+    try {
+      wakeLock.acquire(10 * 60 * 1000L);
+      assert intent != null;
+      String url = intent.getStringExtra(URL);
+      String id = intent.getStringExtra(ID);
+      String documentsDir = intent.getStringExtra(DOCDIR);
+      String dest = intent.getStringExtra(FILEDEST);
+      String version = intent.getStringExtra(VERSION);
+      String sessionKey = intent.getStringExtra(SESSIONKEY);
+      String checksum = intent.getStringExtra(CHECKSUM);
+      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,
           id,
           documentsDir,
           dest,
           version,
           sessionKey,
-          manifest.toString()
-        );
-      } else {
-        Log.e(TAG + " DownloadService", "Manifest is null");
-        publishResults(
-          "",
-          id,
-          version,
-          checksum,
-          sessionKey,
-          "Manifest is null",
-          false
+          checksum
         );
       }
-    } else {
-      handleSingleFileDownload(
-        url,
-        id,
-        documentsDir,
-        dest,
-        version,
-        sessionKey,
-        checksum
-      );
+    } finally {
+      wakeLock.release();
     }
   }
 
@@ -299,7 +277,6 @@ public class DownloadService extends IntentService {
       Log.e(TAG + " DownloadService", "Error in handleManifestDownload", e);
       publishResults("", id, version, "", sessionKey, e.getMessage(), true);
     }
-    stopForegroundIfNeeded();
   }
 
   private void handleSingleFileDownload(
@@ -317,89 +294,107 @@ public class DownloadService extends IntentService {
     File tempFile = new File(documentsDir, "temp" + ".tmp"); // Temp file, where the downloaded data is stored
     try {
       URL u = new URL(url);
-      HttpURLConnection httpConn = (HttpURLConnection) u.openConnection();
+      HttpURLConnection httpConn = null;
+      try {
+        httpConn = (HttpURLConnection) u.openConnection();
 
-      // Reading progress file (if exist)
-      long downloadedBytes = 0;
+        // Reading progress file (if exist)
+        long downloadedBytes = 0;
 
-      if (infoFile.exists() && tempFile.exists()) {
-        try (
-          BufferedReader reader = new BufferedReader(new FileReader(infoFile))
-        ) {
-          String updateVersion = reader.readLine();
-          if (!updateVersion.equals(version)) {
-            clearDownloadData(documentsDir);
-            downloadedBytes = 0;
-          } else {
-            downloadedBytes = tempFile.length();
+        if (infoFile.exists() && tempFile.exists()) {
+          try (
+            BufferedReader reader = new BufferedReader(new FileReader(infoFile))
+          ) {
+            String updateVersion = reader.readLine();
+            if (!updateVersion.equals(version)) {
+              clearDownloadData(documentsDir);
+              downloadedBytes = 0;
+            } else {
+              downloadedBytes = tempFile.length();
+            }
           }
+        } else {
+          clearDownloadData(documentsDir);
+          downloadedBytes = 0;
         }
-      } else {
-        clearDownloadData(documentsDir);
-        downloadedBytes = 0;
-      }
 
-      if (downloadedBytes > 0) {
-        httpConn.setRequestProperty("Range", "bytes=" + downloadedBytes + "-");
-      }
+        if (downloadedBytes > 0) {
+          httpConn.setRequestProperty(
+            "Range",
+            "bytes=" + downloadedBytes + "-"
+          );
+        }
 
-      int responseCode = httpConn.getResponseCode();
+        int responseCode = httpConn.getResponseCode();
 
-      if (
-        responseCode == HttpURLConnection.HTTP_OK ||
-        responseCode == HttpURLConnection.HTTP_PARTIAL
-      ) {
-        String contentType = httpConn.getContentType();
-        long contentLength = httpConn.getContentLength() + downloadedBytes;
+        if (
+          responseCode == HttpURLConnection.HTTP_OK ||
+          responseCode == HttpURLConnection.HTTP_PARTIAL
+        ) {
+          String contentType = httpConn.getContentType();
+          long contentLength = httpConn.getContentLength() + downloadedBytes;
 
-        InputStream inputStream = httpConn.getInputStream();
-        FileOutputStream outputStream = new FileOutputStream(
-          tempFile,
-          downloadedBytes > 0
-        );
-        if (downloadedBytes == 0) {
           try (
-            BufferedWriter writer = new BufferedWriter(new FileWriter(infoFile))
+            InputStream inputStream = httpConn.getInputStream();
+            FileOutputStream outputStream = new FileOutputStream(
+              tempFile,
+              downloadedBytes > 0
+            )
           ) {
-            writer.write(String.valueOf(version));
-          }
-        }
-        // Updating the info file
-        try (
-          BufferedWriter writer = new BufferedWriter(new FileWriter(infoFile))
-        ) {
-          writer.write(String.valueOf(version));
-        }
+            if (downloadedBytes == 0) {
+              try (
+                BufferedWriter writer = new BufferedWriter(
+                  new FileWriter(infoFile)
+                )
+              ) {
+                writer.write(String.valueOf(version));
+              }
+            }
+            // Updating the info file
+            try (
+              BufferedWriter writer = new BufferedWriter(
+                new FileWriter(infoFile)
+              )
+            ) {
+              writer.write(String.valueOf(version));
+            }
 
-        int bytesRead = -1;
-        byte[] buffer = new byte[4096];
-        int lastNotifiedPercent = 0;
-        while ((bytesRead = inputStream.read(buffer)) != -1) {
-          outputStream.write(buffer, 0, bytesRead);
-          downloadedBytes += bytesRead;
-          // Saving progress (flushing every 100 Ko)
-          if (downloadedBytes % 102400 == 0) {
-            outputStream.flush();
-          }
-          // Computing percentage
-          int percent = calcTotalPercent(downloadedBytes, contentLength);
-          while (lastNotifiedPercent + 10 <= percent) {
-            lastNotifiedPercent += 10;
-            notifyDownload(id, lastNotifiedPercent);
-          }
-        }
+            int bytesRead = -1;
+            byte[] buffer = new byte[4096];
+            int lastNotifiedPercent = 0;
+            while ((bytesRead = inputStream.read(buffer)) != -1) {
+              outputStream.write(buffer, 0, bytesRead);
+              downloadedBytes += bytesRead;
+              // Saving progress (flushing every 100 Ko)
+              if (downloadedBytes % 102400 == 0) {
+                outputStream.flush();
+              }
+              // Computing percentage
+              int percent = calcTotalPercent(downloadedBytes, contentLength);
+              while (lastNotifiedPercent + 10 <= percent) {
+                lastNotifiedPercent += 10;
+                // Artificial delay using CPU-bound calculation to take ~5 seconds
+                double result = 0;
+                notifyDownload(id, lastNotifiedPercent);
+              }
+            }
 
-        outputStream.close();
-        inputStream.close();
+            outputStream.close();
+            inputStream.close();
 
-        // Rename the temp file with the final name (dest)
-        tempFile.renameTo(new File(documentsDir, dest));
-        infoFile.delete();
-        publishResults(dest, id, version, checksum, sessionKey, "", false);
-      } else {
-        infoFile.delete();
+            // Rename the temp file with the final name (dest)
+            tempFile.renameTo(new File(documentsDir, dest));
+            infoFile.delete();
+            publishResults(dest, id, version, checksum, sessionKey, "", false);
+          }
+        } else {
+          infoFile.delete();
+        }
+      } finally {
+        if (httpConn != null) {
+          httpConn.disconnect();
+        }
       }
-      httpConn.disconnect();
     } catch (OutOfMemoryError e) {
       e.printStackTrace();
       publishResults(
@@ -423,7 +418,6 @@ public class DownloadService extends IntentService {
         false
       );
     }
-    stopForegroundIfNeeded();
   }
 
   private void clearDownloadData(String docDir) {
@@ -581,15 +575,4 @@ 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/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -44,7 +44,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "isAutoUpdateAvailable", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "6.7.5"
+    private let PLUGIN_VERSION: String = "6.7.7-alpha.1"
     static let updateUrlDefault = "https://plugin.capgo.app/updates"
     static let statsUrlDefault = "https://plugin.capgo.app/stats"
     static let channelUrlDefault = "https://plugin.capgo.app/channel_self"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "6.7.5",
+  "version": "6.7.7-alpha.1",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",