100% code coverage and fixes

Signed-off-by: Matteo Collina <[email protected]>
platformatic · Nov 27, 2024 · 3886bf6 · 3886bf6
1 parent 09e9490
commit 3886bf6
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 7 deletions.
diff --git a/index.js b/index.js
@@ -106,6 +106,10 @@ function createThreadInterceptor (opts) {
 
         try {
           handler.onRequestStart(controller, {})
+          if (controller.aborted) {
+            handler.onResponseError(controller, controller.reason)
+            return
+          }
           handler.onResponseStart(
             controller,
             res.statusCode,
@@ -117,12 +121,8 @@ function createThreadInterceptor (opts) {
           return
         }
 
-        if (!controller.aborted) {
-          handler.onResponseData(controller, res.rawPayload)
-          handler.onResponseEnd(controller, [])
-        } else {
-          handler.onResponseError(controller, controller.reason)
-        }
+        handler.onResponseData(controller, res.rawPayload)
+        handler.onResponseEnd(controller, [])
       })
 
       return true

diff --git a/lib/wrap-handler.js b/lib/wrap-handler.js
@@ -33,8 +33,9 @@ class WrapHandler {
     this.#handler.onComplete?.([])
   }
 
+  // TODO(mcollina): I do not know how to trigger these
+  /* c8 ignore next 3 */
   onResponseError (controller, err) {
-    process._rawDebug('WrapHandler.onResponseError', err)
     this.#handler.onError?.(err)
   }
 }

diff --git a/test/basic.test.js b/test/basic.test.js
@@ -392,3 +392,23 @@ test('Get binary file', async (t) => {
 
   deepStrictEqual(read, expected)
 })
+
+test('aborting a request', async (t) => {
+  const worker = new Worker(join(__dirname, 'fixtures', 'worker1.js'))
+  t.after(() => worker.terminate())
+
+  const interceptor = createThreadInterceptor({
+    domain: '.local',
+  })
+  interceptor.route('myserver', worker)
+
+  const abortController = new AbortController()
+
+  const agent = new Agent().compose(interceptor)
+  abortController.abort()
+
+  await rejects(request('http://myserver.local', {
+    dispatcher: agent,
+    signal: abortController.signal,
+  }))
+})
diff --git a/test/fixtures/worker1.js b/test/fixtures/worker1.js
@@ -6,6 +6,7 @@ const fastify = require('fastify')
 const { wire } = require('../../')
 const fastifyStatic = require('@fastify/static')
 const { join } = require('path')
+const { setTimeout: sleep } = require('timers/promises')
 
 const app = fastify()
 
@@ -47,4 +48,9 @@ app.post('/echo-body', (req, reply) => {
   reply.send(req.body)
 })
 
+app.get('/long', async (req, reply) => {
+  await sleep(1000)
+  return { hello: 'world' }
+})
+
 wire({ server: app, port: parentPort })