@nestjs/platform-fastify 12.1.0 → 12.1.2

package/adapters/fastify-adapter.d.ts

@@ -122,8 +122,8 @@ export declare class FastifyAdapter<TServer extends RawServerBase = RawServerDef
     inject(opts: InjectOptions | string): Promise<LightMyRequestResponse>;
     close(): Promise<void>;
     initHttpServer(options?: NestApplicationOptions): void;
-    useStaticAssets(options: FastifyStaticOptions): Promise<any>;
-    setViewEngine(options: FastifyViewOptions | string): Promise<any>;
+    useStaticAssets(options: FastifyStaticOptions): any;
+    setViewEngine(options: FastifyViewOptions | string): any;
     isHeadersSent(response: TReply): boolean;
     getHeader(response: any, name: string): any;
     setHeader(response: TReply, name: string, value: string): FastifyReply<RouteGenericInterface, TServer, TRawRequest, TRawResponse, unknown, import("fastify").FastifySchema, import("fastify").FastifyTypeProviderDefault, unknown>;

package/adapters/fastify-adapter.js

@@ -8,6 +8,7 @@ import middie from '@fastify/middie';
 import { loadPackage, tryLoadPackage, isNil, isString, isUndefined, } from '@nestjs/common/internal';
 import { AbstractHttpAdapter } from '@nestjs/core';
 import { LegacyRouteConverter } from '@nestjs/core/internal';
+import { getMediaTypeVersion } from './utils/get-media-type-version.util.js';
 const { kRouteContext } = fastifySymbols;
 // Fastify uses `fast-querystring` internally to quickly parse URL query strings.
 import { parse as querystringParse } from 'fast-querystring';
@@ -22,6 +23,12 @@ function isFastifyMultipartPlugin(plugin) {
         (fn[Symbol.for('plugin-meta')]?.name === '@fastify/multipart' ||
             fn.name === 'fastifyMultipart'));
 }
+// Covers "application/json" and the "+json" structured syntax suffix (RFC 6839),
+// e.g. "application/problem+json", with or without parameters.
+function isJsonContentType(contentType) {
+    const mediaType = contentType.split(';')[0].trim().toLowerCase();
+    return (mediaType.startsWith('application/json') || mediaType.endsWith('+json'));
+}
 /**
  * @publicApi
  */
