Merge pull request #61 from elastic/trentm/node-v19-keep-alive

elastic · Mar 30, 2023 · dcf57ba · dcf57ba
2 parents 64d6fa2 + ac4d007
commit dcf57ba
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [14.x, 16.x, 18.x, 19.x]
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:

diff --git a/src/connection/UndiciConnection.ts b/src/connection/UndiciConnection.ts
@@ -181,6 +181,7 @@ export default class Connection extends BaseConnection {
       }
     }
 
+    // @ts-expect-error Assume header is not string[] for now.
     const contentEncoding = (response.headers['content-encoding'] ?? '').toLowerCase()
     const isCompressed = contentEncoding.includes('gzip') || contentEncoding.includes('deflate') // eslint-disable-line
     const isVectorTile = (response.headers['content-type'] ?? '').includes('application/vnd.mapbox-vector-tile')

diff --git a/test/unit/http-connection.test.ts b/test/unit/http-connection.test.ts
@@ -43,6 +43,8 @@ const options = {
   context: null
 }
 
+const nodeKeepAliveByDefault = Number(process.versions.node.split('.')[0]) >= 19
+
 test('Basic (http)', async t => {
   t.plan(3)
 
@@ -176,9 +178,12 @@ test('Disable keep alive', async t => {
   }
 
   const [{ port }, server] = await buildServer(handler)
+  const agent = nodeKeepAliveByDefault
+    ? new http.Agent({ keepAlive: false })
+    : false
   const connection = new HttpConnection({
     url: new URL(`http://localhost:${port}`),
-    agent: false
+    agent
   })
   const res = await connection.request({
     path: '/hello',
@@ -188,6 +193,9 @@ test('Disable keep alive', async t => {
     }
   }, options)
   t.match(res.headers, { connection: /close/ })
+  if (agent) {
+    agent.destroy()
+  }
   server.stop()
 })