From cc7e50b536dca76c8f607d1b1b5f2d187d05b8f9 Mon Sep 17 00:00:00 2001 From: Ev Bogue Date: Thu, 25 Apr 2019 21:43:17 -0500 Subject: ok, I think this works --- gossip.js | 21 +++++++++++++++++++-- server.js | 15 ++++++++++++++- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/gossip.js b/gossip.js index b598dde..0023cb6 100644 --- a/gossip.js +++ b/gossip.js @@ -36,8 +36,25 @@ function sync (src, server, keys) { console.log(send) ws.send(JSON.stringify(send)) } else { - console.log('RECEIVING') - + if (serverMsg.log) { + console.log('RECEIVING') + var newlog = serverMsg.log.concat(srclog) + console.log('NEWLOG') + localforage.getItem('log').then(log => { + if (log) { + var newpubliclog = serverMsg.log.concat(log) + + localforage.setItem('log', newpubliclog) + } + }) + + localforage.setItem(src, newlog) + setTimeout(function () { + location.reload() + }, 1000) + + console.log(newlog) + } } } }) diff --git a/server.js b/server.js index ddd91a9..d963a11 100644 --- a/server.js +++ b/server.js @@ -39,6 +39,19 @@ wserver.on('connection', function (ws) { seq: opened.seq } ws.send(JSON.stringify(res)) + if(res.seq > req.seq) { + console.log('SEND DIFF TO CLIENT') + var diff = res.seq - req.seq + console.log(diff) + var sendlog = log.slice(0, diff) + var send = { + src: req.src, + log: sendlog + } + console.log(send) + ws.send(JSON.stringify(send)) + } + // COMPARE SEQ } }) @@ -50,7 +63,7 @@ wserver.on('connection', function (ws) { console.log(res) ws.send(JSON.stringify(res)) } - } else { + } else if (req.seq == null) { if (fs.existsSync(__dirname + '/bogs/' + req.src)) { fs.readFile(__dirname + '/bogs/' + req.src, 'UTF-8', function (err, data) { var log = JSON.parse(data) -- cgit v1.2.3-70-g09d2