@kapeta/local-cluster-service 0.10.1 → 0.11.1

package/src/operatorManager.ts

@@ -162,16 +162,12 @@ class OperatorManager {
 
         portTypes.sort();
 
-        const containerBaseName = 'kapeta-resource';
-
-        const nameParts = [resourceType.toLowerCase()];
-
         const ports: AnyMap = {};
 
         for (let i = 0; i < portTypes.length; i++) {
             const portType = portTypes[i];
             let containerPortInfo = operatorData.ports[portType];
-            const hostPort = await serviceManager.ensureServicePort(resourceType, portType);
+            const hostPort = await serviceManager.ensureServicePort(systemId, resourceType, portType);
 
             if (typeof containerPortInfo === 'number' || typeof containerPortInfo === 'string') {
                 containerPortInfo = { port: containerPortInfo, type: 'tcp' };
@@ -182,7 +178,6 @@ class OperatorManager {
             }
 
             const portId = containerPortInfo.port + '/' + containerPortInfo.type;
-            nameParts.push(portType + '-' + portId + '-' + hostPort);
 
             ports[portId] = {
                 type: portType,
@@ -190,9 +185,15 @@ class OperatorManager {
             };
         }
 
-        const mounts = containerManager.createMounts(resourceType, operatorData.mounts);
+        const mounts = await containerManager.createMounts(systemId, resourceType, operatorData.mounts);
+
+        const nameParts = [
+            systemId,
+            resourceType.toLowerCase(),
+            version
+        ];
 
-        const containerName = containerBaseName + '-' + md5(nameParts.join('_'));
+        const containerName = `kapeta-resource-${md5(nameParts.join('_'))}`;
 
         const PortBindings: { [key: string]: any } = {};
         const Env: string[] = [];

package/src/repositoryManager.ts

@@ -2,7 +2,7 @@ import FS from 'node:fs';
 import os from 'node:os';
 import Path from 'node:path';
 import watch from 'recursive-watch';
-import FSExtra, { FSWatcher } from 'fs-extra';
+import FSExtra from 'fs-extra';
 import ClusterConfiguration from '@kapeta/local-cluster-config';
 import { parseKapetaUri } from '@kapeta/nodejs-utils';
 import { socketManager } from './socketManager';
@@ -119,9 +119,11 @@ class RepositoryManager {
             this._installQueue.push(async () => {
                 try {
                     const normalizedRefs = refs.map((ref) => 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.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 {
@@ -218,13 +220,11 @@ 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: Dependency) => dep.name);
             if (refs.length > 0) {
-                console.log(`Auto-installing dependencies: ${refs.join(', ')}`);
                 await this._install(refs);
             }
         }

package/src/types.ts

@@ -53,10 +53,7 @@ export enum DesiredInstanceStatus {
 export type ProcessInfo = {
     type: InstanceType;
     pid?: number | string | null;
-    output: EventEmitter;
     portType?: string;
-    logs: () => LogEntry[];
-    stop: () => Promise<void> | void;
 };
 
 export type InstanceInfo = {
@@ -75,10 +72,6 @@ export type InstanceInfo = {
     pid?: number | string | null;
     portType?: string;
 
-    internal?: {
-        output: EventEmitter;
-        logs: () => LogEntry[];
-    };
 };
 
 interface ResourceRef {

package/src/utils/BlockInstanceRunner.ts

@@ -169,7 +169,7 @@ export class BlockInstanceRunner {
             throw new Error(`Missing docker image information: ${JSON.stringify(localContainer)}`);
         }
 
-        const containerName = getBlockInstanceContainerName(blockInstance.id);
+        const containerName = getBlockInstanceContainerName(this._systemId, blockInstance.id);
         const startCmd = localContainer.handlers?.onCreate ? localContainer.handlers.onCreate : '';
         const dockerOpts = localContainer.options ?? {};
         const homeDir = localContainer.userHome ? localContainer.userHome : '/root';
@@ -243,7 +243,7 @@ export class BlockInstanceRunner {
             addonEnv
         } = await this.getDockerPortBindings(blockInstance, assetVersion);
 
-        const containerName = getBlockInstanceContainerName(blockInstance.id);
+        const containerName = getBlockInstanceContainerName(this._systemId, blockInstance.id);
 
         // For windows we need to default to root
         const innerHome = process.platform === 'win32' ? '/root/.kapeta' : ClusterConfig.getKapetaBasedir();
@@ -306,7 +306,8 @@ export class BlockInstanceRunner {
 
         const dockerImage = spec?.local?.image;
 
-        const containerName = getBlockInstanceContainerName(blockInstance.id);
+        //We only want 1 operator per operator type - across all local systems
+        const containerName = getBlockInstanceContainerName(this._systemId, blockInstance.id);
         const logs = new LogData();
 
         const bindHost = getBindHost();
@@ -340,7 +341,7 @@ export class BlockInstanceRunner {
         }
 
         if (spec.local?.mounts) {
-            const mounts = containerManager.createMounts(blockUri.id, spec.local.mounts);
+            const mounts = await containerManager.createMounts(this._systemId, blockUri.id, spec.local.mounts);
             Mounts = containerManager.toDockerMounts(mounts);
         }
 
@@ -418,78 +419,21 @@ export class BlockInstanceRunner {
     }
 
     private async ensureContainer(opts: any) {
-        const logs = new LogData();
-
         const container = await containerManager.ensureContainer(opts);
 
-        try {
-            if (opts.HealthCheck) {
-                await containerManager.waitForHealthy(container);
-            } else {
-                await containerManager.waitForReady(container);
-            }
-        } catch (e: any) {
-            logs.addLog(e.message, 'ERROR');
-        }
+        await containerManager.waitForReady(container);
+
+        return this._handleContainer(container);
 
-        return this._handleContainer(container, logs);
     }
 
     private async _handleContainer(
-        container: Container,
-        logs: LogData,
-        deleteOnExit: boolean = false
+        container: Container
     ): Promise<ProcessInfo> {
-        let localContainer: Container | null = container;
-        const logStream = (await container.logs({
-            follow: true,
-            stdout: true,
-            stderr: true,
-            tail: LogData.MAX_LINES,
-        })) as EventEmitter;
-
-        const outputEvents = new EventEmitter();
-        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 as any;
-            if (deleteOnExit) {
-                try {
-                    await containerManager.remove(container);
-                } catch (e: any) {}
-            }
-            outputEvents.emit('exit', data?.State?.ExitCode ?? 0);
-        });
 
         return {
             type: InstanceType.DOCKER,
-            pid: container.id,
-            output: outputEvents,
-            stop: async () => {
-                if (!localContainer) {
-                    return;
-                }
-
-                try {
-                    await localContainer.stop();
-                    if (deleteOnExit) {
-                        await containerManager.remove(localContainer);
-                    }
-                } catch (e) {}
-                localContainer = null;
-            },
-            logs: () => {
-                return logs.getLogs();
-            },
+            pid: container.id
         };
     }
 }

package/src/utils/LogData.ts

@@ -20,6 +20,7 @@ export class LogData {
         if (!msg.endsWith('\n')) {
             msg += '\n';
         }
+
         this.entries.push({
             time: Date.now(),
             message: msg,

package/src/utils/utils.ts

@@ -1,9 +1,10 @@
 import FS from 'node:fs';
 import YAML from 'yaml';
 import { parseKapetaUri } from '@kapeta/nodejs-utils';
+import md5 from "md5";
 
-export function getBlockInstanceContainerName(instanceId: string) {
-    return `kapeta-block-instance-${instanceId}`;
+export function getBlockInstanceContainerName(systemId:string, instanceId: string) {
+    return `kapeta-block-instance-${md5(systemId + instanceId)}`;
 }
 
 export function normalizeKapetaUri(uri: string) {