Unverified Commit 42f1e757 authored by Sebastian Markbåge's avatar Sebastian Markbåge Committed by GitHub

Remove double decoding of encrypted closures (#71527)

Stacked on #71528 

Thanks to the serverModuleMap option added in
https://github.com/facebook/react/pull/31300 we don't need to double
decode anymore to load server references when parsing the payload.
parent 16472326
...@@ -2,15 +2,9 @@ ...@@ -2,15 +2,9 @@
import 'server-only' import 'server-only'
/* eslint-disable import/no-extraneous-dependencies */ /* eslint-disable import/no-extraneous-dependencies */
import { import { renderToReadableStream } from 'react-server-dom-webpack/server.edge'
renderToReadableStream,
decodeReply,
} from 'react-server-dom-webpack/server.edge'
/* eslint-disable import/no-extraneous-dependencies */ /* eslint-disable import/no-extraneous-dependencies */
import { import { createFromReadableStream } from 'react-server-dom-webpack/client.edge'
createFromReadableStream,
encodeReply,
} from 'react-server-dom-webpack/client.edge'
import { streamToString } from '../stream-utils/node-web-streams-helper' import { streamToString } from '../stream-utils/node-web-streams-helper'
import { import {
...@@ -118,17 +112,10 @@ export async function decryptActionBoundArgs( ...@@ -118,17 +112,10 @@ export async function decryptActionBoundArgs(
moduleMap: isEdgeRuntime moduleMap: isEdgeRuntime
? clientReferenceManifestSingleton.edgeRscModuleMapping ? clientReferenceManifestSingleton.edgeRscModuleMapping
: clientReferenceManifestSingleton.rscModuleMapping, : clientReferenceManifestSingleton.rscModuleMapping,
serverModuleMap: null, // getServerModuleMap() serverModuleMap: getServerModuleMap(),
}, },
} }
) )
// This extra step ensures that the server references are recovered. return deserialized
const serverModuleMap = getServerModuleMap()
const transformed = await decodeReply(
await encodeReply(deserialized),
serverModuleMap
)
return transformed
} }
async function otherAction() {
'use server'
return 'hi'
}
// Test top-level encryption (happens during the module load phase) // Test top-level encryption (happens during the module load phase)
function wrapAction(value) { function wrapAction(value, action) {
return async function () { return async function () {
'use server' 'use server'
console.log(value) const v = await action()
if (v === 'hi') {
console.log(value)
}
} }
} }
const action = wrapAction('some-module-level-encryption-value') const action = wrapAction('some-module-level-encryption-value', otherAction)
// Test runtime encryption (happens during the rendering phase) // Test runtime encryption (happens during the rendering phase)
export default function Page() { export default function Page() {
...@@ -21,7 +28,9 @@ export default function Page() { ...@@ -21,7 +28,9 @@ export default function Page() {
return 'success' return 'success'
}} }}
> >
<button type="submit">Submit</button> <button type="submit" id="submit">
Submit
</button>
</form> </form>
) )
} }
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