hapi-terminator 0.0.4 → 0.0.6

package/dist/index.d.ts

@@ -1,7 +1,12 @@
 import type { Server, Request } from '@hapi/hapi';
+type LimitOption = number | ((request: Request, size: number) => boolean);
+type LimitOptionName = (typeof LIMIT_OPTION_NAMES)[keyof typeof LIMIT_OPTION_NAMES];
 export type TerminatorOptions = {
-    registeredLimit?: number | ((request: Request, size: number) => boolean);
-    unregisteredLimit?: number | ((request: Request, size: number) => boolean);
+    [Name in LimitOptionName]?: LimitOption;
+};
+declare const LIMIT_OPTION_NAMES: {
+    readonly REGISTERED: "registeredLimit";
+    readonly UNREGISTERED: "unregisteredLimit";
 };
 export declare const plugin: {
     pkg: {

package/dist/index.js

@@ -1,13 +1,16 @@
 import Boom from '@hapi/boom';
 import pkg from './package.json';
+const LIMIT_OPTION_NAMES = {
+    REGISTERED: 'registeredLimit',
+    UNREGISTERED: 'unregisteredLimit',
+};
 export const plugin = { pkg, register };
 async function register(server, options) {
     server.ext('onRequest', onRequest(options));
 }
 function onRequest(options) {
     return (request, h) => {
-        const unregisteredRouteHandler = handleUnregisteredRoute(request, h, options);
-        const registeredRouteHandler = handleRegisteredRoute(request, h, options);
+        const handler = validateRoute(request, h, options);
         const rawContentLength = request.headers['content-length'];
         if (!rawContentLength) {
             return h.continue;
@@ -18,37 +21,25 @@ function onRequest(options) {
         }
         const matchedRoute = request.server.match(request.method, request.path);
         if (matchedRoute != null) {
-            return registeredRouteHandler(contentLength);
+            return handler(contentLength, LIMIT_OPTION_NAMES.REGISTERED, option => {
+                throw Boom.entityTooLarge(typeof option === 'number' ? `Payload content length greater than maximum allowed: ${option}` : undefined);
+            });
         }
-        return unregisteredRouteHandler(contentLength);
-    };
-}
-function handleUnregisteredRoute(request, h, options) {
-    return (contentLength) => {
-        if (options.unregisteredLimit == null ||
-            (typeof options.unregisteredLimit === 'number' && options.unregisteredLimit < 0)) {
-            return h.continue;
-        }
-        if ((typeof options.unregisteredLimit === 'number' && contentLength > options.unregisteredLimit) ||
-            (typeof options.unregisteredLimit === 'function' && options.unregisteredLimit(request, contentLength))) {
-            request.raw.req.socket?.destroy();
+        return handler(contentLength, LIMIT_OPTION_NAMES.UNREGISTERED, () => {
             throw Boom.notFound();
-        }
-        return h.continue;
+        });
     };
 }
-function handleRegisteredRoute(request, h, options) {
-    return (contentLength) => {
-        if (options.registeredLimit == null ||
-            (typeof options.registeredLimit === 'number' && options.registeredLimit < 0)) {
+function validateRoute(request, h, options) {
+    return (contentLength, optionName, throwError) => {
+        const option = options[optionName];
+        if (option == null || (typeof option === 'number' && option < 0)) {
             return h.continue;
         }
-        if ((typeof options.registeredLimit === 'number' && contentLength > options.registeredLimit) ||
-            (typeof options.registeredLimit === 'function' && options.registeredLimit(request, contentLength))) {
+        if ((typeof option === 'number' && contentLength > option) ||
+            (typeof option === 'function' && option(request, contentLength))) {
             request.raw.req.socket?.destroy();
-            throw Boom.entityTooLarge(typeof options.registeredLimit === 'number'
-                ? `Payload content length greater than maximum allowed: ${options.registeredLimit}`
-                : undefined);
+            throwError(option);
         }
         return h.continue;
     };

package/dist/package.json

@@ -3,7 +3,7 @@
     "main": "dist/index.js",
     "typings": "dist/index.d.ts",
     "type": "module",
-    "version": "0.0.4",
+    "version": "0.0.6",
     "license": "MIT",
     "author": {
         "name": "Kamaal Farah"

package/package.json

@@ -3,7 +3,7 @@
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "type": "module",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "license": "MIT",
   "author": {
     "name": "Kamaal Farah"