web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

abort the realtime session if it does not synchronize for 30 seconds

Browse Source
This commit is contained in:
ansuz 2017-07-10 10:34:25 +02:00
parent 29c6ed6e9b
commit 4a37bc4a1c
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/translations/messages.js
View File

@ -36,6 +36,8 @@ define(function () {
out.synced = "Everything is saved"; out.synced = "Everything is saved";
out.deleted = "Pad deleted from your CryptDrive"; out.deleted = "Pad deleted from your CryptDrive";
out.realtime_unrecoverableError = "The realtime engine has encountered an unrecoverable error. Click OK to reload.";
out.disconnected = 'Disconnected'; out.disconnected = 'Disconnected';
out.synchronizing = 'Synchronizing'; out.synchronizing = 'Synchronizing';
out.reconnecting = 'Reconnecting...'; out.reconnecting = 'Reconnecting...';

16
www/common/cryptpad-common.js
View File

@ -202,13 +202,29 @@ define([
return; return;
}; };
common.infiniteSpinnerDetected = false;
var whenRealtimeSyncs = common.whenRealtimeSyncs = function (realtime, cb) { var whenRealtimeSyncs = common.whenRealtimeSyncs = function (realtime, cb) {
realtime.sync(); realtime.sync();
window.setTimeout(function () { window.setTimeout(function () {
if (realtime.getAuthDoc() === realtime.getUserDoc()) { if (realtime.getAuthDoc() === realtime.getUserDoc()) {
return void cb(); return void cb();
} }
var to = setTimeout(function () {
realtime.abort();
// don't launch more than one popup
if (common.infiniteSpinnerDetected) { return; }
// inform the user their session is in a bad state
common.confirm(Messages.realtime_unrecoverableError, function (yes) {
if (!yes) { return; }
window.location.reload();
});
common.infiniteSpinnerDetected = true;
}, 30000);
realtime.onSettle(function () { realtime.onSettle(function () {
clearTimeout(to);
cb(); cb();
}); });
}, 0); }, 0);