fix: undici connect timeout (#302)

index.js

@@ -17,6 +17,7 @@ const {
   ServiceUnavailableError,
   GatewayTimeoutError,
   ConnectionResetError,
+  ConnectTimeoutError,
   UndiciSocketError,
   InternalServerError
 } = require('./lib/errors')
@@ -157,6 +158,8 @@ const fastifyReplyFrom = fp(function from (fastify, opts, next) {
             onError(this, { error: new ConnectionResetError() })
           } else if (err.code === 'UND_ERR_SOCKET') {
             onError(this, { error: new UndiciSocketError() })
+          } else if (err.code === 'UND_ERR_CONNECT_TIMEOUT') {
+            onError(this, { error: new ConnectTimeoutError() })
           } else {
             onError(this, { error: new InternalServerError(err.message) })
           }

lib/errors.js

@@ -9,5 +9,6 @@ module.exports.Http2SessionTimeoutError = createError('FST_REPLY_FROM_HTTP2_SESS
 module.exports.ServiceUnavailableError = createError('FST_REPLY_FROM_SERVICE_UNAVAILABLE', 'Service Unavailable', 503)
 module.exports.GatewayTimeoutError = createError('FST_REPLY_FROM_GATEWAY_TIMEOUT', 'Gateway Timeout', 504)
 module.exports.ConnectionResetError = createError('ECONNRESET', 'Connection Reset', 500)
+module.exports.ConnectTimeoutError = createError('UND_ERR_CONNECT_TIMEOUT', 'Connect Timeout Error', 500)
 module.exports.UndiciSocketError = createError('UND_ERR_SOCKET', 'Undici Socket Error', 500)
 module.exports.InternalServerError = createError('FST_REPLY_FROM_INTERNAL_SERVER_ERROR', '%s', 500)

test/disable-request-logging.test.js

@@ -24,7 +24,7 @@ t.test('use a custom instance of \'undici\'', async t => {
   await new Promise((resolve, reject) => target.listen({ port: 0 }, err => err ? reject(err) : resolve()))
 
   t.test('disableRequestLogging is set to true', t => {
-    t.plan(10)
+    t.plan(9)
     const logStream = split(JSON.parse)
     const instance = Fastify({
       logger: {

test/undici-connect-timeout.test.js

@@ -0,0 +1,58 @@
+'use strict'
+
+const t = require('tap')
+const http = require('http')
+const net = require('net')
+const Fastify = require('fastify')
+const From = require('..')
+const got = require('got')
+
+t.autoend(false)
+
+// never connect
+net.connect = function (options) {
+  return new net.Socket(options)
+}
+
+const target = http.createServer((req, res) => {
+  t.fail('target never called')
+})
+
+async function main () {
+  t.plan(2)
+  await target.listen({ port: 0 })
+
+  const instance = Fastify()
+  t.teardown(instance.close.bind(instance))
+  t.teardown(target.close.bind(target))
+
+  instance.register(From, {
+    base: `http://localhost:${target.address().port}`,
+    undici: {
+      connectTimeout: 50
+    }
+  })
+
+  instance.get('/', (request, reply) => {
+    reply.from()
+  })
+
+  await instance.listen({ port: 0 })
+
+  try {
+    await got.get(`http://localhost:${instance.server.address().port}/`, { retry: 0 })
+  } catch (err) {
+    t.equal(err.response.statusCode, 500)
+    t.same(JSON.parse(err.response.body), {
+      statusCode: 500,
+      code: 'UND_ERR_CONNECT_TIMEOUT',
+      error: 'Internal Server Error',
+      message: 'Connect Timeout Error'
+    })
+    return
+  }
+
+  t.fail()
+}
+
+main()