@react-foundry/fastify 0.1.8 → 0.2.0

package/dist/config-helpers.js

@@ -1,20 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultsTrue = exports.defaultsFalse = exports.NodeEnv = exports.Mode = void 0;
-var Mode;
+export var Mode;
 (function (Mode) {
     Mode["Server"] = "server";
     Mode["Serverless"] = "serverless";
     Mode["StaticGenerator"] = "static-generator";
-})(Mode || (exports.Mode = Mode = {}));
+})(Mode || (Mode = {}));
 ;
-var NodeEnv;
+export var NodeEnv;
 (function (NodeEnv) {
     NodeEnv["Development"] = "development";
     NodeEnv["Production"] = "production";
-})(NodeEnv || (exports.NodeEnv = NodeEnv = {}));
+})(NodeEnv || (NodeEnv = {}));
 ;
 const parseBoolean = (pattern) => ((s) => !!(s && s.match(pattern)));
-exports.defaultsFalse = parseBoolean(/(yes|on|true|1)/i);
-const defaultsTrue = (s) => !parseBoolean(/(no|off|false|0)/i)(s);
-exports.defaultsTrue = defaultsTrue;
+export const defaultsFalse = parseBoolean(/(yes|on|true|1)/i);
+export const defaultsTrue = (s) => !parseBoolean(/(no|off|false|0)/i)(s);

package/dist/index.js

