@yopdev/dev-server 1.3.18 → 1.4.0-alpha.1

package/dist/src/config.d.ts

@@ -2,7 +2,6 @@ import { Sqs } from "./sqs";
 import { Sns } from "./sns";
 import { DynamoDb } from "./dynamodb";
 import { StartedNetwork } from "testcontainers";
-import { S3 } from "./s3";
 export type Config = {
     boundServicesPort?: number;
     localStackDockerImage?: string;
@@ -21,7 +20,6 @@ export type DevServerConfig = {
     network: StartedNetwork;
     sqs: Sqs;
     sns: Sns;
-    s3: S3;
     dynamo: DynamoDb;
     eventsProxy: {
         topic: {

package/dist/src/deferred.js

@@ -95,9 +95,13 @@ var Promised = /** @class */ (function () {
                         .then(function () { return _this.service.start(config); })];
             });
         }); };
-        this.stop = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-            return [2 /*return*/, this.service.stop()];
-        }); }); };
+        this.stop = function () { return __awaiter(_this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                return [2 /*return*/, Promise.resolve(this.LOGGER.info('stopped'))
+                        .then(function () { return _this.service.stop(); })];
+            });
+        }); };
         this.name = (0, crypto_1.randomUUID)();
         this.LOGGER = logging_1.LoggerFactory.create("PROMISED[".concat(this.name, "]"));
     }

package/dist/src/dev-server.js

@@ -7,8 +7,6 @@ var sqs_1 = require("./sqs");
 var dynamodb_1 = require("./dynamodb");
 var logging_1 = require("@yopdev/logging");
 var sns_1 = require("./sns");
-var tunnel_1 = require("./tunnel");
-var s3_1 = require("./s3");
 var DevServer = /** @class */ (function () {
     function DevServer(name, service, config) {
         var _this = this;
@@ -34,7 +32,6 @@ var DevServer = /** @class */ (function () {
                 network: infra.network,
                 sqs: new sqs_1.Sqs(infra.aws),
                 sns: new sns_1.Sns(infra.aws),
-                s3: new s3_1.S3(infra.aws),
                 dynamo: new dynamodb_1.DynamoDb(infra.aws),
                 eventsProxy: {
                     topic: {
@@ -42,13 +39,12 @@ var DevServer = /** @class */ (function () {
                     }
                 },
             }); }); }); })
-                .tap(function (config) { return _this.LOGGER.debug('config is %o', config); })
+                .then(function (config) { _this.LOGGER.debug('starting. config is %o', config); return config; })
                 .then(function (aws) { return _this.service.start(aws); })
                 .then(function () { return _this.LOGGER.info('started'); })
                 .then(function () { return _this; });
         };
         this.stop = function () { return _this.service.stop()
-            .then(tunnel_1.terminate)
             .then(function () { var _a; return (_a = _this.localStack) === null || _a === void 0 ? void 0 : _a.stop(); })
             .then(function () { return _this.LOGGER.info('stopped'); }); };
         this.LOGGER = logging_1.LoggerFactory.create("DEVSERVER[".concat(name, "]"));

package/dist/src/dynamodb.js

@@ -40,7 +40,6 @@ exports.DynamoDb = exports.newDynamoDbTable = void 0;
 var client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
 var logging_1 = require("@yopdev/logging");
 var services_1 = require("./services");
-var assert_1 = require("./assert");
 var newDynamoDbTable = function (name, config, callback) { return new services_1.Service(new DynamoDbTableCreator(name, config.command), callback); };
 exports.newDynamoDbTable = newDynamoDbTable;
 var DynamoDbTableCreator = /** @class */ (function () {
@@ -52,11 +51,12 @@ var DynamoDbTableCreator = /** @class */ (function () {
             var _this = this;
             return __generator(this, function (_a) {
                 return [2 /*return*/, config.dynamo.createTable(this.command)
-                        .tap(function (output) { return _this.LOGGER.debug(output); })
+                        .then(function () { return _this.LOGGER.info('created'); })
                         .then(function () { return _this.name; })];
             });
         }); };
-        this.stop = function () { return Promise.resolve(); };
+        this.stop = function () { return Promise.resolve()
+            .then(function () { return _this.LOGGER.info('stopped'); }); };
         this.LOGGER = logging_1.LoggerFactory.create("TABLE[".concat(name, "]"));
     }
     return DynamoDbTableCreator;
@@ -69,7 +69,7 @@ var DynamoDb = /** @class */ (function () {
             return __generator(this, function (_a) {
                 return [2 /*return*/, this.client
                         .send(factory) //
-                        .tap(function (table) { return LOGGER.debug('created %s', (0, assert_1.assertNotUndefined)(table.TableDescription).TableName); })
+                        .then(function (table) { var _a; LOGGER.info('table created %s', (_a = table.TableDescription) === null || _a === void 0 ? void 0 : _a.TableName); return table; })
                         .catch(function (reason) {
                         LOGGER.error('failed to create table');
                         if (reason.name !== 'ResourceInUseException')
@@ -78,6 +78,7 @@ var DynamoDb = /** @class */ (function () {
             });
         }); };
         this.client = new client_dynamodb_1.DynamoDBClient(config);
+        LOGGER.debug('initialized');
     }
     return DynamoDb;
 }());

package/dist/src/event-proxy.d.ts

@@ -1,13 +1,10 @@
-import { SNSMessageAttributes, SQSEvent, SQSRecord } from 'aws-lambda';
-import { Message } from '@aws-sdk/client-sqs';
+import { SQSEvent } from 'aws-lambda';
 import { Service } from './services';
 export declare const newEventsProxy: (name: string, config: {
     handlers: EventHandler[];
     topic?: string;
-    mapper?: (message: Message) => SQSRecord;
-}) => Service<void>;
+}) => Service<any>;
 export type EventHandler = {
-    name: string;
     handler: (event: SQSEvent) => Promise<unknown>;
-    matcher: (subject: string, attributes: SNSMessageAttributes) => boolean;
+    matcher: (subject: string) => boolean;
 };

package/dist/src/event-proxy.js

@@ -43,14 +43,13 @@ var logging_1 = require("@yopdev/logging");
 var stoppable_1 = require("./stoppable");
 var assert_1 = require("./assert");
 var services_1 = require("./services");
