Close proxysock on error and cleanup status on disconnect

Author: jsastriawan

meshcentral-server-0.2.0.js

@@ -134,7 +134,7 @@ var CreateMeshCentralServer = function (host, port, path, username, password, to
                 }
             } else {
                 console.log("Proxy connection failed: "+ e.toString());
-                obj.socket.end();
+                obj.proxysocket.end();
             }
             return;
         }
@@ -299,6 +299,7 @@ var CreateMeshCentralServer = function (host, port, path, username, password, to
         obj.meshes = {};
         obj.userinfo = null;
         obj.computerlist = [];
+        obj.proxy_connected = false;
         //console.log('closed');
     }
 

websocket-wrapper-0.2.0.js

@@ -138,7 +138,7 @@ var CreateWebSocketWrapper = function (host, port, path, certhash, http_proxy) {
                 }
             } else {
                 console.log("Proxy connection failed: "+ e.toString());
-                obj.socket.end();
+                obj.proxysocket.end();
             }
             return;
         }        
@@ -219,6 +219,7 @@ var CreateWebSocketWrapper = function (host, port, path, certhash, http_proxy) {
         obj.socketState = 0;
         if (obj.onclose != null) { obj.onclose(); }
         if (obj.socket != null) { try { obj.socket.end(); } catch (ex) { } obj.socket = null; }
+        obj.proxy_connected = false;
     }
 
     // Called to send websocket data to the server