@kapeta/local-cluster-service 0.13.0 → 0.14.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [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)
+
+
+### Features
+
+* Added api proxy for remote services ([#56](https://github.com/kapetacom/local-cluster-service/issues/56)) ([ea2cba8](https://github.com/kapetacom/local-cluster-service/commit/ea2cba8936b422e4b17197c35ef656b501b740a5))
+
 # [0.13.0](https://github.com/kapetacom/local-cluster-service/compare/v0.12.1...v0.13.0) (2023-08-03)
 
 

package/dist/cjs/index.js

@@ -21,6 +21,7 @@ const routes_7 = __importDefault(require("./src/assets/routes"));
 const routes_8 = __importDefault(require("./src/providers/routes"));
 const routes_9 = __importDefault(require("./src/attachments/routes"));
 const routes_10 = __importDefault(require("./src/tasks/routes"));
+const api_1 = __importDefault(require("./src/api"));
 const utils_1 = require("./src/utils/utils");
 const request_1 = __importDefault(require("request"));
 let currentServer = null;
@@ -36,6 +37,7 @@ function createServer() {
     app.use('/providers', routes_8.default);
     app.use('/attachments', routes_9.default);
     app.use('/tasks', routes_10.default);
+    app.use('/api', api_1.default);
     app.get('/status', async (req, res) => {
         res.send({
             ok: true,

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

@@ -0,0 +1,3 @@
+/// <reference types="express" />
+declare const router: import("express").Router;
+export default router;

package/dist/cjs/src/api.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_promise_router_1 = __importDefault(require("express-promise-router"));
+const cors_1 = require("./middleware/cors");
+const nodejs_api_client_1 = require("@kapeta/nodejs-api-client");
+const local_cluster_config_1 = __importDefault(require("@kapeta/local-cluster-config"));
+const { createAPIRoute } = require('@kapeta/web-microfrontend/server');
+const packageJson = require('../package.json');
+const router = (0, express_promise_router_1.default)();
+const remoteServices = local_cluster_config_1.default.getClusterConfig().remoteServices ?? {};
+router.use('/', cors_1.corsHandler);
+router.use('/registry', createAPIRoute(remoteServices.registry ?? 'https://registry.kapeta.com', {
+    nonce: false,
+    userAgent: `KapetaDesktopCluster/${packageJson.version}`,
+    tokenFetcher: () => {
+        return new nodejs_api_client_1.KapetaAPI().getAccessToken();
+    }
+}));
+exports.default = router;

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/assets/routes.js

@@ -29,7 +29,7 @@ router.use('/', stringBody_1.stringBody);
  * Get all local assets available
  */
 router.get('/', (req, res) => {
-    res.send(assetManager_1.assetManager.getAssets());
+    res.send(assetManager_1.assetManager.getAssets([]));
 });
 /**
  * Get single asset

package/dist/cjs/src/taskManager.js

@@ -130,7 +130,6 @@ class TaskManager {
         if (task.metadata.group) {
             const existingTaskInGroup = this._tasks.find((t) => t.id !== task.id && t.metadata.group === task.metadata.group && t.status === TaskStatus.RUNNING);
             if (existingTaskInGroup) {
-                console.log('existingTaskInGroup', existingTaskInGroup.toData());
                 return;
             }
         }
@@ -154,7 +153,6 @@ class TaskManager {
         if (task.metadata.group) {
             const nextTaskInGroup = this._tasks.find((t) => t.id !== task.id && t.metadata.group === task.metadata.group && t.status === TaskStatus.PENDING);
             if (nextTaskInGroup) {
-                console.log('nextTaskInGroup', nextTaskInGroup.toData());
                 return this.invokeTask(nextTaskInGroup);
             }
         }

package/dist/esm/index.js

@@ -16,6 +16,7 @@ import AssetsRoutes from './src/assets/routes';
 import ProviderRoutes from './src/providers/routes';
 import AttachmentRoutes from './src/attachments/routes';
 import TaskRoutes from './src/tasks/routes';
+import APIRoutes from './src/api';
 import { getBindHost } from './src/utils/utils';
 import request from 'request';
 let currentServer = null;
@@ -31,6 +32,7 @@ function createServer() {
     app.use('/providers', ProviderRoutes);
     app.use('/attachments', AttachmentRoutes);
     app.use('/tasks', TaskRoutes);
+    app.use('/api', APIRoutes);
     app.get('/status', async (req, res) => {
         res.send({
             ok: true,

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

@@ -0,0 +1,3 @@
+/// <reference types="express" />
+declare const router: import("express").Router;
+export default router;

package/dist/esm/src/api.js

@@ -0,0 +1,17 @@
+import Router from 'express-promise-router';
+import { corsHandler } from "./middleware/cors";
+import { KapetaAPI } from "@kapeta/nodejs-api-client";
+import ClusterConfiguration from '@kapeta/local-cluster-config';
+const { createAPIRoute } = require('@kapeta/web-microfrontend/server');
+const packageJson = require('../package.json');
+const router = Router();
+const remoteServices = ClusterConfiguration.getClusterConfig().remoteServices ?? {};
+router.use('/', corsHandler);
+router.use('/registry', createAPIRoute(remoteServices.registry ?? 'https://registry.kapeta.com', {
+    nonce: false,
+    userAgent: `KapetaDesktopCluster/${packageJson.version}`,
+    tokenFetcher: () => {
+        return new KapetaAPI().getAccessToken();
+    }
+}));
+export default router;

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/assets/routes.js

@@ -24,7 +24,7 @@ router.use('/', stringBody);
  * Get all local assets available
  */
 router.get('/', (req, res) => {
-    res.send(assetManager.getAssets());
+    res.send(assetManager.getAssets([]));
 });
 /**
  * Get single asset

package/dist/esm/src/taskManager.js

@@ -126,7 +126,6 @@ class TaskManager {
         if (task.metadata.group) {
             const existingTaskInGroup = this._tasks.find((t) => t.id !== task.id && t.metadata.group === task.metadata.group && t.status === TaskStatus.RUNNING);
             if (existingTaskInGroup) {
-                console.log('existingTaskInGroup', existingTaskInGroup.toData());
                 return;
             }
         }
@@ -150,7 +149,6 @@ class TaskManager {
         if (task.metadata.group) {
             const nextTaskInGroup = this._tasks.find((t) => t.id !== task.id && t.metadata.group === task.metadata.group && t.status === TaskStatus.PENDING);
             if (nextTaskInGroup) {
-                console.log('nextTaskInGroup', nextTaskInGroup.toData());
                 return this.invokeTask(nextTaskInGroup);
             }
         }

package/index.ts

@@ -17,8 +17,13 @@ import AssetsRoutes from './src/assets/routes';
 import ProviderRoutes from './src/providers/routes';
 import AttachmentRoutes from './src/attachments/routes';
 import TaskRoutes from './src/tasks/routes';
+import APIRoutes from './src/api';
 import { getBindHost } from './src/utils/utils';
 import request from 'request';
+import ClusterConfiguration from "@kapeta/local-cluster-config";
+import {KapetaAPI} from "@kapeta/nodejs-api-client";
+import {corsHandler} from "./src/middleware/cors";
+
 
 export type LocalClusterService = HTTP.Server & { host?: string; port?: number };
 
@@ -38,6 +43,8 @@ function createServer() {
     app.use('/providers', ProviderRoutes);
     app.use('/attachments', AttachmentRoutes);
     app.use('/tasks', TaskRoutes);
+    app.use('/api', APIRoutes);
+
     app.get('/status', async (req, res) => {
         res.send({
             ok: true,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.13.0",
+    "version": "0.14.1",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {
@@ -50,6 +50,7 @@
         "@kapeta/nodejs-utils": "<2",
         "@kapeta/schemas": "^0.0.58",
         "@kapeta/sdk-config": "<2",
+        "@kapeta/web-microfrontend": "^0.2.1",
         "async-lock": "^1.4.0",
         "express": "4.17.1",
         "express-promise-router": "^4.1.1",

package/src/api.ts

@@ -0,0 +1,21 @@
+import Router from 'express-promise-router';
+import {corsHandler} from "./middleware/cors";
+import {KapetaAPI} from "@kapeta/nodejs-api-client";
+import ClusterConfiguration from '@kapeta/local-cluster-config';
+const { createAPIRoute }  = require('@kapeta/web-microfrontend/server');
+const packageJson = require('../package.json');
+
+const router = Router();
+
+const remoteServices = ClusterConfiguration.getClusterConfig().remoteServices ?? {};
+router.use('/', corsHandler)
+
+router.use('/registry', createAPIRoute(remoteServices.registry ?? 'https://registry.kapeta.com', {
+    nonce: false,
+    userAgent: `KapetaDesktopCluster/${packageJson.version}`,
+    tokenFetcher: () => {
+        return new KapetaAPI().getAccessToken();
+    }
+}));
+
+export default router;

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/assets/routes.ts

@@ -32,7 +32,7 @@ router.use('/', stringBody);
  * Get all local assets available
  */
 router.get('/', (req: Request, res: Response) => {
-    res.send(assetManager.getAssets());
+    res.send(assetManager.getAssets([]));
 });
 
 /**

package/src/taskManager.ts

@@ -189,7 +189,6 @@ class TaskManager {
             );
 
             if (existingTaskInGroup) {
-                console.log('existingTaskInGroup', existingTaskInGroup.toData());
                 return;
             }
         }
@@ -215,7 +214,6 @@ class TaskManager {
                 (t) => t.id !== task.id && t.metadata.group === task.metadata.group && t.status === TaskStatus.PENDING
             );
             if (nextTaskInGroup) {
-                console.log('nextTaskInGroup', nextTaskInGroup.toData());
                 return this.invokeTask(nextTaskInGroup);
             }
         }