@openstax/ts-utils 1.25.1-pre2 → 1.25.1

package/dist/cjs/middleware/apiErrorHandler.d.ts

@@ -10,7 +10,7 @@ export declare type DefaultErrors = {
     SessionExpiredError: SessionExpiredError;
 };
 export declare type Handlers<E> = {
-    [T in keyof E]: (e: E[T], logger: Logger) => ApiResponse<number, any>;
+    [T in keyof E]?: (e: E[T], logger: Logger) => ApiResponse<number, any>;
 };
 export declare const defaultHandlers: Handlers<DefaultErrors>;
 /**

package/dist/cjs/middleware/apiErrorHandler.js

@@ -25,16 +25,17 @@ const createErrorHandler = (inputHandlers) => {
     return async (e, logger) => {
         const name = (0, errors_1.isAppError)(e) ? e.constructor.TYPE : e.constructor.name;
         const handler = handlers[name];
+        const logLevel = handler ? logger_1.Level.Info : logger_1.Level.Error;
+        logger.logEvent(logLevel, {
+            name: e.name,
+            message: e.message,
+            stack: e.stack,
+        });
         if (handler) {
             // convincing typescript that this error is the right kind for the handler
             // we looked up based on the errors name is very annoying
             return handler(e, logger);
         }
-        logger.logEvent(logger_1.Level.Error, {
-            name: e.name,
-            message: e.message,
-            stack: e.stack,
-        });
         return (0, routing_1.apiTextResponse)(500, '500 Error');
     };
 };

package/dist/cjs/routing/index.js

@@ -139,7 +139,10 @@ const bindRoute = (services, appBinder, pathExtractor, matcher) => (route) => {
         const path = pathExtractor(request);
         const match = getParamsFromPath(path);
         if ((!matcher || matcher(request, route)) && match) {
-            return () => route.handler(match.params, boundServiceProvider ? boundServiceProvider({ request, logger }, { route, params: match.params }) : undefined);
+            return {
+                name: route.name,
+                executor: () => route.handler(match.params, boundServiceProvider ? boundServiceProvider({ request, logger }, { route, params: match.params }) : undefined)
+            };
         }
     };
 };
@@ -192,11 +195,13 @@ const makeGetRequestResponder = () => ({ routes, pathExtractor, routeMatcher, er
         if (logExtractor) {
             logger.setContext(logExtractor(request));
         }
+        logger.log('begin request');
         try {
-            const executor = (0, helpers_1.mapFind)(boundRoutes, (route) => route(request, logger));
-            if (executor) {
+            const route = (0, helpers_1.mapFind)(boundRoutes, (route) => route(request, logger));
+            if (route) {
+                logger.log(`route matched ${route.name}`);
                 const result = boundResponseMiddleware ?
-                    boundResponseMiddleware(executor(), { request, logger }) : executor();
+                    boundResponseMiddleware(route.executor(), { request, logger }) : route.executor();
                 if (isPromise(result) && errorHandler) {
                     const errorHandlerWithMiddleware = (e) => boundResponseMiddleware ?
                         boundResponseMiddleware(errorHandler(e, logger), { request, logger }) : errorHandler(e, logger);
@@ -207,6 +212,7 @@ const makeGetRequestResponder = () => ({ routes, pathExtractor, routeMatcher, er
                 }
             }
             else if (boundResponseMiddleware) {
+                logger.log('no route matched, returning 404');
                 return boundResponseMiddleware(undefined, { request, logger });
             }
         }