@gasket/plugin-fastify 7.0.1-canary.12 → 7.0.3

package/README.md

@@ -6,26 +6,22 @@ Adds Fastify to your application.
 
 #### New apps
 
-```
-gasket create <app-name> --plugins @gasket/plugin-fastify
-```
-
-#### Existing apps
-
 ```
 npm i @gasket/plugin-fastify
 ```
 
-Modify `plugins` section of your `gasket.config.js`:
+Update your `gasket` file plugin configuration:
 
 ```diff
-module.exports = {
-  plugins: {
-    add: [
-+      '@gasket/plugin-fastify'
-    ]
-  }
-}
+// gasket.js
+
++ import pluginFastify from '@gasket/plugin-fastify';
+
+export default makeGasket({
+  plugins: [
++   pluginFastify
+  ]
+});
 ```
 
 ## Configuration
@@ -34,80 +30,35 @@ All the configurations for the plugin are added under `fastify` in the config:
 
 - `compression`: true by default. Can be set to false if applying compression
   differently.
-- `excludedRoutesRegex`: Routes to be excluded based on a regex
 - `trustProxy`: Enable trust proxy option, [see Fastify documentation for possible values](https://fastify.dev/docs/latest/Reference/Server/#trustproxy)
+- `disableRequestLogging`: Turn off request logging, true by default
 
 #### Example configuration
 
 ```js
-module.exports = {
-  plugins: {
-    add: ['@gasket/fastify']
-  },
+export default makeGasket({
+  plugins: [
+    pluginFastify
+  ],
   fastify: {
     compression: false,
+    routes: 'api/*.js',
     excludedRoutesRegex: /^(?!\/_next\/)/,
     trustProxy: true
   }
-}
-```
-
-### Middleware paths
-
-The `gasket.config.js` can contain a `middleware` property, which is an array of
-objects that map plugins to route or path patterns, allowing apps to tune which
-middleware are triggered for which requests.
-
-```js
-  middleware: [
-    {
-      plugin:'gasket-plugin-example', // Name of the Gasket plugin
-      paths: ['/api']
-    },
-    {
-      plugin:'@some/gasket-plugin-example',
-      paths: [/\/default/]
-    },
-    {
-      plugin: '@another/gasket-plugin-example',
-      paths: ['/proxy', /\/home/]
-    }
-  ]
+});
 ```
 
 ## Lifecycles
 
-### middleware
-
-Executed when the `fastify` server has been created, it will apply all returned
-functions as middleware.
-
-```js
-module.exports = {
-  hooks: {
-    /**
-    * Add Fastify middleware
-    *
-    * @param {Gasket} gasket The Gasket API
-    * @param {Fastify} app - Fastify app instance
-    * @returns {function|function[]} middleware(s)
-    */
-    middleware: function (gasket, app) {
-      return require('x-xss-protection')();
-    }
-  }
-}
-```
-
-You may also return an `Array` to inject more than one middleware.
-
 ### fastify
 
 Executed **after** the `middleware` event for when you need full control over
 the `fastify` instance.
 
 ```js
-module.exports = {
+export default {
+  name: 'sample-plugin',
   hooks: {
     /**
     * Update Fastify app instance
@@ -119,7 +70,7 @@ module.exports = {
     fastify: async function (gasket, fastify) {
     }
   }
-}
+};
 ```
 
 ### errorMiddleware
@@ -128,7 +79,8 @@ Executed after the `fastify` event. All middleware functions returned from this
 hook will be applied to Fastify.
 
 ```js
-module.exports = {
+export default {
+  name: 'sample-plugin',
   hooks: {
     /**
     * Add Fastify error middlewares
@@ -139,7 +91,7 @@ module.exports = {
     errorMiddleware: function (gasket) {
     }
   }
-}
+};
 ```
 
 ## How it works

package/generator/app/routes/index.js

@@ -0,0 +1,28 @@
+import gasket from '../gasket.js';
+
+const app = gasket.actions.getFastifyApp();
+
+export const defaultHandler = async (req, res) => {
+  if (res.statusCode === 200) {
+    res.send({ message: 'Welcome to your default route...' });
+  }
+};
+
+{{#if useSwagger}}
+/**
+* @swagger
+*
+* /default:
+*   get:
+*     summary: "Get default route"
+*     produces:
+*       - "application/json"
+*     responses:
+*       "200":
+*         description: "Returns welcome message."
+*         content:
+*           application/json
+*/
+{{/if}}
+app.get('/default',  defaultHandler);
+

package/generator/app/routes/index.ts

@@ -0,0 +1,29 @@
+import type { FastifyRequest, FastifyReply } from 'fastify';
+import gasket from '../gasket.js';
+
+const app = gasket.actions.getFastifyApp();
+
+export const defaultHandler = async (req: FastifyRequest, res: FastifyReply) => {
+  if (res.statusCode === 200) {
+    res.send({ message: 'Welcome to your default route...' });
+  }
+};
+
+{{#if useSwagger}}
+/**
+* @swagger
+*
+* /default:
+*   get:
+*     summary: "Get default route"
+*     produces:
+*       - "application/json"
+*     responses:
+*       "200":
+*         description: "Returns welcome message."
+*         content:
+*           application/json
+*/
+{{/if}}
+app.get('/default', defaultHandler);
+

package/generator/jest/jest.config.js

@@ -0,0 +1,4 @@
+export default {
+  testEnvironment: 'node',
+  injectGlobals: true
+};

package/generator/jest/jest.config.ts

@@ -0,0 +1,17 @@
+import type { JestConfigWithTsJest } from 'ts-jest';
+
+const config: JestConfigWithTsJest = {
+  preset: 'ts-jest/presets/default-esm',
+  testEnvironment: 'node',
+  injectGlobals: true,
+  moduleDirectories: ['node_modules', '<rootDir>'],
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1'
+  },
+  transform: {
+    '^.+.ts$': ['ts-jest', { useESM: true }]
+  }
+};
+
+export default config;
+

package/generator/jest/test/index.test.js

@@ -0,0 +1,20 @@
+import { jest } from '@jest/globals';
+import { defaultHandler } from '../routes';
+
+describe('Routes', () => {
+  let mockRequest, mockResponse;
+  beforeEach(() => {
+    mockRequest = {};
+    mockResponse = {
+      statusCode: 200,
+      send: jest.fn()
+    };
+  });
+
+  it('defaultHandler should use expeced message', async () => {
+    await defaultHandler(mockRequest, mockResponse);
+    expect(mockResponse.send).toHaveBeenCalledWith({
+      message: 'Welcome to your default route...'
+    });
+  });
+});

package/generator/jest/test/index.test.ts

@@ -0,0 +1,26 @@
+import {
+  jest,
+  describe,
+  beforeEach,
+  it,
+  expect
+} from '@jest/globals';
+import { defaultHandler } from '../routes';
+
+describe('Routes', () => {
+  let mockRequest, mockResponse;
+  beforeEach(() => {
+    mockRequest = {};
+    mockResponse = {
+      statusCode: 200,
+      send: jest.fn()
+    };
+  });
+
+  it('defaultHandler should use expeced message', async () => {
+    await defaultHandler(mockRequest, mockResponse);
+    expect(mockResponse.send).toHaveBeenCalledWith({
+      message: 'Welcome to your default route...'
+    });
+  });
+});

package/generator/jest/tsconfig.test.json

@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "moduleResolution": "Node10",
+    "module": "CommonJS",
+  }
+}

package/generator/mocha/test/index.test.js

@@ -0,0 +1,23 @@
+import { expect } from 'chai';
+import sinon from 'sinon';
+import { defaultHandler } from '../routes/index.js';
+
+describe('Routes', () => {
+  let mockRequest, mockResponse, sendSpy;
+
+  beforeEach(() => {
+    mockRequest = {};
+    sendSpy = sinon.spy();
+    mockResponse = {
+      statusCode: 200,
+      send: sendSpy
+    };
+  });
+
+  it('defaultHandler should use expected message', async () => {
+    await defaultHandler(mockRequest, mockResponse);
+    expect(sendSpy.calledWith({
+      message: 'Welcome to your default route...'
+    })).to.be.true;
+  });
+});

package/generator/mocha/test/index.test.ts

@@ -0,0 +1,23 @@
+import { expect } from 'chai';
+import sinon from 'sinon';
+import { defaultHandler } from '../routes/index.js';
+
+describe('Routes', () => {
+  let mockRequest, mockResponse, sendSpy;
+
+  beforeEach(() => {
+    mockRequest = {};
+    sendSpy = sinon.spy();
+    mockResponse = {
+      statusCode: 200,
+      send: sendSpy
+    };
+  });
+
+  it('defaultHandler should use expected message', async () => {
+    await defaultHandler(mockRequest, mockResponse);
+    expect(sendSpy.calledWith({
+      message: 'Welcome to your default route...'
+    })).to.be.true;
+  });
+});

package/lib/create-servers.js

@@ -1,12 +1,6 @@
 /// <reference types="@gasket/plugin-https" />
 /// <reference types="@gasket/plugin-logger" />
 
-const fastify = require('fastify');
-const middie = require('middie');
-const cookieParser = require('cookie-parser');
-const compression = require('compression');
-const debug = require('diagnostics')('gasket:fastify');
-
 /**
  * Create the Fastify instance and setup the lifecycle hooks.
  * Fastify is compatible with express middleware out of the box, so we can
@@ -15,73 +9,12 @@ const debug = require('diagnostics')('gasket:fastify');
  */
 // eslint-disable-next-line max-statements
 module.exports = async function createServers(gasket, serverOpts) {
-  const { logger, config } = gasket;
-  const { middleware: middlewareConfig } = config;
-  const trustProxy = config.fastify?.trustProxy ?? false;
-  const excludedRoutesRegex =
-    config.fastify && config.fastify.excludedRoutesRegex;
-  // @ts-ignore
-  const app = fastify({ logger, trustProxy });
-
-  // Enable middleware for fastify@3
-  await app.register(middie);
-
-  // Add express-like `res.locals` object attaching data
-  app.use(function attachLocals(req, res, next) {
-    res.locals = {};
-    next();
-  });
-
-  if (excludedRoutesRegex) {
-    app.use(excludedRoutesRegex, cookieParser());
-  } else {
-    app.use(cookieParser());
-  }
-
-  const { compression: compressionConfig = true } = config.fastify || {};
-  if (compressionConfig) {
-    app.use(compression());
-  }
-
-  const middlewares = [];
-
-  await gasket.execApply('middleware', async (plugin, handler) => {
-    const middleware = await handler(app);
-    if (middleware) {
-      if (middlewareConfig) {
-        const pluginName = plugin && plugin.name ? plugin.name : '';
-        const mwConfig = middlewareConfig.find(
-          (mw) => mw.plugin === pluginName
-        );
-        if (mwConfig) {
-          middleware.paths = mwConfig.paths;
-          if (excludedRoutesRegex) {
-            middleware.paths.push(excludedRoutesRegex);
-          }
-        }
-      }
-      middlewares.push(middleware);
-    }
-  });
-
-  debug('applied %s middleware layers to fastify', middlewares.length);
-  middlewares.forEach((layer) => {
-    const { paths } = layer;
-    if (paths) {
-      app.use(paths, layer);
-    } else if (excludedRoutesRegex) {
-      app.use(excludedRoutesRegex, layer);
-    } else {
-      app.use(layer);
-    }
-  });
-
+  const app = gasket.actions.getFastifyApp();
   // allow consuming apps to directly append options to their server
   await gasket.exec('fastify', app);
 
-  const postRenderingStacks = (await gasket.exec('errorMiddleware')).filter(
-    Boolean
-  );
+  const postRenderingStacks = (await gasket.exec('errorMiddleware')).filter(Boolean);
+  // @ts-ignore
   postRenderingStacks.forEach((stack) => app.use(stack));
 
   return {

package/lib/create.js

@@ -0,0 +1,61 @@
+/// <reference types="@gasket/core" />
+
+const { name, version, devDependencies } = require('../package.json');
+
+/**
+ * createTestFiles
+ * @property {Files} files - The Gasket Files API.
+ * @property {generatorDir} - The directory of the generator.
+ * @property {testPlugins} - Array of selected test plugins
+ * @property {globIgnore} - Extension pattern to ignore
+ */
+function createTestFiles({ files, generatorDir, testPlugins, globIgnore }) {
+  if (!testPlugins || testPlugins.length === 0) return;
+  const unit = ['jest', 'mocha'];
+  const integration = ['cypress'];
+  const frameworks = [...unit, ...integration];
+  const frameworksRegex = new RegExp(frameworks.join('|'));
+
+  testPlugins.forEach((testPlugin) => {
+    const match = frameworksRegex.exec(testPlugin);
+    if (match) {
+      const matchedFramework = match[0];
+      if (unit.includes(matchedFramework)) {
+        files.add(`${generatorDir}/${matchedFramework}/*/${globIgnore}`, `${generatorDir}/${matchedFramework}/**/${globIgnore}`);
+      } else {
+        files.add(`${generatorDir}/${matchedFramework}/*`, `${generatorDir}/${matchedFramework}/**/*`);
+      }
+    }
+  });
+}
+
+/**
+ * Add files & extend package.json for new apps.
+ * @type {import('@gasket/core').HookHandler<'create'>}
+ */
+module.exports = async function create(gasket, context) {
+  const {
+    files,
+    typescript,
+    apiApp,
+    addApiRoutes = true,
+    testPlugins,
+    pkg,
+    gasketConfig
+  } = context;
+  const generatorDir = `${__dirname}/../generator`;
+
+  gasketConfig.addPlugin('pluginFastify', name);
+
+  pkg.add('dependencies', {
+    [name]: `^${version}`,
+    fastify: devDependencies.fastify
+  });
+
+  if (apiApp && addApiRoutes) {
+    const globIgnore = typescript ? '!(*.js)' : '!(*.ts|*.json)';
+    files.add(`${generatorDir}/app/**/${globIgnore}`);
+
+    createTestFiles({ files, generatorDir, testPlugins, globIgnore });
+  }
+};

package/lib/index.d.ts

@@ -1,22 +1,36 @@
-import type { MaybeAsync, MaybeMultiple } from '@gasket/core';
+import type { MaybeAsync, MaybeMultiple, Plugin } from '@gasket/core';
+import { Logger } from '@gasket/plugin-logger';
 import type {
-  Fastify,
+  FastifyInstance,
   FastifyRequest,
   FastifyReply,
-  FastifyServerOptions
+  FastifyServerOptions,
+  FastifyBaseLogger,
+  FastifyTypeProviderDefault,
+  RawServerDefault
 } from 'fastify';
+import { Http2SecureServer, Http2ServerRequest, Http2ServerResponse } from 'http2';
+import { IncomingMessage, ServerResponse } from 'http';
+
+export type AppRoutes = Array<MaybeAsync<(app: FastifyInstance) => void>>;
 
 declare module '@gasket/core' {
+  export interface GasketActions {
+    getFastifyApp(): FastifyInstance<RawServerDefault, IncomingMessage, ServerResponse<IncomingMessage>, FastifyBaseLogger, FastifyTypeProviderDefault>;
+  }
+
   export interface GasketConfig {
     fastify?: {
       /** Enable compression */
       compression?: boolean;
-      /** Regular expression for excluded routes */
+      /** Filter for which request URLs invoke Gasket middleware */
+      middlewareInclusionRegex?: RegExp;
+      /** @deprecated */
       excludedRoutesRegex?: RegExp;
       /** Trust proxy configuration */
       trustProxy?: FastifyServerOptions['trustProxy'];
-      /** Glob pattern for source files setting up fastify routes */
-      routes?: string;
+      /** Fastify request logging per route */
+      disableRequestLogging?: boolean;
     };
     /** Middleware configuration */
     middleware?: {
@@ -43,21 +57,29 @@ declare module '@gasket/core' {
 
   export interface HookExecTypes {
     middleware(
-      fastify: Fastify
+      app: FastifyInstance<RawServerDefault, IncomingMessage, ServerResponse<IncomingMessage>, FastifyBaseLogger, FastifyTypeProviderDefault>
     ): MaybeAsync<MaybeMultiple<Handler> & { paths?: (string | RegExp)[] }>;
-    fastify(fastify: Fastify): MaybeAsync<void>;
+    fastify(app: FastifyInstance<RawServerDefault, IncomingMessage, ServerResponse<IncomingMessage>, FastifyBaseLogger, FastifyTypeProviderDefault>): MaybeAsync<void>;
     errorMiddleware(): MaybeAsync<MaybeMultiple<ErrorHandler>>;
   }
 }
 
+export function alignLogger(
+  logger: Logger
+): FastifyBaseLogger
+
 declare module 'create-gasket-app' {
   export interface CreateContext {
     /** Flag indicating if API app is enabled */
     apiApp?: boolean;
+    addApiRoutes?: boolean;
+    typescript?: boolean;
   }
 }
 
-export default {
+const plugin: Plugin = {
   name: '@gasket/plugin-fastify',
   hooks: {}
 };
+
+export = plugin;

package/lib/index.js

@@ -1,32 +1,48 @@
 /// <reference types="@gasket/core" />
 /// <reference types="@gasket/plugin-metadata" />
 
-const { peerDependencies, name } = require('../package.json');
+const {
+  name,
+  version,
+  description
+} = require('../package.json');
+const create = require('./create');
 const createServers = require('./create-servers');
+const fastify = require('fastify');
+const { alignLogger } = require('./utils');
+
+let app;
 
 /** @type {import('@gasket/core').Plugin} */
 const plugin = {
   name,
-  hooks: {
-    create: async function create(gasket, context) {
-      const generatorDir = `${__dirname}/../generator`;
+  version,
+  description,
+  actions: {
+    getFastifyApp(gasket) {
+      const { fastify: fastifyConfig = {}, http2, https } = gasket.config;
+      const { trustProxy = false, disableRequestLogging = true } = fastifyConfig;
+      const fastifyLogger = alignLogger(gasket.logger);
 
-      context.pkg.add('dependencies', {
-        fastify: peerDependencies.fastify
-      });
+      // @ts-ignore
+      app ??= fastify({ logger: fastifyLogger, trustProxy, https, http2, disableRequestLogging });
 
-      if ('apiApp' in context && context.apiApp) {
-        context.files.add(`${generatorDir}/**/*`);
-
-        context.gasketConfig.add('fastify', {
-          routes: './routes/*'
-        });
-      }
-    },
+      return app;
+    }
+  },
+  hooks: {
+    create,
     createServers,
     metadata(gasket, meta) {
       return {
         ...meta,
+        actions: [
+          {
+            name: 'getFastifyApp',
+            description: 'Get the Fastify app instance',
+            link: 'README.md#getFastifyApp'
+          }
+        ],
         lifecycles: [
           {
             name: 'middleware',

package/lib/utils.js

@@ -0,0 +1,26 @@
+// @ts-nocheck
+/* 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,10 +1,11 @@
 {
   "name": "@gasket/plugin-fastify",
-  "version": "7.0.1-canary.12",
+  "version": "7.0.3",
   "description": "Adds fastify support to your application",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
+    "generator",
     "lib"
   ],
   "scripts": {
@@ -30,34 +31,26 @@
     "plugin"
   ],
   "author": "GoDaddy Operating Company, LLC",
-  "maintainers": [
-    "Sivan Mehta <smehta@godaddy.com>"
-  ],
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/godaddy/gasket/issues"
   },
   "homepage": "https://github.com/godaddy/gasket/tree/main/packages/gasket-plugin-fastify",
-  "dependencies": {
-    "compression": "^1.7.4",
-    "cookie-parser": "^1.4.6",
-    "diagnostics": "^2.0.2",
-    "middie": "^5.4.0"
-  },
   "devDependencies": {
-    "@gasket/core": "^7.0.1-canary.12",
+    "@gasket/core": "^7.0.1",
     "cross-env": "^7.0.3",
     "eslint": "^8.56.0",
-    "eslint-config-godaddy": "^7.1.0",
-    "eslint-plugin-jest": "^27.6.3",
+    "eslint-config-godaddy": "^7.1.1",
+    "eslint-plugin-jest": "^28.6.0",
     "eslint-plugin-json": "^3.1.0",
-    "eslint-plugin-unicorn": "^44.0.0",
-    "fastify": "^3.3.0",
+    "eslint-plugin-unicorn": "^55.0.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": [
@@ -76,5 +69,8 @@
   "eslintIgnore": [
     "generator"
   ],
-  "gitHead": "30055cdc6bb04a78c07c5ede230242db17327260"
+  "jest": {
+    "rootDir": "test"
+  },
+  "gitHead": "b023043d772b31c25dfd49e6b17bfb21ad54555d"
 }