@nestjs/platform-fastify 12.0.0-alpha.2 → 12.0.0-alpha.3

package/Readme.md

@@ -29,7 +29,7 @@ Nest is a framework for building efficient, scalable <a href="https://nodejs.org
 
 ## Philosophy
 
-<p>In recent years, thanks to Node.js, JavaScript has become the “lingua franca” of the web for both front and backend applications, giving rise to awesome projects like <a href="https://angular.io/" target="_blank">Angular</a>, <a href="https://github.com/facebook/react" target="_blank">React</a>, and <a href="https://github.com/vuejs/vue" target="_blank">Vue</a>, which improve developer productivity and enable the construction of fast, testable, and extensible frontend applications. However, on the server-side, while there are a lot of superb libraries, helpers, and tools for Node, none of them effectively solve the main problem - the architecture.</p>
+<p>In recent years, thanks to Node.js, JavaScript has become the “lingua franca” of the web for both front-end and back-end applications, giving rise to awesome projects like <a href="https://angular.dev/" target="_blank">Angular</a>, <a href="https://react.dev/" target="_blank">React</a>, and <a href="https://vuejs.org/" target="_blank">Vue</a>, which improve developer productivity and enable the construction of fast, testable, and extensible frontend applications. However, on the server-side, while there are a lot of superb libraries, helpers, and tools for Node, none of them effectively solve the main problem - the architecture.</p>
 <p>Nest aims to provide an application architecture out of the box which allows for effortless creation of highly testable, scalable, and loosely coupled and easily maintainable applications. The architecture is heavily inspired by Angular.</p>
 
 ## Getting started
@@ -95,6 +95,7 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
 <td align="center" valign="middle"><a href="https://crawljobs.com" target="_blank"><img src="https://nestjs.com/img/logos/crawljobs-logo.svg" width="130" valign="middle" /></a></td>
 </tr><tr>
 <td align="center" valign="middle"><a href="https://pandektes.com" target="_blank"><img src="https://nestjs.com/img/logos/pandektes-logo.png" width="65" valign="middle" /></a></td>
+<td align="center" valign="middle"><a href="https://www.fintechcrafts.com/" target="_blank"><img src="https://nestjs.com/img/logos/fintechcrafts-logo.svg" width="65" valign="middle" /></a></td>
 </tr>
 </table>
 

package/adapters/fastify-adapter.d.ts

@@ -81,7 +81,7 @@ export declare class FastifyAdapter<TServer extends RawServerBase = RawServerDef
     end(response: TReply, message?: string): void;
     render(response: TReply & {
         view: Function;
-    }, view: string, options: any): FastifyReply<RouteGenericInterface, RawServerDefault, http.IncomingMessage, http.ServerResponse<http.IncomingMessage>, unknown, import("fastify").FastifySchema, import("fastify").FastifyTypeProviderDefault, unknown>;
+    }, view: string, options: any): any;
     redirect(response: TReply, statusCode: number, url: string): FastifyReply<RouteGenericInterface, TServer, TRawRequest, TRawResponse, unknown, import("fastify").FastifySchema, import("fastify").FastifyTypeProviderDefault, unknown>;
     setErrorHandler(handler: Parameters<TInstance['setErrorHandler']>[0]): FastifyInstance<TServer, TRawRequest, TRawResponse, FastifyBaseLogger, import("fastify").FastifyTypeProvider>;
     setNotFoundHandler(handler: Function): FastifyInstance<TServer, TRawRequest, TRawResponse, FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault>;
@@ -123,5 +123,8 @@ export declare class FastifyAdapter<TServer extends RawServerBase = RawServerDef
     private registerMiddie;
     private getRequestOriginalUrl;
     private injectRouteOptions;
+    private sanitizeUrl;
+    private removeDuplicateSlashes;
+    private trimLastSlash;
 }
 export {};

package/adapters/fastify-adapter.js

