diff options
-rw-r--r-- | gossip.js | 278 | ||||
-rw-r--r-- | views.js | 8 |
2 files changed, 143 insertions, 143 deletions
@@ -21,22 +21,118 @@ function sync (subs, keys) { wsServers = pubs } }).then(function () { - subs.forEach(function (sub) { - wsServers.forEach(function (server, index) { - setTimeout(function () { - console.log('SYNCING WITH: ' + server + ' to fetch ' + sub) - var split = server.split('~') - var serverurl = split[0] - var serverpub = split[1] - var ws = new WebSocket(serverurl) + subs.forEach(function (sub, index) { + setTimeout(function () { + wsServers.forEach(function (server, index) { + setTimeout(function () { + console.log('SYNCING WITH: ' + server + ' to fetch ' + sub) + var split = server.split('~') + var serverurl = split[0] + var serverpub = split[1] + var ws = new WebSocket(serverurl) - bog(sub).then(srclog => { - if (srclog) { - open(srclog[0]).then(msg => { + bog(sub).then(srclog => { + if (srclog) { + open(srclog[0]).then(msg => { + ws.onopen = function () { + var message = JSON.stringify(msg) + // if we have a log then send the latest log and see if we get anything back + box(message, serverpub, keys).then(boxed => { + var obj = { + requester: keys.publicKey, + box: boxed + } + ws.send(JSON.stringify(obj)) + }) + } + ws.onmessage = function (message) { + var req = JSON.parse(message.data) + unbox(req.box, req.requester, keys).then(unboxed => { + var unboxedreq = JSON.parse(nacl.util.encodeUTF8(unboxed)) + if (unboxedreq.content) { + console.log(unboxedreq) + renderAd(unboxedreq) + } + if (unboxedreq.seq === 0) { + var stringedfeed = JSON.stringify(srclog) + box(stringedfeed, serverpub, keys).then(boxed => { + var obj = { + requester: keys.publicKey, + box: boxed + } + console.log('Sending entire log of ' + msg.author + ' to ' + serverpub) + ws.send(JSON.stringify(obj)) + }) + } + + if (unboxedreq.seq > msg.seq) { + console.log('server feed is longer, requesting diff from server') + var reqdiff = JSON.stringify({author: unboxedreq.author, seq: msg.seq}) + box(reqdiff, serverpub, keys).then(boxed => { + var obj = { + requester: keys.publicKey, + box: boxed + } + ws.send(JSON.stringify(obj)) + }) + } + + if (unboxedreq.seq < msg.seq) { + console.log('server feed is shorter, sending diff to server') + var diff = JSON.stringify(srclog.slice(0, msg.seq - unboxedreq.seq)) + box(diff, serverpub, keys).then(boxed => { + var obj = { + requester: keys.publicKey, + box: boxed + } + ws.send(JSON.stringify(obj)) + }) + } + + if (Array.isArray(unboxedreq)) { + console.log('received diff from server') + open(unboxedreq[0]).then(msg => { + localforage.getItem(msg.author).then(feed => { + open(feed[0]).then(lastmsg => { + if (unboxedreq.length + lastmsg.seq === msg.seq) { + var newlog = unboxedreq.concat(feed) + localforage.setItem(msg.author, newlog).then(success => { + console.log('combined existing feed of ' + msg.author + ' with diff and saved to client') + }) + localforage.getItem('log').then(log => { + if (!log) { + var log = [] + } + for (var i = unboxedreq.length -1; i >= 0; --i) { + open(unboxedreq[i]).then(opened => { + log.unshift(opened) + var scroller = document.getElementById('scroller') + scroller.insertBefore(render(opened, keys), scroller.childNodes[1]) + if (unboxedreq.length + lastmsg.seq === opened.seq) { + log.sort((a, b) => a.timestamp - b.timestamp) + var reversed = log.reverse() + localforage.setItem('log', reversed).then(success => { + console.log('saved log with ' + opened.author + ' prepended to localForage') + }) + } + }) + } + }) + } + }) + }) + }) + + } + + }) + } + }) + } else { + console.log('NO LOG IN CLIENT') ws.onopen = function () { - var message = JSON.stringify(msg) - // if we have a log then send the latest log and see if we get anything back - box(message, serverpub, keys).then(boxed => { + var reqwhole = JSON.stringify({author: sub, seq: 0}) + box(reqwhole, serverpub, keys).then(boxed => { var obj = { requester: keys.publicKey, box: boxed @@ -46,140 +142,46 @@ function sync (subs, keys) { } ws.onmessage = function (message) { var req = JSON.parse(message.data) + console.log('received message from ' + req.requester) unbox(req.box, req.requester, keys).then(unboxed => { var unboxedreq = JSON.parse(nacl.util.encodeUTF8(unboxed)) - if (unboxedreq.content) { - console.log(unboxedreq) - renderAd(unboxedreq) - } - if (unboxedreq.seq === 0) { - var stringedfeed = JSON.stringify(srclog) - box(stringedfeed, serverpub, keys).then(boxed => { - var obj = { - requester: keys.publicKey, - box: boxed - } - console.log('Sending entire log of ' + msg.author + ' to ' + serverpub) - ws.send(JSON.stringify(obj)) - }) - } - - if (unboxedreq.seq > msg.seq) { - console.log('server feed is longer, requesting diff from server') - var reqdiff = JSON.stringify({author: unboxedreq.author, seq: msg.seq}) - box(reqdiff, serverpub, keys).then(boxed => { - var obj = { - requester: keys.publicKey, - box: boxed - } - ws.send(JSON.stringify(obj)) - }) - } - - if (unboxedreq.seq < msg.seq) { - console.log('server feed is shorter, sending diff to server') - var diff = JSON.stringify(srclog.slice(0, msg.seq - unboxedreq.seq)) - box(diff, serverpub, keys).then(boxed => { - var obj = { - requester: keys.publicKey, - box: boxed - } - ws.send(JSON.stringify(obj)) - }) - } - if (Array.isArray(unboxedreq)) { - console.log('received diff from server') open(unboxedreq[0]).then(msg => { localforage.getItem(msg.author).then(feed => { - open(feed[0]).then(lastmsg => { - if (unboxedreq.length + lastmsg.seq === msg.seq) { - var newlog = unboxedreq.concat(feed) - localforage.setItem(msg.author, newlog).then(success => { - console.log('combined existing feed of ' + msg.author + ' with diff and saved to client') - }) - localforage.getItem('log').then(log => { - if (!log) { - var log = [] - } - for (var i = unboxedreq.length -1; i >= 0; --i) { - open(unboxedreq[i]).then(opened => { - log.unshift(opened) - var scroller = document.getElementById('scroller') - scroller.insertBefore(render(opened, keys), scroller.childNodes[1]) - if (unboxedreq.length + lastmsg.seq === opened.seq) { - log.sort((a, b) => a.timestamp - b.timestamp) - var reversed = log.reverse() - localforage.setItem('log', reversed).then(success => { - console.log('saved log with ' + opened.author + ' prepended to localForage') - }) - } - }) - } - }) - } - }) + if (!feed) { + localforage.setItem(msg.author, unboxedreq).then(success => { + console.log('saved log of ' + msg.author + ' to localforage') + }) + localforage.getItem('log').then(log => { + if (!log) { + var log = [] + } + for (var i = unboxedreq.length -1; i >= 0; --i) { + open(unboxedreq[i]).then(opened => { + log.unshift(opened) + var scroller = document.getElementById('scroller') + scroller.insertBefore(render(opened, keys), scroller.childNodes[1]) + if (opened.seq === unboxedreq.length) { + log.sort((a, b) => a.timestamp - b.timestamp) + var reversed = log.reverse() + localforage.setItem('log', reversed).then(success => { + console.log('saved log with ' + opened.author + ' prepended to localForage') + }) + } + }) + } + }) + } }) }) - } - - }) + }) } - }) - } else { - console.log('NO LOG IN CLIENT') - ws.onopen = function () { - var reqwhole = JSON.stringify({author: sub, seq: 0}) - box(reqwhole, serverpub, keys).then(boxed => { - var obj = { - requester: keys.publicKey, - box: boxed - } - ws.send(JSON.stringify(obj)) - }) } - ws.onmessage = function (message) { - var req = JSON.parse(message.data) - console.log('received message from ' + req.requester) - unbox(req.box, req.requester, keys).then(unboxed => { - var unboxedreq = JSON.parse(nacl.util.encodeUTF8(unboxed)) - if (Array.isArray(unboxedreq)) { - open(unboxedreq[0]).then(msg => { - localforage.getItem(msg.author).then(feed => { - if (!feed) { - localforage.setItem(msg.author, unboxedreq).then(success => { - console.log('saved log of ' + msg.author + ' to localforage') - }) - localforage.getItem('log').then(log => { - if (!log) { - var log = [] - } - for (var i = unboxedreq.length -1; i >= 0; --i) { - open(unboxedreq[i]).then(opened => { - log.unshift(opened) - var scroller = document.getElementById('scroller') - scroller.insertBefore(render(opened, keys), scroller.childNodes[1]) - if (opened.seq === unboxedreq.length) { - log.sort((a, b) => a.timestamp - b.timestamp) - var reversed = log.reverse() - localforage.setItem('log', reversed).then(success => { - console.log('saved log with ' + opened.author + ' prepended to localForage') - }) - } - }) - } - }) - } - }) - }) - } - }) - } - } - }) - }, index * 1000) - }) + }) + }, index * 50000) + }) + }, index * 20000) }) }) } @@ -18,7 +18,7 @@ function profilePage (src, keys) { var interval = 1000 timer = function() { if (src === window.location.hash.substring(1)) { - if (interval < 10000) { interval = interval + 200 } + if (interval < 10000) { interval = interval + 100 } sync(subs, keys) setTimeout(timer, interval) } @@ -124,17 +124,15 @@ function searchPage (src, keys) { function publicPage (keys) { localforage.getItem('subscriptions').then(function (subs) { - var interval = 1000 + var interval = 10000 timer = function() { if ('' === window.location.hash.substring(1)) { - if (interval < 10000) { interval = interval + 1000 } + if (interval < 100000) { interval = interval + 1000 } sync(subs, keys) setTimeout(timer, interval) } } - if (subs) { - subs.push(keys.publicKey) timer() } else { var subs = [] |