@yopdev/dev-server 2.0.0-alpha.1 → 2.0.0-alpha.2

package/dist/src/container.js

@@ -18,7 +18,7 @@ class Container {
             .then((started) => this.started = started)
             .then(() => this.endpointBuilder(this.started.getFirstMappedPort()))
             .tap((url) => this.LOGGER.debug(url));
-        this.stop = async () => this.started.stop().then(() => undefined);
+        this.stop = async () => (this.started ?? { stop: async () => { this.LOGGER.warn('no container'); } }).stop().then(() => undefined);
         this.LOGGER = logging_1.LoggerFactory.create(`CONTAINER[${name}]`);
         const generic = new testcontainers_1.GenericContainer(image);
         const withEnvironment = environment ? generic.withEnvironment(environment) : generic;

package/dist/src/deferred.js

@@ -32,13 +32,14 @@ class Lazy {
 }
 class Promised {
     constructor(configurable) {
-        this.configurable = configurable;
-        this.start = async (config) => this.configurable(config)
-            .then((service) => this.service = service)
-            .then((service) => this.LOGGER.info('DISCOVERY:%s', service.name))
-            .then(() => this.service.start(config));
-        this.stop = async () => this.service.stop();
         this.name = (0, crypto_1.randomUUID)();
         this.LOGGER = logging_1.LoggerFactory.create(`PROMISED[${this.name}]`);
+        let initialized;
+        this.start = async (config) => configurable(config)
+            .catch((e) => e?.cleanup?.() ?? Promise.reject(e))
+            .then((service) => initialized = service)
+            .tap((service) => this.LOGGER.info('DISCOVERY:%s', service.name))
+            .then((service) => service.start(config));
+        this.stop = async () => (initialized ?? { stop: async () => this.LOGGER.info('not started') }).stop();
     }
 }

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

@@ -10,4 +10,5 @@ export declare class DevServer implements Lifecycle<DevServer> {
     constructor(name: string, service: Service<any>, config?: Config);
     start: () => Promise<this>;
     stop: () => Promise<void>;
+    private shutdown;
 }

package/dist/src/dev-server.js

@@ -42,12 +42,16 @@ class DevServer {
         }))))
             .tap((config) => this.LOGGER.debug('config is %o', config))
             .then((aws) => this.service.start(aws))
+            .catch((e) => this.shutdown()
+            .then(() => this.LOGGER.error('error starting service'))
+            .then(() => Promise.reject(e)))
             .then(() => this.LOGGER.info('started'))
             .then(() => this);
-        this.stop = () => this.service.stop()
-            .then(tunnel_1.terminate)
-            .then(() => this.localStack?.stop())
+        this.stop = () => this.shutdown()
             .then(() => this.LOGGER.info('stopped'));
+        this.shutdown = async () => this.service.stop()
+            .then(tunnel_1.terminate)
+            .then(() => this.localStack?.stop());
         this.LOGGER = logging_1.LoggerFactory.create(`DEVSERVER[${name}]`);
         const encodedName = Buffer.from(name).toString('hex').substring(0, 64);
         this.eventProxyTopic = `EventProxyTopic${encodedName}`;

package/dist/src/internal-queue.js

@@ -20,12 +20,13 @@ class InternalQueue {
             .then((queue) => this
             .createConsumer(sqs.client, this.name, queue.url, this.handler(queue), this.visibility)
             .then(() => queue.url));
-        this.createConsumer = async (sqs, name, url, handler, visibility) => Promise.resolve(sqs_consumer_1.Consumer.create({
+        this.createConsumer = async (sqs, name, url, handler, visibility) => Promise.resolve(() => this.consumer = sqs_consumer_1.Consumer.create({
             queueUrl: url,
             waitTimeSeconds: visibility,
             sqs: sqs,
             handleMessage: async (message) => handler({ Records: [this.mapper(message)] }),
         }))
+            .then((factory) => factory())
             .then((consumer) => {
             consumer.on('error', (err) => {
                 this.LOGGER.error(err, 'failed to handle message');
@@ -33,16 +34,13 @@ class InternalQueue {
             consumer.on('processing_error', (err) => {
                 this.LOGGER.error(err, 'failed to process message');
             });
-            consumer.start();
             this.LOGGER.info('consumer for %s initialized', name);
-            this.state = {
-                consumer: consumer,
-                visibility: visibility,
-            };
+            return consumer;
         })
+            .then(async (consumer) => consumer.start())
             .then(() => this.LOGGER.info('started'))
             .then(() => this);
-        this.stop = () => (0, stoppable_1.stopConsumer)(this.state.visibility, this.state.consumer);
+        this.stop = async () => this.consumer !== undefined ? (0, stoppable_1.stopConsumer)(this.visibility, this.consumer) : this.LOGGER.warn('no consumer');
         this.LOGGER = logging_1.LoggerFactory.create(`INTERNALQUEUE[${name}]`);
     }
     async createQueue(sqs, name) {

package/dist/src/services.d.ts

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

package/dist/src/services.js

@@ -9,14 +9,18 @@ class Service {
         this.callbackOrDefault = async (instance) => (this.callback ?? this.DEFAULT_CALLBACK)(instance);
         this.name = service.name;
         this.LOGGER = logging_1.LoggerFactory.create(`SERVICE[${this.name}]`);
+        const stop = async () => service.stop();
         this.start = (config) => service.start(config)
+            .catch((error) => stop()
+            .then(() => this.doStop = () => Promise.resolve(this.LOGGER.error(error, 'failed')))
+            .then(() => Promise.reject(error)))
             .then((started) => this
             .callbackOrDefault(started)
             .then(() => this.LOGGER.info('started'))
             .then(() => started));
-        this.stop = () => service
-            .stop()
+        this.doStop = () => stop()
             .then(() => this.LOGGER.info('stopped'));
+        this.stop = () => this.doStop();
     }
 }
 exports.Service = Service;

package/dist/src/sqs.js

@@ -14,7 +14,7 @@ class Sqs {
             .send(new client_sqs_1.CreateQueueCommand({
             QueueName: fifo ? `${name}.fifo` : name,
             Attributes: {
-                FifoQueue: fifo ? 'true' : 'false',
+                FifoQueue: fifo ? 'true' : undefined,
             }
         }))
             .then((create) => this.client

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yopdev/dev-server",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0-alpha.2",
   "scripts": {
     "compile": "tsc",
     "pretest": "npm run compile",