github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-18 13:52:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Attempt to reconnect to server when browser visibilty changes (#22259)

Browse Source
This commit is contained in:
Mark VanLandingham 2023-06-23 11:32:34 -05:00 committed by GitHub
parent a984a807fd
commit 36b9572bb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/assets/javascripts/discourse/app/services/network-connectivity.js
View File

@ -13,29 +13,31 @@ export default class NetworkConnectivity extends Service {
this.setConnectivity(navigator.onLine); this.setConnectivity(navigator.onLine);
window.addEventListener("offline", () => { window.addEventListener("offline", () => {
this.handleConnectivityChangeEvent(false); this.setConnectivity(false);
}); });
window.addEventListener("online", () => { window.addEventListener(
this.handleConnectivityChangeEvent(true); "online",
}); this.pingServerAndSetConnectivity.bind(this)
);
window.addEventListener("visibilitychange", this.onFocus.bind(this));
} }
handleConnectivityChangeEvent(connected) { onFocus() {
if (connected) { if (!this.connected && document.visibilityState === "visible") {
// Make a super cheap request to the server. If we get a response, we are connected! this.pingServerAndSetConnectivity();
return ajax("/srv/status", { dataType: "text" })
.then((response) => {
this.setConnectivity(response === "ok");
})
.catch(() => {
this.setConnectivity(false);
});
} else {
this.setConnectivity(false);
} }
} }
async pingServerAndSetConnectivity() {
let response = await ajax("/srv/status", { dataType: "text" }).catch(() => {
this.setConnectivity(false);
});
this.setConnectivity(response === "ok");
}
setConnectivity(connected) { setConnectivity(connected) {
this.connected = connected; this.connected = connected;

2
app/assets/javascripts/service-worker.js.erb
View File

@ -19,7 +19,7 @@ workbox.setConfig({
debug: false debug: false
}); });
var authUrls = ["auth", "session/sso_login", "session/sso"].map(path => `<%= Discourse.base_path %>/${path}`); var authUrls = ["auth", "session/sso_login", "session/sso", "srv/status"].map(path => `<%= Discourse.base_path %>/${path}`);
var chatRegex = /\/chat\/channel\/(\d+)\//; var chatRegex = /\/chat\/channel\/(\d+)\//;
var inlineReplyIcon = "<%= UrlHelper.absolute("/images/push-notifications/inline_reply.png") %>"; var inlineReplyIcon = "<%= UrlHelper.absolute("/images/push-notifications/inline_reply.png") %>";