README.md

@@ -121,10 +121,17 @@ Standard Options:
 
   Maximum time in ms to wait before exiting with failure (1) code,
   default Infinity
+  Use postfix 'ms', 's', 'm' or 'h' to change the unit.
 
   --tcpTimeout
 
-   Maximum time in ms for tcp connect, default 300ms
+  Maximum time in ms for tcp connect, default 300ms
+  Use postfix 'ms', 's', 'm' or 'h' to change the unit.
+
+  --httpTimeout
+
+  Maximum time to wait for the HTTP request, default Infinity
+  Use postfix 'ms', 's', 'm' or 'h' to change the unit.
 
  -v, --verbose
 

bin/usage.txt

@@ -68,10 +68,17 @@ Standard Options:
 
   Maximum time in ms to wait before exiting with failure (1) code,
   default Infinity
+  Use postfix 'ms', 's', 'm' or 'h' to change the unit.
 
   --tcpTimeout
 
   Maximum time in ms for tcp connect, default 300ms
+  Use postfix 'ms', 's', 'm' or 'h' to change the unit.
+
+  --httpTimeout
+
+  Maximum time to wait for the HTTP request, default Infinity
+  Use postfix 'ms', 's', 'm' or 'h' to change the unit.
 
  -v, --verbose
 

bin/wait-on

@@ -5,8 +5,9 @@ const minimist = require('minimist');
 const path = require('path');
 const waitOn = require('../');
 
+const interval = ['timeout', 'httpTimeout', 'tcpTimeout'];
 const minimistOpts = {
-  string: ['c', 'd', 'i', 's', 't', 'w', 'httpTimeout', 'tcpTimeout'],
+  string: ['c', 'd', 'i', 's', 't', 'w'].concat(interval),
   boolean: ['h', 'l', 'r', 'v'],
   alias: {
     c: 'config',
@@ -55,7 +56,11 @@ if (argv.help || !hasResources) {
     'window'
   ].reduce(function (accum, x) {
     if (argv[x]) {
-      accum[x] = argv[x];
+      let value = argv[x];
+      if (interval.includes(x)) {
+        value = parseInterval(value);
+      }
+      accum[x] = value;
     }
     return accum;
   }, configOpts);
@@ -79,3 +84,18 @@ function errorExit(err) {
   }
   process.exit(1);
 }
+
+function parseInterval(arg) {
+  const res = /^([\d.]+)(|ms|s|m|h)$/i.exec(arg);
+  if (!res) {
+    return arg;
+  }
+  const value = parseFloat(res[1]);
+  switch (res[2]) {
+    case '':
+    case 'ms': return Math.floor(value);
+    case 's': return Math.floor(value * 1000);
+    case 'm': return Math.floor(value * 1000 * 60);
+    case 'h': return Math.floor(value * 1000 * 60 * 60);
+  }
+}

exampleConfig.js

@@ -12,8 +12,8 @@ module.exports = {
   ],
   passphrase: 'yourpassphrase',
   auth: {
-    user: 'yourusername',
-    pass: 'yourpassword'
+    username: 'yourusername',
+    password: 'yourpassword'
   },
   strictSSL: false,
   followRedirect: false,