-
Notifications
You must be signed in to change notification settings - Fork 13.6k
chore: Implement user caching for publication access #39667
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
Open
ggazzo
wants to merge
5
commits into
develop
Choose a base branch
from
chore/ddp-finds
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+68
−19
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
d28c5c8
refactor: Implement user caching for publication access in Notificati…
ggazzo f4353dd
refactor: Enhance user caching mechanism for publication access with …
ggazzo cc3f1e0
refactor: Simplify user caching logic and improve cache entry managem…
ggazzo 3391f0d
refactor: Update CacheEntry type to include full IUser object for imp…
ggazzo 3b1d986
ops
ggazzo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
apps/meteor/server/modules/streamer/publication-user-cache.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| import type { IUser } from '@rocket.chat/core-typings'; | ||
| import { Users } from '@rocket.chat/models'; | ||
|
|
||
| import type { IPublication } from './types'; | ||
|
|
||
| type CacheEntry = { | ||
| user: IUser; // Pick<IUser, '_id' | 'roles'> | ||
| timeout: NodeJS.Timeout; | ||
| }; | ||
|
|
||
| const CACHE_PROJECTION = { _id: 1, roles: 1 } as const; | ||
| const CACHE_TIMEOUT = 1000 * 60; | ||
| const cacheByPublication = new Map<string, CacheEntry>(); | ||
|
|
||
| export async function getCachedUserForPublication(publication: IPublication): Promise<CacheEntry['user'] | null> { | ||
| const userId = publication.userId ?? publication._session?.userId ?? undefined; | ||
| if (userId == null || userId === '') { | ||
| return null; | ||
| } | ||
|
|
||
| const value = invalidate(userId); | ||
|
|
||
| const user = value ?? (await Users.findOneById<CacheEntry['user']>(userId, { projection: CACHE_PROJECTION })); | ||
|
|
||
| if (user) { | ||
| const timeout = setTimeout(() => { | ||
| invalidate(userId); | ||
| }, CACHE_TIMEOUT); | ||
|
|
||
| cacheByPublication.set(userId, { user, timeout }); | ||
| } | ||
| return user; | ||
| } | ||
|
|
||
| export function invalidate(userId: string): CacheEntry['user'] | null { | ||
| const entry = cacheByPublication.get(userId); | ||
| if (entry) { | ||
| clearTimeout(entry.timeout); | ||
| cacheByPublication.delete(userId); | ||
| } | ||
| return entry?.user ?? null; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.