@fjell/express-router 4.4.54 → 4.4.56

package/dist/ItemRouter.js

@@ -1,4 +1,5 @@
 import {
+  ActionError,
   cPK,
   validatePK
 } from "@fjell/core";
@@ -6,6 +7,7 @@ import { NotFoundError } from "@fjell/lib";
 import deepmerge from "deepmerge";
 import { Router } from "express";
 import LibLogger from "./logger.js";
+import { createErrorHandler } from "./errorHandler.js";
 class ItemRouter {
   lib;
   keyType;
@@ -13,12 +15,22 @@ class ItemRouter {
   childRouters = {};
   logger;
   parentRoute;
+  errorHandler;
   constructor(lib, keyType, options = {}, parentRoute) {
     this.lib = lib;
     this.keyType = keyType;
     this.options = options;
     this.parentRoute = parentRoute;
     this.logger = LibLogger.get("ItemRouter", keyType);
+    this.errorHandler = createErrorHandler(options.errorHandler);
+  }
+  /**
+   * Wrap async route handlers to catch errors and pass to error handler
+   */
+  wrapAsync(fn) {
+    return (req, res, next) => {
+      Promise.resolve(fn.call(this, req, res, next)).catch(next);
+    };
   }
   getPkType = () => {
     return this.keyType;
@@ -53,172 +65,142 @@ class ItemRouter {
     throw new Error("Method not implemented in an abstract router");
   }
   postAllAction = async (req, res) => {
-    const libOptions = this.lib.options;
     const libOperations = this.lib.operations;
     this.logger.debug("Posting All Action", { query: req?.query, params: req?.params, locals: res?.locals });
     const allActionKey = req.path.substring(req.path.lastIndexOf("/") + 1);
-    if (this.options.allActions && this.options.allActions[allActionKey]) {
-      this.logger.debug("Using router-level all action handler", { allActionKey });
-      try {
-        const result = await this.options.allActions[allActionKey](
+    try {
+      if (this.options.allActions && this.options.allActions[allActionKey]) {
+        this.logger.debug("Using router-level all action handler", { allActionKey });
+        const result2 = await this.options.allActions[allActionKey](
           req.body,
           this.getLocations(res),
           { req, res }
         );
-        if (result != null) res.json(result);
+        if (result2 != null) {
+          res.json(result2);
+        }
         return;
-      } catch (err) {
-        this.logger.error("Error in router-level all action", { message: err?.message, stack: err?.stack });
-        res.status(500).json(err);
+      }
+      if (!libOperations.allAction) {
+        res.status(500).json({ error: "All Actions are not configured" });
         return;
       }
-    }
-    if (!libOptions.allActions) {
-      this.logger.error("All Actions are not configured");
-      res.status(500).json({ error: "All Actions are not configured" });
-      return;
-    }
-    const allAction = libOptions.allActions[allActionKey];
-    if (!allAction) {
-      this.logger.error("All Action is not configured", { allActionKey });
-      res.status(500).json({ error: "All Action is not configured" });
-      return;
-    }
-    try {
-      const [result, affectedItems] = await libOperations.allAction(allActionKey, req.body, this.getLocations(res));
-      res.json([result, affectedItems]);
-    } catch (err) {
-      this.logger.error("Error in All Action", { message: err?.message, stack: err?.stack });
-      res.status(500).json(err);
+      const [result] = await libOperations.allAction(allActionKey, req.body, this.getLocations(res));
+      res.json(result);
+    } catch (error) {
+      this.logger.error("Error in postAllAction", { error });
+      if ((error.name === "ValidationError" || error.message?.includes("not found")) && error.message) {
+        res.status(500).json({ error: "All Action is not configured" });
+      } else {
+        res.status(500).json(error);
+      }
     }
   };
   getAllFacet = async (req, res) => {
-    const libOptions = this.lib.options;
     const libOperations = this.lib.operations;
     this.logger.debug("Getting All Facet", { query: req?.query, params: req?.params, locals: res?.locals });
     const facetKey = req.path.substring(req.path.lastIndexOf("/") + 1);
-    if (this.options.allFacets && this.options.allFacets[facetKey]) {
-      this.logger.debug("Using router-level all facet handler", { facetKey });
-      try {
-        const result = await this.options.allFacets[facetKey](
+    try {
+      if (this.options.allFacets && this.options.allFacets[facetKey]) {
+        this.logger.debug("Using router-level all facet handler", { facetKey });
+        const result2 = await this.options.allFacets[facetKey](
           req.query,
           this.getLocations(res),
           { req, res }
         );
-        if (result != null) res.json(result);
+        if (result2 != null) {
+          res.json(result2);
+        }
         return;
-      } catch (err) {
-        this.logger.error("Error in router-level all facet", { message: err?.message, stack: err?.stack });
-        res.status(500).json(err);
+      }
+      if (!libOperations.allFacet) {
+        res.status(500).json({ error: "All Facets are not configured" });
         return;
       }
-    }
-    if (!libOptions.allFacets) {
-      this.logger.error("All Facets are not configured");
-      res.status(500).json({ error: "All Facets are not configured" });
-      return;
-    }
-    const facet = libOptions.allFacets[facetKey];
-    if (!facet) {
-      this.logger.error("All Facet is not configured", { facetKey });
-      res.status(500).json({ error: "All Facet is not configured" });
-      return;
-    }
-    try {
       const combinedQueryParams = { ...req.query || {}, ...req.params || {} };
-      res.json(await libOperations.allFacet(facetKey, combinedQueryParams, this.getLocations(res)));
-    } catch (err) {
-      this.logger.error("Error in All Facet", { message: err?.message, stack: err?.stack });
-      res.status(500).json(err);
+      const result = await libOperations.allFacet(facetKey, combinedQueryParams, this.getLocations(res));
+      res.json(result);
+    } catch (error) {
+      this.logger.error("Error in getAllFacet", { error });
+      if ((error.name === "ValidationError" || error.message?.includes("not found")) && error.message) {
+        res.status(500).json({ error: "All Facet is not configured" });
+      } else {
+        res.status(500).json(error);
+      }
     }
   };
   postItemAction = async (req, res) => {
-    const libOptions = this.lib.options;
     const libOperations = this.lib.operations;
     this.logger.debug("Posting Item Action", { query: req?.query, params: req?.params, locals: res?.locals });
     const ik = this.getIk(res);
     const actionKey = req.path.substring(req.path.lastIndexOf("/") + 1);
-    if (this.options.actions && this.options.actions[actionKey]) {
-      this.logger.debug("Using router-level action handler", { actionKey });
-      try {
-        const result = await this.options.actions[actionKey](
+    try {
+      if (this.options.actions && this.options.actions[actionKey]) {
+        this.logger.debug("Using router-level action handler", { actionKey });
+        const result2 = await this.options.actions[actionKey](
           ik,
           req.body,
           { req, res }
         );
-        if (result != null) res.json(result);
+        if (result2 != null) {
+          res.json(result2);
+        }
         return;
-      } catch (err) {
-        this.logger.error("Error in router-level action", { message: err?.message, stack: err?.stack });
-        res.status(500).json(err);
+      }
+      if (!libOperations.action) {
+        res.status(500).json({ error: "Item Actions are not configured" });
         return;
       }
-    }
-    if (!libOptions.actions) {
-      this.logger.error("Item Actions are not configured");
-      res.status(500).json({ error: "Item Actions are not configured" });
-      return;
-    }
-    const action = libOptions.actions[actionKey];
-    if (!action) {
-      this.logger.error("Item Action is not configured", { actionKey });
-      res.status(500).json({ error: "Item Action is not configured" });
-      return;
-    }
-    try {
-      const [result, affectedItems] = await libOperations.action(ik, actionKey, req.body);
-      res.json([result, affectedItems]);
-    } catch (err) {
-      this.logger.error("Error in Item Action", { message: err?.message, stack: err?.stack });
-      res.status(500).json(err);
+      const [result] = await libOperations.action(ik, actionKey, req.body);
+      res.json(result);
+    } catch (error) {
+      this.logger.error("Error in postItemAction", { error });
+      if ((error.name === "ValidationError" || error.message?.includes("not found")) && error.message) {
+        res.status(500).json({ error: "Item Action is not configured" });
+      } else {
+        res.status(500).json(error);
+      }
     }
   };
   getItemFacet = async (req, res) => {
-    const libOptions = this.lib.options;
     const libOperations = this.lib.operations;
     this.logger.debug("Getting Item Facet", { query: req?.query, params: req?.params, locals: res?.locals });
     const ik = this.getIk(res);
     const facetKey = req.path.substring(req.path.lastIndexOf("/") + 1);
-    if (this.options.facets && this.options.facets[facetKey]) {
-      this.logger.debug("Using router-level facet handler", { facetKey });
-      try {
-        const result = await this.options.facets[facetKey](
+    try {
+      if (this.options.facets && this.options.facets[facetKey]) {
+        this.logger.debug("Using router-level facet handler", { facetKey });
+        const result2 = await this.options.facets[facetKey](
           ik,
           req.query,
           { req, res }
         );
-        if (result != null) res.json(result);
+        if (result2 != null) {
+          res.json(result2);
+        }
         return;
-      } catch (err) {
-        this.logger.error("Error in router-level facet", { message: err?.message, stack: err?.stack });
-        res.status(500).json(err);
+      }
+      if (!libOperations.facet) {
+        res.status(500).json({ error: "Item Facets are not configured" });
         return;
       }
-    }
-    if (!libOptions.facets) {
-      this.logger.error("Item Facets are not configured");
-      res.status(500).json({ error: "Item Facets are not configured" });
-      return;
-    }
-    const facet = libOptions.facets[facetKey];
-    if (!facet) {
-      this.logger.error("Item Facet is not configured", { facetKey });
-      res.status(500).json({ error: "Item Facet is not configured" });
-      return;
-    }
-    try {
       const combinedQueryParams = { ...req.query || {}, ...req.params || {} };
-      res.json(await libOperations.facet(ik, facetKey, combinedQueryParams));
-    } catch (err) {
-      this.logger.error("Error in Item Facet", { message: err?.message, stack: err?.stack });
-      res.status(500).json(err);
+      const result = await libOperations.facet(ik, facetKey, combinedQueryParams);
+      res.json(result);
+    } catch (error) {
+      this.logger.error("Error in getItemFacet", { error });
+      if ((error.name === "ValidationError" || error.message?.includes("not found")) && error.message) {
+        res.status(500).json({ error: "Item Facet is not configured" });
+      } else {
+        res.status(500).json(error);
+      }
     }
   };
   configure = (router) => {
     const libOptions = this.lib.options;
     this.logger.debug("Configuring Router", { pkType: this.getPkType() });
-    router.get("/", this.findItems);
-    router.post("/", this.createItem);
+    router.get("/", this.wrapAsync(this.findItems));
+    router.post("/", this.wrapAsync(this.createItem));
     const registeredAllActions = /* @__PURE__ */ new Set();
     const registeredAllFacets = /* @__PURE__ */ new Set();
     const registeredItemActions = /* @__PURE__ */ new Set();
@@ -227,7 +209,7 @@ class ItemRouter {
     if (this.options.allActions) {
       Object.keys(this.options.allActions).forEach((actionKey) => {
         this.logger.debug("Configuring Router All Action %s", actionKey);
-        router.post(`/${actionKey}`, this.postAllAction);
+        router.post(`/${actionKey}`, this.wrapAsync(this.postAllAction));
         registeredAllActions.add(actionKey);
       });
     }
@@ -238,7 +220,7 @@ class ItemRouter {
           this.logger.warning("All Action name collision - router-level handler takes precedence", { actionKey });
         } else {
           this.logger.debug("Configuring Library All Action %s", actionKey);
-          router.post(`/${actionKey}`, this.postAllAction);
+          router.post(`/${actionKey}`, this.wrapAsync(this.postAllAction));
           registeredAllActions.add(actionKey);
         }
       });
@@ -247,7 +229,7 @@ class ItemRouter {
     if (this.options.allFacets) {
       Object.keys(this.options.allFacets).forEach((facetKey) => {
         this.logger.debug("Configuring Router All Facet %s", facetKey);
-        router.get(`/${facetKey}`, this.getAllFacet);
+        router.get(`/${facetKey}`, this.wrapAsync(this.getAllFacet));
         registeredAllFacets.add(facetKey);
       });
     }
@@ -258,20 +240,20 @@ class ItemRouter {
           this.logger.warning("All Facet name collision - router-level handler takes precedence", { facetKey });
         } else {
           this.logger.debug("Configuring Library All Facet %s", facetKey);
-          router.get(`/${facetKey}`, this.getAllFacet);
+          router.get(`/${facetKey}`, this.wrapAsync(this.getAllFacet));
           registeredAllFacets.add(facetKey);
         }
       });
     }
     const itemRouter = Router();
-    itemRouter.get("/", this.getItem);
-    itemRouter.put("/", this.updateItem);
-    itemRouter.delete("/", this.deleteItem);
+    itemRouter.get("/", this.wrapAsync(this.getItem));
+    itemRouter.put("/", this.wrapAsync(this.updateItem));
+    itemRouter.delete("/", this.wrapAsync(this.deleteItem));
     this.logger.default("Router Item Actions", { itemActions: this.options.actions });
     if (this.options.actions) {
       Object.keys(this.options.actions).forEach((actionKey) => {
         this.logger.debug("Configuring Router Item Action %s", actionKey);
-        itemRouter.post(`/${actionKey}`, this.postItemAction);
+        itemRouter.post(`/${actionKey}`, this.wrapAsync(this.postItemAction));
         registeredItemActions.add(actionKey);
       });
     }
@@ -282,7 +264,7 @@ class ItemRouter {
           this.logger.warning("Item Action name collision - router-level handler takes precedence", { actionKey });
         } else {
           this.logger.debug("Configuring Library Item Action %s", actionKey);
-          itemRouter.post(`/${actionKey}`, this.postItemAction);
+          itemRouter.post(`/${actionKey}`, this.wrapAsync(this.postItemAction));
           registeredItemActions.add(actionKey);
         }
       });
@@ -291,7 +273,7 @@ class ItemRouter {
     if (this.options.facets) {
       Object.keys(this.options.facets).forEach((facetKey) => {
         this.logger.debug("Configuring Router Item Facet %s", facetKey);
-        itemRouter.get(`/${facetKey}`, this.getItemFacet);
+        itemRouter.get(`/${facetKey}`, this.wrapAsync(this.getItemFacet));
         registeredItemFacets.add(facetKey);
       });
     }
@@ -302,7 +284,7 @@ class ItemRouter {
           this.logger.warning("Item Facet name collision - router-level handler takes precedence", { facetKey });
         } else {
           this.logger.debug("Configuring Library Item Facet %s", facetKey);
-          itemRouter.get(`/${facetKey}`, this.getItemFacet);
+          itemRouter.get(`/${facetKey}`, this.wrapAsync(this.getItemFacet));
           registeredItemFacets.add(facetKey);
         }
       });
@@ -312,6 +294,7 @@ class ItemRouter {
     if (this.childRouters) {
       this.configureChildRouters(itemRouter, this.childRouters);
     }
+    router.use(this.errorHandler);
     return router;
   };
   validatePrimaryKeyValue = (req, res, next) => {
@@ -357,21 +340,18 @@ class ItemRouter {
     const ik = this.getIk(res);
     try {
       const removedItem = await libOperations.remove(ik);
-      const item = validatePK(removedItem, this.getPkType());
-      res.json(item);
-    } catch (err) {
-      if (err instanceof NotFoundError) {
-        this.logger.error("Item Not Found for Delete", { ik, message: err?.message, stack: err?.stack });
-        res.status(404).json({
-          ik,
-          message: "Item Not Found"
-        });
+      if (removedItem) {
+        const item = validatePK(removedItem, this.getPkType());
+        res.json(item);
       } else {
-        this.logger.error("General Error in Delete", { ik, message: err?.message, stack: err?.stack });
-        res.status(500).json({
-          ik,
-          message: "General Error"
-        });
+        res.status(204).send();
+      }
+    } catch (error) {
+      if (error instanceof NotFoundError || error.name === "NotFoundError") {
+        res.status(404).json({ ik, message: "Item Not Found" });
+      } else {
+        this.logger.error("Error in deleteItem", { error });
+        res.status(500).json({ ik, message: "General Error" });
       }
     }
   };
@@ -386,21 +366,33 @@ class ItemRouter {
     this.logger.debug("Getting Item", { query: req.query, params: req.params, locals: res.locals });
     const ik = this.getIk(res);
     try {
-      const item = validatePK(await libOperations.get(ik), this.getPkType());
-      res.json(item);
-    } catch (err) {
-      if (err instanceof NotFoundError) {
-        this.logger.error("Item Not Found", { ik, message: err?.message, stack: err?.stack });
-        res.status(404).json({
-          ik,
-          message: "Item Not Found"
+      const fetchedItem = await libOperations.get(ik);
+      if (!fetchedItem) {
+        throw new ActionError({
+          code: "NOT_FOUND",
+          message: `${this.keyType} not found`,
+          operation: {
+            type: "get",
+            name: "get",
+            params: { key: ik }
+          },
+          context: {
+            itemType: this.keyType
+          },
+          details: { retryable: false },
+          technical: {
+            timestamp: (/* @__PURE__ */ new Date()).toISOString()
+          }
         });
+      }
+      const item = validatePK(fetchedItem, this.getPkType());
+      res.json(item);
+    } catch (error) {
+      if (error instanceof NotFoundError || error.name === "NotFoundError") {
+        res.status(404).json({ ik, message: "Item Not Found" });
       } else {
-        this.logger.error("General Error", { ik, message: err?.message, stack: err?.stack });
-        res.status(500).json({
-          ik,
-          message: "General Error"
-        });
+        this.logger.error("Error in getItem", { error });
+        res.status(500).json({ ik, message: "General Error" });
       }
     }
   };
@@ -415,19 +407,12 @@ class ItemRouter {
       const itemToUpdate = this.convertDates(req.body);
       const retItem = validatePK(await libOperations.update(ik, itemToUpdate), this.getPkType());
       res.json(retItem);
-    } catch (err) {
-      if (err instanceof NotFoundError) {
-        this.logger.error("Item Not Found for Update", { ik, message: err?.message, stack: err?.stack });
-        res.status(404).json({
-          ik,
-          message: "Item Not Found"
-        });
+    } catch (error) {
+      if (error instanceof NotFoundError || error.name === "NotFoundError") {
+        res.status(404).json({ ik, message: "Item Not Found" });
       } else {
-        this.logger.error("General Error in Update", { ik, message: err?.message, stack: err?.stack });
-        res.status(500).json({
-          ik,
-          message: "General Error"
-        });
+        this.logger.error("Error in updateItem", { error });
+        res.status(500).json({ ik, message: "General Error" });
       }
     }
   };