expo 52.0.18 → 52.0.19

package/android/build.gradle

@@ -33,7 +33,7 @@ def getRNVersion() {
 ensureDependeciesWereEvaluated(project)
 
 group = 'host.exp.exponent'
-version = '52.0.18'
+version = '52.0.19'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -46,7 +46,7 @@ android {
   namespace "expo.core"
   defaultConfig {
     versionCode 1
-    versionName "52.0.18"
+    versionName "52.0.19"
     consumerProguardFiles("proguard-rules.pro")
   }
   testOptions {

package/android/src/main/java/expo/modules/fetch/NativeResponse.kt

@@ -72,8 +72,13 @@ internal class NativeResponse(appContext: AppContext, private val coroutineScope
   }
 
   fun emitRequestCancelled() {
-    error = FetchRequestCancelledException()
+    val error = FetchRequestCancelledException()
+    this.error = error
+    if (state == ResponseState.BODY_STREAMING_STARTED) {
+      emit("didFailWithError", error)
+    }
     state = ResponseState.ERROR_RECEIVED
+    emit("readyForJSFinalization")
   }
 
   fun waitForStates(states: List<ResponseState>, callback: (ResponseState) -> Unit) {
@@ -108,6 +113,7 @@ internal class NativeResponse(appContext: AppContext, private val coroutineScope
     }
     error = e
     state = ResponseState.ERROR_RECEIVED
+    emit("readyForJSFinalization")
   }
 
   override fun onResponse(call: Call, response: Response) {
@@ -123,6 +129,7 @@ internal class NativeResponse(appContext: AppContext, private val coroutineScope
         emit("didComplete")
       }
       this@NativeResponse.state = ResponseState.BODY_COMPLETED
+      emit("readyForJSFinalization")
     }
   }
 
@@ -158,22 +165,30 @@ internal class NativeResponse(appContext: AppContext, private val coroutineScope
   }
 
   private fun pumpResponseBodyStream(stream: BufferedSource) {
-    while (!stream.exhausted()) {
-      if (isInvalidState(
-          ResponseState.RESPONSE_RECEIVED,
-          ResponseState.BODY_STREAMING_STARTED,
-          ResponseState.BODY_STREAMING_CANCELLED
-        )
-      ) {
-        break
+    try {
+      while (!stream.exhausted()) {
+        if (isInvalidState(
+            ResponseState.RESPONSE_RECEIVED,
+            ResponseState.BODY_STREAMING_STARTED,
+            ResponseState.BODY_STREAMING_CANCELLED
+          )
+        ) {
+          break
+        }
+        if (state == ResponseState.RESPONSE_RECEIVED) {
+          sink.appendBufferBody(stream.buffer.readByteArray())
+        } else if (state == ResponseState.BODY_STREAMING_STARTED) {
+          emit("didReceiveResponseData", stream.buffer.readByteArray())
+        } else {
+          break
+        }
       }
-      if (state == ResponseState.RESPONSE_RECEIVED) {
-        sink.appendBufferBody(stream.buffer.readByteArray())
-      } else if (state == ResponseState.BODY_STREAMING_STARTED) {
-        emit("didReceiveResponseData", stream.buffer.readByteArray())
-      } else {
-        break
+    } catch (e: IOException) {
+      this.error = e
+      if (state == ResponseState.BODY_STREAMING_STARTED) {
+        emit("didFailWithError", e)
       }
+      state = ResponseState.ERROR_RECEIVED
     }
   }
 

package/build/devtools/DevToolsPluginClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DevToolsPluginClient.d.ts","sourceRoot":"","sources":["../../src/devtools/DevToolsPluginClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAG5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAGhE,OAAO,KAAK,EAAE,cAAc,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AAQpF;;;GAGG;AACH,8BAAsB,oBAAoB;aAYtB,cAAc,EAAE,cAAc;IAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IAZ3B,SAAS,CAAC,YAAY,EAAE,YAAY,CAAsB;IAE1D,OAAO,CAAC,MAAM,CAAC,cAAc,CAAsD;IACnF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8D;IAEtF,SAAS,CAAC,QAAQ,UAAS;IAC3B,SAAS,CAAC,OAAO,SAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CACR;gBAGT,cAAc,EAAE,cAAc,EAC7B,OAAO,CAAC,yCAA6B;IAKxD;;;OAGG;IACU,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQvC;;OAEG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAWxC;;;;OAIG;IACI,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;YAQhC,eAAe;IAS7B;;;;OAIG;IACI,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,GAAG,iBAAiB;IAI7F;;;;OAIG;IACI,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IAIpF;;OAEG;IACI,WAAW,IAAI,OAAO;IAI7B;;OAEG;IACH,SAAS,CAAC,YAAY,IAAI,OAAO,CAAC,SAAS,CAAC;IAyB5C,SAAS,CAAC,aAAa,UAAW,qBAAqB,UAErD;IAEF,OAAO,CAAC,iBAAiB,CAiBvB;IAEF;;;OAGG;IACI,wBAAwB,IAAI,qBAAqB;CAGzD"}
+{"version":3,"file":"DevToolsPluginClient.d.ts","sourceRoot":"","sources":["../../src/devtools/DevToolsPluginClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAG5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,KAAK,EAAE,cAAc,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AASpF;;;GAGG;AACH,8BAAsB,oBAAoB;aAYtB,cAAc,EAAE,cAAc;IAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IAZ3B,SAAS,CAAC,YAAY,EAAE,YAAY,CAAsB;IAE1D,OAAO,CAAC,MAAM,CAAC,cAAc,CAAsD;IACnF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8D;IAEtF,SAAS,CAAC,QAAQ,UAAS;IAC3B,SAAS,CAAC,OAAO,SAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CACR;gBAGT,cAAc,EAAE,cAAc,EAC7B,OAAO,CAAC,yCAA6B;IAKxD;;;OAGG;IACU,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQvC;;OAEG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAWxC;;;;OAIG;IACI,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;YAQhC,eAAe;IAS7B;;;;OAIG;IACI,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,GAAG,iBAAiB;IAI7F;;;;OAIG;IACI,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IAIpF;;OAEG;IACI,WAAW,IAAI,OAAO;IAI7B;;OAEG;IACH,SAAS,CAAC,YAAY,IAAI,OAAO,CAAC,SAAS,CAAC;IAyB5C,SAAS,CAAC,aAAa,UAAW,qBAAqB,UAErD;IAEF,OAAO,CAAC,iBAAiB,CAiBvB;IAEF;;;OAGG;IACI,wBAAwB,IAAI,qBAAqB;CAGzD"}

package/build/utils/blobUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"blobUtils.d.ts","sourceRoot":"","sources":["../../src/utils/blobUtils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CAKvE;AAED;;GAEG;AACH,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CASnF"}

package/build/winter/FormData.d.ts

@@ -1,5 +1,49 @@
-export declare function installFormDataPatch(formData: typeof FormData): {
-    new (form?: HTMLFormElement | undefined, submitter?: HTMLElement | null | undefined): FormData;
-    prototype: FormData;
+export type ExpoFormDataValue = string | Blob;
+export type ExpoFormDataPart = {
+    string: string;
+    headers: {
+        [name: string]: string;
+    };
+} | {
+    blob: Blob;
+    headers: {
+        [name: string]: string;
+    };
+    name?: string | undefined;
+    type?: string | undefined;
+} | {
+    uri: string;
+    headers: {
+        [name: string]: string;
+    };
+    name?: string | undefined;
+    type?: string | undefined;
 };
+export declare class ExpoFormData {
+    constructor();
+    append(name: string, value: string): void;
+    append(name: string, value: Blob, filename?: string): void;
+    delete(name: string): void;
+    get(name: string): FormDataEntryValue | null;
+    getAll(name: string): FormDataEntryValue[];
+    has(name: string): boolean;
+    set(name: string, value: string): void;
+    set(name: string, value: Blob, filename?: string): void;
+    append(name: string, value: {
+        uri: string;
+        name?: string;
+        type?: string;
+    }): void;
+    set(name: string, value: {
+        uri: string;
+        name?: string;
+        type?: string;
+    }): void;
+    forEach(callback: (value: FormDataEntryValue, key: string, iterable: FormData) => void, thisArg?: unknown): void;
+    keys(): IterableIterator<string>;
+    values(): IterableIterator<FormDataEntryValue>;
+    entries(): IterableIterator<[string, FormDataEntryValue]>;
+    [Symbol.iterator](): IterableIterator<[string, FormDataEntryValue]>;
+}
+export declare function installFormDataPatch(formData: typeof FormData): typeof ExpoFormData;
 //# sourceMappingURL=FormData.d.ts.map

package/build/winter/FormData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FormData.d.ts","sourceRoot":"","sources":["../../src/winter/FormData.ts"],"names":[],"mappings":"AA6BA,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,QAAQ;;;EA8H7D"}
+{"version":3,"file":"FormData.d.ts","sourceRoot":"","sources":["../../src/winter/FormData.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAAC;AAC9C,MAAM,MAAM,gBAAgB,GACxB;IAEE,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACrC,GACD;IAEE,IAAI,EAAE,IAAI,CAAC;IACX,OAAO,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACpC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,GACD;IAEE,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACpC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC;AAEN,MAAM,CAAC,OAAO,OAAO,YAAY;;IAE/B,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IACzC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI;IAC1D,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAC1B,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,GAAG,IAAI;IAC5C,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,EAAE;IAC1C,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAC1B,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IACtC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI;IAGvD,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAChF,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAG7E,OAAO,CACL,QAAQ,EAAE,CAAC,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,KAAK,IAAI,EAC9E,OAAO,CAAC,EAAE,OAAO,GAChB,IAAI;IACP,IAAI,IAAI,gBAAgB,CAAC,MAAM,CAAC;IAChC,MAAM,IAAI,gBAAgB,CAAC,kBAAkB,CAAC;IAC9C,OAAO,IAAI,gBAAgB,CAAC,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACzD,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;CACpE;AAyBD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,QAAQ,GAAG,OAAO,YAAY,CA+HnF"}

package/build/winter/fetch/FetchResponse.d.ts

@@ -1,11 +1,14 @@
 import { ReadableStream } from 'web-streams-polyfill';
 import type { NativeResponse } from './NativeRequest';
 declare const ConcreteNativeResponse: typeof NativeResponse;
+export type AbortSubscriptionCleanupFunction = () => void;
 /**
  * A response implementation for the `fetch.Response` API.
  */
 export declare class FetchResponse extends ConcreteNativeResponse implements Response {
+    private readonly abortCleanupFunction;
     private streamingStarted;
+    constructor(abortCleanupFunction: AbortSubscriptionCleanupFunction);
     get body(): ReadableStream<Uint8Array> | null;
     get headers(): Headers;
     get ok(): boolean;
@@ -16,7 +19,7 @@ export declare class FetchResponse extends ConcreteNativeResponse implements Res
     toString(): string;
     toJSON(): object;
     clone(): FetchResponse;
-    private removeAllRegisteredListeners;
+    private finalize;
 }
 export {};
 //# sourceMappingURL=FetchResponse.d.ts.map

package/build/winter/fetch/FetchResponse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FetchResponse.d.ts","sourceRoot":"","sources":["../../../src/winter/fetch/FetchResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,QAAA,MAAM,sBAAsB,uBAA0D,CAAC;AAEvF;;GAEG;AACH,qBAAa,aAAc,SAAQ,sBAAuB,YAAW,QAAQ;IAC3E,OAAO,CAAC,gBAAgB,CAAS;IAEjC,IAAI,IAAI,IAAI,cAAc,CAAC,UAAU,CAAC,GAAG,IAAI,CA6B5C;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,IAAI,EAAE,IAAI,OAAO,CAEhB;IAED,SAAgB,IAAI,aAAa;IAE3B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrB,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;IAY7B,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC;IAK1B,QAAQ,IAAI,MAAM;IAIlB,MAAM,IAAI,MAAM;IAShB,KAAK,IAAI,aAAa;IAItB,OAAO,CAAC,4BAA4B;CAKrC"}
+{"version":3,"file":"FetchResponse.d.ts","sourceRoot":"","sources":["../../../src/winter/fetch/FetchResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,QAAA,MAAM,sBAAsB,uBAA0D,CAAC;AAEvF,MAAM,MAAM,gCAAgC,GAAG,MAAM,IAAI,CAAC;AAE1D;;GAEG;AACH,qBAAa,aAAc,SAAQ,sBAAuB,YAAW,QAAQ;IAG/D,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IAFjD,OAAO,CAAC,gBAAgB,CAAS;gBAEJ,oBAAoB,EAAE,gCAAgC;IAKnF,IAAI,IAAI,IAAI,cAAc,CAAC,UAAU,CAAC,GAAG,IAAI,CA0B5C;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,IAAI,EAAE,IAAI,OAAO,CAEhB;IAED,SAAgB,IAAI,aAAa;IAE3B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrB,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;IAY7B,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC;IAK1B,QAAQ,IAAI,MAAM;IAIlB,MAAM,IAAI,MAAM;IAShB,KAAK,IAAI,aAAa;IAItB,OAAO,CAAC,QAAQ,CAQd;CACH"}

package/build/winter/fetch/NativeRequest.d.ts

@@ -13,6 +13,7 @@ export type NativeResponseEvents = {
     didReceiveResponseData(data: Uint8Array): void;
     didComplete(): void;
     didFailWithError(error: string): void;
+    readyForJSFinalization(): void;
 };
 export declare class NativeResponse extends SharedObject<NativeResponseEvents> {
     readonly bodyUsed: boolean;

package/build/winter/fetch/NativeRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeRequest.d.ts","sourceRoot":"","sources":["../../../src/winter/fetch/NativeRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,MAAM,iBAAiB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;AAEnD,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,YAAY;IAC9C,KAAK,CACV,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,iBAAiB,EAC9B,WAAW,EAAE,UAAU,GAAG,IAAI,GAC7B,OAAO,CAAC,cAAc,CAAC;IACnB,MAAM,IAAI,IAAI;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,sBAAsB,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IAC/C,WAAW,IAAI,IAAI,CAAC;IACpB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,YAAY,CAAC,oBAAoB,CAAC;IAC5E,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IACxC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,cAAc,IAAI,IAAI;IACtB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IACrC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IACnC,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;CACxB"}
+{"version":3,"file":"NativeRequest.d.ts","sourceRoot":"","sources":["../../../src/winter/fetch/NativeRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,MAAM,iBAAiB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;AAEnD,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,YAAY;IAC9C,KAAK,CACV,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,iBAAiB,EAC9B,WAAW,EAAE,UAAU,GAAG,IAAI,GAC7B,OAAO,CAAC,cAAc,CAAC;IACnB,MAAM,IAAI,IAAI;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,sBAAsB,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IAC/C,WAAW,IAAI,IAAI,CAAC;IACpB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,sBAAsB,IAAI,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,YAAY,CAAC,oBAAoB,CAAC;IAC5E,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IACxC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,cAAc,IAAI,IAAI;IACtB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IACrC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IACnC,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;CACxB"}

package/build/winter/fetch/RequestUtils.d.ts

@@ -4,20 +4,6 @@ import { type NativeHeadersType } from './NativeRequest';
  * convert a ReadableStream to a Uint8Array
  */
 export declare function convertReadableStreamToUint8ArrayAsync(stream: ReadableStream<Uint8Array>): Promise<Uint8Array>;
-/**
- * Convert FormData to string
- *
- * `uri` is not supported for React Native's FormData.
- * `blob` is not supported for standard FormData.
- */
-export declare function convertFormData(formData: FormData, boundary?: string): {
-    body: string;
-    boundary: string;
-};
-/**
- * Create mutipart boundary
- */
-export declare function createBoundary(): string;
 /**
  * Normalize a BodyInit object to a Uint8Array for NativeRequest
  */

package/build/winter/fetch/RequestUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RequestUtils.d.ts","sourceRoot":"","sources":["../../../src/winter/fetch/RequestUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEzD;;GAEG;AACH,wBAAsB,sCAAsC,CAC1D,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,GACjC,OAAO,CAAC,UAAU,CAAC,CAsBrB;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,QAAQ,EAClB,QAAQ,GAAE,MAAyB,GAClC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CA2BpC;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAOvC;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,SAAS,GAChC,OAAO,CAAC;IAAE,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IAAC,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;CAAE,CAAC,CA0C7E;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,GAAG,iBAAiB,CAe/F;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,iBAAiB,EAC1B,UAAU,EAAE,iBAAiB,GAC5B,iBAAiB,CAYnB"}
+{"version":3,"file":"RequestUtils.d.ts","sourceRoot":"","sources":["../../../src/winter/fetch/RequestUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAIzD;;GAEG;AACH,wBAAsB,sCAAsC,CAC1D,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,GACjC,OAAO,CAAC,UAAU,CAAC,CAsBrB;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,SAAS,GAChC,OAAO,CAAC;IAAE,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IAAC,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;CAAE,CAAC,CA6C7E;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,GAAG,iBAAiB,CAe/F;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,iBAAiB,EAC1B,UAAU,EAAE,iBAAiB,GAC5B,iBAAiB,CAYnB"}

package/build/winter/fetch/convertFormData.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Convert FormData to Uint8Array with a boundary
+ *
+ * `uri` is not supported for React Native's FormData.
+ * `blob` is not supported for standard FormData.
+ */
+export declare function convertFormDataAsync(formData: FormData, boundary?: string): Promise<{
+    body: Uint8Array;
+    boundary: string;
+}>;
+/**
+ * Create mutipart boundary
+ */
+export declare function createBoundary(): string;
+/**
+ * Merge Uint8Arrays into a single Uint8Array
+ */
+export declare function joinUint8Arrays(arrays: Uint8Array[]): Uint8Array;
+//# sourceMappingURL=convertFormData.d.ts.map

package/build/winter/fetch/convertFormData.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"convertFormData.d.ts","sourceRoot":"","sources":["../../../src/winter/fetch/convertFormData.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,GAAE,MAAyB,GAClC,OAAO,CAAC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAsCjD;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAOvC;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,UAAU,CAWhE"}

package/build/winter/fetch/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../src/winter/fetch/fetch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEtD,wBAAsB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAoCxF"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../src/winter/fetch/fetch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAyC,MAAM,iBAAiB,CAAC;AAGvF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEtD,wBAAsB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAqCxF"}

package/bundledNativeModules.json

@@ -17,7 +17,7 @@
   "expo-apple-authentication": "~7.1.2",
   "expo-application": "~6.0.1",
   "expo-asset": "~11.0.1",
-  "expo-audio": "~0.3.0",
+  "expo-audio": "~0.3.1",
   "expo-auth-session": "~6.0.1",
   "expo-av": "~15.0.1",
   "expo-background-fetch": "~13.0.3",
@@ -26,7 +26,7 @@
   "expo-brightness": "~13.0.2",
   "expo-build-properties": "~0.13.1",
   "expo-calendar": "~14.0.5",
-  "expo-camera": "~16.0.9",
+  "expo-camera": "~16.0.10",
   "expo-cellular": "~7.0.1",
   "expo-checkbox": "~4.0.0",
   "expo-clipboard": "~7.0.0",
@@ -37,7 +37,7 @@
   "expo-device": "~7.0.1",
   "expo-document-picker": "~13.0.1",
   "expo-face-detector": "~13.0.1",
-  "expo-file-system": "~18.0.5",
+  "expo-file-system": "~18.0.6",
   "expo-font": "~13.0.1",
   "expo-gl": "~15.0.2",
   "expo-google-app-auth": "~8.3.0",
@@ -57,12 +57,12 @@
   "expo-mail-composer": "~14.0.1",
   "expo-media-library": "~17.0.3",
   "expo-module-template": "~10.15.12",
-  "expo-modules-core": "~2.1.1",
+  "expo-modules-core": "~2.1.2",
   "expo-navigation-bar": "~4.0.6",
-  "expo-network": "~7.0.3",
+  "expo-network": "~7.0.4",
   "expo-notifications": "~0.29.11",
   "expo-print": "~14.0.2",
-  "expo-router": "~4.0.12",
+  "expo-router": "~4.0.13",
   "expo-screen-capture": "~7.0.0",
   "expo-screen-orientation": "~8.0.1",
   "expo-secure-store": "~14.0.0",

package/ios/Fetch/NativeResponse.swift

@@ -59,8 +59,13 @@ internal final class NativeResponse: SharedObject, ExpoURLSessionTaskDelegate {
   }
 
   func emitRequestCanceled() {
-    error = FetchRequestCanceledException()
+    let error = FetchRequestCanceledException()
+    self.error = error
+    if state == .bodyStreamingStarted {
+      emit(event: "didFailWithError", arguments: error.localizedDescription)
+    }
     state = .errorReceived
+    emit(event: "readyForJSFinalization")
   }
 
   /**
@@ -197,5 +202,7 @@ internal final class NativeResponse: SharedObject, ExpoURLSessionTaskDelegate {
     } else {
       state = .bodyCompleted
     }
+
+    emit(event: "readyForJSFinalization")
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo",
-  "version": "52.0.18",
+  "version": "52.0.19",
   "description": "The Expo SDK",
   "main": "src/Expo.ts",
   "module": "src/Expo.ts",
@@ -68,20 +68,20 @@
   "homepage": "https://github.com/expo/expo/tree/main/packages/expo",
   "dependencies": {
     "@babel/runtime": "^7.20.0",
-    "@expo/cli": "0.22.5",
+    "@expo/cli": "0.22.6",
     "@expo/config": "~10.0.6",
     "@expo/config-plugins": "~9.0.12",
-    "@expo/fingerprint": "0.11.3",
-    "@expo/metro-config": "0.19.7",
+    "@expo/fingerprint": "0.11.4",
+    "@expo/metro-config": "0.19.8",
     "@expo/vector-icons": "^14.0.0",
     "babel-preset-expo": "~12.0.4",
     "expo-asset": "~11.0.1",
     "expo-constants": "~17.0.3",
-    "expo-file-system": "~18.0.5",
+    "expo-file-system": "~18.0.6",
     "expo-font": "~13.0.1",
     "expo-keep-awake": "~14.0.1",
     "expo-modules-autolinking": "2.0.4",
-    "expo-modules-core": "2.1.1",
+    "expo-modules-core": "2.1.2",
     "fbemitter": "^3.0.0",
     "web-streams-polyfill": "^3.3.2",
     "whatwg-url-without-unicode": "8.0.0-3"
@@ -112,5 +112,5 @@
       "optional": true
     }
   },
-  "gitHead": "02366411c0bb2cb0055d7f4c0813bdaed1fa9bf8"
+  "gitHead": "637acf537a92ac6209bfced71e097ba736b43fef"
 }

package/src/devtools/DevToolsPluginClient.ts

@@ -3,9 +3,9 @@ import { EventEmitter, EventSubscription } from 'fbemitter';
 import { MessageFramePacker } from './MessageFramePacker';
 import { WebSocketBackingStore } from './WebSocketBackingStore';
 import { WebSocketWithReconnect } from './WebSocketWithReconnect';
-import { blobToArrayBufferAsync } from './blobUtils';
 import type { ConnectionInfo, DevToolsPluginClientOptions } from './devtools.types';
 import * as logger from './logger';
+import { blobToArrayBufferAsync } from '../utils/blobUtils';
 
 interface MessageFramePackerMessageKey {
   pluginName: string;

package/src/devtools/MessageFramePacker.ts

@@ -22,7 +22,7 @@
  *
  */
 
-import { blobToArrayBufferAsync } from './blobUtils';
+import { blobToArrayBufferAsync } from '../utils/blobUtils';
 
 type MessageKeyTypeBase = string | object;
 type PayloadType = Uint8Array | string | number | null | undefined | object | ArrayBuffer | Blob;

package/src/winter/FormData.ts

@@ -6,6 +6,54 @@ type ReactNativeFormDataInternal = FormData & {
   _parts: [string, string | Blob][];
 };
 
+export type ExpoFormDataValue = string | Blob;
+export type ExpoFormDataPart =
+  | {
+      // WinterCG FormData string
+      string: string;
+      headers: { [name: string]: string };
+    }
+  | {
+      // WinterCG FormData blob in our wrapped form
+      blob: Blob;
+      headers: { [name: string]: string };
+      name?: string | undefined;
+      type?: string | undefined;
+    }
+  | {
+      // React Native proprietary local file
+      uri: string;
+      headers: { [name: string]: string };
+      name?: string | undefined;
+      type?: string | undefined;
+    };
+
+export declare class ExpoFormData {
+  constructor();
+  append(name: string, value: string): void;
+  append(name: string, value: Blob, filename?: string): void;
+  delete(name: string): void;
+  get(name: string): FormDataEntryValue | null;
+  getAll(name: string): FormDataEntryValue[];
+  has(name: string): boolean;
+  set(name: string, value: string): void;
+  set(name: string, value: Blob, filename?: string): void;
+
+  // React Native proprietary local file
+  append(name: string, value: { uri: string; name?: string; type?: string }): void;
+  set(name: string, value: { uri: string; name?: string; type?: string }): void;
+
+  // iterable
+  forEach(
+    callback: (value: FormDataEntryValue, key: string, iterable: FormData) => void,
+    thisArg?: unknown
+  ): void;
+  keys(): IterableIterator<string>;
+  values(): IterableIterator<FormDataEntryValue>;
+  entries(): IterableIterator<[string, FormDataEntryValue]>;
+  [Symbol.iterator](): IterableIterator<[string, FormDataEntryValue]>;
+}
+
 function ensureMinArgCount(name: string, args: any[], expected: number) {
   if (args.length < expected) {
     const argName = expected === 2 ? 'arguments' : 'argument';
@@ -16,29 +64,32 @@ function ensureMinArgCount(name: string, args: any[], expected: number) {
   }
 }
 
-function normalizeArgs(name: string, value: any): [string, File | string] {
-  if (typeof value !== 'object') {
+function normalizeArgs(
+  name: string,
+  value: any,
+  blobFilename: string | undefined
+): [string, File | string] {
+  if (value instanceof Blob) {
+    value = { type: value.type, name: blobFilename || 'blob', blob: value };
+  } else if (typeof value !== 'object') {
     value = String(value);
   }
-  // TODO: Add Blob normalization in the future, right now this isn't supported to ensure parity with the rest of the FormData
-  // implementation in React Native.
-  // https://github.com/facebook/react-native/blob/42dcfdd2cdb59fe545523cb57db6ee32a96b9298/packages/react-native/Libraries/Network/FormData.js#L64
-
   return [String(name), value];
 }
 
-export function installFormDataPatch(formData: typeof FormData) {
-  formData.prototype.append ??= function append(this: ReactNativeFormDataInternal, ...props) {
+export function installFormDataPatch(formData: typeof FormData): typeof ExpoFormData {
+  formData.prototype.append = function append(this: ReactNativeFormDataInternal, ...props) {
     ensureMinArgCount('append', props, 2);
-    const [name, value] = props;
-    this._parts.push(normalizeArgs(name, value));
+    // @ts-ignore: When inferred FormData.append from React Native types, it does not support the 3rd blobFilename argument.
+    const [name, value, blobFilename] = props;
+    this._parts.push(normalizeArgs(name, value, blobFilename));
   };
 
   // @ts-ignore: DOM.iterable is disabled for jest compat
-  formData.prototype.set ??= function set(this: ReactNativeFormDataInternal, ...props) {
+  formData.prototype.set = function set(this: ReactNativeFormDataInternal, ...props) {
     ensureMinArgCount('set', props, 2);
-    const [name, value] = props;
-    const args = normalizeArgs(name, value);
+    const [name, value, blobFilename] = props;
+    const args = normalizeArgs(name, value, blobFilename);
     let replaced = false;
 
     for (let i = 0; i < this._parts.length; i++) {
@@ -121,7 +172,7 @@ export function installFormDataPatch(formData: typeof FormData) {
 
   // Required for RSC: https://github.com/facebook/react/blob/985747f81033833dca22f30b0c04704dd4bd3714/packages/react-server/src/ReactFlightServer.js#L2117
   // @ts-ignore: DOM.iterable is disabled for jest compat
-  formData.prototype.entries = function* entries(
+  formData.prototype.entries ??= function* entries(
     this: ReactNativeFormDataInternal
   ): IterableIterator<[string, FormDataEntryValue]> {
     for (const part of this._parts) {
@@ -152,5 +203,5 @@ export function installFormDataPatch(formData: typeof FormData) {
   // @ts-ignore: DOM.iterable is disabled for jest compat
   formData.prototype[Symbol.iterator] = formData.prototype.entries;
 
-  return formData;
+  return formData as unknown as typeof ExpoFormData;
 }

package/src/winter/__tests__/FormData.test.ios.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-global-assign */
-import { installFormDataPatch } from '../FormData';
+import { installFormDataPatch, type ExpoFormData } from '../FormData';
 
 const jestFormDataPolyfill = FormData;
 
@@ -48,6 +48,16 @@ describe('FormData', () => {
       a.delete('a');
       expect(a.get('a')).toBe(null);
     });
+
+    it(`supports react-native local uri`, () => {
+      const a = new FormData() as ExpoFormData;
+      a.append('a', { uri: 'file:///path/to/test.jpg', type: 'image/jpeg', name: 'test.jpg' });
+      expect(a.get('a')).toEqual({
+        uri: 'file:///path/to/test.jpg',
+        type: 'image/jpeg',
+        name: 'test.jpg',
+      });
+    });
   });
 
   describe('getters', () => {

package/src/winter/fetch/FetchResponse.ts

@@ -5,12 +5,19 @@ import type { NativeResponse } from './NativeRequest';
 
 const ConcreteNativeResponse = ExpoFetchModule.NativeResponse as typeof NativeResponse;
 
+export type AbortSubscriptionCleanupFunction = () => void;
+
 /**
  * A response implementation for the `fetch.Response` API.
  */
 export class FetchResponse extends ConcreteNativeResponse implements Response {
   private streamingStarted = false;
 
+  constructor(private readonly abortCleanupFunction: AbortSubscriptionCleanupFunction) {
+    super();
+    this.addListener('readyForJSFinalization', this.finalize);
+  }
+
   get body(): ReadableStream<Uint8Array> | null {
     const response = this;
     return new ReadableStream({
@@ -20,12 +27,10 @@ export class FetchResponse extends ConcreteNativeResponse implements Response {
         });
 
         response.addListener('didComplete', () => {
-          response.removeAllRegisteredListeners();
           controller.close();
         });
 
         response.addListener('didFailWithError', (error: string) => {
-          response.removeAllRegisteredListeners();
           controller.error(new Error(error));
         });
       },
@@ -36,7 +41,6 @@ export class FetchResponse extends ConcreteNativeResponse implements Response {
         }
       },
       cancel(reason) {
-        response.removeAllRegisteredListeners();
         response.cancelStreaming(String(reason));
       },
     });
@@ -91,9 +95,13 @@ export class FetchResponse extends ConcreteNativeResponse implements Response {
     throw new Error('Not implemented');
   }
 
-  private removeAllRegisteredListeners() {
+  private finalize = (): void => {
+    this.removeListener('readyForJSFinalization', this.finalize);
+
+    this.abortCleanupFunction();
+
     this.removeAllListeners('didReceiveResponseData');
     this.removeAllListeners('didComplete');
     this.removeAllListeners('didFailWithError');
-  }
+  };
 }

package/src/winter/fetch/NativeRequest.ts

@@ -21,6 +21,7 @@ export type NativeResponseEvents = {
   didReceiveResponseData(data: Uint8Array): void;
   didComplete(): void;
   didFailWithError(error: string): void;
+  readyForJSFinalization(): void;
 };
 
 export declare class NativeResponse extends SharedObject<NativeResponseEvents> {

package/src/winter/fetch/RequestUtils.ts

@@ -1,6 +1,8 @@
 import { ReadableStream } from 'web-streams-polyfill';
 
 import { type NativeHeadersType } from './NativeRequest';
+import { convertFormDataAsync } from './convertFormData';
+import { blobToArrayBufferAsync } from '../../utils/blobUtils';
 
 /**
  * convert a ReadableStream to a Uint8Array
@@ -31,56 +33,6 @@ export async function convertReadableStreamToUint8ArrayAsync(
   return result;
 }
 
-/**
- * Convert FormData to string
- *
- * `uri` is not supported for React Native's FormData.
- * `blob` is not supported for standard FormData.
- */
-export function convertFormData(
-  formData: FormData,
-  boundary: string = createBoundary()
-): { body: string; boundary: string } {
-  // @ts-expect-error: React Native's FormData is not compatible with the web's FormData
-  if (typeof formData.getParts !== 'function') {
-    throw new Error('Unsupported FormData implementation');
-  }
-  // @ts-expect-error: React Native's FormData is not compatible with the web's FormData
-  const parts: FormDataPart[] = formData.getParts();
-
-  const results: string[] = [];
-  for (const entry of parts) {
-    results.push(`--${boundary}\r\n`);
-    for (const [headerKey, headerValue] of Object.entries(entry.headers)) {
-      results.push(`${headerKey}: ${headerValue}\r\n`);
-    }
-    results.push(`\r\n`);
-    // @ts-expect-error: TypeScript doesn't know about the `string` property
-    if (entry.string != null) {
-      // @ts-expect-error: TypeScript doesn't know about the `string` property
-      results.push(entry.string);
-    } else {
-      throw new Error('Unsupported FormDataPart implementation');
-    }
-    results.push(`\r\n`);
-  }
-
-  results.push(`--${boundary}--\r\n`);
-  return { body: results.join(''), boundary };
-}
-
-/**
- * Create mutipart boundary
- */
-export function createBoundary(): string {
-  const boundaryChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-  let boundary = '----ExpoFetchFormBoundary';
-  for (let i = 0; i < 16; i++) {
-    boundary += boundaryChars.charAt(Math.floor(Math.random() * boundaryChars.length));
-  }
-  return boundary;
-}
-
 /**
  * Normalize a BodyInit object to a Uint8Array for NativeRequest
  */
@@ -105,7 +57,10 @@ export async function normalizeBodyInitAsync(
   }
 
   if (body instanceof Blob) {
-    return { body: new Uint8Array(await body.arrayBuffer()) };
+    return {
+      body: new Uint8Array(await blobToArrayBufferAsync(body)),
+      overriddenHeaders: [['Content-Type', body.type]],
+    };
   }
 
   if (body instanceof URLSearchParams) {
@@ -119,10 +74,10 @@ export async function normalizeBodyInitAsync(
   }
 
   if (body instanceof FormData) {
-    const { body: result, boundary } = convertFormData(body);
-    const encoder = new TextEncoder();
+    const { body: result, boundary } = await convertFormDataAsync(body);
+
     return {
-      body: encoder.encode(result),
+      body: result,
       overriddenHeaders: [['Content-Type', `multipart/form-data; boundary=${boundary}`]],
     };
   }

package/src/winter/fetch/__tests__/RequestUtils-test.ts

@@ -7,58 +7,12 @@ import { ReadableStream } from 'web-streams-polyfill';
 
 import { type NativeHeadersType } from '../NativeRequest';
 import {
-  convertFormData,
   convertReadableStreamToUint8ArrayAsync,
-  createBoundary,
   normalizeBodyInitAsync,
   normalizeHeadersInit,
   overrideHeaders,
 } from '../RequestUtils';
 
-describe(convertFormData, () => {
-  it('should convert react-native FormData to a string with boundary', () => {
-    const formData = new RNFormData();
-    formData.append('foo', 'foo');
-    formData.append('bar', 'bar');
-    const boundary = '----ExpoFetchFormBoundary0000000000000000';
-    const { body, boundary: resultBoundary } = convertFormData(formData, boundary);
-    expect(body).toMatchInlineSnapshot(`
-      "------ExpoFetchFormBoundary0000000000000000
-      content-disposition: form-data; name="foo"
-
-      foo
-      ------ExpoFetchFormBoundary0000000000000000
-      content-disposition: form-data; name="bar"
-
-      bar
-      ------ExpoFetchFormBoundary0000000000000000--
-      "
-    `);
-    expect(resultBoundary).toBe(boundary);
-  });
-
-  it('should throw an error if the react-native FormData passing an uri', () => {
-    const formData = new RNFormData();
-    formData.append('foo', {
-      uri: 'file:/path/to/test.jpg',
-      type: 'image/jpeg',
-      name: 'test.jpg',
-    });
-    expect(() => {
-      convertFormData(formData);
-    }).toThrow(/Unsupported FormDataPart implementation/);
-  });
-
-  it('should throw an error if passing brower compatible FormData', () => {
-    const formData = new globalThis.FormData();
-    formData.append('foo', 'foo');
-    formData.append('blob', new Blob());
-    expect(() => {
-      convertFormData(formData);
-    }).toThrow(/Unsupported FormData implementation/);
-  });
-});
-
 describe(convertReadableStreamToUint8ArrayAsync, () => {
   it('should convert a readable stream to a Uint8Array', async () => {
     const stream = new ReadableStream<Uint8Array>({
@@ -95,12 +49,6 @@ describe(convertReadableStreamToUint8ArrayAsync, () => {
   });
 });
 
-describe(createBoundary, () => {
-  it('should return a boundary string with ExpoFetchFormBoundary prefix plus 16 random chars', () => {
-    expect(createBoundary()).toMatch(/^----ExpoFetchFormBoundary[\w]{16}$/);
-  });
-});
-
 describe(normalizeBodyInitAsync, () => {
   let originalFormData;
   beforeAll(() => {

package/src/winter/fetch/__tests__/convertFormData-test.native.ts

@@ -0,0 +1,111 @@
+import RNFormData from 'react-native/Libraries/Network/FormData';
+import { TextDecoder, TextEncoder } from 'util';
+
+import { installFormDataPatch } from '../../FormData';
+import { createBoundary, convertFormDataAsync, joinUint8Arrays } from '../convertFormData';
+
+// @ts-ignore - TextDecoder and TextEncoder are not defined in native jest environments.
+globalThis.TextDecoder ??= TextDecoder;
+globalThis.TextEncoder ??= TextEncoder;
+
+const ExpoFormData = installFormDataPatch(RNFormData);
+
+describe(convertFormDataAsync, () => {
+  it('should convert string', async () => {
+    const formData = new ExpoFormData();
+    formData.append('foo', 'foo');
+    formData.append('bar', 'bar');
+    const boundary = '----ExpoFetchFormBoundary0000000000000000';
+    const { body, boundary: resultBoundary } = await convertFormDataAsync(formData, boundary);
+    expect(new TextDecoder().decode(body)).toMatchInlineSnapshot(`
+      "------ExpoFetchFormBoundary0000000000000000
+      content-disposition: form-data; name="foo"
+
+      foo
+      ------ExpoFetchFormBoundary0000000000000000
+      content-disposition: form-data; name="bar"
+
+      bar
+      ------ExpoFetchFormBoundary0000000000000000--
+      "
+    `);
+    expect(resultBoundary).toBe(boundary);
+  });
+
+  it(`should convert blob`, async () => {
+    const formData = new ExpoFormData();
+    const blob = new Blob(['hello blob'], { type: 'text/plain' });
+    formData.append('blob', blob, 'blobFile');
+    const boundary = '----ExpoFetchFormBoundary0000000000000000';
+    const { body, boundary: resultBoundary } = await convertFormDataAsync(formData, boundary);
+    expect(new TextDecoder().decode(body)).toMatchInlineSnapshot(`
+      "------ExpoFetchFormBoundary0000000000000000
+      content-disposition: form-data; name="blob"; filename="blobFile"; filename*=utf-8''blobFile
+      content-type: text/plain
+
+      hello blob
+      ------ExpoFetchFormBoundary0000000000000000--
+      "
+    `);
+    expect(resultBoundary).toBe(boundary);
+  });
+
+  it(`should convert expo-file-system FileBlob`, async () => {
+    const formData = new ExpoFormData();
+    const mockFileBlob = {
+      file: {
+        bytes: () => new Uint8Array([65, 66, 67]),
+      },
+    };
+    // @ts-ignore
+    formData.append('blob', mockFileBlob);
+    const boundary = '----ExpoFetchFormBoundary0000000000000000';
+    const { body, boundary: resultBoundary } = await convertFormDataAsync(formData, boundary);
+    expect(new TextDecoder().decode(body)).toMatchInlineSnapshot(`
+      "------ExpoFetchFormBoundary0000000000000000
+      content-disposition: form-data; name="blob"
+
+      ABC
+      ------ExpoFetchFormBoundary0000000000000000--
+      "
+    `);
+    expect(resultBoundary).toBe(boundary);
+  });
+
+  it('should throw an error if the react-native FormData passing an uri', async () => {
+    const formData = new ExpoFormData();
+    formData.append('foo', {
+      uri: 'file:/path/to/test.jpg',
+      type: 'image/jpeg',
+      name: 'test.jpg',
+    });
+    expect(convertFormDataAsync(formData)).rejects.toThrow(
+      /Unsupported FormDataPart implementation/
+    );
+  });
+});
+
+describe(createBoundary, () => {
+  it('should return a boundary string with ExpoFetchFormBoundary prefix plus 16 random chars', () => {
+    expect(createBoundary()).toMatch(/^----ExpoFetchFormBoundary[\w]{16}$/);
+  });
+});
+
+describe(joinUint8Arrays, () => {
+  it(`should join multiple uint8 arrays`, () => {
+    const array1 = new Uint8Array([1, 2]);
+    const array2 = new Uint8Array([3, 4]);
+    const result = joinUint8Arrays([array1, array2]);
+    const expected = new Uint8Array([1, 2, 3, 4]);
+    expect(result).toEqual(expected);
+  });
+
+  it(`should join 0 size arrays correctly`, () => {
+    const array1 = new Uint8Array([1, 2]);
+    const array2 = new Uint8Array([]);
+    const array3 = new Uint8Array([3, 4]);
+    const result = joinUint8Arrays([array1, array2, array3]);
+    const expected = new Uint8Array([1, 2, 3, 4]);
+    expect(result).toEqual(expected);
+  });
+});

package/src/winter/fetch/convertFormData.ts

@@ -0,0 +1,78 @@
+import { blobToArrayBufferAsync } from '../../utils/blobUtils';
+
+/**
+ * Convert FormData to Uint8Array with a boundary
+ *
+ * `uri` is not supported for React Native's FormData.
+ * `blob` is not supported for standard FormData.
+ */
+export async function convertFormDataAsync(
+  formData: FormData,
+  boundary: string = createBoundary()
+): Promise<{ body: Uint8Array; boundary: string }> {
+  // @ts-expect-error: React Native's FormData is not compatible with the web's FormData
+  if (typeof formData.getParts !== 'function') {
+    throw new Error('Unsupported FormData implementation');
+  }
+  // @ts-expect-error: React Native's FormData is not 100% compatible with ours
+  const parts: ExpoFormDataPart[] = formData.getParts();
+
+  const results: (Uint8Array | string)[] = [];
+  for (const entry of parts) {
+    results.push(`--${boundary}\r\n`);
+    for (const [headerKey, headerValue] of Object.entries(entry.headers)) {
+      results.push(`${headerKey}: ${headerValue}\r\n`);
+    }
+    results.push(`\r\n`);
+    if ('string' in entry) {
+      results.push(entry.string);
+    } else if ('file' in entry) {
+      results.push(entry.file.bytes());
+    } else if ('blob' in entry) {
+      results.push(new Uint8Array(await blobToArrayBufferAsync(entry.blob)));
+    } else {
+      throw new Error('Unsupported FormDataPart implementation');
+    }
+    results.push(`\r\n`);
+  }
+
+  results.push(`--${boundary}--\r\n`);
+  const arrays = results.map((result) => {
+    if (typeof result === 'string') {
+      // @ts-ignore: TextEncoder is not available in all environments
+      return new TextEncoder().encode(result);
+    } else {
+      return result;
+    }
+  }) as Uint8Array[];
+
+  return { body: joinUint8Arrays(arrays), boundary };
+}
+
+/**
+ * Create mutipart boundary
+ */
+export function createBoundary(): string {
+  const boundaryChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+  let boundary = '----ExpoFetchFormBoundary';
+  for (let i = 0; i < 16; i++) {
+    boundary += boundaryChars.charAt(Math.floor(Math.random() * boundaryChars.length));
+  }
+  return boundary;
+}
+
+/**
+ * Merge Uint8Arrays into a single Uint8Array
+ */
+export function joinUint8Arrays(arrays: Uint8Array[]): Uint8Array {
+  const totalLength: number = arrays.reduce((acc: number, arr: Uint8Array) => acc + arr.length, 0);
+  const result: Uint8Array = new Uint8Array(totalLength);
+
+  let offset: number = 0;
+  arrays.forEach((array: Uint8Array) => {
+    result.set(array, offset);
+    offset += array.length;
+  });
+
+  return result;
+}

package/src/winter/fetch/fetch.ts

@@ -1,12 +1,16 @@
 import { ExpoFetchModule } from './ExpoFetchModule';
 import { FetchError } from './FetchErrors';
-import { FetchResponse } from './FetchResponse';
+import { FetchResponse, type AbortSubscriptionCleanupFunction } from './FetchResponse';
 import { NativeRequest, NativeRequestInit } from './NativeRequest';
 import { normalizeBodyInitAsync, normalizeHeadersInit, overrideHeaders } from './RequestUtils';
 import type { FetchRequestInit } from './fetch.types';
 
 export async function fetch(url: string, init?: FetchRequestInit): Promise<FetchResponse> {
-  const response = new FetchResponse();
+  let abortSubscription: AbortSubscriptionCleanupFunction | null = null;
+
+  const response = new FetchResponse(() => {
+    abortSubscription?.();
+  });
   const request = new ExpoFetchModule.NativeRequest(response) as NativeRequest;
 
   let headers = normalizeHeadersInit(init?.headers);
@@ -25,10 +29,9 @@ export async function fetch(url: string, init?: FetchRequestInit): Promise<Fetch
   if (init?.signal && init.signal.aborted) {
     throw new FetchError('The operation was aborted.');
   }
-  const abortHandler = () => {
+  abortSubscription = addAbortSignalListener(init?.signal, () => {
     request.cancel();
-  };
-  init?.signal?.addEventListener('abort', abortHandler);
+  });
   try {
     await request.start(url, nativeRequestInit, requestBody);
   } catch (e: unknown) {
@@ -37,8 +40,19 @@ export async function fetch(url: string, init?: FetchRequestInit): Promise<Fetch
     } else {
       throw new FetchError(String(e));
     }
-  } finally {
-    init?.signal?.removeEventListener('abort', abortHandler);
   }
   return response;
 }
+
+/**
+ * A wrapper of `AbortSignal.addEventListener` that returns a cleanup function.
+ */
+function addAbortSignalListener(
+  signal: AbortSignal | undefined,
+  listener: Parameters<AbortSignal['addEventListener']>[1]
+): AbortSubscriptionCleanupFunction {
+  signal?.addEventListener('abort', listener);
+  return () => {
+    signal?.removeEventListener('abort', listener);
+  };
+}

package/build/devtools/blobUtils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"blobUtils.d.ts","sourceRoot":"","sources":["../../src/devtools/blobUtils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CAKvE;AAED;;GAEG;AACH,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CASnF"}