@aesop-fables/triginta 0.2.3 → 0.3.0

package/lib/HttpLambda.d.ts

@@ -1,17 +1,17 @@
 import { IServiceContainer, IServiceModule, Newable } from '@aesop-fables/containr';
-import { APIGatewayProxyEventV2, Handler } from 'aws-lambda';
+import { APIGatewayProxyEventV2, APIGatewayProxyStructuredResultV2, Handler } from 'aws-lambda';
 import { IHttpEndpoint } from './IHttpEndpoint';
 export declare type NonNoisyEvent = Omit<APIGatewayProxyEventV2, 'requestContext'>;
 export interface BootstrappedHttpLambdaContext {
-    createHttpLambda<Input, Output>(newable: Newable<IHttpEndpoint<Input, Output>>): Handler<APIGatewayProxyEventV2, Output>;
+    createHttpLambda<Input, Output>(newable: Newable<IHttpEndpoint<Input, Output>>): Handler<APIGatewayProxyEventV2, APIGatewayProxyStructuredResultV2>;
 }
 export interface IHttpLambdaFactory {
-    createHandler<Input, Output>(newable: Newable<IHttpEndpoint<Input, Output>>): Handler<APIGatewayProxyEventV2, Output>;
+    createHandler<Input, Output>(newable: Newable<IHttpEndpoint<Input, Output>>): Handler<APIGatewayProxyEventV2, APIGatewayProxyStructuredResultV2>;
 }
 export declare class HttpLambdaFactory implements IHttpLambdaFactory {
     private readonly container;
     constructor(container: IServiceContainer);
-    createHandler<Input, Output>(newable: Newable<IHttpEndpoint<Input, Output>>): Handler<APIGatewayProxyEventV2, Output>;
+    createHandler<Input, Output>(newable: Newable<IHttpEndpoint<Input, Output>>): Handler<APIGatewayProxyEventV2, APIGatewayProxyStructuredResultV2>;
 }
 export declare const useTrigintaHttp: IServiceModule;
 export declare class HttpLambda {

package/lib/HttpLambda.js

@@ -31,7 +31,16 @@ class HttpLambdaFactory {
                 const endpoint = this.container.resolve(newable);
                 const { body: request } = event;
                 const response = (yield endpoint.handle(request, event));
-                return response;
+                // TODO -- Break this out into a response writer
+                let proxyResponse = response;
+                if (typeof (proxyResponse === null || proxyResponse === void 0 ? void 0 : proxyResponse.statusCode) === 'undefined') {
+                    // TODO -- Is 200 always correct here?
+                    proxyResponse = {
+                        statusCode: 200,
+                        body: response ? JSON.stringify(response) : undefined,
+                    };
+                }
+                return proxyResponse;
             }
             finally {
                 if (childContainer) {

package/lib/Middleware.d.ts

@@ -1,10 +1 @@
-import middy from '@middy/core';
-export declare const errorWrapper: () => {
-    onError: (handler: middy.HandlerLambda, next: middy.NextFunction) => void;
-};
-export declare const convertNullTo200: () => {
-    after: (handler: middy.HandlerLambda, next: middy.NextFunction) => void;
-};
-export declare const xssFilter: () => {
-    before: (handler: middy.HandlerLambda) => Promise<void>;
-};
+export {};

package/lib/Middleware.js

@@ -1,72 +1,55 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.xssFilter = exports.convertNullTo200 = exports.errorWrapper = void 0;
-const xss_1 = __importDefault(require("xss"));
-const errorWrapper = () => ({
-    onError: (handler, next) => {
-        if (handler.error) {
-            handler.response = {
-                statusCode: 400,
-                headers: {
-                    'Content-Type': 'application/json',
-                    'Access-Control-Allow-Origin': '*',
-                    'Access-Control-Allow-Headers': '*',
-                    'Access-Control-Allow-Methods': '*',
-                },
-                body: JSON.stringify({
-                    error: handler.error,
-                }),
-            };
-            return next();
-        }
-        return next(handler.error);
-    },
-});
-exports.errorWrapper = errorWrapper;
-const convertNullTo200 = () => ({
-    after: (handler, next) => {
-        if (handler.response === null) {
-            handler.response = {
-                statusCode: 200,
-                headers: {
-                    'Content-Type': 'application/json',
-                    'Access-Control-Allow-Origin': '*',
-                    'Access-Control-Allow-Headers': '*',
-                    'Access-Control-Allow-Methods': '*',
-                },
-                body: '',
-            };
-        }
-        return next();
-    },
-});
-exports.convertNullTo200 = convertNullTo200;
-const xssFilter = () => ({
-    before: (handler) => __awaiter(void 0, void 0, void 0, function* () {
-        const { event } = handler;
-        const { body } = event;
-        if (body) {
-            const keys = Object.keys(body);
-            for (let i = 0; i < keys.length; i++) {
-                const key = keys[i];
-                const value = body[key];
-                if (value && typeof value === 'string') {
-                    body[key] = (0, xss_1.default)(value);
-                }
-            }
-        }
-    }),
-});
-exports.xssFilter = xssFilter;
+// export const errorWrapper = () => ({
+//   onError: (handler: middy.MiddyfiedHandler, next: middy.MiddlewareFn) => {
+//     if (handler.error) {
+//       handler.response = {
+//         statusCode: 400,
+//         headers: {
+//           'Content-Type': 'application/json',
+//           'Access-Control-Allow-Origin': '*',
+//           'Access-Control-Allow-Headers': '*',
+//           'Access-Control-Allow-Methods': '*',
+//         },
+//         body: JSON.stringify({
+//           error: handler.error,
+//         }),
+//       };
+//       return next();
+//     }
+//     return next(handler.error);
+//   },
+// });
+// export const convertNullTo200 = () => ({
+//   after: (handler: middy.HandlerLambda, next: middy.NextFunction) => {
+//     if (handler.response === null) {
+//       handler.response = {
+//         statusCode: 200,
+//         headers: {
+//           'Content-Type': 'application/json',
+//           'Access-Control-Allow-Origin': '*',
+//           'Access-Control-Allow-Headers': '*',
+//           'Access-Control-Allow-Methods': '*',
+//         },
+//         body: '',
+//       };
+//     }
+//     return next();
+//   },
+// });
+// export const xssFilter = () => ({
+//   before: async (handler: middy.HandlerLambda) => {
+//     const { event } = handler;
+//     const { body } = event;
+//     if (body) {
+//       const keys = Object.keys(body);
+//       for (let i = 0; i < keys.length; i++) {
+//         const key = keys[i];
+//         const value = body[key];
+//         if (value && typeof value === 'string') {
+//           body[key] = xss(value);
+//         }
+//       }
+//     }
+//   },
+// });

package/lib/index.d.ts

@@ -6,4 +6,5 @@ export * from './HttpLambda';
 export * from './HttpLambdaServices';
 export { default as RouteRegistry } from './RouteRegistry';
 export * from './invokeHttpHandler';
+export * from './IConfiguredRoute';
 export { IHandler, IHttpEndpoint };

package/lib/index.js

@@ -25,3 +25,4 @@ __exportStar(require("./HttpLambdaServices"), exports);
 var RouteRegistry_1 = require("./RouteRegistry");
 Object.defineProperty(exports, "RouteRegistry", { enumerable: true, get: function () { return __importDefault(RouteRegistry_1).default; } });
 __exportStar(require("./invokeHttpHandler"), exports);
+__exportStar(require("./IConfiguredRoute"), exports);

package/lib/invokeHttpHandler.d.ts

@@ -1,11 +1,14 @@
-import { APIGatewayProxyEventPathParameters, APIGatewayProxyEventV2 } from 'aws-lambda';
+import { APIGatewayProxyEventPathParameters, APIGatewayProxyEventV2, APIGatewayProxyStructuredResultV2 } from 'aws-lambda';
+import { IServiceContainer } from '@aesop-fables/containr';
 import { IConfiguredRoute } from './IConfiguredRoute';
 export interface InvocationContext {
     configuredRoute: IConfiguredRoute;
+    container: IServiceContainer;
     body?: any;
     path: string;
 }
 export declare function parseRouteParams(route: string, path: string): APIGatewayProxyEventPathParameters;
-export declare function parsePathParameters(context: InvocationContext): Partial<APIGatewayProxyEventV2>;
-export declare function createApiGatewayEvent(context: InvocationContext): Partial<APIGatewayProxyEventV2>;
-export declare function invokeHttpHandler<Output>(context: InvocationContext): Promise<Output>;
+export declare function parsePathParameters(context: EventGenerationContext): Partial<APIGatewayProxyEventV2>;
+export declare type EventGenerationContext = Omit<InvocationContext, 'container'>;
+export declare function createApiGatewayEvent(context: EventGenerationContext): Partial<APIGatewayProxyEventV2>;
+export declare function invokeHttpHandler<Output>(context: InvocationContext): Promise<APIGatewayProxyStructuredResultV2>;

package/lib/invokeHttpHandler.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.invokeHttpHandler = exports.createApiGatewayEvent = exports.parsePathParameters = exports.parseRouteParams = void 0;
-const HttpLambda_1 = require("./HttpLambda");
 const node_querystring_1 = __importDefault(require("node:querystring"));
 const HttpLambdaServices_1 = require("./HttpLambdaServices");
 function normalizeAndParse(input) {
@@ -78,7 +77,7 @@ function createApiGatewayEvent(context) {
             accept: '*/*',
             'accept-encoding': 'gzip, deflate, br',
             // 'content-length': '0',
-            // 'content-type': 'application/json',
+            'content-type': 'application/json',
             host: '',
             'user-agent': 'triginta/1.0',
             'x-amzn-trace-id': 'Root=1-63e26f79-577a8db87d3b31fa4da65566',
@@ -112,10 +111,11 @@ exports.createApiGatewayEvent = createApiGatewayEvent;
 // TODO -- We need to rename this to make it clear that it's for testing ONLY
 function invokeHttpHandler(context) {
     return __awaiter(this, void 0, void 0, function* () {
-        const container = HttpLambda_1.HttpLambda.getContainer();
+        const { container } = context;
         const factory = container.get(HttpLambdaServices_1.HttpLambdaServices.HttpLambdaFactory);
         const configuredHandler = factory.createHandler(context.configuredRoute.constructor);
-        return configuredHandler(createApiGatewayEvent(context), {
+        const event = createApiGatewayEvent(context);
+        const handlerContext = {
             callbackWaitsForEmptyEventLoop: false,
             functionName: 'httpLambda',
             functionVersion: '0.1',
@@ -125,7 +125,7 @@ function invokeHttpHandler(context) {
             logGroupName: 'test-group',
             logStreamName: 'test-stream',
             getRemainingTimeInMillis: function () {
-                throw new Error('Function not implemented.');
+                return 1000;
             },
             done: function (error, result) {
                 throw new Error('Function not implemented.');
@@ -136,10 +136,9 @@ function invokeHttpHandler(context) {
             succeed: function (messageOrObject) {
                 throw new Error('Function not implemented.');
             },
-        }, () => {
-            // no-op
-            throw new Error('Not supported');
-        });
+        };
+        const response = yield configuredHandler(event, handlerContext);
+        return response;
     });
 }
 exports.invokeHttpHandler = invokeHttpHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aesop-fables/triginta",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "A lightweight framework that wraps the basic infrastructure usages of AWS Lambda (SQS, Kinesis, etc.).",
   "type": "commonjs",
   "exports": {
@@ -45,9 +45,9 @@
     "lib/**/*"
   ],
   "dependencies": {
-    "@middy/core": "^1.5.2",
-    "@middy/http-error-handler": "^1.5.2",
-    "@middy/http-json-body-parser": "^1.5.2",
+    "@middy/core": "^4.2.3",
+    "@middy/http-error-handler": "^4.2.3",
+    "@middy/http-json-body-parser": "^4.2.3",
     "reflect-metadata": "^0.1.13",
     "xss": "^1.0.9"
   },