Feat/upload ios

NitroFs.podspec → NitroFS.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => min_ios_version_supported, :visionos => 1.0 }
+  s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/patrickkabwe/react-native-nitro-fs.git", :tag => "#{s.version}" }
 
   s.source_files = [

android/src/main/java/com/nitrofs/FileDownloader.kt

@@ -1,11 +1,14 @@
 package com.nitrofs
 
+import android.util.Log
+import com.margelo.nitro.nitrofs.NitroFile
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.engine.okhttp.OkHttp
 import io.ktor.client.plugins.onDownload
 import io.ktor.client.request.prepareGet
 import io.ktor.http.HttpMethod
+import io.ktor.http.isSuccess
 import io.ktor.util.cio.writeChannel
 import io.ktor.utils.io.ByteReadChannel
 import io.ktor.utils.io.copyAndClose
@@ -16,16 +19,18 @@ import java.io.File
 class FileDownloader {
     suspend fun downloadFile(
         serverUrl: String,
-        fileName: String,
         destinationPath: String,
         onProgress: ((Double, Double) -> Unit)?
-    ) {
+    ): NitroFile? {
+        var contentType = ""
         val outputFile = File(destinationPath)
         outputFile.parentFile?.mkdirs()
+
         val client = HttpClient(OkHttp)
+
 
         client.use { it
-            it.prepareGet("$serverUrl/$fileName") {
+            it.prepareGet(serverUrl) {
                 method = HttpMethod.Get
                 onDownload { totalBytesSent, contentLength ->
                     if (totalBytesSent > 0 && contentLength != null){
@@ -37,9 +42,20 @@ class FileDownloader {
                     }
                 }
             }.execute { response ->
+                Log.d("TAG", "${response.status.isSuccess()} ${response.status.value} $serverUrl")
+                if (!response.status.isSuccess()) {
+                    throw RuntimeException("HTTP ${response.status.value}: Failed to download file")
+                }
+                contentType = response.headers["Content-Type"] ?: "application/octet-stream"
                 val channel: ByteReadChannel = response.body()
                 channel.copyAndClose(outputFile.writeChannel())
             }
         }
+
+        return NitroFile(
+            name = outputFile.name,
+            path = outputFile.absolutePath,
+            mimeType = contentType
+        )
     }
 }

android/src/main/java/com/nitrofs/HybridNitroFS.kt

@@ -127,18 +127,12 @@ class HybridNitroFS: HybridNitroFSSpec() {
 
     override fun downloadFile(
         serverUrl: String,
-        fileName: String,
         destinationPath: String,
         onProgress: ((Double, Double) -> Unit)?
     ): Promise<NitroFile> {
         return Promise.async(ioScope) {
             try {
-                nitroFsImpl.downloadFile(serverUrl, fileName, destinationPath, onProgress)
-                NitroFile(
-                    name = fileName,
-                    path = destinationPath,
-                    mimeType = "",
-                )
+                nitroFsImpl.downloadFile(serverUrl, destinationPath, onProgress)
             } catch (e: Exception) {
                 Log.e("NitroFS", "Error downloading file: ${e.message}")
                 throw Error(e)

android/src/main/java/com/nitrofs/NitroFSImpl.kt

@@ -92,16 +92,19 @@ class NitroFSImpl(val context: ReactApplicationContext) {
 
     suspend fun downloadFile(
         serverUrl: String,
-        fileName: String,
         destinationPath: String,
         onProgress: ((Double, Double) -> Unit)?
-    ) {
-        fileDownloader.downloadFile(
+    ): NitroFile {
+        val file = fileDownloader.downloadFile(
             serverUrl,
-            fileName,
             destinationPath,
             onProgress
         )
+        if (file != null) {
+            return file
+        } else {
+            throw RuntimeException("Failed to download file from: $serverUrl")
+        }
     }
 
     fun getFileEncoding(encoding: NitroFileEncoding): Charset {

example/App.tsx

@@ -9,9 +9,9 @@ const uploadURL = Platform.select({
 });
 
 const downloadURL = Platform.select({
-  ios: 'http://localhost:5100/download',
-  android: 'http://10.0.2.2:5100/download',
-  default: 'http://localhost:5100/download',
+  ios: 'http://localhost:5100/download/dummyfile.txt',
+  android: 'http://10.0.2.2:5100/download/dummyfile.txt',
+  default: 'http://localhost:5100/download/dummyfile.txt',
 });
 
 const fileToUpload = Platform.select({
@@ -119,7 +119,7 @@ function App(): React.JSX.Element {
               mimeType: 'text/plain',
               path: fileToUpload,
             },
-            {url: uploadURL, method: 'POST', field: 'file'},
+            { url: uploadURL, method: 'POST', field: 'file'},
             (uploadedBytes, totalBytes) => {
               const progress = (uploadedBytes / totalBytes) * 100;
               setUploadProgress(Math.round(progress));
@@ -140,7 +140,6 @@ function App(): React.JSX.Element {
         onPress={() => {
           NitroFS.downloadFile(
             downloadURL,
-            'dummyfile.txt',
             NitroFS.DOWNLOAD_DIR + '/dummyfile.txt',
             (downloadedBytes, totalBytes) => {
               const progress = (downloadedBytes / totalBytes) * 100;

example/ios/Podfile.lock

@@ -8,7 +8,7 @@ PODS:
   - hermes-engine (0.78.0):
     - hermes-engine/Pre-built (= 0.78.0)
   - hermes-engine/Pre-built (0.78.0)
-  - NitroFS (0.2.5):
+  - NitroFS (0.4.2):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1798,7 +1798,7 @@ SPEC CHECKSUMS:
   fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
   glog: eb93e2f488219332457c3c4eafd2738ddc7e80b8
   hermes-engine: b417d2b2aee3b89b58e63e23a51e02be91dc876d
-  NitroFS: 979894cea0ce1469f6baf81d4e755e2209b05749
+  NitroFS: 1bb934dabe27fe3c8d7838cb638cc4bb9a40548c
   NitroModules: 5cc92d3b0baf1124ed8136a015924eea03db912e
   RCT-Folly: e78785aa9ba2ed998ea4151e314036f6c49e6d82
   RCTDeprecation: b2eecf2d60216df56bc5e6be5f063826d3c1ee35

ios/HybridNitroFs.swift

@@ -30,7 +30,7 @@ class HybridNitroFS: HybridNitroFSSpec {
                 try self.nitroFSImpl.writeFile(path: filepath, data: data, encoding: encoding)
             } catch {
                 os_log("Failed to write file content: \(error.localizedDescription)")
-                throw  NitroFSError.nitroFSWriteFailed(message: "Failed to wriote file content to disk")
+                throw  NitroFSError.fileError(message: "Failed to write file content to disk")
             }
         }
     }
@@ -41,7 +41,7 @@ class HybridNitroFS: HybridNitroFSSpec {
                 return try self.nitroFSImpl.readFile(path: path, encoding: encoding)
             } catch {
                 os_log("Failed to read file content: \(error.localizedDescription)")
-                throw  NitroFSError.nitroFSWriteFailed(message: "Failed to write file content to disk")
+                throw  NitroFSError.fileError(message: "Failed to write file content to disk")
             }
         }
     }
@@ -52,7 +52,7 @@ class HybridNitroFS: HybridNitroFSSpec {
                 try self.nitroFSImpl.copy(source: srcPath, destination: destPath)
             } catch {
                 os_log("Failed to copy file content: \(error.localizedDescription)")
-                throw  NitroFSError.nitroFSWriteFailed(message: "Failed to copy file file content to disk")
+                throw  NitroFSError.fileError(message: "Failed to copy file file content to disk")
             }
         }
     }
@@ -63,7 +63,7 @@ class HybridNitroFS: HybridNitroFSSpec {
                 try self.nitroFSImpl.copy(source: srcPath, destination: destPath)
             } catch {
                 os_log("Failed to copy file or directory: \(error.localizedDescription)")
-                throw  NitroFSError.nitroFSWriteFailed(message: "Failed to copy file or directory content to disk")
+                throw  NitroFSError.fileError(message: "Failed to copy file or directory content to disk")
             }
         }
     }
@@ -99,7 +99,7 @@ class HybridNitroFS: HybridNitroFSSpec {
             } catch {
                 os_log("Failed to get stat: \(error.localizedDescription)")
 
-                throw NitroFSError.nitroFSInvalidEncoding(message: "Failed to get stat: \(error.localizedDescription)")
+                throw NitroFSError.encodingError(message: "Failed to get stat: \(error.localizedDescription)")
             }
         }
     }
@@ -123,12 +123,11 @@ class HybridNitroFS: HybridNitroFSSpec {
         }
     }
 
-    func downloadFile(serverUrl: String, fileName: String, destinationPath: String, onProgress: ((Double, Double) -> Void)?) throws -> NitroModules.Promise<NitroFile> {
+    func downloadFile(serverUrl: String, destinationPath: String, onProgress: ((Double, Double) -> Void)?) throws -> NitroModules.Promise<NitroFile> {
         return .async { [unowned self] in
             do {
                 return try await self.nitroFSImpl.downloadFile(
                     serverUrl: serverUrl,
-                    fileName: fileName,
                     destinationPath: destinationPath,
                     onProgress: onProgress
                 )

ios/NitroFSFileDownloader.swift

@@ -8,8 +8,6 @@
 import Foundation
 
 final class NitroFSFileDownloader: NSObject {
-    // MARK: - Properties
-
     private weak var fileManager: FileManager?
     private var downloadTask: URLSessionDownloadTask?
     private var onProgress: ((Double, Double) -> Void)?
@@ -20,23 +18,20 @@ final class NitroFSFileDownloader: NSObject {
         self.fileManager = fileManager
         super.init()
     }
-
-    // MARK: - Public Methods
-
+
     func downloadFile(
         _ serverUrl: String,
-        _ fileName: String,
         _ destinationPath: String,
         onProgress: ((Double, Double) -> Void)? = nil
     ) async throws -> NitroFile {
         guard fileManager != nil else {
-            throw NitroFSError.nitroFSUnavailable(message: "FileManager is not available")
+            throw NitroFSError.unavailable(message: "FileManager is not available")
         }
 
         self.onProgress = onProgress
         self.destinationPath = destinationPath
 
-        let request = try makeRequest(serverUrl: serverUrl, fileName: fileName)
+        let request = try makeRequest(serverUrl: serverUrl)
 
         let session: URLSession = {
             let config = URLSessionConfiguration.default
@@ -58,9 +53,9 @@ final class NitroFSFileDownloader: NSObject {
 
     // MARK: - Private Methods
 
-    private func makeRequest(serverUrl: String, fileName: String) throws -> URLRequest {
-        guard let encodedFilename = fileName.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed),
-              let url = URL(string: "\(serverUrl)/\(encodedFilename)") else {
+    private func makeRequest(serverUrl: String) throws -> URLRequest {
+        guard let encoded = serverUrl.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed),
+              let url = URL(string: encoded) else {
             throw URLError(.badURL)
         }
 
@@ -76,19 +71,19 @@ final class NitroFSFileDownloader: NSObject {
         downloadTask: URLSessionDownloadTask
     ) throws -> NitroFile {
         guard let fileManager else {
-            throw NitroFSError.nitroFSUnavailable(message: "FileManager is not available")
+            throw NitroFSError.unavailable(message: "FileManager is not available")
         }
 
         guard let response = response as? HTTPURLResponse else {
-            throw NitroFSError.nitroFSDownloadFailed(message: "Invalid response type")
+            throw NitroFSError.networkError(message: "Invalid response type")
         }
 
         guard (200...299).contains(response.statusCode) else {
-            throw NitroFSError.nitroFSDownloadFailed(message: "HTTP Error: \(response.statusCode)")
+            throw NitroFSError.networkError(message: "HTTP Error: \(response.statusCode)")
         }
 
         guard let destinationPath = self.destinationPath else {
-            throw NitroFSError.nitroFSDownloadFailed(message: "Destination path not set")
+            throw NitroFSError.networkError(message: "Destination path not set")
         }
 
         let destinationURL = URL(fileURLWithPath: destinationPath)