react-native-nitro-unzip 0.2.1 → 0.2.2

package/android/src/main/java/com/margelo/nitro/unzip/HybridUnzipTask.kt

@@ -49,14 +49,11 @@ class HybridUnzipTask(
   }
 
   override fun await(): Promise<UnzipResult> {
-    return Promise.async { resolve, reject ->
+    return Promise.async {
       try {
-        val result = if (password != null) extractWithPassword() else extract()
-        resolve(result)
+        if (password != null) extractWithPassword() else extract()
       } catch (e: CancellationException) {
-        reject(Exception("Extraction cancelled"))
-      } catch (e: Exception) {
-        reject(e)
+        throw Exception("Extraction cancelled")
       }
     }
   }

package/android/src/main/java/com/margelo/nitro/unzip/HybridZipTask.kt

@@ -46,14 +46,11 @@ class HybridZipTask(
   }
 
   override fun await(): Promise<ZipResult> {
-    return Promise.async { resolve, reject ->
+    return Promise.async {
       try {
-        val result = compress()
-        resolve(result)
+        compress()
       } catch (e: CancellationException) {
-        reject(Exception("Zip creation cancelled"))
-      } catch (e: Exception) {
-        reject(e)
+        throw Exception("Zip creation cancelled")
       }
     }
   }

package/ios/HybridUnzipTask.swift

@@ -30,10 +30,6 @@ class HybridUnzipTask: HybridUnzipTaskSpec {
   private var backgroundTaskId: UIBackgroundTaskIdentifier = .invalid
   private let lock = NSLock()
   private let progressThrottle: TimeInterval = 1.0
-
-  // Promise resolution — held until extraction completes or fails
-  private var resolvePromise: ((UnzipResult) -> Void)?
-  private var rejectPromise: ((Error) -> Void)?
   private var hasStarted = false
 
   init(zipPath: String, destinationPath: String, password: String? = nil) {
@@ -59,45 +55,38 @@ class HybridUnzipTask: HybridUnzipTaskSpec {
   }
 
   func await() throws -> Promise<UnzipResult> {
-    return Promise.async { [self] resolve, reject in
-      self.lock.lock()
-      self.resolvePromise = resolve
-      self.rejectPromise = reject
+    lock.lock()
+    guard !hasStarted else {
+      lock.unlock()
+      return Promise.rejected(withError: NSError(
+        domain: "NitroUnzip",
+        code: 4,
+        userInfo: [NSLocalizedDescriptionKey: "Task already started"]
+      ))
+    }
+    hasStarted = true
+    lock.unlock()
 
-      guard !self.hasStarted else {
-        self.lock.unlock()
-        return
+    return Promise.async {
+      try await withCheckedThrowingContinuation { continuation in
+        self.beginBackgroundTask()
+
+        DispatchQueue.global(qos: .userInitiated).async {
+          do {
+            let result = try self.extract()
+            self.endBackgroundTask()
+            continuation.resume(returning: result)
+          } catch {
+            self.endBackgroundTask()
+            continuation.resume(throwing: error)
+          }
+        }
       }
-      self.hasStarted = true
-      self.lock.unlock()
-
-      self.startExtraction()
     }
   }
 
   // MARK: - Extraction
 
-  private func startExtraction() {
-    beginBackgroundTask()
-
-    DispatchQueue.global(qos: .userInitiated).async { [self] in
-      do {
-        let result = try self.extract()
-        self.endBackgroundTask()
-        self.lock.lock()
-        let resolve = self.resolvePromise
-        self.lock.unlock()
-        resolve?(result)
-      } catch {
-        self.endBackgroundTask()
-        self.lock.lock()
-        let reject = self.rejectPromise
-        self.lock.unlock()
-        reject?(error)
-      }
-    }
-  }
-
   private func extract() throws -> UnzipResult {
     let startTime = Date()
     let fileManager = FileManager.default
@@ -199,7 +188,7 @@ class HybridUnzipTask: HybridUnzipTaskSpec {
     let finalCount = extractedFiles
     let averageSpeed = duration > 0 ? Double(finalCount) / (duration / 1000) : 0
 
-    // Calculate total bytes from extracted files
+    // Calculate total bytes from zip file size
     let totalBytes: Double
     if let attrs = try? fileManager.attributesOfItem(atPath: cleanZip),
        let fileSize = attrs[.size] as? UInt64 {

package/ios/HybridZipTask.swift

@@ -24,9 +24,6 @@ class HybridZipTask: HybridZipTaskSpec {
   private var backgroundTaskId: UIBackgroundTaskIdentifier = .invalid
   private let lock = NSLock()
   private let progressThrottle: TimeInterval = 1.0
-
-  private var resolvePromise: ((ZipResult) -> Void)?
-  private var rejectPromise: ((Error) -> Void)?
   private var hasStarted = false
 
   init(sourcePath: String, destinationZipPath: String, password: String? = nil) {
@@ -52,45 +49,38 @@ class HybridZipTask: HybridZipTaskSpec {
   }
 
   func await() throws -> Promise<ZipResult> {
-    return Promise.async { [self] resolve, reject in
-      self.lock.lock()
-      self.resolvePromise = resolve
-      self.rejectPromise = reject
-
-      guard !self.hasStarted else {
-        self.lock.unlock()
-        return
-      }
-      self.hasStarted = true
-      self.lock.unlock()
-
-      self.startCompression()
+    lock.lock()
+    guard !hasStarted else {
+      lock.unlock()
+      return Promise.rejected(withError: NSError(
+        domain: "NitroUnzip",
+        code: 4,
+        userInfo: [NSLocalizedDescriptionKey: "Task already started"]
+      ))
     }
-  }
-
-  // MARK: - Compression
+    hasStarted = true
+    lock.unlock()
 
-  private func startCompression() {
-    beginBackgroundTask()
-
-    DispatchQueue.global(qos: .userInitiated).async { [self] in
-      do {
-        let result = try self.compress()
-        self.endBackgroundTask()
-        self.lock.lock()
-        let resolve = self.resolvePromise
-        self.lock.unlock()
-        resolve?(result)
-      } catch {
-        self.endBackgroundTask()
-        self.lock.lock()
-        let reject = self.rejectPromise
-        self.lock.unlock()
-        reject?(error)
+    return Promise.async {
+      try await withCheckedThrowingContinuation { continuation in
+        self.beginBackgroundTask()
+
+        DispatchQueue.global(qos: .userInitiated).async {
+          do {
+            let result = try self.compress()
+            self.endBackgroundTask()
+            continuation.resume(returning: result)
+          } catch {
+            self.endBackgroundTask()
+            continuation.resume(throwing: error)
+          }
+        }
       }
     }
   }
 
+  // MARK: - Compression
+
   private func compress() throws -> ZipResult {
     let startTime = Date()
     let fileManager = FileManager.default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-unzip",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "High-performance ZIP extraction for React Native, powered by Nitro Modules",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",