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

The server don't send back anymore messages to their sender

Browse Source
This commit is contained in:
Yann Flory
2016-04-07 11:27:14 +02:00
parent eb4ea7a6b0
commit cf9f60bd57
4 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
NetfluxWebsocketSrv.js
View File

@@ -7,6 +7,7 @@ const LAG_MAX_BEFORE_PING = 15000;
const HISTORY_KEEPER_ID = Crypto.randomBytes(8).toString('hex'); const HISTORY_KEEPER_ID = Crypto.randomBytes(8).toString('hex');
const USE_HISTORY_KEEPER = true; const USE_HISTORY_KEEPER = true;
const USE_FILE_BACKUP_STORAGE = true;
let dropUser; let dropUser;
@@ -86,7 +87,7 @@ const handleMessage = function (ctx, user, msg) {
return; return;
} }
let chanName = obj || randName(); let chanName = obj || randName();
sendMsg(ctx, user, [seq, 'ACK']); sendMsg(ctx, user, [seq, 'JACK', chanName]);
let chan = ctx.channels[chanName] = ctx.channels[chanName] || []; let chan = ctx.channels[chanName] = ctx.channels[chanName] || [];
chan.id = chanName; chan.id = chanName;
if (USE_HISTORY_KEEPER) { if (USE_HISTORY_KEEPER) {
@@ -131,11 +132,11 @@ const handleMessage = function (ctx, user, msg) {
let err; let err;
let chan; let chan;
let idx; let idx;
if (!obj) { err = 'EINVAL'; } if (!obj) { err = 'EINVAL'; obj = 'undefined';}
if (!err && !(chan = ctx.channels[obj])) { err = 'ENOENT'; } if (!err && !(chan = ctx.channels[obj])) { err = 'ENOENT'; }
if (!err && (idx = chan.indexOf(user)) === -1) { err = 'NOT_IN_CHAN'; } if (!err && (idx = chan.indexOf(user)) === -1) { err = 'NOT_IN_CHAN'; }
if (err) { if (err) {
sendMsg(ctx, user, [seq, 'ERROR', err]); sendMsg(ctx, user, [seq, 'ERROR', err, obj]);
return; return;
} }
sendMsg(ctx, user, [seq, 'ACK']); sendMsg(ctx, user, [seq, 'ACK']);
@@ -153,7 +154,7 @@ let run = module.exports.run = function (storage, socketServer) {
let ctx = { let ctx = {
users: {}, users: {},
channels: {}, channels: {},
store: LogStore.create('messages.log', storage) store: (USE_FILE_BACKUP_STORAGE) ? LogStore.create('messages.log', storage) : storage
}; };
setInterval(function () { setInterval(function () {
Object.keys(ctx.users).forEach(function (userId) { Object.keys(ctx.users).forEach(function (userId) {
@@ -161,7 +162,7 @@ let run = module.exports.run = function (storage, socketServer) {
if (now() - u.timeOfLastMessage > LAG_MAX_BEFORE_DISCONNECT) { if (now() - u.timeOfLastMessage > LAG_MAX_BEFORE_DISCONNECT) {
dropUser(ctx, u); dropUser(ctx, u);
} else if (!u.pingOutstanding && now() - u.timeOfLastMessage > LAG_MAX_BEFORE_PING) { } else if (!u.pingOutstanding && now() - u.timeOfLastMessage > LAG_MAX_BEFORE_PING) {
sendMsg(ctx, u, [0, 'PING', now()]); sendMsg(ctx, u, [0, '', 'PING', now()]);
u.pingOutstanding = true; u.pingOutstanding = true;
} }
}); });

33
www/common/netflux.js
View File

@@ -674,8 +674,8 @@ return /******/ (function(modules) { // webpackBootstrap
var msg = undefined; var msg = undefined;
// Create the string message // Create the string message
var date = new Date().getTime();
if (data.type === 'PING') { if (data.type === 'PING') {
var date = new Date().getTime();
msg = JSON.stringify([c.seq++, 'PING', date]); msg = JSON.stringify([c.seq++, 'PING', date]);
} else { } else {
msg = JSON.stringify([c.seq++, data.type, webChannel.id, data.msg]); msg = JSON.stringify([c.seq++, data.type, webChannel.id, data.msg]);
@@ -686,10 +686,11 @@ return /******/ (function(modules) { // webpackBootstrap
srvMsg.shift(); srvMsg.shift();
srvMsg.unshift(webChannel.myID); srvMsg.unshift(webChannel.myID);
srvMsg.unshift(0); srvMsg.unshift(0);
webChannel.waitingAck[c.seq - 1] = srvMsg; webChannel.waitingAck[c.seq - 1] = { resolve: resolve, reject: reject, time: date, data: srvMsg };
// Send the message to the server // Send the message to the server
c.send(msg); c.send(msg);
} }
// resolve();
} catch (err) { } catch (err) {
_didIteratorError = true; _didIteratorError = true;
_iteratorError = err; _iteratorError = err;
@@ -704,8 +705,6 @@ return /******/ (function(modules) { // webpackBootstrap
} }
} }
} }
resolve();
}); });
} }
}, { }, {
@@ -1108,7 +1107,8 @@ return /******/ (function(modules) { // webpackBootstrap
this.NAME = this.constructor.name; this.NAME = this.constructor.name;
this.protocol = _ServiceProvider2.default.get(cs.EXCHANGEPROTOCOL_SERVICE); this.protocol = _ServiceProvider2.default.get(cs.EXCHANGEPROTOCOL_SERVICE);
this.defaults = { this.defaults = {
signaling: 'ws://localhost:9000' signaling: 'ws://localhost:9000',
REQUEST_TIMEOUT: 5000
}; };
this.settings = Object.assign({}, this.defaults, options); this.settings = Object.assign({}, this.defaults, options);
} }
@@ -1122,6 +1122,19 @@ return /******/ (function(modules) { // webpackBootstrap
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
var connection = undefined; var connection = undefined;
var socket = new window.WebSocket(settings.signaling); var socket = new window.WebSocket(settings.signaling);
setInterval(function () {
if (socket.webChannel && socket.webChannel.waitingAck) {
var waitingAck = socket.webChannel.waitingAck;
for (var id in waitingAck) {
var req = waitingAck[id];
var now = new Date().getTime();
if (now - req.time > settings.REQUEST_TIMEOUT) {
delete socket.webChannel.waitingAck[id];
req.reject({ type: 'TIMEOUT', message: 'waited ' + now - req.time + 'ms' });
}
}
}
}, 5000);
socket.seq = 1; socket.seq = 1;
socket.facade = options.facade || null; socket.facade = options.facade || null;
socket.onopen = function () { socket.onopen = function () {
@@ -1345,15 +1358,15 @@ return /******/ (function(modules) { // webpackBootstrap
if (msg[1] === 'ACK') { if (msg[1] === 'ACK') {
var seq = msg[0]; var seq = msg[0];
if (webChannel.waitingAck[seq]) { if (webChannel.waitingAck[seq]) {
var newMsg = webChannel.waitingAck[seq]; var waitingAck = webChannel.waitingAck[seq];
if (parseInt(newMsg[3]) === newMsg[3]) { waitingAck.resolve();
// PING message var newMsg = waitingAck.data;
if (newMsg[2] === 'PING') {
// PING message : set the lag
var lag = new Date().getTime() - newMsg[3]; var lag = new Date().getTime() - newMsg[3];
webChannel.getLag = function () { webChannel.getLag = function () {
return lag; return lag;
}; };
} else {
if (typeof webChannel.onmessage === "function") webChannel.onmessage(newMsg[1], newMsg[4]);
} }
delete webChannel.waitingAck[seq]; delete webChannel.waitingAck[seq];
} }

11
www/common/realtime-input.js
View File

@@ -294,14 +294,17 @@ define([
// Open a Chainpad session // Open a Chainpad session
realtime = createRealtime(); realtime = createRealtime();
// On sending message // Sending a message...
realtime.onMessage(function(message) { realtime.onMessage(function(message) {
// Prevent Chainpad from sending authentication messages since it is handled by Netflux // Filter messages sent by Chainpad to make it compatible with Netflux
message = chainpadAdapter.msgOut(message, wc); message = chainpadAdapter.msgOut(message, wc);
if(message) { if(message) {
wc.send(message).then(function() { wc.send(message).then(function() {
// Send the message back to Chainpad once it is sent to all peers if using the WebRTC protocol // Send the message back to Chainpad once it is sent to the recipients.
if(rtc) { onMessage(wc.myID, message); } onMessage(wc.myID, message);
}, function(err) {
// The message has not been sent, display the error.
console.error(err);
}); });
} }
}); });

2
www/pad/main.js
View File

@@ -98,7 +98,7 @@ define([
we should check when such an element is going to be we should check when such an element is going to be
removed, and prevent that from happening. */ removed, and prevent that from happening. */
if (info.node && info.node.tagName === 'SPAN' && if (info.node && info.node.tagName === 'SPAN' &&
info.node.contentEditable === "true") { info.node.contentEditable === false) {
// it seems to be a magicline plugin element... // it seems to be a magicline plugin element...
if (info.diff.action === 'removeElement') { if (info.diff.action === 'removeElement') {
// and you're about to remove it... // and you're about to remove it...