Skip to content

Commit b180cb2

Browse files
sebmarkbageeps1lon
authored andcommitted
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

9 files changed

Lines changed: 709 additions & 278 deletions

File tree

‎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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
23+
2224
exporttypeServerManifest={
2325
[string]: Array<string>,
2426
};
@@ -78,7 +80,10 @@ export function preloadModule<T>(
7880

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

8489
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
38+
3739
exporttypeServerConsumerModuleMap=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
returnmoduleExports.__esModule ? moduleExports.default : moduleExports;
247249
}
248-
return moduleExports[metadata[NAME]];
250+
if (hasOwnProperty.call(moduleExports, metadata[NAME])) {
251+
returnmoduleExports[metadata[NAME]];
252+
}
253+
return (undefined: any);
249254
}
250255

251256
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
28+
2729
exporttypeServerConsumerModuleMap={
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
returnmoduleExports.default;
160162
}
161-
returnmoduleExports[metadata.name];
163+
if(hasOwnProperty.call(moduleExports,metadata.name)){
164+
returnmoduleExports[metadata.name];
165+
}
166+
return(undefined: any);
162167
}
163168

164169
exportfunctiongetModuleDebugInfo<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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
38+
3739
exporttypeServerConsumerModuleMap=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
returnmoduleExports.__esModule ? moduleExports.default : moduleExports;
255257
}
256-
returnmoduleExports[metadata[NAME]];
258+
if(hasOwnProperty.call(moduleExports,metadata[NAME])){
259+
returnmoduleExports[metadata[NAME]];
260+
}
261+
return(undefined: any);
257262
}
258263

259264
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Bring ReactFlightClient fixes to FlightReplyServer · react/react@b180cb2 · GitHub
Skip to content

Commit b180cb2

Browse files
sebmarkbageeps1lon
authored andcommitted
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

9 files changed

Lines changed: 709 additions & 278 deletions

File tree

‎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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
23+
2224
exporttypeServerManifest={
2325
[string]: Array<string>,
2426
};
@@ -78,7 +80,10 @@ export function preloadModule<T>(
7880

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

8489
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
38+
3739
exporttypeServerConsumerModuleMap=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
returnmoduleExports.__esModule ? moduleExports.default : moduleExports;
247249
}
248-
return moduleExports[metadata[NAME]];
250+
if (hasOwnProperty.call(moduleExports, metadata[NAME])) {
251+
returnmoduleExports[metadata[NAME]];
252+
}
253+
return (undefined: any);
249254
}
250255

251256
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
28+
2729
exporttypeServerConsumerModuleMap={
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
returnmoduleExports.default;
160162
}
161-
returnmoduleExports[metadata.name];
163+
if(hasOwnProperty.call(moduleExports,metadata.name)){
164+
returnmoduleExports[metadata.name];
165+
}
166+
return(undefined: any);
162167
}
163168

164169
exportfunctiongetModuleDebugInfo<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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
38+
3739
exporttypeServerConsumerModuleMap=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
returnmoduleExports.__esModule ? moduleExports.default : moduleExports;
255257
}
256-
returnmoduleExports[metadata[NAME]];
258+
if(hasOwnProperty.call(moduleExports,metadata[NAME])){
259+
returnmoduleExports[metadata[NAME]];
260+
}
261+
return(undefined: any);
257262
}
258263

259264
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Bring ReactFlightClient fixes to FlightReplyServer · react/react@b180cb2 · GitHub
Skip to content

Commit b180cb2

Browse files
sebmarkbageeps1lon
authored andcommitted
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

9 files changed

Lines changed: 709 additions & 278 deletions

File tree

‎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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
23+
2224
exporttypeServerManifest={
2325
[string]: Array<string>,
2426
};
@@ -78,7 +80,10 @@ export function preloadModule<T>(
7880

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

8489
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
38+
3739
exporttypeServerConsumerModuleMap=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
returnmoduleExports.__esModule ? moduleExports.default : moduleExports;
247249
}
248-
return moduleExports[metadata[NAME]];
250+
if (hasOwnProperty.call(moduleExports, metadata[NAME])) {
251+
returnmoduleExports[metadata[NAME]];
252+
}
253+
return (undefined: any);
249254
}
250255

251256
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
28+
2729
exporttypeServerConsumerModuleMap={
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
returnmoduleExports.default;
160162
}
161-
returnmoduleExports[metadata.name];
163+
if(hasOwnProperty.call(moduleExports,metadata.name)){
164+
returnmoduleExports[metadata.name];
165+
}
166+
return(undefined: any);
162167
}
163168

