MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-21 18:53:32 +00:00
Code Issues Releases Wiki Activity

Added macOS clipboard support

Browse Source
This commit is contained in:
Bryan Roe
2020-06-03 17:02:56 -07:00
parent 51a3bc5384
commit 933e7f9721
3 changed files with 123 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

14
modules/clipboard.js
View File

@@ -74,7 +74,7 @@ function dispatchRead(sid)
id = sid; id = sid;
} }
if(id == 0 || (process.platform == 'linux' && require('clipboard').xclip)) if (id == 0 || process.platform == 'darwin' || (process.platform == 'linux' && require('clipboard').xclip))
{ {
return (module.exports.read()); return (module.exports.read());
} }
@@ -134,7 +134,7 @@ function dispatchWrite(data, sid)
id = sid; id = sid;
} }
if (id == 0 || (process.platform == 'linux' && require('clipboard').xclip)) if (id == 0 || process.platform == 'darwin' || (process.platform == 'linux' && require('clipboard').xclip))
{ {
return(module.exports(data)); return(module.exports(data));
} }
@@ -486,6 +486,14 @@ function win_copytext(txt)
user32.SetClipboardData(CF_UNICODETEXT, h); user32.SetClipboardData(CF_UNICODETEXT, h);
user32.CloseClipboard(); user32.CloseClipboard();
} }
function macos_copytext(clipText)
{
return (require('message-box').setClipboard(clipText));
}
function macos_readtext()
{
return (require('message-box').getClipboard());
}
switch(process.platform) switch(process.platform)
{ {
@@ -508,6 +516,8 @@ switch(process.platform)
}); });
break; break;
case 'darwin': case 'darwin':
module.exports = macos_copytext;
module.exports.read = macos_readtext;
break; break;
} }
module.exports.nativeAddModule = nativeAddModule; module.exports.nativeAddModule = nativeAddModule;

99
modules/message-box.js
View File

@@ -548,6 +548,73 @@ function macos_messageBox()
}; };
return (ret); return (ret);
}; };
this.setClipboard = function setClipboard(clipText)
{
// Start Local Server
var ret = this._initIPCBase();
ret.server = this.startMessageServer(ret);
ret.server.ret = ret;
ret.server.clipText = clipText;
ret.server.on('connection', function (c)
{
this._connection = c;
c.promise = this.ret;
c.on('data', function (buffer)
{
if (buffer.len < 4 || buffer.readUInt32LE(0) > buffer.len) { this.unshift(buffer); }
var p = JSON.parse(buffer.slice(4, buffer.readUInt32LE(0)).toString());
switch (p.command)
{
case 'writeClip':
if (p.clipError)
{
this.promise._rej(p.clipError);
}
else
{
this.promise._res();
}
break;
}
});
c.write(translateObject({ command: 'writeClip', clipText: this.clipText }));
});
return (ret);
};
this.getClipboard = function getClipboard()
{
// Start Local Server
var ret = this._initIPCBase();
ret.server = this.startMessageServer(ret);
ret.server.ret = ret;
ret.server.on('connection', function (c)
{
this._connection = c;
c.promise = this.ret;
c.on('data', function (buffer)
{
if (buffer.len < 4 || buffer.readUInt32LE(0) > buffer.len) { this.unshift(buffer); }
var p = JSON.parse(buffer.slice(4, buffer.readUInt32LE(0)).toString());
switch (p.command)
{
case 'readClip':
if (p.clipError)
{
this.promise._rej(p.clipError);
}
else
{
this.promise._res(p.clipValue);
}
break;
}
});
c.write(translateObject({ command: 'readClip' }));
});
return (ret);
};
this.lock = function lock() this.lock = function lock()
{ {
// Start Local Server // Start Local Server
@@ -621,6 +688,38 @@ function macos_messageBox()
var p = JSON.parse(buffer.slice(4, buffer.readUInt32LE(0)).toString()); var p = JSON.parse(buffer.slice(4, buffer.readUInt32LE(0)).toString());
switch (p.command) switch (p.command)
{ {
case 'writeClip':
this._shell = require('child_process').execFile('/usr/bin/pbcopy', ['pbcopy']);
this._shell.ipc = this;
this._shell.stdout.str = ''; this._shell.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
this._shell.stderr.str = ''; this._shell.stderr.on('data', function (chunk) { this.str += chunk.toString(); });
this._shell.stdin.write(p.clipText, function () { this.end(); });
this._shell.on('exit', function ()
{
if (this.stderr.str != '')
{
this.ipc.end(translateObject({ command: 'writeClip', clipError: this.stderr.str }));
}
else
{
this.ipc.end(translateObject({ command: 'writeClip' }));
}
});
break;
case 'readClip':
this._shell = require('child_process').execFile('/usr/bin/pbpaste', ['pbpaste']);
this._shell.stdout.str = ''; this._shell.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
this._shell.stderr.str = ''; this._shell.stderr.on('data', function (chunk) { this.str += chunk.toString(); });
this._shell.waitExit();
if (this._shell.stderr.str != '')
{
this.end(translateObject({ command: 'readClip', clipError: this._shell.stderr.str }));
}
else
{
this.end(translateObject({ command: 'readClip', clipValue: this._shell.stdout.str }));
}
break;
case 'LOCK': case 'LOCK':
this._shell = require('child_process').execFile('/bin/sh', ['sh']); this._shell = require('child_process').execFile('/bin/sh', ['sh']);
this._shell.stdout.str = ''; this._shell.stdout.on('data', function (chunk) { this.str += chunk.toString(); }); this._shell.stdout.str = ''; this._shell.stdout.on('data', function (chunk) { this.str += chunk.toString(); });