Emit Infinite Promise as a Halted Row

No need for the special case.
facebook · Aug 19, 2024 · c7ab906 · c7ab906
1 parent 35b6d73
commit c7ab906
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/packages/react-client/src/ReactFlightClient.js b/packages/react-client/src/ReactFlightClient.js
@@ -45,7 +45,6 @@ import {
   enableRefAsProp,
   enableFlightReadableStream,
   enableOwnerStacks,
-  enableHalt,
 } from 'shared/ReactFeatureFlags';
 
 import {
@@ -1193,10 +1192,6 @@ function parseModelString(
       }
       case '@': {
         // Promise
-        if (value.length === 2) {
-          // Infinite promise that never resolves.
-          return new Promise(() => {});
-        }
         const id = parseInt(value.slice(2), 16);
         const chunk = getChunk(response, id);
         return chunk;
@@ -2634,10 +2629,8 @@ function processFullStringRow(
     }
     // Fallthrough
     case 35 /* "#" */: {
-      if (enableHalt) {
-        resolveBlocked(response, id);
-        return;
-      }
+      resolveBlocked(response, id);
+      return;
     }
     // Fallthrough
     default: /* """ "{" "[" "t" "f" "n" "0" - "9" */ {

diff --git a/packages/react-client/src/__tests__/ReactFlight-test.js b/packages/react-client/src/__tests__/ReactFlight-test.js
@@ -2952,8 +2952,14 @@ describe('ReactFlight', () => {
     function foo() {
       return 'hello';
     }
+
     function ServerComponent() {
-      console.log('hi', {prop: 123, fn: foo, map: new Map([['foo', foo]])});
+      console.log('hi', {
+        prop: 123,
+        fn: foo,
+        map: new Map([['foo', foo]]),
+        promise: new Promise(() => {}),
+      });
       throw new Error('err');
     }
 
@@ -3018,6 +3024,10 @@ describe('ReactFlight', () => {
     expect(loggedFn2).not.toBe(foo);
     expect(loggedFn2.toString()).toBe(foo.toString());
 
+    const promise = mockConsoleLog.mock.calls[0][1].promise;
+    expect(promise).toBeInstanceOf(Promise);
+    expect(promise.status).toBe('blocked');
+
     expect(ownerStacks).toEqual(['\n    in App (at **)']);
   });
 

diff --git a/packages/react-server/src/ReactFlightServer.js b/packages/react-server/src/ReactFlightServer.js
@@ -1815,10 +1815,6 @@ function serializeLazyID(id: number): string {
   return '$L' + id.toString(16);
 }
 
-function serializeInfinitePromise(): string {
-  return '$@';
-}
-
 function serializePromiseID(id: number): string {
   return '$@' + id.toString(16);
 }
@@ -3241,7 +3237,10 @@ function renderConsoleValue(
       }
       // If it hasn't already resolved (and been instrumented) we just encode an infinite
       // promise that will never resolve.
-      return serializeInfinitePromise();
+      request.pendingChunks++;
+      const blockedId = request.nextChunkId++;
+      emitBlockedChunk(request, blockedId);
+      return serializePromiseID(blockedId);
     }
 
     if (existingReference !== undefined) {
@@ -3502,7 +3501,7 @@ function emitConsoleChunk(
         value,
       );
     } catch (x) {
-      return 'unknown value';
+      return 'unknown value' + x.message;
     }
   }