@@ -403,7 +403,7 @@ export class FastifyAdapter extends AbstractHttpAdapter {
                     let pathname = queryParamsIndex >= 0
                         ? req.originalUrl.slice(0, queryParamsIndex)
                         : req.originalUrl;
-                    pathname = safeDecodeURI(pathname).path;
+                    pathname = this.sanitizeUrl(pathname);
                     if (!re.exec(pathname + '/') && normalizedPath) {
                         return next();
                     }
@@ -517,4 +517,34 @@ export class FastifyAdapter extends AbstractHttpAdapter {
         }
         return this.instance.route(routeToInject);
     }
+    sanitizeUrl(url) {
+        const initialConfig = this.instance.initialConfig;
+        const routerOptions = initialConfig.routerOptions;
+        if (routerOptions.ignoreDuplicateSlashes ||
+            initialConfig.ignoreDuplicateSlashes) {
+            url = this.removeDuplicateSlashes(url);
+        }
+        if (routerOptions.ignoreTrailingSlash ||
+            initialConfig.ignoreTrailingSlash) {
+            url = this.trimLastSlash(url);
+        }
+        if (routerOptions.caseSensitive === false ||
+            initialConfig.caseSensitive === false) {
+            url = url.toLowerCase();
+        }
+        return safeDecodeURI(url, routerOptions.useSemicolonDelimiter ||
+            initialConfig.useSemicolonDelimiter).path;
+    }
+    removeDuplicateSlashes(path) {
+        const REMOVE_DUPLICATE_SLASHES_REGEXP = /\/\/+/g;
+        return path.indexOf('//') !== -1
+            ? path.replace(REMOVE_DUPLICATE_SLASHES_REGEXP, '/')
+            : path;
+    }
+    trimLastSlash(path) {
+        if (path.length > 1 && path.charCodeAt(path.length - 1) === 47) {
+            return path.slice(0, -1);
+        }
+        return path;
+    }
 }

package/adapters/middie/fastify-middie.js

@@ -3,17 +3,20 @@ import urlSanitizer from 'find-my-way/lib/url-sanitizer.js';
 import { pathToRegexp } from 'path-to-regexp';
 import reusify from 'reusify';
 const { safeDecodeURI } = urlSanitizer;
+function bindLast(fn, last) {
+    return (...args) => fn(...args, last);
+}
 /**
  * A clone of `@fastify/middie` engine https://github.com/fastify/middie
  * with an extra vulnerability fix. Path is now decoded before matching to
  * avoid bypassing middleware with encoded characters.
  */
