@kapeta/local-cluster-service 0.19.6 → 0.20.0

package/dist/cjs/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;
             }
@@ -387,23 +390,24 @@ class InstanceManager {
                 }
             }
             const instanceConfig = await configManager_1.configManager.getConfigForSection(systemId, instanceId);
+            const resolvedConfig = (0, utils_1.getResolvedConfiguration)(blockSpec.configuration, instanceConfig, blockInstance.defaultConfiguration);
             const task = taskManager_1.taskManager.add(`instance:start:${systemId}:${instanceId}`, async () => {
                 const runner = new BlockInstanceRunner_1.BlockInstanceRunner(systemId);
                 const startTime = Date.now();
                 try {
-                    const processInfo = await runner.start(blockRef, instanceId, instanceConfig);
-                    instance.status = types_1.InstanceStatus.READY;
+                    const processInfo = await runner.start(blockRef, instanceId, resolvedConfig);
+                    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 +554,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 +598,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/cjs/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/cjs/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/cjs/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/dist/cjs/src/utils/utils.d.ts

@@ -1,3 +1,5 @@
+import { EntityList } from '@kapeta/schemas';
+import { AnyMap } from '../types';
 export declare function getBlockInstanceContainerName(systemId: string, instanceId: string): string;
 export declare function normalizeKapetaUri(uri: string): string;
 export declare function readYML(path: string): any;
@@ -5,3 +7,4 @@ export declare function isWindows(): boolean;
 export declare function isMac(): boolean;
 export declare function isLinux(): boolean;
 export declare function getBindHost(preferredHost?: string): string;
+export declare function getResolvedConfiguration(entities?: EntityList, config?: AnyMap, globalConfiguration?: AnyMap): AnyMap;

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

@@ -3,11 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBindHost = exports.isLinux = exports.isMac = exports.isWindows = exports.readYML = exports.normalizeKapetaUri = exports.getBlockInstanceContainerName = void 0;
+exports.getResolvedConfiguration = exports.getBindHost = exports.isLinux = exports.isMac = exports.isWindows = exports.readYML = exports.normalizeKapetaUri = exports.getBlockInstanceContainerName = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const yaml_1 = __importDefault(require("yaml"));
 const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const md5_1 = __importDefault(require("md5"));
+const lodash_1 = __importDefault(require("lodash"));
 function getBlockInstanceContainerName(systemId, instanceId) {
     return `kapeta-block-instance-${(0, md5_1.default)(systemId + instanceId)}`;
 }
@@ -51,3 +52,26 @@ function getBindHost(preferredHost = '127.0.0.1') {
     return isLinux() ? '0.0.0.0' : preferredHost;
 }
 exports.getBindHost = getBindHost;
+function getResolvedConfiguration(entities, config, globalConfiguration) {
+    if (!entities || !globalConfiguration) {
+        return config || {};
+    }
+    const mergedConfig = config ? lodash_1.default.cloneDeep(config) : {};
+    entities.types?.forEach((type) => {
+        if (!type.properties) {
+            return;
+        }
+        Object.entries(type.properties).forEach(([propertyName, property]) => {
+            if (!property.global) {
+                return;
+            }
+            const configPath = type.name + '.' + propertyName;
+            const defaultValue = globalConfiguration ? lodash_1.default.get(globalConfiguration, configPath) : undefined;
+            if (!lodash_1.default.has(mergedConfig, configPath)) {
+                lodash_1.default.set(mergedConfig, configPath, defaultValue);
+            }
+        });
+    });
+    return mergedConfig;
+}
+exports.getResolvedConfiguration = getResolvedConfiguration;

package/dist/esm/src/config/routes.js

@@ -12,7 +12,6 @@ const cors_1 = require("../middleware/cors");
 const kapeta_1 = require("../middleware/kapeta");
 const stringBody_1 = require("../middleware/stringBody");
 const router = (0, express_promise_router_1.default)();
-const SYSTEM_ID = '$plan';
 router.use('/', cors_1.corsHandler);
 router.use('/', kapeta_1.kapetaHeaders);
 router.use('/', stringBody_1.stringBody);
@@ -54,7 +53,7 @@ router.put('/instance', async (req, res) => {
  * Returns the full configuration for a plan
  */
 router.get('/system', (req, res) => {
-    const config = configManager_1.configManager.getConfigForSection(req.kapeta.systemId, SYSTEM_ID);
+    const config = configManager_1.configManager.getConfigForSection(req.kapeta.systemId, configManager_1.SYSTEM_ID);
     res.send(config);
 });
 /**
@@ -65,7 +64,7 @@ router.put('/system', (req, res) => {
     if (!config) {
         config = {};
     }
-    configManager_1.configManager.setConfigForSection(req.kapeta.systemId, SYSTEM_ID, config);
+    configManager_1.configManager.setConfigForSection(req.kapeta.systemId, configManager_1.SYSTEM_ID, config);
     res.status(202).send({ ok: true });
 });
 /**

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

@@ -1,3 +1,4 @@
+export declare const SYSTEM_ID = "$plan";
 type AnyMap = {
     [key: string]: any;
 };

package/dist/esm/src/configManager.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configManager = void 0;
+exports.configManager = exports.SYSTEM_ID = void 0;
 const storageService_1 = require("./storageService");
 const assetManager_1 = require("./assetManager");
 const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const utils_1 = require("./utils/utils");
+exports.SYSTEM_ID = '$plan';
 class ConfigManager {
     _config;
     constructor() {

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

@@ -1,7 +1,6 @@
 /// <reference types="node" />
 import FSExtra from 'fs-extra';
-import { Docker } from 'node-docker-api';
-import { Container } from 'node-docker-api/lib/container';
+import Docker from 'dockerode';
 import { InstanceInfo, LogEntry } from './types';
 type StringMap = {
     [key: string]: string;
@@ -20,24 +19,8 @@ export interface DockerMounts {
     ReadOnly: boolean;
     Consistency: string;
 }
-interface DockerState {
-    Status: 'created' | 'running' | 'paused' | 'restarting' | 'removing' | 'exited' | 'dead';
-    Running: boolean;
-    Paused: boolean;
-    Restarting: boolean;
-    OOMKilled: boolean;
-    Dead: boolean;
-    Pid: number;
-    ExitCode: number;
-    Error: string;
-    StartedAt: string;
-    FinishedAt: string;
-    Health?: {
-        Status: 'starting' | 'healthy' | 'unhealthy' | 'none';
-        FailingStreak: number;
-        Log: any[] | null;
-    };
-}
+export type DockerContainerStatus = 'created' | 'running' | 'paused' | 'restarting' | 'removing' | 'exited' | 'dead';
+export type DockerContainerHealth = 'starting' | 'healthy' | 'unhealthy' | 'none';
 interface Health {
     cmd: string;
     interval?: number;
@@ -45,6 +28,8 @@ interface Health {
     retries?: number;
 }
 export declare const CONTAINER_LABEL_PORT_PREFIX = "kapeta_port-";
+export declare const COMPOSE_LABEL_PROJECT = "com.docker.compose.project";
+export declare const COMPOSE_LABEL_SERVICE = "com.docker.compose.service";
 export declare const HEALTH_CHECK_TIMEOUT: number;
 declare class ContainerManager {
     private _docker;
@@ -71,12 +56,12 @@ declare class ContainerManager {
         Retries: number;
     };
     private applyHash;
-    ensureContainer(opts: any): Promise<Container>;
+    ensureContainer(opts: any): Promise<Docker.Container>;
     private createOrUpdateContainer;
-    startContainer(opts: any): Promise<Container>;
-    waitForReady(container: Container, attempt?: number): Promise<void>;
-    _isReady(container: Container): Promise<any>;
-    remove(container: Container, opts?: {
+    private startContainer;
+    waitForReady(container: Docker.Container, attempt?: number): Promise<void>;
+    _isReady(container: Docker.Container): Promise<boolean>;
+    remove(container: Docker.Container, opts?: {
         force?: boolean;
     }): Promise<void>;
     /**
@@ -84,7 +69,7 @@ declare class ContainerManager {
      * @param name
      * @return {Promise<ContainerInfo>}
      */
-    get(name: string): Promise<ContainerInfo | null>;
+    get(name: string): Promise<ContainerInfo | undefined>;
     getLogs(instance: InstanceInfo): Promise<LogEntry[]>;
     stopLogListening(systemId: string, instanceId: string): Promise<void>;
     ensureLogListening(systemId: string, instanceId: string, handler: (log: LogEntry) => void): Promise<void>;
@@ -102,11 +87,11 @@ export declare class ContainerInfo {
     private readonly _container;
     /**
      *
-     * @param {Container} dockerContainer
+     * @param {Docker.Container} dockerContainer
      */
-    constructor(dockerContainer: Container);
-    get native(): Container;
-    isRunning(): Promise<any>;
+    constructor(dockerContainer: Docker.Container);
+    get native(): Docker.Container;
+    isRunning(): Promise<boolean>;
     start(): Promise<void>;
     restart(): Promise<void>;
     stop(): Promise<void>;
@@ -118,8 +103,30 @@ export declare class ContainerInfo {
         protocol: string;
         hostPort: string;
     } | null>;
-    inspect(): Promise<any>;
-    status(): Promise<DockerState>;
+    inspect(): Promise<Docker.ContainerInspectInfo | undefined>;
+    status(): Promise<{
+        Status: string;
+        Running: boolean;
+        Paused: boolean;
+        Restarting: boolean;
+        OOMKilled: boolean;
+        Dead: boolean;
+        Pid: number;
+        ExitCode: number;
+        Error: string;
+        StartedAt: string;
+        FinishedAt: string;
+        Health?: {
+            Status: string;
+            FailingStreak: number;
+            Log: {
+                Start: string;
+                End: string;
+                ExitCode: number;
+                Output: string;
+            }[];
+        } | undefined;
+    } | undefined>;
     getPorts(): Promise<PortMap | false>;
     getLogStream(): Promise<ClosableLogStream>;
     getLogs(): Promise<LogEntry[]>;