@kapeta/local-cluster-service 0.9.0 → 0.9.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.9.1](https://github.com/kapetacom/local-cluster-service/compare/v0.9.0...v0.9.1) (2023-07-26)
+
+
+### Bug Fixes
+
+* Rename containers before deleting to avoid name conflicts ([#49](https://github.com/kapetacom/local-cluster-service/issues/49)) ([ac977f0](https://github.com/kapetacom/local-cluster-service/commit/ac977f0a9f18f57a517342d51e4c1e1fee68e4ff))
+
 # [0.9.0](https://github.com/kapetacom/local-cluster-service/compare/v0.8.3...v0.9.0) (2023-07-24)
 
 

package/dist/cjs/src/containerManager.d.ts

@@ -76,6 +76,9 @@ declare class ContainerManager {
     waitForHealthy(container: Container, attempt?: number): Promise<void>;
     _isReady(container: Container): Promise<any>;
     _isHealthy(container: Container): Promise<boolean>;
+    remove(container: Container, opts?: {
+        force?: boolean;
+    }): Promise<void>;
     /**
      *
      * @param name

package/dist/cjs/src/containerManager.js

@@ -13,6 +13,7 @@ const node_docker_api_1 = require("node-docker-api");
 const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const local_cluster_config_1 = __importDefault(require("@kapeta/local-cluster-config"));
 const utils_1 = require("./utils/utils");
+const node_uuid_1 = __importDefault(require("node-uuid"));
 const LABEL_PORT_PREFIX = 'kapeta_port-';
 const NANO_SECOND = 1000000;
 const HEALTH_CHECK_INTERVAL = 3000;
@@ -324,6 +325,13 @@ class ContainerManager {
             return false;
         }
     }
+    async remove(container, opts) {
+        const newName = 'deleting-' + node_uuid_1.default.v4();
+        const containerData = container.data;
+        // Rename the container first to avoid name conflicts if people start the same container
+        await container.rename({ name: newName });
+        await container.delete({ force: !!opts?.force });
+    }
     /**
      *
      * @param name
@@ -379,7 +387,7 @@ class ContainerInfo {
         await this._container.stop();
     }
     async remove(opts) {
-        await this._container.delete({ force: !!opts?.force });
+        await exports.containerManager.remove(this._container, opts);
     }
     async getPort(type) {
         const ports = await this.getPorts();

package/dist/cjs/src/utils/BlockInstanceRunner.js

@@ -136,13 +136,13 @@ class BlockInstanceRunner {
         const containerName = (0, utils_1.getBlockInstanceContainerName)(blockInstance.id);
         const logs = new LogData_1.LogData();
         logs.addLog(`Starting block ${blockInstance.ref}`);
-        const containerInfo = await containerManager_1.containerManager.getContainerByName(containerName);
+        let containerInfo = await containerManager_1.containerManager.getContainerByName(containerName);
         let container = containerInfo?.native;
         console.log('Starting dev container', containerName);
-        if (container) {
+        if (containerInfo) {
             console.log(`Dev container already exists. Deleting...`);
             try {
-                await container.delete({
+                await containerInfo.remove({
                     force: true,
                 });
             }
@@ -150,6 +150,7 @@ class BlockInstanceRunner {
                 throw new Error('Failed to delete existing container: ' + e.message);
             }
             container = undefined;
+            containerInfo = undefined;
         }
         logs.addLog(`Creating new container for block: ${containerName}`);
         console.log('Creating new dev container', containerName, dockerImage);
@@ -245,7 +246,7 @@ class BlockInstanceRunner {
             const data = status.data;
             if (deleteOnExit) {
                 try {
-                    await container.delete();
+                    await containerManager_1.containerManager.remove(container);
                 }
                 catch (e) { }
             }
@@ -262,7 +263,7 @@ class BlockInstanceRunner {
                 try {
                     await localContainer.stop();
                     if (deleteOnExit) {
-                        await localContainer.delete();
+                        await containerManager_1.containerManager.remove(localContainer);
                     }
                 }
                 catch (e) { }
@@ -369,7 +370,7 @@ class BlockInstanceRunner {
                 if (containerData.State?.ExitCode > 0) {
                     logs.addLog(`Container exited with code: ${containerData.State.ExitCode}. Deleting...`);
                     try {
-                        await container.delete();
+                        await containerManager_1.containerManager.remove(container);
                     }
                     catch (e) { }
                     container = undefined;
@@ -382,7 +383,7 @@ class BlockInstanceRunner {
                     catch (e) {
                         console.warn('Failed to start container. Deleting...', e);
                         try {
-                            await container.delete();
+                            await containerManager_1.containerManager.remove(container);
                         }
                         catch (e) { }
                         container = undefined;

package/dist/esm/src/containerManager.d.ts

@@ -76,6 +76,9 @@ declare class ContainerManager {
     waitForHealthy(container: Container, attempt?: number): Promise<void>;
     _isReady(container: Container): Promise<any>;
     _isHealthy(container: Container): Promise<boolean>;
+    remove(container: Container, opts?: {
+        force?: boolean;
+    }): Promise<void>;
     /**
      *
      * @param name

package/dist/esm/src/containerManager.js

@@ -7,6 +7,7 @@ import { Docker } from 'node-docker-api';
 import { parseKapetaUri } from '@kapeta/nodejs-utils';
 import ClusterConfiguration from '@kapeta/local-cluster-config';
 import { getBindHost } from './utils/utils';
+import uuid from "node-uuid";
 const LABEL_PORT_PREFIX = 'kapeta_port-';
 const NANO_SECOND = 1000000;
 const HEALTH_CHECK_INTERVAL = 3000;
@@ -318,6 +319,13 @@ class ContainerManager {
             return false;
         }
     }
+    async remove(container, opts) {
+        const newName = 'deleting-' + uuid.v4();
+        const containerData = container.data;
+        // Rename the container first to avoid name conflicts if people start the same container
+        await container.rename({ name: newName });
+        await container.delete({ force: !!opts?.force });
+    }
     /**
      *
      * @param name
@@ -373,7 +381,7 @@ export class ContainerInfo {
         await this._container.stop();
     }
     async remove(opts) {
-        await this._container.delete({ force: !!opts?.force });
+        await containerManager.remove(this._container, opts);
     }
     async getPort(type) {
         const ports = await this.getPorts();

package/dist/esm/src/utils/BlockInstanceRunner.js

@@ -130,13 +130,13 @@ export class BlockInstanceRunner {
         const containerName = getBlockInstanceContainerName(blockInstance.id);
         const logs = new LogData();
         logs.addLog(`Starting block ${blockInstance.ref}`);
-        const containerInfo = await containerManager.getContainerByName(containerName);
+        let containerInfo = await containerManager.getContainerByName(containerName);
         let container = containerInfo?.native;
         console.log('Starting dev container', containerName);
-        if (container) {
+        if (containerInfo) {
             console.log(`Dev container already exists. Deleting...`);
             try {
-                await container.delete({
+                await containerInfo.remove({
                     force: true,
                 });
             }
@@ -144,6 +144,7 @@ export class BlockInstanceRunner {
                 throw new Error('Failed to delete existing container: ' + e.message);
             }
             container = undefined;
+            containerInfo = undefined;
         }
         logs.addLog(`Creating new container for block: ${containerName}`);
         console.log('Creating new dev container', containerName, dockerImage);
@@ -239,7 +240,7 @@ export class BlockInstanceRunner {
             const data = status.data;
             if (deleteOnExit) {
                 try {
-                    await container.delete();
+                    await containerManager.remove(container);
                 }
                 catch (e) { }
             }
@@ -256,7 +257,7 @@ export class BlockInstanceRunner {
                 try {
                     await localContainer.stop();
                     if (deleteOnExit) {
-                        await localContainer.delete();
+                        await containerManager.remove(localContainer);
                     }
                 }
                 catch (e) { }
@@ -363,7 +364,7 @@ export class BlockInstanceRunner {
                 if (containerData.State?.ExitCode > 0) {
                     logs.addLog(`Container exited with code: ${containerData.State.ExitCode}. Deleting...`);
                     try {
-                        await container.delete();
+                        await containerManager.remove(container);
                     }
                     catch (e) { }
                     container = undefined;
@@ -376,7 +377,7 @@ export class BlockInstanceRunner {
                     catch (e) {
                         console.warn('Failed to start container. Deleting...', e);
                         try {
-                            await container.delete();
+                            await containerManager.remove(container);
                         }
                         catch (e) { }
                         container = undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.9.0",
+    "version": "0.9.1",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {

package/src/containerManager.ts

@@ -8,6 +8,7 @@ import { parseKapetaUri } from '@kapeta/nodejs-utils';
 import ClusterConfiguration from '@kapeta/local-cluster-config';
 import { Container } from 'node-docker-api/lib/container';
 import { getBindHost } from './utils/utils';
+import uuid from "node-uuid";
 
 type StringMap = { [key: string]: string };
 
@@ -422,6 +423,14 @@ class ContainerManager {
         }
     }
 
+    async remove(container:Container, opts?: { force?: boolean }) {
+        const newName = 'deleting-' + uuid.v4()
+        const containerData = container.data as any;
+        // Rename the container first to avoid name conflicts if people start the same container
+        await container.rename({ name: newName });
+        await container.delete({ force: !!opts?.force });
+    }
+
     /**
      *
      * @param name
@@ -488,7 +497,7 @@ export class ContainerInfo {
     }
 
     async remove(opts?: { force?: boolean }) {
-        await this._container.delete({ force: !!opts?.force });
+        await containerManager.remove(this._container, opts);
     }
 
     async getPort(type: string) {

package/src/utils/BlockInstanceRunner.ts

@@ -171,21 +171,22 @@ export class BlockInstanceRunner {
         const containerName = getBlockInstanceContainerName(blockInstance.id);
         const logs = new LogData();
         logs.addLog(`Starting block ${blockInstance.ref}`);
-        const containerInfo = await containerManager.getContainerByName(containerName);
+        let containerInfo = await containerManager.getContainerByName(containerName);
         let container = containerInfo?.native;
 
         console.log('Starting dev container', containerName);
 
-        if (container) {
+        if (containerInfo) {
             console.log(`Dev container already exists. Deleting...`);
             try {
-                await container.delete({
+                await containerInfo.remove({
                     force: true,
                 });
             } catch (e: any) {
                 throw new Error('Failed to delete existing container: ' + e.message);
             }
             container = undefined;
+            containerInfo = undefined;
         }
 
         logs.addLog(`Creating new container for block: ${containerName}`);
@@ -298,7 +299,7 @@ export class BlockInstanceRunner {
             const data = status.data as any;
             if (deleteOnExit) {
                 try {
-                    await container.delete();
+                    await containerManager.remove(container);
                 } catch (e: any) {}
             }
             outputEvents.emit('exit', data?.State?.ExitCode ?? 0);
@@ -316,7 +317,7 @@ export class BlockInstanceRunner {
                 try {
                     await localContainer.stop();
                     if (deleteOnExit) {
-                        await localContainer.delete();
+                        await containerManager.remove(localContainer);
                     }
                 } catch (e) {}
                 localContainer = null;
@@ -448,7 +449,7 @@ export class BlockInstanceRunner {
                 if (containerData.State?.ExitCode > 0) {
                     logs.addLog(`Container exited with code: ${containerData.State.ExitCode}. Deleting...`);
                     try {
-                        await container.delete();
+                        await containerManager.remove(container);
                     } catch (e) {}
                     container = undefined;
                 } else {
@@ -458,7 +459,7 @@ export class BlockInstanceRunner {
                     } catch (e) {
                         console.warn('Failed to start container. Deleting...', e);
                         try {
-                            await container.delete();
+                            await containerManager.remove(container);
                         } catch (e) {}
                         container = undefined;
                     }