164169
exportfunctiongetModuleDebugInfo<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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
38+
3739
exporttypeServerConsumerModuleMap=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
returnmoduleExports.__esModule ? moduleExports.default : moduleExports;
255257
}
256-
returnmoduleExports[metadata[NAME]];
258+
if(hasOwnProperty.call(moduleExports,metadata[NAME])){
259+
returnmoduleExports[metadata[NAME]];
260+
}
261+
return(undefined: any);
257262
}
258263

259264
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Bring ReactFlightClient fixes to FlightReplyServer · react/react@b180cb2 · GitHub
Skip to content

Commit b180cb2

Browse files
sebmarkbageeps1lon
authored andcommitted
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

9 files changed

Lines changed: 709 additions & 278 deletions

File tree

‎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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
23+
2224
exporttypeServerManifest={
2325
[string]: Array<string>,
2426
};
@@ -78,7 +80,10 @@ export function preloadModule<T>(
7880

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

8489
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
38+
3739
exporttypeServerConsumerModuleMap=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
returnmoduleExports.__esModule ? moduleExports.default : moduleExports;
247249
}
248-
return moduleExports[metadata[NAME]];
250+
if (hasOwnProperty.call(moduleExports, metadata[NAME])) {
251+
returnmoduleExports[metadata[NAME]];
252+
}
253+
return (undefined: any);
249254
}
250255

251256
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
28+
2729
exporttypeServerConsumerModuleMap={
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
returnmoduleExports.default;
160162
}
161-
returnmoduleExports[metadata.name];
163+
if(hasOwnProperty.call(moduleExports,metadata.name)){
164+
returnmoduleExports[metadata.name];
165+
}
166+
return(undefined: any);
162167
}
163168

164169
exportfunctiongetModuleDebugInfo<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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
38+
3739
exporttypeServerConsumerModuleMap=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
returnmoduleExports.__esModule ? moduleExports.default : moduleExports;
255257
}
256-
returnmoduleExports[metadata[NAME]];
258+
if(hasOwnProperty.call(moduleExports,metadata[NAME])){
259+
returnmoduleExports[metadata[NAME]];
260+
}
261+
return(undefined: any);
257262
}
258263

259264
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Bring ReactFlightClient fixes to FlightReplyServer · react/react@b180cb2 · GitHub
Skip to content

Commit b180cb2

Browse files
sebmarkbageeps1lon
authored andcommitted
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

9 files changed

Lines changed: 709 additions & 278 deletions

File tree

‎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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
23+
2224
exporttypeServerManifest={
2325
[string]: Array<string>,
2426
};
@@ -78,7 +80,10 @@ export function preloadModule<T>(
7880

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

8489
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
38+
3739
exporttypeServerConsumerModuleMap=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
returnmoduleExports.__esModule ? moduleExports.default : moduleExports;
247249
}
248-
return moduleExports[metadata[NAME]];
250+
if (hasOwnProperty.call(moduleExports, metadata[NAME])) {
251+
returnmoduleExports[metadata[NAME]];
252+
}
253+
return (undefined: any);
249254
}
250255

251256
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
28+
2729
exporttypeServerConsumerModuleMap={
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
returnmoduleExports.default;
160162
}
161-
returnmoduleExports[metadata.name];
163+
if(hasOwnProperty.call(moduleExports,metadata.name)){
164+
returnmoduleExports[metadata.name];
165+
}
166+
return(undefined: any);
162167
}
163168

164169
exportfunctiongetModuleDebugInfo<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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
38+
3739
exporttypeServerConsumerModuleMap=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
returnmoduleExports.__esModule ? moduleExports.default : moduleExports;
255257
}
256-
returnmoduleExports[metadata[NAME]];
258+
if(hasOwnProperty.call(moduleExports,metadata[NAME])){
259+
returnmoduleExports[metadata[NAME]];
260+
}
261+
return(undefined: any);
257262
}
258263

259264
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Bring ReactFlightClient fixes to FlightReplyServer · react/react@b180cb2 · GitHub
Skip to content

Commit b180cb2

Browse files
sebmarkbageeps1lon
authored andcommitted
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

9 files changed

Lines changed: 709 additions & 278 deletions

File tree

‎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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
23+
2224
exporttypeServerManifest={
2325
[string]: Array<string>,
2426
};
@@ -78,7 +80,10 @@ export function preloadModule<T>(
7880

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

8489
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
38+
3739
exporttypeServerConsumerModuleMap=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
returnmoduleExports.__esModule ? moduleExports.default : moduleExports;
247249
}
248-
return moduleExports[metadata[NAME]];
250+
if (hasOwnProperty.call(moduleExports, metadata[NAME])) {
251+
returnmoduleExports[metadata[NAME]];
252+
}
253+
return (undefined: any);
249254
}
250255

