expo-updates 29.0.6 → 29.0.7

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 29.0.7 — 2025-08-31
+
+### 💡 Others
+
+- [iOS] Migrate multipart parsers to Swift. ([#39144](https://github.com/expo/expo/pull/39144) by [@alanjhughes](https://github.com/alanjhughes))
+
 ## 29.0.6 — 2025-08-28
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -42,7 +42,7 @@ expoModule {
 }
 
 group = 'host.exp.exponent'
-version = '29.0.6'
+version = '29.0.7'
 
 // Utility method to derive boolean values from the environment or from Java properties,
 // and return them as strings to be used in BuildConfig fields
@@ -88,7 +88,7 @@ android {
   namespace "expo.modules.updates"
   defaultConfig {
     versionCode 31
-    versionName '29.0.6'
+    versionName '29.0.7'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

package/ios/EXUpdates/AppLoader/FileDownloader.swift

@@ -373,10 +373,11 @@ public final class FileDownloader {
     let contentType = httpResponse.value(forHTTPHeaderField: "content-type") ?? ""
 
     if contentType.lowercased().hasPrefix("multipart/") {
-      guard let contentTypeParameters = EXUpdatesParameterParser().parseParameterString(
-        contentType,
-        withDelimiter: FileDownloader.ParameterParserSemicolonDelimiter
-      ) as? [String: Any],
+      guard let scalar = UnicodeScalar(FileDownloader.ParameterParserSemicolonDelimiter) else {
+        return
+      }
+      let contentTypeParameters = UpdatesParameterParser().parseParameterString(contentType, withDelimiter: Character(scalar))
+      guard
         let boundaryParameterValue: String = contentTypeParameters.optionalValue(forKey: "boundary") else {
         let cause = UpdatesError.fileDownloaderMissingMultipartBoundary
         logger.error(cause: cause, code: UpdatesErrorCode.unknown)
@@ -425,7 +426,7 @@ public final class FileDownloader {
     successBlock: @escaping RemoteUpdateDownloadSuccessBlock,
     errorBlock: @escaping RemoteUpdateDownloadErrorBlock
   ) {
-    let reader = EXUpdatesMultipartStreamReader(inputStream: InputStream(data: data), boundary: boundary)
+    let reader = UpdatesMultipartStreamReader(inputStream: InputStream(data: data), boundary: boundary)
 
     var manifestPartHeadersAndData: ([String: Any], Data)?
     var extensionsData: Data?
@@ -433,19 +434,23 @@ public final class FileDownloader {
     var directivePartHeadersAndData: ([String: Any], Data)?
 
     let completed = data.isEmpty || reader.readAllParts { headers, content, _ in
-      if let contentDisposition = (headers as! [String: Any]).stringValueForCaseInsensitiveKey("content-disposition") {
-        if let contentDispositionParameters = EXUpdatesParameterParser().parseParameterString(
-          contentDisposition,
-          withDelimiter: FileDownloader.ParameterParserSemicolonDelimiter
-        ) as? [String: Any],
+      guard let headers else {
+        return
+      }
+      if let contentDisposition = headers.stringValueForCaseInsensitiveKey("content-disposition") {
+        guard let scalar = UnicodeScalar(FileDownloader.ParameterParserSemicolonDelimiter) else {
+          return
+        }
+        let contentDispositionParameters = UpdatesParameterParser().parseParameterString(contentDisposition, withDelimiter: Character(scalar))
+        if
           let contentDispositionNameFieldValue: String = contentDispositionParameters.optionalValue(forKey: "name") {
           switch contentDispositionNameFieldValue {
           case FileDownloader.MultipartManifestPartName:
-            if let headers = headers as? [String: Any], let content = content {
+            if let content {
               manifestPartHeadersAndData = (headers, content)
             }
           case FileDownloader.MultipartDirectivePartName:
-            if let headers = headers as? [String: Any], let content = content {
+            if let content {
               directivePartHeadersAndData = (headers, content)
             }
           case FileDownloader.MultipartExtensionsPartName:

package/ios/EXUpdates/Multipart/UpdatesMultipartStreamReader.swift

@@ -0,0 +1,169 @@
+//  Copyright © 2019 650 Industries. All rights reserved.
+
+import Foundation
+
+public typealias MultipartCallback = (_ headers: [String: Any]?, _ content: Data?, _ done: Bool) -> Void
+
+/**
+ * Fork of React Native's RCTMultipartStreamReader that doesn't necessarily
+ * expect a preamble (first boundary is not necessarily preceded by CRLF).
+ */
+public final class UpdatesMultipartStreamReader {
+  private enum Constants {
+    static let crlf = "\r\n"
+    static let bufferLength = 4 * 1024
+  }
+
+  private let stream: InputStream
+  private let boundary: String
+
+  public init(inputStream: InputStream, boundary: String) {
+    self.stream = inputStream
+    self.boundary = boundary
+  }
+
+  public func readAllParts(withCompletionCallback callback: @escaping MultipartCallback) -> Bool {
+    var chunkStart = 0
+    var bytesSeen = 0
+
+    // First delimiter doesn't necessarily need to be preceded by CRLF (boundary can be first thing in body)
+    let firstDelimiter = Data("--\(boundary)\(Constants.crlf)".utf8)
+    let restDelimiter = Data("\(Constants.crlf)--\(boundary)\(Constants.crlf)".utf8)
+    let closeDelimiter = Data("\(Constants.crlf)--\(boundary)--\(Constants.crlf)".utf8)
+
+    var delimiter = firstDelimiter
+    var content = Data()
+    var currentHeaders: [String: Any]?
+
+    var buffer = [UInt8](repeating: 0, count: Constants.bufferLength)
+
+    stream.open()
+    defer { stream.close() }
+
+    while true {
+      var isCloseDelimiter = false
+
+      // Search only a subset of chunk that we haven't seen before + few bytes
+      // to allow for the edge case when the delimiter is cut by read call
+      let searchStart = max(bytesSeen - closeDelimiter.count, chunkStart)
+      let remainingBufferRange = NSRange(location: searchStart, length: content.count - searchStart)
+
+      // Check for delimiters
+      var range = content.range(of: delimiter, options: [], in: remainingBufferRange)
+      if range.location == NSNotFound {
+        isCloseDelimiter = true
+        range = content.range(of: closeDelimiter, options: [], in: remainingBufferRange)
+      }
+
+      if range.location == NSNotFound {
+        if currentHeaders == nil {
+          if let newHeaders = parseHeadersIfFound(in: content, range: remainingBufferRange, chunkStart: chunkStart) {
+            currentHeaders = newHeaders
+          }
+        }
+
+        bytesSeen = content.count
+        let bytesRead = buffer.withUnsafeMutableBytes { bytes in
+          guard let baseAddress = bytes.bindMemory(to: UInt8.self).baseAddress else {
+            return 0
+          }
+          return stream.read(baseAddress, maxLength: Constants.bufferLength)
+        }
+        guard bytesRead > 0, stream.streamError == nil else {
+          return false
+        }
+        content.append(contentsOf: buffer.prefix(bytesRead))
+        continue
+      }
+
+      let chunkEnd = range.location
+      let length = chunkEnd - chunkStart
+      bytesSeen = chunkEnd
+
+      // Ignore preamble
+      if chunkStart > 0 {
+        let startIndex = content.index(content.startIndex, offsetBy: chunkStart)
+        let endIndex = content.index(startIndex, offsetBy: length)
+        let chunk = Data(content[startIndex..<endIndex])
+        emitChunk(chunk, headers: currentHeaders, callback: callback, done: isCloseDelimiter)
+        currentHeaders = nil
+      }
+
+      if isCloseDelimiter {
+        return true
+      }
+
+      chunkStart = chunkEnd + delimiter.count
+
+      if delimiter == firstDelimiter {
+        delimiter = restDelimiter
+      }
+    }
+  }
+
+  private func parseHeadersIfFound(
+    in content: Data,
+    range: NSRange,
+    chunkStart: Int
+  ) -> [String: Any]? {
+    let marker = Data("\(Constants.crlf)\(Constants.crlf)".utf8)
+    let range = content.range(of: marker, options: [], in: range)
+    guard range.location != NSNotFound else {
+      return nil
+    }
+
+    let startIndex = content.index(content.startIndex, offsetBy: chunkStart)
+    let endIndex = content.index(content.startIndex, offsetBy: range.location)
+    let data = content[startIndex..<endIndex]
+    return parseHeaders(Data(data))
+  }
+
+  private func parseHeaders(_ data: Data) -> [String: Any] {
+    guard let text = String(data: data, encoding: .utf8) else {
+      return [:]
+    }
+
+    return text.components(separatedBy: Constants.crlf)
+      .compactMap { line -> (String, String)? in
+        guard let colonRange = line.range(of: ":") else {
+          return nil
+        }
+        let key = String(line[..<colonRange.lowerBound])
+        let value = String(line[colonRange.upperBound...])
+          .trimmingCharacters(in: .whitespacesAndNewlines)
+        return (key, value)
+      }
+      .reduce(into: [String: Any]()) { headers, valueTuple in
+        headers[valueTuple.0] = valueTuple.1
+      }
+  }
+
+  private func emitChunk(
+    _ data: Data,
+    headers: [String: Any]?,
+    callback: @escaping MultipartCallback,
+    done: Bool
+  ) {
+    let marker = Data("\(Constants.crlf)\(Constants.crlf)".utf8)
+    guard let range = data.range(of: marker) else {
+      callback(nil, data, done)
+      return
+    }
+
+    let bodyData = data.subdata(in: range.upperBound..<data.endIndex)
+
+    if let headers {
+      callback(headers, bodyData, done)
+      return
+    }
+
+    let headersData = data.subdata(in: data.startIndex..<range.lowerBound)
+    callback(parseHeaders(headersData), bodyData, done)
+  }
+}
+
+private extension Data {
+  func range(of data: Data, options: Data.SearchOptions = [], in range: NSRange) -> NSRange {
+    return (self as NSData).range(of: data, options: options, in: range)
+  }
+}

package/ios/EXUpdates/Multipart/UpdatesParameterParser.swift

@@ -0,0 +1,148 @@
+//  Copyright © 2019 650 Industries. All rights reserved.
+
+import Foundation
+
+/**
+ * Derivation of ParameterParser class in the apache commons file upload
+ * project: https://commons.apache.org/proper/commons-fileupload/
+ *
+ * A simple parser intended to parse sequences of name/value pairs.
+ *
+ * Parameter values are expected to be enclosed in quotes if they
+ * contain unsafe characters, such as '=' characters or separators.
+ * Parameter values are optional and can be omitted.
+ */
+public final class UpdatesParameterParser {
+  private enum Constants {
+    static let quote: Character = "\""
+    static let backslash: Character = "\\"
+    static let equals: Character = "="
+  }
+
+  private var parameterString: String = ""
+  private var currentPosition: Int = 0
+  private var tokenStart: Int = 0
+  private var tokenEnd: Int = 0
+
+  public init() {}
+
+  public func parseParameterString(_ parameterString: String, withDelimiter delimiter: Character) -> [String: Any] {
+    self.parameterString = parameterString
+    self.currentPosition = 0
+
+    var params = [String: Any]()
+
+    let delimiterSet = CharacterSet(charactersIn: String(delimiter))
+    let delimiterAndEqualsSet = CharacterSet(charactersIn: String(delimiter) + String(Constants.equals))
+
+    while hasChar() {
+      let paramName = parseToken(withTerminators: delimiterAndEqualsSet)
+      var paramValue: Any?
+
+      if hasChar() && currentChar() == Constants.equals {
+        currentPosition += 1 // skip '='
+        paramValue = parseQuotedToken(withTerminators: delimiterSet)
+      }
+
+      if hasChar() && currentChar() == delimiter {
+        currentPosition += 1 // skip separator
+      }
+
+      if let paramName = paramName, !paramName.isEmpty {
+        params[paramName] = paramValue ?? NSNull()
+      }
+    }
+
+    return params
+  }
+
+  private func getToken(quoted: Bool) -> String? {
+    guard let range = extractTokenRange(quoted: quoted) else { return nil }
+    return String(parameterString[range])
+  }
+
+  private func extractTokenRange(quoted: Bool) -> Range<String.Index>? {
+    var start = tokenStart
+    var end = tokenEnd
+
+    while start < end && parameterString[stringIndex(at: start)].isWhitespace {
+      start += 1
+    }
+
+    while end > start && parameterString[stringIndex(at: end - 1)].isWhitespace {
+      end -= 1
+    }
+
+    if quoted && (end - start) >= 2 {
+      let startChar = parameterString[stringIndex(at: start)]
+      let endChar = parameterString[stringIndex(at: end - 1)]
+      if startChar == Constants.quote && endChar == Constants.quote {
+        start += 1
+        end -= 1
+      }
+    }
+
+    guard end > start else {
+      return nil
+    }
+
+    let startIndex = stringIndex(at: start)
+    let endIndex = stringIndex(at: end)
+    return startIndex..<endIndex
+  }
+
+  private func parseToken(withTerminators terminators: CharacterSet) -> String? {
+    setTokenBounds()
+
+    while hasChar() {
+      let char = currentChar()
+      guard let scalar = char.unicodeScalars.first, !terminators.contains(scalar) else {
+        break
+      }
+      tokenEnd += 1
+      currentPosition += 1
+    }
+
+    return getToken(quoted: false)
+  }
+
+  private func parseQuotedToken(withTerminators terminators: CharacterSet) -> String? {
+    setTokenBounds()
+    var quoted = false
+    var charEscaped = false
+
+    while hasChar() {
+      let char = currentChar()
+
+      if !quoted, let scalar = char.unicodeScalars.first, terminators.contains(scalar) {
+        break
+      }
+
+      if !charEscaped && char == Constants.quote {
+        quoted.toggle()
+      }
+      charEscaped = (!charEscaped && char == Constants.backslash)
+      tokenEnd += 1
+      currentPosition += 1
+    }
+
+    return getToken(quoted: true)
+  }
+
+  private func setTokenBounds() {
+    tokenStart = currentPosition
+    tokenEnd = currentPosition
+  }
+
+  private func hasChar() -> Bool {
+    currentPosition < parameterString.count
+  }
+
+  private func currentChar() -> Character {
+    parameterString[stringIndex(at: currentPosition)]
+  }
+
+  private func stringIndex(at position: Int) -> String.Index {
+    parameterString.index(parameterString.startIndex, offsetBy: position)
+  }
+}

package/ios/Tests/UpdatesMultipartStreamReaderSpec.swift

@@ -0,0 +1,142 @@
+//  Copyright (c) 2020 650 Industries, Inc. All rights reserved.
+
+import XCTest
+@testable import EXUpdates
+
+/**
+ * Tests for UpdatesMultipartStreamReader
+ */
+class UpdatesMultipartStreamReaderSpec: XCTestCase {
+  func testSimpleCase() {
+    let response = "preamble, should be ignored\r\n" +
+      "--sample_boundary\r\n" +
+      "Content-Type: application/json; charset=utf-8\r\n" +
+      "Content-Length: 2\r\n\r\n" +
+      "{}\r\n" +
+      "--sample_boundary--\r\n" +
+      "epilogue, should be ignored"
+
+    let inputStream = InputStream(data: response.data(using: .utf8)!)
+    let reader = UpdatesMultipartStreamReader(inputStream: inputStream, boundary: "sample_boundary")
+
+    var count = 0
+    let success = reader.readAllParts { headers, content, done in
+      XCTAssertTrue(done)
+      XCTAssertEqual(headers?["Content-Type"] as? String, "application/json; charset=utf-8")
+      XCTAssertEqual(String(data: content!, encoding: .utf8), "{}")
+      count += 1
+    }
+
+    XCTAssertTrue(success)
+    XCTAssertEqual(count, 1)
+  }
+
+  func testMultipleParts() {
+    let response = "preamble, should be ignored\r\n" +
+      "--sample_boundary\r\n" +
+      "1\r\n" +
+      "--sample_boundary\r\n" +
+      "2\r\n" +
+      "--sample_boundary\r\n" +
+      "3\r\n" +
+      "--sample_boundary--\r\n" +
+      "epilogue, should be ignored"
+
+    let inputStream = InputStream(data: response.data(using: .utf8)!)
+    let reader = UpdatesMultipartStreamReader(inputStream: inputStream, boundary: "sample_boundary")
+
+    var count = 0
+    let expectedContents = ["1", "2", "3"]
+
+    let success = reader.readAllParts { _, content, done in
+      if count < expectedContents.count {
+        let expectedContent = expectedContents[count]
+        XCTAssertEqual(String(data: content!, encoding: .utf8), expectedContent)
+        XCTAssertEqual(done, count == expectedContents.count - 1)
+        count += 1
+      }
+    }
+
+    XCTAssertTrue(success)
+    XCTAssertEqual(count, 3)
+  }
+
+  func testNoDelimiter() {
+    let response = "content with no delimiter"
+
+    guard let responseData = response.data(using: .utf8) else {
+      XCTFail("Failed to convert response to UTF-8 data")
+      return
+    }
+    let inputStream = InputStream(data: responseData)
+    let reader = UpdatesMultipartStreamReader(inputStream: inputStream, boundary: "sample_boundary")
+
+    var count = 0
+    let success = reader.readAllParts { _, _, _ in
+      count += 1
+    }
+
+    XCTAssertFalse(success)
+    XCTAssertEqual(count, 0)
+  }
+
+  func testEmptyContent() {
+    let response = "--sample_boundary\r\n" +
+      "Content-Type: application/json\r\n" +
+      "\r\n" +
+      "\r\n" +
+      "--sample_boundary--\r\n"
+
+    guard let responseData = response.data(using: .utf8) else {
+      XCTFail("Failed to convert response to UTF-8 data")
+      return
+    }
+    let inputStream = InputStream(data: responseData)
+    let reader = UpdatesMultipartStreamReader(inputStream: inputStream, boundary: "sample_boundary")
+
+    var count = 0
+    let success = reader.readAllParts { headers, content, done in
+      XCTAssertTrue(done)
+      XCTAssertEqual(headers?["Content-Type"] as? String, "application/json")
+      guard let contentData = content else {
+        XCTFail("Content should not be nil")
+        return
+      }
+      XCTAssertEqual(String(data: contentData, encoding: .utf8), "")
+      count += 1
+    }
+
+    XCTAssertTrue(success)
+    XCTAssertEqual(count, 1)
+  }
+
+  func testFirstBoundaryAsBoundary() {
+    let response = "--sample_boundary\r\n" +
+      "Content-Type: application/json\r\n" +
+      "\r\n" +
+      "{}\r\n" +
+      "--sample_boundary--\r\n"
+
+    guard let responseData = response.data(using: .utf8) else {
+      XCTFail("Failed to convert response to UTF-8 data")
+      return
+    }
+    let inputStream = InputStream(data: responseData)
+    let reader = UpdatesMultipartStreamReader(inputStream: inputStream, boundary: "sample_boundary")
+
+    var count = 0
+    let success = reader.readAllParts { headers, content, done in
+      XCTAssertTrue(done)
+      XCTAssertEqual(headers?["Content-Type"] as? String, "application/json")
+      guard let contentData = content else {
+        XCTFail("Content should not be nil")
+        return
+      }
+      XCTAssertEqual(String(data: contentData, encoding: .utf8), "{}")
+      count += 1
+    }
+
+    XCTAssertTrue(success)
+    XCTAssertEqual(count, 1)
+  }
+}

package/ios/Tests/UpdatesParameterParserSpec.swift

@@ -0,0 +1,53 @@
+//  Copyright (c) 2020 650 Industries, Inc. All rights reserved.
+
+import XCTest
+@testable import EXUpdates
+
+class UpdatesParameterParserSpec: XCTestCase {
+  func testParameterParser() {
+    let testCases: [(String, [String: Any])] = [
+      ("", [:]),
+      ("test; test1 =  stuff   ; test2 =  \"stuff; stuff\"; test3=\"stuff",
+       ["test": NSNull(), "test1": "stuff", "test2": "stuff; stuff", "test3": "\"stuff"]),
+      ("  test  ; test1=stuff   ;  ; test2=; test3; ",
+       ["test": NSNull(), "test1": "stuff", "test2": NSNull(), "test3": NSNull()]),
+      ("  test", ["test": NSNull()]),
+      ("  ", [:]),
+      (" = stuff ", [:]),
+      ("text/plain; Charset=UTF-8", ["text/plain": NSNull(), "Charset": "UTF-8"]),
+      ("param = \"stuff\\\"; more stuff\"", ["param": "stuff\\\"; more stuff"]),
+      ("param = \"stuff\\\\\"; anotherparam", ["param": "stuff\\\\", "anotherparam": NSNull()]),
+      ("foo/bar; param=\"baz=bat\"", ["foo/bar": NSNull(), "param": "baz=bat"]),
+
+      // Expo-specific tests
+      ("multipart/mixed; boundary=BbC04y", ["multipart/mixed": NSNull(), "boundary": "BbC04y"]),
+      ("form-data; name=\"manifest\"; filename=\"hello2\"", ["form-data": NSNull(), "name": "manifest", "filename": "hello2"])
+    ]
+
+    let parser = UpdatesParameterParser()
+
+    for (parameterString, expectedDictionary) in testCases {
+      let parameters = parser.parseParameterString(parameterString, withDelimiter: ";")
+
+      XCTAssertEqual(parameters.count, expectedDictionary.count,
+                     "Parameter count mismatch for: '\(parameterString)'")
+
+      for (key, expectedValue) in expectedDictionary {
+        XCTAssertTrue(parameters.keys.contains(key),
+                      "Missing key '\(key)' for: '\(parameterString)'")
+
+        let actualValue = parameters[key]
+
+        if expectedValue is NSNull && actualValue is NSNull {
+          continue
+        } else if let expectedString = expectedValue as? String,
+                  let actualString = actualValue as? String {
+          XCTAssertEqual(actualString, expectedString,
+                         "Value mismatch for key '\(key)' in: '\(parameterString)'")
+        } else {
+          XCTFail("Type mismatch for key '\(key)' in: '\(parameterString)'. Expected: \(type(of: expectedValue)), Actual: \(type(of: actualValue ?? "nil"))")
+        }
+      }
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "29.0.6",
+  "version": "29.0.7",
   "description": "Fetches and manages remotely-hosted assets and updates to your app's JS bundle.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -39,13 +39,13 @@
   },
   "dependencies": {
     "@expo/code-signing-certificates": "0.0.5",
-    "@expo/plist": "^0.4.4",
+    "@expo/plist": "^0.4.5",
     "@expo/spawn-async": "^1.7.2",
     "arg": "4.1.0",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
-    "expo-eas-client": "~1.0.4",
-    "expo-manifests": "~1.0.5",
+    "expo-eas-client": "~1.0.5",
+    "expo-manifests": "~1.0.6",
     "expo-structured-headers": "~5.0.0",
     "expo-updates-interface": "~2.0.0",
     "getenv": "^2.0.0",
@@ -73,5 +73,5 @@
     "react": "*",
     "react-native": "*"
   },
-  "gitHead": "5e15f3a5d68bc213ad36d59113d725fdea4f3411"
+  "gitHead": "1dafdaa317c182191909a94a355c8b08a2654783"
 }

package/ios/EXUpdates/Multipart/EXUpdatesMultipartStreamReader.h

@@ -1,20 +0,0 @@
-//  Copyright © 2019 650 Industries. All rights reserved.
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-typedef void (^EXMultipartCallback)(NSDictionary * _Nullable headers, NSData * _Nullable content, BOOL done);
-
-/**
- * Fork of {@link RCTMultipartStreamReader} that doesn't necessarily
- * expect a preamble (first boundary is not necessarily preceded by CRLF).
- */
-@interface EXUpdatesMultipartStreamReader : NSObject
-
-- (instancetype)initWithInputStream:(NSInputStream *)stream boundary:(NSString *)boundary;
-- (BOOL)readAllPartsWithCompletionCallback:(EXMultipartCallback)callback;
-
-@end
-
-NS_ASSUME_NONNULL_END

package/ios/EXUpdates/Multipart/EXUpdatesMultipartStreamReader.m

@@ -1,137 +0,0 @@
-//  Copyright © 2019 650 Industries. All rights reserved.
-
-#import <EXUpdates/EXUpdatesMultipartStreamReader.h>
-
-#define CRLF @"\r\n"
-
-@implementation EXUpdatesMultipartStreamReader {
-  __strong NSInputStream *_stream;
-  __strong NSString *_boundary;
-}
-
-- (instancetype)initWithInputStream:(NSInputStream *)stream boundary:(NSString *)boundary
-{
-  if (self = [super init]) {
-    _stream = stream;
-    _boundary = boundary;
-  }
-  return self;
-}
-
-- (NSDictionary<NSString *, NSString *> *)parseHeaders:(NSData *)data
-{
-  NSMutableDictionary *headers = [NSMutableDictionary new];
-  NSString *text = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-  NSArray<NSString *> *lines = [text componentsSeparatedByString:CRLF];
-  for (NSString *line in lines) {
-    NSUInteger location = [line rangeOfString:@":"].location;
-    if (location == NSNotFound) {
-      continue;
-    }
-    NSString *key = [line substringToIndex:location];
-    NSString *value = [[line substringFromIndex:location + 1] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
-    [headers setValue:value forKey:key];
-  }
-  return headers;
-}
-
-- (void)emitChunk:(NSData *)data headers:(NSDictionary *)headers callback:(EXMultipartCallback)callback done:(BOOL)done
-{
-  NSData *marker = [CRLF CRLF dataUsingEncoding:NSUTF8StringEncoding];
-  NSRange range = [data rangeOfData:marker options:0 range:NSMakeRange(0, data.length)];
-  if (range.location == NSNotFound) {
-    callback(nil, data, done);
-  } else if (headers != nil) {
-    // If headers were parsed already just use that to avoid doing it twice.
-    NSInteger bodyStart = range.location + marker.length;
-    NSData *bodyData = [data subdataWithRange:NSMakeRange(bodyStart, data.length - bodyStart)];
-    callback(headers, bodyData, done);
-  } else {
-    NSData *headersData = [data subdataWithRange:NSMakeRange(0, range.location)];
-    NSInteger bodyStart = range.location + marker.length;
-    NSData *bodyData = [data subdataWithRange:NSMakeRange(bodyStart, data.length - bodyStart)];
-    callback([self parseHeaders:headersData], bodyData, done);
-  }
-}
-
-- (BOOL)readAllPartsWithCompletionCallback:(EXMultipartCallback)callback
-{
-  NSInteger chunkStart = 0;
-  NSInteger bytesSeen = 0;
-
-  // first delimiter doesn't necessarily need to be preceded by CRLF (boundary can be first thing in body)
-  NSData *firstDelimiter = [[NSString stringWithFormat:@"--%@%@", _boundary, CRLF] dataUsingEncoding:NSUTF8StringEncoding];
-  NSData *restDelimiter = [[NSString stringWithFormat:@"%@--%@%@", CRLF, _boundary, CRLF] dataUsingEncoding:NSUTF8StringEncoding];
-  NSData *delimiter = firstDelimiter;
-  
-  NSData *closeDelimiter = [[NSString stringWithFormat:@"%@--%@--%@", CRLF, _boundary, CRLF] dataUsingEncoding:NSUTF8StringEncoding];
-  NSMutableData *content = [[NSMutableData alloc] initWithCapacity:1];
-  NSDictionary *currentHeaders = nil;
-  NSUInteger currentHeadersLength = 0;
-
-  const NSUInteger bufferLen = 4 * 1024;
-  uint8_t buffer[bufferLen];
-
-  [_stream open];
-  while (true) {
-    BOOL isCloseDelimiter = NO;
-    // Search only a subset of chunk that we haven't seen before + few bytes
-    // to allow for the edge case when the delimiter is cut by read call
-    NSInteger searchStart = MAX(bytesSeen - (NSInteger)closeDelimiter.length, chunkStart);
-    NSRange remainingBufferRange = NSMakeRange(searchStart, content.length - searchStart);
-
-    // Check for delimiters.
-    NSRange range = [content rangeOfData:delimiter options:0 range:remainingBufferRange];
-    if (range.location == NSNotFound) {
-      isCloseDelimiter = YES;
-      range = [content rangeOfData:closeDelimiter options:0 range:remainingBufferRange];
-    }
-
-    if (range.location == NSNotFound) {
-      if (currentHeaders == nil) {
-        // Check for the headers delimiter.
-        NSData *headersMarker = [CRLF CRLF dataUsingEncoding:NSUTF8StringEncoding];
-        NSRange headersRange = [content rangeOfData:headersMarker options:0 range:remainingBufferRange];
-        if (headersRange.location != NSNotFound) {
-          NSData *headersData = [content subdataWithRange:NSMakeRange(chunkStart, headersRange.location - chunkStart)];
-          currentHeadersLength = headersData.length;
-          currentHeaders = [self parseHeaders:headersData];
-        }
-      }
-
-      bytesSeen = content.length;
-      NSInteger bytesRead = [_stream read:buffer maxLength:bufferLen];
-      if (bytesRead <= 0 || _stream.streamError) {
-        [_stream close];
-        return NO;
-      }
-      [content appendBytes:buffer length:bytesRead];
-      continue;
-    }
-
-    NSInteger chunkEnd = range.location;
-    NSInteger length = chunkEnd - chunkStart;
-    bytesSeen = chunkEnd;
-
-    // Ignore preamble
-    if (chunkStart > 0) {
-      NSData *chunk = [content subdataWithRange:NSMakeRange(chunkStart, length)];
-      [self emitChunk:chunk headers:currentHeaders callback:callback done:isCloseDelimiter];
-      currentHeaders = nil;
-      currentHeadersLength = 0;
-    }
-
-    if (isCloseDelimiter) {
-      [_stream close];
-      return YES;
-    }
-
-    chunkStart = chunkEnd + delimiter.length;
-    
-    if (delimiter == firstDelimiter) {
-      delimiter = restDelimiter;
-    }
-  }
-}
-
-@end

package/ios/EXUpdates/Multipart/EXUpdatesParameterParser.h

@@ -1,23 +0,0 @@
-//  Copyright © 2019 650 Industries. All rights reserved.
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * Derivation of ParameterParser class in the apache commons file upload
- * project: https://commons.apache.org/proper/commons-fileupload/
- *
- * A simple parser intended to parse sequences of name/value pairs.
- *
- * Parameter values are expected to be enclosed in quotes if they
- * contain unsafe characters, such as '=' characters or separators.
- * Parameter values are optional and can be omitted.
- */
-@interface EXUpdatesParameterParser : NSObject
-
-- (NSDictionary *)parseParameterString:(NSString *)parameterString withDelimiter:(unichar)delimiter;
-
-@end
-
-NS_ASSUME_NONNULL_END

package/ios/EXUpdates/Multipart/EXUpdatesParameterParser.m

@@ -1,143 +0,0 @@
-//  Copyright © 2019 650 Industries. All rights reserved.
-
-#import <EXUpdates/EXUpdatesParameterParser.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@implementation EXUpdatesParameterParser {
-  // String to be parsed.
-  NSString *_parameterString;
-  
-  // Current position in the string.
-  int _currentPosition;
-  
-  // Start of a token.
-  int _i1;
-  
-  // End of a token.
-  int _i2;
-}
-
-/**
- * A helper method to process the parsed token. This method removes
- * leading and trailing blanks as well as enclosing quotation marks,
- * when necessary.
- */
-- (nullable NSString *)getTokenWithQuoted:(BOOL)quoted {
-  // Trim leading white spaces
-  while ((_i1 < _i2) && [[NSCharacterSet whitespaceCharacterSet] characterIsMember:[_parameterString characterAtIndex:_i1]]) {
-    _i1++;
-  }
-  
-  // Trim trailing white spaces
-  while ((_i2 > _i1) && [[NSCharacterSet whitespaceCharacterSet] characterIsMember:[_parameterString characterAtIndex:(_i2 - 1)]]) {
-      _i2--;
-  }
-  
-  // Strip away quotation marks if necessary
-  if (quoted
-      && ((_i2 - _i1) >= 2)
-      && ([_parameterString characterAtIndex:_i1] == '"')
-      && ([_parameterString characterAtIndex:(_i2 - 1)] == '"')) {
-      _i1++;
-      _i2--;
-  }
-  
-  NSString *result = nil;
-  if (_i2 > _i1) {
-    result = [_parameterString substringWithRange:NSMakeRange(_i1, _i2 - _i1)];
-  }
-  return result;
-}
-
-/**
- * Parses out a token until any of the given terminators
- * is encountered.
- */
-- (NSString *)parseTokenWithTerminators:(NSCharacterSet *)terminators {
-  unichar ch;
-  _i1 = _currentPosition;
-  _i2 = _currentPosition;
-  while ([self hasChar]) {
-    ch = [_parameterString characterAtIndex:_currentPosition];
-    if ([terminators characterIsMember:ch]) {
-      break;
-    }
-    _i2++;
-    _currentPosition++;
-  }
-  return [self getTokenWithQuoted:false];
-}
-
-/**
- * Parses out a token until any of the given terminators
- * is encountered outside the quotation marks.
- */
-- (NSString *)parseQuotedTokenWithTerminators:(NSCharacterSet *)terminators {
-  unichar ch;
-  _i1 = _currentPosition;
-  _i2 = _currentPosition;
-  BOOL quoted = false;
-  BOOL charEscaped = false;
-  
-  while ([self hasChar]) {
-    ch = [_parameterString characterAtIndex:_currentPosition];
-    if (!quoted && [terminators characterIsMember:ch]) {
-      break;
-    }
-    if (!charEscaped && ch == '"') {
-      quoted = !quoted;
-    }
-    charEscaped = (!charEscaped && ch == '\\');
-    _i2++;
-    _currentPosition++;
-  }
-  
-  return [self getTokenWithQuoted:true];
-}
-
-/**
- * Are there any characters left to parse?
- */
-- (BOOL)hasChar {
-  return _currentPosition < _parameterString.length;
-}
-
-/**
- * Extracts a map of name/value pairs from the given string. Names are expected to be unique.
- */
-- (NSDictionary *)parseParameterString:(NSString *)parameterString withDelimiter:(unichar)delimiter {
-  _parameterString = parameterString;
-  
-  NSMutableDictionary *params = [NSMutableDictionary new];
-  
-  NSString *paramName;
-  NSString *paramValue;
-  
-  NSCharacterSet *charSetDelimiter = [NSCharacterSet characterSetWithCharactersInString:[NSString stringWithFormat:@"%C", delimiter]];
-  NSCharacterSet *charSetDelimiterAndEquals = [NSCharacterSet characterSetWithCharactersInString:[NSString stringWithFormat:@"%C=", delimiter]];
-  
-  while ([self hasChar]) {
-    paramName = [self parseTokenWithTerminators:charSetDelimiterAndEquals];
-    paramValue = nil;
-    
-    if ([self hasChar] && [_parameterString characterAtIndex:_currentPosition] == '=') {
-      _currentPosition++; // skip '='
-      paramValue = [self parseQuotedTokenWithTerminators:charSetDelimiter];
-    }
-    
-    if ([self hasChar] && ([_parameterString characterAtIndex:_currentPosition] == delimiter)) {
-      _currentPosition++; // skip separator
-    }
-    
-    if (paramName != nil && paramName.length > 0) {
-      [params setValue:(paramValue ?: [NSNull null]) forKey:paramName];
-    }
-  }
-  
-  return params;
-}
-
-@end
-
-NS_ASSUME_NONNULL_END

package/ios/Tests/EXUpdatesMultipartStreamReaderTests.m

@@ -1,135 +0,0 @@
-//  Copyright (c) 2020 650 Industries, Inc. All rights reserved.
-
-#import <XCTest/XCTest.h>
-
-#import <EXUpdates/EXUpdatesMultipartStreamReader.h>
-
-/**
- * Fork of {@link EXUpdatesMultipartStreamReaderTests}.
- */
-@interface EXUpdatesMultipartStreamReaderTests : XCTestCase
-
-@end
-
-@implementation EXUpdatesMultipartStreamReaderTests
-
-- (void)testSimpleCase
-{
-  NSString *response =
-  @"preamble, should be ignored\r\n"
-  @"--sample_boundary\r\n"
-  @"Content-Type: application/json; charset=utf-8\r\n"
-  @"Content-Length: 2\r\n\r\n"
-  @"{}\r\n"
-  @"--sample_boundary--\r\n"
-  @"epilogue, should be ignored";
-  
-  NSInputStream *inputStream = [NSInputStream inputStreamWithData:[response dataUsingEncoding:NSUTF8StringEncoding]];
-  EXUpdatesMultipartStreamReader *reader = [[EXUpdatesMultipartStreamReader alloc] initWithInputStream:inputStream
-                                                                                              boundary:@"sample_boundary"];
-  __block NSInteger count = 0;
-  BOOL success = [reader readAllPartsWithCompletionCallback:^(NSDictionary *headers, NSData *content, BOOL done) {
-    XCTAssertTrue(done);
-    XCTAssertEqualObjects(headers[@"Content-Type"], @"application/json; charset=utf-8");
-    XCTAssertEqualObjects([[NSString alloc] initWithData:content encoding:NSUTF8StringEncoding], @"{}");
-    count++;
-  }];
-  XCTAssertTrue(success);
-  XCTAssertEqual(count, 1);
-}
-
-- (void)testMultipleParts
-{
-  NSString *response =
-  @"preamble, should be ignored\r\n"
-  @"--sample_boundary\r\n"
-  @"1\r\n"
-  @"--sample_boundary\r\n"
-  @"2\r\n"
-  @"--sample_boundary\r\n"
-  @"3\r\n"
-  @"--sample_boundary--\r\n"
-  @"epilogue, should be ignored";
-  
-  NSInputStream *inputStream = [NSInputStream inputStreamWithData:[response dataUsingEncoding:NSUTF8StringEncoding]];
-  EXUpdatesMultipartStreamReader *reader = [[EXUpdatesMultipartStreamReader alloc] initWithInputStream:inputStream
-                                                                                              boundary:@"sample_boundary"];
-  __block NSInteger count = 0;
-  BOOL success = [reader readAllPartsWithCompletionCallback:^(__unused NSDictionary *headers, NSData *content, BOOL done) {
-    count++;
-    XCTAssertEqual(done, count == 3);
-    NSString *expectedBody = [NSString stringWithFormat:@"%ld", (long)count];
-    NSString *actualBody = [[NSString alloc] initWithData:content encoding:NSUTF8StringEncoding];
-    XCTAssertEqualObjects(actualBody, expectedBody);
-  }];
-  XCTAssertTrue(success);
-  XCTAssertEqual(count, 3);
-}
-
-- (void)testMultiplePartsNoPreamble
-{
-  NSString *response =
-  @"--sample_boundary\r\n"
-  @"1\r\n"
-  @"--sample_boundary\r\n"
-  @"2\r\n"
-  @"--sample_boundary\r\n"
-  @"3\r\n"
-  @"--sample_boundary--\r\n"
-  @"epilogue, should be ignored";
-  
-  NSInputStream *inputStream = [NSInputStream inputStreamWithData:[response dataUsingEncoding:NSUTF8StringEncoding]];
-  EXUpdatesMultipartStreamReader *reader = [[EXUpdatesMultipartStreamReader alloc] initWithInputStream:inputStream
-                                                                                              boundary:@"sample_boundary"];
-  __block NSInteger count = 0;
-  BOOL success = [reader readAllPartsWithCompletionCallback:^(__unused NSDictionary *headers, NSData *content, BOOL done) {
-    count++;
-    XCTAssertEqual(done, count == 3);
-    NSString *expectedBody = [NSString stringWithFormat:@"%ld", (long)count];
-    NSString *actualBody = [[NSString alloc] initWithData:content encoding:NSUTF8StringEncoding];
-    XCTAssertEqualObjects(actualBody, expectedBody);
-  }];
-  XCTAssertTrue(success);
-  XCTAssertEqual(count, 3);
-}
-
-- (void)testNoDelimiter
-{
-  NSString *response = @"Yolo";
-  
-  NSInputStream *inputStream = [NSInputStream inputStreamWithData:[response dataUsingEncoding:NSUTF8StringEncoding]];
-  EXUpdatesMultipartStreamReader *reader = [[EXUpdatesMultipartStreamReader alloc] initWithInputStream:inputStream
-                                                                                              boundary:@"sample_boundary"];
-  __block NSInteger count = 0;
-  BOOL success = [reader readAllPartsWithCompletionCallback:^(
-                                                              __unused NSDictionary *headers, __unused NSData *content, __unused BOOL done) {
-                                                                count++;
-                                                              }];
-  XCTAssertFalse(success);
-  XCTAssertEqual(count, 0);
-}
-
-- (void)testNoCloseDelimiter
-{
-  NSString *response =
-  @"preamble, should be ignored\r\n"
-  @"--sample_boundary\r\n"
-  @"Content-Type: application/json; charset=utf-8\r\n"
-  @"Content-Length: 2\r\n\r\n"
-  @"{}\r\n"
-  @"--sample_boundary\r\n"
-  @"incomplete message...";
-  
-  NSInputStream *inputStream = [NSInputStream inputStreamWithData:[response dataUsingEncoding:NSUTF8StringEncoding]];
-  EXUpdatesMultipartStreamReader *reader = [[EXUpdatesMultipartStreamReader alloc] initWithInputStream:inputStream
-                                                                                              boundary:@"sample_boundary"];
-  __block NSInteger count = 0;
-  BOOL success = [reader readAllPartsWithCompletionCallback:^(
-                                                              __unused NSDictionary *headers, __unused NSData *content, __unused BOOL done) {
-                                                                count++;
-                                                              }];
-  XCTAssertFalse(success);
-  XCTAssertEqual(count, 1);
-}
-
-@end

package/ios/Tests/EXUpdatesParameterParserTests.m

@@ -1,44 +0,0 @@
-//  Copyright (c) 2020 650 Industries, Inc. All rights reserved.
-
-#import <XCTest/XCTest.h>
-
-#import <EXUpdates/EXUpdatesParameterParser.h>
-
-@interface EXUpdatesParameterParserTests : XCTestCase
-@end
-
-@implementation EXUpdatesParameterParserTests
-
-- (void)testParameterParser
-{
-  NSArray<NSArray *> *testCases = @[
-    @[@"", @{}],
-    @[@"test; test1 =  stuff   ; test2 =  \"stuff; stuff\"; test3=\"stuff",
-      @{@"test": [NSNull null], @"test1": @"stuff", @"test2": @"stuff; stuff", @"test3": @"\"stuff"}
-    ],
-    @[@"  test  ; test1=stuff   ;  ; test2=; test3; ",
-      @{@"test": [NSNull null], @"test1": @"stuff", @"test2": [NSNull null], @"test3": [NSNull null]}
-    ],
-    @[@"  test", @{@"test": [NSNull null]}],
-    @[@"  ", @{}],
-    @[@" = stuff ", @{}],
-    @[@"text/plain; Charset=UTF-8", @{@"text/plain": [NSNull null], @"Charset": @"UTF-8"}],
-    @[@"param = \"stuff\\\"; more stuff\"", @{@"param": @"stuff\\\"; more stuff"}],
-    @[@"param = \"stuff\\\\\"; anotherparam", @{@"param": @"stuff\\\\", @"anotherparam": [NSNull null]}],
-    @[@"foo/bar; param=\"baz=bat\"", @{@"foo/bar": [NSNull null], @"param": @"baz=bat"}],
-    
-    // Expo-specific tests
-    @[@"multipart/mixed; boundary=BbC04y", @{@"multipart/mixed": [NSNull null], @"boundary": @"BbC04y"}],
-    @[@"form-data; name=\"manifest\"; filename=\"hello2\"", @{@"form-data": [NSNull null], @"name": @"manifest", @"filename": @"hello2"}],
-  ];
-  
-  for (NSArray *testCase in testCases) {
-    NSString *parameterString = testCase[0];
-    NSDictionary *expectedDictionary = testCase[1];
-    
-    NSDictionary *parameters = [[EXUpdatesParameterParser new] parseParameterString:parameterString withDelimiter:';'];
-    XCTAssertTrue([expectedDictionary isEqualToDictionary:parameters], @"result did not match expected");
-  }
-}
-
-@end