-function middie(complete) {
+function middie(complete, initialConfig) {
     const middlewares = [];
     const pool = reusify(Holder);
     return {
         use,
-        run,
+        run: bindLast(run, initialConfig),
     };
     function use(url, f) {
         if (f === undefined) {
@@ -37,7 +40,7 @@ function middie(complete) {
         }
         return this;
     }
-    function run(req, res, ctx) {
+    function run(req, res, ctx, initialConfig) {
         if (!middlewares.length) {
             complete(null, req, res, ctx);
             return;
@@ -48,6 +51,7 @@ function middie(complete) {
         holder.res = res;
         holder.url = sanitizeUrl(req.url);
         holder.context = ctx;
+        holder.initialConfig = initialConfig;
         holder.done();
     }
     function Holder() {
@@ -55,6 +59,7 @@ function middie(complete) {
         this.res = null;
         this.url = null;
         this.context = null;
+        this.initialConfig = null;
         this.i = 0;
         const that = this;
         this.done = function (err) {
@@ -76,7 +81,21 @@ function middie(complete) {
                 const { fn, regexp } = middlewares[i];
                 if (regexp) {
                     // Decode URL before matching to avoid bypassing middleware
-                    const decodedUrl = safeDecodeURI(url).path;
+                    let sanitizedUrl = url;
+                    if (that.initialConfig.ignoreDuplicateSlashes ||
+                        that.initialConfig.routerOptions?.ignoreDuplicateSlashes) {
+                        sanitizedUrl = removeDuplicateSlashes(sanitizedUrl);
+                    }
+                    if (that.initialConfig.ignoreTrailingSlash ||
+                        that.initialConfig.routerOptions?.ignoreTrailingSlash) {
+                        sanitizedUrl = trimLastSlash(sanitizedUrl);
+                    }
+                    if (that.initialConfig.caseSensitive === false ||
+                        that.initialConfig.routerOptions?.caseSensitive === false) {
+                        sanitizedUrl = sanitizedUrl.toLowerCase();
+                    }
+                    const decodedUrl = safeDecodeURI(sanitizedUrl, that.initialConfig?.routerOptions?.useSemicolonDelimiter ||
+                        that.initialConfig?.useSemicolonDelimiter).path;
                     const result = regexp.exec(decodedUrl);
                     if (result) {
                         req.url = req.url.replace(result[0], '');
@@ -97,11 +116,24 @@ function middie(complete) {
             that.req = null;
             that.res = null;
             that.context = null;
+            that.initialConfig = null;
             that.i = 0;
             pool.release(that);
         }
     }
 }
+function removeDuplicateSlashes(path) {
+    const REMOVE_DUPLICATE_SLASHES_REGEXP = /\/\/+/g;
+    return path.indexOf('//') !== -1
+        ? path.replace(REMOVE_DUPLICATE_SLASHES_REGEXP, '/')
+        : path;
+}
+function trimLastSlash(path) {
+    if (path.length > 1 && path.charCodeAt(path.length - 1) === 47) {
+        return path.slice(0, -1);
+    }
+    return path;
+}
 function sanitizeUrl(url) {
     for (let i = 0, len = url.length; i < len; i++) {
         const charCode = url.charCodeAt(i);
@@ -142,7 +174,7 @@ function fastifyMiddie(fastify, options, next) {
     fastify.decorate('use', use);
     fastify[kMiddlewares] = [];
     fastify[kMiddieHasMiddlewares] = false;
-    fastify[kMiddie] = middie(onMiddieEnd);
+    fastify[kMiddie] = middie(onMiddieEnd, fastify.initialConfig);
     const hook = options.hook || 'onRequest';
     if (!supportedHooks.includes(hook)) {
         next(new Error(`The hook "${hook}" is not supported by fastify-middie`));
@@ -196,7 +228,7 @@ function fastifyMiddie(fastify, options, next) {
     function onRegister(instance) {
         const middlewares = instance[kMiddlewares].slice();
         instance[kMiddlewares] = [];
-        instance[kMiddie] = middie(onMiddieEnd);
+        instance[kMiddie] = middie(onMiddieEnd, instance.initialConfig);
         instance[kMiddieHasMiddlewares] = false;
         instance.decorate('use', use);
         for (const middleware of middlewares) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/platform-fastify",
-  "version": "12.0.0-alpha.2",
+  "version": "12.0.0-alpha.3",
   "description": "Nest - modern, fast, powerful node.js web framework (@platform-fastify)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -28,11 +28,11 @@
     "@fastify/cors": "11.2.0",
     "@fastify/formbody": "8.0.2",
     "fast-querystring": "1.1.2",
-    "fastify": "5.7.4",
+    "fastify": "5.8.5",
     "fastify-plugin": "5.1.0",
-    "find-my-way": "9.4.0",
+    "find-my-way": "9.6.0",
     "light-my-request": "6.6.0",
-    "path-to-regexp": "8.3.0",
+    "path-to-regexp": "8.4.2",
     "reusify": "1.1.0",
     "tslib": "2.8.1"
   },
@@ -50,5 +50,5 @@
       "optional": true
     }
   },
-  "gitHead": "011bff66014e24e82b25f7acf9302b9efb70b02b"
+  "gitHead": "1c9d5482a65a446ede8dd1195bfa1cbbc16e0857"
 }