-var newEventsProxy = function (name, config) { var _a; return new services_1.Service(new EventsProxy(name, config.handlers, (_a = config.mapper) !== null && _a !== void 0 ? _a : mappers_1.mapToLambdaSqsRecord, config.topic)); };
+var newEventsProxy = function (name, config) { return new services_1.Service(new EventsProxy(name, config.handlers, config.topic)); };
 exports.newEventsProxy = newEventsProxy;
 var EventsProxy = /** @class */ (function () {
-    function EventsProxy(name, handlers, mapper, topic) {
+    function EventsProxy(name, handlers, topic) {
         var _this = this;
         this.name = name;
         this.handlers = handlers;
-        this.mapper = mapper;
         this.topic = topic;
         this.pollingFrequency = 1;
         this.stopped = true;
@@ -61,13 +60,13 @@ var EventsProxy = /** @class */ (function () {
             return __generator(this, function (_b) {
                 return [2 /*return*/, this.queueConnectedToTopic(config.sns, (_a = this.topic) !== null && _a !== void 0 ? _a : config.eventsProxy.topic.arn, config.sqs, this.queueName())
                         .then(function (url) { return _this.startEventsConsumer(config.sqs.client, url); })
-                        .tap(function () { return _this.stopped = false; })
-                        .then(function (consumer) { return _this.LOGGER.debug(consumer); })];
+                        .then(function () { return _this.stopped = false; })
+                        .then(function () { return undefined; })];
             });
         }); };
         this.queueConnectedToTopic = function (sns, topic, sqs, queue) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, sqs.createStandardQueue(queue)
+                return [2 /*return*/, sqs.createNamedQueue(queue)
                         .then(function (queue) { return sns
                         .createSubscription({ arn: topic }, { arn: queue.arn })
                         .then(function () { return queue.url; }); })];
@@ -90,36 +89,41 @@ var EventsProxy = /** @class */ (function () {
         }); };
         this.extractErrorMessage = function (e) { return typeof e === 'string' ? e : e.message !== undefined && typeof e.message === 'string' ? e.message : ''; };
         this.onEachMessage = function (message) {
+            var body = (0, assert_1.assertNotUndefined)(message.Body, 'body is not present');
+            var subject = JSON.parse(body).Subject;
             if (_this.stopped) {
-                _this.LOGGER.warn('stopped events proxy received message %o', message);
+                _this.LOGGER.warn('stopped events proxy received message with subject %s', subject);
                 return;
             }
-            var body = (0, assert_1.assertNotUndefined)(message.Body, 'body is not present');
-            var json = JSON.parse(body);
-            var attributes = json.MessageAttributes;
-            var subject = json.Subject;
-            var handlers = _this.handlers.filter(function (handler) { return handler.matcher(subject, attributes); });
+            var handlers = _this.handlers.filter(function (handler) { return handler.matcher(subject); });
             if (handlers.length === 0) {
-                _this.LOGGER.warn('no handlers found for message %o', message);
+                _this.LOGGER.warn('no handlers found for subject %s, message %o', subject, message);
             }
-            var record = _this.mapper(message);
             handlers.forEach(function (handler) {
-                return handler
+                var record = (0, mappers_1.mapToLambdaSqsRecord)(message);
+                handler
                     .handler({ Records: [record] })
                     .then(function () {
-                    _this.LOGGER.debug('handler %s accepted message', handler.name);
+                    var _a;
+                    var json = JSON.parse(record.body);
+                    var subject = json.Subject || ((_a = json.Message) === null || _a === void 0 ? void 0 : _a.eventname) || 'unknown';
+                    _this.LOGGER.debug('subject accepted %s', subject);
                 })
                     .catch(function (e) {
                     var error = _this.extractErrorMessage(e);
-                    _this.LOGGER.error(e, 'handler %s failed with %s', handler.name, error);
+                    _this.LOGGER.error(e, 'failed %s with %s', subject, error);
                 });
             });
         };
-        this.stop = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-            return [2 /*return*/, (0, stoppable_1.stopConsumer)(this.pollingFrequency, this.consumer)];
-        }); }); };
+        this.stop = function () { return __awaiter(_this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                return [2 /*return*/, Promise.resolve(this.consumer)
+                        .then(function (consumer) { return consumer !== undefined ? (0, stoppable_1.stopConsumer)(consumer, _this.pollingFrequency).then(function () { return 'stopped'; }) : 'not started'; })
+                        .then(function (status) { return _this.LOGGER.info(status); })];
+            });
+        }); };
         this.LOGGER = logging_1.LoggerFactory.create("SNS->SQS[".concat(name, "]"));
-        this.LOGGER.debug('handling events from %s', topic !== null && topic !== void 0 ? topic : 'the event bus');
     }
     return EventsProxy;
 }());

package/dist/src/http-server.d.ts

