@aesop-fables/triginta 0.8.6 → 0.9.0

package/lib/AwsServices.d.ts

@@ -0,0 +1,4 @@
+export declare const AwsServices: {
+    Context: string;
+    Event: string;
+};

package/lib/AwsServices.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AwsServices = void 0;
+const Utils_1 = require("./Utils");
+const keyFor = (0, Utils_1.createServiceNamespacer)('aws');
+exports.AwsServices = {
+    Context: keyFor('context'),
+    Event: keyFor('event'),
+};

package/lib/Bootstrapping.d.ts

@@ -4,13 +4,13 @@ import { BootstrappedHttpLambdaContext } from './http/HttpLambda';
 import { BootstrappedSqsLambdaContext } from './sqs/SqsLambda';
 import { BootstrappedS3LambdaContext } from './s3/S3Lambda';
 declare type Placeholder = object;
-interface AwsServices {
+interface AwsServiceCollection {
     http: Placeholder;
     s3: Placeholder;
     sqs: Placeholder;
 }
 declare type ConfiguredServices<T> = {
-    [Property in keyof AwsServices]: T;
+    [Property in keyof AwsServiceCollection]: T;
 };
 interface BootstrappedTrigintaApp extends BootstrappedHttpLambdaContext, BootstrappedSqsLambdaContext, BootstrappedS3LambdaContext {
     containers: ConfiguredServices<IServiceContainer>;
@@ -30,5 +30,7 @@ export interface TrigintaOptions {
     s3?: TrigintaS3Options;
     sqs?: TrigintaSqsOptions;
 }
+export declare const useTriginta: IServiceModule;
+export declare const useAwsServices: IServiceModule;
 export declare function createTrigintaApp(options: TrigintaOptions): BootstrappedTrigintaApp;
 export {};

package/lib/Bootstrapping.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTrigintaApp = void 0;
+exports.createTrigintaApp = exports.useAwsServices = exports.useTriginta = void 0;
+/* eslint-disable @typescript-eslint/no-explicit-any */
 const containr_1 = require("@aesop-fables/containr");
 const http_1 = require("./http");
 const HttpLambda_1 = require("./http/HttpLambda");
@@ -8,6 +9,24 @@ const localization_1 = require("./localization");
 const validation_1 = require("./validation");
 const SqsLambda_1 = require("./sqs/SqsLambda");
 const S3Lambda_1 = require("./s3/S3Lambda");
+const TrigintaServices_1 = require("./TrigintaServices");
+const ITrigintaRuntimeFactory_1 = require("./ITrigintaRuntimeFactory");
+const AwsServices_1 = require("./AwsServices");
+exports.useTriginta = (0, containr_1.createServiceModule)((0, TrigintaServices_1.createCoreKey)('bootstrap'), (services) => {
+    services.autoResolve(TrigintaServices_1.TrigintaServices.RuntimeFactory, ITrigintaRuntimeFactory_1.TrigintaRuntimeFactory, containr_1.Scopes.Transient);
+});
+// The individual middlewares setup the runtime in the child container
+// We're registering this here so that the defaults are in place
+exports.useAwsServices = (0, containr_1.createServiceModule)((0, TrigintaServices_1.createCoreKey)('bootstrap'), (services) => {
+    services.factory(AwsServices_1.AwsServices.Context, (container) => {
+        const runtime = container.get(TrigintaServices_1.TrigintaServices.Runtime);
+        return runtime.context;
+    }, containr_1.Scopes.Transient);
+    services.factory(AwsServices_1.AwsServices.Event, (container) => {
+        const runtime = container.get(TrigintaServices_1.TrigintaServices.Runtime);
+        return runtime.event;
+    }, containr_1.Scopes.Transient);
+});
 function createTrigintaApp(options) {
     const containers = {};
     Object.keys(options).forEach((key) => {
@@ -18,14 +37,22 @@ function createTrigintaApp(options) {
         let container;
         switch (serviceKey) {
             case 'http':
-                container = (0, containr_1.createContainer)([HttpLambda_1.useTrigintaHttp, http_1.useHttpServices, localization_1.useLocalization, validation_1.useHttpValidation, ...modules]);
+                container = (0, containr_1.createContainer)([
+                    exports.useTriginta,
+                    exports.useAwsServices,
+                    HttpLambda_1.useTrigintaHttp,
+                    http_1.useHttpServices,
+                    localization_1.useLocalization,
+                    validation_1.useHttpValidation,
+                    ...modules,
+                ]);
                 break;
             case 's3':
-                container = (0, containr_1.createContainer)([S3Lambda_1.useTrigintaS3, ...modules]);
+                container = (0, containr_1.createContainer)([exports.useTriginta, exports.useAwsServices, S3Lambda_1.useTrigintaS3, ...modules]);
                 break;
             case 'sqs':
                 const { matchers = [] } = serviceOptions;
-                container = (0, containr_1.createContainer)([(0, SqsLambda_1.useTrigintaSqs)({ matchers }), ...modules]);
+                container = (0, containr_1.createContainer)([exports.useTriginta, exports.useAwsServices, (0, SqsLambda_1.useTrigintaSqs)({ matchers }), ...modules]);
                 break;
         }
         if (container) {

package/lib/EventSource.d.ts

@@ -0,0 +1 @@
+export declare type EventSource = 'sqs' | 's3' | 'http';

package/lib/ITrigintaRuntime.d.ts

@@ -0,0 +1,12 @@
+import { Disposable, IServiceContainer } from '@aesop-fables/containr';
+import { EventSource } from './EventSource';
+import { APIGatewayEventRequestContextV2, APIGatewayProxyEventV2, Context, S3Event, SQSEvent } from 'aws-lambda';
+export interface ITrigintaRuntime<TEvent, TContext> extends Disposable {
+    container: IServiceContainer;
+    context: TContext;
+    event: TEvent;
+    source: EventSource;
+}
+export declare type ITrigintaHttpRuntime = ITrigintaRuntime<APIGatewayProxyEventV2, APIGatewayEventRequestContextV2>;
+export declare type ITrigintaS3Runtime = ITrigintaRuntime<S3Event, Context>;
+export declare type ITrigintaSqsRuntime = ITrigintaRuntime<SQSEvent, Context>;

package/lib/ITrigintaRuntime.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/ITrigintaRuntimeFactory.d.ts

@@ -0,0 +1,17 @@
+import middy from '@middy/core';
+import { Context } from 'aws-lambda';
+import { ITrigintaRuntime } from './ITrigintaRuntime';
+import { IServiceContainer, IServiceModule } from '@aesop-fables/containr';
+import { EventSource } from './EventSource';
+export interface TrigintaRuntimeOptions {
+    overrides: IServiceModule[];
+    source: EventSource;
+}
+export interface ITrigintaRuntimeFactory {
+    createRuntime<TEvent, TContext extends Context>(request: middy.Request<TEvent, any, Error, TContext>, options: TrigintaRuntimeOptions): Promise<ITrigintaRuntime<TEvent, TContext>>;
+}
+export declare class TrigintaRuntimeFactory implements ITrigintaRuntimeFactory {
+    private readonly container;
+    constructor(container: IServiceContainer);
+    createRuntime<TEvent, TContext extends Context>(request: middy.Request<TEvent, any, Error, TContext>, options: TrigintaRuntimeOptions): Promise<ITrigintaRuntime<TEvent, TContext>>;
+}

package/lib/ITrigintaRuntimeFactory.js

@@ -0,0 +1,61 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TrigintaRuntimeFactory = void 0;
+const containr_1 = require("@aesop-fables/containr");
+const Utils_1 = require("./Utils");
+const TrigintaServices_1 = require("./TrigintaServices");
+const namespacer = (0, Utils_1.createServiceNamespacer)('runtime');
+const factoryModule = namespacer('factory');
+function embedRuntime(runtime) {
+    return (0, containr_1.createServiceModule)(namespacer('embedRuntime'), (services) => {
+        services.singleton(TrigintaServices_1.TrigintaServices.Runtime, runtime);
+    });
+}
+let TrigintaRuntimeFactory = class TrigintaRuntimeFactory {
+    constructor(container) {
+        this.container = container;
+    }
+    createRuntime(request, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { context, event } = request;
+            const runtime = {
+                context,
+                event,
+                source: options.source,
+            };
+            const overrides = [embedRuntime(runtime), ...options.overrides];
+            const container = this.container.createChildContainer(factoryModule, overrides);
+            runtime.container = container;
+            runtime.dispose = () => {
+                container === null || container === void 0 ? void 0 : container.dispose();
+            };
+            return runtime;
+        });
+    }
+};
+TrigintaRuntimeFactory = __decorate([
+    __param(0, (0, containr_1.injectContainer)()),
+    __metadata("design:paramtypes", [Object])
+], TrigintaRuntimeFactory);
+exports.TrigintaRuntimeFactory = TrigintaRuntimeFactory;

package/lib/TrigintaMiddleware.d.ts

@@ -0,0 +1,20 @@
+import { IServiceContainer, IServiceModule } from '@aesop-fables/containr';
+import middy from '@middy/core';
+import { Context } from 'aws-lambda';
+import { ITrigintaRuntime } from './ITrigintaRuntime';
+import { EventSource } from './EventSource';
+export interface TrigintaMiddlewareOptions {
+    container: IServiceContainer;
+    overrides: IServiceModule[];
+    source: EventSource;
+}
+export declare function resolveTrigintaRuntime<TEvent, TContext extends Context = Context>(context: TContext): ITrigintaRuntime<TEvent, TContext>;
+export declare function trigintaMiddlware<TEvent, TContext extends Context = Context>(options: TrigintaMiddlewareOptions): {
+    after: middy.MiddlewareFn<TEvent, any, Error, TContext>;
+    before: middy.MiddlewareFn<TEvent, any, Error, TContext>;
+};
+interface MiddyHandler<TEvent, TContext extends Context = Context> {
+    (event: TEvent, context: TContext): Promise<any>;
+}
+export declare function trigintafy<TEvent, TContext extends Context = Context>(handler: MiddyHandler<TEvent, TContext>, middlewareMetadata: any[], options: TrigintaMiddlewareOptions): middy.MiddyfiedHandler<TEvent, any, Error, Context & TContext>;
+export {};

package/lib/TrigintaMiddleware.js

@@ -0,0 +1,49 @@
+"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.trigintafy = exports.trigintaMiddlware = exports.resolveTrigintaRuntime = void 0;
+const core_1 = __importDefault(require("@middy/core"));
+const Utils_1 = require("./Utils");
+const TrigintaServices_1 = require("./TrigintaServices");
+const runtimeContextKey = (0, Utils_1.createServiceNamespacer)('runtime')('context');
+function resolveTrigintaRuntime(context) {
+    return context[runtimeContextKey];
+}
+exports.resolveTrigintaRuntime = resolveTrigintaRuntime;
+function trigintaMiddlware(options) {
+    const before = (request) => __awaiter(this, void 0, void 0, function* () {
+        const factory = options.container.get(TrigintaServices_1.TrigintaServices.RuntimeFactory);
+        const runtime = yield factory.createRuntime(request, {
+            overrides: options.overrides,
+            source: options.source,
+        });
+        const context = request.context;
+        context[runtimeContextKey] = runtime;
+    });
+    const after = (request) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        (_a = resolveTrigintaRuntime(request.context)) === null || _a === void 0 ? void 0 : _a.dispose();
+    });
+    return { after, before };
+}
+exports.trigintaMiddlware = trigintaMiddlware;
+function trigintafy(handler, middlewareMetadata, options) {
+    let midHandler = (0, core_1.default)(handler).use(trigintaMiddlware(options));
+    // eslint-disable-next-line @typescript-eslint/ban-types
+    middlewareMetadata.forEach((midFunc) => {
+        midHandler = midHandler.use(midFunc());
+    });
+    return midHandler;
+}
+exports.trigintafy = trigintafy;

package/lib/TrigintaServices.d.ts

@@ -0,0 +1,5 @@
+export declare const createCoreKey: (key: string) => string;
+export declare const TrigintaServices: {
+    Runtime: string;
+    RuntimeFactory: string;
+};

package/lib/TrigintaServices.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TrigintaServices = exports.createCoreKey = void 0;
+const Utils_1 = require("./Utils");
+exports.createCoreKey = (0, Utils_1.createServiceNamespacer)('core');
+exports.TrigintaServices = {
+    Runtime: (0, exports.createCoreKey)('runtime'),
+    RuntimeFactory: (0, exports.createCoreKey)('runtimeFactory'),
+};

package/lib/http/HttpLambda.js

@@ -20,18 +20,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.createBootstrappedHttpLambdaContext = exports.useTrigintaHttp = exports.HttpLambdaFactory = exports.HttpResponseGenerator = void 0;
 /* eslint-disable @typescript-eslint/ban-types */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const containr_1 = require("@aesop-fables/containr");
-const core_1 = __importDefault(require("@middy/core"));
 const Decorators_1 = require("../Decorators");
 const HttpLambdaServices_1 = require("./HttpLambdaServices");
+const TrigintaMiddleware_1 = require("../TrigintaMiddleware");
 const LoggingRegistry_1 = require("../logging/LoggingRegistry");
 const Levels_1 = require("../logging/Levels");
 let HttpResponseGenerator = class HttpResponseGenerator {
@@ -84,7 +81,7 @@ let HttpLambdaFactory = class HttpLambdaFactory {
             throw new Error('No route found for the specified endpoint');
         }
         const handler = (event, context) => __awaiter(this, void 0, void 0, function* () {
-            const childContainer = context['container'];
+            const childContainer = (0, TrigintaMiddleware_1.resolveTrigintaRuntime)(context).container;
             if (!childContainer) {
                 throw new Error('No container found in the context');
             }
@@ -104,32 +101,15 @@ let HttpLambdaFactory = class HttpLambdaFactory {
         });
         const { container } = this;
         const middlewareMetadata = (_a = (0, Decorators_1.getMiddleware)(newable)) !== null && _a !== void 0 ? _a : [];
-        let midHandler = (0, core_1.default)(handler).use({
-            before(request) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    const injectContextualServices = (0, containr_1.createServiceModule)('injectContextualServices', (services) => {
-                        services.singleton(HttpLambdaServices_1.HttpLambdaServices.CurrentRoute, route);
-                        services.singleton(HttpLambdaServices_1.HttpLambdaServices.CurrentEvent, request.event);
-                        services.singleton(HttpLambdaServices_1.HttpLambdaServices.CurrentContext, request.context);
-                        services.factory(HttpLambdaServices_1.HttpLambdaServices.RequestContext, (current) => {
-                            return {
-                                container: current,
-                            };
-                        }, containr_1.Scopes.Transient);
-                    });
-                    const childContainer = container.createChildContainer('httpLambda', [injectContextualServices]);
-                    request.context['container'] = childContainer;
-                });
-            },
-            after(request) {
-                var _a;
-                (_a = request.context['container']) === null || _a === void 0 ? void 0 : _a.dispose();
-            },
+        const httpRuntimeOverrides = (0, containr_1.createServiceModule)('httpRuntimeOverrides', (services) => {
+            services.singleton(HttpLambdaServices_1.HttpLambdaServices.CurrentRoute, route);
+            // TODO -- Register the AwsServices
         });
-        middlewareMetadata.forEach((midFunc) => {
-            midHandler = midHandler.use(midFunc());
+        return (0, TrigintaMiddleware_1.trigintafy)(handler, middlewareMetadata, {
+            container,
+            source: 'http',
+            overrides: [httpRuntimeOverrides],
         });
-        return midHandler;
     }
 };
 HttpLambdaFactory = __decorate([

package/lib/http/HttpLambdaServices.d.ts

@@ -1,8 +1,6 @@
 export declare const HttpLambdaServices: {
-    CurrentContext: string;
-    CurrentEvent: string;
     CurrentRoute: string;
     HttpLambdaFactory: string;
     HttpResponseGenerator: string;
-    RequestContext: string;
+    RuntimeContext: string;
 };

package/lib/http/HttpLambdaServices.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpLambdaServices = void 0;
+const Utils_1 = require("../Utils");
+const keyFor = (0, Utils_1.createServiceNamespacer)('http');
 exports.HttpLambdaServices = {
-    CurrentContext: 'currentContext',
-    CurrentEvent: 'currentEvent',
-    CurrentRoute: 'currentRoute',
-    HttpLambdaFactory: 'HttpLambdaFactory',
-    HttpResponseGenerator: 'HttpResponseGenerator',
-    RequestContext: 'requestContext',
+    CurrentRoute: keyFor('currentRoute'),
+    HttpLambdaFactory: keyFor('httpLambdaFactory'),
+    HttpResponseGenerator: keyFor('httpResponseGenerator'),
+    RuntimeContext: keyFor('runtimeContext'),
 };

package/lib/index.d.ts

@@ -1,26 +1,32 @@
+export { default as RouteRegistry, IRouteRegistry } from './RouteRegistry';
+export * from './AwsServices';
 export * from './Bootstrapping';
+export * from './Decorators';
 export * from './IHandler';
+export * from './ITrigintaRuntime';
+export * from './ITrigintaRuntimeFactory';
+export * from './http/IConfiguredRoute';
 export * from './http/IHttpEndpoint';
-export * from './Decorators';
 export * from './http/HttpLambda';
 export * from './http/HttpLambdaServices';
-export { default as RouteRegistry, IRouteRegistry } from './RouteRegistry';
+export * from './resolveEnvironmentSettings';
+export * from './s3/IS3RecordHandler';
+export * from './s3/S3Lambda';
+export * from './s3/S3LambdaServices';
 export * from './sqs/SqsLambda';
 export * from './sqs/SqsLambdaServices';
 export * from './sqs/ISqsMessageHandler';
+export * from './sqs/ISqsFailureHandler';
 export * from './sqs/RecordMatchers';
 export * from './sqs/ISqsMessage';
 export * from './sqs/MessagePublisher';
 export * from './sqs/SqsSettings';
 export * from './sqs/IQueue';
 export * from './sqs/SqsPublisher';
-export * from './http/IConfiguredRoute';
 export * from './TrigintaConfig';
-export * from './resolveEnvironmentSettings';
 export * from './TrigintaHeaders';
-export * from './s3/IS3RecordHandler';
-export * from './s3/S3Lambda';
-export * from './s3/S3LambdaServices';
+export * from './TrigintaMiddleware';
+export * from './TrigintaServices';
 export * as Localization from './localization';
 export * as Validation from './validation';
 export * as Logging from './logging';
@@ -32,7 +38,7 @@ import * as s3Utils from './s3/invokeS3Handler';
  */
 export declare const TestUtils: {
     invokeS3Handler(context: s3Utils.S3InvocationContext): Promise<void>;
-    invokeSqsHandler(context: sqsUtils.SqsInvocationContext): Promise<void>;
+    invokeSqsHandler(context: sqsUtils.SqsInvocationContext): Promise<import("aws-lambda").SQSBatchResponse>;
     parseRouteParams(route: string, path: string): import("aws-lambda").APIGatewayProxyEventPathParameters;
     parsePathParameters(context: httpUtils.EventGenerationContext): Partial<import("aws-lambda").APIGatewayProxyEventV2>;
     createApiGatewayEvent(context: httpUtils.EventGenerationContext): Partial<import("aws-lambda").APIGatewayProxyEventV2>;

package/lib/index.js

@@ -30,30 +30,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TestUtils = exports.Logging = exports.Validation = exports.Localization = exports.RouteRegistry = void 0;
+var RouteRegistry_1 = require("./RouteRegistry");
+Object.defineProperty(exports, "RouteRegistry", { enumerable: true, get: function () { return __importDefault(RouteRegistry_1).default; } });
+__exportStar(require("./AwsServices"), exports);
 __exportStar(require("./Bootstrapping"), exports);
+__exportStar(require("./Decorators"), exports);
 __exportStar(require("./IHandler"), exports);
+__exportStar(require("./ITrigintaRuntime"), exports);
+__exportStar(require("./ITrigintaRuntimeFactory"), exports);
+__exportStar(require("./http/IConfiguredRoute"), exports);
 __exportStar(require("./http/IHttpEndpoint"), exports);
-__exportStar(require("./Decorators"), exports);
 __exportStar(require("./http/HttpLambda"), exports);
 __exportStar(require("./http/HttpLambdaServices"), exports);
-var RouteRegistry_1 = require("./RouteRegistry");
-Object.defineProperty(exports, "RouteRegistry", { enumerable: true, get: function () { return __importDefault(RouteRegistry_1).default; } });
+__exportStar(require("./resolveEnvironmentSettings"), exports);
+__exportStar(require("./s3/IS3RecordHandler"), exports);
+__exportStar(require("./s3/S3Lambda"), exports);
+__exportStar(require("./s3/S3LambdaServices"), exports);
 __exportStar(require("./sqs/SqsLambda"), exports);
 __exportStar(require("./sqs/SqsLambdaServices"), exports);
 __exportStar(require("./sqs/ISqsMessageHandler"), exports);
+__exportStar(require("./sqs/ISqsFailureHandler"), exports);
 __exportStar(require("./sqs/RecordMatchers"), exports);
 __exportStar(require("./sqs/ISqsMessage"), exports);
 __exportStar(require("./sqs/MessagePublisher"), exports);
 __exportStar(require("./sqs/SqsSettings"), exports);
 __exportStar(require("./sqs/IQueue"), exports);
 __exportStar(require("./sqs/SqsPublisher"), exports);
-__exportStar(require("./http/IConfiguredRoute"), exports);
 __exportStar(require("./TrigintaConfig"), exports);
-__exportStar(require("./resolveEnvironmentSettings"), exports);
 __exportStar(require("./TrigintaHeaders"), exports);
-__exportStar(require("./s3/IS3RecordHandler"), exports);
-__exportStar(require("./s3/S3Lambda"), exports);
-__exportStar(require("./s3/S3LambdaServices"), exports);
+__exportStar(require("./TrigintaMiddleware"), exports);
+__exportStar(require("./TrigintaServices"), exports);
 exports.Localization = __importStar(require("./localization"));
 exports.Validation = __importStar(require("./validation"));
 exports.Logging = __importStar(require("./logging"));

package/lib/logging/Levels.js

@@ -14,9 +14,9 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CurrentRecordLoggingLevel = exports.CurrentRequestLoggingLevel = void 0;
 const containr_1 = require("@aesop-fables/containr");
-const HttpLambdaServices_1 = require("../http/HttpLambdaServices");
 const SqsLambdaServices_1 = require("../sqs/SqsLambdaServices");
 const TrigintaHeaders_1 = require("../TrigintaHeaders");
+const AwsServices_1 = require("../AwsServices");
 let CurrentRequestLoggingLevel = class CurrentRequestLoggingLevel {
     constructor(event) {
         this.event = event;
@@ -26,7 +26,7 @@ let CurrentRequestLoggingLevel = class CurrentRequestLoggingLevel {
     }
 };
 CurrentRequestLoggingLevel = __decorate([
-    __param(0, (0, containr_1.inject)(HttpLambdaServices_1.HttpLambdaServices.CurrentEvent)),
+    __param(0, (0, containr_1.inject)(AwsServices_1.AwsServices.Event)),
     __metadata("design:paramtypes", [Object])
 ], CurrentRequestLoggingLevel);
 exports.CurrentRequestLoggingLevel = CurrentRequestLoggingLevel;

package/lib/s3/S3Lambda.js

@@ -20,21 +20,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.createBootstrappedS3LambdaContext = exports.S3LambdaFactory = exports.useTrigintaS3 = void 0;
 /* eslint-disable @typescript-eslint/ban-types */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const containr_1 = require("@aesop-fables/containr");
-const core_1 = __importDefault(require("@middy/core"));
 const Decorators_1 = require("../Decorators");
 const S3LambdaServices_1 = require("./S3LambdaServices");
+const AwsServices_1 = require("../AwsServices");
+const TrigintaMiddleware_1 = require("../TrigintaMiddleware");
 function embedS3Event(event) {
     return (0, containr_1.createServiceModule)('@aesop-fables/triginta/s3/event', (services) => {
-        services.singleton(S3LambdaServices_1.S3LambdaServices.CurrentEvent, event);
+        services.singleton(AwsServices_1.AwsServices.Event, event);
+    });
+}
+function embedS3Context(context) {
+    return (0, containr_1.createServiceModule)('@aesop-fables/triginta/s3/context', (services) => {
+        services.singleton(AwsServices_1.AwsServices.Context, context);
     });
 }
 function embedS3Record(record) {
@@ -50,16 +53,22 @@ let S3LambdaFactory = class S3LambdaFactory {
         this.container = container;
     }
     createHandler(newable) {
-        const handler = (event) => __awaiter(this, void 0, void 0, function* () {
+        const handler = (event, context) => __awaiter(this, void 0, void 0, function* () {
             for (let i = 0; i < event.Records.length; i++) {
+                const { container } = (0, TrigintaMiddleware_1.resolveTrigintaRuntime)(context);
+                if (!container) {
+                    throw new Error('No container found in the context');
+                }
                 const record = event.Records[i];
-                const childContainer = this.container.createChildContainer('s3Lambda', [
+                const childContainer = container.createChildContainer('s3Lambda', [
                     embedS3Event(event),
                     embedS3Record(record),
+                    embedS3Context(context),
                 ]);
                 try {
                     const handler = childContainer.resolve(newable);
                     yield handler.handle(record, event);
+                    // TODO -- Add the failure handler
                 }
                 finally {
                     if (childContainer) {
@@ -73,15 +82,12 @@ let S3LambdaFactory = class S3LambdaFactory {
                 }
             }
         });
-        const middlewareMetadata = (0, Decorators_1.getMiddleware)(newable);
-        if (middlewareMetadata) {
-            let midHandler = (0, core_1.default)(handler);
-            middlewareMetadata.forEach((midFunc) => {
-                midHandler = midHandler.use(midFunc());
-            });
-            return midHandler;
-        }
-        return handler;
+        const middlewareMetadata = (0, Decorators_1.getMiddleware)(newable) || [];
+        return (0, TrigintaMiddleware_1.trigintafy)(handler, middlewareMetadata, {
+            container: this.container,
+            source: 's3',
+            overrides: [],
+        });
     }
 };
 S3LambdaFactory = __decorate([

package/lib/s3/S3LambdaServices.d.ts

@@ -1,5 +1,4 @@
 export declare const S3LambdaServices: {
     S3LambdaFactory: string;
-    CurrentEvent: string;
     CurrentRecord: string;
 };

package/lib/s3/S3LambdaServices.js

@@ -5,6 +5,5 @@ const Utils_1 = require("../Utils");
 const namedService = (0, Utils_1.createServiceNamespacer)('s3');
 exports.S3LambdaServices = {
     S3LambdaFactory: namedService('factory'),
-    CurrentEvent: namedService('event'),
     CurrentRecord: namedService('record'),
 };

package/lib/sqs/ISqsFailureHandler.d.ts

@@ -0,0 +1,16 @@
+import { SQSRecord } from 'aws-lambda';
+/**
+ * Represents the logic used to handle a failed SQS record.
+ */
+export interface ISqsRecordFailureHandler {
+    /**
+     * Called when an error occurs during the processing an SQSEvent.
+     * @param record The record that caused the error
+     * @param error The error that occurred
+     * @returns Whether or not to report the error (true to report; false to suppress).
+     */
+    onError(record: SQSRecord, error: any): Promise<boolean>;
+}
+export declare class SqsRecordFailureHandler implements ISqsRecordFailureHandler {
+    onError(): Promise<boolean>;
+}

package/lib/sqs/ISqsFailureHandler.js

@@ -0,0 +1,20 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SqsRecordFailureHandler = void 0;
+class SqsRecordFailureHandler {
+    onError() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return true;
+        });
+    }
+}
+exports.SqsRecordFailureHandler = SqsRecordFailureHandler;

package/lib/sqs/ISqsMessageHandler.d.ts

@@ -1,6 +1,5 @@
-import { SQSBatchResponse, SQSEvent, SQSRecord } from 'aws-lambda';
+import { SQSEvent, SQSRecord } from 'aws-lambda';
 import { ISqsMessage } from './ISqsMessage';
-export declare type SqsOutput = SQSBatchResponse | void;
-export interface ISqsMessageHandler<Message extends ISqsMessage, Output extends SqsOutput = void> {
-    handle(message: Message, record: SQSRecord, event: SQSEvent): Promise<Output>;
+export interface ISqsMessageHandler<Message extends ISqsMessage> {
+    handle(message: Message, record: SQSRecord, event: SQSEvent): Promise<void>;
 }

package/lib/sqs/SqsLambda.d.ts

@@ -1,18 +1,18 @@
 import { IServiceContainer, IServiceModule, Newable } from '@aesop-fables/containr';
 import { SQSHandler } from 'aws-lambda';
-import { ISqsMessageHandler, SqsOutput } from './ISqsMessageHandler';
+import { ISqsMessageHandler } from './ISqsMessageHandler';
 import { ISqsMessage } from './ISqsMessage';
 import { ISqsRecordMatcher } from './RecordMatchers';
 export interface BootstrappedSqsLambdaContext {
-    createSqsHandler<Message extends ISqsMessage, Output extends SqsOutput = void>(newable: Newable<ISqsMessageHandler<Message, Output>>): SQSHandler;
+    createSqsHandler<Message extends ISqsMessage>(newable: Newable<ISqsMessageHandler<Message>>): SQSHandler;
 }
 export interface ISqsLambdaFactory {
-    createHandler<Message extends ISqsMessage, Output extends SqsOutput = void>(newable: Newable<ISqsMessageHandler<Message, Output>>): SQSHandler;
+    createHandler<Message extends ISqsMessage>(newable: Newable<ISqsMessageHandler<Message>>): SQSHandler;
 }
 export declare class SqsLambdaFactory implements ISqsLambdaFactory {
     private readonly container;
     constructor(container: IServiceContainer);
-    createHandler<Message extends ISqsMessage, Output extends SqsOutput = void>(newable: Newable<ISqsMessageHandler<Message, Output>>): SQSHandler;
+    createHandler<Message extends ISqsMessage>(newable: Newable<ISqsMessageHandler<Message>>): SQSHandler;
 }
 export interface TrigintaLegacySqsOptions {
     matchers?: ISqsRecordMatcher[];

package/lib/sqs/SqsLambda.js

@@ -20,25 +20,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.createBootstrappedSqsLambdaContext = exports.useTrigintaSqs = exports.SqsLambdaFactory = void 0;
 /* eslint-disable @typescript-eslint/ban-types */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const containr_1 = require("@aesop-fables/containr");
-const core_1 = __importDefault(require("@middy/core"));
 const Decorators_1 = require("../Decorators");
 const SqsLambdaServices_1 = require("./SqsLambdaServices");
 const RecordMatchers_1 = require("./RecordMatchers");
 const SqsPublisher_1 = require("./SqsPublisher");
 const MessagePublisher_1 = require("./MessagePublisher");
 const logging_1 = require("../logging");
+const AwsServices_1 = require("../AwsServices");
+const TrigintaMiddleware_1 = require("../TrigintaMiddleware");
+const ISqsFailureHandler_1 = require("./ISqsFailureHandler");
 function embedSqsEvent(event) {
     return (0, containr_1.createServiceModule)('@aesop-fables/triginta/sqs/event', (services) => {
-        services.singleton(SqsLambdaServices_1.SqsLambdaServices.CurrentEvent, event);
+        services.singleton(AwsServices_1.AwsServices.Event, event);
     });
 }
 function embedSqsRecord(record) {
@@ -48,7 +47,7 @@ function embedSqsRecord(record) {
 }
 function embedSqsContext(context) {
     return (0, containr_1.createServiceModule)('@aesop-fables/triginta/sqs/context', (services) => {
-        services.singleton(SqsLambdaServices_1.SqsLambdaServices.CurrentContext, context);
+        services.singleton(AwsServices_1.AwsServices.Context, context);
     });
 }
 let SqsLambdaFactory = class SqsLambdaFactory {
@@ -57,40 +56,56 @@ let SqsLambdaFactory = class SqsLambdaFactory {
     }
     createHandler(newable) {
         const handler = (event, context) => __awaiter(this, void 0, void 0, function* () {
+            const response = {
+                batchItemFailures: [],
+            };
             for (let i = 0; i < event.Records.length; i++) {
                 const record = event.Records[i];
-                const childContainer = this.container.createChildContainer('sqsLambda', [
-                    embedSqsEvent(event),
-                    embedSqsRecord(record),
-                    embedSqsContext(context),
-                ]);
                 try {
-                    const handler = childContainer.resolve(newable);
-                    const deserializer = childContainer.get(SqsLambdaServices_1.SqsLambdaServices.MessageDeserializer);
-                    const message = yield deserializer.deserializeMessage(record);
-                    yield handler.handle(message, record, event);
-                }
-                finally {
-                    if (childContainer) {
-                        try {
-                            childContainer.dispose();
-                        }
-                        catch (_a) {
-                            // no-op
+                    const { container } = (0, TrigintaMiddleware_1.resolveTrigintaRuntime)(context);
+                    if (!container) {
+                        throw new Error('No container found in the context');
+                    }
+                    const childContainer = container.createChildContainer('sqsLambda', [
+                        embedSqsEvent(event),
+                        embedSqsRecord(record),
+                        embedSqsContext(context),
+                    ]);
+                    try {
+                        const innerHandler = childContainer.resolve(newable);
+                        const deserializer = childContainer.get(SqsLambdaServices_1.SqsLambdaServices.MessageDeserializer);
+                        const message = yield deserializer.deserializeMessage(record);
+                        yield innerHandler.handle(message, record, event);
+                    }
+                    finally {
+                        if (childContainer) {
+                            try {
+                                childContainer.dispose();
+                            }
+                            catch (_a) {
+                                // no-op
+                            }
                         }
                     }
                 }
+                catch (e) {
+                    const failureHandler = this.container.get(SqsLambdaServices_1.SqsLambdaServices.FailureHandler);
+                    const shouldReport = yield failureHandler.onError(record, e);
+                    if (shouldReport) {
+                        response.batchItemFailures.push({
+                            itemIdentifier: record.messageId,
+                        });
+                    }
+                }
             }
+            return response;
+        });
+        const middlewareMetadata = (0, Decorators_1.getMiddleware)(newable) || [];
+        return (0, TrigintaMiddleware_1.trigintafy)(handler, middlewareMetadata, {
+            container: this.container,
+            source: 'sqs',
+            overrides: [],
         });
-        const middlewareMetadata = (0, Decorators_1.getMiddleware)(newable);
-        if (middlewareMetadata) {
-            let midHandler = (0, core_1.default)(handler);
-            middlewareMetadata.forEach((midFunc) => {
-                midHandler = midHandler.use(midFunc());
-            });
-            return midHandler;
-        }
-        return handler;
     }
 };
 SqsLambdaFactory = __decorate([
@@ -108,6 +123,7 @@ exports.useTrigintaSqs = (0, containr_1.createServiceModuleWithOptions)('trigint
     services.autoResolve(SqsLambdaServices_1.SqsLambdaServices.DefaultRecordMatcher, RecordMatchers_1.DefaultSqsRecordMatcher, containr_1.Scopes.Transient);
     services.autoResolve(SqsLambdaServices_1.SqsLambdaServices.MessageDeserializer, RecordMatchers_1.SqsMessageDeserializer, containr_1.Scopes.Transient);
     services.autoResolve(SqsLambdaServices_1.SqsLambdaServices.SqsPublisher, SqsPublisher_1.SqsPublisher, containr_1.Scopes.Transient);
+    services.autoResolve(SqsLambdaServices_1.SqsLambdaServices.FailureHandler, ISqsFailureHandler_1.SqsRecordFailureHandler, containr_1.Scopes.Transient);
     services.autoResolve(SqsLambdaServices_1.SqsLambdaServices.MessagePublisher, MessagePublisher_1.MessagePublisher, containr_1.Scopes.Transient);
     services.include(new logging_1.LoggingRegistry(logging_1.CurrentRecordLoggingLevel));
 });

package/lib/sqs/SqsLambdaServices.d.ts

@@ -1,12 +1,11 @@
 export declare const SqsLambdaServices: {
-    SqsLambdaFactory: string;
+    CurrentRecord: string;
     DefaultRecordMatcher: string;
+    FailureHandler: string;
     MessageDeserializer: string;
-    RecordMatchers: string;
     MessagePublisher: string;
+    RecordMatchers: string;
+    SqsLambdaFactory: string;
     SqsPublisher: string;
     SqsSettings: string;
-    CurrentContext: string;
-    CurrentEvent: string;
-    CurrentRecord: string;
 };

package/lib/sqs/SqsLambdaServices.js

@@ -4,14 +4,13 @@ exports.SqsLambdaServices = void 0;
 const Utils_1 = require("../Utils");
 const namedService = (0, Utils_1.createServiceNamespacer)('sqs');
 exports.SqsLambdaServices = {
-    SqsLambdaFactory: namedService('SqsLambdaFactory'),
+    CurrentRecord: namedService('SqsCurrentRecord'),
     DefaultRecordMatcher: namedService('DefaultRecordMatcher'),
+    FailureHandler: namedService('FailureHandler'),
     MessageDeserializer: namedService('MessageDeserializer'),
-    RecordMatchers: namedService('RecordMatchers'),
     MessagePublisher: namedService('MessagePublisher'),
+    RecordMatchers: namedService('RecordMatchers'),
+    SqsLambdaFactory: namedService('SqsLambdaFactory'),
     SqsPublisher: namedService('SqsPublisher'),
     SqsSettings: namedService('SqsSettings'),
-    CurrentContext: namedService('SqsCurrentContext'),
-    CurrentEvent: namedService('SqsCurrentEvent'),
-    CurrentRecord: namedService('SqsCurrentRecord'),
 };

package/lib/sqs/invokeSqsHandler.d.ts

@@ -1,4 +1,4 @@
-import { SQSEvent } from 'aws-lambda';
+import { SQSBatchResponse, SQSEvent } from 'aws-lambda';
 import { IServiceContainer } from '@aesop-fables/containr';
 export interface SqsInvocationContext extends Partial<SQSEvent> {
     handler: Function;
@@ -9,4 +9,4 @@ export interface SqsInvocationContext extends Partial<SQSEvent> {
  * @param context
  * @returns
  */
-export declare function invokeSqsHandler(context: SqsInvocationContext): Promise<void>;
+export declare function invokeSqsHandler(context: SqsInvocationContext): Promise<SQSBatchResponse>;

package/lib/sqs/invokeSqsHandler.js

@@ -50,7 +50,7 @@ function invokeSqsHandler(context) {
                 throw new Error('Function not implemented.');
             },
         };
-        const response = yield configuredHandler(event, handlerContext);
+        const response = (yield configuredHandler(event, handlerContext));
         return response;
     });
 }

package/lib/validation/ValidationMiddleware.js

@@ -11,12 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validate = void 0;
 const ValidationServices_1 = require("./ValidationServices");
+const TrigintaMiddleware_1 = require("../TrigintaMiddleware");
 function validate(rules) {
     return () => {
         return {
             before(request) {
                 return __awaiter(this, void 0, void 0, function* () {
-                    const container = request.context.container;
+                    const { container } = (0, TrigintaMiddleware_1.resolveTrigintaRuntime)(request.context);
                     const validator = container.get(ValidationServices_1.ValidationServices.ValidatorFactory).create(rules);
                     const failureHandler = container.get(ValidationServices_1.ValidationServices.ValidationFailureHandler);
                     const model = request.event.body;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aesop-fables/triginta",
-  "version": "0.8.6",
+  "version": "0.9.0",
   "description": "A lightweight framework that wraps the basic infrastructure usages of AWS Lambda (SQS, Kinesis, etc.).",
   "type": "commonjs",
   "exports": {
@@ -36,12 +36,12 @@
     "@typescript-eslint/eslint-plugin": "^5.59.11",
     "@typescript-eslint/parser": "5.59.11",
     "aws-sdk": "^2.1386.0",
-    "esbuild": "^0.17.8",
+    "esbuild": "^0.18.16",
     "eslint": "8.42.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-jest": "27.2.2",
+    "eslint-plugin-jest": "27.2.3",
     "eslint-plugin-prettier": "^4.2.1",
-    "jest": "29.5.0",
+    "jest": "29.6.1",
     "jest-mock-extended": "^3.0.1",
     "prettier": "^2.8.1",
     "reflect-metadata": "^0.1.13",

package/lib/http/IRequestContext.d.ts

@@ -1,4 +0,0 @@
-import { IServiceContainer } from '@aesop-fables/containr';
-export interface IRequestContext {
-    container: IServiceContainer;
-}