MyFavMirrors
/
MeshCentral
mirror of https://github.com/Ylianst/MeshCentral.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed meshcore.js, this.root._dispatcher.close(); missing on older agents.

This commit is contained in:
Ylian Saint-Hilaire 2022-08-27 15:47:19 -07:00
parent 0add5f8c7c
commit a3d66b60fc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
agents/meshcore.js
View File

@ -1339,7 +1339,7 @@ function handleServerCommand(data) {
} }
}); });
} else { } else {
require("clipboard").read().then(function (str) { require('clipboard').read().then(function (str) {
if (str) { if (str) {
MeshServerLogEx(21, [str.length], "Getting clipboard content, " + str.length + " byte(s)", data); MeshServerLogEx(21, [str.length], "Getting clipboard content, " + str.length + " byte(s)", data);
mesh.SendCommand({ action: 'msg', type: 'getclip', sessionid: data.sessionid, data: str, tag: data.tag }); mesh.SendCommand({ action: 'msg', type: 'getclip', sessionid: data.sessionid, data: str, tag: data.tag });
@ -1372,7 +1372,7 @@ function handleServerCommand(data) {
this._c.root = this.parent; this._c.root = this.parent;
this._c.on('end', function () this._c.on('end', function ()
{ {
this.root._dispatcher.close(); try { this.root._dispatcher.close(); } catch (ex) { }
this.root._dispatcher = null; this.root._dispatcher = null;
this.root = null; this.root = null;
mesh.SendCommand({ action: 'msg', type: 'setclip', sessionid: data.sessionid, success: true }); mesh.SendCommand({ action: 'msg', type: 'setclip', sessionid: data.sessionid, success: true });
@ -1381,7 +1381,7 @@ function handleServerCommand(data) {
} }
} }
else { else {
require("clipboard")(data.data); require('clipboard')(data.data);
mesh.SendCommand({ action: 'msg', type: 'setclip', sessionid: data.sessionid, success: true }); mesh.SendCommand({ action: 'msg', type: 'setclip', sessionid: data.sessionid, success: true });
} // Set the clipboard } // Set the clipboard
} }
@ -4322,7 +4322,7 @@ function processConsoleCommand(cmd, args, rights, sessionid) {
if (require('MeshAgent').isService) { if (require('MeshAgent').isService) {
require('clipboard').dispatchRead().then(function (str) { sendConsoleText(str, sessionid); }); require('clipboard').dispatchRead().then(function (str) { sendConsoleText(str, sessionid); });
} else { } else {
require("clipboard").read().then(function (str) { sendConsoleText(str, sessionid); }); require('clipboard').read().then(function (str) { sendConsoleText(str, sessionid); });
} }
break; break;
case 'setclip': { case 'setclip': {
@ -4348,7 +4348,7 @@ function processConsoleCommand(cmd, args, rights, sessionid) {
this._c.root = this.parent; this._c.root = this.parent;
this._c.on('end', function () this._c.on('end', function ()
{ {
this.root._dispatcher.close(); try { this.root._dispatcher.close(); } catch (ex) { }
this.root._dispatcher = null; this.root._dispatcher = null;
this.root = null; this.root = null;
}); });
@ -4357,7 +4357,7 @@ function processConsoleCommand(cmd, args, rights, sessionid) {
response = 'Setting clipboard to: "' + args['_'][0] + '"'; response = 'Setting clipboard to: "' + args['_'][0] + '"';
} }
else { else {
require("clipboard")(args['_'][0]); response = 'Setting clipboard to: "' + args['_'][0] + '"'; require('clipboard')(args['_'][0]); response = 'Setting clipboard to: "' + args['_'][0] + '"';
} }
} }
break; break;