infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Netflux server mustn't send a zero message until the history is synced

pull/1/head
ansuz 2016-04-21 17:02:54 +02:00
parent ce69062b7c
commit 7a02d85ec5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NetfluxWebsocketSrv.js
View File

@ -66,8 +66,8 @@ dropUser = function (ctx, user) {
});
};
const getHistory = function (ctx, channelName, handler) {
ctx.store.getMessages(channelName, function (msgStr) { handler(JSON.parse(msgStr)); });
const getHistory = function (ctx, channelName, handler, cb) {
ctx.store.getMessages(channelName, function (msgStr) { handler(JSON.parse(msgStr)); }, cb);
};
const randName = function () { return Crypto.randomBytes(16).toString('hex'); };
@ -105,8 +105,9 @@ const handleMessage = function (ctx, user, msg) {
if (parsed[0] === 'GET_HISTORY') {
getHistory(ctx, parsed[1], function (msg) {
sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(msg)]);
}, function () {
sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, 0]);
});
sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, 0]);
}
return;
}