@kapeta/local-cluster-service 0.10.1 → 0.11.1

package/dist/cjs/src/repositoryManager.js

@@ -113,9 +113,11 @@ class RepositoryManager {
             this._installQueue.push(async () => {
                 try {
                     const normalizedRefs = refs.map((ref) => (0, nodejs_utils_1.parseKapetaUri)(ref).id);
-                    const filteredRefs = normalizedRefs.filter((ref) => !INSTALL_ATTEMPTED[ref]);
-                    console.log(filteredRefs);
+                    const filteredRefs = normalizedRefs
+                        .filter((ref) => !INSTALL_ATTEMPTED[ref])
+                        .filter((ref) => !definitionsManager_1.definitionsManager.exists(ref));
                     if (filteredRefs.length > 0) {
+                        console.log(`Auto-installing dependencies: ${filteredRefs.join(', ')}`);
                         filteredRefs.forEach((ref) => (INSTALL_ATTEMPTED[ref] = true));
                         //Auto-install missing asset
                         try {
@@ -206,14 +208,12 @@ class RepositoryManager {
         }
         this._cache[ref] = true;
         if (!installedAsset) {
-            console.log(`Auto-installing missing asset: ${ref}`);
             await this._install([ref]);
         }
         else {
             //Ensure dependencies are installed
             const refs = assetVersion.dependencies.map((dep) => dep.name);
             if (refs.length > 0) {
-                console.log(`Auto-installing dependencies: ${refs.join(', ')}`);
                 await this._install(refs);
             }
         }

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

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-import EventEmitter from 'events';
 import express from 'express';
 import { Resource } from '@kapeta/schemas';
 import { StringBodyRequest } from './middleware/stringBody';
@@ -50,10 +48,7 @@ export declare enum DesiredInstanceStatus {
 export type ProcessInfo = {
     type: InstanceType;
     pid?: number | string | null;
-    output: EventEmitter;
     portType?: string;
-    logs: () => LogEntry[];
-    stop: () => Promise<void> | void;
 };
 export type InstanceInfo = {
     systemId: string;
@@ -69,10 +64,6 @@ export type InstanceInfo = {
     health?: string | null;
     pid?: number | string | null;
     portType?: string;
-    internal?: {
-        output: EventEmitter;
-        logs: () => LogEntry[];
-    };
 };
 interface ResourceRef {
     blockId: string;

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

@@ -11,7 +11,6 @@ const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const serviceManager_1 = require("../serviceManager");
 const containerManager_1 = require("../containerManager");
 const LogData_1 = require("./LogData");
-const events_1 = __importDefault(require("events"));
 const clusterService_1 = require("../clusterService");
 const types_1 = require("../types");
 const definitionsManager_1 = require("../definitionsManager");
@@ -133,7 +132,7 @@ class BlockInstanceRunner {
         if (!dockerImage) {
             throw new Error(`Missing docker image information: ${JSON.stringify(localContainer)}`);
         }
-        const containerName = (0, utils_1.getBlockInstanceContainerName)(blockInstance.id);
+        const containerName = (0, utils_1.getBlockInstanceContainerName)(this._systemId, blockInstance.id);
         const startCmd = localContainer.handlers?.onCreate ? localContainer.handlers.onCreate : '';
         const dockerOpts = localContainer.options ?? {};
         const homeDir = localContainer.userHome ? localContainer.userHome : '/root';
@@ -186,7 +185,7 @@ class BlockInstanceRunner {
             throw new Error(`Missing docker image information: ${JSON.stringify(versionInfo?.artifact?.details)}`);
         }
         const { PortBindings, ExposedPorts, addonEnv } = await this.getDockerPortBindings(blockInstance, assetVersion);
-        const containerName = (0, utils_1.getBlockInstanceContainerName)(blockInstance.id);
+        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();
         return this.ensureContainer({
@@ -231,7 +230,8 @@ class BlockInstanceRunner {
             throw new Error(`Provider did not have local image: ${providerRef}`);
         }
         const dockerImage = spec?.local?.image;
-        const containerName = (0, utils_1.getBlockInstanceContainerName)(blockInstance.id);
+        //We only want 1 operator per operator type - across all local systems
+        const containerName = (0, utils_1.getBlockInstanceContainerName)(this._systemId, blockInstance.id);
         const logs = new LogData_1.LogData();
         const bindHost = (0, utils_1.getBindHost)();
         const ExposedPorts = {};
@@ -258,7 +258,7 @@ class BlockInstanceRunner {
             });
         }
         if (spec.local?.mounts) {
-            const mounts = containerManager_1.containerManager.createMounts(blockUri.id, spec.local.mounts);
+            const mounts = await containerManager_1.containerManager.createMounts(this._systemId, blockUri.id, spec.local.mounts);
             Mounts = containerManager_1.containerManager.toDockerMounts(mounts);
         }
         if (spec.local?.health) {
@@ -323,69 +323,14 @@ class BlockInstanceRunner {
         return { PortBindings, ExposedPorts, addonEnv };
     }
     async ensureContainer(opts) {
-        const logs = new LogData_1.LogData();
         const container = await containerManager_1.containerManager.ensureContainer(opts);
-        try {
-            if (opts.HealthCheck) {
-                await containerManager_1.containerManager.waitForHealthy(container);
-            }
-            else {
-                await containerManager_1.containerManager.waitForReady(container);
-            }
-        }
-        catch (e) {
-            logs.addLog(e.message, 'ERROR');
-        }
-        return this._handleContainer(container, logs);
+        await containerManager_1.containerManager.waitForReady(container);
+        return this._handleContainer(container);
     }
-    async _handleContainer(container, logs, deleteOnExit = false) {
-        let localContainer = container;
-        const logStream = (await container.logs({
-            follow: true,
-            stdout: true,
-            stderr: true,
-            tail: LogData_1.LogData.MAX_LINES,
-        }));
-        const outputEvents = new events_1.default();
-        logStream.on('data', (data) => {
-            logs.addLog(data.toString());
-            outputEvents.emit('data', data);
-        });
-        logStream.on('error', (data) => {
-            logs.addLog(data.toString());
-            outputEvents.emit('data', data);
-        });
-        logStream.on('close', async () => {
-            const status = await container.status();
-            const data = status.data;
-            if (deleteOnExit) {
-                try {
-                    await containerManager_1.containerManager.remove(container);
-                }
-                catch (e) { }
-            }
-            outputEvents.emit('exit', data?.State?.ExitCode ?? 0);
-        });
+    async _handleContainer(container) {
         return {
             type: types_1.InstanceType.DOCKER,
-            pid: container.id,
-            output: outputEvents,
-            stop: async () => {
-                if (!localContainer) {
-                    return;
-                }
-                try {
-                    await localContainer.stop();
-                    if (deleteOnExit) {
-                        await containerManager_1.containerManager.remove(localContainer);
-                    }
-                }
-                catch (e) { }
-                localContainer = null;
-            },
-            logs: () => {
-                return logs.getLogs();
-            },
+            pid: container.id
         };
     }
 }

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

@@ -1,4 +1,4 @@
-export declare function getBlockInstanceContainerName(instanceId: string): string;
+export declare function getBlockInstanceContainerName(systemId: string, instanceId: string): string;
 export declare function normalizeKapetaUri(uri: string): string;
 export declare function readYML(path: string): any;
 export declare function isWindows(): boolean;

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

@@ -7,8 +7,9 @@ exports.getBindHost = exports.isLinux = exports.isMac = exports.isWindows = expo
 const node_fs_1 = __importDefault(require("node:fs"));
 const yaml_1 = __importDefault(require("yaml"));
 const nodejs_utils_1 = require("@kapeta/nodejs-utils");
-function getBlockInstanceContainerName(instanceId) {
-    return `kapeta-block-instance-${instanceId}`;
+const md5_1 = __importDefault(require("md5"));
+function getBlockInstanceContainerName(systemId, instanceId) {
+    return `kapeta-block-instance-${(0, md5_1.default)(systemId + instanceId)}`;
 }
 exports.getBlockInstanceContainerName = getBlockInstanceContainerName;
 function normalizeKapetaUri(uri) {

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

@@ -1,5 +1,6 @@
 import { Docker } from 'node-docker-api';
 import { Container } from 'node-docker-api/lib/container';
+import { InstanceInfo, LogEntry } from "./types";
 type StringMap = {
     [key: string]: string;
 };
@@ -52,8 +53,8 @@ declare class ContainerManager {
     initialize(): Promise<void>;
     checkAlive(): Promise<boolean>;
     isAlive(): boolean;
-    getMountPoint(kind: string, mountName: string): string;
-    createMounts(kind: string, mountOpts: StringMap): StringMap;
+    getMountPoint(systemId: string, ref: string, mountName: string): string;
+    createMounts(systemId: string, kind: string, mountOpts: StringMap | null | undefined): Promise<StringMap>;
     ping(): Promise<void>;
     docker(): Docker;
     getContainerByName(containerName: string): Promise<ContainerInfo | undefined>;
@@ -67,11 +68,10 @@ declare class ContainerManager {
     };
     private applyHash;
     ensureContainer(opts: any): Promise<Container>;
+    private createOrUpdateContainer;
     startContainer(opts: any): Promise<Container>;
     waitForReady(container: Container, attempt?: number): Promise<void>;
-    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>;
@@ -81,6 +81,7 @@ declare class ContainerManager {
      * @return {Promise<ContainerInfo>}
      */
     get(name: string): Promise<ContainerInfo | null>;
+    getLogs(instance: InstanceInfo): Promise<LogEntry[]>;
 }
 export declare class ContainerInfo {
     private readonly _container;
@@ -105,6 +106,7 @@ export declare class ContainerInfo {
     inspect(): Promise<any>;
     status(): Promise<DockerState>;
     getPorts(): Promise<PortMap | false>;
+    getLogs(): Promise<LogEntry[]>;
 }
 export declare function getExtraHosts(dockerVersion: string): string[] | undefined;
 /**

package/dist/esm/src/containerManager.js

@@ -8,6 +8,7 @@ import { parseKapetaUri } from '@kapeta/nodejs-utils';
 import ClusterConfiguration from '@kapeta/local-cluster-config';
 import uuid from 'node-uuid';
 import md5 from 'md5';
+import { getBlockInstanceContainerName } from "./utils/utils";
 export const CONTAINER_LABEL_PORT_PREFIX = 'kapeta_port-';
 const NANO_SECOND = 1000000;
 const HEALTH_CHECK_INTERVAL = 3000;
@@ -15,8 +16,8 @@ const HEALTH_CHECK_MAX = 20;
 const IMAGE_PULL_CACHE_TTL = 30 * 60 * 1000;
 const IMAGE_PULL_CACHE = {};
 export const HEALTH_CHECK_TIMEOUT = HEALTH_CHECK_INTERVAL * HEALTH_CHECK_MAX * 2;
-const promisifyStream = (stream) => new Promise((resolve, reject) => {
-    stream.on('data', (d) => console.log(d.toString()));
+const promisifyStream = (stream, handler) => new Promise((resolve, reject) => {
+    stream.on('data', handler);
     stream.on('end', resolve);
     stream.on('error', reject);
 });
@@ -95,17 +96,21 @@ class ContainerManager {
     isAlive() {
         return this._alive;
     }
-    getMountPoint(kind, mountName) {
-        const kindUri = parseKapetaUri(kind);
-        return Path.join(this._mountDir, kindUri.handle, kindUri.name, mountName);
+    getMountPoint(systemId, ref, mountName) {
+        const kindUri = parseKapetaUri(ref);
+        const systemUri = parseKapetaUri(systemId);
+        return Path.join(this._mountDir, systemUri.handle, systemUri.name, systemUri.version, kindUri.handle, kindUri.name, kindUri.version, mountName);
     }
-    createMounts(kind, mountOpts) {
+    async createMounts(systemId, kind, mountOpts) {
         const mounts = {};
-        _.forEach(mountOpts, (containerPath, mountName) => {
-            const hostPath = this.getMountPoint(kind, mountName);
-            FSExtra.mkdirpSync(hostPath);
-            mounts[containerPath] = hostPath;
-        });
+        if (mountOpts) {
+            const mountOptList = Object.entries(mountOpts);
+            for (const [mountName, containerPath] of mountOptList) {
+                const hostPath = this.getMountPoint(systemId, kind, mountName);
+                await FSExtra.mkdirp(hostPath);
+                mounts[containerPath] = hostPath;
+            }
+        }
         return mounts;
     }
     async ping() {
@@ -156,12 +161,14 @@ class ContainerManager {
             return false;
         }
         console.log('Pulling image: %s', image);
-        await this.docker()
+        const stream = await this.docker()
             .image.create({}, {
             fromImage: imageName,
             tag: tag,
-        })
-            .then((stream) => promisifyStream(stream));
+        });
+        await promisifyStream(stream, (chunk) => {
+            console.log('Data from docker: "%s"', chunk.toString());
+        });
         IMAGE_PULL_CACHE[image] = Date.now();
         console.log('Image pulled: %s', image);
         return true;
@@ -198,6 +205,11 @@ class ContainerManager {
         dockerOpts.Labels.HASH = hash;
     }
     async ensureContainer(opts) {
+        const container = await this.createOrUpdateContainer(opts);
+        await this.waitForReady(container);
+        return container;
+    }
+    async createOrUpdateContainer(opts) {
         let imagePulled = false;
         try {
             imagePulled = await this.pull(opts.Image);
@@ -277,28 +289,6 @@ class ContainerManager {
             }, HEALTH_CHECK_INTERVAL);
         });
     }
-    async waitForHealthy(container, attempt) {
-        if (!attempt) {
-            attempt = 0;
-        }
-        if (attempt >= HEALTH_CHECK_MAX) {
-            throw new Error('Container did not become healthy within the timeout');
-        }
-        if (await this._isHealthy(container)) {
-            return;
-        }
-        return new Promise((resolve, reject) => {
-            setTimeout(async () => {
-                try {
-                    await this.waitForHealthy(container, (attempt ?? 0) + 1);
-                    resolve();
-                }
-                catch (err) {
-                    reject(err);
-                }
-            }, HEALTH_CHECK_INTERVAL);
-        });
-    }
     async _isReady(container) {
         let info;
         try {
@@ -312,16 +302,12 @@ class ContainerManager {
         if (state?.Status === 'exited' || state?.Status === 'removing' || state?.Status === 'dead') {
             throw new Error('Container exited unexpectedly');
         }
-        return infoData?.State?.Running ?? false;
-    }
-    async _isHealthy(container) {
-        try {
-            const info = await container.status();
-            const infoData = info?.data;
-            return infoData?.State?.Health?.Status === 'healthy';
+        if (infoData?.State?.Health) {
+            // If container has health info - wait for it to become healthy
+            return infoData.State.Health.Status === 'healthy';
         }
-        catch (err) {
-            return false;
+        else {
+            return infoData?.State?.Running ?? false;
         }
     }
     async remove(container, opts) {
@@ -351,6 +337,19 @@ class ContainerManager {
         }
         return new ContainerInfo(dockerContainer);
     }
+    async getLogs(instance) {
+        const containerName = getBlockInstanceContainerName(instance.systemId, instance.instanceId);
+        const containerInfo = await this.getContainerByName(containerName);
+        if (!containerInfo) {
+            return [{
+                    source: "stdout",
+                    level: "ERROR",
+                    time: Date.now(),
+                    message: "Container not found"
+                }];
+        }
+        return containerInfo.getLogs();
+    }
 }
 export class ContainerInfo {
     _container;
@@ -434,6 +433,62 @@ export class ContainerInfo {
         });
         return ports;
     }
+    async getLogs() {
+        const logStream = await this.native.logs({
+            stdout: true,
+            stderr: true,
+            follow: false,
+            tail: 100,
+            timestamps: true,
+        });
+        const out = [];
+        await promisifyStream(logStream, (data) => {
+            const buf = data;
+            let offset = 0;
+            while (offset < buf.length) {
+                try {
+                    // Read the docker log format - explained here:
+                    // https://docs.docker.com/engine/api/v1.41/#operation/ContainerAttach
+                    // or here : https://ahmet.im/blog/docker-logs-api-binary-format-explained/
+                    // First byte is stream type
+                    const streamTypeInt = buf.readInt8(offset);
+                    const streamType = streamTypeInt === 1 ? 'stdout' : 'stderr';
+                    // Bytes 4-8 is frame size
+                    const messageLength = buf.readInt32BE(offset + 4);
+                    // After that is the message - with the message length
+                    const dataWithoutStreamType = buf.subarray(offset + 8, offset + 8 + messageLength);
+                    const raw = dataWithoutStreamType.toString();
+                    // Split the message into date and message
+                    const firstSpaceIx = raw.indexOf(' ');
+                    const dateString = raw.substring(0, firstSpaceIx);
+                    const line = raw.substring(firstSpaceIx + 1);
+                    offset = offset + messageLength + 8;
+                    if (!dateString) {
+                        continue;
+                    }
+                    out.push({
+                        time: new Date(dateString).getTime(),
+                        message: line,
+                        level: 'INFO',
+                        source: streamType,
+                    });
+                }
+                catch (err) {
+                    console.error('Error parsing log entry', err);
+                    offset = buf.length;
+                }
+            }
+        });
+        if (out.length === 0) {
+            out.push({
+                time: Date.now(),
+                message: 'No logs found for container',
+                level: 'INFO',
+                source: 'stdout',
+            });
+        }
+        return out;
+    }
 }
 export function getExtraHosts(dockerVersion) {
     if (process.platform !== 'darwin' && process.platform !== 'win32') {

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

@@ -5,6 +5,7 @@ declare class DefinitionsManager {
     clearCache(): void;
     private doCached;
     getDefinitions(kindFilter?: string | string[]): DefinitionInfo[];
+    exists(ref: string): boolean;
     getProviderDefinitions(): DefinitionInfo[];
 }
 export declare const definitionsManager: DefinitionsManager;

package/dist/esm/src/definitionsManager.js

@@ -1,4 +1,5 @@
 import ClusterConfiguration from '@kapeta/local-cluster-config';
+import { parseKapetaUri } from "@kapeta/nodejs-utils";
 const CACHE_TTL = 60 * 1000; // 1 min
 class DefinitionsManager {
     cache = {};
@@ -31,6 +32,12 @@ class DefinitionsManager {
         const key = this.getKey(kindFilter);
         return this.doCached(key, () => ClusterConfiguration.getDefinitions(kindFilter));
     }
+    exists(ref) {
+        const uri = parseKapetaUri(ref);
+        return !!this.getDefinitions().find((d) => {
+            return parseKapetaUri(`${d.definition.metadata.name}:${d.version}`).id === uri.id;
+        });
+    }
     getProviderDefinitions() {
         return this.doCached('providers', () => ClusterConfiguration.getProviderDefinitions());
     }

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

@@ -1,12 +1,15 @@
-import { InstanceInfo } from './types';
+import { InstanceInfo, LogEntry } from './types';
 export declare class InstanceManager {
     private _interval;
     private readonly _instances;
+    private readonly instanceLocks;
     constructor();
     private checkInstancesLater;
     getInstances(): InstanceInfo[];
     getInstancesForPlan(systemId: string): InstanceInfo[];
     getInstance(systemId: string, instanceId: string): InstanceInfo | undefined;
+    private exclusive;
+    getLogs(systemId: string, instanceId: string): Promise<LogEntry[]>;
     saveInternalInstance(instance: InstanceInfo): Promise<InstanceInfo>;
     /**
      * Method is called when instance is started from the Kapeta SDKs (e.g. NodeJS SDK)
@@ -14,9 +17,10 @@ export declare class InstanceManager {
      */
     registerInstanceFromSDK(systemId: string, instanceId: string, info: Omit<InstanceInfo, 'systemId' | 'instanceId'>): Promise<InstanceInfo | undefined>;
     private getHealthUrl;
-    markAsStopped(systemId: string, instanceId: string): void;
+    markAsStopped(systemId: string, instanceId: string): Promise<void>;
     startAllForPlan(systemId: string): Promise<InstanceInfo[]>;
     stop(systemId: string, instanceId: string): Promise<void>;
+    private stopInner;
     stopAllForPlan(systemId: string): Promise<void>;
     start(systemId: string, instanceId: string): Promise<InstanceInfo>;
     restart(systemId: string, instanceId: string): Promise<InstanceInfo>;