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.

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

Share memory cache between middleware and request handler #2347

Merged
merged 16 commits into from
Jun 21, 2024

Conversation

jpreynat
Copy link
Member

@jpreynat jpreynat commented Jun 18, 2024

This PR reduces the work done in the middleware, since some of it is useless.

The most certain one is that we call either get(Space|CurrentSite)LayoutData that fetches both the scripts and customization for the space/site. However, we only need the scripts for the current content to compute the CSP. Fetching and waiting for the customization just blocks the whole request uselessly.

Then we also prefetch the space/site content data in the middleware, but I'm pretty sure that the middleware execution is isolated from the actual route handler, meaning that this prefetch via waitUntil, even if not blocking the request, is useless.

EDIT:
Since I've checked in logs that globalThis isn't shared between the middleware and the request handlers, this PR instead makes sure that the memory cache is now properly shared between both using Cloudflare's request context.

src/middleware.ts Outdated Show resolved Hide resolved
Copy link

argos-ci bot commented Jun 18, 2024

The latest updates on your projects. Learn more about Argos notifications ↗︎

Build Status Details Updated (UTC)
default (Inspect) ✅ No changes detected - Jun 21, 2024, 9:12 AM

@jpreynat jpreynat changed the title Reduce middleware work Share memory cache between middleware and request handler Jun 19, 2024
Copy link
Member

@SamyPesse SamyPesse left a comment

Choose a reason for hiding this comment

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

Nice!

src/lib/cache/memory.ts Outdated Show resolved Hide resolved
@jpreynat jpreynat merged commit 4a11d8d into main Jun 21, 2024
7 of 8 checks passed
@jpreynat jpreynat deleted the reduce-middleware-time branch June 21, 2024 09:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants