test: ensure that sockets are removed from internal set (fixes #2)

gajus · Jan 29, 2020 · 28b910e · 28b910e
1 parent cfc73ae
commit 28b910e
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/src/factories/createInternalHttpTerminator.js b/src/factories/createInternalHttpTerminator.js
@@ -3,8 +3,8 @@
 import http from 'http';
 import delay from 'delay';
 import type {
-  HttpTerminatorType,
   HttpTerminatorConfigurationInputType,
+  InternalHttpTerminatorType,
 } from '../types';
 import Logger from '../Logger';
 
@@ -16,7 +16,7 @@ const configurationDefaults = {
   gracefulTerminationTimeout: 1000,
 };
 
-export default (configurationInput: HttpTerminatorConfigurationInputType): HttpTerminatorType => {
+export default (configurationInput: HttpTerminatorConfigurationInputType): InternalHttpTerminatorType => {
   const configuration = {
     ...configurationDefaults,
     ...configurationInput,
@@ -91,6 +91,7 @@ export default (configurationInput: HttpTerminatorConfigurationInputType): HttpT
         continue;
       }
 
+      // $FlowFixMe
       const serverResponse = socket._httpMessage;
 
       if (serverResponse) {
@@ -105,6 +106,7 @@ export default (configurationInput: HttpTerminatorConfigurationInputType): HttpT
     }
 
     for (const socket of secureSockets) {
+      // $FlowFixMe
       const serverResponse = socket._httpMessage;
 
       if (serverResponse) {
@@ -138,6 +140,8 @@ export default (configurationInput: HttpTerminatorConfigurationInputType): HttpT
   };
 
   return {
+    secureSockets,
+    sockets,
     terminate,
   };
 };
diff --git a/src/types.js b/src/types.js
@@ -1,5 +1,8 @@
 // @flow
 
+import {
+  Socket,
+} from 'net';
 import type {
   Server as HttpServer,
 } from 'http';
@@ -22,3 +25,9 @@ export type HttpTerminatorConfigurationInputType = {|
 export type HttpTerminatorType = {|
   +terminate: () => Promise<void>,
 |};
+
+export type InternalHttpTerminatorType = {|
+  ...HttpTerminatorType,
+  secureSockets: Set<Socket>,
+  sockets: Set<Socket>,
+|};
diff --git a/test/http-terminator/factories/createInternalHttpTerminator.js b/test/http-terminator/factories/createInternalHttpTerminator.js
@@ -197,3 +197,26 @@ test('ongoing requests receive {connection: close} header (new request reusing a
   t.is(response1.headers.connection, 'close');
   t.is(response1.body, 'baz');
 });
+
+test('empties internal socket collection', async (t) => {
+  // eslint-disable-next-line ava/use-t-well
+  t.timeout(500);
+
+  const httpServer = await createHttpServer((incomingMessage, outgoingMessage) => {
+    outgoingMessage.end('foo');
+  });
+
+  const terminator = createInternalHttpTerminator({
+    gracefulTerminationTimeout: 150,
+    server: httpServer.server,
+  });
+
+  await got(httpServer.url);
+
+  await delay(50);
+
+  t.is(terminator.sockets.size, 0);
+  t.is(terminator.secureSockets.size, 0);
+
+  await terminator.terminate();
+});