@jaypie/express 0.1.2 → 0.1.4

package/dist/module.cjs.js

@@ -3,6 +3,18 @@
 var core = require('@jaypie/core');
 var serverlessExpress = require('@codegenie/serverless-express');
 
+//
+//
+// Constants
+//
+
+const EXPRESS = {
+  PATH: {
+    ANY: "*",
+    ROOT: /^\/?$/,
+  },
+};
+
 //
 //
 // Helper Functions
@@ -232,7 +244,7 @@ const expressHandler = (
       );
     };
     res.status = (...params) => {
-      originalRes.statusSent = true;
+      originalRes.statusSent = params;
       return originalRes.status(...params);
     };
 
@@ -273,7 +285,7 @@ const expressHandler = (
     }
 
     let response;
-    let status;
+    let status = core.HTTP.CODE.OK;
 
     try {
       libLogger.trace("[jaypie] Lambda execution");
@@ -319,13 +331,13 @@ const expressHandler = (
     // Decorate response
     decorateResponse(res, { handler: name });
 
+    // Allow the sent status to override the status in the response
+    if (originalRes.statusSent) {
+      status = originalRes.statusSent;
+    }
+
     // Send response
     try {
-      // Status
-      if (status && !originalRes.statusSent) {
-        res.status(status);
-      }
-
       if (!originalRes.attemptedCall) {
         // Body
         if (response) {
@@ -333,19 +345,18 @@ const expressHandler = (
             if (typeof response.json === "function") {
               res.json(response.json());
             } else {
-              res.json(response);
+              res.status(status).json(response);
             }
           } else if (typeof response === "string") {
             try {
-              res.json(JSON.parse(response));
+              res.status(status).json(JSON.parse(response));
             } catch (error) {
-              res.send(response);
+              res.status(status).send(response);
             }
           } else if (response === true) {
-            res.status(core.HTTP.CODE.CREATED);
-            res.send();
+            res.status(core.HTTP.CODE.CREATED).send();
           } else {
-            res.send(response);
+            res.status(status).send(response);
           }
         } else {
           // No response
@@ -387,4 +398,76 @@ const expressHandler = (
   };
 };
 
+//
+//
+// Main
+//
+
+const echoHandler = (context = {}) => {
+  core.validate.object(context);
+  // Give a default name if there isn't one
+  if (!context.name) {
+    context.name = "_echo";
+  }
+
+  // Return a function that will be used as an express route
+  return expressHandler(async (req) => {
+    return {
+      req: summarizeRequest(req),
+    };
+  }, context);
+};
+
+//
+//
+// Main
+//
+
+const httpHandler = (statusCode = core.HTTP.CODE.OK, context = {}) => {
+  // Give a default name if there isn't one
+  if (!context.name) {
+    context.name = "_http";
+  }
+
+  // Return a function that will be used as an express route
+  return expressHandler(async (req, res) => {
+    // Map the most throwable status codes to errors and throw them!
+    const error = {
+      [core.HTTP.CODE.BAD_REQUEST]: core.BadRequestError,
+      [core.HTTP.CODE.UNAUTHORIZED]: core.UnauthorizedError,
+      [core.HTTP.CODE.FORBIDDEN]: core.ForbiddenError,
+      [core.HTTP.CODE.NOT_FOUND]: core.NotFoundError,
+      [core.HTTP.CODE.METHOD_NOT_ALLOWED]: core.MethodNotAllowedError,
+      [core.HTTP.CODE.GONE]: core.GoneError,
+      [core.HTTP.CODE.TEAPOT]: core.TeapotError,
+      [core.HTTP.CODE.INTERNAL_ERROR]: core.InternalError,
+      [core.HTTP.CODE.BAD_GATEWAY]: core.BadGatewayError,
+      [core.HTTP.CODE.UNAVAILABLE]: core.UnavailableError,
+      [core.HTTP.CODE.GATEWAY_TIMEOUT]: core.GatewayTimeoutError,
+    };
+
+    // If this maps to an error, throw it
+    if (error[statusCode]) {
+      core.log.trace(
+        `@knowdev/express: gracefully throwing ${statusCode} up to projectHandler`,
+      );
+      throw new error[statusCode]();
+    }
+
+    // If this is an error and we didn't get thrown, log a warning
+    if (statusCode >= 400) {
+      core.log.warn(
+        `@knowdev/express: status code ${statusCode} not mapped as throwable`,
+      );
+    }
+
+    // Send the response
+    res.status(statusCode);
+    return statusCode === core.HTTP.CODE.NO_CONTENT ? null : {};
+  }, context);
+};
+
+exports.EXPRESS = EXPRESS;
+exports.expressEchoHandler = echoHandler;
 exports.expressHandler = expressHandler;
+exports.expressHttpHandler = httpHandler;

package/dist/module.esm.js

@@ -1,6 +1,18 @@
-import { log, JAYPIE, HTTP, validate, force, jaypieHandler, UnhandledError } from '@jaypie/core';
+import { log, JAYPIE, HTTP, validate, force, jaypieHandler, UnhandledError, BadRequestError, UnauthorizedError, ForbiddenError, NotFoundError, MethodNotAllowedError, GoneError, TeapotError, InternalError, BadGatewayError, UnavailableError, GatewayTimeoutError } from '@jaypie/core';
 import { getCurrentInvoke } from '@codegenie/serverless-express';
 
+//
+//
+// Constants
+//
+
+const EXPRESS = {
+  PATH: {
+    ANY: "*",
+    ROOT: /^\/?$/,
+  },
+};
+
 //
 //
 // Helper Functions
@@ -230,7 +242,7 @@ const expressHandler = (
       );
     };
     res.status = (...params) => {
-      originalRes.statusSent = true;
+      originalRes.statusSent = params;
       return originalRes.status(...params);
     };
 
@@ -271,7 +283,7 @@ const expressHandler = (
     }
 
     let response;
-    let status;
+    let status = HTTP.CODE.OK;
 
     try {
       libLogger.trace("[jaypie] Lambda execution");
@@ -317,13 +329,13 @@ const expressHandler = (
     // Decorate response
     decorateResponse(res, { handler: name });
 
+    // Allow the sent status to override the status in the response
+    if (originalRes.statusSent) {
+      status = originalRes.statusSent;
+    }
+
     // Send response
     try {
-      // Status
-      if (status && !originalRes.statusSent) {
-        res.status(status);
-      }
-
       if (!originalRes.attemptedCall) {
         // Body
         if (response) {
@@ -331,19 +343,18 @@ const expressHandler = (
             if (typeof response.json === "function") {
               res.json(response.json());
             } else {
-              res.json(response);
+              res.status(status).json(response);
             }
           } else if (typeof response === "string") {
             try {
-              res.json(JSON.parse(response));
+              res.status(status).json(JSON.parse(response));
             } catch (error) {
-              res.send(response);
+              res.status(status).send(response);
             }
           } else if (response === true) {
-            res.status(HTTP.CODE.CREATED);
-            res.send();
+            res.status(HTTP.CODE.CREATED).send();
           } else {
-            res.send(response);
+            res.status(status).send(response);
           }
         } else {
           // No response
@@ -385,4 +396,73 @@ const expressHandler = (
   };
 };
 
-export { expressHandler };
+//
+//
+// Main
+//
+
+const echoHandler = (context = {}) => {
+  validate.object(context);
+  // Give a default name if there isn't one
+  if (!context.name) {
+    context.name = "_echo";
+  }
+
+  // Return a function that will be used as an express route
+  return expressHandler(async (req) => {
+    return {
+      req: summarizeRequest(req),
+    };
+  }, context);
+};
+
+//
+//
+// Main
+//
+
+const httpHandler = (statusCode = HTTP.CODE.OK, context = {}) => {
+  // Give a default name if there isn't one
+  if (!context.name) {
+    context.name = "_http";
+  }
+
+  // Return a function that will be used as an express route
+  return expressHandler(async (req, res) => {
+    // Map the most throwable status codes to errors and throw them!
+    const error = {
+      [HTTP.CODE.BAD_REQUEST]: BadRequestError,
+      [HTTP.CODE.UNAUTHORIZED]: UnauthorizedError,
+      [HTTP.CODE.FORBIDDEN]: ForbiddenError,
+      [HTTP.CODE.NOT_FOUND]: NotFoundError,
+      [HTTP.CODE.METHOD_NOT_ALLOWED]: MethodNotAllowedError,
+      [HTTP.CODE.GONE]: GoneError,
+      [HTTP.CODE.TEAPOT]: TeapotError,
+      [HTTP.CODE.INTERNAL_ERROR]: InternalError,
+      [HTTP.CODE.BAD_GATEWAY]: BadGatewayError,
+      [HTTP.CODE.UNAVAILABLE]: UnavailableError,
+      [HTTP.CODE.GATEWAY_TIMEOUT]: GatewayTimeoutError,
+    };
+
+    // If this maps to an error, throw it
+    if (error[statusCode]) {
+      log.trace(
+        `@knowdev/express: gracefully throwing ${statusCode} up to projectHandler`,
+      );
+      throw new error[statusCode]();
+    }
+
+    // If this is an error and we didn't get thrown, log a warning
+    if (statusCode >= 400) {
+      log.warn(
+        `@knowdev/express: status code ${statusCode} not mapped as throwable`,
+      );
+    }
+
+    // Send the response
+    res.status(statusCode);
+    return statusCode === HTTP.CODE.NO_CONTENT ? null : {};
+  }, context);
+};
+
+export { EXPRESS, echoHandler as expressEchoHandler, expressHandler, httpHandler as expressHttpHandler };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jaypie/express",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "author": "Finlayson Studio",
   "type": "module",
   "exports": {
@@ -28,9 +28,12 @@
     "new:test": "hygen jaypie vitest",
     "prepublish": "npm run build",
     "test": "vitest",
+    "test:spec:constants": "vitest run ./src/__tests__/constants.spec.js",
     "test:spec:decorateResponse.helper": "vitest run ./src/__tests__/decorateResponse.helper.spec.js",
+    "test:spec:echo.handler": "vitest run ./src/__tests__/echo.handler.spec.js",
     "test:spec:expressHandler": "vitest run ./src/__tests__/expressHandler.spec.js",
     "test:spec:getCurrentInvokeUuid.adapter": "vitest run ./src/__tests__/getCurrentInvokeUuid.adapter.spec.js",
+    "test:spec:http.handler": "vitest run ./src/__tests__/http.handler.spec.js",
     "test:spec:index": "vitest run ./src/__tests__/index.spec.js",
     "test:spec:summarizeRequest.helper": "vitest run ./src/__tests__/summarizeRequest.helper.spec.js",
     "test:spec:summarizeResponse.helper": "vitest run ./src/__tests__/summarizeResponse.helper.spec.js",

package/src/constants.js

@@ -0,0 +1,11 @@
+//
+//
+// Constants
+//
+
+export const EXPRESS = {
+  PATH: {
+    ANY: "*",
+    ROOT: /^\/?$/,
+  },
+};

package/src/echo.handler.js

@@ -0,0 +1,31 @@
+import { validate } from "@jaypie/core";
+
+import expressHandler from "./expressHandler.js";
+import summarizeRequest from "./summarizeRequest.helper.js";
+
+//
+//
+// Main
+//
+
+const echoHandler = (context = {}) => {
+  validate.object(context);
+  // Give a default name if there isn't one
+  if (!context.name) {
+    context.name = "_echo";
+  }
+
+  // Return a function that will be used as an express route
+  return expressHandler(async (req) => {
+    return {
+      req: summarizeRequest(req),
+    };
+  }, context);
+};
+
+//
+//
+// Export
+//
+
+export default echoHandler;

package/src/expressHandler.js

@@ -95,7 +95,7 @@ const expressHandler = (
       );
     };
     res.status = (...params) => {
-      originalRes.statusSent = true;
+      originalRes.statusSent = params;
       return originalRes.status(...params);
     };
 
@@ -136,7 +136,7 @@ const expressHandler = (
     }
 
     let response;
-    let status;
+    let status = HTTP.CODE.OK;
 
     try {
       libLogger.trace("[jaypie] Lambda execution");
@@ -182,13 +182,13 @@ const expressHandler = (
     // Decorate response
     decorateResponse(res, { handler: name });
 
+    // Allow the sent status to override the status in the response
+    if (originalRes.statusSent) {
+      status = originalRes.statusSent;
+    }
+
     // Send response
     try {
-      // Status
-      if (status && !originalRes.statusSent) {
-        res.status(status);
-      }
-
       if (!originalRes.attemptedCall) {
         // Body
         if (response) {
@@ -196,19 +196,18 @@ const expressHandler = (
             if (typeof response.json === "function") {
               res.json(response.json());
             } else {
-              res.json(response);
+              res.status(status).json(response);
             }
           } else if (typeof response === "string") {
             try {
-              res.json(JSON.parse(response));
+              res.status(status).json(JSON.parse(response));
             } catch (error) {
-              res.send(response);
+              res.status(status).send(response);
             }
           } else if (response === true) {
-            res.status(HTTP.CODE.CREATED);
-            res.send();
+            res.status(HTTP.CODE.CREATED).send();
           } else {
-            res.send(response);
+            res.status(status).send(response);
           }
         } else {
           // No response

package/src/http.handler.js

@@ -0,0 +1,73 @@
+import {
+  BadGatewayError,
+  BadRequestError,
+  ForbiddenError,
+  GatewayTimeoutError,
+  GoneError,
+  HTTP,
+  InternalError,
+  log,
+  MethodNotAllowedError,
+  NotFoundError,
+  TeapotError,
+  UnauthorizedError,
+  UnavailableError,
+} from "@jaypie/core";
+
+import expressHandler from "./expressHandler.js";
+
+//
+//
+// Main
+//
+
+const httpHandler = (statusCode = HTTP.CODE.OK, context = {}) => {
+  // Give a default name if there isn't one
+  if (!context.name) {
+    context.name = "_http";
+  }
+
+  // Return a function that will be used as an express route
+  return expressHandler(async (req, res) => {
+    // Map the most throwable status codes to errors and throw them!
+    const error = {
+      [HTTP.CODE.BAD_REQUEST]: BadRequestError,
+      [HTTP.CODE.UNAUTHORIZED]: UnauthorizedError,
+      [HTTP.CODE.FORBIDDEN]: ForbiddenError,
+      [HTTP.CODE.NOT_FOUND]: NotFoundError,
+      [HTTP.CODE.METHOD_NOT_ALLOWED]: MethodNotAllowedError,
+      [HTTP.CODE.GONE]: GoneError,
+      [HTTP.CODE.TEAPOT]: TeapotError,
+      [HTTP.CODE.INTERNAL_ERROR]: InternalError,
+      [HTTP.CODE.BAD_GATEWAY]: BadGatewayError,
+      [HTTP.CODE.UNAVAILABLE]: UnavailableError,
+      [HTTP.CODE.GATEWAY_TIMEOUT]: GatewayTimeoutError,
+    };
+
+    // If this maps to an error, throw it
+    if (error[statusCode]) {
+      log.trace(
+        `@knowdev/express: gracefully throwing ${statusCode} up to projectHandler`,
+      );
+      throw new error[statusCode]();
+    }
+
+    // If this is an error and we didn't get thrown, log a warning
+    if (statusCode >= 400) {
+      log.warn(
+        `@knowdev/express: status code ${statusCode} not mapped as throwable`,
+      );
+    }
+
+    // Send the response
+    res.status(statusCode);
+    return statusCode === HTTP.CODE.NO_CONTENT ? null : {};
+  }, context);
+};
+
+//
+//
+// Export
+//
+
+export default httpHandler;

package/src/index.js

@@ -1 +1,4 @@
+export { EXPRESS } from "./constants.js";
+export { default as expressEchoHandler } from "./echo.handler.js";
 export { default as expressHandler } from "./expressHandler.js";
+export { default as expressHttpHandler } from "./http.handler.js";