From f2a129537fcd20e2bb94b670cc35a6d184bb906d Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Thu, 20 Oct 2016 16:27:01 -0400 Subject: [PATCH 1/5] don't draw "length" --- websocket-ui/ui.js | 1 + 1 file changed, 1 insertion(+) diff --git a/websocket-ui/ui.js b/websocket-ui/ui.js index c076dbe..bb3d085 100644 --- a/websocket-ui/ui.js +++ b/websocket-ui/ui.js @@ -243,6 +243,7 @@ setInterval(function() { } for ( var h in tpeers ) { + if( h == "length") continue; drawPeer(getPeer(h)); } From 133fac0b554f56ad47c703408a9c49997acbe214 Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Thu, 20 Oct 2016 19:25:51 -0400 Subject: [PATCH 2/5] remove orphan nodes --- websocket-ui/ui.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/websocket-ui/ui.js b/websocket-ui/ui.js index bb3d085..40afd48 100644 --- a/websocket-ui/ui.js +++ b/websocket-ui/ui.js @@ -1,4 +1,4 @@ -var url = "ws://127.0.0.1:7666"; +var url = "ws://127.0.0.1:7665"; var l = document.getElementById("log"); var c = document.getElementById("main"); @@ -246,7 +246,8 @@ setInterval(function() { if( h == "length") continue; drawPeer(getPeer(h)); } - + + var newPeers = {}; for ( var ed in e ) { var edge = e[ed]; draw.beginPath(); @@ -254,9 +255,14 @@ setInterval(function() { draw.lineWidth = edge[3]; draw.moveTo(edge[0].x * c.width, edge[0].y * c.height); draw.lineTo(edge[1].x * c.width, edge[1].y * c.height); - draw.stroke(); - + newPeers[edge[0].name] = edge[0]; + newPeers[edge[1].name] = edge[1]; + draw.stroke(); } + + peers = newPeers; + + // draw nodes From 3ecd9f05e4703d37014b2d0f3989b111a3045851 Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Thu, 20 Oct 2016 19:35:51 -0400 Subject: [PATCH 3/5] fix previous commit --- websocket-ui/ui.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/websocket-ui/ui.js b/websocket-ui/ui.js index 40afd48..82dfd58 100644 --- a/websocket-ui/ui.js +++ b/websocket-ui/ui.js @@ -248,6 +248,7 @@ setInterval(function() { } var newPeers = {}; + var counter = 0; for ( var ed in e ) { var edge = e[ed]; draw.beginPath(); @@ -255,12 +256,18 @@ setInterval(function() { draw.lineWidth = edge[3]; draw.moveTo(edge[0].x * c.width, edge[0].y * c.height); draw.lineTo(edge[1].x * c.width, edge[1].y * c.height); - newPeers[edge[0].name] = edge[0]; - newPeers[edge[1].name] = edge[1]; + if(!newPeers[edge[0].name]) { + newPeers[edge[0].name] = edge[0]; + counter ++; + } + if(!newPeers[edge[1].name]) { + newPeers[edge[1].name] = edge[1]; + counter ++; + } draw.stroke(); } - - peers = newPeers; + newPeers.length = counter; + tpeers = newPeers; From f495f40be60e09c381752513afdf64894fc2bf9b Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Thu, 20 Oct 2016 19:59:39 -0400 Subject: [PATCH 4/5] update styles --- websocket-ui/index.html | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/websocket-ui/index.html b/websocket-ui/index.html index ecec3e6..22b41e8 100644 --- a/websocket-ui/index.html +++ b/websocket-ui/index.html @@ -3,11 +3,35 @@ websocket events + - - 
-
- + + 

+    
     
     

From 58d94f254929ca7d3a1fcd715b0064355abb8314 Mon Sep 17 00:00:00 2001
From: Jeff Becker 
Date: Fri, 21 Oct 2016 06:16:26 -0400
Subject: [PATCH 5/5] fixups

---
 websocket-ui/index.html |  5 +++--
 websocket-ui/ui.js      | 11 +++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/websocket-ui/index.html b/websocket-ui/index.html
index 22b41e8..2625308 100644
--- a/websocket-ui/index.html
+++ b/websocket-ui/index.html
@@ -10,9 +10,10 @@
         position: fixed;
         right: 0px;
         top: 0px;
+        height: 100%;
         font-size: 10px;
-        box-shadow 0px 0px 10px 10px #1a1a1a;
-        backgroud: rgba(1,1,1,0.5);
+        box-shadow: 0px 0px 10px 10px #1a1a1a;
+        background: rgba(1,1,1,0.5);
         border-radius: 5px;
       }
 
diff --git a/websocket-ui/ui.js b/websocket-ui/ui.js
index 82dfd58..2202467 100644
--- a/websocket-ui/ui.js
+++ b/websocket-ui/ui.js
@@ -96,8 +96,8 @@ function tunnelTestFailed(tid) {
 function tunnelFailed(tid) {
   if(!tunnels[tid]) return;
   logit("Tunnel " + tid + " has failed");
-  tunnels[tid].state = "failed";
-  tunnels[tid].color = "red";
+  delete tunnels[tid];
+  tunnels.length--;
 }
 
 function tunnelExpiring(tid) {
@@ -130,7 +130,7 @@ function tunnelCreated(tid) {
 
 function logit(msg) {
   console.log(msg);
-  var t = document.createTextNode(msg);
+  var t = document.createTextNode(leftpad(msg, 25));
   var e = document.createElement("div");
   e.appendChild(t);
   l.appendChild(e);
@@ -326,10 +326,11 @@ setInterval(function() {
     draw.beginPath();
     var txt = ident.substr(0, 6);
     draw.fillText(txt, x1-5, y1-5);
+    /**
     if(i * 10 < c.height) {
       txt += "| "+leftpad(nodes[ident].recv+" msg/s in", 15)+ " | "+leftpad(nodes[ident].send+" msg/s out", 15)+" |";
       draw.fillText(txt, 100, 20 + (i*10));
-    }
+    } */
     nodes[ident].recv = 0;
     nodes[ident].send = 0;
     draw.moveTo(x0, y0);
@@ -376,3 +377,5 @@ setInterval(function() {
   }
   tick ++;
 }, 100);
+
+logit("loaded");