Merge branch 'master' into patch-1

.eslintrc

@@ -6,6 +6,8 @@
   },
   "rules": {
     "space-before-function-paren": 0,
-    "no-control-regex": 0
+    "no-control-regex": 0,
+    "no-prototype-builtins": 0,
+    "comma-dangle": 0
   }
 }

.prettierrc

@@ -1,4 +1,5 @@
 {
   "printWidth": 80,
-  "singleQuote": true
+  "singleQuote": true,
+  "trailingComma": "none"
 }

.travis.yml

@@ -1,8 +1,5 @@
 language: node_js
 node_js:
-  - "9"
-  - "8"
-  - "7"
-  - "6"
-  - "5"
-  - "4"
+  - 'node'
+  - '10'
+install: npm install

CONTRIBUTE.md → CONTRIBUTING.md

@@ -12,7 +12,7 @@ DEBUG="notifier" node index.js
 
 ```
 node-notifier debug info (fileCommandJson):
-[notifier path] /Users/mib/node-notifier/vendor/terminal-notifier.app/Contents/MacOS/terminal-notifier
+[notifier path] /Users/mib/node-notifier/vendor/mac.noindex/terminal-notifier.app/Contents/MacOS/terminal-notifier
 [notifier options] -message "Hello" -timeout "5" -json "true"
 ```
 

example/advanced.js

@@ -10,7 +10,7 @@ nc.notify(
     sound: 'Funk',
     // case sensitive
     wait: true,
-    appIcon: path.join(__dirname, 'coulson.jpg'),
+    icon: path.join(__dirname, 'coulson.jpg'),
     contentImage: path.join(__dirname, 'coulson.jpg'),
     open: 'file://' + path.join(__dirname, 'coulson.jpg')
   },

example/forceBallon.js

@@ -0,0 +1,9 @@
+const notifier = require('../index');
+const balloon = notifier.WindowsBalloon();
+balloon
+  .notify({ message: 'Hello' }, function(err, data) {
+    console.log(err, data);
+  })
+  .on('click', function() {
+    console.log(arguments);
+  });

example/toaster-with-actions.js

@@ -0,0 +1,34 @@
+const notifier = require('../index');
+const path = require('path');
+
+notifier.notify(
+  {
+    message: 'Are you sure you want to continue?',
+    icon: path.join(__dirname, 'coulson.jpg'),
+    actions: ['OK', 'Cancel']
+  },
+  (err, data) => {
+    // Will also wait until notification is closed.
+    console.log('Waited');
+    console.log(JSON.stringify({ err, data }, null, '\t'));
+  }
+);
+
+// Built-in actions:
+notifier.on('timeout', () => {
+  console.log('Timed out!');
+});
+notifier.on('activate', () => {
+  console.log('Clicked!');
+});
+notifier.on('dismissed', () => {
+  console.log('Dismissed!');
+});
+
+// Buttons actions (lower-case):
+notifier.on('ok', () => {
+  console.log('"Ok" was pressed');
+});
+notifier.on('cancel', () => {
+  console.log('"Cancel" was pressed');
+});

example/toaster.js

@@ -1,24 +1,23 @@
-var notifier = require('../index');
-var path = require('path');
+const notifier = require('../index');
+const path = require('path');
 
 notifier.notify(
   {
     message: 'Hello. This is a longer text\nWith "some" newlines.',
-    wait: true,
     icon: path.join(__dirname, 'coulson.jpg'),
     sound: true
   },
   function(err, data) {
     // Will also wait until notification is closed.
     console.log('Waited');
-    console.log(err, data);
+    console.log(JSON.stringify({ err, data }));
   }
 );
 
-notifier.on('timeout', function() {
+notifier.on('timeout', () => {
   console.log('Timed out!');
 });
 
-notifier.on('click', function() {
+notifier.on('click', () => {
   console.log('Clicked!');
 });

index.js

@@ -10,7 +10,9 @@ var WindowsBalloon = require('./notifiers/balloon');
 
 var options = { withFallback: true };
 
-switch (os.type()) {
+var osType = utils.isWSL() ? 'WSL' : os.type();
+
+switch (osType) {
   case 'Linux':
     module.exports = new NotifySend(options);
     module.exports.Notification = NotifySend;
@@ -28,6 +30,10 @@ switch (os.type()) {
       module.exports.Notification = WindowsToaster;
     }
     break;
+  case 'WSL':
+    module.exports = new WindowsToaster(options);
+    module.exports.Notification = WindowsToaster;
+    break;
   default:
     if (os.type().match(/BSD$/)) {
       module.exports = new NotifySend(options);

lib/checkGrowl.js

@@ -12,12 +12,12 @@ module.exports = function(growlConfig, cb) {
   var socket = net.connect(port, host);
   socket.setTimeout(100);
 
-  socket.on('connect', function() {
+  socket.once('connect', function() {
     socket.end();
     cb(null, true);
   });
 
-  socket.on('error', function() {
+  socket.once('error', function() {
     socket.end();
     cb(null, false);
   });