@@ -16,7 +16,7 @@ export declare class HttpServer implements Lifecycle<string> {
     constructor(name: string, settings: HttpSettings, handler: (request: IncomingMessage, requestBody: string, response: ServerResponse) => void);
     start: () => Promise<string>;
     private endpointUrl;
-    stop: () => Promise<any>;
+    stop: () => Promise<void>;
 }
 export type HttpSettings = {
     protocol: string;

package/dist/src/http-server.js

@@ -15,13 +15,14 @@ var HttpServer = /** @class */ (function () {
         this.settings = settings;
         this.handler = handler;
         this.start = function () { return _this.server
-            .then(function () { return _this.LOGGER.debug('listening [%s]', (0, assert_1.assertNotUndefined)(_this.address).port); })
+            .then(function () { return _this.LOGGER.info('listening on %s', (0, assert_1.assertNotUndefined)(_this.address).port); })
             .then(function () { return _this.endpointUrl(); }); };
         this.endpointUrl = function () {
             var address = (0, assert_1.assertNotUndefined)(_this.address, 'server not started');
             return "".concat(_this.protocol, "//").concat(address.address, ":").concat(address.port, "/");
         };
-        this.stop = function () { return _this.server.then(function (server) { return server.close(); }).then(function () { return undefined; }); };
+        this.stop = function () { return _this.server.then(function (server) { return server.close(); })
+            .then(function () { return _this.LOGGER.info('stop %s', (0, assert_1.assertNotUndefined)(_this.address).port); }); };
         var server = (0, http_1.createServer)(function (req, res) {
             req.setEncoding('utf-8');
             var body = '';

package/dist/src/index.d.ts

@@ -1,22 +1,11 @@
 export { DevServer } from './dev-server';
 export { newHttpServer as httpServer } from './http-server';
-export { newLambdaHttpProxy as lambdaHttpProxy, UNAUTHORIZED } from './lambda-http-proxy';
+export { newLambdaHttpProxy as lambdaHttpProxy } from './lambda-http-proxy';
 export { newSnsHttpProxy as snsHttpProxy } from './sns-http-proxy';
 export { newInternalQueue as internalQueue } from './internal-queue';
 export { newEventsProxy as eventsProxy } from './event-proxy';
 export { newScheduledTasks as scheduledTasks } from './scheduled-tasks';
 export { newPreTrafficHooks as preTrafficHooks } from './pre-traffic-hooks';
 export { newDynamoDbTable as dynamoDbTable } from './dynamodb';
-export { newContainer as container } from './container';
-export { newTunnel as tunnel } from './tunnel';
 export { all as allOf, oneThenOther } from './factories';
 export { lazy, promised } from './deferred';
-export { Lifecycle, Service } from './services';
-export { DevServerConfig } from './config';
-export { Route } from './lambda-http-proxy';
-export { mapToLambdaEvent as defaultApiGatewayLambdaMapper, mapToLambdaSqsRecord as defaultSqsLambdaMapper } from './mappers';
-declare global {
-    interface Promise<T> {
-        tap(onfulfilled?: (value: T) => void, onrejected?: (reason: unknown) => void): Promise<T>;
-    }
-}

package/dist/src/index.js

@@ -1,49 +1,12 @@
 "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 __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultSqsLambdaMapper = exports.defaultApiGatewayLambdaMapper = exports.Service = exports.promised = exports.lazy = exports.oneThenOther = exports.allOf = exports.tunnel = exports.container = exports.dynamoDbTable = exports.preTrafficHooks = exports.scheduledTasks = exports.eventsProxy = exports.internalQueue = exports.snsHttpProxy = exports.UNAUTHORIZED = exports.lambdaHttpProxy = exports.httpServer = exports.DevServer = void 0;
+exports.promised = exports.lazy = exports.oneThenOther = exports.allOf = exports.dynamoDbTable = exports.preTrafficHooks = exports.scheduledTasks = exports.eventsProxy = exports.internalQueue = exports.snsHttpProxy = exports.lambdaHttpProxy = exports.httpServer = exports.DevServer = void 0;
 var dev_server_1 = require("./dev-server");
 Object.defineProperty(exports, "DevServer", { enumerable: true, get: function () { return dev_server_1.DevServer; } });
 var http_server_1 = require("./http-server");
 Object.defineProperty(exports, "httpServer", { enumerable: true, get: function () { return http_server_1.newHttpServer; } });
 var lambda_http_proxy_1 = require("./lambda-http-proxy");
 Object.defineProperty(exports, "lambdaHttpProxy", { enumerable: true, get: function () { return lambda_http_proxy_1.newLambdaHttpProxy; } });
-Object.defineProperty(exports, "UNAUTHORIZED", { enumerable: true, get: function () { return lambda_http_proxy_1.UNAUTHORIZED; } });
 var sns_http_proxy_1 = require("./sns-http-proxy");
 Object.defineProperty(exports, "snsHttpProxy", { enumerable: true, get: function () { return sns_http_proxy_1.newSnsHttpProxy; } });
 var internal_queue_1 = require("./internal-queue");
@@ -56,28 +19,9 @@ var pre_traffic_hooks_1 = require("./pre-traffic-hooks");
 Object.defineProperty(exports, "preTrafficHooks", { enumerable: true, get: function () { return pre_traffic_hooks_1.newPreTrafficHooks; } });
 var dynamodb_1 = require("./dynamodb");
 Object.defineProperty(exports, "dynamoDbTable", { enumerable: true, get: function () { return dynamodb_1.newDynamoDbTable; } });
-var container_1 = require("./container");
-Object.defineProperty(exports, "container", { enumerable: true, get: function () { return container_1.newContainer; } });
-var tunnel_1 = require("./tunnel");
-Object.defineProperty(exports, "tunnel", { enumerable: true, get: function () { return tunnel_1.newTunnel; } });
 var factories_1 = require("./factories");
 Object.defineProperty(exports, "allOf", { enumerable: true, get: function () { return factories_1.all; } });
 Object.defineProperty(exports, "oneThenOther", { enumerable: true, get: function () { return factories_1.oneThenOther; } });
 var deferred_1 = require("./deferred");
 Object.defineProperty(exports, "lazy", { enumerable: true, get: function () { return deferred_1.lazy; } });
 Object.defineProperty(exports, "promised", { enumerable: true, get: function () { return deferred_1.promised; } });
-var services_1 = require("./services");
-Object.defineProperty(exports, "Service", { enumerable: true, get: function () { return services_1.Service; } });
-var mappers_1 = require("./mappers");
-Object.defineProperty(exports, "defaultApiGatewayLambdaMapper", { enumerable: true, get: function () { return mappers_1.mapToLambdaEvent; } });
-Object.defineProperty(exports, "defaultSqsLambdaMapper", { enumerable: true, get: function () { return mappers_1.mapToLambdaSqsRecord; } });
-Promise.prototype.tap = function (onfulfilled, onrejected) {
-    return __awaiter(this, void 0, void 0, function () {
-        var _this = this;
-        return __generator(this, function (_a) {
-            return [2 /*return*/, this.then(onfulfilled, onrejected).then(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                    return [2 /*return*/, this];
-                }); }); })];
-        });
-    });
-};

package/dist/src/internal-queue.d.ts

@@ -1,11 +1,8 @@
 import { Queue } from "./sqs";
-import { SQSEvent, SQSRecord } from "aws-lambda";
+import { SQSEvent } from "aws-lambda";
 import { Service, Callback } from "./services";
-import { Message } from "@aws-sdk/client-sqs";
 export declare const newInternalQueue: (name: string, config: {
     index: number;
     visibility: number;
     handler: (queue: Queue) => (e: SQSEvent) => Promise<void>;
-    fifo: boolean;
-    mapper?: (message: Message) => SQSRecord;
 }, callback?: Callback<string>) => Service<string>;

package/dist/src/internal-queue.js

@@ -42,19 +42,14 @@ var sqs_consumer_1 = require("sqs-consumer");
 var stoppable_1 = require("./stoppable");
 var mappers_1 = require("./mappers");
 var services_1 = require("./services");
-var newInternalQueue = function (name, config, callback) {
-    var _a;
-    return new services_1.Service(new InternalQueue(name, config.visibility, config.handler, config.index, function (sqs) { return config.fifo ? sqs.createFifoQueue : sqs.createStandardQueue; }, (_a = config.mapper) !== null && _a !== void 0 ? _a : mappers_1.mapToLambdaSqsRecord), callback);
-};
+var newInternalQueue = function (name, config, callback) { return new services_1.Service(new InternalQueue(name, config.visibility, config.handler, config.index), callback); };
 exports.newInternalQueue = newInternalQueue;
 var InternalQueue = /** @class */ (function () {
-    function InternalQueue(name, visibility, handler, index, creator, mapper) {
+    function InternalQueue(name, visibility, handler, index) {
         var _this = this;
         this.name = name;
         this.visibility = visibility;
         this.handler = handler;
-        this.creator = creator;
-        this.mapper = mapper;
         this.start = function (config) { return _this.create(config.sqs); };
         this.create = function (sqs) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
@@ -73,7 +68,7 @@ var InternalQueue = /** @class */ (function () {
                         waitTimeSeconds: visibility,
                         sqs: sqs,
                         handleMessage: function (message) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                            return [2 /*return*/, handler({ Records: [this.mapper(message)] })];
+                            return [2 /*return*/, handler({ Records: [(0, mappers_1.mapToLambdaSqsRecord)(message)] })];
                         }); }); },
                     }))
                         .then(function (consumer) {
@@ -94,7 +89,9 @@ var InternalQueue = /** @class */ (function () {
                         .then(function () { return _this; })];
             });
         }); };
