fix: Ensure new connections inherit client's set defaults

* Apply patch from elastic/elasticsearch-js#2159

* Ensure new connections inherit client's set defaults

---------

Co-authored-by: JoshMock <[email protected]>

Author: JoshMock

src/client.ts

@@ -230,7 +230,30 @@ export default class Client extends API {
       // node in the list.
       let node = options.node ?? options.nodes
       if (Array.isArray(node)) node = node[0]
-      this.connectionPool.addConnection(node)
+
+      // ensure default connection values are inherited when creating new connections
+      // see https://github.com/elastic/elasticsearch-js/issues/1791
+      type ConnectionDefaults = Record<string, any>
+
+      const { tls, headers, auth, requestTimeout: timeout, agent, proxy, caFingerprint } = options
+      let defaults: ConnectionDefaults = { tls, headers, auth, timeout, agent, proxy, caFingerprint }
+
+      // strip undefined values from defaults
+      defaults = Object.keys(defaults).reduce((acc: ConnectionDefaults, key) => {
+        const val = defaults[key]
+        if (val !== undefined) acc[key] = val
+        return acc
+      }, {})
+
+      let newOpts
+      if (typeof node === 'string') {
+        newOpts = {
+          url: new URL(node)
+        }
+      } else {
+        newOpts = node
+      }
+      this.connectionPool.addConnection({ ...defaults, ...newOpts })
     }
 
     this.transport = new options.Transport({

test/unit/client.test.ts

@@ -17,9 +17,11 @@
  * under the License.
  */
 
+import * as http from 'http'
 import { test } from 'tap'
 import { URL } from 'url'
-import { connection } from '../utils'
+import FakeTimers from '@sinonjs/fake-timers'
+import { buildServer, connection } from '../utils'
 import { Client, errors } from '../..'
 import * as symbols from '@elastic/transport/lib/symbols'
 import { BaseConnectionPool, CloudConnectionPool } from '@elastic/transport'
@@ -463,3 +465,42 @@ test('user agent is in the correct format', t => {
   t.ok(/^\d+\.\d+\.\d+/.test(agentSplit[0].split('/')[1]))
   t.end()
 })
+
+test('Ensure new client instance stores requestTimeout for each connection', t => {
+  const client = new Client({
+    node: { url: new URL('http://localhost:9200') },
+    requestTimeout: 60000,
+  })
+  t.equal(client.connectionPool.connections[0].timeout, 60000)
+  t.end()
+})
+
+test('Ensure new client does not time out at default (30s) when client sets requestTimeout', async t => {
+  const clock = FakeTimers.install({ toFake: ['setTimeout', 'clearTimeout'] })
+  t.teardown(() => clock.uninstall())
+
+  function handler (_req: http.IncomingMessage, res: http.ServerResponse) {
+    setTimeout(() => {
+      t.pass('timeout ended')
+      res.setHeader('content-type', 'application/json')
+      res.end(JSON.stringify({ success: true }))
+    }, 31000) // default is 30000
+    clock.runToLast()
+  }
+
+  const [{ port }, server] = await buildServer(handler)
+
+  const client = new Client({
+    node: `http://localhost:${port}`,
+    requestTimeout: 60000
+  })
+
+  try {
+    await client.transport.request({ method: 'GET', path: '/' })
+  } catch (error) {
+    t.fail('timeout error hit')
+  } finally {
+    server.stop()
+    t.end()
+  }
+})