From 3913ed3d303a4e3684f0648028b14d503e6d0dc8 Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Thu, 20 Oct 2016 12:14:59 -0400 Subject: [PATCH] update ui for new events --- websocket-ui/index.html | 4 +++- websocket-ui/ui.js | 47 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/websocket-ui/index.html b/websocket-ui/index.html index 2fd2ab6..ecec3e6 100644 --- a/websocket-ui/index.html +++ b/websocket-ui/index.html @@ -5,7 +5,9 @@ - + 
+
+ diff --git a/websocket-ui/ui.js b/websocket-ui/ui.js index 068f459..ca72033 100644 --- a/websocket-ui/ui.js +++ b/websocket-ui/ui.js @@ -1,6 +1,6 @@ - +var l = document.getElementById("log"); var c = document.getElementById("main"); var nodes = { length: 0, @@ -37,8 +37,37 @@ function nodeRecv(ident, n) { nodes[ident].recv += parseInt(n); } +var tunnels = { + length : 0 +}; + +function tunnelBuild(peers, tid, inbound) { + logit("building tunnel "+tid); +} + +function tunnelLatency(tid, latency) { + logit("tunnel "+tid+" latency "+latency+"ms"); +} + +function tunnelState(tid, state) { + logit("tunnel "+tid+" entered state "+state); +} + +function tunnelCreated(tid) { + logit("tunnel "+tid+" was created"); +} + +function logit(msg) { + console.log(msg); + var t = document.createTextNode(msg); + var e = document.createElement("div"); + e.appendChild(t); + l.appendChild(e); + while(l.children.length > 50) + l.removeChild(l.children[0]); +} -var ws = new WebSocket("ws://127.0.0.1:7665/"); +var ws = new WebSocket("ws://127.0.0.1:7666/"); ws.onmessage = function(ev) { var j = JSON.parse(ev.data); if (j) { @@ -50,6 +79,16 @@ ws.onmessage = function(ev) { nodeSend(j.ident, j.number); } else if (j.type == "transport.recvmsg") { nodeRecv(j.ident, j.number); + } else if (j.type == "tunnel.build") { + tunnelBuild(j.value, j.tid, j.inbound); + } else if (j.type == "tunnel.latency") { + tunnelLatency(j.tid, j.value); + } else if (j.type == "tunnel.state") { + tunnelState(j.tid, j.value); + } else if (t.type == "tunnels.created") { + tunnelCreated(j.tid); + } else { + logit("message: "+j.type); } } }; @@ -67,9 +106,9 @@ setInterval(function() { var centerx = c.width / 2; var centery = c.height / 2; - var mult = Math.log(nodes.length) + 0.5; + var mult = Math.log(10 + nodes.length) + 0.5; - var outer_r = (n * mult); + var outer_r = ((10 + n) * mult); if(outer_r > c.width || outer_r > c.height) { var smaller = c.height; if(c.width < smaller) smaller = c.width;