feat: timeout support humanize ms (#48)

node-modules · Feb 20, 2017 · d0b9b18 · d0b9b18
1 parent fe733e7
commit d0b9b18
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/lib/agent.js b/lib/agent.js
@@ -9,6 +9,7 @@
 'use strict';
 
 const OriginalAgent = require('./_http_agent').Agent;
+const ms = require('humanize-ms');
 
 class Agent extends OriginalAgent {
   constructor(options) {
@@ -22,16 +23,18 @@ class Agent extends OriginalAgent {
     if (options.keepAliveTimeout) {
       options.freeSocketKeepAliveTimeout = options.keepAliveTimeout;
     }
+    options.freeSocketKeepAliveTimeout = ms(options.freeSocketKeepAliveTimeout);
 
     // Sets the socket to timeout after timeout milliseconds of inactivity on the socket.
     // By default is double free socket keepalive timeout.
     if (options.timeout === undefined) {
       options.timeout = options.freeSocketKeepAliveTimeout * 2;
-      // make sure socket default inactivity timeout >= 30000
+      // make sure socket default inactivity timeout >= 30s
       if (options.timeout < 30000) {
         options.timeout = 30000;
       }
     }
+    options.timeout = ms(options.timeout);
 
     super(options);
 

diff --git a/package.json b/package.json
@@ -29,7 +29,9 @@
     "keepalive",
     "agentkeepalive"
   ],
-  "dependencies": {},
+  "dependencies": {
+    "humanize-ms": "^1.2.0"
+  },
   "devDependencies": {
     "egg-bin": "^1.9.1",
     "egg-ci": "^1.1.0",

diff --git a/test/agent.test.js b/test/agent.test.js
@@ -108,8 +108,8 @@ describe('test/agent.test.js', () => {
   it('should inactivity socket timeout', done => {
     const name = 'localhost:' + port + ':';
     const agentkeepalive = new Agent({
-      freeSocketKeepAliveTimeout: 5000,
-      timeout: 1000,
+      freeSocketKeepAliveTimeout: '5s',
+      timeout: '1s',
     });
     assert(!agentkeepalive.sockets[name]);
     assert(!agentkeepalive.freeSockets[name]);