@kapeta/local-cluster-service 0.12.0 → 0.13.0

package/dist/cjs/src/taskManager.js

@@ -0,0 +1,163 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.taskManager = exports.Task = exports.TaskStatus = void 0;
+/**
+ * Class that handles processing background tasks.
+ */
+const socketManager_1 = require("./socketManager");
+const EVENT_TASK_UPDATED = 'task-updated';
+const EVENT_TASK_ADDED = 'task-added';
+const EVENT_TASK_REMOVED = 'task-removed';
+var TaskStatus;
+(function (TaskStatus) {
+    TaskStatus["PENDING"] = "PENDING";
+    TaskStatus["RUNNING"] = "RUNNING";
+    TaskStatus["COMPLETED"] = "COMPLETED";
+    TaskStatus["FAILED"] = "FAILED";
+})(TaskStatus || (exports.TaskStatus = TaskStatus = {}));
+class Task {
+    data;
+    constructor(task) {
+        this.data = task;
+    }
+    get id() {
+        return this.data.id;
+    }
+    get status() {
+        return this.data.status;
+    }
+    get errorMessage() {
+        return this.data.errorMessage;
+    }
+    get metadata() {
+        return this.data.metadata;
+    }
+    get future() {
+        return this.data.future;
+    }
+    get run() {
+        return this.data.run;
+    }
+    set status(status) {
+        this.data.status = status;
+    }
+    set errorMessage(errorMessage) {
+        this.data.errorMessage = errorMessage;
+    }
+    set metadata(metadata) {
+        this.data.metadata = metadata;
+    }
+    emitUpdate() {
+        socketManager_1.socketManager.emitGlobal(EVENT_TASK_UPDATED, this.toData());
+    }
+    async wait() {
+        return this.future.promise;
+    }
+    toData() {
+        return { ...this.data };
+    }
+}
+exports.Task = Task;
+function createFuture() {
+    let resolve = () => { };
+    let reject = () => { };
+    const promise = new Promise((res, rej) => {
+        resolve = res;
+        reject = rej;
+    });
+    return {
+        promise,
+        resolve,
+        reject,
+    };
+}
+class TaskManager {
+    _tasks = [];
+    add(id, runner, metadata) {
+        const existingTask = this.get(id);
+        if (existingTask) {
+            return existingTask;
+        }
+        const future = createFuture();
+        const task = new Task({
+            id,
+            status: TaskStatus.PENDING,
+            metadata,
+            future,
+            run: runner,
+        });
+        this._tasks.push(task);
+        socketManager_1.socketManager.emitGlobal(EVENT_TASK_ADDED, task.toData());
+        this.invokeTask(task).catch(() => { });
+        return task;
+    }
+    async waitFor(filter) {
+        const tasks = this._tasks.filter(filter);
+        while (tasks.length > 0) {
+            const task = tasks.shift();
+            if (!task) {
+                continue;
+            }
+            try {
+                await task.wait();
+            }
+            catch (e) {
+                //Ignore
+            }
+        }
+    }
+    get(taskId) {
+        return this._tasks.find((t) => t.id === taskId);
+    }
+    exists(taskId) {
+        return !!this.get(taskId);
+    }
+    remove(taskId) {
+        const task = this.get(taskId);
+        if (!task) {
+            return;
+        }
+        if (task.status === TaskStatus.RUNNING) {
+            throw new Error('Cannot remove a running task');
+        }
+        this._tasks = this._tasks.filter((t) => t.id !== taskId);
+        socketManager_1.socketManager.emitGlobal(EVENT_TASK_REMOVED, task.toData());
+    }
+    list() {
+        return this._tasks.map((t) => t.toData());
+    }
+    async invokeTask(task) {
+        if (task.metadata.group) {
+            const existingTaskInGroup = this._tasks.find((t) => t.id !== task.id && t.metadata.group === task.metadata.group && t.status === TaskStatus.RUNNING);
+            if (existingTaskInGroup) {
+                console.log('existingTaskInGroup', existingTaskInGroup.toData());
+                return;
+            }
+        }
+        try {
+            task.status = TaskStatus.RUNNING;
+            task.emitUpdate();
+            const result = await task.run(task);
+            task.status = TaskStatus.COMPLETED;
+            task.future.resolve(result);
+            task.emitUpdate();
+        }
+        catch (e) {
+            task.errorMessage = e.message;
+            task.status = TaskStatus.FAILED;
+            task.future.reject(e);
+            task.emitUpdate();
+        }
+        finally {
+            this.remove(task.id);
+        }
+        if (task.metadata.group) {
+            const nextTaskInGroup = this._tasks.find((t) => t.id !== task.id && t.metadata.group === task.metadata.group && t.status === TaskStatus.PENDING);
+            if (nextTaskInGroup) {
+                console.log('nextTaskInGroup', nextTaskInGroup.toData());
+                return this.invokeTask(nextTaskInGroup);
+            }
+        }
+    }
+}
+exports.taskManager = new TaskManager();

