Fixed bad minified meshcore modules, added session player and session recording fixes

agents/modules_meshcore/sysinfo.js

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const PDH_FMT_LONG = 0x00000100;
-const PDH_FMT_DOUBLE = 0x00000200;
+var PDH_FMT_LONG = 0x00000100;
+var PDH_FMT_DOUBLE = 0x00000200;
 
 var promise = require('promise');
 if (process.platform == 'win32')

agents/modules_meshcore_min/sysinfo.min.js

@@ -0,0 +1 @@
+var PDH_FMT_LONG=256;var PDH_FMT_DOUBLE=512;var promise=require("promise");if(process.platform=="win32"){var GM=require("_GenericMarshal");GM.kernel32=GM.CreateNativeProxy("kernel32.dll");GM.kernel32.CreateMethod("GlobalMemoryStatusEx");GM.pdh=GM.CreateNativeProxy("pdh.dll");GM.pdh.CreateMethod("PdhAddEnglishCounterA");GM.pdh.CreateMethod("PdhCloseQuery");GM.pdh.CreateMethod("PdhCollectQueryData");GM.pdh.CreateMethod("PdhGetFormattedCounterValue");GM.pdh.CreateMethod("PdhGetFormattedCounterArrayA");GM.pdh.CreateMethod("PdhOpenQueryA");GM.pdh.CreateMethod("PdhRemoveCounter")}function windows_cpuUtilization(){var b=new promise(function(d,c){this._res=d;this._rej=c});b.counter=GM.CreateVariable(16);b.cpu=GM.CreatePointer();b.cpuTotal=GM.CreatePointer();var a=0;if((a=GM.pdh.PdhOpenQueryA(0,0,b.cpu).Val)!=0){b._rej(a);return}if((a=GM.pdh.PdhAddEnglishCounterA(b.cpu.Deref(),GM.CreateVariable("\\Processor(*)\\% Processor Time"),0,b.cpuTotal).Val)!=0){b._rej(a);return}if((a=GM.pdh.PdhCollectQueryData(b.cpu.Deref()).Val!=0)){b._rej(a);return}b._timeout=setTimeout(function(k){var m={cpus:[]};var d=GM.CreateVariable(4);var j=GM.CreateVariable(4);var c,l,h;var f;if((f=GM.pdh.PdhCollectQueryData(k.cpu.Deref()).Val!=0)){k._rej(f);return}if((f=GM.pdh.PdhGetFormattedCounterArrayA(k.cpuTotal.Deref(),PDH_FMT_DOUBLE,d,j,0).Val)==-2147481646){c=GM.CreateVariable(d.toBuffer().readUInt32LE())}else{k._rej(f);return}if((f=GM.pdh.PdhGetFormattedCounterArrayA(k.cpuTotal.Deref(),PDH_FMT_DOUBLE,d,j,c).Val)!=0){k._rej(f);return}for(var g=0;g<j.toBuffer().readUInt32LE();++g){h=c.Deref(g*24,24);l=h.Deref(0,GM.PointerSize).Deref();if(l.String=="_Total"){m.total=h.Deref(16,8).toBuffer().readDoubleLE()}else{m.cpus[parseInt(l.String)]=h.Deref(16,8).toBuffer().readDoubleLE()}}GM.pdh.PdhRemoveCounter(k.cpuTotal.Deref());GM.pdh.PdhCloseQuery(k.cpu.Deref());b._res(m)},100,b);return(b)}function windows_memUtilization(){var a=GM.CreateVariable(64);a.Deref(0,4).toBuffer().writeUInt32LE(64);GM.kernel32.GlobalMemoryStatusEx(a);var b={MemTotal:require("bignum").fromBuffer(a.Deref(8,8).toBuffer(),{endian:"little"}),MemFree:require("bignum").fromBuffer(a.Deref(16,8).toBuffer(),{endian:"little"})};b.percentFree=((b.MemFree.div(require("bignum")("1048576")).toNumber()/b.MemTotal.div(require("bignum")("1048576")).toNumber())*100);b.percentConsumed=((b.MemTotal.sub(b.MemFree).div(require("bignum")("1048576")).toNumber()/b.MemTotal.div(require("bignum")("1048576")).toNumber())*100);b.MemTotal=b.MemTotal.toString();b.MemFree=b.MemFree.toString();return(b)}function linux_cpuUtilization(){var g={cpus:[]};var d=require("fs").readFileSync("/proc/stat");var e=d.toString().split("\n");var a;var k,l;var h,c,j;for(var b in e){a=e[b].split(" ");if(!a[0].startsWith("cpu")){break}k=0,h=0;while(a[++k]==""){}for(l=k;l<a.length;++l){h+=parseInt(a[l])}c=parseInt(a[3+k]);j=(100-((c/h)*100));if(!g.total){g.total=j}else{g.cpus.push(j)}}var f=new promise(function(m,i){this._res=m;this._rej=i});f._res(g);return(f)}function linux_memUtilization(){var c={};var b=require("fs").readFileSync("/proc/meminfo").toString().split("\n");var d;for(var a in b){d=b[a].split(" ");switch(d[0]){case"MemTotal:":c.total=parseInt(d[d.length-2]);break;case"MemFree:":c.free=parseInt(d[d.length-2]);break}}c.percentFree=((c.free/c.total)*100);c.percentConsumed=(((c.total-c.free)/c.total)*100);return(c)}function macos_cpuUtilization(){var d=new promise(function(h,g){this._res=h;this._rej=g});var b=require("child_process").execFile("/bin/sh",["sh"]);b.stdout.str="";b.stdout.on("data",function(g){this.str+=g.toString()});b.stdin.write('top -l 1 | grep -E "^CPU"\nexit\n');b.waitExit();var c=b.stdout.str.split("\n");if(c[0].length>0){var f=c[0].split(":")[1];var a=f.split(",");var e=parseFloat(a[0].split("%")[0].trim())+parseFloat(a[1].split("%")[0].trim());d._res({total:e,cpus:[]})}else{d._rej("parse error")}return(d)}function macos_memUtilization(){var d={};var e=new promise(function(h,g){this._res=h;this._rej=g});var b=require("child_process").execFile("/bin/sh",["sh"]);b.stdout.str="";b.stdout.on("data",function(g){this.str+=g.toString()});b.stdin.write('top -l 1 | grep -E "^Phys"\nexit\n');b.waitExit();var c=b.stdout.str.split("\n");if(c[0].length>0){var f=c[0].split(":")[1];var a=f.split(",");d.MemTotal=parseInt(a[0].trim().split(" ")[0]);d.MemFree=parseInt(a[1].trim().split(" ")[0]);d.percentFree=((d.MemFree/d.MemTotal)*100);d.percentConsumed=(((d.MemTotal-d.MemFree)/d.MemTotal)*100);return(d)}else{throw ("Parse Error")}}switch(process.platform){case"linux":module.exports={cpuUtilization:linux_cpuUtilization,memUtilization:linux_memUtilization};break;case"win32":module.exports={cpuUtilization:windows_cpuUtilization,memUtilization:windows_memUtilization};break;case"darwin":module.exports={cpuUtilization:macos_cpuUtilization,memUtilization:macos_memUtilization};break};

