Updated for Linux/MacOS

modules/message-box.js

@@ -290,7 +290,14 @@ function macos_messageBox()
                         }
                         else
                         {
-                            this.promise._res(p.button);
+                            if (p.button == 'Yes')
+                            {
+                                this.promise._res(p.button);
+                            }
+                            else
+                            {
+                                this.promise._rej('denied');
+                            }
                         }
                         break;
                 }

modules/toaster.js

@@ -16,14 +16,21 @@ limitations under the License.
 
 var promise = require('promise');
 
-if (process.platform == 'linux')
+if (process.platform == 'linux' || process.platform == 'darwin')
 {
     function findPath(app)
     {
         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 " + app + " | awk '{ print $2 }'\nexit\n");
+        if (process.platform == 'linux')
+        {
+            child.stdin.write("whereis " + app + " | awk '{ print $2 }'\nexit\n");
+        }
+        else
+        {
+            child.stdin.write("whereis " + app + "\nexit\n");
+        }
         child.waitExit();
         child.stdout.str = child.stdout.str.trim();
         return (child.stdout.str == '' ? null : child.stdout.str);
@@ -39,146 +46,138 @@ function Toaster()
         retVal.title = title;
         retVal.caption = caption;
 
-        if (process.platform == 'win32')
+        switch (process.platform) {
-        {
+            case 'win32':
-            var GM = require('_GenericMarshal');
-            var kernel32 = GM.CreateNativeProxy('kernel32.dll');
-            kernel32.CreateMethod('ProcessIdToSessionId');
-            var psid = GM.CreateVariable(4);
-            var consoleUid = require('user-sessions').consoleUid();
-            if (kernel32.ProcessIdToSessionId(process.pid, psid).Val == 0)
-            {
-                retVal._rej('internal error'); return (retVal);
-            }
-
-            if (consoleUid == psid.toBuffer().readUInt32LE())
-            {
-                // We are running on the physical console
-                retVal._child = require('ScriptContainer').Create({ processIsolation: true });
-            }
-            else
-            {
-                // We need so spawn the ScriptContainer into the correct session
-                retVal._child = require('ScriptContainer').Create({ processIsolation: true, sessionId: consoleUid });
-            }
-            retVal._child.parent = retVal;
-            retVal._child.on('exit', function (code) { this.parent._res('DISMISSED'); });
-            retVal._child.addModule('win-console', getJSModule('win-console'));
-            retVal._child.addModule('win-message-pump', getJSModule('win-message-pump'));
-
-            var str = "\
-                    try{\
-                    var toast = require('win-console');\
-                    var balloon = toast.SetTrayIcon({ szInfo: '" + caption + "', szInfoTitle: '" + title + "', balloonOnly: true });\
-                    balloon.on('ToastDismissed', function(){process.exit();});\
-                    }\
-                    catch(e)\
-                    {\
-                        require('ScriptContainer').send(e);\
-                    }\
-                        require('ScriptContainer').send('done');\
-                    ";
-            retVal._child.ExecuteString(str);
-            return (retVal);
-        }
-        else
-        {
-            try
-            {
-                retVal.consoleUid = require('user-sessions').consoleUid();
-                retVal.xinfo = require('monitor-info').getXInfo(retVal.consoleUid);
-            }
-            catch(xxe)
-            {
-                retVal._rej(xxe);
-                return (retVal);
-            }
-            var util = findPath('zenity'); 
-            if (util)
-            {
-                // Use ZENITY
-                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 } });
-                retVal.child.parent = retVal;
-                retVal.child.stderr.str = '';
-                retVal.child.stderr.on('data', function (chunk) { this.str += chunk.toString(); this.parent.kill(); });
-                retVal.child.stdout.on('data', function (chunk) { });
-                retVal.child.on('exit', function (code)
                 {
-                    if(this.stderr.str.trim() != '')
+                    var GM = require('_GenericMarshal');
-                    {
+                    var kernel32 = GM.CreateNativeProxy('kernel32.dll');
-                        if ((util = findPath('notify-send')) && this.stderr.str.split('GLib-CRITICAL').length > 1)
+                    kernel32.CreateMethod('ProcessIdToSessionId');
-                        {
+                    var psid = GM.CreateVariable(4);
-                            // This is a bug in zenity, so we should try notify-send
+                    var consoleUid = require('user-sessions').consoleUid();
-                            if (process.env['DISPLAY'])
+                    if (kernel32.ProcessIdToSessionId(process.pid, psid).Val == 0) {
-                            {
+                        retVal._rej('internal error'); return (retVal);
-                                // 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
+                    if (consoleUid == psid.toBuffer().readUInt32LE()) {
-                            this.parent._timeout = setTimeout(function onFakeDismissed(obj)
+                        // We are running on the physical console
+                        retVal._child = require('ScriptContainer').Create({ processIsolation: true });
+                    }
+                    else {
+                        // We need so spawn the ScriptContainer into the correct session
+                        retVal._child = require('ScriptContainer').Create({ processIsolation: true, sessionId: consoleUid });
+                    }
+                    retVal._child.parent = retVal;
+                    retVal._child.on('exit', function (code) { this.parent._res('DISMISSED'); });
+                    retVal._child.addModule('win-console', getJSModule('win-console'));
+                    retVal._child.addModule('win-message-pump', getJSModule('win-message-pump'));
+
+                    var str = "\
+                            try{\
+                            var toast = require('win-console');\
+                            var balloon = toast.SetTrayIcon({ szInfo: '" + caption + "', szInfoTitle: '" + title + "', balloonOnly: true });\
+                            balloon.on('ToastDismissed', function(){process.exit();});\
+                            }\
+                            catch(e)\
+                            {\
+                                require('ScriptContainer').send(e);\
+                            }\
+                                require('ScriptContainer').send('done');\
+                            ";
+                    retVal._child.ExecuteString(str);
+                    return (retVal);
+                }
+                break;
+            case 'linux':
+                {
+                    try {
+                        retVal.consoleUid = require('user-sessions').consoleUid();
+                        retVal.xinfo = require('monitor-info').getXInfo(retVal.consoleUid);
+                    }
+                    catch (xxe) {
+                        retVal._rej(xxe);
+                        return (retVal);
+                    }
+                    var util = findPath('zenity');
+                    if (util) {
+                        // Use ZENITY
+                        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 } });
+                        retVal.child.parent = retVal;
+                        retVal.child.stderr.str = '';
+                        retVal.child.stderr.on('data', function (chunk) { this.str += chunk.toString(); this.parent.kill(); });
+                        retVal.child.stdout.on('data', function (chunk) { });
+                        retVal.child.on('exit', function (code) {
+                            if (this.stderr.str.trim() != '') {
+                                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');
+                                    });
+                                }
+                            }
+                            else {
+                                this.parent._res('DISMISSED');
+                            }
+                        });
+                    }
+                    else {
+                        util = findPath('kdialog');
+                        if (util) {
+                            // use KDIALOG
+                            var xdg = require('user-sessions').findEnv(retVal.consoleUid, 'XDG_RUNTIME_DIR');
+                            if (!retVal.xinfo || !retVal.xinfo.display || !retVal.xinfo.xauthority || !xdg)
                             {
-                                obj._res('DISMISSED');
+                                retVal._rej('Internal Error');
-                            }, 10000, this.parent);
+                                return (retVal);
+                            }
+                            retVal._notify = require('child_process').execFile(util, ['kdialog', '--title', retVal.title, '--passivepopup', retVal.caption, '5'], { uid: retVal.consoleUid, env: { DISPLAY: retVal.xinfo.display, XAUTHORITY: retVal.xinfo.xauthority, XDG_RUNTIME_DIR: xdg } });
+                            retVal._notify.parent = retVal;
+                            retVal._notify.stdout.on('data', function (chunk) { });
+                            retVal._notify.stderr.on('data', function (chunk) { });
+                            retVal._notify.on('exit', function (code) { this.parent._res('DISMISSED'); });
                         }
                         else
                         {
-                            // Fake a toast using zenity --info
+                            retVal._rej('Zenity/KDialog not found');
-                            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');
-                            });
                         }
                     }
