@kapeta/local-cluster-service 0.11.1 → 0.12.1

package/dist/cjs/src/operatorManager.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.operatorManager = void 0;
+exports.operatorManager = exports.KIND_OPERATOR = void 0;
 const path_1 = __importDefault(require("path"));
 const md5_1 = __importDefault(require("md5"));
 const nodejs_utils_1 = require("@kapeta/nodejs-utils");
@@ -14,7 +14,8 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const definitionsManager_1 = require("./definitionsManager");
 const utils_1 = require("./utils/utils");
 const lodash_1 = __importDefault(require("lodash"));
-const KIND_OPERATOR = 'core/resource-type-operator';
+const async_lock_1 = __importDefault(require("async-lock"));
+exports.KIND_OPERATOR = 'core/resource-type-operator';
 class Operator {
     _data;
     constructor(data) {
@@ -29,6 +30,7 @@ class Operator {
 }
 class OperatorManager {
     _mountDir;
+    operatorLock = new async_lock_1.default();
     constructor() {
         this._mountDir = path_1.default.join(storageService_1.storageService.getKapetaBasedir(), 'mounts');
         fs_extra_1.default.mkdirpSync(this._mountDir);
@@ -44,7 +46,7 @@ class OperatorManager {
      * @return {Operator}
      */
     getOperator(resourceType, version) {
-        const operators = definitionsManager_1.definitionsManager.getDefinitions(KIND_OPERATOR);
+        const operators = definitionsManager_1.definitionsManager.getDefinitions(exports.KIND_OPERATOR);
         const operator = operators.find((operator) => operator.definition &&
             operator.definition.metadata &&
             operator.definition.metadata.name &&
@@ -113,74 +115,75 @@ class OperatorManager {
      * @return {Promise<ContainerInfo>}
      */
     async ensureResource(systemId, resourceType, version) {
-        const operator = this.getOperator(resourceType, version);
-        const operatorData = operator.getData();
-        const portTypes = Object.keys(operatorData.ports);
-        portTypes.sort();
-        const ports = {};
-        for (let i = 0; i < portTypes.length; i++) {
-            const portType = portTypes[i];
-            let containerPortInfo = operatorData.ports[portType];
-            const hostPort = await serviceManager_1.serviceManager.ensureServicePort(systemId, resourceType, portType);
-            if (typeof containerPortInfo === 'number' || typeof containerPortInfo === 'string') {
-                containerPortInfo = { port: containerPortInfo, type: 'tcp' };
-            }
-            if (!containerPortInfo.type) {
-                containerPortInfo.type = 'tcp';
+        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        const key = `${systemId}#${resourceType}:${version}`;
+        return await this.operatorLock.acquire(key, async () => {
+            const operator = this.getOperator(resourceType, version);
+            const operatorData = operator.getData();
+            const portTypes = Object.keys(operatorData.ports);
+            portTypes.sort();
+            const ports = {};
+            for (let i = 0; i < portTypes.length; i++) {
+                const portType = portTypes[i];
+                let containerPortInfo = operatorData.ports[portType];
+                const hostPort = await serviceManager_1.serviceManager.ensureServicePort(systemId, resourceType, portType);
+                if (typeof containerPortInfo === 'number' || typeof containerPortInfo === 'string') {
+                    containerPortInfo = { port: containerPortInfo, type: 'tcp' };
+                }
+                if (!containerPortInfo.type) {
+                    containerPortInfo.type = 'tcp';
+                }
+                const portId = containerPortInfo.port + '/' + containerPortInfo.type;
+                ports[portId] = {
+                    type: portType,
+                    hostPort,
+                };
             }
-            const portId = containerPortInfo.port + '/' + containerPortInfo.type;
-            ports[portId] = {
-                type: portType,
-                hostPort,
+            const mounts = await containerManager_1.containerManager.createMounts(systemId, resourceType, operatorData.mounts);
+            const nameParts = [systemId, resourceType.toLowerCase(), version];
+            const containerName = `kapeta-resource-${(0, md5_1.default)(nameParts.join('_'))}`;
+            const PortBindings = {};
+            const Env = [];
+            const Labels = {
+                kapeta: 'true',
             };
-        }
-        const mounts = await containerManager_1.containerManager.createMounts(systemId, resourceType, operatorData.mounts);
-        const nameParts = [
-            systemId,
-            resourceType.toLowerCase(),
-            version
-        ];
-        const containerName = `kapeta-resource-${(0, md5_1.default)(nameParts.join('_'))}`;
-        const PortBindings = {};
-        const Env = [];
-        const Labels = {
-            kapeta: 'true',
-        };
-        const bindHost = (0, utils_1.getBindHost)();
-        const ExposedPorts = {};
-        lodash_1.default.forEach(ports, (portInfo, containerPort) => {
-            ExposedPorts['' + containerPort] = {};
-            PortBindings['' + containerPort] = [
-                {
-                    HostPort: '' + portInfo.hostPort,
-                    HostIp: bindHost,
+            const bindHost = (0, utils_1.getBindHost)();
+            const ExposedPorts = {};
+            lodash_1.default.forEach(ports, (portInfo, containerPort) => {
+                ExposedPorts['' + containerPort] = {};
+                PortBindings['' + containerPort] = [
+                    {
+                        HostPort: '' + portInfo.hostPort,
+                        HostIp: bindHost,
+                    },
+                ];
+                Labels[containerManager_1.CONTAINER_LABEL_PORT_PREFIX + portInfo.hostPort] = portInfo.type;
+            });
+            const Mounts = containerManager_1.containerManager.toDockerMounts(mounts);
+            lodash_1.default.forEach(operatorData.env, (value, name) => {
+                Env.push(name + '=' + value);
+            });
+            let HealthCheck = undefined;
+            if (operatorData.health) {
+                HealthCheck = containerManager_1.containerManager.toDockerHealth(operatorData.health);
+            }
+            const container = await containerManager_1.containerManager.ensureContainer({
+                name: containerName,
+                Image: operatorData.image,
+                Hostname: containerName + '.kapeta',
+                Labels,
+                Cmd: operatorData.cmd,
+                ExposedPorts,
+                Env,
+                HealthCheck,
+                HostConfig: {
+                    PortBindings,
+                    Mounts,
                 },
-            ];
-            Labels[containerManager_1.CONTAINER_LABEL_PORT_PREFIX + portInfo.hostPort] = portInfo.type;
-        });
-        const Mounts = containerManager_1.containerManager.toDockerMounts(mounts);
-        lodash_1.default.forEach(operatorData.env, (value, name) => {
-            Env.push(name + '=' + value);
-        });
-        let HealthCheck = undefined;
-        if (operatorData.health) {
-            HealthCheck = containerManager_1.containerManager.toDockerHealth(operatorData.health);
-        }
-        const container = await containerManager_1.containerManager.ensureContainer({
-            name: containerName,
-            Image: operatorData.image,
-            Hostname: containerName + '.kapeta',
-            Labels,
-            Cmd: operatorData.cmd,
-            ExposedPorts,
-            Env,
-            HealthCheck,
-            HostConfig: {
-                PortBindings,
-                Mounts,
-            },
+            });
+            await containerManager_1.containerManager.waitForReady(container);
+            return new containerManager_1.ContainerInfo(container);
         });
-        return new containerManager_1.ContainerInfo(container);
     }
 }
 exports.operatorManager = new OperatorManager();

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

@@ -7,6 +7,7 @@ export declare class SocketManager {
     isAlive(): boolean;
     private get io();
     emit(context: string, type: string, payload: any): void;
+    emitGlobal(type: string, payload: any): void;
     _bindIO(): void;
     _handleSocketCreated(socket: Socket): void;
     _bindSocket(socket: Socket): void;

package/dist/cjs/src/socketManager.js

@@ -29,6 +29,9 @@ class SocketManager {
     emit(context, type, payload) {
         this.io.to(context).emit(type, { context, payload });
     }
+    emitGlobal(type, payload) {
+        this.io.emit(type, { payload });
+    }
     _bindIO() {
         this.io.on('connection', (socket) => this._handleSocketCreated(socket));
     }

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

@@ -58,6 +58,7 @@ export type InstanceInfo = {
     type: InstanceType;
     owner: InstanceOwner;
     status: InstanceStatus;
+    errorMessage?: string;
     desiredStatus: DesiredInstanceStatus;
     address?: string;
     startedAt?: number;

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

@@ -200,7 +200,7 @@ class BlockInstanceRunner {
                 `KAPETA_LOCAL_CLUSTER_PORT=${clusterService_1.clusterService.getClusterServicePort()}`,
                 ...Object.entries({
                     ...env,
-                    ...addonEnv
+                    ...addonEnv,
                 }).map(([key, value]) => `${key}=${value}`),
             ],
             HostConfig: {
@@ -324,13 +324,12 @@ 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) {
         return {
             type: types_1.InstanceType.DOCKER,
-            pid: container.id
+            pid: container.id,
         };
     }
 }

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

@@ -32,7 +32,7 @@ router.put('/instance', async (req, 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.restart(req.kapeta.systemId, req.kapeta.instanceId);
+            await instanceManager.prepareForRestart(req.kapeta.systemId, req.kapeta.instanceId);
         }
         else {
             configManager.setConfigForSystem(req.kapeta.systemId, config);

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

@@ -1,6 +1,6 @@
 import { Docker } from 'node-docker-api';
 import { Container } from 'node-docker-api/lib/container';
-import { InstanceInfo, LogEntry } from "./types";
+import { InstanceInfo, LogEntry } from './types';
 type StringMap = {
     [key: string]: string;
 };
@@ -49,6 +49,7 @@ declare class ContainerManager {
     private _alive;
     private _mountDir;
     private _version;
+    private _lastDockerAccessCheck;
     constructor();
     initialize(): Promise<void>;
     checkAlive(): Promise<boolean>;
@@ -58,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

@@ -8,13 +8,14 @@ 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";
+import { getBlockInstanceContainerName } from './utils/utils';
+import { socketManager } from './socketManager';
+import { KapetaAPI } from '@kapeta/nodejs-api-client';
+const EVENT_IMAGE_PULL = 'docker-image-pull';
 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);
@@ -26,6 +27,7 @@ class ContainerManager {
     _alive;
     _mountDir;
     _version;
+    _lastDockerAccessCheck = 0;
     constructor() {
         this._docker = null;
         this._alive = false;
@@ -141,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)
@@ -160,17 +156,120 @@ class ContainerManager {
             console.log('Image found: %s', image);
             return false;
         }
-        console.log('Pulling image: %s', image);
-        const stream = await this.docker()
-            .image.create({}, {
+        const timeStarted = Date.now();
+        socketManager.emitGlobal(EVENT_IMAGE_PULL, { image, percent: -1 });
+        const api = new KapetaAPI();
+        const accessToken = await api.getAccessToken();
+        const auth = image.startsWith('docker.kapeta.com/')
+            ? {
+                username: 'kapeta',
+                password: accessToken,
+                serveraddress: 'docker.kapeta.com',
+            }
+            : {};
+        const stream = (await this.docker().image.create(auth, {
             fromImage: imageName,
             tag: tag,
+        }));
+        const chunks = {};
+        let lastEmitted = Date.now();
+        await promisifyStream(stream, (rawData) => {
+            const lines = rawData.toString().trim().split('\n');
+            lines.forEach((line) => {
+                const data = JSON.parse(line);
+                if (![
+                    'Waiting',
+                    'Downloading',
+                    'Extracting',
+                    'Download complete',
+                    'Pull complete',
+                    'Already exists',
+                ].includes(data.status)) {
+                    return;
+                }
+                if (!chunks[data.id]) {
+                    chunks[data.id] = {
+                        downloading: {
+                            total: 0,
+                            current: 0,
+                        },
+                        extracting: {
+                            total: 0,
+                            current: 0,
+                        },
+                        done: false,
+                    };
+                }
+                const chunk = chunks[data.id];
+                switch (data.status) {
+                    case 'Downloading':
+                        chunk.downloading = data.progressDetail;
+                        break;
+                    case 'Extracting':
+                        chunk.extracting = data.progressDetail;
+                        break;
+                    case 'Download complete':
+                        chunk.downloading.current = chunks[data.id].downloading.total;
+                        break;
+                    case 'Pull complete':
+                        chunk.extracting.current = chunks[data.id].extracting.total;
+                        chunk.done = true;
+                        break;
+                    case 'Already exists':
+                        // Force layer to be done
+                        chunk.downloading.current = 1;
+                        chunk.downloading.total = 1;
+                        chunk.extracting.current = 1;
+                        chunk.extracting.total = 1;
+                        chunk.done = true;
+                        break;
+                }
+            });
+            if (Date.now() - lastEmitted < 1000) {
+                return;
+            }
+            const chunkList = Object.values(chunks);
+            let totals = {
+                downloading: {
+                    total: 0,
+                    current: 0,
+                },
+                extracting: {
+                    total: 0,
+                    current: 0,
+                },
+                total: chunkList.length,
+                done: 0,
+            };
+            chunkList.forEach((chunk) => {
+                if (chunk.downloading.current > 0) {
+                    totals.downloading.current += chunk.downloading.current;
+                }
+                if (chunk.downloading.total > 0) {
+                    totals.downloading.total += chunk.downloading.total;
+                }
+                if (chunk.extracting.current > 0) {
+                    totals.extracting.current += chunk.extracting.current;
+                }
+                if (chunk.extracting.total > 0) {
+                    totals.extracting.total += chunk.extracting.total;
+                }
+                if (chunk.done) {
+                    totals.done++;
+                }
+            });
+            const percent = totals.total > 0 ? (totals.done / totals.total) * 100 : 0;
+            //We emit at most every second to not spam the client
+            socketManager.emitGlobal(EVENT_IMAGE_PULL, {
+                image,
+                percent,
+                status: totals,
+                timeTaken: Date.now() - timeStarted,
+            });
+            lastEmitted = Date.now();
+            //console.log('Pulling image %s: %s % [done: %s, total: %s]', image, Math.round(percent), totals.done, totals.total);
         });
-        await promisifyStream(stream, (chunk) => {
-            console.log('Data from docker: "%s"', chunk.toString());
-        });
-        IMAGE_PULL_CACHE[image] = Date.now();
-        console.log('Image pulled: %s', image);
+        socketManager.emitGlobal(EVENT_IMAGE_PULL, { image, percent: 100, timeTaken: Date.now() - timeStarted });
         return true;
     }
     toDockerMounts(mounts) {
@@ -205,18 +304,10 @@ 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 = false;
-        try {
-            imagePulled = await this.pull(opts.Image);
-        }
-        catch (e) {
-            console.warn('Failed to pull image. Continuing...', e);
-        }
+        let imagePulled = await this.pull(opts.Image);
         this.applyHash(opts);
         if (!opts.name) {
             console.log('Starting unnamed container: %s', opts.Image);
@@ -341,12 +432,14 @@ class ContainerManager {
         const containerName = getBlockInstanceContainerName(instance.systemId, instance.instanceId);
         const containerInfo = await this.getContainerByName(containerName);
         if (!containerInfo) {
-            return [{
-                    source: "stdout",
-                    level: "ERROR",
+            return [
+                {
+                    source: 'stdout',
+                    level: 'ERROR',
                     time: Date.now(),
-                    message: "Container not found"
-                }];
+                    message: 'Container not found',
+                },
+            ];
         }
         return containerInfo.getLogs();
     }
@@ -434,13 +527,13 @@ export class ContainerInfo {
         return ports;
     }
     async getLogs() {
-        const logStream = await this.native.logs({
+        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;

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

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

package/dist/esm/src/definitionsManager.js

@@ -1,5 +1,5 @@
 import ClusterConfiguration from '@kapeta/local-cluster-config';
-import { parseKapetaUri } from "@kapeta/nodejs-utils";
+import { parseKapetaUri } from '@kapeta/nodejs-utils';
 const CACHE_TTL = 60 * 1000; // 1 min
 class DefinitionsManager {
     cache = {};
@@ -33,13 +33,16 @@ class DefinitionsManager {
         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;
-        });
+        return !!this.getDefinition(ref);
     }
     getProviderDefinitions() {
         return this.doCached('providers', () => ClusterConfiguration.getProviderDefinitions());
     }
+    getDefinition(ref) {
+        const uri = parseKapetaUri(ref);
+        return this.getDefinitions().find((d) => {
+            return parseKapetaUri(`${d.definition.metadata.name}:${d.version}`).id === uri.id;
+        });
+    }
 }
 export const definitionsManager = new DefinitionsManager();

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

@@ -23,7 +23,14 @@ export declare class InstanceManager {
     private stopInner;
     stopAllForPlan(systemId: string): Promise<void>;
     start(systemId: string, instanceId: string): Promise<InstanceInfo>;
-    restart(systemId: string, instanceId: string): Promise<InstanceInfo>;
+    /**
+     * Stops an instance but does not remove it from the list of active instances
+     *
+     * It will be started again next time the system checks the status of the instance
+     *
+     * We do it this way to not cause the user to wait for the instance to start again
+     */
+    prepareForRestart(systemId: string, instanceId: string): Promise<void>;
     stopAll(): Promise<void>;
     private stopInstances;
     private save;