agents/modules_meshcore_min/wifi-scanner-windows.min.js

@@ -0,0 +1 @@
+function _Scan(){var f=this.Marshal.CreatePointer();this.Native.WlanEnumInterfaces(this.Handle,0,f);var a=f.Deref().Deref(0,4).toBuffer().readUInt32LE(0);var d=f.Deref().Deref(8,532);var c=d.Deref(16,512).AnsiString;var e;switch(d.Deref(528,4).toBuffer().readUInt32LE(0)){case 0:e="NOT READY";break;case 1:e="CONNECTED";break;case 2:e="AD-HOC";break;case 3:e="DISCONNECTING";break;case 4:e="DISCONNECTED";break;case 5:e="ASSOCIATING";break;case 6:e="DISCOVERING";break;case 7:e="AUTHENTICATING";break;default:e="UNKNOWN";break}var b=d.Deref(0,16);if(this.Native.WlanScan(this.Handle,b,0,0,0).Val==0){return(true)}else{return(false)}}function AccessPoint(d,a,c,b){this.ssid=d;this.bssid=a;this.rssi=c;this.lq=b}AccessPoint.prototype.toString=function(){return(this.ssid+" ["+this.bssid+"]: "+this.lq)};function OnNotify(g){var h=g.Deref(0,4).toBuffer().readUInt32LE(0);var f=g.Deref(4,4).toBuffer().readUInt32LE(0);var c=g.Deref(8,16);if((h&8)&&(f==7)){var a=this.Parent.Marshal.CreatePointer();var k=this.Parent.Native.GetBSSList(this.Parent.Handle,c,0,3,0,0,a).Val;if(k==0){var n=a.Deref().Deref(0,4).toBuffer().readUInt32LE(0);var j=a.Deref().Deref(4,4).toBuffer().readUInt32LE(0);for(i=0;i<j;++i){var d=a.Deref().Deref(8+(360*i),360);var m=d.Deref(4,32).String.trim();var b=d.Deref(40,6).HexString2;var l=d.Deref(56,4).toBuffer().readUInt32LE(0);var e=d.Deref(60,4).toBuffer().readUInt32LE(0);this.Parent.emit("Scan",new AccessPoint(m,b,l,e))}}}}function Wireless(){var a=require("events").inherits(this);this.Marshal=require("_GenericMarshal");this.Native=this.Marshal.CreateNativeProxy("wlanapi.dll");this.Native.CreateMethod("WlanOpenHandle");this.Native.CreateMethod("WlanGetNetworkBssList","GetBSSList");this.Native.CreateMethod("WlanRegisterNotification");this.Native.CreateMethod("WlanEnumInterfaces");this.Native.CreateMethod("WlanScan");this.Native.CreateMethod("WlanQueryInterface");var c=this.Marshal.CreatePointer();var b=this.Marshal.CreatePointer();this.Native.WlanOpenHandle(2,0,c,b);this.Handle=b.Deref();this._NOTIFY_PROXY_OBJECT=this.Marshal.CreateCallbackProxy(OnNotify,2);this._NOTIFY_PROXY_OBJECT.Parent=this;var d=this.Marshal.CreatePointer();var e=this.Native.WlanRegisterNotification(this.Handle,65535,0,this._NOTIFY_PROXY_OBJECT.Callback,this._NOTIFY_PROXY_OBJECT.State,0,d);a.createEvent("Scan");a.addMethod("Scan",_Scan);this.GetConnectedNetwork=function(){var n=this.Marshal.CreatePointer();console.log("Success = "+this.Native.WlanEnumInterfaces(this.Handle,0,n).Val);var h=n.Deref().Deref(0,4).toBuffer().readUInt32LE(0);var m=n.Deref().Deref(8,532);var l=m.Deref(16,512).AnsiString;var o=m.Deref(528,4).toBuffer().readUInt32LE(0);if(m.Deref(528,4).toBuffer().readUInt32LE(0)==1){var j=this.Marshal.CreatePointer();var q=this.Marshal.CreatePointer();var s=this.Marshal.CreatePointer();var k=m.Deref(0,16);var r=this.Native.WlanQueryInterface(this.Handle,k,7,0,j,q,s).Val;if(r==0){var f=q.Deref().Deref(524,32).String;var g=q.Deref().Deref(560,6).HexString;var p=q.Deref().Deref(576,4).toBuffer().readUInt32LE(0);return(new AccessPoint(f,g,0,p))}}throw ("GetConnectedNetworks: FAILED (not associated to a network)")};return(this)}module.exports=new Wireless();

agents/modules_meshcore_min/wifi-scanner.min.js

