Merge branch 'websocket-ui'

8 years ago · 9ab415da9d
2 changed files with 63 additions and 35 deletions
--- a/websocket-ui/index.html
+++ b/websocket-ui/index.html
@ -31,6 +31,10 @@
				@@ -31,6 +31,10 @@
    </style>
  </head>
  <body>
+    <div id="login-wrapper">
+      <input id="ws-url" value="ws://127.0.0.1:7666"></input>
+      <button id="connect-button" onclick="startui()">connect</button>
+    </div>
    <pre id="log"></pre>
    <canvas id="main">
    </canvas>
--- a/websocket-ui/ui.js
+++ b/websocket-ui/ui.js
@ -1,5 +1,3 @@
				@@ -1,5 +1,3 @@
-var url = "ws://127.0.0.1:7665";
-
 var l = document.getElementById("log");
 var c = document.getElementById("main");
 var nodes = {
@ -119,18 +117,16 @@ function tunnelState(tid, state) {
				@@ -119,18 +117,16 @@ function tunnelState(tid, state) {
    tunnelFailed(tid);
  } else if (state == "6" ) {
    tunnelExpiring(tid);
-  } else {
-    logit("tunnel "+tid+" state "+state);
  }
 }

 function tunnelCreated(tid) {
-  logit("tunnel "+tid+" was created");
+  logit("Tunnel "+tid+" was created");
 }

 function logit(msg) {
  console.log(msg);
-  var t = document.createTextNode(leftpad(msg, 25));
+  var t = document.createTextNode(msg);
  var e = document.createElement("div");
  e.appendChild(t);
  l.appendChild(e);
@ -138,10 +134,37 @@ function logit(msg) {
				@@ -138,10 +134,37 @@ function logit(msg) {
    l.removeChild(l.children[0]);
 }

+function socketClosed() {
+  var b = document.getElementById("connect-button");
+  b.onclick = startui
+  b.innerHTML = "connect";
+}
+
+function startui() {
+  var el = document.getElementById("ws-url");
+  var url;
+  if(el)
+    url = el.value;
+  else
+    url = "ws://127.0.0.1:7666";
+  
  var ws = new WebSocket(url);
  ws.onclose = function (ev) {
+    if (ev.code == 1000)
+      logit("connection closed");
+    else
+      logit("failed to connect to "+url);
    nodes = { length: 0 };
    tpeers = { length: 0 };
+    socketClosed();
+  }
+  ws.onopen = function(ev) {
+    logit("connected to "+url);
+    var b = document.getElementById("connect-button");
+    b.onclick = function() {
+      ws.close();
+    }
+    b.innerHTML = "disconnect";
  }
  ws.onmessage = function(ev) {
    var j = JSON.parse(ev.data);
@ -170,6 +193,7 @@ ws.onmessage = function(ev) {
				@@ -170,6 +193,7 @@ ws.onmessage = function(ev) {
      }
    }
  };
+}

 function getPeer(h, us) {
  if (tpeers[h]) {