Improved MeshCentral1 migration, improved MeshAgent

agents/meshcmd.js

@@ -31,7 +31,7 @@ var settings = {
 // Check the server certificate fingerprint
 function onVerifyServer(clientName, certs) {
     try { for (var i in certs) { if (certs[i].fingerprint.replace(/:/g, '') == settings.serverHttpsHash) { return; } } } catch (e) { }
-    if (serverhash != null) { console.log('Error: Failed to verify server certificate.'); return false; }
+    if (serverhash != null) { console.log('Error: Failed to verify server certificate.'); throw 'Invalid server certificate'; }
 }
 
 // Print a debug message

agents/meshcore.js

@@ -290,8 +290,11 @@ function createMeshCore(agent) {
                         // Create a new tunnel object
                         var xurl = getServerTargetUrlEx(data.value);
                         if (xurl != null) {
-                            var tunnel = http.request(http.parseUri(xurl));
+                            var woptions = http.parseUri(xurl);
+                            sendConsoleText(JSON.stringify(woptions));
+                            var tunnel = http.request(woptions);
                             tunnel.upgrade = onTunnelUpgrade;
+                            tunnel.onerror = function (e) { sendConsoleText('ERROR: ' + JSON.stringify(e)); }
                             tunnel.sessionid = data.sessionid;
                             tunnel.rights = data.rights;
                             tunnel.state = 0;
@@ -775,6 +778,7 @@ function createMeshCore(agent) {
                         } catch (e) { response = 'Invalid HTTP websocket request'; }
                         if (httprequest != null) {
                             httprequest.upgrade = onWebSocketUpgrade;
+                            httprequest.onerror = function (e) { sendConsoleText('ERROR: ' + JSON.stringify(e)); }
 
                             var index = 1;
                             while (consoleWebSockets[index]) { index++; }