@yopdev/dev-server 1.1.3 → 1.1.6

package/dist/{config.d.ts → src/config.d.ts}

@@ -3,13 +3,12 @@ import { Sns } from "./sns";
 import { DynamoDb } from "./dynamodb";
 import { StartedNetwork } from "testcontainers";
 export type Config = {
-    servicesPort?: number;
+    boundServicesPort?: number;
     localStackDockerImage?: string;
-    useRandomPorts: boolean;
     localStateBindMount?: string;
     queueName?: string;
     topicName?: string;
-    table?: string;
+    tableName?: string;
 };
 export type AwsConfig = {
     region: string;

package/dist/{dev-server.d.ts → src/dev-server.d.ts}

@@ -2,14 +2,14 @@ import { Config } from "./config";
 import { Lifecycle, Service } from "./services";
 export declare class DevServer implements Lifecycle<DevServer> {
     readonly name: string;
-    private readonly config;
     private readonly service;
+    private readonly config?;
     private readonly topicName;
     private readonly queueName;
     private readonly tableName;
     private LOGGER;
     private localStack;
-    constructor(name: string, config: Config, service: Service<any>);
+    constructor(name: string, service: Service<any>, config?: Config);
     start: () => Promise<this>;
     stop: () => Promise<void>;
 }

package/dist/{dev-server.js → src/dev-server.js}

@@ -8,16 +8,16 @@ var dynamodb_1 = require("./dynamodb");
 var logging_1 = require("@yopdev/logging");
 var sns_1 = require("./sns");
 var DevServer = /** @class */ (function () {
-    function DevServer(name, config, service) {
+    function DevServer(name, service, config) {
         var _this = this;
         var _a, _b, _c;
         this.name = name;
-        this.config = config;
         this.service = service;
+        this.config = config;
         this.start = function () {
             return Promise.resolve(new testcontainers_1.Network(new testcontainers_1.RandomUuid()).start())
                 .then(function (network) { return ({
-                localStack: _this.localStack = new localstack_1.LocalStack(_this.config, network),
+                localStack: _this.localStack = new localstack_1.LocalStack(network, _this.config),
                 network: network
             }); })
                 .then(function (infra) { return infra.localStack.start().then(function (config) { return ({
@@ -47,9 +47,9 @@ var DevServer = /** @class */ (function () {
             .then(function () { return _this.LOGGER.info('stopped'); }); };
         this.LOGGER = logging_1.LoggerFactory.create("DEVSERVER[".concat(name, "]"));
         var encodedName = Buffer.from(name).toString('hex').substring(0, 16);
-        this.topicName = (_a = config.topicName) !== null && _a !== void 0 ? _a : "Topic".concat(encodedName);
-        this.queueName = (_b = config.queueName) !== null && _b !== void 0 ? _b : "Queue".concat(encodedName);
-        this.tableName = (_c = config.table) !== null && _c !== void 0 ? _c : "Table".concat(encodedName);
+        this.topicName = (_a = config === null || config === void 0 ? void 0 : config.topicName) !== null && _a !== void 0 ? _a : "Topic".concat(encodedName);
+        this.queueName = (_b = config === null || config === void 0 ? void 0 : config.queueName) !== null && _b !== void 0 ? _b : "Queue".concat(encodedName);
+        this.tableName = (_c = config === null || config === void 0 ? void 0 : config.tableName) !== null && _c !== void 0 ? _c : "Table".concat(encodedName);
     }
     return DevServer;
 }());

package/dist/{index.d.ts → src/index.d.ts}

@@ -8,3 +8,4 @@ export { newScheduledTasks as scheduledTasks } from './scheduled-tasks';
 export { newPreTrafficHooks as preTrafficHooks } from './pre-traffic-hooks';
 export { newDynamoDbTable as dynamoDbTable } from './dynamodb';
 export { all as allOf, oneThenOther } from './factories';
+export { lazy } from './lazy';

package/dist/{index.js → src/index.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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");
@@ -22,3 +22,5 @@ Object.defineProperty(exports, "dynamoDbTable", { enumerable: true, get: functio
 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 lazy_1 = require("./lazy");
+Object.defineProperty(exports, "lazy", { enumerable: true, get: function () { return lazy_1.lazy; } });

package/dist/src/lazy.d.ts

@@ -0,0 +1,3 @@
+import { DevServerConfig } from "./config";
+import { Service } from "./services";
+export declare const lazy: <I>(lifecycle: (config: DevServerConfig) => Service<I>) => Service<I>;

package/dist/src/lazy.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.lazy = void 0;
+var crypto_1 = require("crypto");
+var services_1 = require("./services");
+var logging_1 = require("@yopdev/logging");
+var lazy = function (lifecycle) { return new services_1.Service(new Lazy(lifecycle)); };
+exports.lazy = lazy;
+var Lazy = /** @class */ (function () {
+    function Lazy(configurable) {
+        var _this = this;
+        this.configurable = configurable;
+        this.stop = function () { return __awaiter(_this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.withStartedOr(function (s) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+                        return [2 /*return*/, s.stop()];
+                    }); }); }, function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+                        return [2 /*return*/, Promise.reject(new Error('not started'))];
+                    }); }); })];
+            });
+        }); };
+        this.started = undefined;
+        this.name = (0, crypto_1.randomUUID)();
+        this.LOGGER = logging_1.LoggerFactory.create("LAZY[".concat(this.name, "]"));
+    }
+    Lazy.prototype.start = function (config) {
+        return __awaiter(this, void 0, void 0, function () {
+            var local;
+            return __generator(this, function (_a) {
+                local = this.configurable(config);
+                this.started = local;
+                this.LOGGER.info('DISCOVERY:%s', local.name);
+                return [2 /*return*/, local.start(config)];
+            });
+        });
+    };
+    Lazy.prototype.withStartedOr = function (task, fallback) {
+        var local = this.started;
+        if (local !== undefined)
+            task(local);
+        else
+            fallback();
+    };
+    return Lazy;
+}());

