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

Merge branch 'd' into staging

Browse Source
pull/1/head
yflory 8 years ago
parent 306f6ce806 a286599f93
commit 13d7b3cadc
7 changed files with 79 additions and 41 deletions
Show Stats Download Patch File Download Diff File

32
NetfluxWebsocketSrv.js
Unescape Escape View File

@ -118,7 +118,7 @@ dropUser = function (ctx, user) {
}); });
}; };
const getHistory = function (ctx, channelName, handler, cb) { const getHistory = function (ctx, channelName, lastKnownHash, handler, cb) {
var messageBuf = []; var messageBuf = [];
var messageKey; var messageKey;
ctx.store.getMessages(channelName, function (msgStr) { ctx.store.getMessages(channelName, function (msgStr) {
@ -137,21 +137,35 @@ const getHistory = function (ctx, channelName, handler, cb) {
var startPoint; var startPoint;
var cpCount = 0; var cpCount = 0;
var msgBuff2 = []; var msgBuff2 = [];
var sendBuff2 = function () {
for (var x = msgBuff2.pop(); x; x = msgBuff2.pop()) { handler(x); }
};
var hash = function (msg) {
return msg.slice(0,64); //Crypto.createHash('md5').update(msg).digest('hex');
};
var isSent = false;
for (startPoint = messageBuf.length - 1; startPoint >= 0; startPoint--) { for (startPoint = messageBuf.length - 1; startPoint >= 0; startPoint--) {
var msg = messageBuf[startPoint]; var msg = messageBuf[startPoint];
msgBuff2.push(msg); msgBuff2.push(msg);
if (msg[2] === 'MSG' && msg[4].indexOf('cp|') === 0) { if (lastKnownHash) {
if (msg[2] === 'MSG' && hash(msg[4]) === lastKnownHash) {
msgBuff2.pop();
sendBuff2();
isSent = true;
break;
}
} else if (msg[2] === 'MSG' && msg[4].indexOf('cp|') === 0) {
cpCount++; cpCount++;
if (cpCount >= 2) { if (cpCount >= 2) {
for (var x = msgBuff2.pop(); x; x = msgBuff2.pop()) { handler(x); } sendBuff2();
isSent = true;
break; break;
} }
} }
//console.log(messageBuf[startPoint]);
} }
if (cpCount < 2) { if (!isSent) {
// no checkpoints. // no checkpoints.
for (var x = msgBuff2.pop(); x; x = msgBuff2.pop()) { handler(x); } sendBuff2();
} }
cb(messageBuf); cb(messageBuf);
}); });
@ -196,11 +210,13 @@ const handleMessage = function (ctx, user, msg) {
let parsed; let parsed;
try { parsed = JSON.parse(json[2]); } catch (err) { console.error(err); return; } try { parsed = JSON.parse(json[2]); } catch (err) { console.error(err); return; }
if (parsed[0] === 'GET_HISTORY') { if (parsed[0] === 'GET_HISTORY') {
// parsed[1] is the channel id
// parsed[2] is a validation key (optionnal)
// parsed[3] is the last known hash (optionnal)
sendMsg(ctx, user, [seq, 'ACK']); sendMsg(ctx, user, [seq, 'ACK']);
getHistory(ctx, parsed[1], function (msg) { getHistory(ctx, parsed[1], parsed[3], function (msg) {
sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(msg)]); sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(msg)]);
}, function (messages) { }, function (messages) {
// parsed[2] is a validation key if it exists
if (messages.length === 0 && parsed[2] && !historyKeeperKeys[parsed[1]]) { if (messages.length === 0 && parsed[2] && !historyKeeperKeys[parsed[1]]) {
var key = {channel: parsed[1], validateKey: parsed[2]}; var key = {channel: parsed[1], validateKey: parsed[2]};
storeMessage(ctx, ctx.channels[parsed[1]], JSON.stringify(key)); storeMessage(ctx, ctx.channels[parsed[1]], JSON.stringify(key));

6
www/code/main.js
Unescape Escape View File

@ -2,7 +2,7 @@ require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/J
define([ define([
'/bower_components/chainpad-crypto/crypto.js', '/bower_components/chainpad-crypto/crypto.js',
'/bower_components/chainpad-netflux/chainpad-netflux.js', '/bower_components/chainpad-netflux/chainpad-netflux.js',
'/bower_components/textpatcher/TextPatcher.amd.js', '/bower_components/textpatcher/TextPatcher.js',
'/common/toolbar.js', '/common/toolbar.js',
'json.sortify', 'json.sortify',
'/bower_components/chainpad-json-validator/json-ot.js', '/bower_components/chainpad-json-validator/json-ot.js',
@ -521,12 +521,14 @@ define([
}; };
var onReady = config.onReady = function (info) { var onReady = config.onReady = function (info) {
var realtime = module.realtime = info.realtime;
module.users = info.userList.users; module.users = info.userList.users;
if (module.realtime !== info.realtime) {
var realtime = module.realtime = info.realtime;
module.patchText = TextPatcher.create({ module.patchText = TextPatcher.create({
realtime: realtime, realtime: realtime,
//logging: true //logging: true
}); });
}
var userDoc = module.realtime.getUserDoc(); var userDoc = module.realtime.getUserDoc();

7
www/common/toolbar.js
Unescape Escape View File

@ -407,8 +407,11 @@ define([
window.location = "/"; window.location = "/";
}; };
$aTagBig.click(onClick); var onContext = function (e) { e.stopPropagation(); };
$aTagSmall.click(onClick);
$aTagBig.click(onClick).contextmenu(onContext);
$aTagSmall.click(onClick).contextmenu(onContext);
$linkContainer.append($aTagSmall).append($aTagBig); $linkContainer.append($aTagSmall).append($aTagBig);
}; };

16
www/drive/main.js
Unescape Escape View File

@ -181,6 +181,7 @@ define([
var $tree = $iframe.find("#tree"); var $tree = $iframe.find("#tree");
var $content = $iframe.find("#content"); var $content = $iframe.find("#content");
var $appContainer = $iframe.find(".app-container");
var $driveToolbar = $iframe.find("#driveToolbar"); var $driveToolbar = $iframe.find("#driveToolbar");
var $contextMenu = $iframe.find("#treeContextMenu"); var $contextMenu = $iframe.find("#treeContextMenu");
var $contentContextMenu = $iframe.find("#contentContextMenu"); var $contentContextMenu = $iframe.find("#contentContextMenu");
@ -1737,7 +1738,8 @@ define([
// Disable middle click in the context menu to avoid opening /drive/inner.html# in new tabs // Disable middle click in the context menu to avoid opening /drive/inner.html# in new tabs
$(ifrw).click(function (e) { $(ifrw).click(function (e) {
if (e.which !== 3) { if (!e.target || !$(e.target).parents('.cryptpad-dropdown').length) { return; }
if (e.which !== 1) {
e.stopPropagation(); e.stopPropagation();
return false; return false;
} }
@ -1900,21 +1902,21 @@ define([
module.hideMenu(); module.hideMenu();
}); });
$(ifrw).on('click', function (e) { $appContainer.on('click', function (e) {
if (e.which !== 1) { return ; } if (e.which !== 1) { return ; }
removeSelected(e); removeSelected(e);
removeInput(); removeInput();
module.hideMenu(e); module.hideMenu(e);
hideNewButton(); hideNewButton();
}); });
$(ifrw).on('drag drop', function (e) { $appContainer.on('drag drop', function (e) {
removeInput(); removeInput();
module.hideMenu(e); module.hideMenu(e);
}); });
$(ifrw).on('mouseup drop', function (e) { $appContainer.on('mouseup drop', function (e) {
$iframe.find('.droppable').removeClass('droppable'); $iframe.find('.droppable').removeClass('droppable');
}); });
$(ifrw).on('keydown', function (e) { $appContainer.on('keydown', function (e) {
// "Del" // "Del"
if (e.which === 46) { if (e.which === 46) {
if (filesOp.isPathInFilesData(currentPath)) { return; } // We can't remove elements directly from filesData if (filesOp.isPathInFilesData(currentPath)) { return; } // We can't remove elements directly from filesData
@ -1948,7 +1950,7 @@ define([
moveElements(paths, [TRASH], false, refresh); moveElements(paths, [TRASH], false, refresh);
} }
}); });
$(ifrw).contextmenu(function () { $appContainer.contextmenu(function () {
module.hideMenu(); module.hideMenu();
return false; return false;
}); });
@ -2005,7 +2007,7 @@ define([
updatePathSize(); updatePathSize();
}, 100); }, 100);
}); });
$(ifrw).mouseup(function (e) { $appContainer.mouseup(function (e) {
window.clearInterval(APP.resizeTree); window.clearInterval(APP.resizeTree);
APP.resizeTree = undefined; APP.resizeTree = undefined;
}); });

4
www/pad/main.js
Unescape Escape View File

@ -8,7 +8,7 @@ define([
'/bower_components/chainpad-json-validator/json-ot.js', '/bower_components/chainpad-json-validator/json-ot.js',
'/common/TypingTests.js', '/common/TypingTests.js',
'json.sortify', 'json.sortify',
'/bower_components/textpatcher/TextPatcher.amd.js', '/bower_components/textpatcher/TextPatcher.js',
'/common/cryptpad-common.js', '/common/cryptpad-common.js',
'/common/visible.js', '/common/visible.js',
'/common/notify.js', '/common/notify.js',
@ -656,10 +656,12 @@ define([
} }
} }
if (module.realtime !== info.realtime) {
module.patchText = TextPatcher.create({ module.patchText = TextPatcher.create({
realtime: info.realtime, realtime: info.realtime,
//logging: true, //logging: true,
}); });
}
module.users = info.userList.users; module.users = info.userList.users;
module.realtime = info.realtime; module.realtime = info.realtime;

18
www/poll/main.js
Unescape Escape View File

@ -589,7 +589,7 @@ define([
$description.val(proxy.info.description); $description.val(proxy.info.description);
} }
$('#tableScroll').prepend($table); $('#tableScroll').html('').prepend($table);
updateDisplayedTable(); updateDisplayedTable();
$table $table
@ -662,11 +662,17 @@ define([
var disconnect = function (info) { var disconnect = function (info) {
//setEditable(false); // TODO //setEditable(false); // TODO
APP.realtime.toolbar.failed();
Cryptpad.alert(Messages.common_connectionLost, undefined, true); Cryptpad.alert(Messages.common_connectionLost, undefined, true);
}; };
var reconnect = function (info) {
//setEditable(true); // TODO
APP.realtime.toolbar.reconnecting(info.myId);
Cryptpad.findOKButton().click();
};
var create = function (info) { var create = function (info) {
var realtime = APP.realtime = info.realtime;
var myID = APP.myID = info.myID; var myID = APP.myID = info.myID;
var editHash; var editHash;
@ -676,10 +682,13 @@ define([
editHash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys); editHash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
} }
if (APP.realtime !== info.realtime) {
APP.realtime = info.realtime;
APP.patchText = TextPatcher.create({ APP.patchText = TextPatcher.create({
realtime: realtime, realtime: info.realtime,
logging: true, logging: true,
}); });
}
userList = APP.userList = info.userList; userList = APP.userList = info.userList;
@ -766,7 +775,8 @@ define([
}); });
}); });
}) })
.on('disconnect', disconnect); .on('disconnect', disconnect)
.on('reconnect', reconnect);
Cryptpad.getAttribute(HIDE_INTRODUCTION_TEXT, function (e, value) { Cryptpad.getAttribute(HIDE_INTRODUCTION_TEXT, function (e, value) {
if (e) { console.error(e); } if (e) { console.error(e); }

7
www/slide/main.js
Unescape Escape View File

@ -2,7 +2,7 @@ require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/J
define([ define([
'/bower_components/chainpad-crypto/crypto.js', '/bower_components/chainpad-crypto/crypto.js',
'/bower_components/chainpad-netflux/chainpad-netflux.js', '/bower_components/chainpad-netflux/chainpad-netflux.js',
'/bower_components/textpatcher/TextPatcher.amd.js', '/bower_components/textpatcher/TextPatcher.js',
'/common/toolbar.js', '/common/toolbar.js',
'json.sortify', 'json.sortify',
'/bower_components/chainpad-json-validator/json-ot.js', '/bower_components/chainpad-json-validator/json-ot.js',
@ -678,12 +678,15 @@ define([
}; };
var onReady = config.onReady = function (info) { var onReady = config.onReady = function (info) {
var realtime = module.realtime = info.realtime;
module.users = info.userList.users; module.users = info.userList.users;
if (module.realtime !== info.realtime) {
var realtime = module.realtime = info.realtime;
module.patchText = TextPatcher.create({ module.patchText = TextPatcher.create({
realtime: realtime, realtime: realtime,
//logging: true //logging: true
}); });
}
var userDoc = module.realtime.getUserDoc(); var userDoc = module.realtime.getUserDoc();

Write Preview
Loading…
Cancel
Save