@kapeta/local-cluster-service 0.21.4 → 0.22.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [0.22.0](https://github.com/kapetacom/local-cluster-service/compare/v0.21.5...v0.22.0) (2023-10-17)
+
+
+### Features
+
+* Allow local containers to add Binds ([#85](https://github.com/kapetacom/local-cluster-service/issues/85)) ([c7b46e9](https://github.com/kapetacom/local-cluster-service/commit/c7b46e94412da1eec82503f7d30957fc665e71e6))
+
+## [0.21.5](https://github.com/kapetacom/local-cluster-service/compare/v0.21.4...v0.21.5) (2023-09-26)
+
+
+### Bug Fixes
+
+* handle bad token in current identity API ([#84](https://github.com/kapetacom/local-cluster-service/issues/84)) ([60ca70d](https://github.com/kapetacom/local-cluster-service/commit/60ca70d9f6aa5747d89110b03f56fae70f1c7f24))
+
 ## [0.21.4](https://github.com/kapetacom/local-cluster-service/compare/v0.21.3...v0.21.4) (2023-09-21)
 
 

package/dist/cjs/index.js

@@ -57,11 +57,22 @@ function createServer() {
     });
     app.use('/', (req, res) => {
         console.error('Invalid request: %s %s', req.method, req.originalUrl);
-        res.status(400).send({
+        res.status(400).json({
             ok: false,
             error: 'Unknown',
         });
     });
+    /**
+     * Central error handler, allows us to return a consistent JSON response wrapper with the error.
+     */
+    app.use((err, req, res, next) => {
+        console.error('Error handling request: %s %s', req.method, req.originalUrl, err);
+        res.status(err.status || 500).json({
+            ok: false,
+            error: err.message || 'Unknown error',
+            stack: process.env.NODE_ENV !== 'production' ? err.stack : undefined,
+        });
+    });
     const server = http_1.default.createServer(app);
     //socket
     const io = new socket_io_1.Server(server, {

package/dist/cjs/src/identities/routes.js

@@ -9,31 +9,25 @@ const cors_1 = require("../middleware/cors");
 const router = (0, express_promise_router_1.default)();
 router.use('/', cors_1.corsHandler);
 router.get('/current', async (req, res) => {
-    try {
-        const api = new nodejs_api_client_1.KapetaAPI();
-        if (api.hasToken()) {
-            res.send(await api.getCurrentIdentity());
+    const api = new nodejs_api_client_1.KapetaAPI();
+    if (api.hasToken()) {
+        try {
+            res.json(await api.getCurrentIdentity());
+            return;
         }
-        else {
-            res.status(404).send();
+        catch (e) {
+            console.error(e);
         }
     }
-    catch (e) {
-        res.status(e.status ?? 500).send(e);
-    }
+    res.status(200).json(null);
 });
 router.get('/:identityId/memberships', async (req, res) => {
-    try {
-        const api = new nodejs_api_client_1.KapetaAPI();
-        if (api.hasToken()) {
-            res.send(await api.getMemberships(req.params.identityId));
-        }
-        else {
-            res.send([]);
-        }
+    const api = new nodejs_api_client_1.KapetaAPI();
+    if (api.hasToken()) {
+        res.send(await api.getMemberships(req.params.identityId));
     }
-    catch (e) {
-        res.status(e.status ?? 500).send(e);
+    else {
+        res.send([]);
     }
 });
 exports.default = router;

package/dist/cjs/src/utils/BlockInstanceRunner.js

@@ -14,6 +14,7 @@ const LogData_1 = require("./LogData");
 const clusterService_1 = require("../clusterService");
 const types_1 = require("../types");
 const definitionsManager_1 = require("../definitionsManager");
+const node_os_1 = __importDefault(require("node:os"));
 const KIND_BLOCK_TYPE_OPERATOR = 'core/block-type-operator';
 const KAPETA_SYSTEM_ID = 'KAPETA_SYSTEM_ID';
 const KAPETA_BLOCK_REF = 'KAPETA_BLOCK_REF';
@@ -46,7 +47,8 @@ function getProviderPorts(assetVersion, providerVersion) {
         }
         return [serviceManager_1.DEFAULT_PORT_TYPE];
     }
-    return out;
+    // Duplicated port types are not allowed
+    return Array.from(new Set(out));
 }
 class BlockInstanceRunner {
     _systemId;
@@ -148,6 +150,8 @@ class BlockInstanceRunner {
         const homeDir = localContainer.userHome ? localContainer.userHome : '/root';
         const workingDir = localContainer.workingDir ? localContainer.workingDir : '/workspace';
         const customHostConfigs = localContainer.HostConfig ?? {};
+        const Binds = customHostConfigs.Binds ?? [];
+        delete customHostConfigs.Binds;
         const customLabels = localContainer.Labels ?? {};
         const customEnvs = localContainer.Env ?? [];
         delete localContainer.HostConfig;
@@ -160,7 +164,7 @@ class BlockInstanceRunner {
         }
         const realLocalPath = node_fs_1.default.realpathSync(baseDir);
         const Mounts = containerManager_1.containerManager.toDockerMounts({
-            [workingDir]: (0, containerManager_1.toLocalBindVolume)(realLocalPath)
+            [workingDir]: (0, containerManager_1.toLocalBindVolume)(realLocalPath),
         });
         const systemUri = (0, nodejs_utils_1.parseKapetaUri)(this._systemId);
         return this.ensureContainer({
@@ -189,10 +193,20 @@ class BlockInstanceRunner {
             HostConfig: {
                 ...customHostConfigs,
                 Binds: [
-                    `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${homeDir}/.kapeta`
+                    `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${homeDir}/.kapeta`,
+                    ...Binds.map((bind) => {
+                        let [host, container] = bind.split(':');
+                        if (host.startsWith('~')) {
+                            host = node_os_1.default.homedir() + host.substring(1);
+                        }
+                        if (container.startsWith('~')) {
+                            container = homeDir + container.substring(1);
+                        }
+                        return `${(0, containerManager_1.toLocalBindVolume)(host)}:${container}`;
+                    }),
                 ],
                 PortBindings,
-                Mounts
+                Mounts,
             },
         });
     }

package/dist/esm/index.js

@@ -57,11 +57,22 @@ function createServer() {
     });
     app.use('/', (req, res) => {
         console.error('Invalid request: %s %s', req.method, req.originalUrl);
-        res.status(400).send({
+        res.status(400).json({
             ok: false,
             error: 'Unknown',
         });
     });
+    /**
+     * Central error handler, allows us to return a consistent JSON response wrapper with the error.
+     */
+    app.use((err, req, res, next) => {
+        console.error('Error handling request: %s %s', req.method, req.originalUrl, err);
+        res.status(err.status || 500).json({
+            ok: false,
+            error: err.message || 'Unknown error',
+            stack: process.env.NODE_ENV !== 'production' ? err.stack : undefined,
+        });
+    });
     const server = http_1.default.createServer(app);
     //socket
     const io = new socket_io_1.Server(server, {

package/dist/esm/src/identities/routes.js

@@ -9,31 +9,25 @@ const cors_1 = require("../middleware/cors");
 const router = (0, express_promise_router_1.default)();
 router.use('/', cors_1.corsHandler);
 router.get('/current', async (req, res) => {
-    try {
-        const api = new nodejs_api_client_1.KapetaAPI();
-        if (api.hasToken()) {
-            res.send(await api.getCurrentIdentity());
+    const api = new nodejs_api_client_1.KapetaAPI();
+    if (api.hasToken()) {
+        try {
+            res.json(await api.getCurrentIdentity());
+            return;
         }
-        else {
-            res.status(404).send();
+        catch (e) {
+            console.error(e);
         }
     }
-    catch (e) {
-        res.status(e.status ?? 500).send(e);
-    }
+    res.status(200).json(null);
 });
 router.get('/:identityId/memberships', async (req, res) => {
-    try {
-        const api = new nodejs_api_client_1.KapetaAPI();
-        if (api.hasToken()) {
-            res.send(await api.getMemberships(req.params.identityId));
-        }
-        else {
-            res.send([]);
-        }
+    const api = new nodejs_api_client_1.KapetaAPI();
+    if (api.hasToken()) {
+        res.send(await api.getMemberships(req.params.identityId));
     }
-    catch (e) {
-        res.status(e.status ?? 500).send(e);
+    else {
+        res.send([]);
     }
 });
 exports.default = router;

package/dist/esm/src/utils/BlockInstanceRunner.js

@@ -14,6 +14,7 @@ const LogData_1 = require("./LogData");
 const clusterService_1 = require("../clusterService");
 const types_1 = require("../types");
 const definitionsManager_1 = require("../definitionsManager");
+const node_os_1 = __importDefault(require("node:os"));
 const KIND_BLOCK_TYPE_OPERATOR = 'core/block-type-operator';
 const KAPETA_SYSTEM_ID = 'KAPETA_SYSTEM_ID';
 const KAPETA_BLOCK_REF = 'KAPETA_BLOCK_REF';
@@ -46,7 +47,8 @@ function getProviderPorts(assetVersion, providerVersion) {
         }
         return [serviceManager_1.DEFAULT_PORT_TYPE];
     }
-    return out;
+    // Duplicated port types are not allowed
+    return Array.from(new Set(out));
 }
 class BlockInstanceRunner {
     _systemId;
@@ -148,6 +150,8 @@ class BlockInstanceRunner {
         const homeDir = localContainer.userHome ? localContainer.userHome : '/root';
         const workingDir = localContainer.workingDir ? localContainer.workingDir : '/workspace';
         const customHostConfigs = localContainer.HostConfig ?? {};
+        const Binds = customHostConfigs.Binds ?? [];
+        delete customHostConfigs.Binds;
         const customLabels = localContainer.Labels ?? {};
         const customEnvs = localContainer.Env ?? [];
         delete localContainer.HostConfig;
@@ -160,7 +164,7 @@ class BlockInstanceRunner {
         }
         const realLocalPath = node_fs_1.default.realpathSync(baseDir);
         const Mounts = containerManager_1.containerManager.toDockerMounts({
-            [workingDir]: (0, containerManager_1.toLocalBindVolume)(realLocalPath)
+            [workingDir]: (0, containerManager_1.toLocalBindVolume)(realLocalPath),
         });
         const systemUri = (0, nodejs_utils_1.parseKapetaUri)(this._systemId);
         return this.ensureContainer({
@@ -189,10 +193,20 @@ class BlockInstanceRunner {
             HostConfig: {
                 ...customHostConfigs,
                 Binds: [
-                    `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${homeDir}/.kapeta`
+                    `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${homeDir}/.kapeta`,
+                    ...Binds.map((bind) => {
+                        let [host, container] = bind.split(':');
+                        if (host.startsWith('~')) {
+                            host = node_os_1.default.homedir() + host.substring(1);
+                        }
+                        if (container.startsWith('~')) {
+                            container = homeDir + container.substring(1);
+                        }
+                        return `${(0, containerManager_1.toLocalBindVolume)(host)}:${container}`;
+                    }),
                 ],
                 PortBindings,
-                Mounts
+                Mounts,
             },
         });
     }

package/index.ts

@@ -62,12 +62,24 @@ function createServer() {
 
     app.use('/', (req: express.Request, res: express.Response) => {
         console.error('Invalid request: %s %s', req.method, req.originalUrl);
-        res.status(400).send({
+        res.status(400).json({
             ok: false,
             error: 'Unknown',
         });
     });
 
+    /**
+     * Central error handler, allows us to return a consistent JSON response wrapper with the error.
+     */
+    app.use((err: any, req: express.Request, res: express.Response, next: express.NextFunction) => {
+        console.error('Error handling request: %s %s', req.method, req.originalUrl, err);
+        res.status(err.status || 500).json({
+            ok: false,
+            error: err.message || 'Unknown error',
+            stack: process.env.NODE_ENV !== 'production' ? err.stack : undefined,
+        });
+    });
+
     const server = HTTP.createServer(app);
 
     //socket

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.21.4",
+    "version": "0.22.0",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {
@@ -45,7 +45,7 @@
     "dependencies": {
         "@kapeta/codegen": "<2",
         "@kapeta/local-cluster-config": ">= 0.2.3 <2",
-        "@kapeta/nodejs-api-client": "<2",
+        "@kapeta/nodejs-api-client": ">=0.1.3 <2",
         "@kapeta/nodejs-process": "<2",
         "@kapeta/nodejs-registry-utils": "<2",
         "@kapeta/nodejs-utils": "<2",

package/src/identities/routes.ts

@@ -9,28 +9,24 @@ const router = Router();
 router.use('/', corsHandler);
 
 router.get('/current', async (req: Request, res: Response) => {
-    try {
-        const api = new KapetaAPI();
-        if (api.hasToken()) {
-            res.send(await api.getCurrentIdentity());
-        } else {
-            res.status(404).send();
+    const api = new KapetaAPI();
+    if (api.hasToken()) {
+        try {
+            res.json(await api.getCurrentIdentity());
+            return;
+        } catch (e) {
+            console.error(e);
         }
-    } catch (e: any) {
-        res.status(e.status ?? 500).send(e);
     }
+    res.status(200).json(null);
 });
 
 router.get('/:identityId/memberships', async (req: Request, res: Response) => {
-    try {
-        const api = new KapetaAPI();
-        if (api.hasToken()) {
-            res.send(await api.getMemberships(req.params.identityId));
-        } else {
-            res.send([]);
-        }
-    } catch (e: any) {
-        res.status(e.status ?? 500).send(e);
+    const api = new KapetaAPI();
+    if (api.hasToken()) {
+        res.send(await api.getMemberships(req.params.identityId));
+    } else {
+        res.send([]);
     }
 });
 

package/src/utils/BlockInstanceRunner.ts

@@ -15,6 +15,7 @@ import { clusterService } from '../clusterService';
 import { AnyMap, BlockProcessParams, InstanceType, ProcessInfo, StringMap } from '../types';
 import { definitionsManager } from '../definitionsManager';
 import Docker from 'dockerode';
+import OS from 'node:os';
 
 const KIND_BLOCK_TYPE_OPERATOR = 'core/block-type-operator';
 const KAPETA_SYSTEM_ID = 'KAPETA_SYSTEM_ID';
@@ -53,8 +54,8 @@ function getProviderPorts(assetVersion: DefinitionInfo, providerVersion: Definit
         }
         return [DEFAULT_PORT_TYPE];
     }
-
-    return out;
+    // Duplicated port types are not allowed
+    return Array.from(new Set<string>(out));
 }
 
 export class BlockInstanceRunner {
@@ -194,6 +195,8 @@ export class BlockInstanceRunner {
         const workingDir = localContainer.workingDir ? localContainer.workingDir : '/workspace';
 
         const customHostConfigs = localContainer.HostConfig ?? {};
+        const Binds = customHostConfigs.Binds ?? [];
+        delete customHostConfigs.Binds;
         const customLabels = localContainer.Labels ?? {};
         const customEnvs = localContainer.Env ?? [];
         delete localContainer.HostConfig;
@@ -214,7 +217,7 @@ export class BlockInstanceRunner {
         const realLocalPath = FS.realpathSync(baseDir);
 
         const Mounts = containerManager.toDockerMounts({
-            [workingDir]: toLocalBindVolume(realLocalPath)
+            [workingDir]: toLocalBindVolume(realLocalPath),
         });
 
         const systemUri = parseKapetaUri(this._systemId);
@@ -245,10 +248,22 @@ export class BlockInstanceRunner {
             HostConfig: {
                 ...customHostConfigs,
                 Binds: [
-                    `${toLocalBindVolume(ClusterConfig.getKapetaBasedir())}:${homeDir}/.kapeta`
+                    `${toLocalBindVolume(ClusterConfig.getKapetaBasedir())}:${homeDir}/.kapeta`,
+                    ...Binds.map((bind: string) => {
+                        let [host, container] = bind.split(':');
+                        if (host.startsWith('~')) {
+                            host = OS.homedir() + host.substring(1);
+                        }
+
+                        if (container.startsWith('~')) {
+                            container = homeDir + container.substring(1);
+                        }
+
+                        return `${toLocalBindVolume(host)}:${container}`;
+                    }),
                 ],
                 PortBindings,
-                Mounts
+                Mounts,
             },
         });
     }