package/dist/cjs/src/tasks/routes.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="express" />
+declare const router: import("express").Router;
+export default router;

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

@@ -0,0 +1,35 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_promise_router_1 = __importDefault(require("express-promise-router"));
+const cors_1 = require("../middleware/cors");
+const taskManager_1 = require("../taskManager");
+const router = (0, express_promise_router_1.default)();
+router.use('/', cors_1.corsHandler);
+/**
+ * Get all current tasks
+ */
+router.get('/', (req, res) => {
+    res.send(taskManager_1.taskManager.list());
+});
+router.get('/:taskId', (req, res) => {
+    const task = taskManager_1.taskManager.get(req.params.taskId);
+    if (!task) {
+        res.status(404).send({ error: 'Task not found' });
+        return;
+    }
+    res.send(task.toData());
+});
+router.delete('/:taskId', (req, res) => {
+    try {
+        taskManager_1.taskManager.remove(req.params.taskId);
+        res.send({ ok: true });
+    }
+    catch (e) {
+        res.status(400).send({ error: e.message });
+        return;
+    }
+});
+exports.default = router;

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/index.js

@@ -15,6 +15,7 @@ import FilesystemRoutes from './src/filesystem/routes';
 import AssetsRoutes from './src/assets/routes';
 import ProviderRoutes from './src/providers/routes';
 import AttachmentRoutes from './src/attachments/routes';
+import TaskRoutes from './src/tasks/routes';
 import { getBindHost } from './src/utils/utils';
 import request from 'request';
 let currentServer = null;
