@kapeta/local-cluster-service 0.12.0 → 0.12.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.12.1](https://github.com/kapetacom/local-cluster-service/compare/v0.12.0...v0.12.1) (2023-08-02)
+
+
+### Bug Fixes
+
+* Adjustments to make starting plans locally smoother ([fc353ad](https://github.com/kapetacom/local-cluster-service/commit/fc353adde350b7e9d4c7eb9347c4cfa0c3a6aa58))
+
 # [0.12.0](https://github.com/kapetacom/local-cluster-service/compare/v0.11.1...v0.12.0) (2023-07-31)
 
 

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

@@ -59,7 +59,7 @@ declare class ContainerManager {
     ping(): Promise<void>;
     docker(): Docker;
     getContainerByName(containerName: string): Promise<ContainerInfo | undefined>;
-    pull(image: string, cacheForMS?: number): Promise<boolean>;
+    pull(image: string): Promise<boolean>;
     toDockerMounts(mounts: StringMap): DockerMounts[];
     toDockerHealth(health: Health): {
         Test: string[];

package/dist/cjs/src/containerManager.js

@@ -22,8 +22,6 @@ exports.CONTAINER_LABEL_PORT_PREFIX = 'kapeta_port-';
 const NANO_SECOND = 1000000;
 const HEALTH_CHECK_INTERVAL = 3000;
 const HEALTH_CHECK_MAX = 20;
-const IMAGE_PULL_CACHE_TTL = 30 * 60 * 1000;
-const IMAGE_PULL_CACHE = {};
 exports.HEALTH_CHECK_TIMEOUT = HEALTH_CHECK_INTERVAL * HEALTH_CHECK_MAX * 2;
 const promisifyStream = (stream, handler) => new Promise((resolve, reject) => {
     stream.on('data', handler);
@@ -151,17 +149,11 @@ class ContainerManager {
         }
         return undefined;
     }
-    async pull(image, cacheForMS = IMAGE_PULL_CACHE_TTL) {
+    async pull(image) {
         let [imageName, tag] = image.split(/:/);
         if (!tag) {
             tag = 'latest';
         }
-        if (IMAGE_PULL_CACHE[image]) {
-            const timeSince = Date.now() - IMAGE_PULL_CACHE[image];
-            if (timeSince < cacheForMS) {
-                return false;
-            }
-        }
         const imageTagList = (await this.docker().image.list())
             .map((image) => image.data)
             .filter((imageData) => !!imageData.RepoTags)
@@ -171,7 +163,7 @@ class ContainerManager {
             return false;
         }
         const timeStarted = Date.now();
-        socketManager_1.socketManager.emitGlobal(EVENT_IMAGE_PULL, { image, percent: 0 });
+        socketManager_1.socketManager.emitGlobal(EVENT_IMAGE_PULL, { image, percent: -1 });
         const api = new nodejs_api_client_1.KapetaAPI();
         const accessToken = await api.getAccessToken();
         const auth = image.startsWith('docker.kapeta.com/')
@@ -283,7 +275,6 @@ class ContainerManager {
             lastEmitted = Date.now();
             //console.log('Pulling image %s: %s % [done: %s, total: %s]', image, Math.round(percent), totals.done, totals.total);
         });
-        IMAGE_PULL_CACHE[image] = Date.now();
         socketManager_1.socketManager.emitGlobal(EVENT_IMAGE_PULL, { image, percent: 100, timeTaken: Date.now() - timeStarted });
         return true;
     }
@@ -319,9 +310,7 @@ class ContainerManager {
         dockerOpts.Labels.HASH = hash;
     }
     async ensureContainer(opts) {
-        const container = await this.createOrUpdateContainer(opts);
-        await this.waitForReady(container);
-        return container;
+        return await this.createOrUpdateContainer(opts);
     }
     async createOrUpdateContainer(opts) {
         let imagePulled = await this.pull(opts.Image);

package/dist/cjs/src/instanceManager.js

@@ -55,7 +55,13 @@ class InstanceManager {
             return [];
         }
         systemId = (0, utils_1.normalizeKapetaUri)(systemId);
-        return this._instances.filter((instance) => instance.systemId === systemId);
+        const planInfo = definitionsManager_1.definitionsManager.getDefinition(systemId);
+        if (!planInfo) {
+            return [];
+        }
+        const plan = planInfo.definition;
+        const instanceIds = plan.spec.blocks.map((block) => block.id);
+        return this._instances.filter((instance) => instance.systemId === systemId && instanceIds.includes(instance.instanceId));
     }
     getInstance(systemId, instanceId) {
         systemId = (0, utils_1.normalizeKapetaUri)(systemId);
@@ -393,7 +399,7 @@ class InstanceManager {
                 ];
                 const out = await this.saveInternalInstance({
                     ...instance,
-                    type: types_1.InstanceType.LOCAL,
+                    type: types_1.InstanceType.UNKNOWN,
                     pid: null,
                     health: null,
                     portType: DEFAULT_HEALTH_PORT_TYPE,

package/dist/cjs/src/instances/routes.js

@@ -122,8 +122,10 @@ router.put('/', async (req, res) => {
         const oldInstance = instanceManager_1.instanceManager.getInstance(req.kapeta.systemId, req.kapeta.instanceId);
         if (oldInstance) {
             instance.pid = oldInstance.pid;
+            instance.desiredStatus = oldInstance.desiredStatus;
         }
         instance.type = types_1.InstanceType.DOCKER;
+        instance.owner = types_1.InstanceOwner.INTERNAL;
     }
     else {
         // Coming from user starting the instance outside of kapeta

package/dist/cjs/src/operatorManager.js

@@ -181,6 +181,7 @@ class OperatorManager {
                     Mounts,
                 },
             });
+            await containerManager_1.containerManager.waitForReady(container);
             return new containerManager_1.ContainerInfo(container);
         });
     }

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

@@ -324,7 +324,6 @@ class BlockInstanceRunner {
     }
     async ensureContainer(opts) {
         const container = await containerManager_1.containerManager.ensureContainer(opts);
-        await containerManager_1.containerManager.waitForReady(container);
         return this._handleContainer(container);
     }
     async _handleContainer(container) {

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

@@ -59,7 +59,7 @@ declare class ContainerManager {
     ping(): Promise<void>;
     docker(): Docker;
     getContainerByName(containerName: string): Promise<ContainerInfo | undefined>;
-    pull(image: string, cacheForMS?: number): Promise<boolean>;
+    pull(image: string): Promise<boolean>;
     toDockerMounts(mounts: StringMap): DockerMounts[];
     toDockerHealth(health: Health): {
         Test: string[];

package/dist/esm/src/containerManager.js

@@ -16,8 +16,6 @@ export const CONTAINER_LABEL_PORT_PREFIX = 'kapeta_port-';
 const NANO_SECOND = 1000000;
 const HEALTH_CHECK_INTERVAL = 3000;
 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, handler) => new Promise((resolve, reject) => {
     stream.on('data', handler);
@@ -145,17 +143,11 @@ class ContainerManager {
         }
         return undefined;
     }
-    async pull(image, cacheForMS = IMAGE_PULL_CACHE_TTL) {
+    async pull(image) {
         let [imageName, tag] = image.split(/:/);
         if (!tag) {
             tag = 'latest';
         }
-        if (IMAGE_PULL_CACHE[image]) {
-            const timeSince = Date.now() - IMAGE_PULL_CACHE[image];
-            if (timeSince < cacheForMS) {
-                return false;
-            }
-        }
         const imageTagList = (await this.docker().image.list())
             .map((image) => image.data)
             .filter((imageData) => !!imageData.RepoTags)
@@ -165,7 +157,7 @@ class ContainerManager {
             return false;
         }
         const timeStarted = Date.now();
-        socketManager.emitGlobal(EVENT_IMAGE_PULL, { image, percent: 0 });
+        socketManager.emitGlobal(EVENT_IMAGE_PULL, { image, percent: -1 });
         const api = new KapetaAPI();
         const accessToken = await api.getAccessToken();
         const auth = image.startsWith('docker.kapeta.com/')
@@ -277,7 +269,6 @@ class ContainerManager {
             lastEmitted = Date.now();
             //console.log('Pulling image %s: %s % [done: %s, total: %s]', image, Math.round(percent), totals.done, totals.total);
         });
-        IMAGE_PULL_CACHE[image] = Date.now();
         socketManager.emitGlobal(EVENT_IMAGE_PULL, { image, percent: 100, timeTaken: Date.now() - timeStarted });
         return true;
     }
@@ -313,9 +304,7 @@ class ContainerManager {
         dockerOpts.Labels.HASH = hash;
     }
     async ensureContainer(opts) {
-        const container = await this.createOrUpdateContainer(opts);
-        await this.waitForReady(container);
-        return container;
+        return await this.createOrUpdateContainer(opts);
     }
     async createOrUpdateContainer(opts) {
         let imagePulled = await this.pull(opts.Image);

package/dist/esm/src/instanceManager.js

@@ -49,7 +49,13 @@ export class InstanceManager {
             return [];
         }
         systemId = normalizeKapetaUri(systemId);
-        return this._instances.filter((instance) => instance.systemId === systemId);
+        const planInfo = definitionsManager.getDefinition(systemId);
+        if (!planInfo) {
+            return [];
+        }
+        const plan = planInfo.definition;
+        const instanceIds = plan.spec.blocks.map((block) => block.id);
+        return this._instances.filter((instance) => instance.systemId === systemId && instanceIds.includes(instance.instanceId));
     }
     getInstance(systemId, instanceId) {
         systemId = normalizeKapetaUri(systemId);
@@ -387,7 +393,7 @@ export class InstanceManager {
                 ];
                 const out = await this.saveInternalInstance({
                     ...instance,
-                    type: InstanceType.LOCAL,
+                    type: InstanceType.UNKNOWN,
                     pid: null,
                     health: null,
                     portType: DEFAULT_HEALTH_PORT_TYPE,

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

@@ -117,8 +117,10 @@ router.put('/', async (req, res) => {
         const oldInstance = instanceManager.getInstance(req.kapeta.systemId, req.kapeta.instanceId);
         if (oldInstance) {
             instance.pid = oldInstance.pid;
+            instance.desiredStatus = oldInstance.desiredStatus;
         }
         instance.type = InstanceType.DOCKER;
+        instance.owner = InstanceOwner.INTERNAL;
     }
     else {
         // Coming from user starting the instance outside of kapeta

package/dist/esm/src/operatorManager.js

@@ -175,6 +175,7 @@ class OperatorManager {
                     Mounts,
                 },
             });
+            await containerManager.waitForReady(container);
             return new ContainerInfo(container);
         });
     }

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

@@ -318,7 +318,6 @@ export class BlockInstanceRunner {
     }
     async ensureContainer(opts) {
         const container = await containerManager.ensureContainer(opts);
-        await containerManager.waitForReady(container);
         return this._handleContainer(container);
     }
     async _handleContainer(container) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.12.0",
+    "version": "0.12.1",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {

package/src/containerManager.ts

@@ -66,8 +66,7 @@ export const CONTAINER_LABEL_PORT_PREFIX = 'kapeta_port-';
 const NANO_SECOND = 1000000;
 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;
 
@@ -223,19 +222,12 @@ class ContainerManager {
         return undefined;
     }
 
-    async pull(image: string, cacheForMS: number = IMAGE_PULL_CACHE_TTL) {
+    async pull(image: string) {
         let [imageName, tag] = image.split(/:/);
         if (!tag) {
             tag = 'latest';
         }
 
-        if (IMAGE_PULL_CACHE[image]) {
-            const timeSince = Date.now() - IMAGE_PULL_CACHE[image];
-            if (timeSince < cacheForMS) {
-                return false;
-            }
-        }
-
         const imageTagList = (await this.docker().image.list())
             .map((image) => image.data as any)
             .filter((imageData) => !!imageData.RepoTags)
@@ -247,7 +239,7 @@ class ContainerManager {
         }
 
         const timeStarted = Date.now();
-        socketManager.emitGlobal(EVENT_IMAGE_PULL, { image, percent: 0 });
+        socketManager.emitGlobal(EVENT_IMAGE_PULL, { image, percent: -1 });
 
         const api = new KapetaAPI();
         const accessToken = await api.getAccessToken();
@@ -390,8 +382,6 @@ class ContainerManager {
             //console.log('Pulling image %s: %s % [done: %s, total: %s]', image, Math.round(percent), totals.done, totals.total);
         });
 
-        IMAGE_PULL_CACHE[image] = Date.now();
-
         socketManager.emitGlobal(EVENT_IMAGE_PULL, { image, percent: 100, timeTaken: Date.now() - timeStarted });
 
         return true;
@@ -435,11 +425,7 @@ class ContainerManager {
     }
 
     public async ensureContainer(opts: any) {
-        const container = await this.createOrUpdateContainer(opts);
-
-        await this.waitForReady(container);
-
-        return container;
+        return await this.createOrUpdateContainer(opts);
     }
 
     private async createOrUpdateContainer(opts: any) {

package/src/instanceManager.ts

@@ -9,7 +9,7 @@ import { assetManager } from './assetManager';
 import { containerManager, HEALTH_CHECK_TIMEOUT } from './containerManager';
 import { configManager } from './configManager';
 import { DesiredInstanceStatus, InstanceInfo, InstanceOwner, InstanceStatus, InstanceType, LogEntry } from './types';
-import { BlockDefinitionSpec, BlockInstance } from '@kapeta/schemas';
+import {BlockDefinitionSpec, BlockInstance, Plan} from '@kapeta/schemas';
 import { getBlockInstanceContainerName, normalizeKapetaUri } from './utils/utils';
 import { KIND_OPERATOR, operatorManager } from './operatorManager';
 import { parseKapetaUri } from '@kapeta/nodejs-utils';
@@ -64,7 +64,17 @@ export class InstanceManager {
 
         systemId = normalizeKapetaUri(systemId);
 
-        return this._instances.filter((instance) => instance.systemId === systemId);
+        const planInfo = definitionsManager.getDefinition(systemId);
+
+        if (!planInfo) {
+            return [];
+        }
+
+        const plan = planInfo.definition as Plan;
+
+        const instanceIds = plan.spec.blocks.map((block) => block.id);
+
+        return this._instances.filter((instance) => instance.systemId === systemId && instanceIds.includes(instance.instanceId));
     }
 
     public getInstance(systemId: string, instanceId: string) {
@@ -482,7 +492,7 @@ export class InstanceManager {
 
                 const out = await this.saveInternalInstance({
                     ...instance,
-                    type: InstanceType.LOCAL,
+                    type: InstanceType.UNKNOWN,
                     pid: null,
                     health: null,
                     portType: DEFAULT_HEALTH_PORT_TYPE,

package/src/instances/routes.ts

@@ -146,8 +146,10 @@ router.put('/', async (req: KapetaBodyRequest, res: Response) => {
         const oldInstance = instanceManager.getInstance(req.kapeta!.systemId, req.kapeta!.instanceId);
         if (oldInstance) {
             instance.pid = oldInstance.pid;
+            instance.desiredStatus = oldInstance.desiredStatus;
         }
         instance.type = InstanceType.DOCKER;
+        instance.owner = InstanceOwner.INTERNAL;
     } else {
         // Coming from user starting the instance outside of kapeta
         instance.type = InstanceType.LOCAL;

package/src/operatorManager.ts

@@ -246,6 +246,8 @@ class OperatorManager {
                 },
             });
 
+            await containerManager.waitForReady(container);
+
             return new ContainerInfo(container);
         });
     }

package/src/utils/BlockInstanceRunner.ts

@@ -415,8 +415,6 @@ export class BlockInstanceRunner {
     private async ensureContainer(opts: any) {
         const container = await containerManager.ensureContainer(opts);
 
-        await containerManager.waitForReady(container);
-
         return this._handleContainer(container);
     }