From b274bd838dca5f36d08a2cf0b4946d5e3cb7174d Mon Sep 17 00:00:00 2001 From: Ev Bogue Date: Tue, 23 Jul 2019 14:48:07 -0500 Subject: turns out we can avoid sending requester id to the server --- gossip.js | 12 ++++++------ server.js | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gossip.js b/gossip.js index 0d31afc..06ce458 100644 --- a/gossip.js +++ b/gossip.js @@ -23,8 +23,8 @@ function sync (subs, keys) { open(srclog[0]).then(msg => { var req = { src: sub, - seq: msg.seq, - requester: keys.publicKey + seq: msg.seq + //requester: keys.publicKey } ws.onopen = function () { ws.send(JSON.stringify(req)) @@ -37,8 +37,8 @@ function sync (subs, keys) { var sendlog = srclog.slice(0, diff) var send = { src: sub, - log: sendlog, - requester: keys.publicKey + log: sendlog + //requester: keys.publicKey } ws.send(JSON.stringify(send)) } else { @@ -52,8 +52,8 @@ function sync (subs, keys) { } else { var req = { src: sub, - seq: null, - requester: keys.publicKey + seq: null + //requester: keys.publicKey } ws.onopen = function () { diff --git a/server.js b/server.js index f462fe7..f2a7e0d 100644 --- a/server.js +++ b/server.js @@ -37,7 +37,7 @@ wserver.on('connection', function (ws) { } ws.send(JSON.stringify(res)) if(res.seq > req.seq) { - console.log('Sending diff of' + req.src + ' to ' + req.requester) + console.log('Sending diff of' + req.src /*+ ' to ' + req.requester*/) var diff = res.seq - req.seq var sendlog = log.slice(0, diff) var send = { @@ -63,7 +63,7 @@ wserver.on('connection', function (ws) { src: req.src, log } - console.log('Sending full log of ' + req.src + ' to ' + req.requester ) + console.log('Sending full log of ' + req.src /*+ ' to ' + req.requester*/ ) ws.send(JSON.stringify(res)) }) } @@ -76,7 +76,7 @@ wserver.on('connection', function (ws) { var newlog = req.log.concat(serverlog) fs.writeFile(__dirname + '/bogs/' + req.src, JSON.stringify(newlog), 'UTF-8', function (err, success) { - console.log('Appending diff of ' + req.src + ' from ' + req.requester + ' and saved to server') + console.log('Appending diff of ' + req.src /*+ ' from ' + req.requester + ' and saved to server'*/) }) }) @@ -84,7 +84,7 @@ wserver.on('connection', function (ws) { fs.writeFile(__dirname + '/bogs/' + req.src, JSON.stringify(req.log), 'UTF-8', function (err, success) { if (err) throw err else - console.log('Saved new log of ' + req.src + ' that was sent from ' + req.requester ) + console.log('Saved new log of ' + req.src /*+ ' that was sent from ' + req.requester */) }) } } -- cgit v1.2.3-70-g09d2