@kapeta/local-cluster-service 0.8.3 → 0.9.1

package/src/assetManager.ts

@@ -10,6 +10,8 @@ import { parseKapetaUri } from '@kapeta/nodejs-utils';
 import { repositoryManager } from './repositoryManager';
 import { BlockDefinition } from '@kapeta/schemas';
 import { Actions } from '@kapeta/nodejs-registry-utils';
+import { definitionsManager } from './definitionsManager';
+import { normalizeKapetaUri } from './utils/utils';
 
 export interface EnrichedAsset {
     ref: string;
@@ -67,7 +69,7 @@ class AssetManager {
      */
     getAssets(assetKinds?: string[]): EnrichedAsset[] {
         if (!assetKinds) {
-            const blockTypeProviders = ClusterConfiguration.getDefinitions([
+            const blockTypeProviders = definitionsManager.getDefinitions([
                 'core/block-type',
                 'core/block-type-operator',
             ]);
@@ -77,7 +79,7 @@ class AssetManager {
             assetKinds.push('core/plan');
         }
 
-        const assets = ClusterConfiguration.getDefinitions(assetKinds);
+        const assets = definitionsManager.getDefinitions(assetKinds);
 
         return assets.map(enrichAsset);
     }
@@ -97,6 +99,7 @@ class AssetManager {
     }
 
     async getAsset(ref: string, noCache: boolean = false): Promise<EnrichedAsset | undefined> {
+        ref = normalizeKapetaUri(ref);
         const cacheKey = `getAsset:${ref}`;
         if (!noCache && this.cache.has(cacheKey)) {
             return this.cache.get(cacheKey);
@@ -104,10 +107,10 @@ class AssetManager {
         const uri = parseKapetaUri(ref);
         await repositoryManager.ensureAsset(uri.handle, uri.name, uri.version);
 
-        let asset = ClusterConfiguration.getDefinitions()
+        let asset = definitionsManager
+            .getDefinitions()
             .map(enrichAsset)
             .find((a) => parseKapetaUri(a.ref).equals(uri));
-
         if (!asset) {
             throw new Error('Asset not found: ' + ref);
         }

package/src/clusterService.ts

@@ -1,3 +1,5 @@
+import { normalizeKapetaUri } from './utils/utils';
+
 const net = require('net');
 const DEFAULT_SERVER_PORT = 35100;
 const DEFAULT_START_PORT = 40000;
@@ -125,6 +127,7 @@ class ClusterService {
      * @return {string}
      */
     getProxyPath(systemId: string, consumerInstanceId: string, consumerResourceName: string, portType: string) {
+        systemId = normalizeKapetaUri(systemId);
         return `/proxy/${encodeURIComponent(systemId)}/${encodeURIComponent(consumerInstanceId)}/${encodeURIComponent(
             consumerResourceName
         )}/${encodeURIComponent(portType)}/`;

package/src/codeGeneratorManager.ts

@@ -2,6 +2,7 @@ import Path from 'path';
 import { registry as Targets, BlockCodeGenerator, CodeWriter } from '@kapeta/codegen';
 import ClusterConfiguration from '@kapeta/local-cluster-config';
 import { BlockDefinition } from '@kapeta/schemas';
+import { definitionsManager } from './definitionsManager';
 
 const TARGET_KIND = 'core/language-target';
 const BLOCK_TYPE_KIND = 'core/block-type';
@@ -9,7 +10,7 @@ const BLOCK_TYPE_KIND = 'core/block-type';
 class CodeGeneratorManager {
     async reload() {
         Targets.reset();
-        const languageTargets = ClusterConfiguration.getDefinitions(TARGET_KIND);
+        const languageTargets = definitionsManager.getDefinitions(TARGET_KIND);
         for (const languageTarget of languageTargets) {
             const key = `${languageTarget.definition.metadata.name}:${languageTarget.version}`;
             try {
@@ -31,7 +32,7 @@ class CodeGeneratorManager {
             return false;
         }
 
-        const blockTypes = ClusterConfiguration.getDefinitions(BLOCK_TYPE_KIND);
+        const blockTypes = definitionsManager.getDefinitions(BLOCK_TYPE_KIND);
         const blockTypeKinds = blockTypes.map(
             (blockType) => blockType.definition.metadata.name.toLowerCase() + ':' + blockType.version
         );

package/src/config/routes.ts

@@ -41,7 +41,7 @@ router.put('/instance', async (req: KapetaBodyRequest, res) => {
         if (req.kapeta!.instanceId) {
             configManager.setConfigForSection(req.kapeta!.systemId, req.kapeta!.instanceId, config);
             //Restart the instance if it is running after config change
-            await instanceManager.restartIfRunning(req.kapeta!.systemId, req.kapeta!.instanceId);
+            await instanceManager.restart(req.kapeta!.systemId, req.kapeta!.instanceId);
         } else {
             configManager.setConfigForSystem(req.kapeta!.systemId, config);
         }

package/src/configManager.ts

@@ -3,6 +3,7 @@ import { BlockInstance } from '@kapeta/schemas';
 import { storageService } from './storageService';
 import { assetManager } from './assetManager';
 import { parseKapetaUri } from '@kapeta/nodejs-utils';
+import { normalizeKapetaUri } from './utils/utils';
 
 type AnyMap = { [key: string]: any };
 
@@ -19,6 +20,7 @@ class ConfigManager {
     }
 
     _forSystem(systemId: string) {
+        systemId = normalizeKapetaUri(systemId);
         if (!this._config[systemId]) {
             this._config[systemId] = {};
         }
@@ -27,16 +29,19 @@ class ConfigManager {
     }
 
     setConfigForSystem(systemId: string, config: AnyMap) {
+        systemId = normalizeKapetaUri(systemId);
         const systemConfig = config || {};
 
         storageService.put('config', systemId, systemConfig);
     }
 
     getConfigForSystem(systemId: string): AnyMap {
+        systemId = normalizeKapetaUri(systemId);
         return this._forSystem(systemId);
     }
 
     setConfigForSection(systemId: string, sectionId: string, config: AnyMap) {
+        systemId = normalizeKapetaUri(systemId);
         let systemConfig = this._forSystem(systemId);
         systemConfig[sectionId] = config || {};
 
@@ -44,6 +49,7 @@ class ConfigManager {
     }
 
     getConfigForSection(systemId: string, sectionId: string) {
+        systemId = normalizeKapetaUri(systemId);
         const systemConfig = this._forSystem(systemId);
 
         if (!systemConfig[sectionId]) {
@@ -70,6 +76,10 @@ class ConfigManager {
      * @returns {Promise<{systemId:string,instanceId:string}>}
      */
     async resolveIdentity(blockRef: string, systemId?: string) {
+        blockRef = normalizeKapetaUri(blockRef);
+        if (systemId) {
+            systemId = normalizeKapetaUri(systemId);
+        }
         const planAssets = assetManager.getPlans();
 
         const blockUri = parseKapetaUri(blockRef);
@@ -89,7 +99,7 @@ class ConfigManager {
                 const refUri = parseKapetaUri(blockInstance.block.ref);
                 if (refUri.equals(blockUri)) {
                     matchingIdentities.push({
-                        systemId: planAsset.ref,
+                        systemId: normalizeKapetaUri(planAsset.ref),
                         instanceId: blockInstance.id,
                     });
                 }
@@ -120,6 +130,8 @@ class ConfigManager {
     }
 
     async verifyIdentity(blockRef: string, systemId: string, instanceId: string) {
+        blockRef = normalizeKapetaUri(blockRef);
+        systemId = normalizeKapetaUri(systemId);
         const planAssets = assetManager.getPlans();
         const systemUri = systemId ? parseKapetaUri(systemId) : null;
         const blockUri = parseKapetaUri(blockRef);

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 };
 
@@ -27,6 +28,25 @@ export interface DockerMounts {
     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;
+    };
+}
+
 interface Health {
     cmd: string;
     interval?: number;
@@ -36,11 +56,13 @@ interface Health {
 
 const LABEL_PORT_PREFIX = 'kapeta_port-';
 const NANO_SECOND = 1000000;
-const HEALTH_CHECK_INTERVAL = 2000;
-const HEALTH_CHECK_MAX = 30;
+const HEALTH_CHECK_INTERVAL = 3000;
+const HEALTH_CHECK_MAX = 20;
 const IMAGE_PULL_CACHE_TTL = 30 * 60 * 1000;
 const IMAGE_PULL_CACHE: { [key: string]: number } = {};
 
+export const HEALTH_CHECK_TIMEOUT = HEALTH_CHECK_INTERVAL * HEALTH_CHECK_MAX * 2;
+
 const promisifyStream = (stream: ReadStream) =>
     new Promise((resolve, reject) => {
         stream.on('data', (d) => console.log(d.toString()));
@@ -165,11 +187,17 @@ class ContainerManager {
         return this._docker;
     }
 
-    async getContainerByName(containerName: string): Promise<Container | undefined> {
+    async getContainerByName(containerName: string): Promise<ContainerInfo | undefined> {
         const containers = await this.docker().container.list({ all: true });
-        return containers.find((container) => {
-            return (container.data as any).Names.indexOf(`/${containerName}`) > -1;
+        const out = containers.find((container) => {
+            const containerData = container.data as any;
+            return containerData.Names.indexOf(`/${containerName}`) > -1;
         });
+
+        if (out) {
+            return new ContainerInfo(out);
+        }
+        return undefined;
     }
 
     async pull(image: string, cacheForMS: number = IMAGE_PULL_CACHE_TTL) {
@@ -371,18 +399,36 @@ class ContainerManager {
     }
 
     async _isReady(container: Container) {
-        const info: Container = await container.status();
+        let info: Container;
+        try {
+            info = await container.status();
+        } catch (err) {
+            return false;
+        }
         const infoData: any = info?.data;
-        if (infoData?.State?.Status === 'exited') {
+        const state = infoData?.State as DockerState;
+        if (state?.Status === 'exited' || state?.Status === 'removing' || state?.Status === 'dead') {
             throw new Error('Container exited unexpectedly');
         }
         return infoData?.State?.Running ?? false;
     }
 
     async _isHealthy(container: Container) {
-        const info = await container.status();
-        const infoData: any = info?.data;
-        return infoData?.State?.Health?.Status === 'healthy';
+        try {
+            const info = await container.status();
+            const infoData: any = info?.data;
+            return infoData?.State?.Health?.Status === 'healthy';
+        } catch (err) {
+            return false;
+        }
+    }
+
+    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 });
     }
 
     /**
@@ -429,7 +475,7 @@ export class ContainerInfo {
     }
 
     async isRunning() {
-        const inspectResult = await this.getStatus();
+        const inspectResult = await this.inspect();
 
         if (!inspectResult || !inspectResult.State) {
             return false;
@@ -451,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) {
@@ -464,14 +510,24 @@ export class ContainerInfo {
         return null;
     }
 
-    async getStatus() {
-        const result = await this._container.status();
+    async inspect() {
+        try {
+            const result = await this._container.status();
+
+            return result ? (result.data as any) : null;
+        } catch (err) {
+            return null;
+        }
+    }
+
+    async status() {
+        const result = await this.inspect();
 
-        return result ? (result.data as any) : null;
+        return result.State as DockerState;
     }
 
     async getPorts(): Promise<PortMap | false> {
-        const inspectResult = await this.getStatus();
+        const inspectResult = await this.inspect();
 
         if (!inspectResult || !inspectResult.Config || !inspectResult.Config.Labels) {
             return false;

package/src/definitionsManager.ts

@@ -0,0 +1,54 @@
+import ClusterConfiguration, { DefinitionInfo } from '@kapeta/local-cluster-config';
+
+const CACHE_TTL = 60 * 1000; // 1 min
+
+interface DefinitionCacheEntry {
+    expires: number;
+    definitions: DefinitionInfo[];
+}
+
+class DefinitionsManager {
+    private cache: { [key: string]: DefinitionCacheEntry } = {};
+
+    private getKey(kindFilter?: string | string[]) {
+        if (kindFilter) {
+            if (Array.isArray(kindFilter)) {
+                return kindFilter.join(',');
+            }
+            return kindFilter;
+        }
+        return 'none';
+    }
+
+    public clearCache() {
+        this.cache = {};
+    }
+
+    private doCached(key: string, getter: () => DefinitionInfo[]) {
+        if (this.cache[key]) {
+            if (this.cache[key].expires > Date.now()) {
+                return this.cache[key].definitions;
+            }
+            delete this.cache[key];
+        }
+
+        this.cache[key] = {
+            expires: Date.now() + CACHE_TTL,
+            definitions: getter(),
+        };
+
+        return this.cache[key].definitions;
+    }
+
+    public getDefinitions(kindFilter?: string | string[]) {
+        const key = this.getKey(kindFilter);
+
+        return this.doCached(key, () => ClusterConfiguration.getDefinitions(kindFilter));
+    }
+
+    public getProviderDefinitions() {
+        return this.doCached('providers', () => ClusterConfiguration.getProviderDefinitions());
+    }
+}
+
+export const definitionsManager = new DefinitionsManager();

package/src/filesystemManager.ts

@@ -17,9 +17,7 @@ function isFile(path: string) {
 class FilesystemManager {
     async writeFile(path: string, data: string | Buffer) {
         const dirName = Path.dirname(path);
-        console.log('Dir name', dirName, path);
         if (!FS.existsSync(dirName)) {
-            console.log('Making folder', dirName);
             FSExtra.mkdirpSync(dirName, {});
         }
         FS.writeFileSync(path, data);