Ensure fastify-express does not interface w/fastify handlers.

Author: dlongley

CHANGELOG.md

@@ -2,8 +2,9 @@
 
 ## 8.5.1 - 2025-10-dd
 
-### Changed
-- Fix fastify request/reply after fastify-express runs.
+### Fixed
+- Ensure fastify-express does not interfere with native fastify route
+  handlers.
 
 ## 8.5.0 - 2025-09-18
 

lib/index.js

@@ -147,24 +147,39 @@ bedrock.events.on('bedrock.start', async () => {
     next();
   });
 
-  // add express compatibility layer to fastify; this translates the express
-  // API to fastify's
-  await fastify.register(fastifyExpress);
+  // capture express hooks added by `fastify-express` so they can be made
+  // conditional (based on whether any fastify routes take precedence)
+  const originalAddHook = fastify.addHook;
+  const capturedHooks = [];
+  fastify.addHook = function(...args) {
+    const [name, fn] = args;
+    if(name === 'captureHook') {
+      capturedHooks.push(fn);
+      return this;
+    }
+    return Reflect.apply(originalAddHook, this, args);
+  };
+  await fastify.register(fastifyExpress, {expressHook: 'captureHook'});
+
+  // now register captured hooks, but only run them when there is no defined
+  // fastify route, ensuring express only runs as a fallback
+  for(const fn of capturedHooks) {
+    fastify.addHook('onRequest', function expressFallback(req, reply, next) {
+      // only run express as a fallback when no fastify route has been defined
+      // to handle the request
+      if(req.routeOptions.url === undefined) {
+        return Reflect.apply(fn, this, [req, reply, next]);
+      }
+      next();
+    });
+  }
 
   // if server is native http2, add http2 support to fastify express app,
   // otherwise (e.g., `spdy` is used) this is unnecessary
   if(isNativeHttp2) {
     _addHttp2Support(fastify.express);
   }
 
-  // ensure `request` and `reply` raw values are restored after express runs
-  fastify.addHook('onRequest', async (request, reply) => {
-    const app = request.raw.app;
-    request.raw = app.request;
-    reply.raw = app.response;
-    request.raw.app = reply.raw.app = app;
-  });
-
   // init
   await bedrock.events.emit('bedrock-express.fastify.init', {fastify, app});
   await bedrock.events.emit('bedrock-express.init', app);