@kapeta/local-cluster-service 0.15.3 → 0.16.0

package/dist/esm/src/RepositoryWatcher.js

@@ -0,0 +1,266 @@
+import chokidar from 'chokidar';
+import ClusterConfiguration from '@kapeta/local-cluster-config';
+import FS from 'fs-extra';
+import Path from 'node:path';
+import YAML from 'yaml';
+import { parseKapetaUri } from '@kapeta/nodejs-utils';
+import _ from 'lodash';
+import { socketManager } from './socketManager';
+import { definitionsManager } from './definitionsManager';
+import { assetManager } from './assetManager';
+function clearAllCaches() {
+    definitionsManager.clearCache();
+    assetManager.clearCache();
+}
+const KAPETA_YML_RX = /^kapeta.ya?ml$/;
+export class RepositoryWatcher {
+    watcher;
+    disabled = false;
+    baseDir;
+    allDefinitions = [];
+    symbolicLinks = {};
+    ignoredFiles = new Set();
+    constructor() {
+        this.baseDir = ClusterConfiguration.getRepositoryBasedir();
+    }
+    setDisabled(disabled) {
+        this.disabled = disabled;
+    }
+    watch() {
+        if (!FS.existsSync(this.baseDir)) {
+            FS.mkdirpSync(this.baseDir);
+        }
+        this.allDefinitions = ClusterConfiguration.getDefinitions();
+        try {
+            this.watcher = chokidar.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 ignoreChangesFor(file) {
+        this.ignoredFiles.add(file);
+        const realPath = await FS.realpath(file);
+        if (realPath !== file) {
+            this.ignoredFiles.add(realPath);
+        }
+    }
+    async resumeChangedFor(file) {
+        this.ignoredFiles.delete(file);
+        const realPath = await FS.realpath(file);
+        if (realPath !== file) {
+            this.ignoredFiles.delete(realPath);
+        }
+    }
+    async unwatch() {
+        if (!this.watcher) {
+            return;
+        }
+        this.symbolicLinks = {};
+        await this.watcher.close();
+        this.watcher = undefined;
+    }
+    async getAssetIdentity(path) {
+        const baseName = Path.basename(path);
+        let handle, name, version;
+        if (path.startsWith(this.baseDir)) {
+            const relativePath = Path.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.parse((await FS.readFile(path)).toString());
+            const uri = 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;
+        }
+        if (this.ignoredFiles.has(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);
+            }
+        }
+        await this.checkForChange(assetIdentity);
+    }
+    async checkForChange(assetIdentity) {
+        const ymlPath = Path.join(this.baseDir, assetIdentity.handle, assetIdentity.name, assetIdentity.version, 'kapeta.yml');
+        const newDefinitions = ClusterConfiguration.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 && _.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 = 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,
+        };
+        this.allDefinitions = newDefinitions;
+        //console.log('Asset changed', payload);
+        socketManager.emitGlobal('asset-change', payload);
+        clearAllCaches();
+    }
+    async exists(path) {
+        try {
+            await FS.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.lstat(path);
+            if (stat.isSymbolicLink()) {
+                const realPath = `${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) {
+            // 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 = Path.basename(path);
+        if (filename.startsWith('.')) {
+            return true;
+        }
+        const relativePath = Path.relative(this.baseDir, path).split(Path.sep);
+        try {
+            if (FS.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);
+    }
+}

package/dist/esm/src/assetManager.js

@@ -1,6 +1,5 @@
 import Path from 'node:path';
-import FS from 'node:fs';
-import FSExtra from 'fs-extra';
+import FS from 'fs-extra';
 import YAML from 'yaml';
 import NodeCache from 'node-cache';
 import { codeGeneratorManager } from './codeGeneratorManager';
@@ -11,6 +10,10 @@ import { Actions } from '@kapeta/nodejs-registry-utils';
 import { definitionsManager } from './definitionsManager';
 import { normalizeKapetaUri } from './utils/utils';
 import { taskManager } from './taskManager';
+function clearAllCaches() {
+    definitionsManager.clearCache();
+    assetManager.clearCache();
+}
 function enrichAsset(asset) {
     return {
         ref: `kapeta://${asset.definition.metadata.name}:${asset.version}`,
@@ -97,19 +100,16 @@ class AssetManager {
         return asset;
     }
     async createAsset(path, yaml) {
-        if (FS.existsSync(path)) {
+        if (await FS.pathExists(path)) {
             throw new Error('File already exists: ' + path);
         }
         const dirName = Path.dirname(path);
-        if (!FS.existsSync(dirName)) {
-            FSExtra.mkdirpSync(dirName);
+        if (!(await FS.pathExists(dirName))) {
+            await FS.mkdirp(dirName);
         }
-        console.log('Wrote to ' + path);
-        FS.writeFileSync(path, YAML.stringify(yaml));
+        await FS.writeFile(path, YAML.stringify(yaml));
         const asset = await this.importFile(path);
-        console.log('Imported');
-        this.cache.flushAll();
-        definitionsManager.clearCache();
+        clearAllCaches();
         const ref = `kapeta://${yaml.metadata.name}:local`;
         this.maybeGenerateCode(ref, path, yaml);
         return asset;
@@ -125,11 +125,23 @@ class AssetManager {
         if (!asset.ymlPath) {
             throw new Error('Attempted to update corrupted asset: ' + ref);
         }
-        console.log('Wrote to ' + asset.ymlPath);
-        FS.writeFileSync(asset.ymlPath, YAML.stringify(yaml));
-        this.cache.flushAll();
-        definitionsManager.clearCache();
-        this.maybeGenerateCode(asset.ref, asset.ymlPath, yaml);
+        const path = asset.ymlPath;
+        try {
+            await repositoryManager.ignoreChangesFor(path);
+            await FS.writeFile(asset.ymlPath, YAML.stringify(yaml));
+            console.log('Wrote to ' + asset.ymlPath);
+            clearAllCaches();
+            this.maybeGenerateCode(asset.ref, asset.ymlPath, yaml);
+        }
+        finally {
+            //We need to wait a bit for the disk to settle before we can resume watching
+            setTimeout(async () => {
+                try {
+                    await repositoryManager.resumeChangedFor(path);
+                }
+                catch (e) { }
+            }, 500);
+        }
     }
     maybeGenerateCode(ref, ymlPath, block) {
         ref = normalizeKapetaUri(ref);
@@ -148,14 +160,15 @@ class AssetManager {
         if (filePath.startsWith('file://')) {
             filePath = filePath.substring('file://'.length);
         }
-        if (!FS.existsSync(filePath)) {
+        if (!(await FS.pathExists(filePath))) {
             throw new Error('File not found: ' + filePath);
         }
-        const assetInfos = YAML.parseAllDocuments(FS.readFileSync(filePath).toString()).map((doc) => doc.toJSON());
+        const content = await FS.readFile(filePath);
+        const assetInfos = YAML.parseAllDocuments(content.toString()).map((doc) => doc.toJSON());
         await Actions.link(new ProgressListener(), Path.dirname(filePath));
         const version = 'local';
         const refs = assetInfos.map((assetInfo) => `kapeta://${assetInfo.metadata.name}:${version}`);
-        this.cache.flushAll();
+        clearAllCaches();
         return this.getAssets().filter((a) => refs.some((ref) => compareRefs(ref, a.ref)));
     }
     async unregisterAsset(ref) {
@@ -163,7 +176,7 @@ class AssetManager {
         if (!asset) {
             throw new Error('Asset does not exists: ' + ref);
         }
-        this.cache.flushAll();
+        clearAllCaches();
         await Actions.uninstall(new ProgressListener(), [asset.ref]);
     }
     async installAsset(ref) {

package/dist/esm/src/instanceManager.js

@@ -51,7 +51,10 @@ export 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/esm/src/repositoryManager.d.ts

@@ -1,13 +1,13 @@
 import { Task } from './taskManager';
 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>;
+    ignoreChangesFor(file: string): Promise<void>;
+    resumeChangedFor(file: string): Promise<void>;
     ensureDefaultProviders(): void;
     private _install;
     ensureAsset(handle: string, name: string, version: string, wait?: boolean): Promise<undefined | Task[]>;

package/dist/esm/src/repositoryManager.js

@@ -1,17 +1,16 @@
-import FS from 'node:fs';
 import os from 'node:os';
-import Path from 'node:path';
-import watch from 'recursive-watch';
-import FSExtra from 'fs-extra';
-import ClusterConfiguration from '@kapeta/local-cluster-config';
-import { parseKapetaUri } from '@kapeta/nodejs-utils';
 import { socketManager } from './socketManager';
 import { Actions, Config, RegistryService } from '@kapeta/nodejs-registry-utils';
 import { definitionsManager } from './definitionsManager';
 import { taskManager } from './taskManager';
 import { normalizeKapetaUri } from './utils/utils';
-import { assetManager } from './assetManager';
 import { ProgressListener } from './progressListener';
+import { RepositoryWatcher } from './RepositoryWatcher';
+import { assetManager } from './assetManager';
+function clearAllCaches() {
+    definitionsManager.clearCache();
+    assetManager.clearCache();
+}
 const EVENT_DEFAULT_PROVIDERS_START = 'default-providers-start';
 const EVENT_DEFAULT_PROVIDERS_END = 'default-providers-end';
 const DEFAULT_PROVIDERS = [
@@ -30,92 +29,26 @@ const DEFAULT_PROVIDERS = [
 ];
 const INSTALL_ATTEMPTED = {};
 class RepositoryManager {
-    changeEventsEnabled;
     _registryService;
     _cache;
     watcher;
     constructor() {
-        this.changeEventsEnabled = true;
-        this.listenForChanges();
         this._registryService = new RegistryService(Config.data.registry.url);
         this._cache = {};
-    }
-    setChangeEventsEnabled(enabled) {
-        this.changeEventsEnabled = enabled;
+        this.watcher = new RepositoryWatcher();
+        this.listenForChanges();
     }
     listenForChanges() {
-        const baseDir = ClusterConfiguration.getRepositoryBasedir();
-        if (!FS.existsSync(baseDir)) {
-            FSExtra.mkdirpSync(baseDir);
-        }
-        let allDefinitions = ClusterConfiguration.getDefinitions();
-        console.log('Watching local repository for provider changes: %s', baseDir);
-        try {
-            this.watcher = watch(baseDir, (filename) => {
-                if (!filename) {
-                    return;
-                }
-                const [handle, name, version] = filename.toString().split(/\//g);
-                if (!name || !version) {
-                    return;
-                }
-                if (!this.changeEventsEnabled) {
-                    return;
-                }
-                const ymlPath = Path.join(baseDir, handle, name, version, 'kapeta.yml');
-                const newDefinitions = ClusterConfiguration.getDefinitions();
-                const newDefinition = newDefinitions.find((d) => d.ymlPath === ymlPath);
-                let currentDefinition = allDefinitions.find((d) => d.ymlPath === ymlPath);
-                const ymlExists = FS.existsSync(ymlPath);
-                let type;
-                if (ymlExists) {
-                    if (currentDefinition) {
-                        type = 'updated';
-                    }
-                    else if (newDefinition) {
-                        type = 'added';
-                        currentDefinition = newDefinition;
-                    }
-                    else {
-                        //Other definition was added / updated - ignore
-                        return;
-                    }
-                }
-                else {
-                    if (currentDefinition) {
-                        const ref = parseKapetaUri(`${currentDefinition.definition.metadata.name}:${currentDefinition.version}`).id;
-                        delete INSTALL_ATTEMPTED[ref];
-                        //Something was removed
-                        type = 'removed';
-                    }
-                    else {
-                        //Other definition was removed - ignore
-                        return;
-                    }
-                }
-                const payload = {
-                    type,
-                    definition: currentDefinition?.definition,
-                    asset: { handle, name, version },
-                };
-                allDefinitions = newDefinitions;
-                socketManager.emit(`assets`, 'changed', payload);
-                definitionsManager.clearCache();
-            });
-        }
-        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;
-        }
+        this.watcher.watch();
     }
-    stopListening() {
-        if (!this.watcher) {
-            return;
-        }
-        this.watcher();
-        this.watcher = undefined;
+    async stopListening() {
+        return this.watcher.unwatch();
+    }
+    ignoreChangesFor(file) {
+        return this.watcher.ignoreChangesFor(file);
+    }
+    resumeChangedFor(file) {
+        return this.watcher.resumeChangedFor(file);
     }
     ensureDefaultProviders() {
         socketManager.emitGlobal(EVENT_DEFAULT_PROVIDERS_START, { providers: DEFAULT_PROVIDERS });
@@ -140,19 +73,13 @@ class RepositoryManager {
                 try {
                     //We change to a temp dir to avoid issues with the current working directory
                     process.chdir(os.tmpdir());
-                    //Disable change events while installing
-                    this.setChangeEventsEnabled(false);
                     await Actions.install(new ProgressListener(), [ref], {});
                 }
                 catch (e) {
                     console.error(`Failed to install asset: ${ref}`, e);
                     throw e;
                 }
-                finally {
-                    this.setChangeEventsEnabled(true);
-                }
-                definitionsManager.clearCache();
-                assetManager.clearCache();
+                clearAllCaches();
                 //console.log(`Asset installed: ${ref}`);
             };
         };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.15.3",
+    "version": "0.16.0",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {
@@ -53,6 +53,7 @@
         "@kapeta/sdk-config": "<2",
         "@kapeta/web-microfrontend": "^0.2.1",
         "async-lock": "^1.4.0",
+        "chokidar": "^3.5.3",
         "express": "4.17.1",
         "express-promise-router": "^4.1.1",
         "fs-extra": "^11.1.0",
@@ -62,7 +63,6 @@
         "node-cache": "^5.1.2",
         "node-docker-api": "1.1.22",
         "node-uuid": "^1.4.8",
-        "recursive-watch": "^1.1.4",
         "request": "2.88.2",
         "request-promise": "4.2.6",
         "socket.io": "^4.5.2",