@spytecgps/lambda-utils 0.9.10 → 0.9.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/types.d.ts +3 -1
  2. package/dist/wrappers/apiGatewayEventWrapper.d.ts +1 -1
  3. package/dist/wrappers/apiGatewayEventWrapper.js +8 -4
  4. package/dist/wrappers/response.d.ts +1 -1
  5. package/dist/wrappers/response.js +2 -2
  6. package/dist/wrappers/sqsEventWrapper.js +4 -4
  7. package/package.json +3 -2
package/dist/types.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { APIGatewayProxyEvent, APIGatewayProxyWithLambdaAuthorizerEvent, SQSEvent, SQSRecord } from 'aws-lambda';
1
+ import { APIGatewayEventRequestContext, APIGatewayProxyEvent, APIGatewayProxyWithLambdaAuthorizerEvent, SQSEvent, SQSRecord } from 'aws-lambda';
2
2
  import { ObjectSchema } from 'joi';
3
3
  import { APIGatewayProxyEventBase } from 'aws-lambda/trigger/api-gateway-proxy';
4
4
  import * as Joi from 'joi';
@@ -17,6 +17,7 @@ export interface SpytecAuthContext {
17
17
  export declare type BaseAPIGatewayEvent = Omit<APIGatewayProxyEventBase<SpytecAuthContext>, 'pathParameters' | 'queryStringParameters' | 'body'>;
18
18
  export interface WrapperArgs<E, R> {
19
19
  event: APIGatewayProxyWithLambdaAuthorizerEvent<SpytecAuthContext> | APIGatewayProxyEvent;
20
+ context?: APIGatewayEventRequestContext;
20
21
  schema?: ObjectSchema<E>;
21
22
  handler: Handler<E, R>;
22
23
  }
@@ -29,6 +30,7 @@ export interface HandlerResponse<R> {
29
30
  isBase64Encoded?: boolean;
30
31
  message?: string;
31
32
  data?: R;
33
+ rawResult?: boolean;
32
34
  }
33
35
  export declare type BaseRecord = Omit<SQSRecord, 'body' | 'messageAttributes'>;
34
36
  export interface MessageEvent<RecordType extends BaseRecord> {
package/dist/wrappers/apiGatewayEventWrapper.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import { APIGatewayProxyResult } from 'aws-lambda';
2
2
  import { WrapperArgs } from '../types';
3
- declare const apiGatewayEventWrapper: <E, R>({ event, schema, handler, }: WrapperArgs<E, R>) => Promise<APIGatewayProxyResult>;
3
+ declare const apiGatewayEventWrapper: <E, R>({ event, context, schema, handler, }: WrapperArgs<E, R>) => Promise<APIGatewayProxyResult>;
4
4
  export default apiGatewayEventWrapper;
package/dist/wrappers/apiGatewayEventWrapper.js CHANGED
@@ -38,6 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
38
38
  Object.defineProperty(exports, "__esModule", { value: true });
39
39
  var validation_1 = require("../validation");
40
40
  var response_1 = require("./response");
41
+ var sdk_1 = require("@spytecgps/sdk");
41
42
  var logEvent = function (e) { return ({
42
43
  resource: e.resource,
43
44
  httpMethod: e.httpMethod,
@@ -46,13 +47,16 @@ var logEvent = function (e) { return ({
46
47
  body: e.body,
47
48
  }); };
48
49
  var apiGatewayEventWrapper = function (_a) {
49
- var event = _a.event, schema = _a.schema, handler = _a.handler;
50
+ var event = _a.event, context = _a.context, schema = _a.schema, handler = _a.handler;
50
51
  return __awaiter(void 0, void 0, void 0, function () {
51
52
  var validatedEvent, result, err_1;
52
53
  return __generator(this, function (_b) {
53
54
  switch (_b.label) {
54
55
  case 0:
55
- console.log("apiGatewayWrapper - got event", logEvent(event));
56
+ if (event && context) {
57
+ sdk_1.logger.withRequest(event, context);
58
+ }
59
+ sdk_1.logger.info(logEvent(event), "apiGatewayWrapper - got event");
56
60
  _b.label = 1;
57
61
  case 1:
58
62
  _b.trys.push([1, 3, , 4]);
@@ -60,11 +64,11 @@ var apiGatewayEventWrapper = function (_a) {
60
64
  return [4 /*yield*/, handler(validatedEvent)];
61
65
  case 2:
62
66
  result = _b.sent();
63
- console.log("apiGatewayWrapper - finished", result);
67
+ sdk_1.logger.info(result, "apiGatewayWrapper - finished");
64
68
  return [2 /*return*/, response_1.buildProxyResult(result)];
65
69
  case 3:
66
70
  err_1 = _b.sent();
67
- console.error("apiGatewayWrapper - caught error", err_1);
71
+ sdk_1.logger.error({ err: err_1 }, "apiGatewayWrapper - caught error");
68
72
  return [2 /*return*/, response_1.buildProxyResult({
69
73
  statusCode: err_1.code || 500,
70
74
  message: err_1.message || 'Error',
package/dist/wrappers/response.d.ts CHANGED
@@ -5,4 +5,4 @@ export declare const buildResponseBody: <T>(statusCode: number, message: string,
5
5
  message: string;
6
6
  result: T;
7
7
  };
8
- export declare const buildProxyResult: <R>({ statusCode, message, data, headers, }: HandlerResponse<R>) => APIGatewayProxyResult;
8
+ export declare const buildProxyResult: <R>({ statusCode, message, data, headers, rawResult, }: HandlerResponse<R>) => APIGatewayProxyResult;
package/dist/wrappers/response.js CHANGED
@@ -25,8 +25,8 @@ exports.buildResponseBody = function (statusCode, message, data) {
25
25
  };
26
26
  };
27
27
  exports.buildProxyResult = function (_a) {
28
- var _b = _a.statusCode, statusCode = _b === void 0 ? 200 : _b, _c = _a.message, message = _c === void 0 ? 'ok' : _c, data = _a.data, _d = _a.headers, headers = _d === void 0 ? {} : _d;
29
- var resp = exports.buildResponseBody(statusCode, message, data);
28
+ var _b = _a.statusCode, statusCode = _b === void 0 ? 200 : _b, _c = _a.message, message = _c === void 0 ? 'ok' : _c, data = _a.data, _d = _a.headers, headers = _d === void 0 ? {} : _d, _e = _a.rawResult, rawResult = _e === void 0 ? false : _e;
29
+ var resp = rawResult ? data : exports.buildResponseBody(statusCode, message, data);
30
30
  return {
31
31
  headers: __assign(__assign({}, baseHeaders), headers),
32
32
  statusCode: statusCode,
package/dist/wrappers/sqsEventWrapper.js CHANGED
@@ -37,6 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
37
37
  };
38
38
  Object.defineProperty(exports, "__esModule", { value: true });
39
39
  var validateEvent_1 = require("../validation/validateEvent");
40
+ var sdk_1 = require("@spytecgps/sdk");
40
41
  var sqsEventWrapper = function (_a) {
41
42
  var event = _a.event, schema = _a.schema, handler = _a.handler;
42
43
  return __awaiter(void 0, void 0, void 0, function () {
@@ -44,7 +45,7 @@ var sqsEventWrapper = function (_a) {
44
45
  return __generator(this, function (_b) {
45
46
  switch (_b.label) {
46
47
  case 0:
47
- console.log("sqsEventWrapper - got event", JSON.stringify(event, undefined, 2));
48
+ sdk_1.logger.info(event, "sqsEventWrapper - got event");
48
49
  _b.label = 1;
49
50
  case 1:
50
51
  _b.trys.push([1, 3, , 4]);
@@ -52,12 +53,11 @@ var sqsEventWrapper = function (_a) {
52
53
  return [4 /*yield*/, handler(validatedEvent)];
53
54
  case 2:
54
55
  result = _b.sent();
55
- console.log("sqsEventWrapper - finished", result);
56
+ sdk_1.logger.info(result, "sqsEventWrapper - finished");
56
57
  return [3 /*break*/, 4];
57
58
  case 3:
58
59
  err_1 = _b.sent();
59
- JSON.stringify(err_1, undefined, 2);
60
- console.error("sqsEventWrapper - caught error", err_1);
60
+ sdk_1.logger.error({ err: err_1 }, "sqsEventWrapper - caught error");
61
61
  throw err_1;
62
62
  case 4: return [2 /*return*/];
63
63
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@spytecgps/lambda-utils",
3
- "version": "0.9.10",
3
+ "version": "0.9.12",
4
4
  "description": "Lambda Utils",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",
@@ -27,7 +27,8 @@
27
27
  "homepage": "https://github.com/spytecgps/lambda-utils#readme",
28
28
  "dependencies": {
29
29
  "joi": "^17.4.0",
30
- "qs": "^6.10.1"
30
+ "qs": "^6.10.1",
31
+ "@spytecgps/sdk": "0.5.22"
31
32
  },
32
33
  "devDependencies": {
33
34
  "@types/aws-lambda": "^8.10.76",