expo-file-system 16.0.5 → 16.0.7

package/CHANGELOG.md

@@ -10,6 +10,19 @@
 
 ### 💡 Others
 
+## 16.0.7 — 2024-02-27
+
+### 🐛 Bug fixes
+
+- [iOS] Fix downloadAsync for local files. ([#27187](https://github.com/expo/expo/pull/27187) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+- On `iOS`, fix an issue with `copyAsync` where the copy fails if it is a photo library asset. ([#27208](https://github.com/expo/expo/pull/27208) by [@alanjhughes](https://github.com/alanjhughes))
+
+## 16.0.6 — 2024-02-06
+
+### 🐛 Bug fixes
+
+- On `iOS`, fix upload task requests. ([#26880](https://github.com/expo/expo/pull/26880) by [@alanjhughes](https://github.com/alanjhughes))
+
 ## 16.0.5 — 2024-01-23
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '16.0.5'
+version = '16.0.7'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 if (expoModulesCorePlugin.exists()) {
@@ -94,7 +94,7 @@ android {
   namespace "expo.modules.filesystem"
   defaultConfig {
     versionCode 30
-    versionName "16.0.5"
+    versionName "16.0.7"
   }
 }
 

package/ios/FileSystemExceptions.swift

@@ -8,6 +8,12 @@ final class FileNotExistsException: GenericException<String> {
   }
 }
 
+final class FileAlreadyExistsException: GenericException<String> {
+  override var reason: String {
+    "File '\(param)' already exists"
+  }
+}
+
 final class DirectoryNotExistsException: GenericException<String> {
   override var reason: String {
     "Directory '\(param)' does not exist"
@@ -67,3 +73,27 @@ final class CannotDetermineDiskCapacity: Exception {
     "Unable to determine free disk storage capacity"
   }
 }
+
+final class FailedToCreateBodyException: Exception {
+  override var reason: String {
+    "Unable to create multipart body"
+  }
+}
+
+final class FailedToAccessDirectoryException: Exception {
+  override var reason: String {
+    "Failed to access `Caches` directory"
+  }
+}
+
+final class FailedToCopyAssetException: GenericException<String> {
+  override var reason: String {
+    "Failed to copy photo library asset: \(param)"
+  }
+}
+
+final class FailedToFindAssetException: GenericException<String> {
+  override var reason: String {
+    "Failed to find photo library asset: \(param)"
+  }
+}

package/ios/FileSystemHelpers.swift

@@ -1,6 +1,9 @@
 // Copyright 2023-present 650 Industries. All rights reserved.
 
 import ExpoModulesCore
+import Photos
+
+private let assetIdentifier = "ph://"
 
 internal func ensureFileDirectoryExists(_ fileUrl: URL) throws {
   let directoryPath = fileUrl.deletingLastPathComponent()
@@ -64,3 +67,42 @@ internal func ensurePathPermission(_ appContext: AppContext?, path: String, flag
     throw flag == .read ? FileNotReadableException(path) : FileNotWritableException(path)
   }
 }
+
+internal func isPHAsset(path: String) -> Bool {
+  return path.contains(assetIdentifier)
+}
+
+internal func copyPHAsset(fromUrl: URL, toUrl: URL, with resourceManager: PHAssetResourceManager, promise: Promise) {
+  if isPhotoLibraryStatusAuthorized() {
+    if FileManager.default.fileExists(atPath: toUrl.path) {
+      promise.reject(FileAlreadyExistsException(toUrl.path))
+      return
+    }
+
+    let identifier = fromUrl.absoluteString.replacingOccurrences(of: assetIdentifier, with: "")
+
+    guard let asset = PHAsset.fetchAssets(withLocalIdentifiers: [identifier], options: nil).firstObject else {
+      promise.reject(FailedToFindAssetException(fromUrl.absoluteString))
+      return
+    }
+
+    let firstResource = PHAssetResource.assetResources(for: asset).first
+    if let firstResource {
+      resourceManager.writeData(for: firstResource, toFile: toUrl, options: nil) { error in
+        if let error {
+          promise.reject(FailedToCopyAssetException(fromUrl.absoluteString))
+        }
+      }
+    } else {
+      promise.reject(FailedToCopyAssetException(fromUrl.absoluteString))
+    }
+  }
+}
+
+internal func isPhotoLibraryStatusAuthorized() -> Bool {
+  if #available(iOS 14, tvOS 14, *) {
+    let status = PHPhotoLibrary.authorizationStatus(for: .readWrite)
+    return status == .authorized || status == .limited
+  }
+  return PHPhotoLibrary.authorizationStatus() == .authorized
+}

package/ios/FileSystemModule.swift

@@ -1,6 +1,7 @@
 // Copyright 2023-present 650 Industries. All rights reserved.
 
 import ExpoModulesCore
+import Photos
 
 private let EVENT_DOWNLOAD_PROGRESS = "expo-file-system.downloadProgress"
 private let EVENT_UPLOAD_PROGRESS = "expo-file-system.uploadProgress"
@@ -8,6 +9,7 @@ private let EVENT_UPLOAD_PROGRESS = "expo-file-system.uploadProgress"
 public final class FileSystemModule: Module {
   private lazy var sessionTaskDispatcher = EXSessionTaskDispatcher(sessionHandler: ExpoAppDelegate.getSubscriberOfType(FileSystemBackgroundSessionHandler.self))
   private lazy var taskHandlersManager = EXTaskHandlersManager()
+  private lazy var resourceManager = PHAssetResourceManager()
 
   private lazy var backgroundSession = createUrlSession(type: .background, delegate: sessionTaskDispatcher)
   private lazy var foregroundSession = createUrlSession(type: .foreground, delegate: sessionTaskDispatcher)
@@ -100,6 +102,11 @@ public final class FileSystemModule: Module {
     AsyncFunction("copyAsync") { (options: RelocatingOptions, promise: Promise) in
       let (fromUrl, toUrl) = try options.asTuple()
 
+      if isPHAsset(path: fromUrl.absoluteString) {
+        copyPHAsset(fromUrl: fromUrl, toUrl: toUrl, with: resourceManager, promise: promise)
+        return
+      }
+
       try ensurePathPermission(appContext, path: fromUrl.path, flag: .read)
       try ensurePathPermission(appContext, path: toUrl.path, flag: .write)
 
@@ -134,6 +141,11 @@ public final class FileSystemModule: Module {
       try ensureFileDirectoryExists(localUrl)
       try ensurePathPermission(appContext, path: localUrl.path, flag: .write)
 
+      if sourceUrl.isFileURL {
+        try ensurePathPermission(appContext, path: sourceUrl.path, flag: .read)
+        EXFileSystemLocalFileHandler.copy(from: sourceUrl, to: localUrl, resolver: promise.resolver, rejecter: promise.legacyRejecter)
+        return
+      }
       let session = options.sessionType == .background ? backgroundSession : foregroundSession
       let request = createUrlRequest(url: sourceUrl, headers: options.headers)
       let downloadTask = session.downloadTask(with: request)
@@ -156,7 +168,7 @@ public final class FileSystemModule: Module {
         throw FileNotExistsException(localUrl.path)
       }
       let session = options.sessionType == .background ? backgroundSession : foregroundSession
-      let task = createUploadTask(session: session, targetUrl: targetUrl, sourceUrl: localUrl, options: options)
+      let task = try createUploadTask(session: session, targetUrl: targetUrl, sourceUrl: localUrl, options: options)
       let taskDelegate = EXSessionUploadTaskDelegate(resolve: promise.resolver, reject: promise.legacyRejecter)
 
       sessionTaskDispatcher.register(taskDelegate, for: task)
@@ -165,7 +177,7 @@ public final class FileSystemModule: Module {
 
     AsyncFunction("uploadTaskStartAsync") { (targetUrl: URL, localUrl: URL, uuid: String, options: UploadOptions, promise: Promise) in
       let session = options.sessionType == .background ? backgroundSession : foregroundSession
-      let task = createUploadTask(session: session, targetUrl: targetUrl, sourceUrl: localUrl, options: options)
+      let task = try createUploadTask(session: session, targetUrl: targetUrl, sourceUrl: localUrl, options: options)
       let onSend: EXUploadDelegateOnSendCallback = { [weak self] _, _, totalBytesSent, totalBytesExpectedToSend in
         self?.sendEvent(EVENT_UPLOAD_PROGRESS, [
           "uuid": uuid,

package/ios/NetworkingHelpers.swift

@@ -30,7 +30,7 @@ func createUrlRequest(url: URL, headers: [String: String]?) -> URLRequest {
   return request
 }
 
-func createUploadTask(session: URLSession, targetUrl: URL, sourceUrl: URL, options: UploadOptions) -> URLSessionUploadTask {
+func createUploadTask(session: URLSession, targetUrl: URL, sourceUrl: URL, options: UploadOptions) throws -> URLSessionUploadTask {
   var request = createUrlRequest(url: targetUrl, headers: options.headers)
   request.httpMethod = options.httpMethod.rawValue
 
@@ -39,47 +39,60 @@ func createUploadTask(session: URLSession, targetUrl: URL, sourceUrl: URL, optio
     return session.uploadTask(with: request, fromFile: sourceUrl)
   case .multipart:
     let boundaryString = UUID().uuidString
-    let data = try? createMultipartBody(boundary: boundaryString, sourceUrl: sourceUrl, options: options)
+    guard let data = createMultipartBody(boundary: boundaryString, sourceUrl: sourceUrl, options: options) else {
+      throw FailedToCreateBodyException()
+    }
 
     request.setValue("multipart/form-data; boundary=\(boundaryString)", forHTTPHeaderField: "Content-Type")
-    request.httpBody = data
 
-    return session.uploadTask(withStreamedRequest: request)
+    let localURL = try createLocalUrl(from: sourceUrl)
+    try? data.write(to: localURL)
+
+    return session.uploadTask(with: request, fromFile: localURL)
+  }
+}
+
+func createLocalUrl(from sourceUrl: URL) throws -> URL {
+  guard let cachesDir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first else {
+    throw FailedToAccessDirectoryException()
   }
+  let tempDir = cachesDir.appendingPathComponent("uploads")
+  FileSystemUtilities.ensureDirExists(at: tempDir)
+  return tempDir.appendingPathComponent(sourceUrl.lastPathComponent)
 }
 
-func createMultipartBody(boundary: String, sourceUrl: URL, options: UploadOptions) throws -> Data {
-  let fileName = options.fieldName ?? sourceUrl.lastPathComponent
-  let fileContents = try String(contentsOf: sourceUrl)
-  let mimeType = options.mimeType ?? findMimeType(forAttachment: sourceUrl)
+func createMultipartBody(boundary: String, sourceUrl: URL, options: UploadOptions) -> Data? {
+  let fieldName = options.fieldName ?? sourceUrl.lastPathComponent
+  var mimeType = options.mimeType ?? findMimeType(forAttachment: sourceUrl)
+  guard let data = try? Data(contentsOf: sourceUrl) else {
+    return nil
+  }
 
-  let body = """
-\(headersForMultipartParams(options.parameters, boundary: boundary))
---\(boundary)
-Content-Disposition: form-data; name="\(fileName)"; filename="\(sourceUrl.lastPathComponent)"
-Content-Type: \(mimeType)
+  var body = Data()
+  headersForMultipartParams(options.parameters, boundary: boundary, body: &body)
 
-\(fileContents)
---\(boundary)--
-"""
+  body.append("--\(boundary)\r\n".data)
+  body.append("Content-Disposition: form-data; name=\"\(fieldName)\"; filename=\"\(sourceUrl.lastPathComponent)\"\r\n".data)
+  body.append("Content-Type: \(mimeType)\r\n\r\n".data)
+  body.append(data)
+  body.append("\r\n".data)
+  body.append("--\(boundary)--\r\n".data)
 
-  guard let bodyData = body.data(using: .utf8) else {
-    throw HeaderEncodingFailedException(sourceUrl.absoluteString)
-  }
-  return bodyData
+  return body
 }
 
-func headersForMultipartParams(_ params: [String: String]?, boundary: String) -> String {
-  guard let params else {
-    return ""
+func headersForMultipartParams(_ params: [String: String]?, boundary: String, body: inout Data) {
+  if let params {
+    for (key, value) in params {
+      body.append("--\(boundary)\r\n".data)
+      body.append("Content-Disposition: form-data; name=\"\(key)\"\r\n\r\n".data)
+      body.append("\(value)\r\n".data)
+    }
   }
-  return params.map { (key: String, value: String) in
-"""
---\(boundary)
-Content-Disposition: form-data; name="\(key)"
+}
 
-\(value)
-"""
-  }
-  .joined()
+// All swift strings are unicode correct.
+// This avoids the optional created by string.data(using: .utf8)
+private extension String {
+  var data: Data { Data(self.utf8) }
 }

package/ios/Tests/EXFileSystemSpec.swift

@@ -20,7 +20,7 @@ class EXFileSystemSpec: ExpoSpec {
       it("should handle UTF-8 characters") {
         let utf8UriInput = "file:///var/mobile/中文"
         let utf8UriExpectedOutput = "file:///var/mobile/%E4%B8%AD%E6%96%87"
-        let utf8Uri = fileSystem.percentEncodedURL(fromURIString:utf8UriInput)
+        let utf8Uri = fileSystem.percentEncodedURL(fromURIString: utf8UriInput)
 
         expect(utf8Uri?.absoluteString) == utf8UriExpectedOutput
         expect(utf8Uri?.scheme) == "file"
@@ -29,7 +29,7 @@ class EXFileSystemSpec: ExpoSpec {
       it("should handle URI with percent, numbers and UTF-8 characters") {
         let input = "file:///document/directory/%40%2F中文"
         let expectedOutput = "file:///document/directory/%40%2F%E4%B8%AD%E6%96%87"
-        let uri = fileSystem.percentEncodedURL(fromURIString:input)
+        let uri = fileSystem.percentEncodedURL(fromURIString: input)
 
         expect(uri?.absoluteString) == expectedOutput
       }
@@ -37,7 +37,7 @@ class EXFileSystemSpec: ExpoSpec {
       it("should not decode percentages in URI") {
         let input = "file:///document/hello%2Fworld.txt"
         let unexpectedOutput = "file:///document/hello/world.txt"
-        let uri = fileSystem.percentEncodedURL(fromURIString:input)
+        let uri = fileSystem.percentEncodedURL(fromURIString: input)
 
         // Should not create a directory named "hello"
         expect(uri?.absoluteString) != unexpectedOutput
@@ -45,7 +45,7 @@ class EXFileSystemSpec: ExpoSpec {
 
       it("should handle assets-library URIs") {
         let assetsLibraryUriInput = "assets-library://asset/asset.JPG?id=3C1D9C54-9521-488F-BB27-AA1EA0F8AF04/L0/001&ext=JPG"
-        let assetsLibraryUri = fileSystem.percentEncodedURL(fromURIString:assetsLibraryUriInput)
+        let assetsLibraryUri = fileSystem.percentEncodedURL(fromURIString: assetsLibraryUriInput)
 
         expect(assetsLibraryUri?.absoluteString) == assetsLibraryUriInput
         expect(assetsLibraryUri?.scheme) == "assets-library"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-file-system",
-  "version": "16.0.5",
+  "version": "16.0.7",
   "description": "Provides access to the local file system on the device.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -41,5 +41,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "7fb94e3c0598d0e2d428184b16eec5ec67d80388"
+  "gitHead": "e94e2aac39cbb7f8788869cd6798bbdeadc58f42"
 }