Skip to content

Commit b180cb2

Browse files
sebmarkbageeps1lon
sebmarkbage
authored and
eps1lon
committed
Bring ReactFlightClient fixes to FlightReplyServer
We did a bunch of refactors to ReactFlightClient in PRs like #29823 and #33664. This brings a bunch of those related refactors to the equivalent FlightReplyServer. Such as deep resolution of cycles and deferred error handling.
1 parent 581fdc5 commit b180cb2

File tree

9 files changed

+709
-278
lines changed

9 files changed

+709
-278
lines changed

‎packages/react-server-dom-esm/src/server/ReactFlightDOMServerNode.js‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -348,31 +348,42 @@ function decodeReplyFromBusboy<T>(
348348
// we queue any fields we receive until the previous file is done.
349349
queuedFields.push(name, value);
350350
} else {
351-
resolveField(response, name, value);
351+
try {
352+
resolveField(response, name, value);
353+
} catch (error) {
354+
busboyStream.destroy(error);
355+
}
352356
}
353357
});
354358
busboyStream.on('file', (name, value, {filename, encoding, mimeType}) => {
355359
if (encoding.toLowerCase() === 'base64') {
356-
throw new Error(
357-
"React doesn't accept base64 encoded file uploads because we don't expect " +
358-
"form data passed from a browser to ever encode data that way. If that's " +
359-
'the wrong assumption, we can easily fix it.',
360+
busboyStream.destroy(
361+
new Error(
362+
"React doesn't accept base64 encoded file uploads because we don't expect " +
363+
"form data passed from a browser to ever encode data that way. If that's " +
364+
'the wrong assumption, we can easily fix it.',
365+
),
360366
);
367+
return;
361368
}
362369
pendingFiles++;
363370
const file = resolveFileInfo(response, name, filename, mimeType);
364371
value.on('data', chunk => {
365372
resolveFileChunk(response, file, chunk);
366373
});
367374
value.on('end', () => {
368-
resolveFileComplete(response, name, file);
369-
pendingFiles--;
370-
if (pendingFiles === 0) {
371-
// Release any queued fields
372-
for (let i = 0; i < queuedFields.length; i += 2) {
373-
resolveField(response, queuedFields[i], queuedFields[i + 1]);
375+
try {
376+
resolveFileComplete(response, name, file);
377+
pendingFiles--;
378+
if (pendingFiles === 0) {
379+
// Release any queued fields
380+
for (let i = 0; i < queuedFields.length; i += 2) {
381+
resolveField(response, queuedFields[i], queuedFields[i + 1]);
382+
}
383+
queuedFields.length = 0;
374384
}
375-
queuedFields.length = 0;
385+
} catch (error) {
386+
busboyStream.destroy(error);
376387
}
377388
});
378389
});

‎packages/react-server-dom-parcel/src/client/ReactFlightClientConfigBundlerParcel.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import {
1919
} from '../shared/ReactFlightImportMetadata';
2020
import {prepareDestinationWithChunks} from 'react-client/src/ReactFlightClientConfig';
2121

22+
import hasOwnProperty from 'shared/hasOwnProperty';
23+
2224
export type ServerManifest = {
2325
[string]: Array<string>,
2426
};
@@ -78,7 +80,10 @@ export function preloadModule<T>(
7880

7981
export function requireModule<T>(metadata: ClientReference<T>): T {
8082
const moduleExports = parcelRequire(metadata[ID]);
81-
return moduleExports[metadata[NAME]];
83+
if (hasOwnProperty.call(moduleExports, metadata[NAME])) {
84+
return moduleExports[metadata[NAME]];
85+
}
86+
return (undefined: any);
8287
}
8388

8489
export function getModuleDebugInfo<T>(

‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerNode.js‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -578,31 +578,42 @@ export function decodeReplyFromBusboy<T>(
578578
// we queue any fields we receive until the previous file is done.
579579
queuedFields.push(name, value);
580580
} else {
581-
resolveField(response, name, value);
581+
try {
582+
resolveField(response, name, value);
583+
} catch (error) {
584+
busboyStream.destroy(error);
585+
}
582586
}
583587
});
584588
busboyStream.on('file', (name, value, {filename, encoding, mimeType}) => {
585589
if (encoding.toLowerCase() === 'base64') {
586-
throw new Error(
587-
"React doesn't accept base64 encoded file uploads because we don't expect " +
588-
"form data passed from a browser to ever encode data that way. If that's " +
589-
'the wrong assumption, we can easily fix it.',
590+
busboyStream.destroy(
591+
new Error(
592+
"React doesn't accept base64 encoded file uploads because we don't expect " +
593+
"form data passed from a browser to ever encode data that way. If that's " +
594+
'the wrong assumption, we can easily fix it.',
595+
),
590596
);
597+
return;
591598
}
592599
pendingFiles++;
593600
const file = resolveFileInfo(response, name, filename, mimeType);
594601
value.on('data', chunk => {
595602
resolveFileChunk(response, file, chunk);
596603
});
597604
value.on('end', () => {
598-
resolveFileComplete(response, name, file);
599-
pendingFiles--;
600-
if (pendingFiles === 0) {
601-
// Release any queued fields
602-
for (let i = 0; i < queuedFields.length; i += 2) {
603-
resolveField(response, queuedFields[i], queuedFields[i + 1]);
605+
try {
606+
resolveFileComplete(response, name, file);
607+
pendingFiles--;
608+
if (pendingFiles === 0) {
609+
// Release any queued fields
610+
for (let i = 0; i < queuedFields.length; i += 2) {
611+
resolveField(response, queuedFields[i], queuedFields[i + 1]);
612+
}
613+
queuedFields.length = 0;
604614
}
605-
queuedFields.length = 0;
615+
} catch (error) {
616+
busboyStream.destroy(error);
606617
}
607618
});
608619
});

‎packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ import {
3434
addChunkDebugInfo,
3535
} from 'react-client/src/ReactFlightClientConfig';
3636

37+
import hasOwnProperty from 'shared/hasOwnProperty';
38+
3739
export type ServerConsumerModuleMap = null | {
3840
[clientId: string]: {
3941
[clientExportName: string]: ClientReferenceManifestEntry,
@@ -245,7 +247,10 @@ export function requireModule<T>(metadata: ClientReference<T>): T {
245247
// default property of this if it was an ESM interop module.
246248
return moduleExports.__esModule ? moduleExports.default : moduleExports;
247249
}
248-
return moduleExports[metadata[NAME]];
250+
if (hasOwnProperty.call(moduleExports, metadata[NAME])) {
251+
return moduleExports[metadata[NAME]];
252+
}
253+
return (undefined: any);
249254
}
250255

251256
export function getModuleDebugInfo<T>(

‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerNode.js‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -570,31 +570,42 @@ function decodeReplyFromBusboy<T>(
570570
// we queue any fields we receive until the previous file is done.
571571
queuedFields.push(name, value);
572572
} else {
573-
resolveField(response, name, value);
573+
try {
574+
resolveField(response, name, value);
575+
} catch (error) {
576+
busboyStream.destroy(error);
577+
}
574578
}
575579
});
576580
busboyStream.on('file', (name, value, {filename, encoding, mimeType}) => {
577581
if (encoding.toLowerCase() === 'base64') {
578-
throw new Error(
579-
"React doesn't accept base64 encoded file uploads because we don't expect " +
580-
"form data passed from a browser to ever encode data that way. If that's " +
581-
'the wrong assumption, we can easily fix it.',
582+
busboyStream.destroy(
583+
new Error(
584+
"React doesn't accept base64 encoded file uploads because we don't expect " +
585+
"form data passed from a browser to ever encode data that way. If that's " +
586+
'the wrong assumption, we can easily fix it.',
587+
),
582588
);
589+
return;
583590
}
584591
pendingFiles++;
585592
const file = resolveFileInfo(response, name, filename, mimeType);
586593
value.on('data', chunk => {
587594
resolveFileChunk(response, file, chunk);
588595
});
589596
value.on('end', () => {
590-
resolveFileComplete(response, name, file);
591-
pendingFiles--;
592-
if (pendingFiles === 0) {
593-
// Release any queued fields
594-
for (let i = 0; i < queuedFields.length; i += 2) {
595-
resolveField(response, queuedFields[i], queuedFields[i + 1]);
597+
try {
598+
resolveFileComplete(response, name, file);
599+
pendingFiles--;
600+
if (pendingFiles === 0) {
601+
// Release any queued fields
602+
for (let i = 0; i < queuedFields.length; i += 2) {
603+
resolveField(response, queuedFields[i], queuedFields[i + 1]);
604+
}
605+
queuedFields.length = 0;
596606
}
597-
queuedFields.length = 0;
607+
} catch (error) {
608+
busboyStream.destroy(error);
598609
}
599610
});
600611
});

‎packages/react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerNode.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import {
2424
} from '../shared/ReactFlightImportMetadata';
2525
import {prepareDestinationWithChunks} from 'react-client/src/ReactFlightClientConfig';
2626

27+
import hasOwnProperty from 'shared/hasOwnProperty';
28+
2729
export type ServerConsumerModuleMap = {
2830
[clientId: string]: {
2931
[clientExportName: string]: ClientReference<any>,
@@ -158,7 +160,10 @@ export function requireModule<T>(metadata: ClientReference<T>): T {
158160
// default property of this if it was an ESM interop module.
159161
return moduleExports.default;
160162
}
161-
return moduleExports[metadata.name];
163+
if (hasOwnProperty.call(moduleExports, metadata.name)) {
164+
return moduleExports[metadata.name];
165+
}
166+
return (undefined: any);
162167
}
163168

164169
export function getModuleDebugInfo<T>(metadata: ClientReference<T>): null {

‎packages/react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ import {
3434
addChunkDebugInfo,
3535
} from 'react-client/src/ReactFlightClientConfig';
3636

37+
import hasOwnProperty from 'shared/hasOwnProperty';
38+
3739
export type ServerConsumerModuleMap = null | {
3840
[clientId: string]: {
3941
[clientExportName: string]: ClientReferenceManifestEntry,
@@ -253,7 +255,10 @@ export function requireModule<T>(metadata: ClientReference<T>): T {
253255
// default property of this if it was an ESM interop module.
254256
return moduleExports.__esModule ? moduleExports.default : moduleExports;
255257
}
256-
return moduleExports[metadata[NAME]];
258+
if (hasOwnProperty.call(moduleExports, metadata[NAME])) {
259+
return moduleExports[metadata[NAME]];
260+
}
261+
return (undefined: any);
257262
}
258263

259264
export function getModuleDebugInfo<T>(

‎packages/react-server-dom-webpack/src/server/ReactFlightDOMServerNode.js‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -570,31 +570,42 @@ function decodeReplyFromBusboy<T>(
570570
// we queue any fields we receive until the previous file is done.
571571
queuedFields.push(name, value);
572572
} else {
573-
resolveField(response, name, value);
573+
try {
574+
resolveField(response, name, value);
575+
} catch (error) {
576+
busboyStream.destroy(error);
577+
}
574578
}
575579
});
576580
busboyStream.on('file', (name, value, {filename, encoding, mimeType}) => {
577581
if (encoding.toLowerCase() === 'base64') {
578-
throw new Error(
579-
"React doesn't accept base64 encoded file uploads because we don't expect " +
580-
"form data passed from a browser to ever encode data that way. If that's " +
581-
'the wrong assumption, we can easily fix it.',
582+
busboyStream.destroy(
583+
new Error(
584+
"React doesn't accept base64 encoded file uploads because we don't expect " +
585+
"form data passed from a browser to ever encode data that way. If that's " +
586+
'the wrong assumption, we can easily fix it.',
587+
),
582588
);
589+
return;
583590
}
584591
pendingFiles++;
585592
const file = resolveFileInfo(response, name, filename, mimeType);
586593
value.on('data', chunk => {
587594
resolveFileChunk(response, file, chunk);
588595
});
589596
value.on('end', () => {
590-
resolveFileComplete(response, name, file);
591-
pendingFiles--;
592-
if (pendingFiles === 0) {
593-
// Release any queued fields
594-
for (let i = 0; i < queuedFields.length; i += 2) {
595-
resolveField(response, queuedFields[i], queuedFields[i + 1]);
597+
try {
598+
resolveFileComplete(response, name, file);
599+
pendingFiles--;
600+
if (pendingFiles === 0) {
601+
// Release any queued fields
602+
for (let i = 0; i < queuedFields.length; i += 2) {
603+
resolveField(response, queuedFields[i], queuedFields[i + 1]);
604+
}
605+
queuedFields.length = 0;
596606
}
597-
queuedFields.length = 0;
607+
} catch (error) {
608+
busboyStream.destroy(error);
598609
}
599610
});
600611
});

0 commit comments

Comments
 (0)