Improved crypto and removed dependency on WebSocket library, using ws instead.

public/scripts/agent-redir-ws-0.1.0.js

@@ -16,7 +16,9 @@ var CreateAgentRedirect = function (meshserver, module, serverPublicNamePort) {
     obj.connectstate = -1;
     obj.tunnelid = Math.random().toString(36).substring(2); // Generate a random client tunnel id
     obj.protocol = module.protocol; // 1 = SOL, 2 = KVM, 3 = IDER, 4 = Files, 5 = FileTransfer
-
+    obj.attemptWebRTC = false;
+    obj.webrtc = null;
+    obj.webchannel = null;
     obj.onStateChanged = null;
 
     // Private method
@@ -43,8 +45,68 @@ var CreateAgentRedirect = function (meshserver, module, serverPublicNamePort) {
         obj.xxStateChange(2);
     }
 
+    // Called to pass websocket control messages
+    obj.xxOnControlCommand = function (msg) {
+        var controlMsg = JSON.parse(msg);
+        if ((controlMsg.type == 'answer') && (obj.webrtc != null)) {
+            console.log('gotAnswer', JSON.stringify(controlMsg));
+            obj.webrtc.setRemoteDescription(new RTCSessionDescription(controlMsg), function () { console.log('WebRTC remote ok'); }, obj.xxCloseWebRTC);
+        }
+    }
+
+    // Close the WebRTC connection, should be called if a problem occurs during WebRTC setup.
+    obj.xxCloseWebRTC = function () {
+        if (obj.webchannel != null) { obj.webchannel.close(); obj.webchannel = null; }
+        if (obj.webrtc != null) { obj.webrtc.close(); obj.webrtc = null; }
+    }
+
     obj.xxOnMessage = function (e) {
-        if (obj.State < 3) { if (e.data == 'c') { obj.socket.send(obj.protocol); obj.xxStateChange(3); return; } }
+        if (obj.State < 3) {
+            if (e.data == 'c') {
+                obj.socket.send(obj.protocol);
+                obj.xxStateChange(3);
+
+                if (obj.attemptWebRTC == true) {
+                    // Try to get WebRTC setup
+                    var configuration = null; //{ "iceServers": [ { 'urls': 'stun:stun.services.mozilla.com' }, { 'urls': 'stun:stun.l.google.com:19302' } ] };
+                    if (typeof RTCPeerConnection !== 'undefined') { obj.webrtc = new RTCPeerConnection(configuration); }
+                    else if (typeof webkitRTCPeerConnection !== 'undefined') { obj.webrtc = new webkitRTCPeerConnection(configuration); }
+
+                    if (obj.webrtc != null) {
+                        obj.webchannel = obj.webrtc.createDataChannel("DataChannel", {}); // { ordered: false, maxRetransmits: 2 }
+                        obj.webchannel.onmessage = function (event) { console.log("DataChannel - onmessage", event.data); };
+                        obj.webchannel.onopen = function () { console.log("DataChannel - onopen"); };
+                        obj.webchannel.onclose = function (event) { console.log("DataChannel - onclose"); }
+                        obj.webrtc.ondatachannel = function (e) { console.log('ondatachannel'); } // TODO: Should not be needed
+                        obj.webrtc.onicecandidate = function (e) {
+                            if (e.candidate == null) {
+                                console.log('createOffer', JSON.stringify(obj.webrtcoffer));
+                                obj.socket.send('**********%%%%%%###**' + JSON.stringify(obj.webrtcoffer)); // End of candidates, send the offer
+                            } else {
+                                obj.webrtcoffer.sdp += ("a=" + e.candidate.candidate + "\r\n"); // New candidate, add it to the SDP
+                            }
+                        }
+                        obj.webrtc.oniceconnectionstatechange = function () {
+                            if (obj.webrtc != null) {
+                                console.log('oniceconnectionstatechange', obj.webrtc.iceConnectionState);
+                                if ((obj.webrtc.iceConnectionState == 'disconnected') || (obj.webrtc.iceConnectionState == 'failed')) { obj.xxCloseWebRTC(); }
+                            }
+                        }
+                        obj.webrtc.createOffer(function (offer) {
+                            // Got the offer
+                            obj.webrtcoffer = offer;
+                            obj.webrtc.setLocalDescription(offer, function () { console.log('WebRTC local ok'); }, obj.xxCloseWebRTC);
+                        }, obj.xxCloseWebRTC, { mandatory: { OfferToReceiveAudio: false, OfferToReceiveVideo: false } });
+                    }
+                }
+
+                return;
+            }
+        }
+        if (typeof e.data == 'string') {
+            // Control messages, most likely WebRTC setup 
+            obj.xxOnControlCommand(e.data);
+        }
         if (typeof e.data == 'object') {
             var f = new FileReader();
             if (f.readAsBinaryString) {
@@ -81,6 +143,9 @@ var CreateAgentRedirect = function (meshserver, module, serverPublicNamePort) {
         }
         else if (typeof data !== 'string') return;
 
+        // TODO: Don't use a prefix anymore, use string encoding instead
+        if (data.length > 21 && data.startsWith('**********%%%%%%###**')) { obj.xxOnControlCommand(data.substring(21)); return; }
+
         //console.log("xxOnSocketData", rstr2hex(data));
 
         return obj.m.ProcessData(data);
@@ -115,6 +180,7 @@ var CreateAgentRedirect = function (meshserver, module, serverPublicNamePort) {
         //obj.debug("Agent Redir Socket Stopped");
         obj.xxStateChange(0);
         obj.connectstate = -1;
+        obj.xxCloseWebRTC();
         if (obj.socket != null) { obj.socket.close(); obj.socket = null; }
     }