expo 52.0.20 → 52.0.21

package/android/build.gradle

@@ -33,7 +33,7 @@ def getRNVersion() {
 ensureDependeciesWereEvaluated(project)
 
 group = 'host.exp.exponent'
-version = '52.0.20'
+version = '52.0.21'
 
 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.20"
+    versionName "52.0.21"
     consumerProguardFiles("proguard-rules.pro")
   }
   testOptions {

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

@@ -59,7 +59,7 @@ class ExpoFetchModule : Module() {
       }
 
       AsyncFunction("startStreaming") { response: NativeResponse ->
-        response.startStreaming()
+        return@AsyncFunction response.startStreaming()
       }
 
       AsyncFunction("cancelStreaming") { response: NativeResponse ->

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

@@ -49,9 +49,9 @@ internal class NativeResponse(appContext: AppContext, private val coroutineScope
     state = ResponseState.STARTED
   }
 
-  fun startStreaming() {
+  fun startStreaming(): ByteArray? {
     if (isInvalidState(ResponseState.RESPONSE_RECEIVED, ResponseState.BODY_COMPLETED)) {
-      return
+      return null
     }
     if (state == ResponseState.RESPONSE_RECEIVED) {
       state = ResponseState.BODY_STREAMING_STARTED
@@ -59,9 +59,9 @@ internal class NativeResponse(appContext: AppContext, private val coroutineScope
       emit("didReceiveResponseData", queuedData)
     } else if (state == ResponseState.BODY_COMPLETED) {
       val queuedData = this.sink.finalize()
-      emit("didReceiveResponseData", queuedData)
-      emit("didComplete")
+      return queuedData
     }
+    return null
   }
 
   fun cancelStreaming() {

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

@@ -7,7 +7,8 @@ export type AbortSubscriptionCleanupFunction = () => void;
  */
 export declare class FetchResponse extends ConcreteNativeResponse implements Response {
     private readonly abortCleanupFunction;
-    private streamingStarted;
+    private streamingState;
+    private bodyStream;
     constructor(abortCleanupFunction: AbortSubscriptionCleanupFunction);
     get body(): ReadableStream<Uint8Array> | null;
     get headers(): Headers;

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,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"}
+{"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;IAI/D,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IAHjD,OAAO,CAAC,cAAc,CAA4C;IAClE,OAAO,CAAC,UAAU,CAA2C;gBAEhC,oBAAoB,EAAE,gCAAgC;IAKnF,IAAI,IAAI,IAAI,cAAc,CAAC,UAAU,CAAC,GAAG,IAAI,CAwC5C;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

@@ -22,7 +22,7 @@ export declare class NativeResponse extends SharedObject<NativeResponseEvents> {
     readonly statusText: string;
     readonly url: string;
     readonly redirected: boolean;
-    startStreaming(): void;
+    startStreaming(): Promise<Uint8Array | null>;
     cancelStreaming(reason: string): void;
     arrayBuffer(): Promise<ArrayBuffer>;
     text(): Promise<string>;

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;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"}
+{"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,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAC5C,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IACrC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IACnC,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;CACxB"}

package/ios/Fetch/ExpoFetchModule.swift

@@ -27,8 +27,8 @@ public final class ExpoFetchModule: Module {
         return NativeResponse(dispatchQueue: fetchRequestQueue)
       }
 
-      AsyncFunction("startStreaming") { (response: NativeResponse) in
-        response.startStreaming()
+      AsyncFunction("startStreaming") { (response: NativeResponse) -> Data? in
+        return response.startStreaming()
       }.runOnQueue(fetchRequestQueue)
 
       AsyncFunction("cancelStreaming") { (response: NativeResponse, _ reason: String) in

package/ios/Fetch/NativeResponse.swift

@@ -36,9 +36,9 @@ internal final class NativeResponse: SharedObject, ExpoURLSessionTaskDelegate {
     self.dispatchQueue = dispatchQueue
   }
 
-  func startStreaming() {
+  func startStreaming() -> Data? {
     if isInvalidState(.responseReceived, .bodyCompleted) {
-      return
+      return nil
     }
     if state == .responseReceived {
       state = .bodyStreamingStarted
@@ -46,9 +46,9 @@ internal final class NativeResponse: SharedObject, ExpoURLSessionTaskDelegate {
       emit(event: "didReceiveResponseData", arguments: queuedData)
     } else if state == .bodyCompleted {
       let queuedData = self.sink.finalize()
-      emit(event: "didReceiveResponseData", arguments: queuedData)
-      emit(event: "didComplete")
+      return queuedData
     }
+    return nil
   }
 
   func cancelStreaming() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo",
-  "version": "52.0.20",
+  "version": "52.0.21",
   "description": "The Expo SDK",
   "main": "src/Expo.ts",
   "module": "src/Expo.ts",
@@ -112,5 +112,5 @@
       "optional": true
     }
   },
-  "gitHead": "bfb5a2f3f0c2d100a6ab55509fb324a9bcf7b1b9"
+  "gitHead": "71f2c55ff3f11e43ab43761bb5cece2e48eae0bf"
 }

package/src/winter/fetch/FetchResponse.ts

@@ -11,7 +11,8 @@ export type AbortSubscriptionCleanupFunction = () => void;
  * A response implementation for the `fetch.Response` API.
  */
 export class FetchResponse extends ConcreteNativeResponse implements Response {
-  private streamingStarted = false;
+  private streamingState: 'none' | 'started' | 'completed' = 'none';
+  private bodyStream: ReadableStream<Uint8Array> | null = null;
 
   constructor(private readonly abortCleanupFunction: AbortSubscriptionCleanupFunction) {
     super();
@@ -19,31 +20,45 @@ export class FetchResponse extends ConcreteNativeResponse implements Response {
   }
 
   get body(): ReadableStream<Uint8Array> | null {
-    const response = this;
-    return new ReadableStream({
-      start(controller) {
-        response.addListener('didReceiveResponseData', (data: Uint8Array) => {
-          controller.enqueue(data);
-        });
-
-        response.addListener('didComplete', () => {
-          controller.close();
-        });
-
-        response.addListener('didFailWithError', (error: string) => {
-          controller.error(new Error(error));
-        });
-      },
-      pull() {
-        if (!response.streamingStarted) {
-          response.startStreaming();
-          response.streamingStarted = true;
-        }
-      },
-      cancel(reason) {
-        response.cancelStreaming(String(reason));
-      },
-    });
+    if (this.bodyStream == null) {
+      const response = this;
+      this.bodyStream = new ReadableStream({
+        start(controller) {
+          if (response.streamingState === 'completed') {
+            return;
+          }
+          response.addListener('didReceiveResponseData', (data: Uint8Array) => {
+            controller.enqueue(data);
+          });
+
+          response.addListener('didComplete', () => {
+            controller.close();
+          });
+
+          response.addListener('didFailWithError', (error: string) => {
+            controller.error(new Error(error));
+          });
+        },
+        async pull(controller) {
+          if (response.streamingState === 'none') {
+            const completedData = await response.startStreaming();
+            if (completedData != null) {
+              controller.enqueue(completedData);
+              controller.close();
+              response.streamingState = 'completed';
+            } else {
+              response.streamingState = 'started';
+            }
+          } else if (response.streamingState === 'completed') {
+            controller.close();
+          }
+        },
+        cancel(reason) {
+          response.cancelStreaming(String(reason));
+        },
+      });
+    }
+    return this.bodyStream;
   }
 
   get headers(): Headers {

package/src/winter/fetch/NativeRequest.ts

@@ -31,7 +31,7 @@ export declare class NativeResponse extends SharedObject<NativeResponseEvents> {
   readonly statusText: string;
   readonly url: string;
   readonly redirected: boolean;
-  startStreaming(): void;
+  startStreaming(): Promise<Uint8Array | null>;
   cancelStreaming(reason: string): void;
   arrayBuffer(): Promise<ArrayBuffer>;
   text(): Promise<string>;