@@ -79,13 +86,12 @@ export class FastifyAdapter extends AbstractHttpAdapter {
             // Media Type (Accept Header) Versioning Handler
             if (this.versioningOptions?.type === VersioningType.MEDIA_TYPE) {
                 const MEDIA_TYPE_HEADER = 'Accept';
-                const acceptHeaderValue = (req.headers?.[MEDIA_TYPE_HEADER] || req.headers?.[MEDIA_TYPE_HEADER.toLowerCase()]);
-                const acceptHeaderVersionParameter = acceptHeaderValue
-                    ? acceptHeaderValue.split(';')[1]
-                    : undefined;
-                return isUndefined(acceptHeaderVersionParameter)
+                const acceptHeaderValue = req.headers?.[MEDIA_TYPE_HEADER] ||
+                    req.headers?.[MEDIA_TYPE_HEADER.toLowerCase()];
+                const headerVersion = getMediaTypeVersion(acceptHeaderValue, this.versioningOptions.key);
+                return isUndefined(headerVersion)
                     ? VERSION_NEUTRAL // No version was supplied
-                    : acceptHeaderVersionParameter.split(this.versioningOptions.key)[1];
+                    : headerVersion;
             }
             // Header Versioning Handler
             else if (this.versioningOptions?.type === VersioningType.HEADER) {
@@ -280,8 +286,9 @@ export class FastifyAdapter extends AbstractHttpAdapter {
             }
             body = body.getStream();
         }
-        if (fastifyReply.getHeader('Content-Type') !== undefined &&
-            fastifyReply.getHeader('Content-Type') !== 'application/json' &&
+        const responseContentType = fastifyReply.getHeader('Content-Type');
+        if (typeof responseContentType === 'string' &&
+            !isJsonContentType(responseContentType) &&
             body?.statusCode >= HttpStatus.BAD_REQUEST) {
             Logger.warn("Content-Type doesn't match Reply body, you might need a custom ExceptionFilter for non-JSON responses", FastifyAdapter.name);
             fastifyReply.header('Content-Type', 'application/json');
@@ -392,15 +399,20 @@ export class FastifyAdapter extends AbstractHttpAdapter {
             this.trackOpenConnections();
         }
     }
-    async useStaticAssets(options) {
-        return this.register(await loadPackage('@fastify/static', 'FastifyAdapter.useStaticAssets()', () => import('@fastify/static')), options);
+    // `register()` accepts a promise of a plugin, so the import is handed over
+    // unawaited on purpose. `NestApplication.useStaticAssets()` discards what
+    // this returns, so awaiting here would enqueue the plugin after the caller
+    // has already moved on to `listen()`.
+    useStaticAssets(options) {
+        return this.register(loadPackage('@fastify/static', 'FastifyAdapter.useStaticAssets()', () => import('@fastify/static')), options);
     }
-    async setViewEngine(options) {
+    // Handed over unawaited for the same reason as `useStaticAssets()` above.
+    setViewEngine(options) {
         if (isString(options)) {
             new Logger('FastifyAdapter').error("setViewEngine() doesn't support a string argument.");
             process.exit(1);
         }
-        return this.register(await loadPackage('@fastify/view', 'FastifyAdapter.setViewEngine()', () => import('@fastify/view')), options);
+        return this.register(loadPackage('@fastify/view', 'FastifyAdapter.setViewEngine()', () => import('@fastify/view')), options);
     }
     isHeadersSent(response) {
         return response.sent;

package/adapters/utils/get-media-type-version.util.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Returns the version carried by an `Accept` header for media type versioning,
+ * e.g. `2` for `application/json;v=2` with the `v=` key.
+ *
+ * The version parameter may follow other parameters and may belong to any
+ * media range of a list (`text/html, application/json;v=2`); the first match
+ * wins. Returns `undefined` when no parameter starts with the key.
+ *
+ * Duplicated in each platform package so that a platform package never
+ * depends on a newer `@nestjs/core` than the one installed.
+ */
+export declare function getMediaTypeVersion(acceptHeader: string | string[] | undefined, key: string): string | undefined;

package/adapters/utils/get-media-type-version.util.js

@@ -0,0 +1,26 @@
+/**
+ * Returns the version carried by an `Accept` header for media type versioning,
+ * e.g. `2` for `application/json;v=2` with the `v=` key.
+ *
+ * The version parameter may follow other parameters and may belong to any
+ * media range of a list (`text/html, application/json;v=2`); the first match
+ * wins. Returns `undefined` when no parameter starts with the key.
+ *
+ * Duplicated in each platform package so that a platform package never
+ * depends on a newer `@nestjs/core` than the one installed.
+ */
+export function getMediaTypeVersion(acceptHeader, key) {
+    const mediaRanges = []
+        .concat(acceptHeader ?? [])
+        .flatMap(value => value.split(','));
+    for (const mediaRange of mediaRanges) {
+        const [, ...parameters] = mediaRange.split(';');
+        for (const parameter of parameters) {
+            const trimmedParameter = parameter.trim();
+            if (trimmedParameter.startsWith(key)) {
+                return trimmedParameter.slice(key.length);
+            }
+        }
+    }
+    return undefined;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/platform-fastify",
-  "version": "12.1.0",
+  "version": "12.1.2",
   "description": "Nest - modern, fast, powerful node.js web framework (@platform-fastify)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -54,5 +54,5 @@
       "optional": true
     }
   },
-  "gitHead": "6739656fa3e8c98bd55883f0363a2254e6412232"
+  "gitHead": "8ab60aa1b2927fbe0e23135ffc65d610c623236a"
 }