@yopdev/dev-server 1.4.0-alpha.1 → 1.5.0-alpha.0

package/dist/src/container.d.ts

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,82 @@
+"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()); })];
+            });
+        }); };
+        this.stop = function () { return __awaiter(_this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.started.stop().then(function () { return _this.LOGGER.info('stop'); })];
+            });
+        }); };
+        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/event-proxy.d.ts

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

package/dist/src/event-proxy.js

@@ -89,29 +89,26 @@ 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 with subject %s', subject);
+                _this.LOGGER.warn('stopped events proxy received message %o', message);
                 return;
             }
-            var handlers = _this.handlers.filter(function (handler) { return handler.matcher(subject); });
+            var body = (0, assert_1.assertNotUndefined)(message.Body, 'body is not present');
+            var subject = JSON.parse(body).Subject;
+            var handlers = _this.handlers.filter(function (handler) { var _a; return handler.matcher(subject, (_a = message.MessageAttributes) !== null && _a !== void 0 ? _a : {}); });
             if (handlers.length === 0) {
-                _this.LOGGER.warn('no handlers found for subject %s, message %o', subject, message);
+                _this.LOGGER.warn('no handlers found for message %o', message);
             }
+            var record = (0, mappers_1.mapToLambdaSqsRecord)(message);
             handlers.forEach(function (handler) {
-                var record = (0, mappers_1.mapToLambdaSqsRecord)(message);
-                handler
+                return handler
                     .handler({ Records: [record] })
                     .then(function () {
-                    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);
+                    _this.LOGGER.debug('handler %s accepted message', handler.name);
                 })
                     .catch(function (e) {
                     var error = _this.extractErrorMessage(e);
-                    _this.LOGGER.error(e, 'failed %s with %s', subject, error);
+                    _this.LOGGER.error(e, 'handler %s failed with %s', handler.name, error);
                 });
             });
         };

package/dist/src/index.d.ts

@@ -7,5 +7,9 @@ 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, terminate } from './tunnel';
 export { all as allOf, oneThenOther } from './factories';
 export { lazy, promised } from './deferred';
+export { Lifecycle, Service } from './services';
+export { DevServerConfig } from './config';

package/dist/src/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.Service = exports.promised = exports.lazy = exports.oneThenOther = exports.allOf = exports.terminate = exports.tunnel = exports.container = 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");
@@ -19,9 +19,16 @@ 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; } });
+Object.defineProperty(exports, "terminate", { enumerable: true, get: function () { return tunnel_1.terminate; } });
 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; } });

package/dist/src/tunnel.d.ts

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,84 @@
+"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 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) {
+                        var url = listener.url();
+                        _this.logger.info('start %s', url);
+                        return url || 'undefined';
+                    })];
+            });
+        }); };
+        this.stop = function () { return __awaiter(_this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                return [2 /*return*/, ngrok.disconnect().then(function () { return _this.logger.info('stop'); })];
+            });
+        }); };
+        this.logger = logging_1.LoggerFactory.create("TUNNEL[".concat(name, "]"));
+    }
+    return Tunnel;
+}());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yopdev/dev-server",
-  "version": "1.4.0-alpha.1",
+  "version": "1.5.0-alpha.0",
   "scripts": {
     "compile": "tsc",
     "pretest": "npm run compile",
@@ -20,6 +20,7 @@
     "@aws-sdk/client-dynamodb": "^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"