-        this.stop = function () { return (0, stoppable_1.stopConsumer)(_this.state.visibility, _this.state.consumer); };
+        this.stop = function () { return Promise.resolve(_this.state)
+            .then(function (state) { return state !== undefined ? (0, stoppable_1.stopConsumer)(state.consumer, state.visibility).then(function () { return 'stopped'; }) : 'not started'; })
+            .then(function (status) { return _this.LOGGER.info(status); }); };
         this.queueName = (index + 1000).toString().padStart(10, '0');
         this.LOGGER = logging_1.LoggerFactory.create("INTERNALQUEUE[".concat(name, "]"));
     }
@@ -102,7 +99,8 @@ var InternalQueue = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.creator(sqs)(name) //
+                return [2 /*return*/, sqs
+                        .createNamedQueue(name) //
                         .then(function (queue) {
                         _this.LOGGER.info('created: %s', queue.url);
                         return queue;

package/dist/src/lambda-http-proxy.d.ts

@@ -1,20 +1,13 @@
 import { HttpSettings } from "./http-server";
-import { APIGatewayEventDefaultAuthorizerContext, APIGatewayProxyEvent, APIGatewayProxyResult } from "aws-lambda";
-import { IncomingMessage } from "http";
+import { APIGatewayProxyEvent, APIGatewayProxyResult } from "aws-lambda";
 import { Service, Callback } from "./services";
-export declare const UNAUTHORIZED: Error;
 export declare const newLambdaHttpProxy: (name: string, config: {
     settings: HttpSettings;
     routes: Route[];
-    mapper?: (request: IncomingMessage, body: string) => Promise<APIGatewayProxyEvent>;
-    authorizer?: Authorizer;
 }, callback?: Callback<string>) => Service<string>;
-export type Route = {
+type Route = {
     method: RegExp;
     path: RegExp;
-    weight: number;
-    authorizer?: Authorizer;
     handler: (event: APIGatewayProxyEvent) => Promise<APIGatewayProxyResult>;
 };
-type Authorizer = (authorization: string) => Promise<APIGatewayEventDefaultAuthorizerContext | undefined>;
 export {};

package/dist/src/lambda-http-proxy.js

@@ -36,51 +36,33 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.newLambdaHttpProxy = exports.UNAUTHORIZED = void 0;
+exports.newLambdaHttpProxy = void 0;
 var logging_1 = require("@yopdev/logging");
 var http_server_1 = require("./http-server");
 var mappers_1 = require("./mappers");
 var responses_1 = require("./responses");
 var services_1 = require("./services");
-exports.UNAUTHORIZED = new Error('UNAUTHORIZED');
-var newLambdaHttpProxy = function (name, config, callback) {
-    var _a, _b;
-    return new services_1.Service(new LambdaHttpProxy(name, config.settings, config.routes, (_a = config.mapper) !== null && _a !== void 0 ? _a : mappers_1.mapToLambdaEvent, (_b = config.authorizer) !== null && _b !== void 0 ? _b : (function () { return Promise.resolve(undefined); })), callback);
-};
+var newLambdaHttpProxy = function (name, config, callback) { return new services_1.Service(new LambdaHttpProxy(name, config.settings, config.routes), callback); };
 exports.newLambdaHttpProxy = newLambdaHttpProxy;
 var LambdaHttpProxy = /** @class */ (function () {
-    function LambdaHttpProxy(name, settings, routes, mapper, defaultAuthorizer) {
+    function LambdaHttpProxy(name, settings, routes) {
         var _this = this;
         this.name = name;
         this.routes = routes;
-        this.mapper = mapper;
-        this.defaultAuthorizer = defaultAuthorizer;
         this.start = function () { return _this.server.start(); };
-        this.stop = function () { return _this.server.stop(); };
-        this.handler = function (authorizer, lambdaHandler) {
+        this.stop = function () { return _this.server.stop()
+            .then(function () { return _this.LOGGER.info('stopped'); }); };
+        this.handler = function (lambdaHandler) {
             return function (request, body, response) {
-                return _this.mapper(request, body)
-                    .then(function (proxyEvent) { return __awaiter(_this, void 0, void 0, function () {
-                    var _this = this;
-                    return __generator(this, function (_a) {
-                        return [2 /*return*/, authorizer(proxyEvent.headers['authorization'])
-                                .then(function (context) { return __awaiter(_this, void 0, void 0, function () {
-                                var _this = this;
-                                return __generator(this, function (_a) {
-                                    proxyEvent.requestContext.authorizer = context;
-                                    return [2 /*return*/, lambdaHandler(proxyEvent)
-                                            .then(function (lambda) {
-                                            var _a, _b, _c, _d, _e, _f;
-                                            return (0, responses_1.writeResponse)(response, lambda.statusCode, lambda.body, (_c = (_b = (_a = lambda.headers) === null || _a === void 0 ? void 0 : _a['Content-Type']) === null || _b === void 0 ? void 0 : _b.toString()) !== null && _c !== void 0 ? _c : undefined, (_f = (_e = (_d = lambda.headers) === null || _d === void 0 ? void 0 : _d['Location']) === null || _e === void 0 ? void 0 : _e.toString()) !== null && _f !== void 0 ? _f : undefined);
-                                        })
-                                            .catch(function (e) {
-                                            _this.LOGGER.error(e, 'request failed to execute');
-                                            (0, responses_1.internalServerError)(response, e.body);
-                                        })];
-                                });
-                            }); }, function (e) { return e === exports.UNAUTHORIZED ? (0, responses_1.writeResponse)(response, 401, '') : (0, responses_1.internalServerError)(response, e); })];
-                    });
-                }); });
+                return lambdaHandler((0, mappers_1.mapToLambdaEvent)(request, body))
+                    .then(function (lambda) {
+                    var _a, _b, _c, _d, _e, _f;
+                    return (0, responses_1.writeResponse)(response, lambda.statusCode, lambda.body, (_c = (_b = (_a = lambda.headers) === null || _a === void 0 ? void 0 : _a['Content-Type']) === null || _b === void 0 ? void 0 : _b.toString()) !== null && _c !== void 0 ? _c : undefined, (_f = (_e = (_d = lambda.headers) === null || _d === void 0 ? void 0 : _d['Location']) === null || _e === void 0 ? void 0 : _e.toString()) !== null && _f !== void 0 ? _f : undefined);
+                })
+                    .catch(function (e) {
+                    _this.LOGGER.error(e, 'request failed to execute');
+                    (0, responses_1.internalServerError)(response, e.body);
+                });
             };
         };
         this.fallback = function (request, _, response) { return __awaiter(_this, void 0, void 0, function () {
@@ -94,13 +76,12 @@ var LambdaHttpProxy = /** @class */ (function () {
             var _a;
             return ((_a = _this.routes.filter(function (r) { return request.method.match(r.method); })
                 .filter(function (r) { return request.url.match(r.path); })
-                .sort(function (r1, r2) { return r2.weight - r1.weight; })
-                .map(function (r) { var _a; return _this.handler((_a = r.authorizer) !== null && _a !== void 0 ? _a : _this.defaultAuthorizer, r.handler); })
+                .sort(function (r1, r2) { return r2.path.source.length - r1.path.source.length; })
+                .map(function (r) { return _this.handler(r.handler); })
                 .find(function () { return true; })) !== null && _a !== void 0 ? _a : _this.fallback)(request, body, response);
         };
         this.server = new http_server_1.HttpServer(name, settings, this.resolveRoute);
         this.LOGGER = logging_1.LoggerFactory.create("HTTP->LAMBDA[".concat(this.name, "]"));
-        this.LOGGER.info('registered %i routes', routes.length);
     }
     return LambdaHttpProxy;
 }());

package/dist/src/localstack.js

@@ -57,13 +57,12 @@ var LocalStack = /** @class */ (function () {
                             accessKeyId: 'dummy',
                             secretAccessKey: 'dummy'
                         }
-                    }); })
-                        .tap(function () { return LOGGER.debug('started'); })];
+                    }); })];
             });
         }); };
         this.stop = function () { return Promise.resolve(_this.started)
             .then(function (container) { return container ? container.stop().then(function () { return 'stopped'; }) : 'not started'; })
-            .then(function (status) { return LOGGER.debug(status); }); };
+            .then(function (status) { return LOGGER.info(status); }); };
         var concreteConfig = this.configOrDefaults(config);
         var container = new testcontainers_1.GenericContainer(concreteConfig.localStackDockerImage);
         var localStatePath = concreteConfig.localStateBindMount;
