[Flight][Fizz] ping work within current task

packages/react-dom-bindings/src/server/ReactDOMLegacyServerStreamConfig.js

@@ -20,6 +20,10 @@ export function scheduleWork(callback: () => void) {
   callback();
 }
 
+export function scheduleEagerWork(callback: () => void) {
+  callback();
+}
+
 export function flushBuffered(destination: Destination) {}
 
 export function beginWriting(destination: Destination) {}

packages/react-dom/src/__tests__/ReactDOMFizzServerNode-test.js

@@ -38,7 +38,7 @@ describe('ReactDOMFizzServerNode', () => {
       writable.on('finish', () => {
         resolve();
       });
-      writable.on('error', () => {
+      writable.on('error', pl => {
         resolve();
       });
     });
@@ -589,6 +589,7 @@ describe('ReactDOMFizzServerNode', () => {
       if (!hasLoaded) {
         throw promise;
       }
+      console.log('rendering');
       rendered = true;
       return 'Done';
     }
@@ -617,12 +618,11 @@ describe('ReactDOMFizzServerNode', () => {
     writable.end();
 
     await jest.runAllTimers();
+    await completed;
 
     hasLoaded = true;
     resolve();
 
-    await completed;
-
     expect(errors).toEqual([
       'The destination stream errored while writing data.',
     ]);

packages/react-noop-renderer/src/ReactNoopFlightServer.js

@@ -28,6 +28,9 @@ const ReactNoopFlightServer = ReactFlightServer({
   scheduleWork(callback: () => void) {
     callback();
   },
+  scheduleEagerWork(callback: () => void) {
+    callback();
+  },
   beginWriting(destination: Destination): void {},
   writeChunk(destination: Destination, chunk: string): void {
     destination.push(chunk);

packages/react-noop-renderer/src/ReactNoopServer.js

@@ -77,6 +77,9 @@ const ReactNoopServer = ReactFizzServer({
   scheduleWork(callback: () => void) {
     callback();
   },
+  scheduleEagerWork(callback: () => void) {
+    callback();
+  },
   beginWriting(destination: Destination): void {},
   writeChunk(destination: Destination, buffer: Uint8Array): void {
     write(destination, buffer);

packages/react-server/src/ReactFizzServer.js

@@ -36,6 +36,7 @@ import {describeObjectForErrorMessage} from 'shared/ReactSerializationErrors';
 
 import {
   scheduleWork,
+  scheduleEagerWork,
   beginWriting,
   writeChunk,
   writeChunkAndReturn,
@@ -595,7 +596,7 @@ function pingTask(request: Request, task: Task): void {
   pingedTasks.push(task);
   if (request.pingedTasks.length === 1) {
     request.flushScheduled = request.destination !== null;
-    scheduleWork(() => performWork(request));
+    scheduleEagerWork(() => performWork(request));
   }
 }
 
@@ -4430,6 +4431,7 @@ export function abort(request: Request, reason: mixed): void {
       flushCompletedQueues(request, request.destination);
     }
   } catch (error) {
+    console.log('caught', error);
     const errorInfo: ThrownInfo = {};
     logRecoverableError(request, error, errorInfo);
     fatalError(request, error);

packages/react-server/src/ReactFlightServer.js

@@ -24,6 +24,7 @@ import {enableFlightReadableStream} from 'shared/ReactFeatureFlags';
 
 import {
   scheduleWork,
+  scheduleEagerWork,
   flushBuffered,
   beginWriting,
   writeChunkAndReturn,
@@ -1237,7 +1238,7 @@ function pingTask(request: Request, task: Task): void {
   pingedTasks.push(task);
   if (pingedTasks.length === 1) {
     request.flushScheduled = request.destination !== null;
-    scheduleWork(() => performWork(request));
+    scheduleEagerWork(() => performWork(request));
   }
 }
 

packages/react-server/src/ReactServerStreamConfigBrowser.js

@@ -17,6 +17,10 @@ export function scheduleWork(callback: () => void) {
   callback();
 }
 
+export function scheduleEagerWork(callback: () => void) {
+  callback();
+}
+
 export function flushBuffered(destination: Destination) {
   // WHATWG Streams do not yet have a way to flush the underlying
   // transform streams. https://github.com/whatwg/streams/issues/960

packages/react-server/src/ReactServerStreamConfigBun.js

@@ -25,6 +25,10 @@ export function scheduleWork(callback: () => void) {
   callback();
 }
 
+export function scheduleEagerWork(callback: () => void) {
+  callback();
+}
+
 export function flushBuffered(destination: Destination) {
   // Bun direct streams provide a flush function.
   // If we don't have any more data to send right now.

packages/react-server/src/ReactServerStreamConfigEdge.js

@@ -17,6 +17,11 @@ export function scheduleWork(callback: () => void) {
   setTimeout(callback, 0);
 }
 
+const resolved = Promise.resolve();
+export function scheduleEagerWork(callback: () => void) {
+  resolved.then(callback);
+}
+
 export function flushBuffered(destination: Destination) {
   // WHATWG Streams do not yet have a way to flush the underlying
   // transform streams. https://github.com/whatwg/streams/issues/960

packages/react-server/src/ReactServerStreamConfigNode.js

@@ -26,6 +26,11 @@ export function scheduleWork(callback: () => void) {
   setImmediate(callback);
 }
 
+const resolved = Promise.resolve();
+export function scheduleEagerWork(callback: () => void) {
+  resolved.then(callback);
+}
+
 export function flushBuffered(destination: Destination) {
   // If we don't have any more data to send right now.
   // Flush whatever is in the buffer to the wire.

packages/react-server/src/forks/ReactServerStreamConfig.custom.js

@@ -31,6 +31,7 @@ export opaque type Chunk = mixed; // eslint-disable-line no-undef
 export opaque type BinaryChunk = mixed; // eslint-disable-line no-undef
 
 export const scheduleWork = $$$config.scheduleWork;
+export const scheduleEagerWork = $$$config.scheduleEagerWork;
 export const beginWriting = $$$config.beginWriting;
 export const writeChunk = $$$config.writeChunk;
 export const writeChunkAndReturn = $$$config.writeChunkAndReturn;

packages/react-server/src/forks/ReactServerStreamConfig.dom-fb-experimental.js

@@ -46,6 +46,10 @@ export function scheduleWork(callback: () => void) {
   callback();
 }
 
+export function scheduleEagerWork(callback: () => void) {
+  callback();
+}
+
 export function beginWriting(destination: Destination) {
   destination.beginWriting();
 }

packages/react-server/src/forks/ReactServerStreamConfig.dom-fb.js

@@ -12,3 +12,7 @@ export * from '../ReactServerStreamConfigFB';
 export function scheduleWork(callback: () => void) {
   // We don't schedule work in this model, and instead expect performWork to always be called repeatedly.
 }
+
+export function scheduleEagerWork(callback: () => void) {
+  // We don't schedule work in this model, and instead expect performWork to always be called repeatedly.
+}