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

Better reconnect after invalid lastKnownHash

Browse Source
This commit is contained in:
yflory
2020-03-13 17:39:16 +01:00
parent d53e9cff02
commit 578042154e
6 changed files with 66 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
www/common/outer/async-store.js
View File

@@ -1499,6 +1499,15 @@ define([
return;
}
var onError = function (err) {
console.warn(err); // XXX DEBUG
channel.bcast("PAD_ERROR", err);
// If this is a DELETED, EXPIRED or RESTRICTED pad, leave the channel
if (["EDELETED", "EEXPIRED", "ERESTRICTED"].indexOf(err.type) === -1) { return; }
Store.leavePad(null, data, function () {});
};
var conf = {
onReady: function (pad) {
var padData = pad.metadata || {};
@@ -1522,18 +1531,8 @@ define([
onLeave: function (m) {
channel.bcast("PAD_LEAVE", m);
},
onError: function (err) {
console.error(err); // XXX DEBUG
channel.bcast("PAD_ERROR", err);
Store.leavePad(null, data, function () {});
},
onChannelError: function (err) {
console.warn(err); // XXX DEBUG
channel.bcast("PAD_ERROR", err);
Store.leavePad(null, data, function () {});
},
onError: onError,
onChannelError: onError,
onRejected: function (allowed, _cb) {
var cb = Util.once(Util.mkAsync(_cb));