@@ -84,6 +83,7 @@ var LocalStack = /** @class */ (function () {
             .start()
             .then(function (container) { return _this.started = container; })
             .then(function (container) { return "".concat(PROTOCOL, "://").concat(container.getHost(), ":").concat(container.getMappedPort(SERVICES_PORT)); }); };
+        LOGGER.debug('initialized');
     }
     LocalStack.prototype.configOrDefaults = function (config) {
         var selectedServicesPort = config === null || config === void 0 ? void 0 : config.boundServicesPort;

package/dist/src/mappers.d.ts

@@ -3,4 +3,4 @@ import { Message } from "@aws-sdk/client-sqs";
 import { APIGatewayProxyEvent, SQSRecord } from "aws-lambda";
 import { IncomingMessage } from "http";
 export declare const mapToLambdaSqsRecord: (message: Message) => SQSRecord;
-export declare function mapToLambdaEvent(req: IncomingMessage, requestBody: string): Promise<APIGatewayProxyEvent>;
+export declare function mapToLambdaEvent(req: IncomingMessage, requestBody: string): APIGatewayProxyEvent;

package/dist/src/mappers.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapToLambdaEvent = exports.mapToLambdaSqsRecord = void 0;
+var logging_1 = require("@yopdev/logging");
 var url_1 = require("url");
+var LOGGER = logging_1.LoggerFactory.create('MAPPERS');
 var mapToLambdaSqsRecord = function (message) {
     if (!message.Body)
-        throw new Error('message Body must be present');
+        throw new Error("message Body must be present: ".concat(message.Body));
     return {
         messageId: 'N/A',
         receiptHandle: 'N/A',
@@ -26,17 +28,16 @@ exports.mapToLambdaSqsRecord = mapToLambdaSqsRecord;
 function mapToLambdaEvent(req, requestBody) {
     if (!req.url || !req.method)
         throw new Error('url and method are required');
-    var url = new url_1.URL(req.url, "http://".concat(req.headers.host));
+    var url = new url_1.URL(decodeURIComponent(req.url), "http://".concat(req.headers.host));
     var qsp = {};
-    url.searchParams.forEach(function (v, k) { return (qsp[k] = decodeURIComponent(v)); });
+    url.searchParams.forEach(function (v, k) { return (qsp[k] = v); });
+    var claims = extractClaims(req);
     var headers = {};
     if (req.headers['content-type'])
-        headers['content-type'] = req.headers['content-type'];
+        headers['Content-Type'] = req.headers['content-type'];
     if (req.headers['accept'])
-        headers['accept'] = req.headers['accept'];
-    if (req.headers['authorization'])
-        headers['authorization'] = req.headers['authorization'];
-    return Promise.resolve({
+        headers['Accept'] = req.headers['accept'];
+    return {
         httpMethod: req.method,
         body: requestBody,
         headers: headers,
@@ -51,7 +52,7 @@ function mapToLambdaEvent(req, requestBody) {
         requestContext: {
             accountId: '',
             apiId: '',
-            authorizer: undefined,
+            authorizer: { claims: claims },
             httpMethod: '',
             identity: {
                 accessKey: '',
@@ -84,6 +85,17 @@ function mapToLambdaEvent(req, requestBody) {
             resourcePath: '',
             stage: '',
         },
-    });
+    };
 }
 exports.mapToLambdaEvent = mapToLambdaEvent;
+function extractClaims(req) {
+    var _a;
+    var jwt = (_a = req.headers['authorization']) === null || _a === void 0 ? void 0 : _a.replace('Bearer ', '');
+    try {
+        return jwt ? JSON.parse(atob(jwt.split('.')[1])) : null;
+    }
+    catch (e) {
+        LOGGER.warn('Invalid token, claims could not be extracted: %O', jwt);
+        return undefined;
+    }
+}

package/dist/src/pre-traffic-hooks.d.ts

@@ -1,2 +1,11 @@
-import { Service } from './services';
-export declare const newPreTrafficHooks: (name: string, hooks: () => Promise<void>[]) => Service<any>;
+import { Lifecycle, Service, Callback } from './services';
+export declare const newPreTrafficHooks: (name: string, hooks: () => Promise<void>[], callback?: Callback<PreTrafficHooks>) => Service<PreTrafficHooks>;
+declare class PreTrafficHooks implements Lifecycle<PreTrafficHooks> {
+    readonly name: string;
+    private readonly hooks;
+    private LOGGER;
+    constructor(name: string, hooks: () => Promise<void>[]);
+    start: () => Promise<this>;
+    stop: () => Promise<void>;
+}
+export {};

package/dist/src/pre-traffic-hooks.js

@@ -39,7 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.newPreTrafficHooks = void 0;
 var logging_1 = require("@yopdev/logging");
 var services_1 = require("./services");
-var newPreTrafficHooks = function (name, hooks) { return new services_1.Service(new PreTrafficHooks(name, hooks)); };
+var newPreTrafficHooks = function (name, hooks, callback) { return new services_1.Service(new PreTrafficHooks(name, hooks), callback); };
 exports.newPreTrafficHooks = newPreTrafficHooks;
 var PreTrafficHooks = /** @class */ (function () {
     function PreTrafficHooks(name, hooks) {
@@ -47,17 +47,22 @@ var PreTrafficHooks = /** @class */ (function () {
         this.name = name;
         this.hooks = hooks;
         this.start = function () { return __awaiter(_this, void 0, void 0, function () {
+            var _this = this;
             return __generator(this, function (_a) {
                 return [2 /*return*/, Promise
                         .all(this.hooks())
-                        .then(function () { return undefined; })];
+                        .then(function () { return _this.LOGGER.info('started'); })
+                        .then(function () { return _this; })];
+            });
+        }); };
+        this.stop = function () { return __awaiter(_this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                return [2 /*return*/, Promise.resolve()
+                        .then(function () { return _this.LOGGER.info('stopped'); })];
             });
         }); };
-        this.stop = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-            return [2 /*return*/, Promise.resolve()];
-        }); }); };
         this.LOGGER = logging_1.LoggerFactory.create("PRETRAFFIC[".concat(name, "]"));
-        this.LOGGER.info('%i hooks registered', hooks.length);
     }
     return PreTrafficHooks;
 }());

