Merge pull request #414 from mitmproxy/flowviews2

Flowviews2

1 files changed, 22 insertions, 31 deletions

diff --git a/web/src/js/connection.js b/web/src/js/connection.js
index 3edbfc20..6ca353b3 100644
--- a/web/src/js/connection.js
+++ b/web/src/js/connection.js
@@ -1,33 +1,24 @@
-function _Connection(url) {
-    this.url = url;
-}
-_Connection.prototype.init = function () {
-    this.openWebSocketConnection();
-};
-_Connection.prototype.openWebSocketConnection = function () {
-    this.ws = new WebSocket(this.url.replace("http", "ws"));
-    var ws = this.ws;
+function Connection(url) {
 
-    ws.onopen = this.onopen.bind(this);
-    ws.onmessage = this.onmessage.bind(this);
-    ws.onerror = this.onerror.bind(this);
-    ws.onclose = this.onclose.bind(this);
-};
-_Connection.prototype.onopen = function (open) {
-    console.debug("onopen", this, arguments);
-};
-_Connection.prototype.onmessage = function (message) {
-    //AppDispatcher.dispatchServerAction(...);
-    var m = JSON.parse(message.data);
-    AppDispatcher.dispatchServerAction(m);
-};
-_Connection.prototype.onerror = function (error) {
-    EventLogActions.add_event("WebSocket Connection Error.");
-    console.debug("onerror", this, arguments);
-};
-_Connection.prototype.onclose = function (close) {
-    EventLogActions.add_event("WebSocket Connection closed.");
-    console.debug("onclose", this, arguments);
-};
+    if (url[0] === "/") {
+        url = location.origin.replace("http", "ws") + url;
+    }
 
-var Connection = new _Connection(location.origin + "/updates");
+    var ws = new WebSocket(url);
+    ws.onopen = function () {
+        ConnectionActions.open();
+    };
+    ws.onmessage = function (message) {
+        var m = JSON.parse(message.data);
+        AppDispatcher.dispatchServerAction(m);
+    };
+    ws.onerror = function () {
+        ConnectionActions.error();
+        EventLogActions.add_event("WebSocket connection error.");
+    };
+    ws.onclose = function () {
+        ConnectionActions.close();
+        EventLogActions.add_event("WebSocket connection closed.");
+    };
+    return ws;
+}
\ No newline at end of file