@kapeta/local-cluster-service 0.19.6 → 0.19.7

package/dist/esm/src/instanceManager.js

@@ -262,6 +262,9 @@ class InstanceManager {
             if (instance.status === types_1.InstanceStatus.STOPPED) {
                 return;
             }
+            if (instance.status === types_1.InstanceStatus.STOPPING) {
+                return;
+            }
             if (changeDesired && instance.desiredStatus !== types_1.DesiredInstanceStatus.EXTERNAL) {
                 instance.desiredStatus = types_1.DesiredInstanceStatus.STOP;
             }
@@ -392,18 +395,18 @@ class InstanceManager {
                 const startTime = Date.now();
                 try {
                     const processInfo = await runner.start(blockRef, instanceId, instanceConfig);
-                    instance.status = types_1.InstanceStatus.READY;
+                    instance.status = types_1.InstanceStatus.STARTING;
                     return this.saveInternalInstance({
                         ...instance,
                         type: processInfo.type,
                         pid: processInfo.pid ?? -1,
                         health: null,
                         portType: processInfo.portType,
-                        status: types_1.InstanceStatus.READY,
+                        status: types_1.InstanceStatus.STARTING,
                     });
                 }
                 catch (e) {
-                    console.warn('Failed to start instance: ', systemId, instanceId, blockRef, e.message);
+                    console.warn('Failed to start instance: ', systemId, instanceId, blockRef, e);
                     const logs = [
                         {
                             source: 'stdout',
@@ -550,7 +553,7 @@ class InstanceManager {
                         await this.start(instance.systemId, instance.instanceId);
                     }
                     catch (e) {
-                        console.warn('Failed to start instance', instance.systemId, instance.instanceId, e);
+                        console.warn('Failed to start previously stopped instance', instance.systemId, instance.instanceId, e);
                     }
                     return;
                 }
@@ -594,31 +597,38 @@ class InstanceManager {
                 return types_1.InstanceStatus.STOPPED;
             }
             const state = await container.status();
-            if (state.Status === 'running') {
-                if (state.Health?.Status === 'healthy') {
-                    return types_1.InstanceStatus.READY;
-                }
-                if (state.Health?.Status === 'starting') {
-                    return types_1.InstanceStatus.STARTING;
-                }
-                if (state.Health?.Status === 'unhealthy') {
-                    return types_1.InstanceStatus.UNHEALTHY;
+            if (!state) {
+                return types_1.InstanceStatus.STOPPED;
+            }
+            const statusType = state.Status;
+            if (statusType === 'running') {
+                if (state.Health?.Status) {
+                    const healthStatusType = state.Health.Status;
+                    if (healthStatusType === 'healthy' || healthStatusType === 'none') {
+                        return types_1.InstanceStatus.READY;
+                    }
+                    if (healthStatusType === 'starting') {
+                        return types_1.InstanceStatus.STARTING;
+                    }
+                    if (healthStatusType === 'unhealthy') {
+                        return types_1.InstanceStatus.UNHEALTHY;
+                    }
                 }
                 return types_1.InstanceStatus.READY;
             }
-            if (state.Status === 'created') {
+            if (statusType === 'created') {
                 return types_1.InstanceStatus.STARTING;
             }
-            if (state.Status === 'exited' || state.Status === 'dead') {
+            if (statusType === 'exited' || statusType === 'dead') {
                 return types_1.InstanceStatus.STOPPED;
             }
-            if (state.Status === 'removing') {
+            if (statusType === 'removing') {
                 return types_1.InstanceStatus.BUSY;
             }
-            if (state.Status === 'restarting') {
+            if (statusType === 'restarting') {
                 return types_1.InstanceStatus.BUSY;
             }
-            if (state.Status === 'paused') {
+            if (statusType === 'paused') {
                 return types_1.InstanceStatus.BUSY;
             }
             return types_1.InstanceStatus.STOPPED;

package/dist/esm/src/operatorManager.js

@@ -146,8 +146,11 @@ class OperatorManager {
             const containerName = `kapeta-resource-${(0, md5_1.default)(nameParts.join('_'))}`;
             const PortBindings = {};
             const Env = [];
+            const systemUri = (0, nodejs_utils_1.parseKapetaUri)(systemId);
             const Labels = {
                 kapeta: 'true',
+                [containerManager_1.COMPOSE_LABEL_PROJECT]: systemUri.id.replace(/[^a-z0-9]/gi, '_'),
+                [containerManager_1.COMPOSE_LABEL_SERVICE]: [resourceType, version].join('_').replace(/[^a-z0-9]/gi, '_'),
             };
             const operatorMetadata = operator.getDefinitionInfo().definition.metadata;
             const bindHost = (0, utils_1.getBindHost)();

package/dist/esm/src/taskManager.js

@@ -90,7 +90,9 @@ class TaskManager {
         });
         this._tasks.push(task);
         socketManager_1.socketManager.emitGlobal(EVENT_TASK_ADDED, task.toData());
-        this.invokeTask(task).catch(() => { });
+        this.invokeTask(task).catch((err) => {
+            console.warn(`Task ${task.id} failed`, err);
+        });
         return task;
     }
     async waitFor(filter) {
@@ -145,6 +147,7 @@ class TaskManager {
             task.emitUpdate();
         }
         catch (e) {
+            console.warn(`Task ${task.id} failed while waiting for it to resolve`, e);
             task.errorMessage = e.message;
             task.status = TaskStatus.FAILED;
             task.future.reject(e);

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

@@ -146,6 +146,7 @@ class BlockInstanceRunner {
         if (localContainer.healthcheck) {
             HealthCheck = containerManager_1.containerManager.toDockerHealth({ cmd: localContainer.healthcheck });
         }
+        const systemUri = (0, nodejs_utils_1.parseKapetaUri)(this._systemId);
         return this.ensureContainer({
             ...dockerOpts,
             Image: dockerImage,
@@ -154,6 +155,8 @@ class BlockInstanceRunner {
             Labels: {
                 ...customLabels,
                 instance: blockInstance.id,
+                [containerManager_1.COMPOSE_LABEL_PROJECT]: systemUri.id.replace(/[^a-z0-9]/gi, '_'),
+                [containerManager_1.COMPOSE_LABEL_SERVICE]: blockInfo.id.replace(/[^a-z0-9]/gi, '_'),
             },
             HealthCheck,
             ExposedPorts,
@@ -195,12 +198,15 @@ class BlockInstanceRunner {
         const containerName = (0, utils_1.getBlockInstanceContainerName)(this._systemId, blockInstance.id);
         // For windows we need to default to root
         const innerHome = process.platform === 'win32' ? '/root/.kapeta' : local_cluster_config_1.default.getKapetaBasedir();
+        const systemUri = (0, nodejs_utils_1.parseKapetaUri)(this._systemId);
         return this.ensureContainer({
             Image: dockerImage,
             name: containerName,
             ExposedPorts,
             Labels: {
                 instance: blockInstance.id,
+                [containerManager_1.COMPOSE_LABEL_PROJECT]: systemUri.id.replace(/[^a-z0-9]/gi, '_'),
+                [containerManager_1.COMPOSE_LABEL_SERVICE]: blockInfo.id.replace(/[^a-z0-9]/gi, '_'),
             },
             Env: [
                 ...DOCKER_ENV_VARS,
@@ -273,6 +279,7 @@ class BlockInstanceRunner {
         }
         // For windows we need to default to root
         const innerHome = process.platform === 'win32' ? '/root/.kapeta' : local_cluster_config_1.default.getKapetaBasedir();
+        const systemUri = (0, nodejs_utils_1.parseKapetaUri)(this._systemId);
         logs.addLog(`Creating new container for block: ${containerName}`);
         const out = await this.ensureContainer({
             Image: dockerImage,
@@ -289,6 +296,8 @@ class BlockInstanceRunner {
             },
             Labels: {
                 instance: blockInstance.id,
+                [containerManager_1.COMPOSE_LABEL_PROJECT]: systemUri.id.replace(/[^a-z0-9]/gi, '_'),
+                [containerManager_1.COMPOSE_LABEL_SERVICE]: blockUri.id.replace(/[^a-z0-9]/gi, '_'),
             },
             Env: [
                 `KAPETA_INSTANCE_NAME=${blockInstance.ref}`,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.19.6",
+    "version": "0.19.7",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {
@@ -52,8 +52,11 @@
         "@kapeta/schemas": "^0.0.58",
         "@kapeta/sdk-config": "<2",
         "@kapeta/web-microfrontend": "^0.2.1",
+        "@types/dockerode": "^3.3.19",
+        "@types/stream-json": "^1.7.3",
         "async-lock": "^1.4.0",
         "chokidar": "^3.5.3",
+        "dockerode": "^3.3.5",
         "express": "4.17.1",
         "express-promise-router": "^4.1.1",
         "fs-extra": "^11.1.0",
@@ -62,11 +65,11 @@
         "lodash": "^4.17.15",
         "md5": "2.2.1",
         "node-cache": "^5.1.2",
-        "node-docker-api": "1.1.22",
         "node-uuid": "^1.4.8",
         "request": "2.88.2",
         "request-promise": "4.2.6",
         "socket.io": "^4.5.2",
+        "stream-json": "^1.8.0",
         "tar-stream": "^3.1.6",
         "typescript": "^5.1.6",
         "yaml": "^1.6.0"