package/dist/src/responses.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="node" />
 import { ServerResponse } from 'http';
-export declare function internalServerError(res: ServerResponse, body: any): void;
+export declare function internalServerError(res: ServerResponse, body: string): void;
 export declare function writeResponse(res: ServerResponse, statusCode: number, body: string, contentType?: string, location?: string): void;

package/dist/src/responses.js

@@ -1,11 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeResponse = exports.internalServerError = void 0;
-var logging_1 = require("@yopdev/logging");
-var LOG = logging_1.LoggerFactory.create('RESPONSES');
 function internalServerError(res, body) {
-    LOG.error(body, 'internal server error handled');
-    return writeResponse(res, 500, 'internal server error. check system logs');
+    return writeResponse(res, 500, body);
 }
 exports.internalServerError = internalServerError;
 function writeResponse(res, statusCode, body, contentType, location) {

package/dist/src/scheduled-tasks.d.ts

@@ -1,6 +1,17 @@
-import { Service } from './services';
-export declare const newScheduledTasks: (name: string, schedules: Rate[]) => Service<any>;
+/// <reference types="node" />
+import { Lifecycle, Service, Callback } from './services';
+export declare const newScheduledTasks: (name: string, schedules: Rate[], callback?: Callback<ScheduledTasks>) => Service<ScheduledTasks>;
+declare class ScheduledTasks implements Lifecycle<ScheduledTasks> {
+    readonly name: string;
+    private readonly schedules;
+    private LOGGER;
+    constructor(name: string, schedules: Rate[]);
+    intervals: NodeJS.Timeout[];
+    start: () => Promise<this>;
+    stop: () => Promise<void>;
+}
 export type Rate = {
     frequency: number;
     task: () => Promise<unknown>;
 };
+export {};

package/dist/src/scheduled-tasks.js

@@ -40,7 +40,7 @@ exports.newScheduledTasks = void 0;
 var logging_1 = require("@yopdev/logging");
 var timers_1 = require("timers");
 var services_1 = require("./services");
-var newScheduledTasks = function (name, schedules) { return new services_1.Service(new ScheduledTasks(name, schedules)); };
+var newScheduledTasks = function (name, schedules, callback) { return new services_1.Service(new ScheduledTasks(name, schedules), callback); };
 exports.newScheduledTasks = newScheduledTasks;
 var ScheduledTasks = /** @class */ (function () {
     function ScheduledTasks(name, schedules) {
@@ -52,14 +52,18 @@ var ScheduledTasks = /** @class */ (function () {
             var _this = this;
             return __generator(this, function (_a) {
                 return [2 /*return*/, Promise.resolve(this.schedules.forEach(function (schedule) { return _this.intervals.push(setInterval(schedule.task, schedule.frequency * 1000)); }))
-                        .then(function () { return undefined; })];
+                        .then(function () { return _this.LOGGER.info('started'); })
+                        .then(function () { return _this; })];
+            });
+        }); };
+        this.stop = function () { return __awaiter(_this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                return [2 /*return*/, Promise.resolve(this.intervals.forEach(function (interval) { return (0, timers_1.clearInterval)(interval); }))
+                        .then(function () { return _this.LOGGER.info('stopped'); })];
             });
         }); };
-        this.stop = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-            return [2 /*return*/, Promise.resolve(this.intervals.forEach(function (interval) { return (0, timers_1.clearInterval)(interval); }))];
-        }); }); };
         this.LOGGER = logging_1.LoggerFactory.create("SCHEDULER[".concat(name, "]"));
-        this.LOGGER.info('registered %i scheduled tasks', schedules.length);
     }
     return ScheduledTasks;
 }());

package/dist/src/sns-http-proxy.js