@@ -0,0 +1 @@
+var MemoryStream=require("MemoryStream");var WindowsChildScript='var parent = require("ScriptContainer");var Wireless = require("wifi-scanner-windows");Wireless.on("Scan", function (ap) { parent.send(ap); });Wireless.Scan();';function AccessPoint(c,a,b){this.ssid=c;this.bssid=a;this.lq=b}AccessPoint.prototype.toString=function(){return("["+this.bssid+"]: "+this.ssid+" ("+this.lq+")")};function WiFiScanner(){var a=require("events").inherits(this);a.createEvent("accessPoint");this.hasWireless=function(){var d=false;var b=require("os").networkInterfaces();for(var c in b){if(b[c][0].type=="wireless"){d=true;break}}return(d)};this.Scan=function(){if(process.platform=="win32"){this.master=require("ScriptContainer").Create(15,ContainerPermissions.DEFAULT);this.master.parent=this;this.master.on("data",function(e){this.parent.emit("accessPoint",new AccessPoint(e.ssid,e.bssid,e.lq))});this.master.addModule("wifi-scanner-windows",getJSModule("wifi-scanner-windows"));this.master.ExecuteString(WindowsChildScript)}else{if(process.platform=="linux"){var c=require("os").networkInterfaces();var d=null;for(var b in c){if(c[b][0].type=="wireless"){d=b;break}}if(d!=null){this.child=require("child_process").execFile("/sbin/iwlist",["iwlist",d,"scan"]);this.child.parent=this;this.child.ms=new MemoryStream();this.child.ms.parent=this.child;this.child.stdout.on("data",function(e){this.parent.ms.write(e)});this.child.on("exit",function(){this.ms.end()});this.child.ms.on("end",function(){var l=this.buffer.toString();tokens=l.split(" - Address: ");for(var h in tokens){if(h==0){continue}var i=tokens[h].split("\n");var e=i[0];var f;var g;for(var j in i){j=i[j].trim();j=j.trim();if(j.startsWith("ESSID:")){g=j.slice(7,j.length-1);if(g=="<hidden>"){g=""}}if(j.startsWith("Signal level=")){f=j.slice(13,j.length-4)}else{if(j.startsWith("Quality=")){f=j.slice(8,10);var k=j.slice(11,13)}}}this.parent.parent.emit("accessPoint",new AccessPoint(g,e,f))}})}}}}}module.exports=WiFiScanner;

agents/modules_meshcore_min/win-console.min.js

@@ -0,0 +1 @@
+var TrayIconFlags={NIF_MESSAGE:1,NIF_ICON:2,NIF_TIP:4,NIF_STATE:8,NIF_INFO:16,NIF_GUID:32,NIF_REALTIME:64,NIF_SHOWTIP:128,NIM_ADD:0,NIM_MODIFY:1,NIM_DELETE:2,NIM_SETFOCUS:3,NIM_SETVERSION:4};var NOTIFYICON_VERSION_4=4;var MessageTypes={WM_APP:32768,WM_USER:1024};function WindowsConsole(){if(process.platform=="win32"){this._ObjectID="win-console";this._Marshal=require("_GenericMarshal");this._kernel32=this._Marshal.CreateNativeProxy("kernel32.dll");this._user32=this._Marshal.CreateNativeProxy("user32.dll");this._kernel32.CreateMethod("GetConsoleWindow");this._kernel32.CreateMethod("GetCurrentThread");this._user32.CreateMethod("ShowWindow");this._user32.CreateMethod("LoadImageA");this._user32.CreateMethod({method:"GetMessageA",threadDispatch:1});this._shell32=this._Marshal.CreateNativeProxy("Shell32.dll");this._shell32.CreateMethod("Shell_NotifyIconA");this._handle=this._kernel32.GetConsoleWindow();this.minimize=function(){this._user32.ShowWindow(this._handle,6)};this.restore=function(){this._user32.ShowWindow(this._handle,9)};this.hide=function(){this._user32.ShowWindow(this._handle,0)};this.show=function(){this._user32.ShowWindow(this._handle,5)};this._loadicon=function(c){var b=this._user32.LoadImageA(0,this._Marshal.CreateVariable(c),1,0,0,16|32768|64);return(b)};this.SetTrayIcon=function a(h){var b=this._Marshal.CreateVariable(this._Marshal.PointerSize==4?508:528);b.toBuffer().writeUInt32LE(b._size,0);var n=TrayIconFlags.NIF_TIP|TrayIconFlags.NIF_MESSAGE;h.filter=MessageTypes.WM_APP+1;b.Deref(this._Marshal.PointerSize==4?16:24,4).toBuffer().writeUInt32LE(h.filter);if(!h.noBalloon){n|=TrayIconFlags.NIF_INFO}if(h.icon){n|=TrayIconFlags.NIF_ICON;var c=b.Deref(this._Marshal.PointerSize==4?20:32,this._Marshal.PointerSize);h.icon.pointerBuffer().copy(c.toBuffer())}b.Deref(this._Marshal.PointerSize*2,4).toBuffer().writeUInt32LE(1);b.Deref(this._Marshal.PointerSize==4?12:20,4).toBuffer().writeUInt32LE(n);b.Deref(this._Marshal.PointerSize==4?416:432,4).toBuffer().writeUInt32LE(NOTIFYICON_VERSION_4);var m=b.Deref(this._Marshal.PointerSize==4?24:40,128);var k=b.Deref(this._Marshal.PointerSize==4?160:176,256);var l=b.Deref(this._Marshal.PointerSize==4?420:436,64);if(h.szTip){Buffer.from(h.szTip).copy(m.toBuffer())}if(h.szInfo){Buffer.from(h.szInfo).copy(k.toBuffer())}if(h.szInfoTitle){Buffer.from(h.szInfoTitle).copy(l.toBuffer())}var d=require("win-message-pump");retVal={_ObjectID:"WindowsConsole.TrayIcon",MessagePump:new d(h)};var j=require("events").inherits(retVal);j.createEvent("ToastClicked");j.createEvent("IconHover");j.createEvent("ToastDismissed");retVal.Options=h;retVal.MessagePump.TrayIcon=retVal;retVal.MessagePump.NotifyData=b;retVal.MessagePump.WindowsConsole=this;retVal.MessagePump.on("exit",function e(o){console.log("Pump Exited");if(this.TrayIcon){this.TrayIcon.remove()}});retVal.MessagePump.on("hwnd",function f(o){h.hwnd=o;o.pointerBuffer().copy(this.NotifyData.Deref(this.WindowsConsole._Marshal.PointerSize,this.WindowsConsole._Marshal.PointerSize).toBuffer());if(this.WindowsConsole._shell32.Shell_NotifyIconA(TrayIconFlags.NIM_ADD,this.NotifyData).Val==0){}});retVal.MessagePump.on("message",function g(p){if(p.message==this.TrayIcon.Options.filter){var o=false;if(p.wparam==1&&p.lparam==1029){this.TrayIcon.emit("ToastClicked");o=true}if(p.wparam==1&&p.lparam==512){this.TrayIcon.emit("IconHover");o=true}if(this.TrayIcon.Options.balloonOnly&&p.wparam==1&&(p.lparam==1028||p.lparam==1029)){this.TrayIcon.emit("ToastDismissed");this.TrayIcon.remove();o=true}}});retVal.remove=function i(){this.MessagePump.WindowsConsole._shell32.Shell_NotifyIconA(TrayIconFlags.NIM_DELETE,this.MessagePump.NotifyData);this.MessagePump.stop();delete this.MessagePump.TrayIcon;delete this.MessagePump};return(retVal)}}}module.exports=new WindowsConsole();

