@kapeta/local-cluster-service 0.54.9 → 0.54.11

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [0.54.11](https://github.com/kapetacom/local-cluster-service/compare/v0.54.10...v0.54.11) (2024-07-10)
+
+
+### Bug Fixes
+
+* handle unpredictable AI outputs ([#189](https://github.com/kapetacom/local-cluster-service/issues/189)) ([651c1dc](https://github.com/kapetacom/local-cluster-service/commit/651c1dc1c15e5392fc4f4b09f27ce42e4f7ae7a5))
+
+## [0.54.10](https://github.com/kapetacom/local-cluster-service/compare/v0.54.9...v0.54.10) (2024-07-09)
+
+
+### Bug Fixes
+
+* make instanceManager watch explicit w/ start+stop ([ff86ca7](https://github.com/kapetacom/local-cluster-service/commit/ff86ca7c9077a5901c3578a6920298ba6bfb21e3))
+* make repositoryManager watch explicit w/ start+stop in index ([f7c08e7](https://github.com/kapetacom/local-cluster-service/commit/f7c08e70947a185cfb8e8ca4e83183af297d85aa))
+* send QA and Building events ([955d171](https://github.com/kapetacom/local-cluster-service/commit/955d17128aed1f51ded68d723e10c501d0000696))
+* temporarily disable code verify and fixing while codegen is unstable ([08e54b6](https://github.com/kapetacom/local-cluster-service/commit/08e54b61bdab402a84370d985e5d25d2fa9f9588))
+
 ## [0.54.9](https://github.com/kapetacom/local-cluster-service/compare/v0.54.8...v0.54.9) (2024-07-02)
 
 

package/dist/cjs/index.js

@@ -61,6 +61,7 @@ const authManager_1 = require("./src/authManager");
 const codeGeneratorManager_1 = require("./src/codeGeneratorManager");
 const Sentry = __importStar(require("@sentry/node"));
 const assetManager_1 = require("./src/assetManager");
+const instanceManager_1 = require("./src/instanceManager");
 Sentry.init({
     dsn: 'https://0b7cc946d82c591473d6f95fff5e210b@o4505820837249024.ingest.sentry.io/4506212692000768',
     enabled: process.env.NODE_ENV !== 'development',
@@ -191,6 +192,8 @@ exports.default = {
         }
         await clusterService_1.clusterService.init();
         authManager_1.authManager.listenForChanges();
+        instanceManager_1.instanceManager.startMonitoring();
+        repositoryManager_1.repositoryManager.listenForChanges();
         currentServer = createServer();
         const port = clusterService_1.clusterService.getClusterServicePort();
         const host = clusterService_1.clusterService.getClusterServiceHost();
@@ -250,7 +253,9 @@ exports.default = {
      * Stops any currently running cluster services.
      * @return {Promise<boolean>} Returns true if the service was stopped - false if no service was running.
      */
-    stop: function () {
+    stop: async function () {
+        instanceManager_1.instanceManager.stopMonitoring();
+        await repositoryManager_1.repositoryManager.stopListening();
         if (currentServer) {
             return new Promise(function (resolve) {
                 if (currentServer) {

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

@@ -10,6 +10,8 @@ export declare class InstanceManager {
     private readonly _instances;
     private readonly instanceLocks;
     constructor();
+    startMonitoring(): void;
+    stopMonitoring(): void;
     private checkInstancesLater;
     getInstances(): InstanceInfo[];
     getInstancesForPlan(systemId: string): Promise<InstanceInfo[]>;

package/dist/cjs/src/instanceManager.js

@@ -32,9 +32,16 @@ class InstanceManager {
     instanceLocks = new async_lock_1.default();
     constructor() {
         this._instances = storageService_1.storageService.section('instances', []);
+    }
+    startMonitoring() {
         // We need to wait a bit before running the first check
         this.checkInstancesLater(1000);
     }
+    stopMonitoring() {
+        if (this._interval) {
+            clearTimeout(this._interval);
+        }
+    }
     checkInstancesLater(time = CHECK_INTERVAL) {
         if (this._interval) {
             clearTimeout(this._interval);

package/dist/cjs/src/repositoryManager.js

@@ -42,7 +42,6 @@ class RepositoryManager extends node_events_1.EventEmitter {
         super();
         this._registryService = new nodejs_registry_utils_1.RegistryService(nodejs_registry_utils_1.Config.data.registry.url);
         this.watcher = new RepositoryWatcher_1.RepositoryWatcher();
-        this.listenForChanges();
         this.watcher.on('change', (file, source) => {
             this.emit('change', file, source);
         });

package/dist/cjs/src/storm/codegen.js

@@ -390,10 +390,12 @@ class StormCodegen {
         await (0, promises_1.writeFile)(kapetaYmlPath, kapetaYaml);
         const blockRef = block.uri;
         this.emitBlockStatus(blockUri, block.aiName, events_1.StormEventBlockStatusType.QA);
-        const filesToBeFixed = serviceFiles.concat(contextFiles).concat(screenFilesConverted);
-        const codeGenerator = new codegen_1.BlockCodeGenerator(blockDefinition);
+        /* TODO: temporarily disabled - enable again when codegen is more stable
+                        const filesToBeFixed = serviceFiles.concat(contextFiles).concat(screenFilesConverted);
+                        const codeGenerator = new BlockCodeGenerator(blockDefinition);
+        */
         this.emitBlockStatus(blockUri, block.aiName, events_1.StormEventBlockStatusType.BUILDING);
-        await this.verifyAndFixCode(blockUri, block.aiName, codeGenerator, basePath, filesToBeFixed, allFiles);
+        //        await this.verifyAndFixCode(blockUri, block.aiName, codeGenerator, basePath, filesToBeFixed, allFiles);
         this.out.emit('data', {
             type: 'BLOCK_READY',
             reason: 'Block ready',

package/dist/cjs/src/storm/event-parser.js

@@ -386,12 +386,12 @@ class StormEventParser {
             const blockSpec = blockDefinitionInfo.content.spec;
             const apiResources = {};
             let dbResource = undefined;
-            blockInfo.resources.forEach((resource) => {
+            (blockInfo.resources || []).forEach((resource) => {
                 const port = {
                     type: this.toPortType(resource.type),
                 };
                 switch (resource.type) {
-                    case 'API':
+                    case 'API': {
                         const apiResource = {
                             kind: this.toResourceKind(resource.type),
                             metadata: {
@@ -411,6 +411,7 @@ class StormEventParser {
                         apiResources[resource.name] = apiResource;
                         blockSpec.providers.push(apiResource);
                         break;
+                    }
                     case 'CLIENT':
                         blockSpec.consumers.push({
                             kind: this.toResourceKind(resource.type),
@@ -508,7 +509,12 @@ class StormEventParser {
                     // available rest resource
                     const firstKey = Object.keys(apiResources)[0];
                     const firstEntry = apiResources[firstKey];
-                    firstEntry.spec.source.value += api + '\n\n';
+                    if (firstEntry) {
+                        firstEntry.spec.source.value += api + '\n\n';
+                    }
+                    else {
+                        console.warn('Unable to find resource for API', api);
+                    }
                 }
             });
             blockInfo.types.forEach((type) => {

package/dist/esm/index.js

@@ -61,6 +61,7 @@ const authManager_1 = require("./src/authManager");
 const codeGeneratorManager_1 = require("./src/codeGeneratorManager");
 const Sentry = __importStar(require("@sentry/node"));
 const assetManager_1 = require("./src/assetManager");
+const instanceManager_1 = require("./src/instanceManager");
 Sentry.init({
     dsn: 'https://0b7cc946d82c591473d6f95fff5e210b@o4505820837249024.ingest.sentry.io/4506212692000768',
     enabled: process.env.NODE_ENV !== 'development',
@@ -191,6 +192,8 @@ exports.default = {
         }
         await clusterService_1.clusterService.init();
         authManager_1.authManager.listenForChanges();
+        instanceManager_1.instanceManager.startMonitoring();
+        repositoryManager_1.repositoryManager.listenForChanges();
         currentServer = createServer();
         const port = clusterService_1.clusterService.getClusterServicePort();
         const host = clusterService_1.clusterService.getClusterServiceHost();
@@ -250,7 +253,9 @@ exports.default = {
      * Stops any currently running cluster services.
      * @return {Promise<boolean>} Returns true if the service was stopped - false if no service was running.
      */
-    stop: function () {
+    stop: async function () {
+        instanceManager_1.instanceManager.stopMonitoring();
+        await repositoryManager_1.repositoryManager.stopListening();
         if (currentServer) {
             return new Promise(function (resolve) {
                 if (currentServer) {

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

@@ -10,6 +10,8 @@ export declare class InstanceManager {
     private readonly _instances;
     private readonly instanceLocks;
     constructor();
+    startMonitoring(): void;
+    stopMonitoring(): void;
     private checkInstancesLater;
     getInstances(): InstanceInfo[];
     getInstancesForPlan(systemId: string): Promise<InstanceInfo[]>;

package/dist/esm/src/instanceManager.js

@@ -32,9 +32,16 @@ class InstanceManager {
     instanceLocks = new async_lock_1.default();
     constructor() {
         this._instances = storageService_1.storageService.section('instances', []);
+    }
+    startMonitoring() {
         // We need to wait a bit before running the first check
         this.checkInstancesLater(1000);
     }
+    stopMonitoring() {
+        if (this._interval) {
+            clearTimeout(this._interval);
+        }
+    }
     checkInstancesLater(time = CHECK_INTERVAL) {
         if (this._interval) {
             clearTimeout(this._interval);

package/dist/esm/src/repositoryManager.js

@@ -42,7 +42,6 @@ class RepositoryManager extends node_events_1.EventEmitter {
         super();
         this._registryService = new nodejs_registry_utils_1.RegistryService(nodejs_registry_utils_1.Config.data.registry.url);
         this.watcher = new RepositoryWatcher_1.RepositoryWatcher();
-        this.listenForChanges();
         this.watcher.on('change', (file, source) => {
             this.emit('change', file, source);
         });

package/dist/esm/src/storm/codegen.js

@@ -390,10 +390,12 @@ class StormCodegen {
         await (0, promises_1.writeFile)(kapetaYmlPath, kapetaYaml);
         const blockRef = block.uri;
         this.emitBlockStatus(blockUri, block.aiName, events_1.StormEventBlockStatusType.QA);
-        const filesToBeFixed = serviceFiles.concat(contextFiles).concat(screenFilesConverted);
-        const codeGenerator = new codegen_1.BlockCodeGenerator(blockDefinition);
+        /* TODO: temporarily disabled - enable again when codegen is more stable
+                        const filesToBeFixed = serviceFiles.concat(contextFiles).concat(screenFilesConverted);
+                        const codeGenerator = new BlockCodeGenerator(blockDefinition);
+        */
         this.emitBlockStatus(blockUri, block.aiName, events_1.StormEventBlockStatusType.BUILDING);
-        await this.verifyAndFixCode(blockUri, block.aiName, codeGenerator, basePath, filesToBeFixed, allFiles);
+        //        await this.verifyAndFixCode(blockUri, block.aiName, codeGenerator, basePath, filesToBeFixed, allFiles);
         this.out.emit('data', {
             type: 'BLOCK_READY',
             reason: 'Block ready',

package/dist/esm/src/storm/event-parser.js

@@ -386,12 +386,12 @@ class StormEventParser {
             const blockSpec = blockDefinitionInfo.content.spec;
             const apiResources = {};
             let dbResource = undefined;
-            blockInfo.resources.forEach((resource) => {
+            (blockInfo.resources || []).forEach((resource) => {
                 const port = {
                     type: this.toPortType(resource.type),
                 };
                 switch (resource.type) {
-                    case 'API':
+                    case 'API': {
                         const apiResource = {
                             kind: this.toResourceKind(resource.type),
                             metadata: {
@@ -411,6 +411,7 @@ class StormEventParser {
                         apiResources[resource.name] = apiResource;
                         blockSpec.providers.push(apiResource);
                         break;
+                    }
                     case 'CLIENT':
                         blockSpec.consumers.push({
                             kind: this.toResourceKind(resource.type),
@@ -508,7 +509,12 @@ class StormEventParser {
                     // available rest resource
                     const firstKey = Object.keys(apiResources)[0];
                     const firstEntry = apiResources[firstKey];
-                    firstEntry.spec.source.value += api + '\n\n';
+                    if (firstEntry) {
+                        firstEntry.spec.source.value += api + '\n\n';
+                    }
+                    else {
+                        console.warn('Unable to find resource for API', api);
+                    }
                 }
             });
             blockInfo.types.forEach((type) => {

package/index.ts

@@ -35,6 +35,7 @@ import { authManager } from './src/authManager';
 import { codeGeneratorManager } from './src/codeGeneratorManager';
 import * as Sentry from '@sentry/node';
 import { assetManager } from './src/assetManager';
+import { instanceManager } from './src/instanceManager';
 
 Sentry.init({
     dsn: 'https://0b7cc946d82c591473d6f95fff5e210b@o4505820837249024.ingest.sentry.io/4506212692000768',
@@ -197,6 +198,8 @@ export default {
         await clusterService.init();
 
         authManager.listenForChanges();
+        instanceManager.startMonitoring();
+        repositoryManager.listenForChanges();
 
         currentServer = createServer();
 
@@ -266,7 +269,9 @@ export default {
      * Stops any currently running cluster services.
      * @return {Promise<boolean>} Returns true if the service was stopped - false if no service was running.
      */
-    stop: function () {
+    stop: async function () {
+        instanceManager.stopMonitoring();
+        await repositoryManager.stopListening();
         if (currentServer) {
             return new Promise(function (resolve) {
                 if (currentServer) {

package/package.json

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

package/src/instanceManager.ts

@@ -49,7 +49,7 @@ const DEFAULT_HEALTH_PORT_TYPE = 'http';
 const MIN_TIME_RUNNING = 30000; //If something didnt run for more than 30 secs - it failed
 
 export class InstanceManager {
-    private _interval: any = undefined;
+    private _interval: ReturnType<typeof setTimeout> | undefined = undefined;
 
     private readonly _instances: InstanceInfo[] = [];
 
@@ -57,11 +57,19 @@ export class InstanceManager {
 
     constructor() {
         this._instances = storageService.section('instances', []);
+    }
 
+    public startMonitoring() {
         // We need to wait a bit before running the first check
         this.checkInstancesLater(1000);
     }
 
+    public stopMonitoring() {
+        if (this._interval) {
+            clearTimeout(this._interval);
+        }
+    }
+
     private checkInstancesLater(time = CHECK_INTERVAL) {
         if (this._interval) {
             clearTimeout(this._interval);

package/src/repositoryManager.ts

@@ -43,7 +43,6 @@ class RepositoryManager extends EventEmitter {
         super();
         this._registryService = new RegistryService(Config.data.registry.url);
         this.watcher = new RepositoryWatcher();
-        this.listenForChanges();
 
         this.watcher.on('change', (file: string, source: SourceOfChange) => {
             this.emit('change', file, source);

package/src/storm/codegen.ts

@@ -480,11 +480,13 @@ export class StormCodegen {
 
         this.emitBlockStatus(blockUri, block.aiName, StormEventBlockStatusType.QA);
 
-        const filesToBeFixed = serviceFiles.concat(contextFiles).concat(screenFilesConverted);
-        const codeGenerator = new BlockCodeGenerator(blockDefinition);
+/* TODO: temporarily disabled - enable again when codegen is more stable
+                const filesToBeFixed = serviceFiles.concat(contextFiles).concat(screenFilesConverted);
+                const codeGenerator = new BlockCodeGenerator(blockDefinition);
+*/
 
         this.emitBlockStatus(blockUri, block.aiName, StormEventBlockStatusType.BUILDING);
-        await this.verifyAndFixCode(blockUri, block.aiName, codeGenerator, basePath, filesToBeFixed, allFiles);
+//        await this.verifyAndFixCode(blockUri, block.aiName, codeGenerator, basePath, filesToBeFixed, allFiles);
 
         this.out.emit('data', {
             type: 'BLOCK_READY',

package/src/storm/event-parser.ts

@@ -26,7 +26,8 @@ import {
     DSLAPIParser,
     DSLController,
     DSLConverters,
-    DSLDataTypeParser, DSLEntityType,
+    DSLDataTypeParser,
+    DSLEntityType,
     DSLMethod,
     DSLParser,
     KAPLANG_ID,
@@ -540,12 +541,12 @@ export class StormEventParser {
             const apiResources: { [key: string]: Resource | undefined } = {};
             let dbResource: Resource | undefined = undefined;
 
-            blockInfo.resources.forEach((resource) => {
+            (blockInfo.resources || []).forEach((resource) => {
                 const port = {
                     type: this.toPortType(resource.type),
                 };
                 switch (resource.type) {
-                    case 'API':
+                    case 'API': {
                         const apiResource = {
                             kind: this.toResourceKind(resource.type),
                             metadata: {
@@ -565,6 +566,7 @@ export class StormEventParser {
                         apiResources[resource.name] = apiResource;
                         blockSpec.providers!.push(apiResource);
                         break;
+                    }
                     case 'CLIENT':
                         blockSpec.consumers!.push({
                             kind: this.toResourceKind(resource.type),
@@ -665,7 +667,11 @@ export class StormEventParser {
                     // available rest resource
                     const firstKey = Object.keys(apiResources)[0];
                     const firstEntry = apiResources[firstKey];
-                    firstEntry!.spec.source.value += api + '\n\n';
+                    if (firstEntry) {
+                        firstEntry.spec.source.value += api + '\n\n';
+                    } else {
+                        console.warn('Unable to find resource for API', api);
+                    }
                 }
             });