Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(rsc-auth): Implement serverStore to hold and pass req info to RSC #10585

Merged
merged 12 commits into from
May 17, 2024
Merged

feat(rsc-auth): Implement serverStore to hold and pass req info to RSC #10585

merged 12 commits into from
May 17, 2024

Conversation

dac09
Copy link
Contributor

@dac09 dac09 commented May 16, 2024 •
edited
Loading

First pass at implementing a per-request store that allows:

  • access to headers and cookies from requests in server components
  • access to serverAuthState from server components
  • maps serverAuthState updated from middleware to the the per request store

This PR also implements execution of middleware in the RSC handler. Note that this is done in a "good enough" way currently, because the RSC handler doesn't use Fetch requests (but everything else does)

Important things to note:

  • the store is initialised again in the RSC worker, with the same values on each invocation of renderRsc
  • we have not tested or tried in Dev because rw dev does not work in RSC yet
  • we have not tested behaviour on initial SSR - because this is not implemented yet in RSC

dac09 added 5 commits May 14, 2024 22:04
@dac09
Invoke middleware in RSC handler
32a29b8 
Set serverStore after invoking middleware
@dac09
Merge branch 'main' of github.com:redwoodjs/redwood into try/server-a…
b61a010 
…uth-store

* 'main' of github.com:redwoodjs/redwood:
  chore(router): Add more code comments to analyzeRoutes (#10569)
  RSC: No need to use memo or useMemo in the server router (#10568)
  RSC: getViteConfig in rscWorker (#10567)
  Split RSC and RSA handling in rscWorker (#10565)
  RSC: Extract the fetchRSC function (#10564)
  RSC: Fix TODO regarding SSR in client.ts (#10562)
  Docs: QoL Updates to Contributing.md (#10561)
  Added warning note to not add WebAuthn (#10231)
  fix(rsc): Load all css links to support css with rsc (#10544)
  fix(cli): Add deprecation notice for edgio deployment (#10551)
  Define `process.env.NODE_ENV` in build process. (#10553)
  chore(docs): Update dbAuth and Supabase middleware READMEs (#10552)
  chore(deps): Upgrade React 19 to beta 20240508 (#10560)
  Revert "chore(deps): React beta 20240508 (#10558)" (#10559)
  chore(deps): React beta 20240508 (#10558)
  fix(functions): Fix context variable warning/error (#10556)
  fix(functions): Mock context in function test template (#10555)
  chore(middleware): Format code and comments and fix comment grammar (#10554)
@dac09
Cleanup
3a23521
@dac09
Update comment
4ef0c95
@dac09
Switch implementation to use asyncStore.run
84e6935
@dac09 dac09 added this to the RSC milestone May 16, 2024
@dac09 dac09 added the release:feature This PR introduces a new feature label May 16, 2024
@dac09 dac09 self-assigned this May 16, 2024
@dac09 dac09 requested a review from dthyresson May 16, 2024 16:45
dthyresson
dthyresson approved these changes May 16, 2024
View reviewed changes
Copy link
Contributor

@dthyresson dthyresson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dac09 Looks great. Had a question about moving to the web package but perhaps in a separate PR?

packages/vite/src/serverStore.ts
@@ -0,0 +1,74 @@
import { AsyncLocalStorage } from 'async_hooks'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dac09 do we want to move this into '@redwoodjs/web/serverStore'? In a separate PR?

If so '@redwoodjs/web/serverAuth ?

If would be nice to have auth in the import so one can distinguish auth from other store related things...

Perhaps @redwoodjs/web/serverAuth and @redwoodjs/web/serverStore when the serverAuth has auth specific methods?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm intentionally holding off this until we're done with the implementation DT :) - anticipating some challenges here.

packages/vite/src/rsc/rscBuildForServer.ts
@@ -49,7 +49,8 @@ export async function rscBuildForServer(
noExternal: true,
// Can't inline prisma client (db calls fail at runtime) or react-dom
// (css pre-init failure)
external: ['@prisma/client', 'react-dom'],
// Server store has to be externalized, because it's a singleton (shared between FW and App)
external: ['@prisma/client', 'react-dom', '@redwoodjs/vite/serverStore'],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note if/when moving store to web will need to update here too so not bundled in

dac09 added 2 commits May 17, 2024 18:12
@dac09
Merge branch 'main' of github.com:redwoodjs/redwood into feat/dt-dc-s…
87a70ed 
…erverStore

* 'main' of github.com:redwoodjs/redwood: (66 commits)
  fix(deps): update dependency @graphql-yoga/plugin-graphql-sse to v3.3.1 (#10639)
  fix(deps): update graphql-tools monorepo (#10641)
  fix(deps): update dependency core-js to v3.37.1 (#10630)
  fix(deps): update dependency @graphql-yoga/plugin-persisted-operations to v3.3.1 (#10640)
  fix(deps): update dependency @graphql-yoga/plugin-defer-stream to v3.3.1 (#10638)
  chore(deps): update dependency firebase to v10.12.0 (#10635)
  chore(deps): update yarn monorepo (#10624)
  fix(deps): update dependency @swc/core to v1.5.7 (#10634)
  fix(deps): update dependency mini-css-extract-plugin to v2.9.0 (#10633)
  fix(deps): update dependency @sdl-codegen/node to v0.0.15 (#10632)
  chore(deps): update dependency @npmcli/arborist to v7.5.2 (#10628)
  fix(deps): update dependency find-my-way to v8.2.0 (#10631)
  chore(deps): bump @fastify/reply-from from 9.4.0 to 9.8.0 (#10629)
  fix(deps): update prisma monorepo to v5.14.0 (#10627)
  fix(deps): update dependency fastify to v4.27.0 (#10625)
  fix(deps): update docusaurus monorepo to v3.3.2 (#10626)
  fix(deps): update dependency react-helmet-async to v2.0.5 (#10621)
  chore(deps): update dependency @types/vscode to v1.89.0 (#10623)
  fix(deps): update dependency react-hook-form to v7.51.4 (#10622)
  chore(deps): update dependency @clerk/clerk-react to v4.31.1 (#10616)
  ...
@dac09
Cleanup, manually convert headers
558fec2
@dac09 dac09 marked this pull request as ready for review May 17, 2024 11:47
@dac09
Copy link
Contributor Author

dac09 commented May 17, 2024

Pulling out of draft @dthyresson - we still need to check with K6 or curl though if the store is isolated per request!

@dthyresson dthyresson merged commit 288bcab into main May 17, 2024
46 checks passed
@dthyresson dthyresson deleted the feat/dt-dc-serverStore branch May 17, 2024 23:11
@Tobbe Tobbe mentioned this pull request May 19, 2024
Merged
dac09 added a commit to dac09/redwood that referenced this pull request May 21, 2024
@dac09
Merge branch 'main' of github.com:redwoodjs/redwood into feat/return-…
01206ef 
…tuples-dbauth-mw

* 'main' of github.com:redwoodjs/redwood:
  fix(deps): update dependency isbot to v5 (redwoodjs#10340)
  chore(deps): update dependency vscode-languageserver-protocol to v3.17.5 (redwoodjs#10351)
  chore(deps): update node.js to >=14.17 <=20.13 (redwoodjs#10368)
  fix(deps): update dependency graphql-sse to v2.5.3 (redwoodjs#10364)
  chore(deps): update dependency @supabase/supabase-js to v2.43.2 (redwoodjs#10365)
  chore(deps): update babel monorepo to v7.24.5 (redwoodjs#10614)
  fix(vite): Rename `serverAuthContext` to `serverAuthState` (redwoodjs#10653)
  feat(middleware): Add .shortCircuit to MiddlewareResponse (redwoodjs#10586)
  chore(ssr): Make entry.client.tsx better match standard entry.client (redwoodjs#10652)
  patch(crwa): Fix small annoyances (formatting, spell-check) (redwoodjs#10651)
  chore(ci): Update rsc readme (redwoodjs#10650)
  chore(serverAuth): Rename serverAuthContext to serverAuthState where relevant (redwoodjs#10643)
  chore(deps): Remove unused deps from prerender (redwoodjs#10649)
  Add missing rwjs/auth deps (redwoodjs#10648)
  feat(rsc-auth): Implement serverStore to hold and pass req info to RSC (redwoodjs#10585)
  chore(deps): Remove unused octokit package (redwoodjs#10645)
  chore(deps): bump @fastify/reply-from from 9.4.0 to 9.8.0 (redwoodjs#10644)
@Josh-Walker-GM Josh-Walker-GM modified the milestones: RSC, v8.0.0 Sep 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dthyresson dthyresson dthyresson approved these changes

Assignees

@dac09 dac09

Labels
release:feature This PR introduces a new feature
Projects
Bighorn Development
Archived in project
Milestone
v8.0.0
Development

Successfully merging this pull request may close these issues.
3 participants
@dac09 @dthyresson @Josh-Walker-GM