@kapeta/local-cluster-service 0.14.0 → 0.14.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.14.2](https://github.com/kapetacom/local-cluster-service/compare/v0.14.1...v0.14.2) (2023-08-08)
+
+
+### Bug Fixes
+
+* Use kapeta std lib for child process ([#58](https://github.com/kapetacom/local-cluster-service/issues/58)) ([43254ce](https://github.com/kapetacom/local-cluster-service/commit/43254cef67c86f8260150073d44b5803cd20e527))
+
+## [0.14.1](https://github.com/kapetacom/local-cluster-service/compare/v0.14.0...v0.14.1) (2023-08-07)
+
+
+### Bug Fixes
+
+* Generate code in the background ([#57](https://github.com/kapetacom/local-cluster-service/issues/57)) ([2e14827](https://github.com/kapetacom/local-cluster-service/commit/2e1482713ee52a19aed8edb9810107f1f340537c))
+
 # [0.14.0](https://github.com/kapetacom/local-cluster-service/compare/v0.13.0...v0.14.0) (2023-08-05)
 
 

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

@@ -25,6 +25,7 @@ declare class AssetManager {
     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;
     importFile(filePath: string): Promise<EnrichedAsset[]>;
     unregisterAsset(ref: string): Promise<void>;
     installAsset(ref: string): Promise<import("./taskManager").Task<void>[] | undefined>;

package/dist/cjs/src/assetManager.js

@@ -16,6 +16,7 @@ const repositoryManager_1 = require("./repositoryManager");
 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");
 function enrichAsset(asset) {
     return {
         ref: `kapeta://${asset.definition.metadata.name}:${asset.version}`,
@@ -109,16 +110,18 @@ class AssetManager {
         if (!node_fs_1.default.existsSync(dirName)) {
             fs_extra_1.default.mkdirpSync(dirName);
         }
+        console.log('Wrote to ' + path);
         node_fs_1.default.writeFileSync(path, yaml_1.default.stringify(yaml));
         const asset = await this.importFile(path);
-        if (codeGeneratorManager_1.codeGeneratorManager.canGenerateCode(yaml)) {
-            await codeGeneratorManager_1.codeGeneratorManager.generate(path, yaml);
-        }
+        console.log('Imported');
         this.cache.flushAll();
+        definitionsManager_1.definitionsManager.clearCache();
+        const ref = `kapeta://${yaml.metadata.name}:local`;
+        this.maybeGenerateCode(ref, path, yaml);
         return asset;
     }
     async updateAsset(ref, yaml) {
-        const asset = await this.getAsset(ref, true);
+        const asset = await this.getAsset(ref, true, false);
         if (!asset) {
             throw new Error('Attempted to update unknown asset: ' + ref);
         }
@@ -128,14 +131,24 @@ class AssetManager {
         if (!asset.ymlPath) {
             throw new Error('Attempted to update corrupted asset: ' + ref);
         }
+        console.log('Wrote to ' + asset.ymlPath);
         node_fs_1.default.writeFileSync(asset.ymlPath, yaml_1.default.stringify(yaml));
         this.cache.flushAll();
-        if (codeGeneratorManager_1.codeGeneratorManager.canGenerateCode(yaml)) {
-            await codeGeneratorManager_1.codeGeneratorManager.generate(asset.ymlPath, yaml);
-        }
-        else {
-            console.log('Could not generate code for %s', yaml.kind ? yaml.kind : 'unknown yaml');
+        definitionsManager_1.definitionsManager.clearCache();
+        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://')) {

package/dist/cjs/src/progressListener.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.progressListener = void 0;
-const child_process_1 = require("child_process");
+const nodejs_process_1 = require("@kapeta/nodejs-process");
 const socketManager_1 = require("./socketManager");
 class ProgressListener {
     socketManager;
@@ -14,18 +14,15 @@ class ProgressListener {
             message: `Running command "${command}"`,
         });
         return new Promise((resolve, reject) => {
-            const child = (0, child_process_1.spawn)(command, {
+            const child = (0, nodejs_process_1.spawn)(command, [], {
                 cwd: directory ? directory : process.cwd(),
                 detached: true,
                 shell: true,
             });
-            child.stdout.on('data', (data) => {
-                this.socketManager.emit(`install`, 'install:log', { type: 'info', message: data.toString() });
+            child.onData((data) => {
+                this.socketManager.emit(`install`, 'install:log', { type: 'info', message: data.line });
             });
-            child.stderr.on('data', (data) => {
-                this.socketManager.emit(`install`, 'install:log', { type: 'info', message: data.toString() });
-            });
-            child.on('exit', (exit, signal) => {
+            child.process.on('exit', (exit, signal) => {
                 if (exit !== 0) {
                     this.socketManager.emit(`install`, 'install:log', {
                         type: 'info',
@@ -41,7 +38,7 @@ class ProgressListener {
                     resolve({ exit, signal });
                 }
             });
-            child.on('error', (err) => {
+            child.process.on('error', (err) => {
                 this.socketManager.emit(`install`, 'install:log', {
                     type: 'info',
                     message: `"${command}" failed: "${err.message}"`,

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

@@ -25,6 +25,7 @@ declare class AssetManager {
     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;
     importFile(filePath: string): Promise<EnrichedAsset[]>;
     unregisterAsset(ref: string): Promise<void>;
     installAsset(ref: string): Promise<import("./taskManager").Task<void>[] | undefined>;

package/dist/esm/src/assetManager.js

@@ -10,6 +10,7 @@ import { repositoryManager } from './repositoryManager';
 import { Actions } from '@kapeta/nodejs-registry-utils';
 import { definitionsManager } from './definitionsManager';
 import { normalizeKapetaUri } from './utils/utils';
+import { taskManager } from "./taskManager";
 function enrichAsset(asset) {
     return {
         ref: `kapeta://${asset.definition.metadata.name}:${asset.version}`,
@@ -103,16 +104,18 @@ class AssetManager {
         if (!FS.existsSync(dirName)) {
             FSExtra.mkdirpSync(dirName);
         }
+        console.log('Wrote to ' + path);
         FS.writeFileSync(path, YAML.stringify(yaml));
         const asset = await this.importFile(path);
-        if (codeGeneratorManager.canGenerateCode(yaml)) {
-            await codeGeneratorManager.generate(path, yaml);
-        }
+        console.log('Imported');
         this.cache.flushAll();
+        definitionsManager.clearCache();
+        const ref = `kapeta://${yaml.metadata.name}:local`;
+        this.maybeGenerateCode(ref, path, yaml);
         return asset;
     }
     async updateAsset(ref, yaml) {
-        const asset = await this.getAsset(ref, true);
+        const asset = await this.getAsset(ref, true, false);
         if (!asset) {
             throw new Error('Attempted to update unknown asset: ' + ref);
         }
@@ -122,14 +125,24 @@ 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();
-        if (codeGeneratorManager.canGenerateCode(yaml)) {
-            await codeGeneratorManager.generate(asset.ymlPath, yaml);
-        }
-        else {
-            console.log('Could not generate code for %s', yaml.kind ? yaml.kind : 'unknown yaml');
+        definitionsManager.clearCache();
+        this.maybeGenerateCode(asset.ref, asset.ymlPath, yaml);
+    }
+    maybeGenerateCode(ref, ymlPath, block) {
+        ref = normalizeKapetaUri(ref);
+        if (codeGeneratorManager.canGenerateCode(block)) {
+            const assetTitle = block.metadata.title ? block.metadata.title : parseKapetaUri(block.metadata.name).name;
+            taskManager.add(`codegen:${ref}`, async () => {
+                await codeGeneratorManager.generate(ymlPath, block);
+            }, {
+                name: `Generating code for ${assetTitle}`,
+            });
+            return true;
         }
+        return false;
     }
     async importFile(filePath) {
         if (filePath.startsWith('file://')) {

package/dist/esm/src/progressListener.js

@@ -1,4 +1,4 @@
-import { spawn } from 'child_process';
+import { spawn } from '@kapeta/nodejs-process';
 import { socketManager } from './socketManager';
 class ProgressListener {
     socketManager;
@@ -11,18 +11,15 @@ class ProgressListener {
             message: `Running command "${command}"`,
         });
         return new Promise((resolve, reject) => {
-            const child = spawn(command, {
+            const child = spawn(command, [], {
                 cwd: directory ? directory : process.cwd(),
                 detached: true,
                 shell: true,
             });
-            child.stdout.on('data', (data) => {
-                this.socketManager.emit(`install`, 'install:log', { type: 'info', message: data.toString() });
+            child.onData((data) => {
+                this.socketManager.emit(`install`, 'install:log', { type: 'info', message: data.line });
             });
-            child.stderr.on('data', (data) => {
-                this.socketManager.emit(`install`, 'install:log', { type: 'info', message: data.toString() });
-            });
-            child.on('exit', (exit, signal) => {
+            child.process.on('exit', (exit, signal) => {
                 if (exit !== 0) {
                     this.socketManager.emit(`install`, 'install:log', {
                         type: 'info',
@@ -38,7 +35,7 @@ class ProgressListener {
                     resolve({ exit, signal });
                 }
             });
-            child.on('error', (err) => {
+            child.process.on('error', (err) => {
                 this.socketManager.emit(`install`, 'install:log', {
                     type: 'info',
                     message: `"${command}" failed: "${err.message}"`,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.14.0",
+    "version": "0.14.2",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {
@@ -46,6 +46,7 @@
         "@kapeta/codegen": "<2",
         "@kapeta/local-cluster-config": ">= 0.2.3 <2",
         "@kapeta/nodejs-api-client": "<2",
+        "@kapeta/nodejs-process": "^1.1.0",
         "@kapeta/nodejs-registry-utils": "<2",
         "@kapeta/nodejs-utils": "<2",
         "@kapeta/schemas": "^0.0.58",

package/src/assetManager.ts

@@ -12,6 +12,7 @@ import { BlockDefinition } from '@kapeta/schemas';
 import { Actions } from '@kapeta/nodejs-registry-utils';
 import { definitionsManager } from './definitionsManager';
 import { normalizeKapetaUri } from './utils/utils';
+import {taskManager} from "./taskManager";
 
 export interface EnrichedAsset {
     ref: string;
@@ -141,19 +142,24 @@ class AssetManager {
             FSExtra.mkdirpSync(dirName);
         }
 
+        console.log('Wrote to ' + path);
         FS.writeFileSync(path, YAML.stringify(yaml));
 
         const asset = await this.importFile(path);
+        console.log('Imported');
 
-        if (codeGeneratorManager.canGenerateCode(yaml)) {
-            await codeGeneratorManager.generate(path, yaml);
-        }
         this.cache.flushAll();
+        definitionsManager.clearCache();
+
+        const ref = `kapeta://${yaml.metadata.name}:local`;
+
+        this.maybeGenerateCode(ref, path, yaml);
+
         return asset;
     }
 
     async updateAsset(ref: string, yaml: BlockDefinition) {
-        const asset = await this.getAsset(ref, true);
+        const asset = await this.getAsset(ref, true, false);
         if (!asset) {
             throw new Error('Attempted to update unknown asset: ' + ref);
         }
@@ -166,13 +172,26 @@ class AssetManager {
             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();
-        if (codeGeneratorManager.canGenerateCode(yaml)) {
-            await codeGeneratorManager.generate(asset.ymlPath, yaml);
-        } else {
-            console.log('Could not generate code for %s', yaml.kind ? yaml.kind : 'unknown yaml');
+        definitionsManager.clearCache();
+
+        this.maybeGenerateCode(asset.ref, asset.ymlPath, yaml);
+    }
+
+    private maybeGenerateCode(ref:string, ymlPath:string, block: BlockDefinition) {
+        ref = normalizeKapetaUri(ref);
+        if (codeGeneratorManager.canGenerateCode(block)) {
+            const assetTitle = block.metadata.title ? block.metadata.title : parseKapetaUri(block.metadata.name).name;
+            taskManager.add(`codegen:${ref}`, async () => {
+                await codeGeneratorManager.generate(ymlPath, block);
+            },{
+                name: `Generating code for ${assetTitle}`,
+            });
+            return true;
         }
+        return false;
     }
 
     async importFile(filePath: string) {

package/src/progressListener.ts

@@ -1,4 +1,4 @@
-import { spawn } from 'child_process';
+import { spawn } from '@kapeta/nodejs-process';
 import { SocketManager, socketManager } from './socketManager';
 class ProgressListener {
     private socketManager: SocketManager;
@@ -14,21 +14,17 @@ class ProgressListener {
         });
 
         return new Promise((resolve, reject) => {
-            const child = spawn(command, {
+            const child = spawn(command, [],{
                 cwd: directory ? directory : process.cwd(),
                 detached: true,
                 shell: true,
             });
 
-            child.stdout.on('data', (data) => {
-                this.socketManager.emit(`install`, 'install:log', { type: 'info', message: data.toString() });
+            child.onData((data) => {
+                this.socketManager.emit(`install`, 'install:log', { type: 'info', message: data.line });
             });
 
-            child.stderr.on('data', (data) => {
-                this.socketManager.emit(`install`, 'install:log', { type: 'info', message: data.toString() });
-            });
-
-            child.on('exit', (exit, signal) => {
+            child.process.on('exit', (exit, signal) => {
                 if (exit !== 0) {
                     this.socketManager.emit(`install`, 'install:log', {
                         type: 'info',
@@ -44,7 +40,7 @@ class ProgressListener {
                 }
             });
 
-            child.on('error', (err) => {
+            child.process.on('error', (err) => {
                 this.socketManager.emit(`install`, 'install:log', {
                     type: 'info',
                     message: `"${command}" failed: "${err.message}"`,