react-native-video-trim 2.2.10 → 3.0.0

package/ios/VideoTrim.swift

@@ -1,705 +1,704 @@
 import React
 import Photos
-import ffmpegkit
 
 @available(iOS 13.0, *)
 @objc(VideoTrim)
 class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDelegate {
-    private let FILE_PREFIX = "trimmedVideo"
-    private var hasListeners = false
-    private var isShowing = false
-    
-    private var saveToPhoto = false
-    private var removeAfterSavedToPhoto = false
-    private var removeAfterFailedToSavePhoto = false
-    private var removeAfterSavedToDocuments = false
-    private var removeAfterFailedToSaveDocuments = false
-    private var removeAfterShared = false
-    private var removeAfterFailedToShare = false
-    
-    private var trimmingText = "Trimming video..."
-    private var enableCancelDialog = true
-    private var cancelDialogTitle = "Warning!"
-    private var cancelDialogMessage = "Are you sure want to cancel?"
-    private var cancelDialogCancelText = "Close"
-    private var cancelDialogConfirmText = "Proceed"
-    private var enableSaveDialog = true
-    private var saveDialogTitle = "Confirmation!"
-    private var saveDialogMessage = "Are you sure want to save?"
-    private var saveDialogCancelText = "Close"
-    private var saveDialogConfirmText = "Proceed"
-    private var fullScreenModalIOS  = false
-    private var cancelButtonText = "Cancel"
-    private var saveButtonText = "Save"
-    private var vc: VideoTrimmerViewController?
-    private var isVideoType = true
-    private var outputExt = "mp4"
-    private var openDocumentsOnFinish = false
-    private var openShareSheetOnFinish = false
-    private var outputFile: URL?
-    private var closeWhenFinish = true
-    private var enableCancelTrimming = true;
-    private var cancelTrimmingButtonText = "Cancel";
-    private var enableCancelTrimmingDialog = true;
-    private var cancelTrimmingDialogTitle = "Warning!";
-    private var cancelTrimmingDialogMessage = "Are you sure want to trimming?";
-    private var cancelTrimmingDialogCancelText = "Close";
-    private var cancelTrimmingDialogConfirmText = "Proceed";
-    private var alertOnFailToLoad = true;
-    private var alertOnFailTitle = "Error";
-    private var alertOnFailMessage = "Fail to load media. Possibly invalid file or no network connection";
-    private var alertOnFailCloseText = "Close";
-    
-    @objc
-    static override func requiresMainQueueSetup() -> Bool {
-        return true
+  private let FILE_PREFIX = "trimmedVideo"
+  private var hasListeners = false
+  private var isShowing = false
+  
+  private var saveToPhoto = false
+  private var removeAfterSavedToPhoto = false
+  private var removeAfterFailedToSavePhoto = false
+  private var removeAfterSavedToDocuments = false
+  private var removeAfterFailedToSaveDocuments = false
+  private var removeAfterShared = false
+  private var removeAfterFailedToShare = false
+  
+  private var trimmingText = "Trimming video..."
+  private var enableCancelDialog = true
+  private var cancelDialogTitle = "Warning!"
+  private var cancelDialogMessage = "Are you sure want to cancel?"
+  private var cancelDialogCancelText = "Close"
+  private var cancelDialogConfirmText = "Proceed"
+  private var enableSaveDialog = true
+  private var saveDialogTitle = "Confirmation!"
+  private var saveDialogMessage = "Are you sure want to save?"
+  private var saveDialogCancelText = "Close"
+  private var saveDialogConfirmText = "Proceed"
+  private var fullScreenModalIOS  = false
+  private var cancelButtonText = "Cancel"
+  private var saveButtonText = "Save"
+  private var vc: VideoTrimmerViewController?
+  private var isVideoType = true
+  private var outputExt = "mp4"
+  private var openDocumentsOnFinish = false
+  private var openShareSheetOnFinish = false
+  private var outputFile: URL?
+  private var closeWhenFinish = true
+  private var enableCancelTrimming = true;
+  private var cancelTrimmingButtonText = "Cancel";
+  private var enableCancelTrimmingDialog = true;
+  private var cancelTrimmingDialogTitle = "Warning!";
+  private var cancelTrimmingDialogMessage = "Are you sure want to trimming?";
+  private var cancelTrimmingDialogCancelText = "Close";
+  private var cancelTrimmingDialogConfirmText = "Proceed";
+  private var alertOnFailToLoad = true;
+  private var alertOnFailTitle = "Error";
+  private var alertOnFailMessage = "Fail to load media. Possibly invalid file or no network connection";
+  private var alertOnFailCloseText = "Close";
+  
+  private var timer: Timer?;
+  private var exportSession: AVAssetExportSession?
+  private var progressUpdateInterval: TimeInterval = 0.1
+  
+  @objc
+  static override func requiresMainQueueSetup() -> Bool {
+    return true
+  }
+  
+  override func supportedEvents() -> [String]! {
+    return ["VideoTrim"]
+  }
+  
+  override func startObserving() {
+    hasListeners = true
+  }
+  
+  override func stopObserving() {
+    hasListeners = false
+  }
+  
+  @objc(showEditor:withConfig:)
+  func showEditor(uri: String, config: NSDictionary){
+    if isShowing {
+      return
     }
-    
-    override func supportedEvents() -> [String]! {
-        return ["VideoTrim"]
+    saveToPhoto = config["saveToPhoto"] as? Bool ?? false
+    
+    removeAfterSavedToPhoto = config["removeAfterSavedToPhoto"] as? Bool ?? false
+    removeAfterFailedToSavePhoto = config["removeAfterFailedToSavePhoto"] as? Bool ?? false
+    removeAfterSavedToDocuments = config["removeAfterSavedToDocuments"] as? Bool ?? false
+    removeAfterFailedToSaveDocuments = config["removeAfterFailedToSaveDocuments"] as? Bool ?? false
+    removeAfterShared = config["removeAfterShared"] as? Bool ?? false
+    removeAfterFailedToShare = config["removeAfterFailedToShare"] as? Bool ?? false
+    
+    enableCancelDialog = config["enableCancelDialog"] as? Bool ?? true
+    cancelDialogTitle = config["cancelDialogTitle"] as? String ?? "Warning!"
+    cancelDialogMessage = config["cancelDialogMessage"] as? String ?? "Are you sure want to cancel?"
+    cancelDialogCancelText = config["cancelDialogCancelText"] as? String ?? "Close"
+    cancelDialogConfirmText = config["cancelDialogConfirmText"] as? String ?? "Proceed"
+    
+    enableSaveDialog = config["enableSaveDialog"] as? Bool ?? true
+    saveDialogTitle = config["saveDialogTitle"] as? String ?? "Confirmation!"
+    saveDialogMessage = config["saveDialogMessage"] as? String ?? "Are you sure want to save?"
+    saveDialogCancelText = config["saveDialogCancelText"] as? String ?? "Close"
+    saveDialogConfirmText = config["saveDialogConfirmText"] as? String ?? "Proceed"
+    trimmingText = config["trimmingText"] as? String ?? "Trimming video..."
+    fullScreenModalIOS = config["fullScreenModalIOS"] as? Bool ?? false
+    isVideoType = (config["type"] as? String ?? "video") == "video"
+    outputExt = config["outputExt"] as? String ?? "mp4"
+    openDocumentsOnFinish = config["openDocumentsOnFinish"] as? Bool ?? false
+    openShareSheetOnFinish = config["openShareSheetOnFinish"] as? Bool ?? false
+    
+    closeWhenFinish = config["closeWhenFinish"] as? Bool ?? true
+    enableCancelTrimming = config["enableCancelTrimming"] as? Bool ?? true
+    cancelTrimmingButtonText = config["cancelTrimmingButtonText"] as? String ?? "Cancel"
+    enableCancelTrimmingDialog = config["enableCancelTrimmingDialog"] as? Bool ?? true
+    cancelTrimmingDialogTitle = config["cancelTrimmingDialogTitle"] as? String ?? "Warning!"
+    cancelTrimmingDialogMessage = config["cancelTrimmingDialogMessage"] as? String ?? "Are you sure want to cancel trimming?"
+    cancelTrimmingDialogCancelText = config["cancelTrimmingDialogCancelText"] as? String ?? "Close"
+    cancelTrimmingDialogConfirmText = config["cancelTrimmingDialogConfirmText"] as? String ?? "Proceed"
+    alertOnFailToLoad = config["alertOnFailToLoad"] as? Bool ?? true
+    alertOnFailTitle = config["alertOnFailTitle"] as? String ?? "Error"
+    alertOnFailMessage = config["alertOnFailMessage"] as? String ?? "Fail to load media. Possibly invalid file or no network connection"
+    alertOnFailCloseText = config["alertOnFailCloseText"] as? String ?? "Close"
+    progressUpdateInterval = config["progressUpdateInterval"] as? TimeInterval ?? 0.1
+    
+    if let cancelBtnText = config["cancelButtonText"] as? String, !cancelBtnText.isEmpty {
+      self.cancelButtonText = cancelBtnText
     }
     
-    override func startObserving() {
-        hasListeners = true
+    if let saveButtonText = config["saveButtonText"] as? String, !saveButtonText.isEmpty {
+      self.saveButtonText = saveButtonText
     }
     
-    override func stopObserving() {
-        hasListeners = false
-    }
+    let destPath = URL(string: uri)
+    let newPath = renameFile(at: destPath!, newName: "beforeTrim")
+    
+    guard let destPath = newPath else { return }
     
-    @objc(showEditor:withConfig:)
-    func showEditor(uri: String, config: NSDictionary){
-        if isShowing {
-            return
+    DispatchQueue.main.async {
+      self.vc = VideoTrimmerViewController()
+      
+      guard let vc = self.vc else { return }
+      
+      vc.configure(config: config)
+      
+      vc.cancelBtnClicked = {
+        if !self.enableCancelDialog {
+          self.emitEventToJS("onCancel", eventData: nil)
+          
+          vc.dismiss(animated: true, completion: {
+            self.emitEventToJS("onHide", eventData: nil)
+            self.isShowing = false
+          })
+          return
         }
-        saveToPhoto = config["saveToPhoto"] as? Bool ?? false
         
-        removeAfterSavedToPhoto = config["removeAfterSavedToPhoto"] as? Bool ?? false
-        removeAfterFailedToSavePhoto = config["removeAfterFailedToSavePhoto"] as? Bool ?? false
-        removeAfterSavedToDocuments = config["removeAfterSavedToDocuments"] as? Bool ?? false
-        removeAfterFailedToSaveDocuments = config["removeAfterFailedToSaveDocuments"] as? Bool ?? false
-        removeAfterShared = config["removeAfterShared"] as? Bool ?? false
-        removeAfterFailedToShare = config["removeAfterFailedToShare"] as? Bool ?? false
+        // Create Alert
+        let dialogMessage = UIAlertController(title: self.cancelDialogTitle, message: self.cancelDialogMessage, preferredStyle: .alert)
+        dialogMessage.overrideUserInterfaceStyle = .dark
         
-        enableCancelDialog = config["enableCancelDialog"] as? Bool ?? true
-        cancelDialogTitle = config["cancelDialogTitle"] as? String ?? "Warning!"
-        cancelDialogMessage = config["cancelDialogMessage"] as? String ?? "Are you sure want to cancel?"
-        cancelDialogCancelText = config["cancelDialogCancelText"] as? String ?? "Close"
-        cancelDialogConfirmText = config["cancelDialogConfirmText"] as? String ?? "Proceed"
+        // Create OK button with action handler
+        let ok = UIAlertAction(title: self.cancelDialogConfirmText, style: .destructive, handler: { (action) -> Void in
+          self.emitEventToJS("onCancel", eventData: nil)
+          
+          vc.dismiss(animated: true, completion: {
+            self.emitEventToJS("onHide", eventData: nil)
+            self.isShowing = false
+          })
+        })
         
-        enableSaveDialog = config["enableSaveDialog"] as? Bool ?? true
-        saveDialogTitle = config["saveDialogTitle"] as? String ?? "Confirmation!"
-        saveDialogMessage = config["saveDialogMessage"] as? String ?? "Are you sure want to save?"
-        saveDialogCancelText = config["saveDialogCancelText"] as? String ?? "Close"
-        saveDialogConfirmText = config["saveDialogConfirmText"] as? String ?? "Proceed"
-        trimmingText = config["trimmingText"] as? String ?? "Trimming video..."
-        fullScreenModalIOS = config["fullScreenModalIOS"] as? Bool ?? false
-        isVideoType = (config["type"] as? String ?? "video") == "video"
-        outputExt = config["outputExt"] as? String ?? "mp4"
-        openDocumentsOnFinish = config["openDocumentsOnFinish"] as? Bool ?? false
-        openShareSheetOnFinish = config["openShareSheetOnFinish"] as? Bool ?? false
+        // Create Cancel button with action handlder
+        let cancel = UIAlertAction(title: self.cancelDialogCancelText, style: .cancel)
         
-        closeWhenFinish = config["closeWhenFinish"] as? Bool ?? true
-        enableCancelTrimming = config["enableCancelTrimming"] as? Bool ?? true
-        cancelTrimmingButtonText = config["cancelTrimmingButtonText"] as? String ?? "Cancel"
-        enableCancelTrimmingDialog = config["enableCancelTrimmingDialog"] as? Bool ?? true
-        cancelTrimmingDialogTitle = config["cancelTrimmingDialogTitle"] as? String ?? "Warning!"
-        cancelTrimmingDialogMessage = config["cancelTrimmingDialogMessage"] as? String ?? "Are you sure want to cancel trimming?"
-        cancelTrimmingDialogCancelText = config["cancelTrimmingDialogCancelText"] as? String ?? "Close"
-        cancelTrimmingDialogConfirmText = config["cancelTrimmingDialogConfirmText"] as? String ?? "Proceed"
-        alertOnFailToLoad = config["alertOnFailToLoad"] as? Bool ?? true
-        alertOnFailTitle = config["alertOnFailTitle"] as? String ?? "Error"
-        alertOnFailMessage = config["alertOnFailMessage"] as? String ?? "Fail to load media. Possibly invalid file or no network connection"
-        alertOnFailCloseText = config["alertOnFailCloseText"] as? String ?? "Close"
+        //Add OK and Cancel button to an Alert object
+        dialogMessage.addAction(ok)
+        dialogMessage.addAction(cancel)
         
-        if let cancelBtnText = config["cancelButtonText"] as? String, !cancelBtnText.isEmpty {
-            self.cancelButtonText = cancelBtnText
+        // Present alert message to user
+        if let root = RCTPresentedViewController() {
+          root.present(dialogMessage, animated: true, completion: nil)
         }
-        
-        if let saveButtonText = config["saveButtonText"] as? String, !saveButtonText.isEmpty {
-            self.saveButtonText = saveButtonText
+      }
+      
+      vc.saveBtnClicked = {(selectedRange: CMTimeRange) in
+        if !self.enableSaveDialog {
+          self.trim(viewController: vc,inputFile: destPath, videoDuration: self.vc!.asset!.duration.seconds, startTime: selectedRange.start.seconds, endTime: selectedRange.end.seconds)
+          return
         }
         
-        let destPath = URL(string: uri)
-        let newPath = renameFile(at: destPath!, newName: "beforeTrim")
-      
-        guard let destPath = newPath else { return }
+        // Create Alert
+        let dialogMessage = UIAlertController(title: self.saveDialogTitle, message: self.saveDialogMessage, preferredStyle: .alert)
+        dialogMessage.overrideUserInterfaceStyle = .dark
         
-        DispatchQueue.main.async {
-            self.vc = VideoTrimmerViewController()
-            
-            guard let vc = self.vc else { return }
-            
-            vc.configure(config: config)
-
-            vc.cancelBtnClicked = {
-                if !self.enableCancelDialog {
-                    self.emitEventToJS("onCancel", eventData: nil)
-                    
-                    vc.dismiss(animated: true, completion: {
-                        self.emitEventToJS("onHide", eventData: nil)
-                        self.isShowing = false
-                    })
-                    return
-                }
-                
-                // Create Alert
-                let dialogMessage = UIAlertController(title: self.cancelDialogTitle, message: self.cancelDialogMessage, preferredStyle: .alert)
-                dialogMessage.overrideUserInterfaceStyle = .dark
-                
-                // Create OK button with action handler
-                let ok = UIAlertAction(title: self.cancelDialogConfirmText, style: .destructive, handler: { (action) -> Void in
-                    self.emitEventToJS("onCancel", eventData: nil)
-                    
-                    vc.dismiss(animated: true, completion: {
-                        self.emitEventToJS("onHide", eventData: nil)
-                        self.isShowing = false
-                    })
-                })
-                
-                // Create Cancel button with action handlder
-                let cancel = UIAlertAction(title: self.cancelDialogCancelText, style: .cancel)
-                
-                //Add OK and Cancel button to an Alert object
-                dialogMessage.addAction(ok)
-                dialogMessage.addAction(cancel)
-                
-                // Present alert message to user
-                if let root = RCTPresentedViewController() {
-                    root.present(dialogMessage, animated: true, completion: nil)
-                }
-            }
-            
-            vc.saveBtnClicked = {(selectedRange: CMTimeRange) in
-                if !self.enableSaveDialog {
-                    self.trim(viewController: vc,inputFile: destPath, videoDuration: self.vc!.asset!.duration.seconds, startTime: selectedRange.start.seconds, endTime: selectedRange.end.seconds)
-                    return
-                }
-                
-                // Create Alert
-                let dialogMessage = UIAlertController(title: self.saveDialogTitle, message: self.saveDialogMessage, preferredStyle: .alert)
-                dialogMessage.overrideUserInterfaceStyle = .dark
-
-                // Create OK button with action handler
-                let ok = UIAlertAction(title: self.saveDialogConfirmText, style: .default, handler: { (action) -> Void in
-                    self.trim(viewController: vc,inputFile: destPath, videoDuration: vc.asset!.duration.seconds, startTime: selectedRange.start.seconds, endTime: selectedRange.end.seconds)
-                })
-                
-                // Create Cancel button with action handlder
-                let cancel = UIAlertAction(title: self.saveDialogCancelText, style: .cancel)
-                
-                //Add OK and Cancel button to an Alert object
-                dialogMessage.addAction(ok)
-                dialogMessage.addAction(cancel)
-                
-                // Present alert message to user
-                if let root = RCTPresentedViewController() {
-                    root.present(dialogMessage, animated: true, completion: nil)
-                }
-            }
-            
-            vc.isModalInPresentation = true // prevent modal closed by swipe down
-            
-            if self.fullScreenModalIOS {
-                vc.modalPresentationStyle = .fullScreen
-            }
-            
-            if let root = RCTPresentedViewController() {
-                root.present(vc, animated: true, completion: {
-                    self.emitEventToJS("onShow", eventData: nil)
-                    self.isShowing = true
-                    
-                    // start loading asset after view is finished presenting
-                    // otherwise it may run too fast for local file and autoplay looks weird
-                    let assetLoader = AssetLoader()
-                    assetLoader.delegate = self
-                    assetLoader.loadAsset(url: destPath, isVideoType: self.isVideoType)
-                })
-            }
-        }
+        // Create OK button with action handler
+        let ok = UIAlertAction(title: self.saveDialogConfirmText, style: .default, handler: { (action) -> Void in
+          self.trim(viewController: vc,inputFile: destPath, videoDuration: vc.asset!.duration.seconds, startTime: selectedRange.start.seconds, endTime: selectedRange.end.seconds)
+        })
         
+        // Create Cancel button with action handlder
+        let cancel = UIAlertAction(title: self.saveDialogCancelText, style: .cancel)
+        
+        //Add OK and Cancel button to an Alert object
+        dialogMessage.addAction(ok)
+        dialogMessage.addAction(cancel)
+        
+        // Present alert message to user
+        if let root = RCTPresentedViewController() {
+          root.present(dialogMessage, animated: true, completion: nil)
+        }
+      }
+      
+      vc.isModalInPresentation = true // prevent modal closed by swipe down
+      
+      if self.fullScreenModalIOS {
+        vc.modalPresentationStyle = .fullScreen
+      }
+      
+      if let root = RCTPresentedViewController() {
+        root.present(vc, animated: true, completion: {
+          self.emitEventToJS("onShow", eventData: nil)
+          self.isShowing = true
+          
+          // start loading asset after view is finished presenting
+          // otherwise it may run too fast for local file and autoplay looks weird
+          let assetLoader = AssetLoader()
+          assetLoader.delegate = self
+          assetLoader.loadAsset(url: destPath, isVideoType: self.isVideoType)
+        })
+      }
     }
     
-    private func copyFileToDocumentDir(uri: String) -> URL? {
-        if let videoURL = URL(string: uri) {
-            // Save the video to the document directory
-            let documentsDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
-            // Extract the file extension from the videoURL
-            let fileExtension = videoURL.pathExtension
-            
-            // Define the filename with the correct file extension
-            let timestamp = Int(Date().timeIntervalSince1970)
-            let destinationURL = documentsDirectory.appendingPathComponent("\(FILE_PREFIX)_original_\(timestamp).\(fileExtension)")
-            
-            do {
-                try FileManager.default.copyItem(at: videoURL, to: destinationURL)
-            } catch {
-                print("Error while copying file to document directory \(error)")
-                return nil
-            }
-            
-            return destinationURL
-        } else {
-            return nil
-        }
+  }
+  
+  private func copyFileToDocumentDir(uri: String) -> URL? {
+    if let videoURL = URL(string: uri) {
+      // Save the video to the document directory
+      let documentsDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
+      // Extract the file extension from the videoURL
+      let fileExtension = videoURL.pathExtension
+      
+      // Define the filename with the correct file extension
+      let timestamp = Int(Date().timeIntervalSince1970)
+      let destinationURL = documentsDirectory.appendingPathComponent("\(FILE_PREFIX)_original_\(timestamp).\(fileExtension)")
+      
+      do {
+        try FileManager.default.copyItem(at: videoURL, to: destinationURL)
+      } catch {
+        print("Error while copying file to document directory \(error)")
+        return nil
+      }
+      
+      return destinationURL
+    } else {
+      return nil
     }
+  }
+  
+  private func emitEventToJS(_ eventName: String, eventData: [String: Any]?) {
+    if hasListeners {
+      var modifiedEventData = eventData ?? [:] // If eventData is nil, create an empty dictionary
+      modifiedEventData["name"] = eventName
+      sendEvent(withName: "VideoTrim", body: modifiedEventData)
+    }
+  }
+  
+  @objc(listFiles:withRejecter:)
+  func listFiles(resolve: @escaping RCTPromiseResolveBlock,reject: @escaping RCTPromiseRejectBlock) -> Void {
+    let files = listFiles()
+    resolve(files.map{ $0.absoluteString })
+  }
+  
+  @objc(cleanFiles:withRejecter:)
+  func cleanFiles(resolve: @escaping RCTPromiseResolveBlock,reject: @escaping RCTPromiseRejectBlock) -> Void {
+    let files = listFiles()
+    var successCount = 0
+    for file in files {
+      let state = deleteFile(url: file)
+      
+      if state == 0 {
+        successCount += 1
+      }
+    }
+    
+    resolve(successCount)
+  }
+  
+  @objc(deleteFile:withResolver:withRejecter:)
+  func deleteFile(uri: String, resolve: @escaping RCTPromiseResolveBlock,reject: @escaping RCTPromiseRejectBlock) -> Void {
+    let state = deleteFile(url: URL(string: uri)!)
+    resolve(state == 0)
+  }
+  
+  private func listFiles() -> [URL] {
+    var files: [URL] = []
+    
+    let documentsDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
     
-    private func emitEventToJS(_ eventName: String, eventData: [String: Any]?) {
-        if hasListeners {
-            var modifiedEventData = eventData ?? [:] // If eventData is nil, create an empty dictionary
-            modifiedEventData["name"] = eventName
-            sendEvent(withName: "VideoTrim", body: modifiedEventData)
+    do {
+      let directoryContents = try FileManager.default.contentsOfDirectory(at: documentsDirectory, includingPropertiesForKeys: nil)
+      
+      for fileURL in directoryContents {
+        if fileURL.lastPathComponent.starts(with: FILE_PREFIX) {
+          files.append(fileURL)
         }
+      }
+    } catch {
+      print("[listFiles] Error when retrieving files: \(error)")
     }
     
-    @objc(listFiles:withRejecter:)
-    func listFiles(resolve: @escaping RCTPromiseResolveBlock,reject: @escaping RCTPromiseRejectBlock) -> Void {
-        let files = listFiles()
-        resolve(files.map{ $0.absoluteString })
+    return files
+  }
+  
+  private func deleteFile(url: URL) -> Int {
+    do {
+      if FileManager.default.fileExists(atPath: url.path) {
+        try FileManager.default.removeItem(at: url)
+        
+        return 0
+      }
+      
+      return 1
+    } catch {
+      print("[deleteFile] Error deleting files: \(error)")
+      
+      return 2
     }
-    
-    @objc(cleanFiles:withRejecter:)
-    func cleanFiles(resolve: @escaping RCTPromiseResolveBlock,reject: @escaping RCTPromiseRejectBlock) -> Void {
-        let files = listFiles()
-        var successCount = 0
-        for file in files {
-            let state = deleteFile(url: file)
-            
-            if state == 0 {
-                successCount += 1
-            }
+  }
+  
+  private func trim(viewController: VideoTrimmerViewController, inputFile: URL, videoDuration: Double, startTime: Double, endTime: Double) {
+    vc?.pausePlayer()
+    
+    // Generate output file URL
+    let timestamp = Int(Date().timeIntervalSince1970)
+    let inputExtension = inputFile.pathExtension.lowercased()
+    let outputName = "\(FILE_PREFIX)_\(timestamp).\(inputExtension)"
+    let documentsDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
+    outputFile = documentsDirectory.appendingPathComponent(outputName)
+    
+    let formatter = DateFormatter()
+    formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSSSSZ"
+    formatter.timeZone = TimeZone(identifier: "UTC")
+    let dateTime = formatter.string(from: Date())
+    
+    emitEventToJS("onStartTrimming", eventData: nil)
+    
+    let progressAlert = ProgressAlertController()
+    progressAlert.modalPresentationStyle = .overFullScreen
+    progressAlert.modalTransitionStyle = .crossDissolve
+    progressAlert.setTitle(trimmingText)
+    
+    if enableCancelTrimming {
+      progressAlert.setCancelTitle(cancelTrimmingButtonText)
+      progressAlert.showCancelBtn()
+      progressAlert.onDismiss = {
+        if self.enableCancelTrimmingDialog {
+          let dialogMessage = UIAlertController(title: self.cancelTrimmingDialogTitle, message: self.cancelTrimmingDialogMessage, preferredStyle: .alert)
+          dialogMessage.overrideUserInterfaceStyle = .dark
+          
+          let ok = UIAlertAction(title: self.cancelDialogConfirmText, style: .destructive) { _ in
+            self.exportSession?.cancelExport()
+            progressAlert.dismiss(animated: true)
+          }
+          let cancel = UIAlertAction(title: self.cancelDialogCancelText, style: .cancel)
+          dialogMessage.addAction(ok)
+          dialogMessage.addAction(cancel)
+          
+          if let root = RCTPresentedViewController() {
+            root.present(dialogMessage, animated: true, completion: nil)
+          }
+        } else {
+          self.exportSession?.cancelExport()
+          progressAlert.dismiss(animated: true)
         }
-        
-        resolve(successCount)
+      }
     }
     
-    @objc(deleteFile:withResolver:withRejecter:)
-    func deleteFile(uri: String, resolve: @escaping RCTPromiseResolveBlock,reject: @escaping RCTPromiseRejectBlock) -> Void {
-        let state = deleteFile(url: URL(string: uri)!)
-        resolve(state == 0)
+    if let root = RCTPresentedViewController() {
+      root.present(progressAlert, animated: true, completion: nil)
     }
     
-    private func listFiles() -> [URL] {
-        var files: [URL] = []
-        
-        let documentsDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
-        
-        do {
-            let directoryContents = try FileManager.default.contentsOfDirectory(at: documentsDirectory, includingPropertiesForKeys: nil)
-            
-            for fileURL in directoryContents {
-                if fileURL.lastPathComponent.starts(with: FILE_PREFIX) {
-                    files.append(fileURL)
-                }
-            }
-        } catch {
-            print("[listFiles] Error when retrieving files: \(error)")
-        }
-        
-        return files
+    // Setup AVAssetExportSession
+    let asset = AVAsset(url: inputFile)
+    let isVideo = !asset.tracks(withMediaType: .video).isEmpty
+    let isWav = inputExtension == "wav"
+    let preset = isVideo || isWav ? AVAssetExportPresetPassthrough : AVAssetExportPresetAppleM4A
+    
+    guard let session = AVAssetExportSession(asset: asset, presetName: preset) else {
+      onError(message: "Failed to create export session", code: .trimmingFailed)
+      progressAlert.dismiss(animated: true)
+      return
+    }
+    exportSession = session
+    
+    var fileType: AVFileType
+    switch inputExtension {
+    case "mp4": fileType = .mp4
+    case "mov": fileType = .mov
+    case "m4a": fileType = .m4a
+    case "mp3": fileType = .mp3
+    case "wav": fileType = .wav
+    case "aif", "aiff": fileType = .aiff
+    case "caf": fileType = .caf
+    default: fileType = .mp4
     }
     
-    private func deleteFile(url: URL) -> Int {
-        do {
-            if FileManager.default.fileExists(atPath: url.path) {
-                try FileManager.default.removeItem(at: url)
-                
-                return 0
-            }
-            
-            return 1
-        } catch {
-            print("[deleteFile] Error deleting files: \(error)")
-            
-            return 2
-        }
+    let supportedTypes = session.supportedFileTypes
+    let finalOutputURL: URL
+    if preset == AVAssetExportPresetAppleM4A && !supportedTypes.contains(fileType) {
+      fileType = .m4a
+      let adjustedOutputName = "\(FILE_PREFIX)_\(timestamp).m4a"
+      finalOutputURL = documentsDirectory.appendingPathComponent(adjustedOutputName)
+      print("Adjusting output from '\(inputExtension)' to '.m4a' for audio encoding")
+    } else {
+      finalOutputURL = outputFile!
     }
     
-    private func trim(viewController: VideoTrimmerViewController, inputFile: URL, videoDuration: Double, startTime: Double, endTime: Double) {
-        vc?.pausePlayer()
-        
-        let timestamp = Int(Date().timeIntervalSince1970)
-        let outputName = "\(FILE_PREFIX)_\(timestamp).\(outputExt)"
-        let documentsDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
-        outputFile = documentsDirectory.appendingPathComponent(outputName)
-        
-        let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSSSSZ"
-        formatter.timeZone = TimeZone(identifier: "UTC")
-        let dateTime = formatter.string(from: Date())
-        
-        emitEventToJS("onStartTrimming", eventData: nil)
-        
-        var ffmpegSession: FFmpegSession?
-        let progressAlert = ProgressAlertController()
-        progressAlert.modalPresentationStyle = .overFullScreen
-        progressAlert.modalTransitionStyle = .crossDissolve
-        progressAlert.setTitle(trimmingText)
-        
-        if enableCancelTrimming {
-            progressAlert.setCancelTitle(cancelTrimmingButtonText)
-            progressAlert.showCancelBtn()
-            progressAlert.onDismiss = {
-                if self.enableCancelTrimmingDialog {
-                    let dialogMessage = UIAlertController(title: self.cancelTrimmingDialogTitle, message: self.cancelTrimmingDialogMessage, preferredStyle: .alert)
-                    dialogMessage.overrideUserInterfaceStyle = .dark
-
-                    // Create OK button with action handler
-                    let ok = UIAlertAction(title: self.cancelDialogConfirmText, style: .destructive, handler: { (action) -> Void in
-                        
-                        if let ffmpegSession = ffmpegSession {
-                            ffmpegSession.cancel()
-                        } else {
-                            self.emitEventToJS("onCancelTrimming", eventData: nil)
-                        }
-                        
-                        progressAlert.dismiss(animated: true)
-                    })
-                    
-                    // Create Cancel button with action handlder
-                    let cancel = UIAlertAction(title: self.cancelDialogCancelText, style: .cancel)
-                    
-                    //Add OK and Cancel button to an Alert object
-                    dialogMessage.addAction(ok)
-                    dialogMessage.addAction(cancel)
-                    
-                    // Present alert message to user
-                    if let root = RCTPresentedViewController() {
-                        root.present(dialogMessage, animated: true, completion: nil)
-                    }
-                } else {
-                    if let ffmpegSession = ffmpegSession {
-                        ffmpegSession.cancel()
-                    } else {
-                        self.emitEventToJS("onCancelTrimming", eventData: nil)
-                    }
-                    
-                    progressAlert.dismiss(animated: true)
-                }
-                
-            }
-        }
-        
-        if let root = RCTPresentedViewController() {
-            root.present(progressAlert, animated: true, completion: nil)
-        }
-        
-        let cmds = [
-            "-ss",
-            "\(startTime * 1000)ms",
-            "-to",
-            "\(endTime * 1000)ms",
-            "-i",
-            "\(inputFile)",
-            "-c",
-            "copy",
-            "-metadata",
-            "creation_time=\(dateTime)",
-            outputFile!.absoluteString
-        ]
-        
-        print("Command: ", cmds.joined(separator: " "))
-        
+    try? FileManager.default.removeItem(at: finalOutputURL)
+    session.outputURL = finalOutputURL
+    session.outputFileType = fileType
+    session.timeRange = CMTimeRange(start: CMTime(seconds: startTime, preferredTimescale: 600), duration: CMTime(seconds: endTime - startTime, preferredTimescale: 600))
+    
+    // Add creation date metadata
+    let metadataItem = AVMutableMetadataItem()
+    metadataItem.key = AVMetadataKey.commonKeyCreationDate as NSCopying & NSObjectProtocol
+    metadataItem.keySpace = .common
+    metadataItem.value = dateTime as NSCopying & NSObjectProtocol
+    session.metadata = [metadataItem]
+    
+    // Progress and completion
+    let manager = ExportSessionManager(session: session)
+    timer = Timer.scheduledTimer(withTimeInterval: progressUpdateInterval, repeats: true) { timer in
+      let progress = manager.progress
+      DispatchQueue.main.async {
+        progressAlert.setProgress(progress)
+      }
+      let statsPayload: [String: Any] = [
+        "time": Int(Double(progress) * videoDuration * 1000),
+        "progress": progress
+      ]
+      self.emitEventToJS("onStatistics", eventData: statsPayload)
+      if manager.isFinished { timer.invalidate() }
+    }
+    
+    session.exportAsynchronously {
+      manager.markFinished()
+      self.timer?.invalidate()
+      self.timer = nil
+      
+      DispatchQueue.main.async {
+        progressAlert.dismiss(animated: true)
+      }
+      
+      let finalProgress = manager.progress
+      if finalProgress >= 1.0 {
         let eventPayload: [String: Any] = [
-            "command": cmds.joined(separator: " ")
+          "outputPath": finalOutputURL.absoluteString,
+          "startTime": (startTime * 1000).rounded(),
+          "endTime": (endTime * 1000).rounded(),
+          "duration": (videoDuration * 1000).rounded()
         ]
-        self.emitEventToJS("onLog", eventData: eventPayload)
+        self.emitEventToJS("onFinishTrimming", eventData: eventPayload)
         
-        ffmpegSession = FFmpegKit.execute(withArgumentsAsync: cmds, withCompleteCallback: { session in
-            
-            // always hide progressAlert
-            DispatchQueue.main.async {
-                progressAlert.dismiss(animated: true)
+        if self.saveToPhoto && isVideo {
+          PHPhotoLibrary.requestAuthorization { status in
+            guard status == .authorized else {
+              self.onError(message: "Permission to access Photo Library is not granted", code: .noPhotoPermission)
+              return
             }
             
-            let state = session?.getState()
-            let returnCode = session?.getReturnCode()
-            
-            if ReturnCode.isSuccess(returnCode) {
-                let eventPayload: [String: Any] = ["outputPath": self.outputFile!.absoluteString, "startTime": (startTime * 1000).rounded(), "endTime": (endTime * 1000).rounded(), "duration": (videoDuration * 1000).rounded()]
-                self.emitEventToJS("onFinishTrimming", eventData: eventPayload)
-                
-                if (self.saveToPhoto && self.isVideoType) {
-                    PHPhotoLibrary.requestAuthorization { status in
-                        guard status == .authorized else {
-                            self.onError(message: "Permission to access Photo Library is not granted", code: .noPhotoPermission)
-                            return
-                        }
-                        
-                        PHPhotoLibrary.shared().performChanges({
-                            let request = PHAssetChangeRequest.creationRequestForAssetFromVideo(atFileURL: self.outputFile!)
-                            request?.creationDate = Date()
-                        }) { success, error in
-                            if success {
-                                print("Edited video saved to Photo Library successfully.")
-                                
-                                if self.removeAfterSavedToPhoto {
-                                    let _ = self.deleteFile(url: self.outputFile!)
-                                }
-                            } else {
-                                self.onError(message: "Failed to save edited video to Photo Library: \(error?.localizedDescription ?? "Unknown error")", code: .failToSaveToPhoto)
-                                if self.removeAfterFailedToSavePhoto {
-                                    let _ = self.deleteFile(url: self.outputFile!)
-                                }
-                            }
-                        }
-                    }
-                } else if self.openDocumentsOnFinish {
-                    self.saveFileToFilesApp(fileURL: self.outputFile!)
-                    
-                    // must return otherwise editor will close
-                    return
-                } else if self.openShareSheetOnFinish {
-                    self.shareFile(fileURL: self.outputFile!)
-                    
-                    // must return otherwise editor will close
-                    return
+            PHPhotoLibrary.shared().performChanges({
+              let request = PHAssetChangeRequest.creationRequestForAssetFromVideo(atFileURL: finalOutputURL)
+              request?.creationDate = Date()
+            }) { success, error in
+              if success {
+                print("Edited video saved to Photo Library successfully.")
+                if self.removeAfterSavedToPhoto {
+                  let _ = self.deleteFile(url: finalOutputURL)
                 }
-                
-                if self.closeWhenFinish {
-                    self.closeEditor()
-                }
-                
-            } else if ReturnCode.isCancel(returnCode) {
-                // CANCEL
-                self.emitEventToJS("onCancelTrimming", eventData: nil)
-            } else {
-                // FAILURE
-                self.onError(message: "Command failed with state \(String(describing: FFmpegKitConfig.sessionState(toString: state ?? .failed))) and rc \(String(describing: returnCode)).\(String(describing: session?.getFailStackTrace()))", code: .trimmingFailed)
-                if self.closeWhenFinish {
-                    self.closeEditor()
-                }
-            }
-            
-            
-        }, withLogCallback: { log in
-            guard let log = log else { return }
-            
-            print("FFmpeg process started with log " + (log.getMessage()));
-            
-            let eventPayload: [String: Any] = [
-                "level": log.getLevel(),
-                "message": log.getMessage() ?? "",
-                "sessionId": log.getSessionId(),
-            ]
-            self.emitEventToJS("onLog", eventData: eventPayload)
-            
-        }, withStatisticsCallback: { statistics in
-            guard let statistics = statistics else { return }
-            
-            let timeInMilliseconds = statistics.getTime()
-            if timeInMilliseconds > 0 {
-                let completePercentage = timeInMilliseconds / (videoDuration * 1000); // from 0 -> 1
-                DispatchQueue.main.async {
-                    progressAlert.setProgress(Float(completePercentage))
+              } else {
+                print(error ?? "Error saving edited video to Photo Library")
+                self.onError(message: "Failed to save edited video to Photo Library: \(error?.localizedDescription ?? "Unknown error")", code: .failToSaveToPhoto)
+                if self.removeAfterFailedToSavePhoto {
+                  let _ = self.deleteFile(url: finalOutputURL)
                 }
+              }
             }
-            
-            let eventPayload: [String: Any] = [
-                "sessionId": statistics.getSessionId(),
-                "videoFrameNumber": statistics.getVideoFrameNumber(),
-                "videoFps": statistics.getVideoFps(),
-                "videoQuality": statistics.getVideoQuality(),
-                "size": statistics.getSize(),
-                "time": statistics.getTime(),
-                "bitrate": statistics.getBitrate(),
-                "speed": statistics.getSpeed()
-            ]
-            self.emitEventToJS("onStatistics", eventData: eventPayload)
-        })
-    }
-    
-    func assetLoader(_ loader: AssetLoader, didFailWithError error: any Error, forKey key: String) {
-        let message = "Failed to load \(key): \(error.localizedDescription)"
-        print("Failed to load \(key)", message)
-        
-        self.onError(message: message, code: .failToLoadMedia)
-        vc?.onAssetFailToLoad()
+          }
+        } else if self.openDocumentsOnFinish {
+          self.saveFileToFilesApp(fileURL: finalOutputURL)
+          return
+        } else if self.openShareSheetOnFinish {
+          self.shareFile(fileURL: finalOutputURL)
+          return
+        }
         
-        if alertOnFailToLoad {
-            let dialogMessage = UIAlertController(title: alertOnFailTitle, message: alertOnFailMessage, preferredStyle: .alert)
-            dialogMessage.overrideUserInterfaceStyle = .dark
-
-            // Create Cancel button with action handlder
-            let ok = UIAlertAction(title: alertOnFailCloseText, style: .default)
-            
-            //Add OK and Cancel button to an Alert object
-            dialogMessage.addAction(ok)
-            
-            // Present alert message to user
-            if let root = RCTPresentedViewController() {
-                root.present(dialogMessage, animated: true, completion: nil)
-            }
+        if self.closeWhenFinish {
+          self.closeEditor()
+        }
+      } else if let error = manager.error {
+        if self.exportSession?.status == .cancelled {
+          self.emitEventToJS("onCancelTrimming", eventData: nil)
+        } else {
+          print(error)
+          self.onError(message: "Trimming failed: \(error.localizedDescription)", code: .trimmingFailed)
+          if self.closeWhenFinish {
+            self.closeEditor()
+          }
         }
+      } else {
+        self.onError(message: "Export failed or was cancelled", code: .trimmingFailed)
+        if self.closeWhenFinish {
+          self.closeEditor()
+        }
+      }
     }
+  }
+  
+  func assetLoader(_ loader: AssetLoader, didFailWithError error: any Error, forKey key: String) {
+    let message = "Failed to load \(key): \(error.localizedDescription)"
+    print("Failed to load \(key)", message)
     
-    func assetLoaderDidSucceed(_ loader: AssetLoader) {
-        print("Asset loaded successfully")
-        
-        vc?.asset = loader.asset
-        
-        let eventPayload: [String: Any] = [
-            "duration": loader.asset!.duration.seconds * 1000,
-        ]
-        self.emitEventToJS("onLoad", eventData: eventPayload)
-    }
+    self.onError(message: message, code: .failToLoadMedia)
+    vc?.onAssetFailToLoad()
     
+    if alertOnFailToLoad {
+      let dialogMessage = UIAlertController(title: alertOnFailTitle, message: alertOnFailMessage, preferredStyle: .alert)
+      dialogMessage.overrideUserInterfaceStyle = .dark
+      
+      // Create Cancel button with action handlder
+      let ok = UIAlertAction(title: alertOnFailCloseText, style: .default)
+      
+      //Add OK and Cancel button to an Alert object
+      dialogMessage.addAction(ok)
+      
+      // Present alert message to user
+      if let root = RCTPresentedViewController() {
+        root.present(dialogMessage, animated: true, completion: nil)
+      }
+    }
+  }
+  
+  func assetLoaderDidSucceed(_ loader: AssetLoader) {
+    print("Asset loaded successfully")
     
+    vc?.asset = loader.asset
     
-    private func saveFileToFilesApp(fileURL: URL) {
-        DispatchQueue.main.async {
-            let documentPicker = UIDocumentPickerViewController(url: fileURL, in: .exportToService)
-            documentPicker.delegate = self
-            documentPicker.modalPresentationStyle = .formSheet
-            if let root = RCTPresentedViewController() {
-                root.present(documentPicker, animated: true, completion: nil)
-            }
-        }
+    let eventPayload: [String: Any] = [
+      "duration": loader.asset!.duration.seconds * 1000,
+    ]
+    self.emitEventToJS("onLoad", eventData: eventPayload)
+  }
+  
+  
+  
+  private func saveFileToFilesApp(fileURL: URL) {
+    DispatchQueue.main.async {
+      let documentPicker = UIDocumentPickerViewController(url: fileURL, in: .exportToService)
+      documentPicker.delegate = self
+      documentPicker.modalPresentationStyle = .formSheet
+      if let root = RCTPresentedViewController() {
+        root.present(documentPicker, animated: true, completion: nil)
+      }
     }
-    
-    private func shareFile(fileURL: URL) {
-        DispatchQueue.main.async {
-            // Create an instance of UIActivityViewController
-            let activityViewController = UIActivityViewController(activityItems: [fileURL], applicationActivities: nil)
-            
-            activityViewController.completionWithItemsHandler = { activityType, completed, returnedItems, error in
-                
-                if let error = error {
-                    let message = "Sharing error: \(error.localizedDescription)"
-                    print(message)
-                    self.onError(message: message, code: .failToShare)
-                    
-                    if self.removeAfterFailedToShare {
-                        let _ = self.deleteFile(url: self.outputFile!)
-                    }
-                    return
-                }
-                
-                if completed {
-                    print("User completed the sharing activity")
-                    if self.removeAfterShared {
-                        let _ = self.deleteFile(url: self.outputFile!)
-                    }
-                } else {
-                    print("User cancelled or failed to complete the sharing activity")
-                    if self.removeAfterFailedToShare {
-                        let _ = self.deleteFile(url: self.outputFile!)
-                    }
-                }
-                
-                self.closeEditor()
-
-            }
-            
-            // Present the share sheet
-            if let root = RCTPresentedViewController() {
-                root.present(activityViewController, animated: true, completion: nil)
-            }
+  }
+  
+  private func shareFile(fileURL: URL) {
+    DispatchQueue.main.async {
+      // Create an instance of UIActivityViewController
+      let activityViewController = UIActivityViewController(activityItems: [fileURL], applicationActivities: nil)
+      
+      activityViewController.completionWithItemsHandler = { activityType, completed, returnedItems, error in
+        
+        if let error = error {
+          let message = "Sharing error: \(error.localizedDescription)"
+          print(message)
+          self.onError(message: message, code: .failToShare)
+          
+          if self.removeAfterFailedToShare {
+            let _ = self.deleteFile(url: self.outputFile!)
+          }
+          return
         }
         
-    }
-    
-    func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
-        if removeAfterSavedToDocuments {
-            let _ = deleteFile(url: outputFile!)
+        if completed {
+          print("User completed the sharing activity")
+          if self.removeAfterShared {
+            let _ = self.deleteFile(url: self.outputFile!)
+          }
+        } else {
+          print("User cancelled or failed to complete the sharing activity")
+          if self.removeAfterFailedToShare {
+            let _ = self.deleteFile(url: self.outputFile!)
+          }
         }
-        closeEditor()
+        
+        self.closeEditor()
+        
+      }
+      
+      // Present the share sheet
+      if let root = RCTPresentedViewController() {
+        root.present(activityViewController, animated: true, completion: nil)
+      }
     }
     
-    func documentPickerWasCancelled(_ controller: UIDocumentPickerViewController) {
-        if removeAfterFailedToSaveDocuments {
-            let _ = deleteFile(url: outputFile!)
-        }
-        closeEditor()
+  }
+  
+  func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
+    if removeAfterSavedToDocuments {
+      let _ = deleteFile(url: outputFile!)
     }
-    
-    @objc(closeEditor:withRejecter:)
-    func closeEditor(resolve: @escaping RCTPromiseResolveBlock,reject: @escaping RCTPromiseRejectBlock) -> Void {
-        closeEditor()
-        resolve(true)
+    closeEditor()
+  }
+  
+  func documentPickerWasCancelled(_ controller: UIDocumentPickerViewController) {
+    if removeAfterFailedToSaveDocuments {
+      let _ = deleteFile(url: outputFile!)
     }
-    
-    private func closeEditor() {
-        guard let vc = vc else { return }
-        // some how in case we trim a very short video the view controller is still visible after first .dismiss call
-        // even the file is successfully saved
-        // that's why we need a small delay here to ensure vc will be dismissed
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-            vc.dismiss(animated: true, completion: {
-                self.emitEventToJS("onHide", eventData: nil)
-                self.isShowing = false
-            })
-        }
+    closeEditor()
+  }
+  
+  @objc(closeEditor:withRejecter:)
+  func closeEditor(resolve: @escaping RCTPromiseResolveBlock,reject: @escaping RCTPromiseRejectBlock) -> Void {
+    closeEditor()
+    resolve(true)
+  }
+  
+  private func closeEditor() {
+    guard let vc = vc else { return }
+    // some how in case we trim a very short video the view controller is still visible after first .dismiss call
+    // even the file is successfully saved
+    // that's why we need a small delay here to ensure vc will be dismissed
+    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+      vc.dismiss(animated: true, completion: {
+        self.emitEventToJS("onHide", eventData: nil)
+        self.isShowing = false
+      })
     }
-    
-    @objc(isValidFile:withResolver:withRejecter:)
-    func isValidFile(uri: String, resolve: @escaping RCTPromiseResolveBlock,reject: @escaping RCTPromiseRejectBlock) -> Void {
-        let fileURL = URL(string: uri)!
-        checkFileValidity(url: fileURL) { isValid, fileType, duration in
-            if isValid {
-                print("Valid \(fileType) file with duration: \(duration) milliseconds")
-            } else {
-                print("Invalid file")
-            }
-            
-            let payload: [String: Any] = [
-                "isValid": isValid,
-                "fileType": fileType,
-                "duration": duration
-            ]
-            resolve(payload)
-        }
-        
+  }
+  
+  @objc(isValidFile:withResolver:withRejecter:)
+  func isValidFile(uri: String, resolve: @escaping RCTPromiseResolveBlock,reject: @escaping RCTPromiseRejectBlock) -> Void {
+    let fileURL = URL(string: uri)!
+    checkFileValidity(url: fileURL) { isValid, fileType, duration in
+      if isValid {
+        print("Valid \(fileType) file with duration: \(duration) milliseconds")
+      } else {
+        print("Invalid file")
+      }
+      
+      let payload: [String: Any] = [
+        "isValid": isValid,
+        "fileType": fileType,
+        "duration": duration
+      ]
+      resolve(payload)
     }
     
-    private func onError(message: String, code: ErrorCode) {
-        let eventPayload: [String: String] = [
-            "message": message,
-            "errorCode": code.rawValue
-        ]
-        self.emitEventToJS("onError", eventData: eventPayload)
-    }
+  }
+  
+  private func onError(message: String, code: ErrorCode) {
+    let eventPayload: [String: String] = [
+      "message": message,
+      "errorCode": code.rawValue
+    ]
+    self.emitEventToJS("onError", eventData: eventPayload)
+  }
+  
+  private func checkFileValidity(url: URL, completion: @escaping (Bool, String, Double) -> Void) {
+    let asset = AVAsset(url: url)
     
-    private func checkFileValidity(url: URL, completion: @escaping (Bool, String, Double) -> Void) {
-        let asset = AVAsset(url: url)
-        
-        // Load the duration and tracks asynchronously
-        asset.loadValuesAsynchronously(forKeys: ["duration", "tracks"]) {
-            var error: NSError? = nil
-            
-            // Check if the duration and tracks are loaded
-            let durationStatus = asset.statusOfValue(forKey: "duration", error: &error)
-            let tracksStatus = asset.statusOfValue(forKey: "tracks", error: &error)
-            
-            // Ensure both properties are loaded successfully
-            guard durationStatus == .loaded, tracksStatus == .loaded, error == nil else {
-                DispatchQueue.main.async {
-                    completion(false, "unknown", -1)
-                }
-                return
-            }
-            
-            // Check if the asset contains any video or audio tracks
-            let videoTracks = asset.tracks(withMediaType: .video)
-            let audioTracks = asset.tracks(withMediaType: .audio)
-            
-            let isValid = !videoTracks.isEmpty || !audioTracks.isEmpty
-            let fileType: String
-            if !videoTracks.isEmpty {
-                fileType = "video"
-            } else if !audioTracks.isEmpty {
-                fileType = "audio"
-            } else {
-                fileType = "unknown"
-            }
-            
-            let duration = CMTimeGetSeconds(asset.duration) * 1000
-            
-            DispatchQueue.main.async {
-                completion(isValid, fileType, isValid ? duration.rounded() : -1)
-            }
+    // Load the duration and tracks asynchronously
+    asset.loadValuesAsynchronously(forKeys: ["duration", "tracks"]) {
+      var error: NSError? = nil
+      
+      // Check if the duration and tracks are loaded
+      let durationStatus = asset.statusOfValue(forKey: "duration", error: &error)
+      let tracksStatus = asset.statusOfValue(forKey: "tracks", error: &error)
+      
+      // Ensure both properties are loaded successfully
+      guard durationStatus == .loaded, tracksStatus == .loaded, error == nil else {
+        DispatchQueue.main.async {
+          completion(false, "unknown", -1)
         }
+        return
+      }
+      
+      // Check if the asset contains any video or audio tracks
+      let videoTracks = asset.tracks(withMediaType: .video)
+      let audioTracks = asset.tracks(withMediaType: .audio)
+      
+      let isValid = !videoTracks.isEmpty || !audioTracks.isEmpty
+      let fileType: String
+      if !videoTracks.isEmpty {
+        fileType = "video"
+      } else if !audioTracks.isEmpty {
+        fileType = "audio"
+      } else {
+        fileType = "unknown"
+      }
+      
+      let duration = CMTimeGetSeconds(asset.duration) * 1000
+      
+      DispatchQueue.main.async {
+        completion(isValid, fileType, isValid ? duration.rounded() : -1)
+      }
     }
+  }
   
   private func renameFile(at url: URL, newName: String) -> URL? {
     let fileManager = FileManager.default
@@ -735,3 +734,27 @@ class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDelegate
     }
   }
 }
+
+/// Helper class to manage export session state for legacy API without capturing in closures
+private class ExportSessionManager {
+  private weak var session: AVAssetExportSession?
+  private(set) var isFinished: Bool = false
+  
+  init(session: AVAssetExportSession) {
+    self.session = session
+  }
+  
+  var progress: Float {
+    session?.progress ?? 0.0
+  }
+  
+  func markFinished() {
+    isFinished = true
+  }
+  
+  // Reintroduce error for legacy path, suppressing deprecation warning
+  @available(iOS, deprecated: 18.0, message: "Used only for iOS < 18 compatibility")
+  var error: Error? {
+    session?.error
+  }
+}