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

fix: ensure pusher events are processed in the same order they were received #31144

Merged
merged 10 commits into from
Nov 16, 2023
Merged

fix: ensure pusher events are processed in the same order they were received #31144

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
14755eb
ensure push events are processed in the same order as they are received
barros001 Nov 6, 2023
49557b3
removed redundant promise
barros001 Nov 7, 2023
f756a64
removed unnecessary return
barros001 Nov 7, 2023
0244379
added missing ;
barros001 Nov 7, 2023
f351967
Merge branch 'main' into serialize-events
barros001 Nov 9, 2023
89267cb
use reduce instead of for
barros001 Nov 9, 2023
b79db02
add comment
barros001 Nov 9, 2023
39508d3
fixed lint issues
barros001 Nov 9, 2023
82fb44b
serialize execution of entire apply method instead of only applyPushe…
barros001 Nov 14, 2023
cb7356e
Revert "serialize execution of entire apply method instead of only ap…
barros001 Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/libs/actions/OnyxUpdates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ Onyx.connect({
callback: (val) => (lastUpdateIDAppliedToClient = val),
});

// This promise is used to ensure pusher events are always processed in the order they are received,
// even when such events are received over multiple separate pusher updates.
let pusherEventsPromise = Promise.resolve();

function applyHTTPSOnyxUpdates(request: Request, response: Response) {
console.debug('[OnyxUpdateManager] Applying https update');
// For most requests we can immediately update Onyx. For write requests we queue the updates and apply them after the sequential queue has flushed to prevent a replay effect in
Expand Down Expand Up @@ -44,11 +48,17 @@ function applyHTTPSOnyxUpdates(request: Request, response: Response) {
}

function applyPusherOnyxUpdates(updates: OnyxUpdateEvent[]) {
console.debug('[OnyxUpdateManager] Applying pusher update');
const pusherEventPromises = updates.map((update) => PusherUtils.triggerMultiEventHandler(update.eventType, update.data));
return Promise.all(pusherEventPromises).then(() => {
console.debug('[OnyxUpdateManager] Done applying Pusher update');
pusherEventsPromise = pusherEventsPromise.then(() => {
console.debug('[OnyxUpdateManager] Applying pusher update');
});

pusherEventsPromise = updates
.reduce((promise, update) => promise.then(() => PusherUtils.triggerMultiEventHandler(update.eventType, update.data)), pusherEventsPromise)
.then(() => {
console.debug('[OnyxUpdateManager] Done applying Pusher update');
});

return pusherEventsPromise;
Copy link
Contributor

Choose a reason for hiding this comment

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

async / await is better reading and easy to understand but unfortunately that's not allowed in our codebase

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agreed. Originally I went this route but then lint yelled at me. I also had a for loop initially that might be more readable, but ended up going with a reduce. I can switch back to it if that makes things easier to understand.

}

/**
Expand Down
Loading