github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 12:53:42 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: MessageBus would stall after 20 minutes of inactivity (#13219)

Browse Source 
Previous to this change we would switch off MessageBus updating after 20
minutes.

This ensures that when the user becomes present again we turn on long polling.

Without long polling updates can be delayed for minutes.
This commit is contained in:
Sam 2021-06-01 12:23:51 +10:00 committed by GitHub
parent c1c090419b
commit c5174e6982
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/discourse/app/initializers/message-bus.js
View File

@ -2,7 +2,7 @@ import { isProduction, isTesting } from "discourse-common/config/environment";
// Initialize the message bus to receive messages.
import getURL from "discourse-common/lib/get-url";
import { handleLogoff } from "discourse/lib/ajax";
import userPresent from "discourse/lib/user-presence";
import userPresent, { onPresenceChange } from "discourse/lib/user-presence";
const LONG_POLL_AFTER_UNSEEN_TIME = 1200000; // 20 minutes
const CONNECTIVITY_ERROR_CLASS = "message-bus-offline";
@ -51,6 +51,18 @@ export default {
// we do not want to start anything till document is complete
messageBus.stop();
// This will notify MessageBus to force a long poll after user becomes
// present
// When 20 minutes pass we stop long polling due to "shouldLongPollCallback".
onPresenceChange({
unseenTime: LONG_POLL_AFTER_UNSEEN_TIME,
callback: () => {
if (messageBus.onVisibilityChange) {
messageBus.onVisibilityChange();
}
},
});
if (siteSettings.login_required && !user) {
// Endpoint is not available in this case, so don't try
return;

22
app/assets/javascripts/discourse/app/lib/user-presence.js
View File

@ -25,8 +25,30 @@ export default function (maxUnseenTime) {
}
}
const callbacks = [];
const MIN_DELTA = 60000;
export function seenUser() {
let lastSeenTime = seenUserTime;
seenUserTime = Date.now();
let delta = seenUserTime - lastSeenTime;
if (lastSeenTime && delta > MIN_DELTA) {
callbacks.forEach((info) => {
if (delta > info.unseenTime) {
info.callback();
}
});
}
}
// register a callback for cases where presence changed
export function onPresenceChange(maxUnseenTime, callback) {
if (maxUnseenTime < MIN_DELTA) {
throw "unseenTime is too short";
}
callbacks.push({ unseenTime: maxUnseenTime, callback: callback });
}
// We could piggieback on the Scroll mixin, but it is not applied