251256
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
28+
2729
exporttypeServerConsumerModuleMap={
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
returnmoduleExports.default;
160162
}
161-
returnmoduleExports[metadata.name];
163+
if(hasOwnProperty.call(moduleExports,metadata.name)){
164+
returnmoduleExports[metadata.name];
165+
}
166+
return(undefined: any);
162167
}
163168

164169
exportfunctiongetModuleDebugInfo<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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
38+
3739
exporttypeServerConsumerModuleMap=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
returnmoduleExports.__esModule ? moduleExports.default : moduleExports;
255257
}
256-
returnmoduleExports[metadata[NAME]];
258+
if(hasOwnProperty.call(moduleExports,metadata[NAME])){
259+
returnmoduleExports[metadata[NAME]];
260+
}
261+
return(undefined: any);
257262
}
258263

259264
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Bring ReactFlightClient fixes to FlightReplyServer · react/react@b180cb2 · GitHub
Skip to content

Commit b180cb2

Browse files
sebmarkbageeps1lon
authored andcommitted
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

9 files changed

Lines changed: 709 additions & 278 deletions

File tree

‎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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
23+
2224
exporttypeServerManifest={
2325
[string]: Array<string>,
2426
};
@@ -78,7 +80,10 @@ export function preloadModule<T>(
7880

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

8489
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
38+
3739
exporttypeServerConsumerModuleMap=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
returnmoduleExports.__esModule ? moduleExports.default : moduleExports;
247249
}
248-
return moduleExports[metadata[NAME]];
250+
if (hasOwnProperty.call(moduleExports, metadata[NAME])) {
251+
returnmoduleExports[metadata[NAME]];
252+
}
253+
return (undefined: any);
249254
}
250255

251256
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
28+
2729
exporttypeServerConsumerModuleMap={
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
returnmoduleExports.default;
160162
}
161-
returnmoduleExports[metadata.name];
163+
if(hasOwnProperty.call(moduleExports,metadata.name)){
164+
returnmoduleExports[metadata.name];
165+
}
166+
return(undefined: any);
162167
}
163168

164169
exportfunctiongetModuleDebugInfo<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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
38+
3739
exporttypeServerConsumerModuleMap=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
returnmoduleExports.__esModule ? moduleExports.default : moduleExports;
255257
}
256-
returnmoduleExports[metadata[NAME]];
258+
if(hasOwnProperty.call(moduleExports,metadata[NAME])){
259+
returnmoduleExports[metadata[NAME]];
260+
}
261+
return(undefined: any);
257262
}
258263

259264
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Bring ReactFlightClient fixes to FlightReplyServer · react/react@b180cb2 · GitHub
Skip to content

Commit b180cb2

Browse files
sebmarkbageeps1lon
authored andcommitted
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

9 files changed

Lines changed: 709 additions & 278 deletions

File tree

‎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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
23+
2224
exporttypeServerManifest={
2325
[string]: Array<string>,
2426
};
@@ -78,7 +80,10 @@ export function preloadModule<T>(
7880

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

8489
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
38+
3739
exporttypeServerConsumerModuleMap=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
returnmoduleExports.__esModule ? moduleExports.default : moduleExports;
247249
}
248-
return moduleExports[metadata[NAME]];
250+
if (hasOwnProperty.call(moduleExports, metadata[NAME])) {
251+
returnmoduleExports[metadata[NAME]];
252+
}
253+
return (undefined: any);
249254
}
250255

251256
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
28+
2729
exporttypeServerConsumerModuleMap={
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
returnmoduleExports.default;
160162
}
161-
returnmoduleExports[metadata.name];
163+
if(hasOwnProperty.call(moduleExports,metadata.name)){
164+
returnmoduleExports[metadata.name];
165+
}
166+
return(undefined: any);
162167
}
163168

164169
exportfunctiongetModuleDebugInfo<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+
importhasOwnPropertyfrom'shared/hasOwnProperty';
38+
3739
exporttypeServerConsumerModuleMap=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
returnmoduleExports.__esModule ? moduleExports.default : moduleExports;
255257
}
256-
returnmoduleExports[metadata[NAME]];
258+
if(hasOwnProperty.call(moduleExports,metadata[NAME])){
259+
returnmoduleExports[metadata[NAME]];
260+
}
261+
return(undefined: any);
257262
}
258263

259264
exportfunctiongetModuleDebugInfo<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-
thrownewError(
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+
newError(
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
constfile=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(leti=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(leti=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)