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

Fix reconnect

Browse Source
This commit is contained in:
yflory 2018-06-06 17:25:06 +02:00
parent 9c5ad795e1
commit 953d98be96
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -556,8 +556,8 @@ define([
// Pad RPC // Pad RPC
var pad = common.padRpc = {}; var pad = common.padRpc = {};
pad.joinPad = function (data, cb) { pad.joinPad = function (data) {
postMessage("JOIN_PAD", data, cb); postMessage("JOIN_PAD", data);
}; };
pad.sendPadMsg = function (data, cb) { pad.sendPadMsg = function (data, cb) {
postMessage("SEND_PAD_MSG", data, cb); postMessage("SEND_PAD_MSG", data, cb);
@ -567,6 +567,7 @@ define([
pad.onJoinEvent = Util.mkEvent(); pad.onJoinEvent = Util.mkEvent();
pad.onLeaveEvent = Util.mkEvent(); pad.onLeaveEvent = Util.mkEvent();
pad.onDisconnectEvent = Util.mkEvent(); pad.onDisconnectEvent = Util.mkEvent();
pad.onConnectEvent = Util.mkEvent();
pad.onErrorEvent = Util.mkEvent(); pad.onErrorEvent = Util.mkEvent();
// Loading events // Loading events
@ -680,6 +681,7 @@ define([
PAD_JOIN: common.padRpc.onJoinEvent.fire, PAD_JOIN: common.padRpc.onJoinEvent.fire,
PAD_LEAVE: common.padRpc.onLeaveEvent.fire, PAD_LEAVE: common.padRpc.onLeaveEvent.fire,
PAD_DISCONNECT: common.padRpc.onDisconnectEvent.fire, PAD_DISCONNECT: common.padRpc.onDisconnectEvent.fire,
PAD_CONNECT: common.padRpc.onConnectEvent.fire,
PAD_ERROR: common.padRpc.onErrorEvent.fire, PAD_ERROR: common.padRpc.onErrorEvent.fire,
// Drive // Drive
DRIVE_LOG: common.drive.onLog.fire, DRIVE_LOG: common.drive.onLog.fire,

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

@ -966,7 +966,7 @@ define([
channel.queue.forEach(function (data) { channel.queue.forEach(function (data) {
sendMessage(data.message); sendMessage(data.message);
}); });
cb({ postMessage("PAD_CONNECT", {
myID: wc.myID, myID: wc.myID,
id: wc.id, id: wc.id,
members: wc.members members: wc.members

2
www/common/outer/worker-channel.js
View File

@ -24,7 +24,7 @@ define([
var txid = mkTxid(); var txid = mkTxid();
var timeout = setTimeout(function () { var timeout = setTimeout(function () {
delete queries[txid]; delete queries[txid];
console.log("Timeout making query " + q); //console.log("Timeout making query " + q);
}, 30000); }, 30000);
queries[txid] = function (data, msg) { queries[txid] = function (data, msg) {
clearTimeout(timeout); clearTimeout(timeout);

6
www/common/sframe-chainpad-netflux-outer.js
View File

@ -116,6 +116,10 @@ define([], function () {
sframeChan.event('EV_RT_DISCONNECT'); sframeChan.event('EV_RT_DISCONNECT');
}); });
padRpc.onConnectEvent.reg(function (data) {
onOpen(data);
});
padRpc.onErrorEvent.reg(function (err) { padRpc.onErrorEvent.reg(function (err) {
sframeChan.event('EV_RT_ERROR', err); sframeChan.event('EV_RT_ERROR', err);
}); });
@ -128,8 +132,6 @@ define([], function () {
owners: owners, owners: owners,
password: password, password: password,
expire: expire expire: expire
}, function(data) {
onOpen(data);
}); });
}; };