@@ -29,16 +29,17 @@ var SnsHttpProxy = /** @class */ (function () {
         this.topic = topic;
         this.start = function (config) { return Promise.resolve(_this.server)
             .then(function (server) { return server.start(); })
-            .tap(function () {
+            .then(function (endpoint) {
             var _a;
             _this.config = {
                 topic: (_a = _this.topic) !== null && _a !== void 0 ? _a : config.eventsProxy.topic.arn,
                 sns: config.sns
             };
+            return endpoint;
         })
             .then(function (endpoint) { return endpoint; }); };
         this.stop = function () { return _this.onlyWhenStarted(_this.server).stop()
-            .then(function () { return _this.LOGGER.debug('stopped'); }); };
+            .then(function () { return _this.LOGGER.info('stopped'); }); };
         this.handler = function (method, subject) {
             return function (request, body, response) {
                 return Promise.resolve(((0, assert_1.assertNotUndefined)(_this.config)))
@@ -77,7 +78,6 @@ var SnsHttpProxy = /** @class */ (function () {
         };
         this.server = new http_server_1.HttpServer(this.name, this.settings, this.handler(this.method, this.subject));
         this.LOGGER = logging_1.LoggerFactory.create("HTTP->SNS[".concat(name, "]"));
-        this.LOGGER.info('forwarding %s %s events to %s', subject ? "events with ".concat(subject, " subject") : 'all', method, topic !== null && topic !== void 0 ? topic : 'the event bus');
     }
     return SnsHttpProxy;
 }());

package/dist/src/sns.js

@@ -50,8 +50,7 @@ var Sns = /** @class */ (function () {
                         .send(new client_sns_1.CreateTopicCommand({
                         Name: topic,
                     }))
-                        .then(function (o) { return (0, assert_1.assertNotUndefined)(o.TopicArn, 'TopicArn is not present'); })
-                        .tap(function (arn) { return LOGGER.debug('topic %o created', arn); })];
+                        .then(function (o) { return (0, assert_1.assertNotUndefined)(o.TopicArn, 'TopicArn is not present'); })];
             });
         }); };
         this.createSubscription = function (topic, queue) { return __awaiter(_this, void 0, void 0, function () {
@@ -62,7 +61,7 @@ var Sns = /** @class */ (function () {
                         Protocol: 'sqs',
                         Endpoint: queue.arn,
                     }))
-                        .then(function () { return LOGGER.debug('subscription %s->%s created', topic.arn, queue.arn); })];
+                        .then(function () { return LOGGER.debug('connected %s to %s', topic.arn, queue.arn); })];
             });
         }); };
         this.publish = function (topic, body, subject, attributes) { return __awaiter(_this, void 0, void 0, function () {
@@ -74,11 +73,12 @@ var Sns = /** @class */ (function () {
                         MessageAttributes: attributes,
                         Subject: subject,
                     }))
-                        .then(function () { return LOGGER.trace('published %s[%s]', topic.arn, subject); })
+                        .then(function () { return LOGGER.debug('published with subject %s to %s', subject, topic.arn); })
                         .then()];
             });
         }); };
         this.client = new client_sns_1.SNSClient(aws);
+        LOGGER.debug('initialized');
     }
     return Sns;
 }());

package/dist/src/sqs.d.ts

@@ -3,9 +3,7 @@ import { AwsConfig } from "./config";
 export declare class Sqs {
     readonly client: SQSClient;
     constructor(config: AwsConfig);
-    createStandardQueue: (name: string) => Promise<Queue>;
-    createFifoQueue: (name: string) => Promise<Queue>;
-    private createNamedQueue;
+    createNamedQueue: (name: string) => Promise<Queue>;
 }
 export type Queue = {
     arn: string;

package/dist/src/sqs.js

@@ -45,21 +45,12 @@ var LOGGER = logging_1.LoggerFactory.create('SQS');
 var Sqs = /** @class */ (function () {
     function Sqs(config) {
         var _this = this;
-        this.createStandardQueue = function (name) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-            return [2 /*return*/, this.createNamedQueue(name, false)];
-        }); }); };
-        this.createFifoQueue = function (name) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-            return [2 /*return*/, this.createNamedQueue(name, true)];
-        }); }); };
-        this.createNamedQueue = function (name, fifo) { return __awaiter(_this, void 0, void 0, function () {
+        this.createNamedQueue = function (name) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 return [2 /*return*/, this.client
                         .send(new client_sqs_1.CreateQueueCommand({
-                        QueueName: fifo ? "".concat(name, ".fifo") : name,
-                        Attributes: {
-                            FifoQueue: fifo ? 'true' : 'false',
-                        }
+                        QueueName: name,
                     }))
                         .then(function (create) { return _this.client
                         .send(new client_sqs_1.GetQueueAttributesCommand({
@@ -69,11 +60,11 @@ var Sqs = /** @class */ (function () {
                         .then(function (attributes) { return ({
                         url: (0, assert_1.assertNotUndefined)(create.QueueUrl),
                         arn: (0, assert_1.assertNotUndefined)(attributes.Attributes)[QUEUE_NAME_ATTRIBUTE_NAME],
-                    }); }); })
-                        .tap(function (queue) { return LOGGER.debug('created %s', queue.arn); })];
+                    }); }); })];
             });
         }); };
         this.client = new client_sqs_1.SQSClient(config);
+        LOGGER.debug('initialized');
     }
     return Sqs;
 }());

package/dist/src/stoppable.d.ts

@@ -1,2 +1,2 @@
 import { Consumer } from "sqs-consumer";
-export declare const stopConsumer: (queueWaitTimeSecs: number, target?: Consumer) => Promise<void>;
+export declare const stopConsumer: (target: Consumer, queueWaitTimeSecs: number) => Promise<void>;

package/dist/src/stoppable.js

@@ -37,18 +37,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stopConsumer = void 0;
-var stopConsumer = function (queueWaitTimeSecs, target) { return __awaiter(void 0, void 0, void 0, function () {
+var stopConsumer = function (target, queueWaitTimeSecs) { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
-        if (target) {
-            target.stop();
-            return [2 /*return*/, new Promise(function (resolve) {
-                    setTimeout(resolve, queueWaitTimeSecs * 1000 + 1);
-                })];
-        }
-        else {
-            return [2 /*return*/, Promise.resolve()];
-        }
-        return [2 /*return*/];
+        target.stop();
+        return [2 /*return*/, new Promise(function (resolve) {
+                setTimeout(resolve, queueWaitTimeSecs * 1000 + 1);
+            })];
     });
 }); };
 exports.stopConsumer = stopConsumer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yopdev/dev-server",
-  "version": "1.3.18",
+  "version": "1.4.0-alpha.1",
   "scripts": {
     "compile": "tsc",
     "pretest": "npm run compile",
@@ -18,17 +18,15 @@
   },
   "dependencies": {
     "@aws-sdk/client-dynamodb": "^3.451.0",
-    "@aws-sdk/client-s3": "^3.451.0",
     "@aws-sdk/client-sns": "^3.451.0",
     "@aws-sdk/client-sqs": "^3.451.0",
-    "@ngrok/ngrok": "^0.9.1",
     "@yopdev/logging": "^0.0.2",
     "sqs-consumer": "^7.4.0",
     "testcontainers": "^10.2.2"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/blockademy/devserver.git"
+    "url": "github:blockademy/devserver"
   },
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

package/dist/src/container.d.ts

