@spytecgps/lambda-utils 0.9.22 → 0.9.23

package/dist/types.d.ts

@@ -24,10 +24,17 @@ export interface WrapperArgs<E, R> {
     context?: APIGatewayEventRequestContext;
     schema?: ObjectSchema<E>;
     handler: Handler<E, R>;
+    metricsHandler?: MetricsHandler;
 }
 export declare type UserAPIHandler<TEvent = APIGatewayProxyWithLambdaAuthorizerEvent<SpytecAuthContext>, TResult = any> = (event: TEvent, context: APIGatewayEventRequestContext, callback: Callback<TResult>) => void | Promise<TResult>;
 export declare type ServerAPIHandler<TResult = any> = (event: APIGatewayProxyWithCognitoAuthorizerEvent, context: APIGatewayEventRequestContext, callback: Callback<TResult>) => void | Promise<TResult>;
 export declare type Handler<E, R> = (event: E) => Promise<HandlerResponse<R>>;
+export declare type MetricsHandler = (event: APIGatewayProxyEvent, metrics: RequestMetrics) => Promise<void>;
+export interface RequestMetrics {
+    requestStart: Date;
+    requestEnd: Date;
+    statusCode: number;
+}
 export interface HandlerResponse<R> {
     statusCode?: number;
     headers?: {

package/dist/wrappers/apiGatewayEventWrapper.d.ts

@@ -1,4 +1,4 @@
 import { APIGatewayProxyResult } from 'aws-lambda';
 import { WrapperArgs } from '../types';
-declare const apiGatewayEventWrapper: <E, R>({ event, context, schema, handler, }: WrapperArgs<E, R>) => Promise<APIGatewayProxyResult>;
+declare const apiGatewayEventWrapper: <E, R>({ event, context, schema, handler, metricsHandler, }: WrapperArgs<E, R>) => Promise<APIGatewayProxyResult>;
 export default apiGatewayEventWrapper;

package/dist/wrappers/apiGatewayEventWrapper.js

@@ -46,35 +46,73 @@ var logEvent = function (e) { return ({
     pathParameters: e.pathParameters,
     body: e.body,
 }); };
+var safeExecuteMetricsHandler = function (metricsHandler, event, metrics) { return __awaiter(void 0, void 0, void 0, function () {
+    var err_1;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                if (!metricsHandler) {
+                    return [2 /*return*/];
+                }
+                _a.label = 1;
+            case 1:
+                _a.trys.push([1, 3, , 4]);
+                return [4 /*yield*/, metricsHandler(event, metrics)];
+            case 2:
+                _a.sent();
+                return [3 /*break*/, 4];
+            case 3:
+                err_1 = _a.sent();
+                sdk_1.logger.warn(err_1, "apiGatewayWrapper - caught error on metrics handler");
+                return [3 /*break*/, 4];
+            case 4: return [2 /*return*/];
+        }
+    });
+}); };
 var apiGatewayEventWrapper = function (_a) {
-    var event = _a.event, context = _a.context, schema = _a.schema, handler = _a.handler;
+    var event = _a.event, context = _a.context, schema = _a.schema, handler = _a.handler, metricsHandler = _a.metricsHandler;
     return __awaiter(void 0, void 0, void 0, function () {
-        var start, validatedEvent, result, err_1;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var start, validatedEvent, result, err_2;
+        var _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     start = new Date().getTime();
                     if (event && context) {
                         sdk_1.logger.withRequest(event, context);
                     }
                     sdk_1.logger.info(logEvent(event), "apiGatewayWrapper - got event");
-                    _b.label = 1;
+                    _c.label = 1;
                 case 1:
-                    _b.trys.push([1, 3, , 4]);
+                    _c.trys.push([1, 4, , 6]);
                     validatedEvent = validation_1.validateEvent(event, schema);
                     return [4 /*yield*/, handler(validatedEvent)];
                 case 2:
-                    result = _b.sent();
+                    result = _c.sent();
                     sdk_1.logger.info({ result: result, requestTime: new Date().getTime() - start }, "apiGatewayWrapper - finished");
-                    return [2 /*return*/, response_1.buildProxyResult(result)];
+                    return [4 /*yield*/, safeExecuteMetricsHandler(metricsHandler, event, {
+                            requestStart: new Date(start),
+                            requestEnd: new Date(),
+                            statusCode: (_b = result === null || result === void 0 ? void 0 : result.statusCode) !== null && _b !== void 0 ? _b : 200,
+                        })];
                 case 3:
-                    err_1 = _b.sent();
-                    sdk_1.logger.error({ err: err_1 }, "apiGatewayWrapper - caught error");
+                    _c.sent();
+                    return [2 /*return*/, response_1.buildProxyResult(result)];
+                case 4:
+                    err_2 = _c.sent();
+                    sdk_1.logger.error({ err: err_2 }, "apiGatewayWrapper - caught error");
+                    return [4 /*yield*/, safeExecuteMetricsHandler(metricsHandler, event, {
+                            requestStart: new Date(start),
+                            requestEnd: new Date(),
+                            statusCode: err_2.code || 500,
+                        })];
+                case 5:
+                    _c.sent();
                     return [2 /*return*/, response_1.buildProxyResult({
-                            statusCode: err_1.code || 500,
-                            message: err_1.message || 'Error',
+                            statusCode: err_2.code || 500,
+                            message: err_2.message || 'Error',
                         })];
-                case 4: return [2 /*return*/];
+                case 6: return [2 /*return*/];
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spytecgps/lambda-utils",
-  "version": "0.9.22",
+  "version": "0.9.23",
   "description": "Lambda Utils",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",