@@ -29,6 +30,7 @@ function createServer() {
     app.use('/assets', AssetsRoutes);
     app.use('/providers', ProviderRoutes);
     app.use('/attachments', AttachmentRoutes);
+    app.use('/tasks', TaskRoutes);
     app.get('/status', async (req, res) => {
         res.send({
             ok: true,

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

@@ -13,6 +13,7 @@ export interface EnrichedAsset {
 declare class AssetManager {
     private cache;
     constructor();
+    clearCache(): void;
     /**
      *
      * @param {string[]} [assetKinds]
@@ -21,11 +22,12 @@ declare class AssetManager {
     getAssets(assetKinds?: string[]): EnrichedAsset[];
     getPlans(): EnrichedAsset[];
     getPlan(ref: string, noCache?: boolean): Promise<Definition>;
-    getAsset(ref: string, noCache?: boolean): Promise<EnrichedAsset | undefined>;
+    getAsset(ref: string, noCache?: boolean, autoFetch?: boolean): Promise<EnrichedAsset | undefined>;
     createAsset(path: string, yaml: BlockDefinition): Promise<EnrichedAsset[]>;
     updateAsset(ref: string, yaml: BlockDefinition): Promise<void>;
     importFile(filePath: string): Promise<EnrichedAsset[]>;
     unregisterAsset(ref: string): Promise<void>;
+    installAsset(ref: string): Promise<import("./taskManager").Task<void>[] | undefined>;
 }
 export declare const assetManager: AssetManager;
 export {};

package/dist/esm/src/assetManager.js

@@ -41,6 +41,9 @@ class AssetManager {
             stdTTL: 60 * 60, // 1 hour
         });
     }
+    clearCache() {
+        this.cache.flushAll();
+    }
     /**
      *
      * @param {string[]} [assetKinds]
@@ -70,22 +73,26 @@ class AssetManager {
         }
         return asset.data;
     }
-    async getAsset(ref, noCache = false) {
+    async getAsset(ref, noCache = false, autoFetch = true) {
         ref = normalizeKapetaUri(ref);
         const cacheKey = `getAsset:${ref}`;
         if (!noCache && this.cache.has(cacheKey)) {
             return this.cache.get(cacheKey);
         }
         const uri = parseKapetaUri(ref);
-        await repositoryManager.ensureAsset(uri.handle, uri.name, uri.version);
+        if (autoFetch) {
+            await repositoryManager.ensureAsset(uri.handle, uri.name, uri.version, true);
+        }
         let asset = definitionsManager
             .getDefinitions()
             .map(enrichAsset)
             .find((a) => parseKapetaUri(a.ref).equals(uri));
-        if (!asset) {
+        if (autoFetch && !asset) {
             throw new Error('Asset not found: ' + ref);
         }
-        this.cache.set(cacheKey, asset);
+        if (asset) {
+            this.cache.set(cacheKey, asset);
+        }
         return asset;
     }
     async createAsset(path, yaml) {
@@ -146,5 +153,14 @@ class AssetManager {
         this.cache.flushAll();
         await Actions.uninstall(progressListener, [asset.ref]);
     }
+    async installAsset(ref) {
+        const asset = await this.getAsset(ref, true, false);
+        if (asset) {
+            throw new Error('Asset already installed: ' + ref);
+        }
+        const uri = parseKapetaUri(ref);
+        console.log('Installing %s', ref);
+        return await repositoryManager.ensureAsset(uri.handle, uri.name, uri.version, false);
+    }
 }
 export const assetManager = new AssetManager();

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

@@ -34,8 +34,15 @@ router.get('/read', async (req, res) => {
         res.status(400).send({ error: 'Query parameter "ref" is missing' });
         return;
     }
+    const ensure = req.query.ensure !== 'false';
     try {
-        res.send(await assetManager.getAsset(req.query.ref, true));
+        const asset = await assetManager.getAsset(req.query.ref, true, ensure);
+        if (asset) {
+            res.send(asset);
+        }
+        else {
+            res.status(404).send({ error: 'Asset not found' });
+        }
     }
     catch (err) {
         res.status(400).send({ error: err.message });
@@ -109,4 +116,18 @@ router.put('/import', async (req, res) => {
         res.status(400).send({ error: err.message });
     }
 });
+router.put('/install', async (req, res) => {
+    if (!req.query.ref) {
+        res.status(400).send({ error: 'Query parameter "ref" is missing' });
+        return;
+    }
+    try {
+        const tasks = await assetManager.installAsset(req.query.ref);
+        const taskIds = tasks?.map((t) => t.id) ?? [];
+        res.status(200).send(taskIds);
+    }
+    catch (err) {
+        res.status(400).send({ error: err.message });
+    }
+});
 export default router;

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

@@ -9,15 +9,13 @@ import ClusterConfiguration from '@kapeta/local-cluster-config';
 import uuid from 'node-uuid';
 import md5 from 'md5';
 import { getBlockInstanceContainerName } from './utils/utils';
-import { socketManager } from './socketManager';
 import { KapetaAPI } from '@kapeta/nodejs-api-client';
+import { taskManager } from './taskManager';
 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);
@@ -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)
@@ -164,121 +156,141 @@ class ContainerManager {
             console.log('Image found: %s', image);
             return false;
         }
-        const timeStarted = Date.now();
-        socketManager.emitGlobal(EVENT_IMAGE_PULL, { image, percent: 0 });
-        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;
+        let friendlyImageName = image;
+        const imageParts = imageName.split('/');
+        if (imageParts.length > 2) {
+            //Strip the registry to make the name shorter
+            friendlyImageName = `${imageParts.slice(1).join('/')}:${tag}`;
+        }
+        const taskName = `Pulling image ${friendlyImageName}`;
+        const processor = async (task) => {
+            const timeStarted = Date.now();
+            const api = new KapetaAPI();
+            const accessToken = await api.getAccessToken();
+            const auth = image.startsWith('docker.kapeta.com/')
+                ? {
+                    username: 'kapeta',
+                    password: accessToken,
+                    serveraddress: 'docker.kapeta.com',
                 }
-                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 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 progress = totals.total > 0 ? (totals.done / totals.total) * 100 : 0;
+                task.metadata = {
+                    ...task.metadata,
+                    image,
+                    progress,
+                    status: totals,
+                    timeTaken: Date.now() - timeStarted,
+                };
+                task.emitUpdate();
+                lastEmitted = Date.now();
+                //console.log('Pulling image %s: %s % [done: %s, total: %s]', image, Math.round(percent), totals.done, totals.total);
             });
-            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, {
+            task.metadata = {
+                ...task.metadata,
                 image,
-                percent,
-                status: totals,
+                progress: 100,
                 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);
+            };
+            task.emitUpdate();
+        };
+        const task = taskManager.add(`docker:image:pull:${image}`, processor, {
+            name: taskName,
+            image,
+            progress: -1,
         });
-        IMAGE_PULL_CACHE[image] = Date.now();
-        socketManager.emitGlobal(EVENT_IMAGE_PULL, { image, percent: 100, timeTaken: Date.now() - timeStarted });
+        await task.wait();
         return true;
     }
     toDockerMounts(mounts) {
@@ -313,9 +325,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.d.ts

@@ -1,4 +1,5 @@
 import { InstanceInfo, LogEntry } from './types';
+import { Task } from './taskManager';
 export declare class InstanceManager {
     private _interval;
     private readonly _instances;
@@ -18,11 +19,11 @@ export declare class InstanceManager {
     registerInstanceFromSDK(systemId: string, instanceId: string, info: Omit<InstanceInfo, 'systemId' | 'instanceId'>): Promise<InstanceInfo | undefined>;
     private getHealthUrl;
     markAsStopped(systemId: string, instanceId: string): Promise<void>;
-    startAllForPlan(systemId: string): Promise<InstanceInfo[]>;
+    startAllForPlan(systemId: string): Promise<Task<InstanceInfo[]>>;
     stop(systemId: string, instanceId: string): Promise<void>;
     private stopInner;
-    stopAllForPlan(systemId: string): Promise<void>;
-    start(systemId: string, instanceId: string): Promise<InstanceInfo>;
+    stopAllForPlan(systemId: string): Task<void>;
+    start(systemId: string, instanceId: string): Promise<InstanceInfo | Task<InstanceInfo>>;
     /**
      * Stops an instance but does not remove it from the list of active instances
      *