MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-31 17:53:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added automatic clipboard.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2021-06-14 18:46:01 -07:00
parent 5e7669e6d8
commit d8fa07941d
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
agents/meshcore.js
View File

@ -1400,6 +1400,7 @@ function serverFetchFile() {
if ((Object.keys(agentFileHttpRequests).length > 4) || (agentFileHttpPendingRequests.length == 0)) return; // No more than 4 active HTTPS requests to the server. if ((Object.keys(agentFileHttpRequests).length > 4) || (agentFileHttpPendingRequests.length == 0)) return; // No more than 4 active HTTPS requests to the server.
var data = agentFileHttpPendingRequests.shift(); var data = agentFileHttpPendingRequests.shift();
if ((data.overwrite !== true) && fs.existsSync(data.path)) return; // Don't overwrite an existing file. if ((data.overwrite !== true) && fs.existsSync(data.path)) return; // Don't overwrite an existing file.
//try { fs.unlinkSync(data.path); } catch (ex) { } // Remove the old file.
if (data.createFolder) { try { fs.mkdirSync(data.folder); } catch (ex) { } } // If requested, create the local folder. if (data.createFolder) { try { fs.mkdirSync(data.folder); } catch (ex) { } } // If requested, create the local folder.
data.url = 'http' + getServerTargetUrlEx('*/').substring(2); data.url = 'http' + getServerTargetUrlEx('*/').substring(2);
var agentFileHttpOptions = http.parseUri(data.url); var agentFileHttpOptions = http.parseUri(data.url);

23
views/default.handlebars
View File

@ -1254,6 +1254,7 @@
<div id="d7otherset2" style="display:block"> <div id="d7otherset2" style="display:block">
<label style="display:block"><input type="checkbox" id="d7deskSwapMouse" />Swap Mouse Buttons</label> <label style="display:block"><input type="checkbox" id="d7deskSwapMouse" />Swap Mouse Buttons</label>
<label style="display:block"><input type="checkbox" id="d7deskRemoteKeyMap" />Use Remote Keyboard Map</label> <label style="display:block"><input type="checkbox" id="d7deskRemoteKeyMap" />Use Remote Keyboard Map</label>
<label style="display:block" id="d7deskAutoClipboardLabel"><input type="checkbox" id="d7deskAutoClipboard" />Automatic Clipboard</label>
</div> </div>
</div> </div>
</div> </div>
@ -1376,6 +1377,7 @@
var miscState = {}; var miscState = {};
var checkedNodeids = {}; var checkedNodeids = {};
var deskKeyboardShortcuts = []; var deskKeyboardShortcuts = [];
var deskLastClipboardSent = null;
// Console Message Display Timers // Console Message Display Timers
var p11DeskConsoleMsgTimer = null; var p11DeskConsoleMsgTimer = null;
@ -7673,7 +7675,7 @@
QE('connectbutton1h', hwonline); QE('connectbutton1h', hwonline);
QV('deskFocusBtn', (desktop != null) && (desktop.contype == 2) && (deskState != 0) && (desktopsettings.showfocus)); QV('deskFocusBtn', (desktop != null) && (desktop.contype == 2) && (deskState != 0) && (desktopsettings.showfocus));
QE('DeskClip', deskState == 3); QE('DeskClip', deskState == 3);
QV('DeskClip', (inputAllowed) && (currentNode.agent) && (currentNode.agent.id != 11) && (currentNode.agent.id != 16) && ((desktop == null) || (desktop.contype != 2))); // Clipboard not supported on macOS QV('DeskClip', (inputAllowed) && (currentNode.agent) && (currentNode.agent.id != 11) && (currentNode.agent.id != 16) && ((desktop == null) || (desktop.contype != 2)) && (desktopsettings.autoclipboard != true)); // Clipboard not supported on macOS
QE('DeskESC', deskState == 3); QE('DeskESC', deskState == 3);
QV('DeskESC', browserfullscreen && inputAllowed); QV('DeskESC', browserfullscreen && inputAllowed);
QE('DeskType', deskState == 3); QE('DeskType', deskState == 3);
@ -7684,8 +7686,9 @@
QV('DeskTimer', deskState == 3); QV('DeskTimer', deskState == 3);
// Enable browser clipboard read if supported // Enable browser clipboard read if supported
QV('DeskClipboardOutButton', online && inputAllowed && (navigator.clipboard != null) && (navigator.clipboard.readText != null)); QV('DeskClipboardOutButton', online && inputAllowed && (navigator.clipboard != null) && (navigator.clipboard.readText != null) && (desktopsettings.autoclipboard != true));
QV('DeskClipboardInButton', online && inputAllowed && (navigator.clipboard != null) && (navigator.clipboard.writeText != null)); QV('d7deskAutoClipboardLabel', navigator.clipboard.readText != null);
QV('DeskClipboardInButton', online && inputAllowed && (navigator.clipboard != null) && (navigator.clipboard.writeText != null) && (desktopsettings.autoclipboard != true));
if (deskState != 3) { QV('DeskInputLockedButton', false); QV('DeskInputUnLockedButton', false); } if (deskState != 3) { QV('DeskInputLockedButton', false); QV('DeskInputUnLockedButton', false); }
@ -7968,6 +7971,7 @@
case 3: case 3:
if (desktop && (desktop.serverIsRecording == true)) { QV('deskRecordIcon', true); } if (desktop && (desktop.serverIsRecording == true)) { QV('deskRecordIcon', true); }
desktop.startTime = new Date(); desktop.startTime = new Date();
deskLastClipboardSent = null;
if (updateSessionTimer == null) { updateSessionTimer = setInterval(updateSessionTime, 1000); } if (updateSessionTimer == null) { updateSessionTimer = setInterval(updateSessionTime, 1000); }
break; break;
default: default:
@ -7987,6 +7991,16 @@
if (desktop.latency && (desktop.latency.current >= 0)) { latencyStr = format('{0} ms, ', desktop.latency.current); } if (desktop.latency && (desktop.latency.current >= 0)) { latencyStr = format('{0} ms, ', desktop.latency.current); }
seconds = Math.floor((new Date() - desktop.startTime) / 1000); seconds = Math.floor((new Date() - desktop.startTime) / 1000);
QH('DeskTimer', latencyStr + zeroPad(Math.floor(seconds / 3600), 2) + ':' + zeroPad((Math.floor(seconds / 60) % 60), 2) + ':' + zeroPad((seconds % 60), 2)); QH('DeskTimer', latencyStr + zeroPad(Math.floor(seconds / 3600), 2) + ':' + zeroPad((Math.floor(seconds / 60) % 60), 2) + ':' + zeroPad((seconds % 60), 2));
if ((desktopsettings.autoclipboard === true) && (navigator.clipboard != null) && (navigator.clipboard.readText != null)) {
try {
navigator.clipboard.readText().then(function(text) {
if ((text != null) && (deskLastClipboardSent != text)) {
meshserver.send({ action: 'msg', type: 'setclip', nodeid: currentNode._id, data: text });
deskLastClipboardSent = text;
}
}).catch(function(err) { });
} catch (ex) { console.log(ex); }
}
} else { } else {
QH('DeskTimer', ''); QH('DeskTimer', '');
} }
@ -8020,9 +8034,11 @@
desktopsettings.framerate = d7framelimiter.value; desktopsettings.framerate = d7framelimiter.value;
desktopsettings.swapmouse = d7deskSwapMouse.checked; desktopsettings.swapmouse = d7deskSwapMouse.checked;
desktopsettings.remotekeymap = d7deskRemoteKeyMap.checked; desktopsettings.remotekeymap = d7deskRemoteKeyMap.checked;
desktopsettings.autoclipboard = d7deskAutoClipboard.checked;
desktopsettings.localkeymap = d7localKeyMap.checked; desktopsettings.localkeymap = d7localKeyMap.checked;
localStorage.setItem('desktopsettings', JSON.stringify(desktopsettings)); localStorage.setItem('desktopsettings', JSON.stringify(desktopsettings));
applyDesktopSettings(); applyDesktopSettings();
updateDesktopButtons();
if (desktop) { if (desktop) {
if (desktop.contype == 1) { if (desktop.contype == 1) {
desktop.m.SwapMouse = desktopsettings.swapmouse; desktop.m.SwapMouse = desktopsettings.swapmouse;
@ -8051,6 +8067,7 @@
if (desktopsettings.framerate) { d7framelimiter.value = desktopsettings.framerate; } else { d7framelimiter.value = 100; } if (desktopsettings.framerate) { d7framelimiter.value = desktopsettings.framerate; } else { d7framelimiter.value = 100; }
if (desktopsettings.swapmouse != null) { d7deskSwapMouse.checked = desktopsettings.swapmouse; } if (desktopsettings.swapmouse != null) { d7deskSwapMouse.checked = desktopsettings.swapmouse; }
if (desktopsettings.remotekeymap != null) { d7deskRemoteKeyMap.checked = desktopsettings.remotekeymap; } if (desktopsettings.remotekeymap != null) { d7deskRemoteKeyMap.checked = desktopsettings.remotekeymap; }
if (desktopsettings.autoclipboard != null) { d7deskAutoClipboard.checked = desktopsettings.autoclipboard; }
if (desktopsettings.localkeymap) { d7localKeyMap.checked = desktopsettings.localkeymap; } if (desktopsettings.localkeymap) { d7localKeyMap.checked = desktopsettings.localkeymap; }
QV('deskFocusBtn', (desktop != null) && (desktop.contype == 2) && (desktop.state != 0) && (desktopsettings.showfocus)); QV('deskFocusBtn', (desktop != null) && (desktop.contype == 2) && (desktop.state != 0) && (desktopsettings.showfocus));
} }