@kapeta/local-cluster-service 0.15.3 → 0.16.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.16.1](https://github.com/kapetacom/local-cluster-service/compare/v0.16.0...v0.16.1) (2023-08-11)
+
+
+### Bug Fixes
+
+* Instead of ignoring we set source-of-change ([ecd23c4](https://github.com/kapetacom/local-cluster-service/commit/ecd23c4c3316a189038a1f2f2f2c8794f6153261))
+
+# [0.16.0](https://github.com/kapetacom/local-cluster-service/compare/v0.15.3...v0.16.0) (2023-08-11)
+
+
+### Features
+
+* Use chokidar lib for watching for changes on disk ([#60](https://github.com/kapetacom/local-cluster-service/issues/60)) ([f2af855](https://github.com/kapetacom/local-cluster-service/commit/f2af85554fc2a23133ce27a4f8989cabdea097d7))
+
 ## [0.15.3](https://github.com/kapetacom/local-cluster-service/compare/v0.15.2...v0.15.3) (2023-08-10)
 
 

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

@@ -0,0 +1,23 @@
+import { SourceOfChange } from './types';
+export declare class RepositoryWatcher {
+    private watcher?;
+    private disabled;
+    private readonly baseDir;
+    private allDefinitions;
+    private symbolicLinks;
+    private sourceOfChange;
+    constructor();
+    setDisabled(disabled: boolean): void;
+    watch(): void;
+    setSourceOfChangeFor(file: string, source: SourceOfChange): Promise<void>;
+    clearSourceOfChangeFor(file: string): Promise<void>;
+    unwatch(): Promise<void>;
+    private getAssetIdentity;
+    private handleFileChange;
+    private checkForChange;
+    private exists;
+    private removeSymlinkTarget;
+    private updateSymlinkTarget;
+    private addSymlinkTarget;
+    private ignoreFile;
+}

package/dist/cjs/src/RepositoryWatcher.js

@@ -0,0 +1,269 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RepositoryWatcher = void 0;
+const chokidar_1 = __importDefault(require("chokidar"));
+const local_cluster_config_1 = __importDefault(require("@kapeta/local-cluster-config"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const node_path_1 = __importDefault(require("node:path"));
+const yaml_1 = __importDefault(require("yaml"));
+const nodejs_utils_1 = require("@kapeta/nodejs-utils");
+const lodash_1 = __importDefault(require("lodash"));
+const socketManager_1 = require("./socketManager");
+const cacheManager_1 = require("./cacheManager");
+const KAPETA_YML_RX = /^kapeta.ya?ml$/;
+class RepositoryWatcher {
+    watcher;
+    disabled = false;
+    baseDir;
+    allDefinitions = [];
+    symbolicLinks = {};
+    sourceOfChange = new Map();
+    constructor() {
+        this.baseDir = local_cluster_config_1.default.getRepositoryBasedir();
+    }
+    setDisabled(disabled) {
+        this.disabled = disabled;
+    }
+    watch() {
+        if (!fs_extra_1.default.existsSync(this.baseDir)) {
+            fs_extra_1.default.mkdirpSync(this.baseDir);
+        }
+        this.allDefinitions = local_cluster_config_1.default.getDefinitions();
+        try {
+            this.watcher = chokidar_1.default.watch(this.baseDir, {
+                followSymlinks: false,
+                ignorePermissionErrors: true,
+                disableGlobbing: true,
+                persistent: true,
+                depth: 2,
+                ignored: (path) => this.ignoreFile(path),
+            });
+            this.watcher.on('all', this.handleFileChange.bind(this));
+            this.watcher.on('error', (error) => {
+                console.log('Error watching repository', error);
+            });
+            this.watcher.on('ready', () => {
+                console.log('Watching local repository for provider changes: %s', this.baseDir);
+            });
+        }
+        catch (e) {
+            // Fallback to run without watch mode due to potential platform issues.
+            // https://nodejs.org/docs/latest/api/fs.html#caveats
+            console.log('Unable to watch for changes. Changes to assets will not update automatically.', e);
+            return;
+        }
+    }
+    async setSourceOfChangeFor(file, source) {
+        this.sourceOfChange.set(file, source);
+        const realPath = await fs_extra_1.default.realpath(file);
+        if (realPath !== file) {
+            this.sourceOfChange.set(realPath, source);
+        }
+    }
+    async clearSourceOfChangeFor(file) {
+        this.sourceOfChange.delete(file);
+        const realPath = await fs_extra_1.default.realpath(file);
+        if (realPath !== file) {
+            this.sourceOfChange.delete(realPath);
+        }
+    }
+    async unwatch() {
+        if (!this.watcher) {
+            return;
+        }
+        this.symbolicLinks = {};
+        await this.watcher.close();
+        this.watcher = undefined;
+    }
+    async getAssetIdentity(path) {
+        const baseName = node_path_1.default.basename(path);
+        let handle, name, version;
+        if (path.startsWith(this.baseDir)) {
+            const relativePath = node_path_1.default.relative(this.baseDir, path);
+            // Inside the repo we can use the path to determine the handle, name and version
+            [handle, name, version] = relativePath.split(/\//g);
+            if (!handle || !name || !version) {
+                // Do nothing with this
+                return;
+            }
+            return {
+                handle,
+                name,
+                version,
+            };
+        }
+        if (!KAPETA_YML_RX.test(baseName)) {
+            // Do nothing with this
+            return;
+        }
+        // Outside the repo we need to use the file content to determine the handle, name
+        // Version is always 'local'
+        version = 'local';
+        try {
+            const definition = yaml_1.default.parse((await fs_extra_1.default.readFile(path)).toString());
+            const uri = (0, nodejs_utils_1.parseKapetaUri)(definition.metadata.name);
+            handle = uri.handle;
+            name = uri.name;
+            return {
+                handle,
+                name,
+                version,
+            };
+        }
+        catch (e) {
+            // Ignore issues in the YML file
+            return;
+        }
+    }
+    async handleFileChange(eventName, path) {
+        if (!path) {
+            return;
+        }
+        //console.log('File changed', eventName, path);
+        const assetIdentity = await this.getAssetIdentity(path);
+        if (!assetIdentity) {
+            return;
+        }
+        if (this.disabled) {
+            return;
+        }
+        // If this is false it's because we're watching a symlink target
+        const withinRepo = path.startsWith(this.baseDir);
+        if (withinRepo && assetIdentity.version === 'local' && path.endsWith('/local')) {
+            // This is likely a symlink target
+            if (eventName === 'add') {
+                //console.log('Checking if we should add symlink target', handle, name, version, path);
+                await this.addSymlinkTarget(path);
+            }
+            if (eventName === 'unlink') {
+                await this.removeSymlinkTarget(path);
+            }
+            if (eventName === 'change') {
+                await this.updateSymlinkTarget(path);
+            }
+        }
+        const sourceOfChange = this.sourceOfChange.get(path) ?? 'filesystem';
+        await this.checkForChange(assetIdentity, sourceOfChange);
+        // We consume the sourceOfChange when the file is changed
+        this.sourceOfChange.delete(path);
+    }
+    async checkForChange(assetIdentity, sourceOfChange) {
+        const ymlPath = node_path_1.default.join(this.baseDir, assetIdentity.handle, assetIdentity.name, assetIdentity.version, 'kapeta.yml');
+        const newDefinitions = local_cluster_config_1.default.getDefinitions();
+        const newDefinition = newDefinitions.find((d) => d.ymlPath === ymlPath);
+        let currentDefinition = this.allDefinitions.find((d) => d.ymlPath === ymlPath);
+        const ymlExists = await this.exists(ymlPath);
+        let type;
+        if (ymlExists) {
+            if (currentDefinition) {
+                if (newDefinition && lodash_1.default.isEqual(currentDefinition, newDefinition)) {
+                    //Definition was not changed
+                    return;
+                }
+                type = 'updated';
+            }
+            else if (newDefinition) {
+                type = 'added';
+                currentDefinition = newDefinition;
+            }
+            else {
+                //Other definition was added / updated - ignore
+                return;
+            }
+        }
+        else {
+            if (currentDefinition) {
+                const ref = (0, nodejs_utils_1.parseKapetaUri)(`${currentDefinition.definition.metadata.name}:${currentDefinition.version}`).id;
+                //Something was removed
+                type = 'removed';
+            }
+            else {
+                //Other definition was removed - ignore
+                return;
+            }
+        }
+        const payload = {
+            type,
+            definition: newDefinition?.definition ?? currentDefinition?.definition,
+            asset: assetIdentity,
+            sourceOfChange,
+        };
+        this.allDefinitions = newDefinitions;
+        //console.log('Asset changed', payload);
+        socketManager_1.socketManager.emitGlobal('asset-change', payload);
+        cacheManager_1.cacheManager.flush();
+    }
+    async exists(path) {
+        try {
+            await fs_extra_1.default.access(path);
+            return true;
+        }
+        catch (e) {
+            return false;
+        }
+    }
+    async removeSymlinkTarget(path) {
+        if (this.symbolicLinks[path]) {
+            //console.log('Unwatching symlink target %s => %s', path, this.symbolicLinks[path]);
+            this.watcher?.unwatch(this.symbolicLinks[path]);
+            delete this.symbolicLinks[path];
+        }
+    }
+    async updateSymlinkTarget(path) {
+        if (this.symbolicLinks[path]) {
+            //console.log('Updating symlink target %s => %s', path, this.symbolicLinks[path]);
+            this.watcher?.unwatch(this.symbolicLinks[path]);
+            delete this.symbolicLinks[path];
+            await this.addSymlinkTarget(path);
+        }
+    }
+    async addSymlinkTarget(path) {
+        try {
+            // Make sure we're not watching the symlink target
+            await this.removeSymlinkTarget(path);
+            const stat = await fs_extra_1.default.lstat(path);
+            if (stat.isSymbolicLink()) {
+                const realPath = `${await fs_extra_1.default.realpath(path)}/kapeta.yml`;
+                if (await this.exists(realPath)) {
+                    //console.log('Watching symlink target %s => %s', path, realPath);
+                    this.watcher?.add(realPath);
+                    this.symbolicLinks[path] = realPath;
+                }
+            }
+        }
+        catch (e) {
+            // Ignore
+            console.warn('Failed to check local symlink target', e);
+        }
+    }
+    ignoreFile(path) {
+        if (!path.startsWith(this.baseDir)) {
+            return false;
+        }
+        if (path.includes('/node_modules/')) {
+            return true;
+        }
+        const filename = node_path_1.default.basename(path);
+        if (filename.startsWith('.')) {
+            return true;
+        }
+        const relativePath = node_path_1.default.relative(this.baseDir, path).split(node_path_1.default.sep);
+        try {
+            if (fs_extra_1.default.statSync(path).isDirectory()) {
+                if (relativePath.length > 3) {
+                    return true;
+                }
+                return false;
+            }
+        }
+        catch (e) {
+            // Didn't exist - dont ignore
+            return false;
+        }
+        return !/^kapeta\.ya?ml$/.test(filename);
+    }
+}
+exports.RepositoryWatcher = RepositoryWatcher;

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

@@ -1,5 +1,6 @@
 import { Definition } from '@kapeta/local-cluster-config';
 import { BlockDefinition } from '@kapeta/schemas';
+import { SourceOfChange } from './types';
 export interface EnrichedAsset {
     ref: string;
     editable: boolean;
@@ -11,9 +12,6 @@ export interface EnrichedAsset {
     ymlPath: string;
 }
 declare class AssetManager {
-    private cache;
-    constructor();
-    clearCache(): void;
     /**
      *
      * @param {string[]} [assetKinds]
@@ -23,12 +21,12 @@ declare class AssetManager {
     getPlans(): EnrichedAsset[];
     getPlan(ref: string, noCache?: boolean): Promise<Definition>;
     getAsset(ref: string, noCache?: boolean, autoFetch?: boolean): Promise<EnrichedAsset | undefined>;
-    createAsset(path: string, yaml: BlockDefinition): Promise<EnrichedAsset[]>;
-    updateAsset(ref: string, yaml: BlockDefinition): Promise<void>;
-    private maybeGenerateCode;
+    createAsset(path: string, yaml: BlockDefinition, sourceOfChange?: SourceOfChange): Promise<EnrichedAsset[]>;
+    updateAsset(ref: string, yaml: BlockDefinition, sourceOfChange?: SourceOfChange): Promise<void>;
     importFile(filePath: string): Promise<EnrichedAsset[]>;
     unregisterAsset(ref: string): Promise<void>;
     installAsset(ref: string): Promise<import("./taskManager").Task<void>[] | undefined>;
+    private maybeGenerateCode;
 }
 export declare const assetManager: AssetManager;
 export {};

package/dist/cjs/src/assetManager.js

@@ -5,10 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assetManager = void 0;
 const node_path_1 = __importDefault(require("node:path"));
-const node_fs_1 = __importDefault(require("node:fs"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const yaml_1 = __importDefault(require("yaml"));
-const node_cache_1 = __importDefault(require("node-cache"));
 const codeGeneratorManager_1 = require("./codeGeneratorManager");
 const progressListener_1 = require("./progressListener");
 const nodejs_utils_1 = require("@kapeta/nodejs-utils");
@@ -17,6 +15,8 @@ const nodejs_registry_utils_1 = require("@kapeta/nodejs-registry-utils");
 const definitionsManager_1 = require("./definitionsManager");
 const utils_1 = require("./utils/utils");
 const taskManager_1 = require("./taskManager");
+const cacheManager_1 = require("./cacheManager");
+const CACHE_TTL = 60 * 60 * 1000; // 1 hour
 function enrichAsset(asset) {
     return {
         ref: `kapeta://${asset.definition.metadata.name}:${asset.version}`,
@@ -42,15 +42,6 @@ function parseRef(ref) {
     return [out[0].toLowerCase(), out[1].toLowerCase()];
 }
 class AssetManager {
-    cache;
-    constructor() {
-        this.cache = new node_cache_1.default({
-            stdTTL: 60 * 60, // 1 hour
-        });
-    }
-    clearCache() {
-        this.cache.flushAll();
-    }
     /**
      *
      * @param {string[]} [assetKinds]
@@ -83,8 +74,8 @@ class AssetManager {
     async getAsset(ref, noCache = false, autoFetch = true) {
         ref = (0, utils_1.normalizeKapetaUri)(ref);
         const cacheKey = `getAsset:${ref}`;
-        if (!noCache && this.cache.has(cacheKey)) {
-            return this.cache.get(cacheKey);
+        if (!noCache && cacheManager_1.cacheManager.has(cacheKey)) {
+            return cacheManager_1.cacheManager.get(cacheKey);
         }
         const uri = (0, nodejs_utils_1.parseKapetaUri)(ref);
         if (autoFetch) {
@@ -98,29 +89,27 @@ class AssetManager {
             throw new Error('Asset not found: ' + ref);
         }
         if (asset) {
-            this.cache.set(cacheKey, asset);
+            cacheManager_1.cacheManager.set(cacheKey, asset, CACHE_TTL);
         }
         return asset;
     }
-    async createAsset(path, yaml) {
-        if (node_fs_1.default.existsSync(path)) {
+    async createAsset(path, yaml, sourceOfChange = 'filesystem') {
+        if (await fs_extra_1.default.pathExists(path)) {
             throw new Error('File already exists: ' + path);
         }
         const dirName = node_path_1.default.dirname(path);
-        if (!node_fs_1.default.existsSync(dirName)) {
-            fs_extra_1.default.mkdirpSync(dirName);
+        if (!(await fs_extra_1.default.pathExists(dirName))) {
+            await fs_extra_1.default.mkdirp(dirName);
         }
-        console.log('Wrote to ' + path);
-        node_fs_1.default.writeFileSync(path, yaml_1.default.stringify(yaml));
+        await repositoryManager_1.repositoryManager.setSourceOfChangeFor(path, sourceOfChange);
+        await fs_extra_1.default.writeFile(path, yaml_1.default.stringify(yaml));
         const asset = await this.importFile(path);
-        console.log('Imported');
-        this.cache.flushAll();
-        definitionsManager_1.definitionsManager.clearCache();
+        cacheManager_1.cacheManager.flush();
         const ref = `kapeta://${yaml.metadata.name}:local`;
         this.maybeGenerateCode(ref, path, yaml);
         return asset;
     }
-    async updateAsset(ref, yaml) {
+    async updateAsset(ref, yaml, sourceOfChange = 'filesystem') {
         const asset = await this.getAsset(ref, true, false);
         if (!asset) {
             throw new Error('Attempted to update unknown asset: ' + ref);
@@ -131,37 +120,25 @@ class AssetManager {
         if (!asset.ymlPath) {
             throw new Error('Attempted to update corrupted asset: ' + ref);
         }
+        await repositoryManager_1.repositoryManager.setSourceOfChangeFor(asset.ymlPath, sourceOfChange);
+        await fs_extra_1.default.writeFile(asset.ymlPath, yaml_1.default.stringify(yaml));
         console.log('Wrote to ' + asset.ymlPath);
-        node_fs_1.default.writeFileSync(asset.ymlPath, yaml_1.default.stringify(yaml));
-        this.cache.flushAll();
-        definitionsManager_1.definitionsManager.clearCache();
+        cacheManager_1.cacheManager.flush();
         this.maybeGenerateCode(asset.ref, asset.ymlPath, yaml);
     }
-    maybeGenerateCode(ref, ymlPath, block) {
-        ref = (0, utils_1.normalizeKapetaUri)(ref);
-        if (codeGeneratorManager_1.codeGeneratorManager.canGenerateCode(block)) {
-            const assetTitle = block.metadata.title ? block.metadata.title : (0, nodejs_utils_1.parseKapetaUri)(block.metadata.name).name;
-            taskManager_1.taskManager.add(`codegen:${ref}`, async () => {
-                await codeGeneratorManager_1.codeGeneratorManager.generate(ymlPath, block);
-            }, {
-                name: `Generating code for ${assetTitle}`,
-            });
-            return true;
-        }
-        return false;
-    }
     async importFile(filePath) {
         if (filePath.startsWith('file://')) {
             filePath = filePath.substring('file://'.length);
         }
-        if (!node_fs_1.default.existsSync(filePath)) {
+        if (!(await fs_extra_1.default.pathExists(filePath))) {
             throw new Error('File not found: ' + filePath);
         }
-        const assetInfos = yaml_1.default.parseAllDocuments(node_fs_1.default.readFileSync(filePath).toString()).map((doc) => doc.toJSON());
+        const content = await fs_extra_1.default.readFile(filePath);
+        const assetInfos = yaml_1.default.parseAllDocuments(content.toString()).map((doc) => doc.toJSON());
         await nodejs_registry_utils_1.Actions.link(new progressListener_1.ProgressListener(), node_path_1.default.dirname(filePath));
         const version = 'local';
         const refs = assetInfos.map((assetInfo) => `kapeta://${assetInfo.metadata.name}:${version}`);
-        this.cache.flushAll();
+        cacheManager_1.cacheManager.flush();
         return this.getAssets().filter((a) => refs.some((ref) => compareRefs(ref, a.ref)));
     }
     async unregisterAsset(ref) {
@@ -169,7 +146,7 @@ class AssetManager {
         if (!asset) {
             throw new Error('Asset does not exists: ' + ref);
         }
-        this.cache.flushAll();
+        cacheManager_1.cacheManager.flush();
         await nodejs_registry_utils_1.Actions.uninstall(new progressListener_1.ProgressListener(), [asset.ref]);
     }
     async installAsset(ref) {
@@ -181,5 +158,18 @@ class AssetManager {
         console.log('Installing %s', ref);
         return await repositoryManager_1.repositoryManager.ensureAsset(uri.handle, uri.name, uri.version, false);
     }
+    maybeGenerateCode(ref, ymlPath, block) {
+        ref = (0, utils_1.normalizeKapetaUri)(ref);
+        if (codeGeneratorManager_1.codeGeneratorManager.canGenerateCode(block)) {
+            const assetTitle = block.metadata.title ? block.metadata.title : (0, nodejs_utils_1.parseKapetaUri)(block.metadata.name).name;
+            taskManager_1.taskManager.add(`codegen:${ref}`, async () => {
+                await codeGeneratorManager_1.codeGeneratorManager.generate(ymlPath, block);
+            }, {
+                name: `Generating code for ${assetTitle}`,
+            });
+            return true;
+        }
+        return false;
+    }
 }
 exports.assetManager = new AssetManager();

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

@@ -63,7 +63,7 @@ router.post('/create', async (req, res) => {
     }
     const content = parseBody(req);
     try {
-        const assets = await assetManager_1.assetManager.createAsset(req.query.path, content);
+        const assets = await assetManager_1.assetManager.createAsset(req.query.path, content, 'user');
         res.status(200).send(assets);
     }
     catch (err) {
@@ -81,7 +81,7 @@ router.put('/update', async (req, res) => {
     }
     const content = parseBody(req);
     try {
-        await assetManager_1.assetManager.updateAsset(req.query.ref, content);
+        await assetManager_1.assetManager.updateAsset(req.query.ref, content, 'user');
         res.sendStatus(204);
     }
     catch (err) {

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

@@ -0,0 +1,16 @@
+export interface CacheEntry<T = any> {
+    expires: number;
+    data: T;
+}
+declare class CacheManager {
+    private cache;
+    flush(): void;
+    doCached<T>(key: string, getter: () => T, ttl?: number): T;
+    get<T>(key: string): T | undefined;
+    set<T>(key: string, data: T, ttl?: number): void;
+    has(key: string): boolean;
+    remove(key: string): number;
+}
+export declare const cacheManager: CacheManager;
+export declare const doCached: <T>(key: string, getter: () => T, ttl?: number) => T;
+export {};

package/dist/cjs/src/cacheManager.js

@@ -0,0 +1,38 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.doCached = exports.cacheManager = void 0;
+const node_cache_1 = __importDefault(require("node-cache"));
+const DEFAULT_CACHE_TTL = 60 * 1000; // 1 min
+class CacheManager {
+    cache = new node_cache_1.default();
+    flush() {
+        this.cache.flushAll();
+    }
+    doCached(key, getter, ttl = DEFAULT_CACHE_TTL) {
+        const data = this.cache.get(key);
+        if (data !== undefined) {
+            return data;
+        }
+        const result = getter();
+        this.cache.set(key, result, ttl);
+        return result;
+    }
+    get(key) {
+        return this.cache.get(key);
+    }
+    set(key, data, ttl = DEFAULT_CACHE_TTL) {
+        this.cache.set(key, data, ttl);
+    }
+    has(key) {
+        return this.cache.has(key);
+    }
+    remove(key) {
+        return this.cache.del(key);
+    }
+}
+exports.cacheManager = new CacheManager();
+const doCached = (key, getter, ttl = DEFAULT_CACHE_TTL) => exports.cacheManager.doCached(key, getter, ttl);
+exports.doCached = doCached;

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

@@ -1,9 +1,7 @@
 import { DefinitionInfo } from '@kapeta/local-cluster-config';
 declare class DefinitionsManager {
-    private cache;
-    private getKey;
-    clearCache(): void;
-    private doCached;
+    private getHash;
+    private getFullKey;
     getDefinitions(kindFilter?: string | string[]): DefinitionInfo[];
     exists(ref: string): boolean;
     getProviderDefinitions(): DefinitionInfo[];

package/dist/cjs/src/definitionsManager.js

@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.definitionsManager = void 0;
 const local_cluster_config_1 = __importDefault(require("@kapeta/local-cluster-config"));
 const nodejs_utils_1 = require("@kapeta/nodejs-utils");
-const CACHE_TTL = 60 * 1000; // 1 min
+const cacheManager_1 = require("./cacheManager");
 class DefinitionsManager {
-    cache = {};
-    getKey(kindFilter) {
+    getHash(kindFilter) {
         if (kindFilter) {
             if (Array.isArray(kindFilter)) {
                 return kindFilter.join(',');
@@ -18,31 +17,18 @@ class DefinitionsManager {
         }
         return 'none';
     }
-    clearCache() {
-        this.cache = {};
-    }
-    doCached(key, getter) {
-        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;
+    getFullKey(kindFilter) {
+        return `DefinitionsManager:${this.getHash(kindFilter)}`;
     }
     getDefinitions(kindFilter) {
-        const key = this.getKey(kindFilter);
-        return this.doCached(key, () => local_cluster_config_1.default.getDefinitions(kindFilter));
+        const key = this.getFullKey(kindFilter);
+        return (0, cacheManager_1.doCached)(key, () => local_cluster_config_1.default.getDefinitions(kindFilter));
     }
     exists(ref) {
         return !!this.getDefinition(ref);
     }
     getProviderDefinitions() {
-        return this.doCached('providers', () => local_cluster_config_1.default.getProviderDefinitions());
+        return (0, cacheManager_1.doCached)('providers', () => local_cluster_config_1.default.getProviderDefinitions());
     }
     getDefinition(ref) {
         const uri = (0, nodejs_utils_1.parseKapetaUri)(ref);

package/dist/cjs/src/instanceManager.js

@@ -57,7 +57,10 @@ class InstanceManager {
             return [];
         }
         const plan = planInfo.definition;
-        const instanceIds = plan.spec.blocks.map((block) => block.id);
+        if (!plan?.spec?.blocks) {
+            return [];
+        }
+        const instanceIds = plan.spec?.blocks?.map((block) => block.id) || [];
         return this._instances.filter((instance) => instance.systemId === systemId && instanceIds.includes(instance.instanceId));
     }
     getInstance(systemId, instanceId) {

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

@@ -1,13 +1,18 @@
 import { Task } from './taskManager';
+import { SourceOfChange } from './types';
 declare class RepositoryManager {
-    private changeEventsEnabled;
     private _registryService;
     private _cache;
-    private watcher?;
+    private watcher;
     constructor();
-    setChangeEventsEnabled(enabled: boolean): void;
     listenForChanges(): void;
-    stopListening(): void;
+    stopListening(): Promise<void>;
+    /**
+     * Setting the source of change helps us know
+     * how to react to changes in the UI.
+     */
+    setSourceOfChangeFor(file: string, source: SourceOfChange): Promise<void>;
+    clearSourceOfChangeFor(file: string): Promise<void>;
     ensureDefaultProviders(): void;
     private _install;
     ensureAsset(handle: string, name: string, version: string, wait?: boolean): Promise<undefined | Task[]>;