Merge pull request #46 from node-modules/timeout-string

humanize timeout

lib/urllib.js

@@ -25,6 +25,7 @@ var digestAuthHeader = require('digest-header');
 var typer = require('media-typer');
 var util = require('util');
 var EventEmitter = require('events').EventEmitter;
+var ms = require('humanize-ms');
 
 var _Promise;
 var _iconv;
@@ -45,7 +46,8 @@ exports.httpsAgent.maxSockets = 1000;
  * @type {Number}
  * @const
  */
-exports.TIMEOUT = 5000;
+
+exports.TIMEOUT = ms('5s');
 
 var REQUEST_ID = 0;
 
@@ -559,7 +561,7 @@ exports.requestWithCallback = function (url, args, callback) {
     req.abort();
   };
 
-  var timeout = args.timeout;
+  var timeout = ms(args.timeout);
 
   timer = setTimeout(function () {
     timer = null;

package.json

@@ -31,6 +31,7 @@
     "debug": "~2.1.0",
     "default-user-agent": "~0.0.1",
     "digest-header": "~0.0.1",
+    "humanize-ms": "~1.0.0",
     "iconv-lite": "~0.4.4",
     "media-typer": "~0.3.0",
     "native-or-bluebird": "~1.1.2"
@@ -41,12 +42,12 @@
     "bluebird": "*",
     "co": "*",
     "contributors": "*",
-    "formstream": "~0.0.8",
+    "formstream": "~1.0.0",
     "istanbul": "*",
     "jshint": "*",
     "mocha": "*",
-    "pedding": "*",
-    "should": "~4.0.4",
+    "pedding": "~1.0.0",
+    "should": "~4.3.0",
     "should-http": "*"
   },
   "engines": {