@@ -1,18 +0,0 @@
-import { BindMount, Environment } from 'testcontainers/build/types';
-import { Callback, Service } from './services';
-import { PortWithOptionalBinding } from 'testcontainers/build/utils/port';
-import { Readable } from 'stream';
-import { WaitStrategy } from 'testcontainers/build/wait-strategies/wait-strategy';
-export declare const newContainer: (name: string, config: {
-    image: string;
-    networkAlias: string;
-    environment?: Environment;
-    bindMounts?: BindMount[];
-    exposedPorts?: PortWithOptionalBinding[];
-    logConsumer?: (stream: Readable) => unknown;
-    startup?: {
-        waitStrategy: WaitStrategy;
-        timeout: number;
-    };
-    endpointBuilder?: (port: number) => string;
-}, callback?: Callback<string>) => Service<string>;

package/dist/src/container.js

@@ -1,80 +0,0 @@
-"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 __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.newContainer = void 0;
-var logging_1 = require("@yopdev/logging");
-var testcontainers_1 = require("testcontainers");
-var services_1 = require("./services");
-var newContainer = function (name, config, callback) {
-    return new services_1.Service(new Container(name, config.image, config.networkAlias, config.environment, config.bindMounts, config.exposedPorts, config.logConsumer, config.startup, config.endpointBuilder), callback);
-};
-exports.newContainer = newContainer;
-var Container = /** @class */ (function () {
-    function Container(name, image, networkAlias, environment, bindMounts, exposedPorts, logConsumer, startup, endpointBuilder) {
-        var _this = this;
-        this.name = name;
-        this.networkAlias = networkAlias;
-        this.start = function (config) { return __awaiter(_this, void 0, void 0, function () {
-            var _this = this;
-            return __generator(this, function (_a) {
-                return [2 /*return*/, Promise.resolve(this.LOGGER.info('start'))
-                        .then(function () { return _this.container
-                        .withNetwork(config.network)
-                        .withNetworkAliases(_this.networkAlias)
-                        .start(); })
-                        .then(function (started) { return _this.started = started; })
-                        .then(function () { return _this.endpointBuilder(_this.started.getFirstMappedPort()); })
-                        .tap(function (url) { return _this.LOGGER.debug(url); })];
-            });
-        }); };
-        this.stop = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-            return [2 /*return*/, this.started.stop().then(function () { return undefined; })];
-        }); }); };
-        this.LOGGER = logging_1.LoggerFactory.create("CONTAINER[".concat(name, "]"));
-        var generic = new testcontainers_1.GenericContainer(image);
-        var withEnvironment = environment ? generic.withEnvironment(environment) : generic;
-        var withBindMounts = bindMounts ? withEnvironment.withBindMounts(bindMounts) : withEnvironment;
-        var withExposedPorts = exposedPorts ? withBindMounts.withExposedPorts.apply(withBindMounts, exposedPorts) : withBindMounts;
-        var withLogConsumer = logConsumer ? withExposedPorts.withLogConsumer(logConsumer) : withExposedPorts;
-        this.container = startup ? withLogConsumer.withWaitStrategy(startup.waitStrategy).withStartupTimeout(startup.timeout) : withLogConsumer;
-        this.networkAlias = networkAlias;
-        this.endpointBuilder = endpointBuilder !== null && endpointBuilder !== void 0 ? endpointBuilder : (function (port) { return "http://localhost:".concat(port); });
-    }
-    return Container;
-}());
-;

package/dist/src/s3.d.ts

@@ -1,7 +0,0 @@
-import { CORSConfiguration, S3Client } from '@aws-sdk/client-s3';
-import { AwsConfig } from './config';
-export declare class S3 {
-    readonly client: S3Client;
-    constructor(aws: AwsConfig);
-    createBucket: (name: string, cors?: CORSConfiguration) => Promise<import("@aws-sdk/client-s3").PutBucketCorsCommandOutput>;
-}

package/dist/src/s3.js

@@ -1,74 +0,0 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-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 __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.S3 = void 0;
-var client_s3_1 = require("@aws-sdk/client-s3");
-var logging_1 = require("@yopdev/logging");
-var LOGGER = logging_1.LoggerFactory.create('S3');
-var S3 = /** @class */ (function () {
-    function S3(aws) {
-        var _this = this;
-        this.createBucket = function (name, cors) { return __awaiter(_this, void 0, void 0, function () {
-            var _this = this;
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.client.send(new client_s3_1.CreateBucketCommand({
-                        Bucket: name,
-                    }))
-                        .then(function () { return cors && _this.client.send(new client_s3_1.PutBucketCorsCommand({
-                        Bucket: name,
-                        CORSConfiguration: cors
-                    })); })
-                        .tap(function () { return LOGGER.debug('bucket %s created', name); })];
-            });
-        }); };
-        this.client = new client_s3_1.S3Client(__assign({ forcePathStyle: true }, aws));
-    }
-    return S3;
-}());
-exports.S3 = S3;

package/dist/src/tunnel.d.ts

@@ -1,10 +0,0 @@
-import { Service } from './services';
-export declare const terminate: () => Promise<void>;
-export declare const newTunnel: (config: {
-    name: string;
-    port: number;
-    fixed?: {
-        name: string;
-        token: string;
-    };
-}) => Service<string>;

package/dist/src/tunnel.js

@@ -1,79 +0,0 @@
-"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 __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.newTunnel = exports.terminate = void 0;
-var services_1 = require("./services");
-var logging_1 = require("@yopdev/logging");
-var ngrok = require("@ngrok/ngrok");
-var assert_1 = require("./assert");
-var terminate = function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
-    return [2 /*return*/, ngrok.kill()];
-}); }); };
-exports.terminate = terminate;
-var newTunnel = function (config) {
-    return new services_1.Service(new Tunnel(config.name, config.port, config.fixed));
-};
-exports.newTunnel = newTunnel;
-var Tunnel = /** @class */ (function () {
-    function Tunnel(name, port, domain) {
-        var _this = this;
-        this.name = name;
-        this.port = port;
-        this.domain = domain;
-        this.start = function () { return __awaiter(_this, void 0, void 0, function () {
-            var _this = this;
-            var _a, _b;
-            return __generator(this, function (_c) {
-                return [2 /*return*/, ngrok
-                        .forward({
-                        proto: 'http',
-                        domain: (_a = this.domain) === null || _a === void 0 ? void 0 : _a.name,
-                        addr: this.port,
-                        authtoken: (_b = this.domain) === null || _b === void 0 ? void 0 : _b.token,
-                    })
-                        .then(function (listener) { return (0, assert_1.assertNotUndefined)(listener.url()); })
-                        .tap(function (url) { return _this.logger.debug(url); })];
-            });
-        }); };
-        this.stop = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-            return [2 /*return*/, ngrok.disconnect()];
-        }); }); };
-        this.logger = logging_1.LoggerFactory.create("TUNNEL[".concat(name, "]"));
-    }
-    return Tunnel;
-}());