-                    else
-                    {
-                        this.parent._res('DISMISSED');
-                    }
-                });
-            }
-            else
-            {
-                util = findPath('kdialog');
-                if (util)
-                {
-                    // use KDIALOG
-                    var xdg = require('user-sessions').findEnv(retVal.consoleUid, 'XDG_RUNTIME_DIR');
-                    if (!retVal.xinfo || !retVal.xinfo.display || !retVal.xinfo.xauthority || !xdg)
-                    {
-                        retVal._rej('Internal Error');
-                        return (retVal);
-                    }
-                    retVal._notify = require('child_process').execFile(util, ['kdialog', '--title', retVal.title, '--passivepopup', retVal.caption, '5'], { uid: retVal.consoleUid, env: { DISPLAY: retVal.xinfo.display, XAUTHORITY: retVal.xinfo.xauthority, XDG_RUNTIME_DIR: xdg } });
-                    retVal._notify.parent = retVal;
-                    retVal._notify.stdout.on('data', function (chunk) { });
-                    retVal._notify.stderr.on('data', function (chunk) { });
-                    retVal._notify.on('exit', function (code) { this.parent._res('DISMISSED'); });
                 }
-                else
+                break;
-                {
+            case 'darwin':
-                    retVal._rej ('Zenity/KDialog not found');
+                retVal._toast = require('message-box').notify(title, caption);
-                }
+                retVal._toast.parent = retVal;
-            }
+                retVal._toast.then(function (v) { this.parent._res(v); }, function (e) { this.parent._rej(e); });
-
+                break;
-            return (retVal);
         }
