@kapeta/local-cluster-service 0.32.0 → 0.32.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.32.1](https://github.com/kapetacom/local-cluster-service/compare/v0.32.0...v0.32.1) (2023-12-23)
+
+
+### Bug Fixes
+
+* Several smaller fixes ([4036345](https://github.com/kapetacom/local-cluster-service/commit/40363457597d36c97481e94e646a6b45d113bb09))
+
 # [0.32.0](https://github.com/kapetacom/local-cluster-service/compare/v0.31.0...v0.32.0) (2023-12-20)
 
 

package/dist/cjs/src/RepositoryWatcher.js

@@ -20,6 +20,24 @@ const cacheManager_1 = require("./cacheManager");
 const node_events_1 = require("node:events");
 const assetManager_1 = require("./assetManager");
 const KAPETA_YML_RX = /^kapeta.ya?ml$/;
+let definitions;
+let definitionTimeout;
+function getDefinitionsDebounced() {
+    if (definitionTimeout) {
+        clearTimeout(definitionTimeout);
+        definitionTimeout = undefined;
+    }
+    if (!definitions) {
+        definitions = local_cluster_config_1.default.getDefinitions();
+    }
+    else {
+        definitionTimeout = setTimeout(() => {
+            definitionTimeout = undefined;
+            definitions = undefined;
+        }, 500);
+    }
+    return definitions;
+}
 class RepositoryWatcher extends node_events_1.EventEmitter {
     watcher;
     disabled = false;
@@ -186,7 +204,7 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
     }
     async checkForChange(assetIdentity, sourceOfChange) {
         const ymlPath = node_path_1.default.join(this.getRepositoryPath(assetIdentity), 'kapeta.yml');
-        const newDefinitions = local_cluster_config_1.default.getDefinitions();
+        const newDefinitions = getDefinitionsDebounced();
         const newDefinition = newDefinitions.find((d) => d.ymlPath === ymlPath);
         let currentDefinition = this.allDefinitions.find((d) => d.ymlPath === ymlPath);
         const ymlExists = await this.exists(ymlPath);
@@ -265,11 +283,17 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
             }
             catch (e) { }
             if (symbolicLink) {
-                const realPath = node_path_1.default.join(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;
+                try {
+                    const realPath = node_path_1.default.join(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) {
+                    // Remove the symlink - it's broken
+                    await fs_extra_1.default.remove(path);
                 }
             }
         }

package/dist/cjs/src/assetManager.js

@@ -24,10 +24,13 @@ const node_os_1 = __importDefault(require("node:os"));
 const CACHE_TTL = 60 * 60 * 1000; // 1 hour
 const UPGRADE_CHECK_INTERVAL = 10 * 60 * 1000; // 10 minutes
 const toKey = (ref) => `assetManager:asset:${ref}`;
+function filterExists(asset) {
+    return fs_extra_1.default.existsSync(asset.path);
+}
 function enrichAsset(asset) {
     return {
         ref: `kapeta://${asset.definition.metadata.name}:${asset.version}`,
-        editable: asset.version === 'local',
+        editable: asset.version === 'local', //Only local versions are editable
         exists: true,
         version: asset.version,
         kind: asset.definition.kind,
@@ -81,7 +84,7 @@ class AssetManager {
             assetKinds.push('core/plan');
         }
         const assets = await definitionsManager_1.definitionsManager.getDefinitions(assetKinds);
-        return assets.map(enrichAsset);
+        return assets.filter(filterExists).map(enrichAsset);
     }
     async getPlans() {
         return this.getAssets(['core/plan']);

package/dist/cjs/src/definitionsManager.js

@@ -131,9 +131,9 @@ class DefinitionsManager {
         const definitions = await this.getDefinitions();
         return definitions.find((d) => {
             if (!uri.version) {
-                return d.definition.metadata.name === uri.fullName;
+                return d.definition.metadata.name.toLowerCase() === uri.fullName.toLowerCase();
             }
-            return (0, nodejs_utils_1.parseKapetaUri)(`${d.definition.metadata.name}:${d.version}`).id === uri.id;
+            return (0, nodejs_utils_1.parseKapetaUri)(`${d.definition.metadata.name}:${d.version}`).equals(uri);
         });
     }
     async getLatestDefinition(name) {

package/dist/cjs/src/instanceManager.js

@@ -25,7 +25,7 @@ const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const definitionsManager_1 = require("./definitionsManager");
 const taskManager_1 = require("./taskManager");
 const CHECK_INTERVAL = 5000;
-const DEFAULT_HEALTH_PORT_TYPE = 'rest';
+const DEFAULT_HEALTH_PORT_TYPE = 'http';
 const MIN_TIME_RUNNING = 30000; //If something didnt run for more than 30 secs - it failed
 class InstanceManager {
     _interval = undefined;
@@ -198,7 +198,7 @@ class InstanceManager {
     }
     getHealthUrl(info, address) {
         let healthUrl = null;
-        let health = info.health;
+        let health = info.health ?? '/.kapeta/health';
         if (health) {
             if (health.startsWith('/')) {
                 health = health.substring(1);

package/dist/cjs/src/repositoryManager.js

@@ -183,7 +183,7 @@ class RepositoryManager extends node_events_1.EventEmitter {
                 if (await definitionsManager_1.definitionsManager.exists(ref)) {
                     return;
                 }
-                throw new Error(`Failed to install asset: ${ref}`);
+                throw new Error(`Failed to find asset after installation: ${ref}. Please try again`);
             };
         };
         const tasks = [];

package/dist/esm/src/RepositoryWatcher.js

@@ -20,6 +20,24 @@ const cacheManager_1 = require("./cacheManager");
 const node_events_1 = require("node:events");
 const assetManager_1 = require("./assetManager");
 const KAPETA_YML_RX = /^kapeta.ya?ml$/;
+let definitions;
+let definitionTimeout;
+function getDefinitionsDebounced() {
+    if (definitionTimeout) {
+        clearTimeout(definitionTimeout);
+        definitionTimeout = undefined;
+    }
+    if (!definitions) {
+        definitions = local_cluster_config_1.default.getDefinitions();
+    }
+    else {
+        definitionTimeout = setTimeout(() => {
+            definitionTimeout = undefined;
+            definitions = undefined;
+        }, 500);
+    }
+    return definitions;
+}
 class RepositoryWatcher extends node_events_1.EventEmitter {
     watcher;
     disabled = false;
@@ -186,7 +204,7 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
     }
     async checkForChange(assetIdentity, sourceOfChange) {
         const ymlPath = node_path_1.default.join(this.getRepositoryPath(assetIdentity), 'kapeta.yml');
-        const newDefinitions = local_cluster_config_1.default.getDefinitions();
+        const newDefinitions = getDefinitionsDebounced();
         const newDefinition = newDefinitions.find((d) => d.ymlPath === ymlPath);
         let currentDefinition = this.allDefinitions.find((d) => d.ymlPath === ymlPath);
         const ymlExists = await this.exists(ymlPath);
@@ -265,11 +283,17 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
             }
             catch (e) { }
             if (symbolicLink) {
-                const realPath = node_path_1.default.join(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;
+                try {
+                    const realPath = node_path_1.default.join(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) {
+                    // Remove the symlink - it's broken
+                    await fs_extra_1.default.remove(path);
                 }
             }
         }

package/dist/esm/src/assetManager.js

@@ -24,10 +24,13 @@ const node_os_1 = __importDefault(require("node:os"));
 const CACHE_TTL = 60 * 60 * 1000; // 1 hour
 const UPGRADE_CHECK_INTERVAL = 10 * 60 * 1000; // 10 minutes
 const toKey = (ref) => `assetManager:asset:${ref}`;
+function filterExists(asset) {
+    return fs_extra_1.default.existsSync(asset.path);
+}
 function enrichAsset(asset) {
     return {
         ref: `kapeta://${asset.definition.metadata.name}:${asset.version}`,
-        editable: asset.version === 'local',
+        editable: asset.version === 'local', //Only local versions are editable
         exists: true,
         version: asset.version,
         kind: asset.definition.kind,
@@ -81,7 +84,7 @@ class AssetManager {
             assetKinds.push('core/plan');
         }
         const assets = await definitionsManager_1.definitionsManager.getDefinitions(assetKinds);
-        return assets.map(enrichAsset);
+        return assets.filter(filterExists).map(enrichAsset);
     }
     async getPlans() {
         return this.getAssets(['core/plan']);

package/dist/esm/src/definitionsManager.js

@@ -131,9 +131,9 @@ class DefinitionsManager {
         const definitions = await this.getDefinitions();
         return definitions.find((d) => {
             if (!uri.version) {
-                return d.definition.metadata.name === uri.fullName;
+                return d.definition.metadata.name.toLowerCase() === uri.fullName.toLowerCase();
             }
-            return (0, nodejs_utils_1.parseKapetaUri)(`${d.definition.metadata.name}:${d.version}`).id === uri.id;
+            return (0, nodejs_utils_1.parseKapetaUri)(`${d.definition.metadata.name}:${d.version}`).equals(uri);
         });
     }
     async getLatestDefinition(name) {

package/dist/esm/src/instanceManager.js

@@ -25,7 +25,7 @@ const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const definitionsManager_1 = require("./definitionsManager");
 const taskManager_1 = require("./taskManager");
 const CHECK_INTERVAL = 5000;
-const DEFAULT_HEALTH_PORT_TYPE = 'rest';
+const DEFAULT_HEALTH_PORT_TYPE = 'http';
 const MIN_TIME_RUNNING = 30000; //If something didnt run for more than 30 secs - it failed
 class InstanceManager {
     _interval = undefined;
@@ -198,7 +198,7 @@ class InstanceManager {
     }
     getHealthUrl(info, address) {
         let healthUrl = null;
-        let health = info.health;
+        let health = info.health ?? '/.kapeta/health';
         if (health) {
             if (health.startsWith('/')) {
                 health = health.substring(1);

package/dist/esm/src/repositoryManager.js

@@ -183,7 +183,7 @@ class RepositoryManager extends node_events_1.EventEmitter {
                 if (await definitionsManager_1.definitionsManager.exists(ref)) {
                     return;
                 }
-                throw new Error(`Failed to install asset: ${ref}`);
+                throw new Error(`Failed to find asset after installation: ${ref}. Please try again`);
             };
         };
         const tasks = [];

package/package.json

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

package/src/RepositoryWatcher.ts

@@ -15,6 +15,7 @@ import { SourceOfChange, WatchEventName } from './types';
 import { cacheManager } from './cacheManager';
 import { EventEmitter } from 'node:events';
 import { assetManager } from './assetManager';
+import { definitionsManager } from './definitionsManager';
 
 interface AssetIdentity {
     handle: string;
@@ -22,6 +23,27 @@ interface AssetIdentity {
     version: string;
 }
 const KAPETA_YML_RX = /^kapeta.ya?ml$/;
+
+let definitions: DefinitionInfo[] | undefined;
+let definitionTimeout: NodeJS.Timeout | undefined;
+
+function getDefinitionsDebounced() {
+    if (definitionTimeout) {
+        clearTimeout(definitionTimeout);
+        definitionTimeout = undefined;
+    }
+    if (!definitions) {
+        definitions = ClusterConfiguration.getDefinitions();
+    } else {
+        definitionTimeout = setTimeout(() => {
+            definitionTimeout = undefined;
+            definitions = undefined;
+        }, 500);
+    }
+
+    return definitions;
+}
+
 export class RepositoryWatcher extends EventEmitter {
     private watcher?: FSWatcher;
     private disabled: boolean = false;
@@ -208,7 +230,8 @@ export class RepositoryWatcher extends EventEmitter {
 
     private async checkForChange(assetIdentity: AssetIdentity, sourceOfChange: SourceOfChange) {
         const ymlPath = Path.join(this.getRepositoryPath(assetIdentity), 'kapeta.yml');
-        const newDefinitions = ClusterConfiguration.getDefinitions();
+        const newDefinitions = getDefinitionsDebounced();
+
         const newDefinition = newDefinitions.find((d) => d.ymlPath === ymlPath);
         let currentDefinition = this.allDefinitions.find((d) => d.ymlPath === ymlPath);
         const ymlExists = await this.exists(ymlPath);
@@ -290,11 +313,16 @@ export class RepositoryWatcher extends EventEmitter {
             } catch (e) {}
 
             if (symbolicLink) {
-                const realPath = Path.join(await FS.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;
+                try {
+                    const realPath = Path.join(await FS.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) {
+                    // Remove the symlink - it's broken
+                    await FS.remove(path);
                 }
             }
         } catch (e) {

package/src/assetManager.ts

@@ -36,6 +36,10 @@ export interface EnrichedAsset {
     ymlPath: string;
 }
 
+function filterExists(asset: DefinitionInfo): boolean {
+    return FS.existsSync(asset.path);
+}
+
 function enrichAsset(asset: DefinitionInfo): EnrichedAsset {
     return {
         ref: `kapeta://${asset.definition.metadata.name}:${asset.version}`,
@@ -101,7 +105,7 @@ class AssetManager {
 
         const assets = await definitionsManager.getDefinitions(assetKinds);
 
-        return assets.map(enrichAsset);
+        return assets.filter(filterExists).map(enrichAsset);
     }
 
     async getPlans(): Promise<EnrichedAsset[]> {

package/src/definitionsManager.ts

@@ -164,9 +164,9 @@ class DefinitionsManager {
         const definitions = await this.getDefinitions();
         return definitions.find((d) => {
             if (!uri.version) {
-                return d.definition.metadata.name === uri.fullName;
+                return d.definition.metadata.name.toLowerCase() === uri.fullName.toLowerCase();
             }
-            return parseKapetaUri(`${d.definition.metadata.name}:${d.version}`).id === uri.id;
+            return parseKapetaUri(`${d.definition.metadata.name}:${d.version}`).equals(uri);
         });
     }
 

package/src/instanceManager.ts

@@ -27,7 +27,7 @@ import { definitionsManager } from './definitionsManager';
 import { Task, taskManager } from './taskManager';
 
 const CHECK_INTERVAL = 5000;
-const DEFAULT_HEALTH_PORT_TYPE = 'rest';
+const DEFAULT_HEALTH_PORT_TYPE = 'http';
 
 const MIN_TIME_RUNNING = 30000; //If something didnt run for more than 30 secs - it failed
 
@@ -264,7 +264,7 @@ export class InstanceManager {
 
     private getHealthUrl(info: Omit<InstanceInfo, 'systemId' | 'instanceId'>, address: string) {
         let healthUrl = null;
-        let health = info.health;
+        let health = info.health ?? '/.kapeta/health';
         if (health) {
             if (health.startsWith('/')) {
                 health = health.substring(1);

package/src/repositoryManager.ts

@@ -209,7 +209,7 @@ class RepositoryManager extends EventEmitter {
                 if (await definitionsManager.exists(ref)) {
                     return;
                 }
-                throw new Error(`Failed to install asset: ${ref}`);
+                throw new Error(`Failed to find asset after installation: ${ref}. Please try again`);
             };
         };