@@ -1,52 +1,9 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SessionStore = exports.AuthMethod = exports.Fastify = void 0;
-const close_with_grace_1 = __importDefault(require("close-with-grace"));
-const fastify_1 = __importDefault(require("fastify"));
-const rate_limit_1 = __importDefault(require("@fastify/rate-limit"));
-const fastify_auth_1 = __importStar(require("@react-foundry/fastify-auth"));
-Object.defineProperty(exports, "AuthMethod", { enumerable: true, get: function () { return fastify_auth_1.AuthMethod; } });
-const fastify_harden_1 = __importDefault(require("@react-foundry/fastify-harden"));
-const config_helpers_1 = require("./config-helpers");
+import closeWithGrace from 'close-with-grace';
+import _Fastify from 'fastify';
+import fastifyRateLimit from '@fastify/rate-limit';
+import fastifyAuth, { AuthMethod } from '@react-foundry/fastify-auth';
+import fastifyHarden from '@react-foundry/fastify-harden';
+import { NodeEnv } from './config-helpers';
 const is = () => true;
 const probeHandler = (isFn) => async (_req, reply) => {
     if (await isFn()) {
@@ -63,9 +20,9 @@ const parseForwarded = (hdr) => {
         : hdr);
     return str?.split(',')[0]?.trim();
 };
-const Fastify = ({ auth: _auth, cookies = {
+export const Fastify = ({ auth: _auth, cookies = {
     secret: 'changeme'
-}, contentSecurityPolicy, dev = process.env.NODE_ENV === config_helpers_1.NodeEnv.Development, isLive = is, isReady = is, logger: _logger = {}, onClose, permissionsPolicy, rateLimit: _rateLimit, session, ...options }) => {
+}, contentSecurityPolicy, dev = process.env.NODE_ENV === NodeEnv.Development, isLive = is, isReady = is, logger: _logger = {}, onClose, permissionsPolicy, rateLimit: _rateLimit, session, ...options }) => {
     const isTTY = process.stdout.isTTY;
     const stdLogger = {
         level: 'info',
@@ -102,11 +59,11 @@ const Fastify = ({ auth: _auth, cookies = {
             ..._logger
         }
         : _logger);
-    const httpd = (0, fastify_1.default)({
+    const httpd = _Fastify({
         logger,
         ...options
     });
-    const auth = ((session?.store === undefined) && (_auth === undefined || _auth.method === fastify_auth_1.AuthMethod.None)
+    const auth = ((session?.store === undefined) && (_auth === undefined || _auth.method === AuthMethod.None)
         ? undefined
         : {
             rateLimit: _rateLimit,
@@ -123,16 +80,16 @@ const Fastify = ({ auth: _auth, cookies = {
     httpd.log.debug(`Privacy mode: ${!!auth?.privacy}`);
     httpd.log.debug(`Authentication method: ${auth?.method || 'none'}`);
     httpd.log.debug(`Session store: ${session?.store}`);
-    httpd.register(fastify_harden_1.default, {
+    httpd.register(fastifyHarden, {
         contentSecurityPolicy,
         dev,
         permissionsPolicy
     });
     if (rateLimit) {
-        httpd.register(rate_limit_1.default, rateLimit);
+        httpd.register(fastifyRateLimit, rateLimit);
     }
     if (auth) {
-        httpd.register(fastify_auth_1.default, auth);
+        httpd.register(fastifyAuth, auth);
     }
     httpd.get('/healthz', probeHandler(isLive));
     httpd.get('/readiness', probeHandler(isReady));
@@ -141,7 +98,7 @@ const Fastify = ({ auth: _auth, cookies = {
             await onClose();
         });
     }
-    const signalListeners = (0, close_with_grace_1.default)(async ({ signal, err }) => {
+    const signalListeners = closeWithGrace(async ({ signal, err }) => {
         if (err) {
             httpd.log.error({ err }, 'server shutting down due to error...');
         }
@@ -155,8 +112,7 @@ const Fastify = ({ auth: _auth, cookies = {
     });
     return httpd;
 };
-exports.Fastify = Fastify;
-exports.default = exports.Fastify;
-var fastify_auth_2 = require("@react-foundry/fastify-auth");
-Object.defineProperty(exports, "SessionStore", { enumerable: true, get: function () { return fastify_auth_2.SessionStore; } });
-__exportStar(require("./config-helpers"), exports);
+export default Fastify;
+export { AuthMethod };
+export { SessionStore } from '@react-foundry/fastify-auth';
+export * from './config-helpers';

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@react-foundry/fastify",
-  "version": "0.1.8",
+  "version": "0.2.0",
   "description": "A customised Fastify server for running websites.",
+  "type": "module",
   "main": "dist/index.js",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js",
-      "default": "./dist/index.mjs"
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
     }
   },
   "files": [
@@ -23,24 +23,22 @@
     "@fastify/rate-limit": "^10.3.0",
     "close-with-grace": "^2.5.0",
     "fastify": "^5.8.4",
-    "@react-foundry/fastify-auth": "^0.1.8",
-    "@react-foundry/fastify-dev-logger": "^0.1.8",
-    "@react-foundry/fastify-harden": "^0.1.8"
+    "@react-foundry/fastify-auth": "^0.2.0",
+    "@react-foundry/fastify-dev-logger": "^0.2.0",
+    "@react-foundry/fastify-harden": "^0.2.0"
   },
   "devDependencies": {
     "jest": "30.3.0",
     "jest-environment-jsdom": "30.3.0",
-    "ts-jest": "29.4.6",
+    "ts-jest": "29.4.9",
     "typescript": "5.9.3",
-    "@react-foundry/types-helpers": "0.1.8"
+    "@react-foundry/types-helpers": "0.2.0"
   },
   "scripts": {
     "test": "NODE_OPTIONS=--experimental-vm-modules jest",
-    "build": "npm run build:esm && npm run build:cjs",
-    "build:esm": "tsc -m es2022 && find dist -name '*.js' -exec sh -c 'mv \"$0\" \"${0%.js}.mjs\"' {} \\;",
-    "build:cjs": "tsc",
+    "build": "tsc",
     "clean": "rm -rf dist tsconfig.tsbuildinfo"
   },
-  "module": "dist/index.mjs",
+  "module": "dist/index.js",
   "typings": "dist/index.d.ts"
 }

package/dist/config-helpers.mjs

@@ -1,16 +0,0 @@
-export var Mode;
-(function (Mode) {
-    Mode["Server"] = "server";
-    Mode["Serverless"] = "serverless";
-    Mode["StaticGenerator"] = "static-generator";
-})(Mode || (Mode = {}));
-;
-export var NodeEnv;
-(function (NodeEnv) {
-    NodeEnv["Development"] = "development";
-    NodeEnv["Production"] = "production";
-})(NodeEnv || (NodeEnv = {}));
-;
-const parseBoolean = (pattern) => ((s) => !!(s && s.match(pattern)));
-export const defaultsFalse = parseBoolean(/(yes|on|true|1)/i);
-export const defaultsTrue = (s) => !parseBoolean(/(no|off|false|0)/i)(s);

package/dist/index.mjs

@@ -1,118 +0,0 @@
-import closeWithGrace from 'close-with-grace';
-import _Fastify from 'fastify';
-import fastifyRateLimit from '@fastify/rate-limit';
-import fastifyAuth, { AuthMethod } from '@react-foundry/fastify-auth';
-import fastifyHarden from '@react-foundry/fastify-harden';
-import { NodeEnv } from './config-helpers';
-const is = () => true;
-const probeHandler = (isFn) => async (_req, reply) => {
-    if (await isFn()) {
-        return 'OK';
-    }
-    else {
-        reply.statusCode = 503;
-        return 'Service Unavailable';
-    }
-};
-const parseForwarded = (hdr) => {
-    const str = (Array.isArray(hdr)
-        ? hdr[0]
-        : hdr);
-    return str?.split(',')[0]?.trim();
-};
-export const Fastify = ({ auth: _auth, cookies = {
-    secret: 'changeme'
-}, contentSecurityPolicy, dev = process.env.NODE_ENV === NodeEnv.Development, isLive = is, isReady = is, logger: _logger = {}, onClose, permissionsPolicy, rateLimit: _rateLimit, session, ...options }) => {
-    const isTTY = process.stdout.isTTY;
-    const stdLogger = {
-        level: 'info',
-        serializers: {
-            req: (req) => ({
-                method: req.method,
-                url: req.url,
-                version: req.headers && req.headers['accept-version']?.toString(),
-                host: req.host,
-                remoteAddress: (req.ip === '127.0.0.1'
-                    ? parseForwarded(req.headers['x-forwarded-for']) || req.ip
-                    : req.ip),
-                remotePort: req.socket?.remotePort,
-                userAgent: req.headers && req.headers['user-agent']
-            }),
-            res: (reply) => ({
-                statusCode: reply.statusCode,
-                contentLength: (typeof reply.getHeaders === 'function') && reply.getHeaders()['content-length']
-            })
-        }
-    };
-    const devLogger = {
-        ...stdLogger,
-        level: 'debug',
-        transport: {
-            target: '@react-foundry/fastify-dev-logger'
-        }
-    };
-    const logger = (_logger instanceof Object
-        ? {
-            ...(!(dev && isTTY)
-                ? stdLogger
-                : devLogger),
-            ..._logger
-        }
-        : _logger);
-    const httpd = _Fastify({
-        logger,
-        ...options
-    });
-    const auth = ((session?.store === undefined) && (_auth === undefined || _auth.method === AuthMethod.None)
-        ? undefined
-        : {
-            rateLimit: _rateLimit,
-            ...(_auth || {}),
-            session: {
-                ...(session || {}),
-                cookies
-            }
-        });
-    const rateLimit = _rateLimit && {
-        ..._rateLimit,
-        global: true
-    };
-    httpd.log.debug(`Privacy mode: ${!!auth?.privacy}`);
-    httpd.log.debug(`Authentication method: ${auth?.method || 'none'}`);
-    httpd.log.debug(`Session store: ${session?.store}`);
-    httpd.register(fastifyHarden, {
-        contentSecurityPolicy,
-        dev,
-        permissionsPolicy
-    });
-    if (rateLimit) {
-        httpd.register(fastifyRateLimit, rateLimit);
-    }
-    if (auth) {
-        httpd.register(fastifyAuth, auth);
-    }
-    httpd.get('/healthz', probeHandler(isLive));
-    httpd.get('/readiness', probeHandler(isReady));
-    if (onClose) {
-        httpd.addHook('onClose', async (_fastify) => {
-            await onClose();
-        });
-    }
-    const signalListeners = closeWithGrace(async ({ signal, err }) => {
-        if (err) {
-            httpd.log.error({ err }, 'server shutting down due to error...');
-        }
-        else {
-            httpd.log.info(`${signal} received; server shutting down...`);
-        }
-        await httpd.close();
-    });
-    httpd.addHook('onClose', async (_fastify) => {
-        signalListeners.uninstall();
-    });
-    return httpd;
-};
-export default Fastify;
-export { AuthMethod };
-export { SessionStore } from '@react-foundry/fastify-auth';
-export * from './config-helpers';