fix: iOS threading issues

ian-wd · ian-wd · commit a1e18b35ef5d · 2025-06-17T13:33:12.000+08:00
diff --git a/android/src/main/java/com/margelo/nitro/fs2/Fs2.kt b/android/src/main/java/com/margelo/nitro/fs2/Fs2.kt
@@ -397,7 +397,7 @@ class Fs2() : HybridFs2Spec() {
                 )
             )
 
-            downloadPromise.reject(throw reject(options.toFile, e)) // Also rethrow for the promise rejection
+            downloadPromise.reject(reject(options.toFile, e)) // Also rethrow for the promise rejection
         }
 
         return downloadPromise
diff --git a/android/src/main/java/com/margelo/nitro/fs2/MediaStore.kt b/android/src/main/java/com/margelo/nitro/fs2/MediaStore.kt
@@ -1,12 +1,10 @@
 package com.margelo.nitro.fs2
 
-import com.margelo.nitro.NitroModules
 import com.margelo.nitro.core.Promise
 import androidx.core.net.toUri
 
 class MediaStore(): HybridMediaStoreSpec() {
-    private val reactContext = NitroModules.applicationContext!!
-    private val mediaStoreManager = RNFSMediaStoreManager(reactContext)
+    private val mediaStoreManager = RNFSMediaStoreManager()
 
     private fun reject(context: String, ex: Exception): Throwable {
         // You can expand this for more specific error types as needed
@@ -77,16 +75,22 @@ class MediaStore(): HybridMediaStoreSpec() {
     }
 
     override fun mediaStoreQueryFile(searchOptions: MediaStoreSearchOptions): Promise<MediaStoreFile?> {
-        return Promise.async {
-            try {
-                val file = mediaStoreManager.query(searchOptions)
-                println("MediaStore query result: $file")
+        val queryPromise:Promise<MediaStoreFile?> = Promise()
 
-                return@async file
-            } catch (e: Exception) {
-                throw reject(searchOptions.fileName ?: "query", e)
+        try {
+            val file = mediaStoreManager.query(searchOptions)
+
+            if (file != null) {
+                queryPromise.resolve(file)
+            } else {
+                println("File not found: ${searchOptions.fileName}")
+                queryPromise.reject(Error("File not found: ${searchOptions.fileName}"))
             }
+        } catch (e: Exception) {
+            throw reject(searchOptions.fileName ?: "query", e)
         }
+
+        return queryPromise
     }
 
     override fun mediaStoreDeleteFile(uri: String): Promise<Boolean> {
diff --git a/android/src/main/java/com/margelo/nitro/fs2/RNFSMediaStoreManager.kt b/android/src/main/java/com/margelo/nitro/fs2/RNFSMediaStoreManager.kt
@@ -17,8 +17,14 @@ import java.io.FileOutputStream
 import java.io.IOException
 import java.io.OutputStream
 
-class RNFSMediaStoreManager(private val context: Context) {
+import com.margelo.nitro.NitroModules
+
+class RNFSMediaStoreManager {
+    private val context = NitroModules.applicationContext
+        ?: throw IllegalStateException("NitroModules.applicationContext is null")
+
     companion object {
+        private const val BUFFER_SIZE = 10240
         private fun getMediaUri(mt: MediaCollectionType): Uri? {
             return when (mt) {
                 MediaCollectionType.AUDIO ->
@@ -111,35 +117,32 @@ class RNFSMediaStoreManager(private val context: Context) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q)
             throw UnsupportedOperationException("Android version not supported")
         val resolver = context.contentResolver
-        var stream: OutputStream? = null
         try {
             val src = File(filePath)
             if (!src.exists()) throw IOException("No such file ('$filePath')")
             val descr =
                 resolver.openFileDescriptor(fileUri, "w")
                     ?: throw IOException("Failed to open file descriptor")
+
             FileInputStream(src).use { fin ->
                 FileOutputStream(descr.fileDescriptor).use { out ->
                     if (transformFile) {
                         val bytes = fin.readBytes()
                         // Implement transformation logic if needed
                         out.write(bytes) // No transformation in this version
                     } else {
-                        val buf = ByteArray(1024 * 10)
+                        val buf = ByteArray(BUFFER_SIZE)
                         var read: Int
                         while (fin.read(buf).also { read = it } > 0) {
                             out.write(buf, 0, read)
                         }
                     }
                 }
             }
-            stream = resolver.openOutputStream(fileUri)
-            stream?.close()
+            
             return true
         } catch (e: Exception) {
             throw IOException("Failed to write file: ${e.message}", e)
-        } finally {
-            stream?.close()
         }
     }
 
@@ -192,10 +195,16 @@ class RNFSMediaStoreManager(private val context: Context) {
             val queryFilename: String = query.fileName ?: ""
             val queryRelativePath: String = query.relativePath ?: ""
 
+            val mediaCollectionType = try {
+                MediaCollectionType.valueOf(queryMediaType)
+            } catch (e: IllegalArgumentException) {
+                Log.e("RNFS2", "Invalid media type provided: $queryMediaType")
+                return null
+            }
 
             val mediaURI =
                 if (queryUri.isNotEmpty()) queryUri.toUri()
-                else getMediaUri(MediaCollectionType.valueOf(queryMediaType))
+                else getMediaUri(mediaCollectionType)
             val projection =
                 arrayOf(
                     MediaStore.MediaColumns._ID,
@@ -209,7 +218,7 @@ class RNFSMediaStoreManager(private val context: Context) {
             val selection: String?
             val selectionArgs: Array<String>?
             if (queryUri.isEmpty()) {
-                val relativePath = getRelativePath(MediaCollectionType.valueOf(queryMediaType))
+                val relativePath = getRelativePath(mediaCollectionType)
                 selection =
                     MediaStore.MediaColumns.DISPLAY_NAME +
                             " = ? AND " +
diff --git a/example/src/example4.tsx b/example/src/example4.tsx
@@ -13,7 +13,10 @@ import { getTestFolder, getFolderText } from './utils';
 
 const EXAMPLE_FOLDER = 'RNFS2Example4Folder';
 const FILE_NAME = 'picsum.jpg';
-const FILE_URL = 'https://picsum.photos/200';
+const FILE_URL = 'https://picsum.photos/seed/picsum/200/300';
+
+const FILE_NAME2 = 'picsum2.jpg';
+const FILE_URL2 = 'https://picsum.photos/id/237/200/300';
 
 const Example = () => {
   const [runningAction, setRunningAction] = useState(false);
@@ -36,6 +39,7 @@ const Example = () => {
 
       // Download file
       const filePath = `${folder}/${EXAMPLE_FOLDER}/${FILE_NAME}`;
+      const filePath2 = `${folder}/${EXAMPLE_FOLDER}/${FILE_NAME2}`;
       runStatus += `\n- Downloading file from ${FILE_URL}`;
       setResult(runStatus);
 
@@ -76,6 +80,27 @@ const Example = () => {
           console.log('downloadFile canBeResumed', event);
         },
       });
+
+      RNFS.downloadFile({
+        fromUrl: FILE_URL2,
+        toFile: filePath2,
+        jobId,
+        begin: (event) => {
+          console.log('downloadFile begin', event);
+        },
+        progress: (event) => {
+          console.log('downloadFile progress', event);
+        },
+        complete: async (event) => {
+          console.log('downloadFile complete', event);
+        },
+        error: (event) => {
+          console.log('downloadFile error', event);
+        },
+        canBeResumed: (event) => {
+          console.log('downloadFile canBeResumed', event);
+        },
+      });
     } catch (err) {
       setResult('Error Running Example: ' + err);
     } finally {
diff --git a/ios/Downloader.swift b/ios/Downloader.swift
@@ -8,6 +8,7 @@ protocol DownloaderDelegate: AnyObject {
   func downloadDidComplete(jobId: Int, statusCode: Int, bytesWritten: Int64)
   func downloadDidError(jobId: Int, error: Error)
   func downloadCanBeResumed(jobId: Int)
+  func downloadCleanup(jobId: Int)
 }
 
 class Downloader: NSObject, URLSessionDownloadDelegate {
@@ -30,6 +31,7 @@ class Downloader: NSObject, URLSessionDownloadDelegate {
   // MARK: - Public API
 
   func startDownload(from url: URL, to destination: String, headers: [String: String]?, options: DownloadFileOptions?) {
+    
     if FileManager.default.fileExists(atPath: destination) {
       do {
         let fileHandle = try FileHandle(forWritingTo: URL(fileURLWithPath: destination))
@@ -191,6 +193,7 @@ class Downloader: NSObject, URLSessionDownloadDelegate {
     defer {
       self.session?.finishTasksAndInvalidate()
       self.clearState()
+      delegate?.downloadCleanup(jobId: jobId)
     }
 
     // Move file to destination
@@ -218,6 +221,7 @@ class Downloader: NSObject, URLSessionDownloadDelegate {
     defer {
       self.session?.finishTasksAndInvalidate()
       self.clearState()
+      delegate?.downloadCleanup(jobId: jobId)
     }
 
     if let error = error as NSError? {
diff --git a/ios/Fs2.swift b/ios/Fs2.swift

Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ class Fs2() : HybridFs2Spec() {`
`397`	`397`	`)`
`398`	`398`	`)`
`399`	`399`
`400`		`- downloadPromise.reject(throw reject(options.toFile, e)) // Also rethrow for the promise rejection`
	`400`	`+ downloadPromise.reject(reject(options.toFile, e)) // Also rethrow for the promise rejection`
`401`	`401`	`}`
`402`	`402`
`403`	`403`	`return downloadPromise`