+
+        return (retVal);
     };
 }
 

modules/user-sessions.js

@@ -393,6 +393,26 @@ function UserSessions()
             }
             return (ret);
         }
+        this.consoleUid = function consoleUid()
+        {
+            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('who\nexit\n');
+            child.waitExit();
+
+            var lines = child.stdout.str.split('\n');
+            var tokens, i, j;
+            for (i in lines) {
+                tokens = lines[i].split(' ');
+                for (j = 1; j < tokens.length; ++j) {
+                    if (tokens[j].length > 0) {
+                        return (parseInt(this._users()[tokens[0]]));
+                    }
+                }
+            }
+            throw ('nobody logged into console');
+        }
         this.Current = function Current(cb)
         {
             var retVal = {};
@@ -652,6 +672,15 @@ function UserSessions()
     }
     else if(process.platform == 'darwin')
     {
+        this.getUid = function getUid(username)
+        {
+            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("id " + username + " | awk '{ split($1, token, \"=\"); split(token[2], uid, \"(\"); print uid[1]; }'\nexit\n");
+            child.waitExit();
+            return (parseInt(child.stdout.str.trim()));
+        };
         this.getGroupID = function getGroupID(uid)
         {
             var child = require('child_process').execFile('/bin/sh', ['sh']);
@@ -664,8 +693,10 @@ function UserSessions()
         this.getUsername = function getUsername(uid)
         {
             var child = require('child_process').execFile('/bin/sh', ['sh']);
+            child.stderr.str = '';
             child.stdout.str = '';
             child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
+            child.stderr.on('data', function (chunk) { this.str += chunk.toString(); });
             child.stdin.write("dscl . list /Users UniqueID | grep " + uid + " | awk '{ if($2==" + uid + "){ print $1 }}'\nexit\n");
             child.waitExit();
             if(child.stdout.str.trim() != '')
@@ -677,6 +708,21 @@ function UserSessions()
                 throw ('uid: ' + uid + ' not found');
             }
         };
+        this.consoleUid = function consoleUid()
+        {
+            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("who | tr '\n' '\.' | awk '{ print $1 }'\nexit\n");
+            child.waitExit();
+
+            var ret = child.stdout.str.trim();
+            if (ret != '')
+            {
+                return (this.getUid(ret));
+            }
+            throw ('nobody logged into console');     
+        }
         this.getHomeFolder = function getHomeFolder(user)
         {
             var child = require('child_process').execFile('/bin/sh', ['sh']);
@@ -697,10 +743,13 @@ function UserSessions()
         {
             var child = require('child_process').execFile('/usr/bin/dscl', ['dscl', '.', 'list', '/Users', 'UniqueID']);
             child.stdout.str = '';
+            child.stderr.str = '';
+            child.stderr.on('data', function (chunk) { this.str += chunk.toString(); });
             child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
             child.stdin.write('exit\n');
             child.waitExit();
 
+
             var lines = child.stdout.str.split('\n');
             var tokens, i;
             var users = {};
@@ -803,31 +852,6 @@ function UserSessions()
         {
             return (this.Self() == 0);
         }
-        this.consoleUid = function consoleUid()
-        {
-            var checkstr = process.platform == 'darwin' ? 'console' : ((process.env['DISPLAY'])?process.env['DISPLAY']:':0')
-            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('who\nexit\n');
-            child.waitExit();
-
-            var lines = child.stdout.str.split('\n');
-            var tokens, i, j;
-            for (i in lines)
-            {
-                tokens = lines[i].split(' ');
-                for (j = 1; j < tokens.length; ++j)
-                {
-                    if (tokens[j].length > 0)
-                    {
-                        return (parseInt(this._users()[tokens[0]]));
-                    }
-                }
-            }
-            
-            throw ('nobody logged into console');
-        }
     }