Sync DoS mitigations for React Flight

parent fc3b7c50
...@@ -433,14 +433,17 @@ function processReply( ...@@ -433,14 +433,17 @@ function processReply(
if ("undefined" === typeof value) return "$undefined"; if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) { if ("function" === typeof value) {
parentReference = knownServerReferences.get(value); parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference) if (void 0 !== parentReference) {
return ( key = writtenObjects.get(value);
(key = JSON.stringify(parentReference, resolveToJSON)), if (void 0 !== key) return key;
null === formData && (formData = new FormData()), key = JSON.stringify(parentReference, resolveToJSON);
(parentReference = nextPartId++), null === formData && (formData = new FormData());
formData.set(formFieldPrefix + parentReference, key), parentReference = nextPartId++;
"$h" + parentReference.toString(16) formData.set(formFieldPrefix + parentReference, key);
); key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if ( if (
void 0 !== temporaryReferences && void 0 !== temporaryReferences &&
-1 === key.indexOf(":") && -1 === key.indexOf(":") &&
...@@ -727,10 +730,17 @@ function waitForReference( ...@@ -727,10 +730,17 @@ function waitForReference(
value.then(fulfill, reject); value.then(fulfill, reject);
return; return;
} }
value = value[path[i]]; var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
} }
i = map(response, value, parentObject, key); i = map(response, value, parentObject, key);
parentObject[key] = i; "__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i); "" === key && null === handler.value && (handler.value = i);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -812,7 +822,7 @@ function loadServerReference(response, metaData, parentObject, key) { ...@@ -812,7 +822,7 @@ function loadServerReference(response, metaData, parentObject, key) {
resolvedValue = resolvedValue.bind.apply(resolvedValue, boundArgs); resolvedValue = resolvedValue.bind.apply(resolvedValue, boundArgs);
} }
registerBoundServerReference(resolvedValue, metaData.id, metaData.bound); registerBoundServerReference(resolvedValue, metaData.id, metaData.bound);
parentObject[key] = resolvedValue; "__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && null === handler.value && (handler.value = resolvedValue); "" === key && null === handler.value && (handler.value = resolvedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1129,8 +1139,8 @@ function startReadableStream(response, id, type) { ...@@ -1129,8 +1139,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk)); (previousBlockedChunk = chunk));
} else { } else {
chunk = previousBlockedChunk; chunk = previousBlockedChunk;
var chunk$52 = createPendingChunk(response); var chunk$53 = createPendingChunk(response);
chunk$52.then( chunk$53.then(
function (v) { function (v) {
return controller.enqueue(v); return controller.enqueue(v);
}, },
...@@ -1138,10 +1148,10 @@ function startReadableStream(response, id, type) { ...@@ -1138,10 +1148,10 @@ function startReadableStream(response, id, type) {
return controller.error(e); return controller.error(e);
} }
); );
previousBlockedChunk = chunk$52; previousBlockedChunk = chunk$53;
chunk.then(function () { chunk.then(function () {
previousBlockedChunk === chunk$52 && (previousBlockedChunk = null); previousBlockedChunk === chunk$53 && (previousBlockedChunk = null);
resolveModelChunk(chunk$52, json); resolveModelChunk(chunk$53, json);
}); });
} }
}, },
...@@ -1276,8 +1286,8 @@ function mergeBuffer(buffer, lastChunk) { ...@@ -1276,8 +1286,8 @@ function mergeBuffer(buffer, lastChunk) {
for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++) for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++)
byteLength += buffer[i].byteLength; byteLength += buffer[i].byteLength;
byteLength = new Uint8Array(byteLength); byteLength = new Uint8Array(byteLength);
for (var i$53 = (i = 0); i$53 < l; i$53++) { for (var i$54 = (i = 0); i$54 < l; i$54++) {
var chunk = buffer[i$53]; var chunk = buffer[i$54];
byteLength.set(chunk, i); byteLength.set(chunk, i);
i += chunk.byteLength; i += chunk.byteLength;
} }
...@@ -1467,42 +1477,44 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) { ...@@ -1467,42 +1477,44 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) {
} }
function createFromJSONCallback(response) { function createFromJSONCallback(response) {
return function (key, value) { return function (key, value) {
if ("string" === typeof value) if ("__proto__" !== key) {
return parseModelString(response, this, key, value); if ("string" === typeof value)
if ("object" === typeof value && null !== value) { return parseModelString(response, this, key, value);
if (value[0] === REACT_ELEMENT_TYPE) { if ("object" === typeof value && null !== value) {
if ( if (value[0] === REACT_ELEMENT_TYPE) {
((key = {
$$typeof: REACT_ELEMENT_TYPE,
type: value[1],
key: value[2],
ref: null,
props: value[3]
}),
null !== initializingHandler)
)
if ( if (
((value = initializingHandler), ((key = {
(initializingHandler = value.parent), $$typeof: REACT_ELEMENT_TYPE,
value.errored) type: value[1],
key: value[2],
ref: null,
props: value[3]
}),
null !== initializingHandler)
) )
(key = createErrorChunk(response, value.value)), if (
(key = createLazyChunkWrapper(key)); ((value = initializingHandler),
else if (0 < value.deps) { (initializingHandler = value.parent),
var blockedChunk = new ReactPromise( value.errored)
"blocked", )
null, (key = createErrorChunk(response, value.value)),
null, (key = createLazyChunkWrapper(key));
response else if (0 < value.deps) {
); var blockedChunk = new ReactPromise(
value.value = key; "blocked",
value.chunk = blockedChunk; null,
key = createLazyChunkWrapper(blockedChunk); null,
} response
} else key = value; );
return key; value.value = key;
value.chunk = blockedChunk;
key = createLazyChunkWrapper(blockedChunk);
}
} else key = value;
return key;
}
return value;
} }
return value;
}; };
} }
function createResponseFromOptions(options) { function createResponseFromOptions(options) {
......
...@@ -454,14 +454,17 @@ function processReply( ...@@ -454,14 +454,17 @@ function processReply(
if ("undefined" === typeof value) return "$undefined"; if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) { if ("function" === typeof value) {
parentReference = knownServerReferences.get(value); parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference) if (void 0 !== parentReference) {
return ( key = writtenObjects.get(value);
(key = JSON.stringify(parentReference, resolveToJSON)), if (void 0 !== key) return key;
null === formData && (formData = new FormData()), key = JSON.stringify(parentReference, resolveToJSON);
(parentReference = nextPartId++), null === formData && (formData = new FormData());
formData.set(formFieldPrefix + parentReference, key), parentReference = nextPartId++;
"$h" + parentReference.toString(16) formData.set(formFieldPrefix + parentReference, key);
); key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if ( if (
void 0 !== temporaryReferences && void 0 !== temporaryReferences &&
-1 === key.indexOf(":") && -1 === key.indexOf(":") &&
...@@ -895,10 +898,17 @@ function waitForReference( ...@@ -895,10 +898,17 @@ function waitForReference(
value.then(fulfill, reject); value.then(fulfill, reject);
return; return;
} }
value = value[path[i]]; var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
} }
i = map(response, value, parentObject, key); i = map(response, value, parentObject, key);
parentObject[key] = i; "__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i); "" === key && null === handler.value && (handler.value = i);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -995,7 +1005,7 @@ function loadServerReference(response, metaData, parentObject, key) { ...@@ -995,7 +1005,7 @@ function loadServerReference(response, metaData, parentObject, key) {
metaData.bound, metaData.bound,
response._encodeFormAction response._encodeFormAction
); );
parentObject[key] = resolvedValue; "__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && null === handler.value && (handler.value = resolvedValue); "" === key && null === handler.value && (handler.value = resolvedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1317,8 +1327,8 @@ function startReadableStream(response, id, type) { ...@@ -1317,8 +1327,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk)); (previousBlockedChunk = chunk));
} else { } else {
chunk = previousBlockedChunk; chunk = previousBlockedChunk;
var chunk$52 = createPendingChunk(response); var chunk$53 = createPendingChunk(response);
chunk$52.then( chunk$53.then(
function (v) { function (v) {
return controller.enqueue(v); return controller.enqueue(v);
}, },
...@@ -1326,10 +1336,10 @@ function startReadableStream(response, id, type) { ...@@ -1326,10 +1336,10 @@ function startReadableStream(response, id, type) {
return controller.error(e); return controller.error(e);
} }
); );
previousBlockedChunk = chunk$52; previousBlockedChunk = chunk$53;
chunk.then(function () { chunk.then(function () {
previousBlockedChunk === chunk$52 && (previousBlockedChunk = null); previousBlockedChunk === chunk$53 && (previousBlockedChunk = null);
resolveModelChunk(chunk$52, json); resolveModelChunk(chunk$53, json);
}); });
} }
}, },
...@@ -1464,8 +1474,8 @@ function mergeBuffer(buffer, lastChunk) { ...@@ -1464,8 +1474,8 @@ function mergeBuffer(buffer, lastChunk) {
for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++) for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++)
byteLength += buffer[i].byteLength; byteLength += buffer[i].byteLength;
byteLength = new Uint8Array(byteLength); byteLength = new Uint8Array(byteLength);
for (var i$53 = (i = 0); i$53 < l; i$53++) { for (var i$54 = (i = 0); i$54 < l; i$54++) {
var chunk = buffer[i$53]; var chunk = buffer[i$54];
byteLength.set(chunk, i); byteLength.set(chunk, i);
i += chunk.byteLength; i += chunk.byteLength;
} }
...@@ -1655,42 +1665,44 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) { ...@@ -1655,42 +1665,44 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) {
} }
function createFromJSONCallback(response) { function createFromJSONCallback(response) {
return function (key, value) { return function (key, value) {
if ("string" === typeof value) if ("__proto__" !== key) {
return parseModelString(response, this, key, value); if ("string" === typeof value)
if ("object" === typeof value && null !== value) { return parseModelString(response, this, key, value);
if (value[0] === REACT_ELEMENT_TYPE) { if ("object" === typeof value && null !== value) {
if ( if (value[0] === REACT_ELEMENT_TYPE) {
((key = {
$$typeof: REACT_ELEMENT_TYPE,
type: value[1],
key: value[2],
ref: null,
props: value[3]
}),
null !== initializingHandler)
)
if ( if (
((value = initializingHandler), ((key = {
(initializingHandler = value.parent), $$typeof: REACT_ELEMENT_TYPE,
value.errored) type: value[1],
key: value[2],
ref: null,
props: value[3]
}),
null !== initializingHandler)
) )
(key = createErrorChunk(response, value.value)), if (
(key = createLazyChunkWrapper(key)); ((value = initializingHandler),
else if (0 < value.deps) { (initializingHandler = value.parent),
var blockedChunk = new ReactPromise( value.errored)
"blocked", )
null, (key = createErrorChunk(response, value.value)),
null, (key = createLazyChunkWrapper(key));
response else if (0 < value.deps) {
); var blockedChunk = new ReactPromise(
value.value = key; "blocked",
value.chunk = blockedChunk; null,
key = createLazyChunkWrapper(blockedChunk); null,
} response
} else key = value; );
return key; value.value = key;
value.chunk = blockedChunk;
key = createLazyChunkWrapper(blockedChunk);
}
} else key = value;
return key;
}
return value;
} }
return value;
}; };
} }
function noServerCall() { function noServerCall() {
......
...@@ -455,14 +455,17 @@ function processReply( ...@@ -455,14 +455,17 @@ function processReply(
if ("undefined" === typeof value) return "$undefined"; if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) { if ("function" === typeof value) {
parentReference = knownServerReferences.get(value); parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference) if (void 0 !== parentReference) {
return ( key = writtenObjects.get(value);
(key = JSON.stringify(parentReference, resolveToJSON)), if (void 0 !== key) return key;
null === formData && (formData = new FormData()), key = JSON.stringify(parentReference, resolveToJSON);
(parentReference = nextPartId++), null === formData && (formData = new FormData());
formData.set(formFieldPrefix + parentReference, key), parentReference = nextPartId++;
"$h" + parentReference.toString(16) formData.set(formFieldPrefix + parentReference, key);
); key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if ( if (
void 0 !== temporaryReferences && void 0 !== temporaryReferences &&
-1 === key.indexOf(":") && -1 === key.indexOf(":") &&
...@@ -896,10 +899,17 @@ function waitForReference( ...@@ -896,10 +899,17 @@ function waitForReference(
value.then(fulfill, reject); value.then(fulfill, reject);
return; return;
} }
value = value[path[i]]; var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
} }
i = map(response, value, parentObject, key); i = map(response, value, parentObject, key);
parentObject[key] = i; "__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i); "" === key && null === handler.value && (handler.value = i);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -996,7 +1006,7 @@ function loadServerReference(response, metaData, parentObject, key) { ...@@ -996,7 +1006,7 @@ function loadServerReference(response, metaData, parentObject, key) {
metaData.bound, metaData.bound,
response._encodeFormAction response._encodeFormAction
); );
parentObject[key] = resolvedValue; "__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && null === handler.value && (handler.value = resolvedValue); "" === key && null === handler.value && (handler.value = resolvedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1318,8 +1328,8 @@ function startReadableStream(response, id, type) { ...@@ -1318,8 +1328,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk)); (previousBlockedChunk = chunk));
} else { } else {
chunk = previousBlockedChunk; chunk = previousBlockedChunk;
var chunk$52 = createPendingChunk(response); var chunk$53 = createPendingChunk(response);
chunk$52.then( chunk$53.then(
function (v) { function (v) {
return controller.enqueue(v); return controller.enqueue(v);
}, },
...@@ -1327,10 +1337,10 @@ function startReadableStream(response, id, type) { ...@@ -1327,10 +1337,10 @@ function startReadableStream(response, id, type) {
return controller.error(e); return controller.error(e);
} }
); );
previousBlockedChunk = chunk$52; previousBlockedChunk = chunk$53;
chunk.then(function () { chunk.then(function () {
previousBlockedChunk === chunk$52 && (previousBlockedChunk = null); previousBlockedChunk === chunk$53 && (previousBlockedChunk = null);
resolveModelChunk(chunk$52, json); resolveModelChunk(chunk$53, json);
}); });
} }
}, },
...@@ -1465,8 +1475,8 @@ function mergeBuffer(buffer, lastChunk) { ...@@ -1465,8 +1475,8 @@ function mergeBuffer(buffer, lastChunk) {
for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++) for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++)
byteLength += buffer[i].byteLength; byteLength += buffer[i].byteLength;
byteLength = new Uint8Array(byteLength); byteLength = new Uint8Array(byteLength);
for (var i$53 = (i = 0); i$53 < l; i$53++) { for (var i$54 = (i = 0); i$54 < l; i$54++) {
var chunk = buffer[i$53]; var chunk = buffer[i$54];
byteLength.set(chunk, i); byteLength.set(chunk, i);
i += chunk.byteLength; i += chunk.byteLength;
} }
...@@ -1656,42 +1666,44 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) { ...@@ -1656,42 +1666,44 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) {
} }
function createFromJSONCallback(response) { function createFromJSONCallback(response) {
return function (key, value) { return function (key, value) {
if ("string" === typeof value) if ("__proto__" !== key) {
return parseModelString(response, this, key, value); if ("string" === typeof value)
if ("object" === typeof value && null !== value) { return parseModelString(response, this, key, value);
if (value[0] === REACT_ELEMENT_TYPE) { if ("object" === typeof value && null !== value) {
if ( if (value[0] === REACT_ELEMENT_TYPE) {
((key = {
$$typeof: REACT_ELEMENT_TYPE,
type: value[1],
key: value[2],
ref: null,
props: value[3]
}),
null !== initializingHandler)
)
if ( if (
((value = initializingHandler), ((key = {
(initializingHandler = value.parent), $$typeof: REACT_ELEMENT_TYPE,
value.errored) type: value[1],
key: value[2],
ref: null,
props: value[3]
}),
null !== initializingHandler)
) )
(key = createErrorChunk(response, value.value)), if (
(key = createLazyChunkWrapper(key)); ((value = initializingHandler),
else if (0 < value.deps) { (initializingHandler = value.parent),
var blockedChunk = new ReactPromise( value.errored)
"blocked", )
null, (key = createErrorChunk(response, value.value)),
null, (key = createLazyChunkWrapper(key));
response else if (0 < value.deps) {
); var blockedChunk = new ReactPromise(
value.value = key; "blocked",
value.chunk = blockedChunk; null,
key = createLazyChunkWrapper(blockedChunk); null,
} response
} else key = value; );
return key; value.value = key;
value.chunk = blockedChunk;
key = createLazyChunkWrapper(blockedChunk);
}
} else key = value;
return key;
}
return value;
} }
return value;
}; };
} }
function noServerCall() { function noServerCall() {
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
"neo-async": "^2.6.1" "neo-async": "^2.6.1"
}, },
"peerDependencies": { "peerDependencies": {
"react": "0.0.0-experimental-7a835f3c-20251211", "react": "0.0.0-experimental-ff76fc6a-20260126",
"react-dom": "0.0.0-experimental-7a835f3c-20251211" "react-dom": "0.0.0-experimental-ff76fc6a-20260126"
} }
} }
\ No newline at end of file
...@@ -432,14 +432,17 @@ function processReply( ...@@ -432,14 +432,17 @@ function processReply(
if ("undefined" === typeof value) return "$undefined"; if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) { if ("function" === typeof value) {
parentReference = knownServerReferences.get(value); parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference) if (void 0 !== parentReference) {
return ( key = writtenObjects.get(value);
(key = JSON.stringify(parentReference, resolveToJSON)), if (void 0 !== key) return key;
null === formData && (formData = new FormData()), key = JSON.stringify(parentReference, resolveToJSON);
(parentReference = nextPartId++), null === formData && (formData = new FormData());
formData.set(formFieldPrefix + parentReference, key), parentReference = nextPartId++;
"$h" + parentReference.toString(16) formData.set(formFieldPrefix + parentReference, key);
); key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if ( if (
void 0 !== temporaryReferences && void 0 !== temporaryReferences &&
-1 === key.indexOf(":") && -1 === key.indexOf(":") &&
...@@ -723,10 +726,17 @@ function waitForReference( ...@@ -723,10 +726,17 @@ function waitForReference(
value.then(fulfill, reject); value.then(fulfill, reject);
return; return;
} }
value = value[path[i]]; var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
} }
i = map(response, value, parentObject, key); i = map(response, value, parentObject, key);
parentObject[key] = i; "__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i); "" === key && null === handler.value && (handler.value = i);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -808,7 +818,7 @@ function loadServerReference(response, metaData, parentObject, key) { ...@@ -808,7 +818,7 @@ function loadServerReference(response, metaData, parentObject, key) {
resolvedValue = resolvedValue.bind.apply(resolvedValue, boundArgs); resolvedValue = resolvedValue.bind.apply(resolvedValue, boundArgs);
} }
registerBoundServerReference(resolvedValue, metaData.id, metaData.bound); registerBoundServerReference(resolvedValue, metaData.id, metaData.bound);
parentObject[key] = resolvedValue; "__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && null === handler.value && (handler.value = resolvedValue); "" === key && null === handler.value && (handler.value = resolvedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1125,8 +1135,8 @@ function startReadableStream(response, id, type) { ...@@ -1125,8 +1135,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk)); (previousBlockedChunk = chunk));
} else { } else {
chunk = previousBlockedChunk; chunk = previousBlockedChunk;
var chunk$52 = createPendingChunk(response); var chunk$53 = createPendingChunk(response);
chunk$52.then( chunk$53.then(
function (v) { function (v) {
return controller.enqueue(v); return controller.enqueue(v);
}, },
...@@ -1134,10 +1144,10 @@ function startReadableStream(response, id, type) { ...@@ -1134,10 +1144,10 @@ function startReadableStream(response, id, type) {
return controller.error(e); return controller.error(e);
} }
); );
previousBlockedChunk = chunk$52; previousBlockedChunk = chunk$53;
chunk.then(function () { chunk.then(function () {
previousBlockedChunk === chunk$52 && (previousBlockedChunk = null); previousBlockedChunk === chunk$53 && (previousBlockedChunk = null);
resolveModelChunk(chunk$52, json); resolveModelChunk(chunk$53, json);
}); });
} }
}, },
...@@ -1272,8 +1282,8 @@ function mergeBuffer(buffer, lastChunk) { ...@@ -1272,8 +1282,8 @@ function mergeBuffer(buffer, lastChunk) {
for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++) for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++)
byteLength += buffer[i].byteLength; byteLength += buffer[i].byteLength;
byteLength = new Uint8Array(byteLength); byteLength = new Uint8Array(byteLength);
for (var i$53 = (i = 0); i$53 < l; i$53++) { for (var i$54 = (i = 0); i$54 < l; i$54++) {
var chunk = buffer[i$53]; var chunk = buffer[i$54];
byteLength.set(chunk, i); byteLength.set(chunk, i);
i += chunk.byteLength; i += chunk.byteLength;
} }
...@@ -1452,42 +1462,44 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) { ...@@ -1452,42 +1462,44 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) {
} }
function createFromJSONCallback(response) { function createFromJSONCallback(response) {
return function (key, value) { return function (key, value) {
if ("string" === typeof value) if ("__proto__" !== key) {
return parseModelString(response, this, key, value); if ("string" === typeof value)
if ("object" === typeof value && null !== value) { return parseModelString(response, this, key, value);
if (value[0] === REACT_ELEMENT_TYPE) { if ("object" === typeof value && null !== value) {
if ( if (value[0] === REACT_ELEMENT_TYPE) {
((key = {
$$typeof: REACT_ELEMENT_TYPE,
type: value[1],
key: value[2],
ref: null,
props: value[3]
}),
null !== initializingHandler)
)
if ( if (
((value = initializingHandler), ((key = {
(initializingHandler = value.parent), $$typeof: REACT_ELEMENT_TYPE,
value.errored) type: value[1],
key: value[2],
ref: null,
props: value[3]
}),
null !== initializingHandler)
) )
(key = new ReactPromise("rejected", null, value.value, response)), if (
(key = createLazyChunkWrapper(key)); ((value = initializingHandler),
else if (0 < value.deps) { (initializingHandler = value.parent),
var blockedChunk = new ReactPromise( value.errored)
"blocked", )
null, (key = new ReactPromise("rejected", null, value.value, response)),
null, (key = createLazyChunkWrapper(key));
response else if (0 < value.deps) {
); var blockedChunk = new ReactPromise(
value.value = key; "blocked",
value.chunk = blockedChunk; null,
key = createLazyChunkWrapper(blockedChunk); null,
} response
} else key = value; );
return key; value.value = key;
value.chunk = blockedChunk;
key = createLazyChunkWrapper(blockedChunk);
}
} else key = value;
return key;
}
return value;
} }
return value;
}; };
} }
function createResponseFromOptions(options) { function createResponseFromOptions(options) {
......
...@@ -453,14 +453,17 @@ function processReply( ...@@ -453,14 +453,17 @@ function processReply(
if ("undefined" === typeof value) return "$undefined"; if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) { if ("function" === typeof value) {
parentReference = knownServerReferences.get(value); parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference) if (void 0 !== parentReference) {
return ( key = writtenObjects.get(value);
(key = JSON.stringify(parentReference, resolveToJSON)), if (void 0 !== key) return key;
null === formData && (formData = new FormData()), key = JSON.stringify(parentReference, resolveToJSON);
(parentReference = nextPartId++), null === formData && (formData = new FormData());
formData.set(formFieldPrefix + parentReference, key), parentReference = nextPartId++;
"$h" + parentReference.toString(16) formData.set(formFieldPrefix + parentReference, key);
); key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if ( if (
void 0 !== temporaryReferences && void 0 !== temporaryReferences &&
-1 === key.indexOf(":") && -1 === key.indexOf(":") &&
...@@ -891,10 +894,17 @@ function waitForReference( ...@@ -891,10 +894,17 @@ function waitForReference(
value.then(fulfill, reject); value.then(fulfill, reject);
return; return;
} }
value = value[path[i]]; var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
} }
i = map(response, value, parentObject, key); i = map(response, value, parentObject, key);
parentObject[key] = i; "__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i); "" === key && null === handler.value && (handler.value = i);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -991,7 +1001,7 @@ function loadServerReference(response, metaData, parentObject, key) { ...@@ -991,7 +1001,7 @@ function loadServerReference(response, metaData, parentObject, key) {
metaData.bound, metaData.bound,
response._encodeFormAction response._encodeFormAction
); );
parentObject[key] = resolvedValue; "__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && null === handler.value && (handler.value = resolvedValue); "" === key && null === handler.value && (handler.value = resolvedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1313,8 +1323,8 @@ function startReadableStream(response, id, type) { ...@@ -1313,8 +1323,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk)); (previousBlockedChunk = chunk));
} else { } else {
chunk = previousBlockedChunk; chunk = previousBlockedChunk;
var chunk$52 = createPendingChunk(response); var chunk$53 = createPendingChunk(response);
chunk$52.then( chunk$53.then(
function (v) { function (v) {
return controller.enqueue(v); return controller.enqueue(v);
}, },
...@@ -1322,10 +1332,10 @@ function startReadableStream(response, id, type) { ...@@ -1322,10 +1332,10 @@ function startReadableStream(response, id, type) {
return controller.error(e); return controller.error(e);
} }
); );
previousBlockedChunk = chunk$52; previousBlockedChunk = chunk$53;
chunk.then(function () { chunk.then(function () {
previousBlockedChunk === chunk$52 && (previousBlockedChunk = null); previousBlockedChunk === chunk$53 && (previousBlockedChunk = null);
resolveModelChunk(chunk$52, json); resolveModelChunk(chunk$53, json);
}); });
} }
}, },
...@@ -1460,8 +1470,8 @@ function mergeBuffer(buffer, lastChunk) { ...@@ -1460,8 +1470,8 @@ function mergeBuffer(buffer, lastChunk) {
for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++) for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++)
byteLength += buffer[i].byteLength; byteLength += buffer[i].byteLength;
byteLength = new Uint8Array(byteLength); byteLength = new Uint8Array(byteLength);
for (var i$53 = (i = 0); i$53 < l; i$53++) { for (var i$54 = (i = 0); i$54 < l; i$54++) {
var chunk = buffer[i$53]; var chunk = buffer[i$54];
byteLength.set(chunk, i); byteLength.set(chunk, i);
i += chunk.byteLength; i += chunk.byteLength;
} }
...@@ -1640,42 +1650,44 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) { ...@@ -1640,42 +1650,44 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) {
} }
function createFromJSONCallback(response) { function createFromJSONCallback(response) {
return function (key, value) { return function (key, value) {
if ("string" === typeof value) if ("__proto__" !== key) {
return parseModelString(response, this, key, value); if ("string" === typeof value)
if ("object" === typeof value && null !== value) { return parseModelString(response, this, key, value);
if (value[0] === REACT_ELEMENT_TYPE) { if ("object" === typeof value && null !== value) {
if ( if (value[0] === REACT_ELEMENT_TYPE) {
((key = {
$$typeof: REACT_ELEMENT_TYPE,
type: value[1],
key: value[2],
ref: null,
props: value[3]
}),
null !== initializingHandler)
)
if ( if (
((value = initializingHandler), ((key = {
(initializingHandler = value.parent), $$typeof: REACT_ELEMENT_TYPE,
value.errored) type: value[1],
key: value[2],
ref: null,
props: value[3]
}),
null !== initializingHandler)
) )
(key = new ReactPromise("rejected", null, value.value, response)), if (
(key = createLazyChunkWrapper(key)); ((value = initializingHandler),
else if (0 < value.deps) { (initializingHandler = value.parent),
var blockedChunk = new ReactPromise( value.errored)
"blocked", )
null, (key = new ReactPromise("rejected", null, value.value, response)),
null, (key = createLazyChunkWrapper(key));
response else if (0 < value.deps) {
); var blockedChunk = new ReactPromise(
value.value = key; "blocked",
value.chunk = blockedChunk; null,
key = createLazyChunkWrapper(blockedChunk); null,
} response
} else key = value; );
return key; value.value = key;
value.chunk = blockedChunk;
key = createLazyChunkWrapper(blockedChunk);
}
} else key = value;
return key;
}
return value;
} }
return value;
}; };
} }
function noServerCall() { function noServerCall() {
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
"neo-async": "^2.6.1" "neo-async": "^2.6.1"
}, },
"peerDependencies": { "peerDependencies": {
"react": "19.1.0-canary-7a835f3c-20251211", "react": "19.1.0-canary-ff76fc6a-20260126",
"react-dom": "19.1.0-canary-7a835f3c-20251211" "react-dom": "19.1.0-canary-ff76fc6a-20260126"
} }
} }
\ No newline at end of file
...@@ -64,8 +64,8 @@ ...@@ -64,8 +64,8 @@
"webpack-sources": "^3.2.0" "webpack-sources": "^3.2.0"
}, },
"peerDependencies": { "peerDependencies": {
"react": "0.0.0-experimental-7a835f3c-20251211", "react": "0.0.0-experimental-ff76fc6a-20260126",
"react-dom": "0.0.0-experimental-7a835f3c-20251211", "react-dom": "0.0.0-experimental-ff76fc6a-20260126",
"webpack": "^5.59.0" "webpack": "^5.59.0"
} }
} }
\ No newline at end of file
...@@ -64,8 +64,8 @@ ...@@ -64,8 +64,8 @@
"webpack-sources": "^3.2.0" "webpack-sources": "^3.2.0"
}, },
"peerDependencies": { "peerDependencies": {
"react": "19.1.0-canary-7a835f3c-20251211", "react": "19.1.0-canary-ff76fc6a-20260126",
"react-dom": "19.1.0-canary-7a835f3c-20251211", "react-dom": "19.1.0-canary-ff76fc6a-20260126",
"webpack": "^5.59.0" "webpack": "^5.59.0"
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment