@gasket/plugin-fastify 7.0.0-next.56 → 7.0.0-next.58

package/lib/create-servers.js

@@ -1,6 +1,8 @@
 /// <reference types="@gasket/plugin-https" />
 /// <reference types="@gasket/plugin-logger" />
 
+const { alignLogger } = require('./utils');
+
 /**
  * Create the Fastify instance and setup the lifecycle hooks.
  * Fastify is compatible with express middleware out of the box, so we can
@@ -10,7 +12,8 @@
 // eslint-disable-next-line max-statements
 module.exports = async function createServers(gasket, serverOpts) {
   const fastify = require('fastify');
-  const { config, logger } = gasket;
+
+  const { config } = gasket;
   const {
     fastify: {
       routes,
@@ -19,8 +22,10 @@ module.exports = async function createServers(gasket, serverOpts) {
     http2
   } = config;
 
+  const fastifyLogger = alignLogger(gasket.logger);
+
   // @ts-ignore
-  const app = fastify({ logger, trustProxy, http2 });
+  const app = fastify({ logger: fastifyLogger, trustProxy, http2 });
 
   // allow consuming apps to directly append options to their server
   await gasket.exec('fastify', app);
@@ -35,6 +40,7 @@ module.exports = async function createServers(gasket, serverOpts) {
   }
 
   const postRenderingStacks = (await gasket.exec('errorMiddleware')).filter(Boolean);
+  // @ts-ignore
   postRenderingStacks.forEach((stack) => app.use(stack));
 
   return {

package/lib/index.d.ts

@@ -1,10 +1,12 @@
 import type { MaybeAsync, MaybeMultiple, Plugin } from '@gasket/core';
+import { Logger } from '@gasket/plugin-logger';
 import type {
   FastifyInstance,
   FastifyRequest,
   FastifyReply,
   FastifyServerOptions
 } from 'fastify';
+import { Http2SecureServer, Http2ServerRequest, Http2ServerResponse } from 'http2'
 
 export type AppRoutes = Array<MaybeAsync<(app: FastifyInstance) => void>>;
 
@@ -20,7 +22,7 @@ declare module '@gasket/core' {
       /** Trust proxy configuration */
       trustProxy?: FastifyServerOptions['trustProxy'];
       /** Glob pattern for source files setting up fastify routes */
-      routes?: Array<MaybeAsync<(app: FastifyInstance) => void>>;
+      routes?: Array<MaybeAsync<(app: FastifyInstance<Http2SecureServer, Http2ServerRequest, Http2ServerResponse>) => void>>;
     };
     /** Middleware configuration */
     middleware?: {
@@ -47,13 +49,22 @@ declare module '@gasket/core' {
 
   export interface HookExecTypes {
     middleware(
-      fastify: Fastify
+      app: FastifyInstance<Http2SecureServer, Http2ServerRequest, Http2ServerResponse>
     ): MaybeAsync<MaybeMultiple<Handler> & { paths?: (string | RegExp)[] }>;
-    fastify(fastify: FastifyInstance): MaybeAsync<void>;
+    fastify(app: FastifyInstance<Http2SecureServer, Http2ServerRequest, Http2ServerResponse>): MaybeAsync<void>;
     errorMiddleware(): MaybeAsync<MaybeMultiple<ErrorHandler>>;
   }
 }
 
+type FastifyLogger = Logger & {
+  trace?: () => MaybeAsync<any>,
+  fatal?: () => MaybeAsync<any>
+}
+
+export function alignLogger(
+  logger: Logger
+): FastifyLogger
+
 declare module 'create-gasket-app' {
   export interface CreateContext {
     /** Flag indicating if API app is enabled */

package/lib/utils.js

@@ -0,0 +1,25 @@
+/* eslint-disable no-console */
+const fallbackMap = {
+  fatal: 'error',
+  trace: 'debug'
+};
+
+/**
+ * A helper function to ensure that all the required log levels
+ * for a Fastify server are present.
+ * @type {import('./index').alignLogger}
+ */
+function alignLogger(logger) {
+  const fastifyLogger = logger;
+  ['fatal', 'trace'].map(level => {
+    if (!logger[level]) {
+      fastifyLogger[level] = logger[fallbackMap[level]];
+    }
+  });
+
+  return fastifyLogger;
+}
+
+module.exports = {
+  alignLogger
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gasket/plugin-fastify",
-  "version": "7.0.0-next.56",
+  "version": "7.0.0-next.58",
   "description": "Adds fastify support to your application",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -39,19 +39,20 @@
   },
   "homepage": "https://github.com/godaddy/gasket/tree/main/packages/gasket-plugin-fastify",
   "devDependencies": {
-    "@gasket/core": "7.0.0-next.56",
+    "@gasket/core": "7.0.0-next.58",
     "cross-env": "^7.0.3",
     "eslint": "^8.56.0",
     "eslint-config-godaddy": "^7.1.1",
     "eslint-plugin-jest": "^28.6.0",
     "eslint-plugin-json": "^3.1.0",
     "eslint-plugin-unicorn": "^55.0.0",
-    "fastify": "^3.3.0",
+    "fastify": "^4.28.1",
+    "http2": "^3.3.7",
     "jest": "^29.7.0",
     "typescript": "^5.4.5"
   },
   "peerDependencies": {
-    "fastify": "^3.0.0"
+    "fastify": "^3 || ^4"
   },
   "eslintConfig": {
     "extends": [
@@ -70,5 +71,5 @@
   "eslintIgnore": [
     "generator"
   ],
-  "gitHead": "129c2124d2ce7c744a59f1309e87e0032cf29fc7"
+  "gitHead": "800032d942a80eec38ae3cf80e738e73e411db7f"
 }