MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-16 08:13:30 +00:00
Code Issues Releases Wiki Activity

Fixed error case for linux notifications, by checking zenity version, to do fallback for notify-send, if it exists, otherwise using zenity --info, with a faked timeout if necessary.

Browse Source
This commit is contained in:
Bryan Roe
2019-08-22 00:36:15 -07:00
parent 0469531f02
commit a0ffbc1e90
3 changed files with 58 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

14
modules/message-box.js
View File

@@ -171,6 +171,20 @@ function linux_messageBox()
})() })()
}); });
} }
else
{
Object.defineProperty(this, 'notifysend',
{
value: (function ()
{
var child = require('child_process').execFile('/bin/sh', ['sh']);
child.stdout.str = ''; child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
child.stdin.write("whereis notify-send | awk '{ print $2 }'\nexit\n");
child.waitExit();
return (child.stdout.str.trim() == '' ? null : { path: child.stdout.str.trim() });
})()
});
}
this.create = function create(title, caption, timeout) this.create = function create(title, caption, timeout)
{ {

85
modules/toaster.js
View File

@@ -115,66 +115,49 @@ function Toaster()
retVal._rej(xxe); retVal._rej(xxe);
return (retVal); return (retVal);
} }
var util = findPath('zenity');
if (util) if (require('message-box').zenity)
{ {
// Use ZENITY if (require('message-box').zenity.version[0] < 3 || (require('message-box').zenity.version[0] == 3 && require('message-box').zenity.version[1] < 10))
retVal.child = require('child_process').execFile(util, ['zenity', '--notification', '--title=' + title, '--text=' + caption, '--timeout=5'], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } }); {
// ZENITY Notification is broken
if (require('message-box').notifysend)
{
// Using notify-send
retVal.child = require('child_process').execFile('/bin/sh', ['sh']);
retVal.child.stdin.write('su - ' + retVal.username + ' -c "DISPLAY=\'' + retVal.xinfo.display + '\' notify-send \'' + retVal.title + '\' \'' + retVal.caption + '\'"\nexit\n');
}
else
{
// Faking notification with ZENITY --info
if (require('message-box').zenity.timeout)
{
// Timeout Supported
retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--info', '--title=' + retVal.title, '--text=' + retVal.caption, '--timeout=5'], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } });
}
else
{
// No Timeout Support, so we must fake it
retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--info', '--title=' + retVal.title, '--text=' + retVal.caption], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } });
retVal.child.timeout = setTimeout(function (c) { c.timeout = null; c.kill(); }, 5000, retVal.child);
}
}
}
else
{
// Use ZENITY Notification
retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--notification', '--title=' + title, '--text=' + caption, '--timeout=5'], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } });
}
retVal.child.parent = retVal; retVal.child.parent = retVal;
retVal.child.stderr.str = ''; retVal.child.stderr.str = '';
retVal.child.stderr.on('data', function (chunk) { this.str += chunk.toString(); this.parent.kill(); }); retVal.child.stderr.on('data', function (chunk) { this.str += chunk.toString(); });
retVal.child.stdout.on('data', function (chunk) { }); retVal.child.stdout.on('data', function (chunk) { });
retVal.child.on('exit', function (code) retVal.child.on('exit', function (code)
{ {
if (this.stderr.str.trim() != '') if (this.timeout) { clearTimeout(this.timeout); }
{
if ((util = findPath('notify-send')) && this.stderr.str.split('GLib-CRITICAL').length > 1)
{
// This is a bug in zenity, so we should try notify-send
if (process.env['DISPLAY'])
{
// DISPLAY is set, so we good to go
this.parent.child = require('child_process').execFile(util, ['notify-send', this.parent.title, this.parent.caption]);
this.parent.child.parent = this.parent;
}
else
{
// We need to find the DISPLAY to use
var username = require('user-sessions').getUsername(consoleUid);
this.parent.child = require('child_process').execFile('/bin/sh', ['sh']);
this.parent.child.parent = this.parent;
this.parent.child.stdin.write('su - ' + username + ' -c "DISPLAY=' + display + ' notify-send \'' + this.parent.title + '\' \'' + this.parent.caption + '\'"\n');
this.parent.child.stdin.write('exit\n');
}
this.parent.child.stdout.on('data', function (chunk) { });
this.parent.child.waitExit();
// NOTIFY-SEND has a bug where timeouts don't work, so the default is 5 seconds
this.parent._timeout = setTimeout(function onFakeDismissed(obj)
{
obj._res('DISMISSED');
}, 10000, this.parent);
}
else
{
// Fake a toast using zenity --info
util = findPath('zenity');
this.parent.child = require('child_process').execFile(util, ['zenity', '--info', '--title=' + this.parent.title, '--text=' + this.parent.caption, '--timeout=5'], { uid: this.parent.consoleUid, env: { XAUTHORITY: this.parent.xinfo.xauthority, DISPLAY: this.parent.xinfo.display } });
this.parent.child.parent = this.parent;
this.parent.child.stderr.on('data', function (chunk) { });
this.parent.child.stdout.on('data', function (chunk) { });
this.parent.child.on('exit', function (code)
{
this.parent._res('DISMISSED'); this.parent._res('DISMISSED');
}); });
} }
}
else
{
this.parent._res('DISMISSED');
}
});
}
else else
{ {
util = findPath('kdialog'); util = findPath('kdialog');