common.js

@@ -126,6 +126,7 @@ module.exports.ComputeDigesthash = function (username, password, realm, method,
 module.exports.toNumber = function (str) { var x = parseInt(str); if (x == str) return x; return str; };
 module.exports.escapeHtml = function (string) { return String(string).replace(/[&<>"'`=\/]/g, function (s) { return { '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;', '/': '&#x2F;', '`': '&#x60;', '=': '&#x3D;' }[s]; }); };
 module.exports.escapeHtmlBreaks = function (string) { return String(string).replace(/[&<>"'`=\/]/g, function (s) { return { '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;', '/': '&#x2F;', '`': '&#x60;', '=': '&#x3D;', '\r': '<br />', '\n': '' }[s]; }); };
+module.exports.zeroPad = function(num, c) { if (c == null) { c = 2; } var s = "000000" + num; return s.substr(s.length - c); }
 
 // Lowercase all the names in a object recursively
 // Allow for exception keys, child of exceptions will not get lower-cased.

meshrelay.js

@@ -17,6 +17,7 @@ module.exports.CreateMeshRelay = function (parent, ws, req, domain, user, cookie
     var obj = {};
     obj.ws = ws;
     obj.id = req.query.id;
+    obj.user = user;
 
     // Relay session count (we may remove this in the future)
     obj.relaySessionCounted = true;
@@ -164,10 +165,11 @@ module.exports.CreateMeshRelay = function (parent, ws, req, domain, user, cookie
                     if (relayinfo.timeout) { clearTimeout(relayinfo.timeout); delete relayinfo.timeout; }
 
                     // Setup session recording
-                    var sessionUser = user;
+                    var sessionUser = obj.user;
                     if (sessionUser == null) { sessionUser = obj.peer.user; }
-                    if (domain.sessionrecording == true || ((typeof domain.sessionrecording == 'object') && ((domain.sessionrecording.protocols == null) || (domain.sessionrecording.protocols.indexOf(parseInt(req.query.p)) >= 0)))) {
-                        var recFilename = 'relaysession' + ((domain.id == '') ? '' : '-') + domain.id + '-' + Date.now() + '-' + obj.id + '.mcrec'
+                    if ((sessionUser != null) && (domain.sessionrecording == true || ((typeof domain.sessionrecording == 'object') && ((domain.sessionrecording.protocols == null) || (domain.sessionrecording.protocols.indexOf(parseInt(req.query.p)) >= 0))))) {
+                        var now = new Date(Date.now());
+                        var recFilename = 'relaysession' + ((domain.id == '') ? '' : '-') + domain.id + '-' + now.getUTCFullYear() + '-' + parent.common.zeroPad(now.getUTCMonth(), 2) + '-' + parent.common.zeroPad(now.getUTCDate(), 2) + '-' + parent.common.zeroPad(now.getUTCHours(), 2) + '-' + parent.common.zeroPad(now.getUTCMinutes(), 2) + '-' + parent.common.zeroPad(now.getUTCSeconds(), 2) + '-' + obj.id + '.mcrec'
                         var recFullFilename = null;
                         if (domain.sessionrecording.filepath) {
                             try { parent.parent.fs.mkdirSync(domain.sessionrecording.filepath); } catch (e) { }
@@ -184,7 +186,7 @@ module.exports.CreateMeshRelay = function (parent, ws, req, domain, user, cookie
                             } else {
                                 // Write the recording file header
                                 var firstBlock = JSON.stringify({ magic: 'MeshCentralRelaySession', ver: 1, userid: sessionUser._id, username: sessionUser.name, sessionid: obj.id, ipaddr1: cleanRemoteAddr(ws._socket.remoteAddress), ipaddr2: cleanRemoteAddr(obj.peer.ws._socket.remoteAddress), time: new Date().toLocaleString(), protocol: req.query.p, nodeid: req.query.nodeid });
-                                recordingEntry(fd, 2, ((req.query.browser) ? 2 : 0), firstBlock, function () {
+                                recordingEntry(fd, 1, ((req.query.browser) ? 2 : 0), firstBlock, function () {
                                     relayinfo.peer1.ws.logfile = ws.logfile = { fd: fd, lock: false };
                                     ws.send('c'); // Send connect to both peers
                                     relayinfo.peer1.ws.send('c');
@@ -200,13 +202,13 @@ module.exports.CreateMeshRelay = function (parent, ws, req, domain, user, cookie
                     parent.parent.debug(1, 'Relay connected: ' + obj.id + ' (' + cleanRemoteAddr(ws._socket.remoteAddress) + ' --> ' + cleanRemoteAddr(obj.peer.ws._socket.remoteAddress) + ')');
 
                     // Log the connection
-                    if (sessionUser) {
+                    if (sessionUser != null) {
                         var msg = 'Started relay session';
                         if (req.query.p == 1) { msg = 'Started terminal session'; }
                         else if (req.query.p == 2) { msg = 'Started desktop session'; }
                         else if (req.query.p == 5) { msg = 'Started file management session'; }
                         var event = { etype: 'relay', action: 'relaylog', domain: domain.id, userid: sessionUser._id, username: sessionUser.name, msg: msg + ' \"' + obj.id + '\" from ' + cleanRemoteAddr(obj.peer.ws._socket.remoteAddress) + ' to ' + cleanRemoteAddr(ws._socket.remoteAddress), protocol: req.query.p, nodeid: req.query.nodeid };
-                        parent.parent.DispatchEvent(['*', user._id], obj, event);
+                        parent.parent.DispatchEvent(['*', sessionUser._id], obj, event);
                     }
                 } else {
                     // Connected already, drop (TODO: maybe we should re-connect?)

public/player.htm

@@ -0,0 +1,434 @@
+<!DOCTYPE html>
+<html dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta content="text/html;charset=utf-8" http-equiv="Content-Type" />
+    <meta name="viewport" content="user-scalable=1.0,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="format-detection" content="telephone=no" />
+    <link type="text/css" href="styles/style.css" media="screen" rel="stylesheet" title="CSS" />
+    <script type="text/javascript" src="scripts/common-0.0.1.js"></script>
+    <script type="text/javascript" src="scripts/agent-desktop-0.0.2.js"></script>
+    <script type="text/javascript" src="scripts/amt-desktop-0.0.2.js"></script>
+</head>
+<body style="overflow:hidden;background-color:black">
+    <div id=p11 class="noselect" style="overflow:hidden">
+        <div id=deskarea0>
+            <div id=deskarea1 class="areaHead">
+                <div class="toright2">
+                    <div class='deskareaicon' title="Toggle View Mode" onclick="toggleAspectRatio(1)">&#8690;</div>
+                </div>
+                <div>
+                    <input id="OpenFileButton" type=button value="Open File..." onclick="openfile()">
+                    <span id="deskstatus"></span>
+                </div>
+            </div>
+            <div id=deskarea2 style="">
+                <div class="areaProgress"><div id="progressbar" style=""></div></div>
+            </div>
+            <div id=deskarea3x style="max-height:calc(100vh - 54px);height:calc(100vh - 54px);">
+                <div id="bigok" style="display:none;left:calc((100vh / 2))"><b>&checkmark;</b></div>
+                <div id="bigfail" style="display:none;left:calc((100vh / 2))"><b>&#10007;</b></div>
+                <div id="metadatadiv" style="padding:20px;color:lightgrey;text-align:left;display:none"></div>
+                <div id=DeskParent onclick="togglePause()">
+                    <canvas id=Desk width=640 height=480></canvas>
+                </div>
+                <div id=p11DeskConsoleMsg style="display:none;cursor:pointer;position:absolute;left:30px;top:17px;color:yellow;background-color:rgba(0,0,0,0.6);padding:10px;border-radius:5px" onclick=clearConsoleMsg()></div>
+            </div>
+            <div id=deskarea4 class="areaFoot">
+                <div class="toright2">
+                    <div id="timespan" style="padding-top:4px;padding-right:4px">00:00:00</div>
+                </div>
+                <div>
+                    &nbsp;
+                    <input id="PlayButton" type=button value="Play" disabled="disabled" onclick="play()">
+                    <input id="PauseButton" type=button value="Pause" disabled="disabled" onclick="pause()">
+                    <input id="RestartButton" type=button value="Restart" disabled="disabled" onclick="restart()">
+                    <select id="PlaySpeed" onchange="this.blur();">
+                        <option value=4>1/4 Speed</option>
+                        <option value=2>1/2 Speed</option>
+                        <option value=1 selected>Normal Speed</option>
+                        <option value=0.5>2x Speed</option>
+                        <option value=0.25>4x Speed</option>
+                        <option value=0.1>10x Speed</option>
+                    </select>
+                </div>
+            </div>
+        </div>
+        <div id=dialog class="noselect" style="display:none">
+            <div id=dialogHeader>
+                <div tabindex=0 id=id_dialogclose onclick=setDialogMode() onkeypress="if (event.key == 'Enter') setDialogMode()">&#x2716;</div>
+                <div id=id_dialogtitle></div>
+            </div>
+            <div id=dialogBody>
+                <div id=dialog1>
+                    <div id=id_dialogMessage style=""></div>
+                </div>
+                <div id=dialog2 style="">
+                    <div id=id_dialogOptions></div>
+                </div>
+            </div>
+            <div id="idx_dlgButtonBar">
+                <input id="idx_dlgCancelButton" type="button" value="Cancel" style="" onclick="dialogclose(0)">
+                <input id="idx_dlgOkButton" type="button" value="OK" style="" onclick="dialogclose(1)">
+                <div><input id="idx_dlgDeleteButton" type="button" value="Delete" style="display:none" onclick="dialogclose(2)"></div>
+            </div>
+        </div>
+    </div>
+    <script>
+        var recFile = null;
+        var recFilePtr = 0;
+        var recFileStartTime = 0;
+        var recFileLastTime = 0;
+        var recFileMetadata = null;
+        var recFileProtocol = 0;
+        var agentDesktop = null;
+        var playing = false;
+        var readState = 0;
+        var waitTimer = null;
+        var waitTimerArgs = null;
+        var deskAspectRatio = 0;
+        var currentDeltaTimeTotalSec = 0;
+
+        function start() {
+            window.onresize = deskAdjust;
+            document.ondrop = ondrop;
+            document.ondragover = ondragover;
+            document.ondragleave = ondragleave;
+            document.onkeypress = onkeypress;
+            Q('PlaySpeed').value = 1;
+            cleanup();
+        }
+
+        function readNextBlock(func) {
+            if ((recFilePtr + 16) > recFile.size) { func(-1); } else {
+                var fr = new FileReader();
+                fr.onload = function () {
+                    var type = ReadShort(this.result, 0);
+                    var flags = ReadShort(this.result, 2);
+                    var size = ReadInt(this.result, 4);
+                    var time = (ReadInt(this.result, 8) << 32) + ReadInt(this.result, 12);
+                    if ((recFilePtr + 16 + size) > recFile.size) { func(-1); } else {
+                        var fr2 = new FileReader();
+                        fr2.onload = function () {
+                            recFilePtr += (16 + size);
+                            QS('progressbar').width = Math.floor(100 * (recFilePtr / recFile.size)) + '%';
+                            func(type, flags, time, this.result);
+                        };
+                        fr2.readAsBinaryString(recFile.slice(recFilePtr + 16, recFilePtr + 16 + size));
+                    }
+                };
+                fr.readAsBinaryString(recFile.slice(recFilePtr, recFilePtr + 16));
+            }
+        }
+
+        function addInfo(name, value) { if (value == null) return ''; return addInfoNoEsc(name, EscapeHtml(value)); }
+
+        function addInfoNoEsc(name, value) {
+            if (value == null) return '';
+            return '<span style=color:gray>' + EscapeHtml(name) + '</span>:&nbsp;<span style=font-size:20px>' + value + '</span><br/>';
+        }
+
+        function processFirstBlock(type, flags, time, data) {
+            recFileProtocol = 0;
+            if ((type != 1) || (flags != 0)) { cleanup(); return; }
+            try { recFileMetadata = JSON.parse(data) } catch (ex) { cleanup(); return; }
+            if ((recFileMetadata == null) || (recFileMetadata.magic != 'MeshCentralRelaySession') || (recFileMetadata.ver != 1)) { cleanup(); return; }
+            var x = '';
+            x += addInfo('Time', recFileMetadata.time);
+            x += addInfo('Username', recFileMetadata.username);
+            x += addInfo('UserID', recFileMetadata.userid);
+            x += addInfo('SessionID', recFileMetadata.sessionid);
+            if (recFileMetadata.ipaddr1 && recFileMetadata.ipaddr2) { x += addInfo('Addresses', recFileMetadata.ipaddr1 + ' to ' + recFileMetadata.ipaddr2); }
+            x += addInfo('NodeID', recFileMetadata.nodeid);
+            if (recFileMetadata.protocol) {
+                var p = recFileMetadata.protocol;
+                if (p == 1) { p = 'MeshCentral Terminal'; }
+                else if (p == 2) { p = 'MeshCentral Desktop'; }
+                else if (p == 100) { p = 'Intel&reg; AMT WSMAN'; }
+                else if (p == 101) { p = 'Intel&reg; AMT Redirection'; }
+                x += addInfoNoEsc('Protocol', p);
+            }
+            if (recFileMetadata.protocol == 2) {
+                // MeshCentral remote desktop
+                recFileProtocol = 2;
+                x += '<br /><br /><span style=color:gray>Press [space] to play/pause.</span>';
+                QE('PlayButton', true);
+                QE('PauseButton', false);
+                QE('RestartButton', false);
+                recFileStartTime = recFileLastTime = time;
+                agentDesktop = CreateAgentRemoteDesktop('Desk');
+                agentDesktop.onScreenSizeChange = deskAdjust;
+                agentDesktop.State = 3;
+                deskAdjust();
+            }
+            QV('metadatadiv', true);
+            QH('metadatadiv', x);
+            QH('deskstatus', recFile.name);
+        }
+
+        function processBlock(type, flags, time, data) {
+            if (type < 0) { pause(); return; }
+            var waitTime = Math.round((time - recFileLastTime) * parseFloat(Q('PlaySpeed').value));
+            if (waitTime < 5) {
+                processBlockEx(type, flags, time, data);
+            } else {
+                waitTimerArgs = [type, flags, time, data]
+                waitTimer = setTimeout(function () { waitTimer = null; processBlockEx(waitTimerArgs[0], waitTimerArgs[1], waitTimerArgs[2], waitTimerArgs[3]); }, waitTime);
+            }
+        }
+
+        function processBlockEx(type, flags, time, data) {
+            if (playing == false) return;
+            var flagBinary = (flags & 1) != 0, flagUser = (flags & 2) != 0;
+            if ((type == 2) && flagBinary && !flagUser) {
+                var deltaTimeTotalSec = Math.floor((time - recFileStartTime) / 1000);
+                if (currentDeltaTimeTotalSec != deltaTimeTotalSec) {
+                    currentDeltaTimeTotalSec = deltaTimeTotalSec;
+                    var deltaTimeHours = Math.floor(deltaTimeTotalSec / 3600);
+                    deltaTimeTotalSec -= (deltaTimeHours * 3600)
+                    var deltaTimeMinutes = Math.floor(deltaTimeTotalSec / 60);
+                    deltaTimeTotalSec -= (deltaTimeHours * 60)
+                    var deltaTimeSeconds = Math.floor(deltaTimeTotalSec);
+                    QH('timespan', pad2(deltaTimeHours) + ':' + pad2(deltaTimeMinutes) + ':' + pad2(deltaTimeSeconds))
+                }
+                agentDesktop.ProcessData(data);
+            }
+            recFileLastTime = time;
+            if (playing) { readNextBlock(processBlock); }
+        }
+
+        function cleanup() {
+            recFile = null;
+            recFilePtr = 0;
+            recFileMetadata = null;
+            if (agentDesktop != null) {
+                agentDesktop.Canvas.clearRect(0, 0, agentDesktop.CanvasId.width, agentDesktop.CanvasId.height);
+                agentDesktop = null;
+            }
+            readState = 0;
+            waitTimerArgs = null;
+            currentDeltaTimeTotalSec = 0;
+            if (waitTimer != null) { clearTimeout(waitTimer); waitTimer = null; }
+            QH('deskstatus', '');
+            QE('PlayButton', false);
+            QE('PauseButton', false);
+            QE('RestartButton', false);
+            QS('progressbar').width = '0px';
+            QH('timespan', '00:00:00');
+            QV('metadatadiv', true);
+            QH('metadatadiv', '<span style=\"font-family:Arial,Helvetica Neue,Helvetica,sans-serif;font-size:28px\">MeshCentral Session Player</span><br /><br /><span style=color:gray>Drag & drop a .mcrec file or click "Open File..."</span>');
+        }
+
+        function ondrop(e) {
+            haltEvent(e);
+            QV('bigfail', false);
+            QV('bigok', false);
+
+            // Check if these are files we can upload, remove all folders.
+            if (e.dataTransfer == null) return;
+            var files = [];
+            for (var i in e.dataTransfer.files) {
+                if ((e.dataTransfer.files[i].type != null) && (e.dataTransfer.files[i].size != null) && (e.dataTransfer.files[i].size != 0) && (e.dataTransfer.files[i].name.endsWith('.mcrec'))) {
+                    files.push(e.dataTransfer.files[i]);
+                }
+            }
+            if (files.length == 0) return;
+            cleanup();
+            recFile = files[0];
+            recFilePtr = 0;
+            readNextBlock(processFirstBlock);
+        }
+
+        var dragtimer = null;
+        function ondragover(e) {
+            haltEvent(e);
+            if (dragtimer != null) { clearTimeout(dragtimer); dragtimer = null; }
+            var ac = true;
+            QV('bigok', ac);
+            QV('bigfail', !ac);
+        }
+
+        function ondragleave(e) {
+            haltEvent(e);
+            dragtimer = setTimeout(function () { QV('bigfail', false); QV('bigok', false); dragtimer = null; }, 10);
+        }
+
+        function onkeypress(e) {
+            if (xxdialogMode) return;
+            if (e.key == ' ') { togglePause(); haltEvent(e); }
+            if (e.key == '1') { Q('PlaySpeed').value = 4; haltEvent(e); }
+            if (e.key == '2') { Q('PlaySpeed').value = 2; haltEvent(e); }
+            if (e.key == '3') { Q('PlaySpeed').value = 1; haltEvent(e); }
+            if (e.key == '4') { Q('PlaySpeed').value = 0.5; haltEvent(e); }
+            if (e.key == '5') { Q('PlaySpeed').value = 0.25; haltEvent(e); }
+            if (e.key == '6') { Q('PlaySpeed').value = 0.1; haltEvent(e); }
+            if (e.key == '0') { pause(); restart(); haltEvent(e); }
+        }
+
+        function openfile() {
+            var x = '<input type=file name=files id=p2fileinput style=width:100% accept=".mcrec" onchange="openfileChanged()" />';
+            setDialogMode(2, "Open File...", 3, openfileEx, x);
+            QE('idx_dlgOkButton', false);
+        }
+
+        function openfileEx() {
+            var xfiles = Q('p2fileinput').files;
+            if (xfiles != null) { var files = []; for (var i in xfiles) { if ((xfiles[i].type != null) && (xfiles[i].size != null) && (xfiles[i].size != 0) && (xfiles[i].name.endsWith('.mcrec'))) { files.push(xfiles[i]); } } }
+            if (files.length == 0) return;
+            cleanup();
+            recFile = files[0];
+            recFilePtr = 0;
+            readNextBlock(processFirstBlock);
+            Q('OpenFileButton').blur();
+        }
+
+        function openfileChanged() {
+            var xfiles = Q('p2fileinput').files;
+            if (xfiles != null) { var files = []; for (var i in xfiles) { if ((xfiles[i].type != null) && (xfiles[i].size != null) && (xfiles[i].size != 0) && (xfiles[i].name.endsWith('.mcrec'))) { files.push(xfiles[i]); } } }
+            QE('idx_dlgOkButton', files.length == 1);
+        }
+
+        function togglePause() { if (recFile == null) return; if (playing == true) { pause(); } else { if (recFilePtr != recFile.size) { play(); } } }
+
+        function play() {
+            Q('PlayButton').blur();
+            if ((playing == true) || (recFileProtocol == 0)) return;
+            playing = true;
+            QV('metadatadiv', false);
+            QE('PlayButton', false);
+            QE('PauseButton', true);
+            QE('RestartButton', false);
+            readNextBlock(processBlock);
+        }
+
+        function pause() {
+            Q('PauseButton').blur();
+            if (playing == false) return;
+            playing = false;
+            QE('PlayButton', recFilePtr != recFile.size);
+            QE('PauseButton', false);
+            QE('RestartButton', recFilePtr != 0);
+            if (waitTimer != null) {
+                clearTimeout(waitTimer);
+                waitTimer = null;
+                processBlockEx(waitTimerArgs[0], waitTimerArgs[1], waitTimerArgs[2], waitTimerArgs[3]);
+                waitTimerArgs = null;
+            }
+        }
+
+        function restart() {
+            Q('RestartButton').blur();
+            if (playing == true) return;
+            recFilePtr = 0;
+            readState = 0;
+            currentDeltaTimeTotalSec = 0;
+            QV('metadatadiv', true);
+            QE('PlayButton', true);
+            QE('PauseButton', false);
+            QE('RestartButton', false);
+            QS('progressbar').width = '0px';
+            QH('timespan', '00:00:00')
+            agentDesktop.Canvas.clearRect(0, 0, agentDesktop.CanvasId.width, agentDesktop.CanvasId.height);
+        }
+
+        function clearConsoleMsg() {
+            console.log('clearConsoleMsg');
+        }
+
+        // Toggle the web page to full screen
+        function toggleAspectRatio(toggle) {
+            if (toggle === 1) { deskAspectRatio = ((deskAspectRatio + 1) % 3); }
+            deskAdjust();
+        }
+
+        function deskAdjust() {
+            var parentH = Q('DeskParent').clientHeight, parentW = Q('DeskParent').clientWidth;
+            var deskH = Q('Desk').height, deskW = Q('Desk').width;
+
+            if (deskAspectRatio == 2) {
+                // Scale mode
+                QS('Desk')['margin-top'] = null;
+                QS('Desk').height = '100%';
+                QS('Desk').width = '100%';
+                QS('DeskParent').overflow = 'hidden';
+            } else if (deskAspectRatio == 1) {
+                // Zoomed mode
+                QS('Desk')['margin-top'] = '0px';
+                //QS('Desk')['margin-left'] = '0px';
+                QS('Desk').height = deskH + 'px';
+                QS('Desk').width = deskW + 'px';
+                QS('DeskParent').overflow = 'scroll';
+            } else {
+                // Fixed aspect ratio
+                if ((parentH / parentW) > (deskH / deskW)) {
+                    var hNew = ((deskH * parentW) / deskW) + 'px';
+                    //if (webPageFullScreen || fullscreen) {
+                    //QS('deskarea3x').height = null;
+                    //} else {
+                    // QS('deskarea3x').height = hNew;
+                    //QS('deskarea3x').height = null;
+                    //}
+                    QS('Desk').height = hNew;
+                    QS('Desk').width = '100%';
+                } else {
+                    var wNew = ((deskW * parentH) / deskH) + 'px';
+                    //if (webPageFullScreen || fullscreen) {
+                        //QS('Desk').height = null;
+                    //} else {
+                        QS('Desk').height = '100%';
+                    //}
+                    QS('Desk').width = wNew;
+                }
+                QS('Desk')['margin-top'] = null;
+                QS('DeskParent').overflow = 'hidden';
+            }
+        }
+
+        //
+        // POPUP DIALOG
+        //
+
+        // null = Hidden, 1 = Generic Message
+        var xxdialogMode;
+        var xxdialogFunc;
+        var xxdialogButtons;
+        var xxdialogTag;
+        var xxcurrentView = -1;
+
+        // Display a dialog box
+        // Parameters: Dialog Mode (0 = none), Dialog Title, Buttons (1 = OK, 2 = Cancel, 3 = OK & Cancel), Call back function(0 = Cancel, 1 = OK), Dialog Content (Mode 2 only)
+        function setDialogMode(x, y, b, f, c, tag) {
+            xxdialogMode = x;
+            xxdialogFunc = f;
+            xxdialogButtons = b;
+            xxdialogTag = tag;
+            QE('idx_dlgOkButton', true);
+            QV('idx_dlgOkButton', b & 1);
+            QV('idx_dlgCancelButton', b & 2);
+            QV('id_dialogclose', (b & 2) || (b & 8));
+            QV('idx_dlgDeleteButton', b & 4);
+            QV('idx_dlgButtonBar', b & 7);
+            if (y) QH('id_dialogtitle', y);
+            for (var i = 1; i < 3; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
+            QV('dialog', x);
+            if (c) { if (x == 2) { QH('id_dialogOptions', c); } else { QH('id_dialogMessage', c); } }
+        }
+
+        function dialogclose(x) {
+            var f = xxdialogFunc, b = xxdialogButtons, t = xxdialogTag;
+            setDialogMode();
+            if (((b & 8) || x) && f) f(x, t);
+        }
+
+        function messagebox(t, m) { setSessionActivity(); QH('id_dialogMessage', m); setDialogMode(1, t, 1); }
+        function statusbox(t, m) { setSessionActivity(); QH('id_dialogMessage', m); setDialogMode(1, t); }
+
+
+        function haltEvent(e) { if (e.preventDefault) e.preventDefault(); if (e.stopPropagation) e.stopPropagation(); return false; }
+        function pad2(num) { var s = "00" + num; return s.substr(s.length - 2); }
+
+        start();
+    </script>
+</body>
+</html>

public/scripts/agent-desktop-0.0.2.js

@@ -92,7 +92,7 @@ var CreateAgentRemoteDesktop = function (canvasid, scrolldiv) {
 
     obj.send = function (x) {
         if (obj.debugmode > 1) { console.log("KSend(" + x.length + "): " + rstr2hex(x)); }
-        obj.parent.send(x);
+        if (obj.parent != null) { obj.parent.send(x); }
     }
 
     // KVM Control.
@@ -288,8 +288,10 @@ var CreateAgentRemoteDesktop = function (canvasid, scrolldiv) {
                 str = str.substring(4);
                 if (str[0] != '.') {
                     console.log(str); //alert('KVM: ' + str);
-                    obj.parent.consoleMessage = str;
-                    if (obj.parent.onConsoleMessageChange) { obj.parent.onConsoleMessageChange(obj.parent, str); }
+                    if (obj.parent != null) {
+                        obj.parent.consoleMessage = str;
+                        if (obj.parent.onConsoleMessageChange) { obj.parent.onConsoleMessageChange(obj.parent, str); }
+                    }
                 } else {
                     console.log('KVM: ' + str.substring(1));
                 }

sample-config.json

@@ -108,17 +108,17 @@
         "protocols": [ 1, 2, 101 ]
       }
     },
-    "customer1": {
-      "DNS": "customer1.myserver.com",
-      "Title": "Customer1",
-      "Title2": "TestServer",
-      "NewAccounts": 1,
-      "Auth": "sspi",
-      "Footer": "Test",
+    "_customer1": {
+      "_DNS": "customer1.myserver.com",
+      "_Title": "Customer1",
+      "_Title2": "TestServer",
+      "_NewAccounts": 1,
+      "_Auth": "sspi",
+      "_Footer": "Test",
       "_CertUrl": "https://192.168.2.106:443/"
     },
-    "info": {
-      "share": "C:\\ExtraWebSite"
+    "_info": {
+      "_share": "C:\\ExtraWebSite"
     }
   },
   "_letsencrypt": {

views/default.handlebars

@@ -2483,7 +2483,7 @@
                                 r += '</span></td></tr><tr>';
                                 if (mesh.mtype == 1) {
                                     r += '<td><div style=padding:10px><i>No Intel&reg; AMT devices in this mesh';
-                                    if ((meshrights & 4) != 0) { r += ', <a href=# style=cursor:pointer onclick=\'return addDeviceToMesh(\"' + mesh._id + '\"\')>add one</a>'; }
+                                    if ((meshrights & 4) != 0) { r += ', <a href=# style=cursor:pointer onclick=\'return addDeviceToMesh(\"' + mesh._id + '\")\'>add one</a>'; }
                                 }
                                 if (mesh.mtype == 2) {
                                     r += '<td><div style=padding:10px><i>No devices in this mesh';

webserver.js

@@ -1962,7 +1962,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
 
             // Setup session recording if needed
             if (domain.sessionrecording == true || ((typeof domain.sessionrecording == 'object') && ((domain.sessionrecording.protocols == null) || (domain.sessionrecording.protocols.indexOf((req.query.p == 2) ? 101 : 100) >= 0)))) { // TODO 100
-                var recFilename = 'relaysession' + ((domain.id == '') ? '' : '-') + domain.id + '-' + Date.now() + '-' + getRandomPassword() + '.mcrec'; // TODO: Random ID
+                var now = new Date(Date.now());
+                var recFilename = 'relaysession' + ((domain.id == '') ? '' : '-') + domain.id + '-' + now.getUTCFullYear() + '-' + obj.common.zeroPad(now.getUTCMonth(), 2) + '-' + obj.common.zeroPad(now.getUTCDate(), 2) + '-' + obj.common.zeroPad(now.getUTCHours(), 2) + '-' + obj.common.zeroPad(now.getUTCMinutes(), 2) + '-' + obj.common.zeroPad(now.getUTCSeconds(), 2) + '-' + getRandomPassword() + '.mcrec'
                 var recFullFilename = null;
                 if (domain.sessionrecording.filepath) {
                     try { obj.fs.mkdirSync(domain.sessionrecording.filepath); } catch (e) { }