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

Bryan's fix for meshcore.js: Added dispatcher.close() for setclip on Windows, if the dispatcher already exists

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

10
agents/meshcore.js
View File

@ -1339,7 +1339,7 @@ function handleServerCommand(data) {
}
});
} else {
require("clipboard").read().then(function (str) {
require('clipboard').read().then(function (str) {
if (str) {
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 });
@ -1364,6 +1364,7 @@ function handleServerCommand(data) {
var domain = require('user-sessions').getDomain(uid);
user = (domain + '\\' + user);
if (this._dispatcher) { this._dispatcher.close(); }
this._dispatcher = require('win-dispatcher').dispatch({ user: user, modules: [{ name: 'clip-dispatch', script: "module.exports = { dispatch: function dispatch(val) { require('clipboard')(val); process.exit(); } };" }], launch: { module: 'clip-dispatch', method: 'dispatch', args: [clipargs] } });
this._dispatcher.parent = this;
//require('events').setFinalizerMetadata.call(this._dispatcher, 'clip-dispatch');
@ -1381,7 +1382,7 @@ function handleServerCommand(data) {
}
}
else {
require("clipboard")(data.data);
require('clipboard')(data.data);
mesh.SendCommand({ action: 'msg', type: 'setclip', sessionid: data.sessionid, success: true });
} // Set the clipboard
}
@ -4322,7 +4323,7 @@ function processConsoleCommand(cmd, args, rights, sessionid) {
if (require('MeshAgent').isService) {
require('clipboard').dispatchRead().then(function (str) { sendConsoleText(str, sessionid); });
} else {
require("clipboard").read().then(function (str) { sendConsoleText(str, sessionid); });
require('clipboard').read().then(function (str) { sendConsoleText(str, sessionid); });
}
break;
case 'setclip': {
@ -4340,6 +4341,7 @@ function processConsoleCommand(cmd, args, rights, sessionid) {
var domain = require('user-sessions').getDomain(uid);
user = (domain + '\\' + user);
if (this._dispatcher) { this._dispatcher.close(); }
this._dispatcher = require('win-dispatcher').dispatch({ user: user, modules: [{ name: 'clip-dispatch', script: "module.exports = { dispatch: function dispatch(val) { require('clipboard')(val); process.exit(); } };" }], launch: { module: 'clip-dispatch', method: 'dispatch', args: [clipargs] } });
this._dispatcher.parent = this;
//require('events').setFinalizerMetadata.call(this._dispatcher, 'clip-dispatch');
@ -4357,7 +4359,7 @@ function processConsoleCommand(cmd, args, rights, sessionid) {
response = 'Setting clipboard to: "' + args['_'][0] + '"';
}
else {
require("clipboard")(args['_'][0]); response = 'Setting clipboard to: "' + args['_'][0] + '"';
require('clipboard')(args['_'][0]); response = 'Setting clipboard to: "' + args['_'][0] + '"';
}
}
break;