@spytecgps/lambda-utils 0.9.12 → 0.9.13

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import { APIGatewayEventRequestContext, APIGatewayProxyEvent, APIGatewayProxyWithLambdaAuthorizerEvent, SQSEvent, SQSRecord } from 'aws-lambda';
+import { APIGatewayEventRequestContext, APIGatewayProxyEvent, APIGatewayProxyWithLambdaAuthorizerEvent, SQSEvent, SQSRecord, Context } from 'aws-lambda';
 import { ObjectSchema } from 'joi';
 import { APIGatewayProxyEventBase } from 'aws-lambda/trigger/api-gateway-proxy';
 import * as Joi from 'joi';
@@ -38,6 +38,7 @@ export interface MessageEvent<RecordType extends BaseRecord> {
 }
 export interface SQSWrapperArgs<RecordType extends BaseRecord> {
     event: SQSEvent;
+    context?: Context;
     schema?: Joi.ObjectSchema<MessageEvent<RecordType>>;
     handler: (e: MessageEvent<RecordType>) => void | Promise<void>;
 }

package/dist/validation/validateEvent.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var errors_1 = require("../errors");
+var sdk_1 = require("@spytecgps/sdk");
 var validateEvent = function (event, schema, validateOptions) {
     if (!schema) {
-        console.warn("skipping validation");
+        sdk_1.logger.warn("skipping validation");
         return event;
     }
     var _a = schema.validate(event, {
@@ -16,7 +17,7 @@ var validateEvent = function (event, schema, validateOptions) {
         },
     }), error = _a.error, value = _a.value;
     if (error) {
-        console.error(error);
+        sdk_1.logger.error({ error: error }, 'Validation error');
         throw error.isJoi ? new errors_1.BadRequestError(error.message) : error;
     }
     return value;

package/dist/wrappers/apiGatewayEventWrapper.js

@@ -49,10 +49,11 @@ var logEvent = function (e) { return ({
 var apiGatewayEventWrapper = function (_a) {
     var event = _a.event, context = _a.context, schema = _a.schema, handler = _a.handler;
     return __awaiter(void 0, void 0, void 0, function () {
-        var validatedEvent, result, err_1;
+        var start, validatedEvent, result, err_1;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
+                    start = new Date().getTime();
                     if (event && context) {
                         sdk_1.logger.withRequest(event, context);
                     }
@@ -64,7 +65,7 @@ var apiGatewayEventWrapper = function (_a) {
                     return [4 /*yield*/, handler(validatedEvent)];
                 case 2:
                     result = _b.sent();
-                    sdk_1.logger.info(result, "apiGatewayWrapper - finished");
+                    sdk_1.logger.info({ result: result, requestTime: new Date().getTime() - start }, "apiGatewayWrapper - finished");
                     return [2 /*return*/, response_1.buildProxyResult(result)];
                 case 3:
                     err_1 = _b.sent();

package/dist/wrappers/sqsEventWrapper.d.ts

@@ -1,3 +1,3 @@
 import { SQSWrapperArgs } from '../types';
-declare const sqsEventWrapper: <RecordType extends Pick<import("aws-lambda").SQSRecord, "messageId" | "receiptHandle" | "attributes" | "md5OfBody" | "eventSource" | "eventSourceARN" | "awsRegion">>({ event, schema, handler, }: SQSWrapperArgs<RecordType>) => Promise<void>;
+declare const sqsEventWrapper: <RecordType extends Pick<import("aws-lambda").SQSRecord, "messageId" | "receiptHandle" | "attributes" | "md5OfBody" | "eventSource" | "eventSourceARN" | "awsRegion">>({ event, context, schema, handler, }: SQSWrapperArgs<RecordType>) => Promise<void>;
 export default sqsEventWrapper;

package/dist/wrappers/sqsEventWrapper.js

@@ -39,12 +39,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var validateEvent_1 = require("../validation/validateEvent");
 var sdk_1 = require("@spytecgps/sdk");
 var sqsEventWrapper = function (_a) {
-    var event = _a.event, schema = _a.schema, handler = _a.handler;
+    var event = _a.event, context = _a.context, schema = _a.schema, handler = _a.handler;
     return __awaiter(void 0, void 0, void 0, function () {
-        var validatedEvent, result, err_1;
+        var start, validatedEvent, err_1;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
+                    start = new Date().getTime();
+                    if (event && context) {
+                        sdk_1.logger.withRequest(event, context);
+                    }
                     sdk_1.logger.info(event, "sqsEventWrapper - got event");
                     _b.label = 1;
                 case 1:
@@ -52,8 +56,8 @@ var sqsEventWrapper = function (_a) {
                     validatedEvent = validateEvent_1.default(event, schema);
                     return [4 /*yield*/, handler(validatedEvent)];
                 case 2:
-                    result = _b.sent();
-                    sdk_1.logger.info(result, "sqsEventWrapper - finished");
+                    _b.sent();
+                    sdk_1.logger.info({ requestTime: new Date().getTime() - start }, "sqsEventWrapper - finished");
                     return [3 /*break*/, 4];
                 case 3:
                     err_1 = _b.sent();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spytecgps/lambda-utils",
-  "version": "0.9.12",
+  "version": "0.9.13",
   "description": "Lambda Utils",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -28,7 +28,7 @@
   "dependencies": {
     "joi": "^17.4.0",
     "qs": "^6.10.1",
-    "@spytecgps/sdk": "0.5.22"
+    "@spytecgps/sdk": "0.5.29"
   },
   "devDependencies": {
     "@types/aws-lambda": "^8.10.76",