better connection draining for shutdown handler

lib/tcp.js

@@ -23,6 +23,8 @@ module.exports = function tcp( method, url, payload, id, cache ){
   })
 }
 
+module.exports.shutdown = shutdown
+
 function getPool(addr, opts) {
   if (connections.has(addr)) return connections.get(addr)
   const pool = Pool.createPool({
@@ -57,14 +59,20 @@ function getPool(addr, opts) {
   return pool
 }
 
-function onSignal() {
-  debug('open connections', connections.size)
-  for (var [key, value] of connections.entries()) {
+function shutdown(cb = ()=>{}) {
+  const entries = connections.entries()
+  const run = () => {
+    const next = entries.next()
+    if (next.done) return cb()
+    const [key, value] = next.value
     debug('disconnecting %s', key)
     value.drain().then(() => {
       value.clear()
+      debug(`removing tcp connection to ${key}`)
+      connections.delete(key)
+      run()
     })
   }
+
+  run()
 }
-process.once('SIGINT', onSignal)
-process.once('SIGTERM', onSignal)

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "skyring-tcp-transport",
-  "version": "1.0.0",
+  "name": "@skyring/tcp-trasport",
+  "version": "0.1.0",
   "description": "A TCP transport for skyring service",
   "main": "index.js",
   "scripts": {
@@ -28,7 +28,7 @@
     "generic-pool": "^3.1.7"
   },
   "devDependencies": {
-    "skyring": "^4.0.4",
+    "skyring": "^4.2.0",
     "supertest": "^3.0.0",
     "tap": "^10.3.2"
   }

test/transport.tcp.spec.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const net = require('net')
+    , os = require('os')
     , path = require('path')
     , tap = require('tap')
     , supertest = require('supertest')
@@ -90,8 +91,9 @@ test('pool', (t) => {
       })
   }
   t.on('end', (done) => {
+    console.log("shutting down")
     handler.close()
-    server.close()
+    server.shutdown()
   })
   t.test('set up skyring server', (tt) => {
     server = new Skyring({
@@ -112,19 +114,18 @@ test('pool', (t) => {
     }, 2000)
   })
   t.test('success - should deliver payload', (tt) => {
-    tt.plan(150)
+    tt.plan(151)
     handler = net.createServer((socket) => {
-      console.log('connection')
       socket.setEncoding('utf8')
       socket.once('data', (data) => {
         tt.match(data, /fake/)
-        tt.pass('timeout executed')
       })
-    }).listen(5555).unref()
-
-    for (var x = 0; x < 150; x++ ) {
-      doRequest({error: () => {}})
-    }
+    }).listen(5555, (err) => {
+      tt.error(err)
+      for (var x = 0; x < 150; x++ ) {
+        doRequest({error: () => {}})
+      }
+    })
   })
   t.end()
 })