package/dist/{localstack.d.ts → src/localstack.d.ts}

@@ -4,7 +4,8 @@ import { Stoppable } from "./services";
 export declare class LocalStack implements Stoppable {
     private readonly _start;
     private started;
-    constructor(config: Config, network: StartedNetwork);
+    constructor(network: StartedNetwork, config?: Config);
+    private configOrDefaults;
     start: () => Promise<AwsConfig>;
     stop: () => Promise<void>;
 }

package/dist/{localstack.js → src/localstack.js}

@@ -40,12 +40,12 @@ exports.LocalStack = void 0;
 var logging_1 = require("@yopdev/logging");
 var testcontainers_1 = require("testcontainers");
 var LOGGER = logging_1.LoggerFactory.create('LOCALSTACK');
-var DEFAULT_SERVICES_PORT = 4566;
+var SERVICES_PORT = 4566;
 var NETWORK_ALIAS = 'localstack';
 var PROTOCOL = 'http';
 var DEFAULT_DOCKER_IMAGE = 'localstack/localstack:stable';
 var LocalStack = /** @class */ (function () {
-    function LocalStack(config, network) {
+    function LocalStack(network, config) {
         var _this = this;
         this.start = function () { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -63,9 +63,9 @@ var LocalStack = /** @class */ (function () {
         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.info(status); }); };
-        var servicesPort = config.servicesPort || DEFAULT_SERVICES_PORT;
-        var container = new testcontainers_1.GenericContainer(config.localStackDockerImage || DEFAULT_DOCKER_IMAGE);
-        var localStatePath = config.localStateBindMount;
+        var concreteConfig = this.configOrDefaults(config);
+        var container = new testcontainers_1.GenericContainer(concreteConfig.localStackDockerImage);
+        var localStatePath = concreteConfig.localStateBindMount;
         var withLocalState = localStatePath !== undefined ?
             container
                 .withEnvironment({ PERSISTENCE: '1' })
@@ -76,20 +76,26 @@ var LocalStack = /** @class */ (function () {
                 }])
             : container;
         var ready = withLocalState
-            .withExposedPorts(config.useRandomPorts ?
-            servicesPort :
-            {
-                container: servicesPort,
-                host: servicesPort
-            })
+            .withExposedPorts(concreteConfig.exposedPort)
             .withNetwork(network)
             .withNetworkAliases(NETWORK_ALIAS);
         this._start = function () { return ready
             .start()
             .then(function (container) { return _this.started = container; })
-            .then(function (container) { return "".concat(PROTOCOL, "://").concat(container.getHost(), ":").concat(container.getMappedPort(servicesPort)); }); };
+            .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;
+        var exposedPort = selectedServicesPort !== undefined ?
+            { container: SERVICES_PORT, host: selectedServicesPort } :
+            SERVICES_PORT;
+        return {
+            localStackDockerImage: (config === null || config === void 0 ? void 0 : config.localStackDockerImage) || DEFAULT_DOCKER_IMAGE,
+            exposedPort: exposedPort,
+            localStateBindMount: config === null || config === void 0 ? void 0 : config.localStateBindMount,
+        };
+    };
     return LocalStack;
 }());
 exports.LocalStack = LocalStack;

package/dist/{services.d.ts → src/services.d.ts}

@@ -13,7 +13,7 @@ export declare class Service<I> implements Lifecycle<I> {
     readonly name: string;
     readonly start: (config: DevServerConfig) => Promise<I>;
     readonly stop: () => Promise<void>;
-    private LOGGER;
+    private readonly LOGGER;
     constructor(service: Lifecycle<I>, callback?: Callback<I>);
     private callbackOrDefault;
 }

package/package.json

@@ -1,28 +1,34 @@
 {
   "name": "@yopdev/dev-server",
-  "version": "1.1.3",
+  "version": "1.1.6",
   "scripts": {
     "compile": "tsc",
+    "test": "jest",
     "clean": "rm -rf dist",
     "predistclean": "npm run clean",
     "distclean": "rm -rf node_modules"
   },
   "devDependencies": {
-    "typescript": "^5.2.2"
+    "ts-jest": "^29.1.1",
+    "typescript": "^5.2.2",
+    "@types/aws-lambda": "8.10.114",
+    "@types/node": "^20.9.0"
   },
   "dependencies": {
     "@aws-sdk/client-dynamodb": "^3.451.0",
     "@aws-sdk/client-sns": "^3.451.0",
     "@aws-sdk/client-sqs": "^3.451.0",
-    "@types/aws-lambda": "8.10.114",
-    "@types/node": "^20.9.0",
     "@yopdev/logging": "^0.0.1",
     "sqs-consumer": "^7.4.0",
     "testcontainers": "^10.2.2"
   },
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "repository": {
+    "type": "git",
+    "url": "github:blockademy/devserver"
+  },
+  "main": "dist/src/index.js",
+  "types": "dist/src/index.d.ts",
   "files": [
-    "dist"
+    "dist/src"
   ]
 }