@capgo/capacitor-downloader 8.1.29 → 8.1.31

package/android/src/main/java/ee/forgr/capacitor/plugin/downloader/CapacitorDownloaderPlugin.java

@@ -23,7 +23,7 @@ import java.util.Map;
 @CapacitorPlugin(name = "CapacitorDownloader")
 public class CapacitorDownloaderPlugin extends Plugin {
 
-    private final String pluginVersion = "8.1.29";
+    private final String pluginVersion = "8.1.31";
 
     private DownloadManager downloadManager;
     private final Map<String, Long> downloads = new HashMap<>();

package/ios/Sources/CapacitorDownloaderPlugin/CapacitorDownloaderPlugin.swift

@@ -8,7 +8,7 @@ import Capacitor
 
 @objc(CapacitorDownloaderPlugin)
 public class CapacitorDownloaderPlugin: CAPPlugin, CAPBridgedPlugin {
-    private let pluginVersion: String = "8.1.29"
+    private let pluginVersion: String = "8.1.31"
     public let identifier = "CapacitorDownloaderPlugin"
     public let jsName = "CapacitorDownloader"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -22,12 +22,40 @@ public class CapacitorDownloaderPlugin: CAPPlugin, CAPBridgedPlugin {
     ]
 
     private var tasks: [String: URLSessionDownloadTask] = [:]
+    private let tasksLock = NSLock()
     private lazy var session: URLSession = {
         let config = URLSessionConfiguration.background(withIdentifier: "CapacitorDownloader")
         config.sessionSendsLaunchEvents = true
         return URLSession(configuration: config, delegate: self, delegateQueue: nil)
     }()
 
+    private func setTask(_ task: URLSessionDownloadTask, for id: String) {
+        tasksLock.lock()
+        defer { tasksLock.unlock() }
+        tasks[id] = task
+    }
+
+    private func getTask(for id: String) -> URLSessionDownloadTask? {
+        tasksLock.lock()
+        defer { tasksLock.unlock() }
+        return tasks[id]
+    }
+
+    private func removeTask(for id: String) {
+        tasksLock.lock()
+        defer { tasksLock.unlock() }
+        tasks.removeValue(forKey: id)
+    }
+
+    private func idForTask(_ task: URLSessionDownloadTask) -> String? {
+        if let id = task.taskDescription, !id.isEmpty {
+            return id
+        }
+        tasksLock.lock()
+        defer { tasksLock.unlock() }
+        return tasks.first(where: { $0.value == task })?.key
+    }
+
     @objc func download(_ call: CAPPluginCall) {
         guard let id = call.getString("id"),
               let urlString = call.getString("url"),
@@ -45,7 +73,8 @@ public class CapacitorDownloaderPlugin: CAPPlugin, CAPBridgedPlugin {
         }
 
         let task = session.downloadTask(with: request)
-        tasks[id] = task
+        task.taskDescription = id
+        setTask(task, for: id)
         task.resume()
 
         call.resolve([
@@ -57,7 +86,7 @@ public class CapacitorDownloaderPlugin: CAPPlugin, CAPBridgedPlugin {
 
     @objc func pause(_ call: CAPPluginCall) {
         guard let id = call.getString("id"),
-              let task = tasks[id] else {
+              let task = getTask(for: id) else {
             call.reject("Task not found")
             return
         }
@@ -68,7 +97,7 @@ public class CapacitorDownloaderPlugin: CAPPlugin, CAPBridgedPlugin {
 
     @objc func resume(_ call: CAPPluginCall) {
         guard let id = call.getString("id"),
-              let task = tasks[id] else {
+              let task = getTask(for: id) else {
             call.reject("Task not found")
             return
         }
@@ -79,19 +108,19 @@ public class CapacitorDownloaderPlugin: CAPPlugin, CAPBridgedPlugin {
 
     @objc func stop(_ call: CAPPluginCall) {
         guard let id = call.getString("id"),
-              let task = tasks[id] else {
+              let task = getTask(for: id) else {
             call.reject("Task not found")
             return
         }
 
         task.cancel()
-        tasks.removeValue(forKey: id)
+        removeTask(for: id)
         call.resolve()
     }
 
     @objc func checkStatus(_ call: CAPPluginCall) {
         guard let id = call.getString("id"),
-              let task = tasks[id] else {
+              let task = getTask(for: id) else {
             call.reject("Task not found")
             return
         }
@@ -141,7 +170,7 @@ public class CapacitorDownloaderPlugin: CAPPlugin, CAPBridgedPlugin {
 
 extension CapacitorDownloaderPlugin: URLSessionDownloadDelegate {
     public func urlSession(_ session: URLSession, downloadTask: URLSessionDownloadTask, didFinishDownloadingTo location: URL) {
-        guard let id = tasks.first(where: { $0.value == downloadTask })?.key,
+        guard let id = idForTask(downloadTask),
               let destinationURL = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first?.appendingPathComponent(id) else {
             return
         }
@@ -156,11 +185,11 @@ extension CapacitorDownloaderPlugin: URLSessionDownloadDelegate {
 
     public func urlSession(_ session: URLSession, task: URLSessionTask, didCompleteWithError error: Error?) {
         guard let downloadTask = task as? URLSessionDownloadTask,
-              let id = tasks.first(where: { $0.value == downloadTask })?.key else {
+              let id = idForTask(downloadTask) else {
             return
         }
 
-        tasks.removeValue(forKey: id)
+        removeTask(for: id)
 
         if let error = error {
             notifyListeners("downloadFailed", data: ["id": id, "error": error.localizedDescription])
@@ -168,7 +197,7 @@ extension CapacitorDownloaderPlugin: URLSessionDownloadDelegate {
     }
 
     public func urlSession(_ session: URLSession, downloadTask: URLSessionDownloadTask, didWriteData bytesWritten: Int64, totalBytesWritten: Int64, totalBytesExpectedToWrite: Int64) {
-        guard let id = tasks.first(where: { $0.value == downloadTask })?.key else {
+        guard let id = idForTask(downloadTask) else {
             return
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-downloader",
-  "version": "8.1.29",
+  "version": "8.1.31",
   "description": "Download file in background or foreground",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -52,7 +52,8 @@
     "prepublishOnly": "bun run build",
     "check:wiring": "node scripts/check-capacitor-plugin-wiring.mjs",
     "example:install": "cd example-app && bun install --frozen-lockfile",
-    "example:build": "bun run build && cd example-app && bun install --frozen-lockfile && bun run build"
+    "example:build": "bun run build && cd example-app && bun install --frozen-lockfile && bun run build",
+    "changelog:ai": "node scripts/generate-ai-changelog.mjs"
   },
   "devDependencies": {
     "@capacitor/android": "^8.0.0",