@kapeta/local-cluster-service 0.0.65 → 0.0.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kapeta/local-cluster-service",
-  "version": "0.0.65",
+  "version": "0.0.66",
   "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
   "main": "index.js",
   "repository": {

package/src/config/routes.js

@@ -1,35 +1,35 @@
 const Router = require('express-promise-router').default;
-const YAML = require('yaml');
 const configManager = require('../configManager');
 const serviceManager = require('../serviceManager');
 const operatorManager = require('../operatorManager');
 
 const router = new Router();
+const SYSTEM_ID = '$system';
 
+router.use('/', require('../middleware/cors'));
 router.use('/', require('../middleware/kapeta'));
 router.use('/', require('../middleware/stringBody'));
 
 /**
  * Returns the full configuration for a given service.
  */
-router.get('/', (req, res) => {
-    //Get service YAML config
-    const config = configManager.getConfigForService(req.kapeta.systemId, req.kapeta.instanceId);
+router.get('/instance', (req, res) => {
+    const config = configManager.getConfigForSection(req.kapeta.systemId, req.kapeta.instanceId);
 
-    res.send(YAML.stringify(config));
+    res.send(config);
 });
 
 /**
  * Updates the full configuration for a given service.
  */
-router.put('/', (req, res) => {
+router.put('/instance', (req, res) => {
 
-    let config = YAML.parse(req.stringBody);
+    let config = JSON.parse(req.stringBody);
     if (!config) {
         config = {};
     }
-    //Get service YAML config
-    configManager.setConfigForService(
+
+    configManager.setConfigForSection(
         req.kapeta.systemId,
         req.kapeta.instanceId,
         config
@@ -37,9 +37,35 @@ router.put('/', (req, res) => {
     res.status(202).send({ok:true});
 });
 
+/**
+ * Returns the full configuration for a given service.
+ */
+router.get('/system', (req, res) => {
+    const config = configManager.getConfigForSection(req.kapeta.systemId, SYSTEM_ID);
+
+    res.send(config);
+});
+
+/**
+ * Updates the full configuration for a given service.
+ */
+router.put('/system', (req, res) => {
+
+    let config = JSON.parse(req.stringBody);
+    if (!config) {
+        config = {};
+    }
+    configManager.setConfigForSection(
+        req.kapeta.systemId,
+        SYSTEM_ID,
+        config
+    );
+    res.status(202).send({ok:true});
+});
+
 
 /**
- * Resolves and checks the identify of a block instance
+ * Resolves and checks the identity of a block instance
  */
 router.get('/identity', async (req, res) => {
 

package/src/configManager.js

@@ -17,25 +17,21 @@ class ConfigManager {
         return this._config[systemId];
     }
 
-    setConfigForService(systemId, serviceId, config) {
+    setConfigForSection(systemId, sectionId, config) {
         const systemConfig = this._forSystem(systemId);
-        systemConfig[serviceId] = config || {};
+        systemConfig[sectionId] = config || {};
 
         storageService.put('config', systemId, systemConfig);
     }
 
-    getConfigForService(systemId, serviceId) {
+    getConfigForSection(systemId, sectionId) {
         const systemConfig = this._forSystem(systemId);
 
-        if (!systemConfig[serviceId]) {
-            systemConfig[serviceId] = {};
+        if (!systemConfig[sectionId]) {
+            systemConfig[sectionId] = {};
         }
 
-        if (!systemConfig[serviceId].kapeta) {
-            systemConfig[serviceId].kapeta = {};
-        }
-
-        return systemConfig[serviceId];
+        return systemConfig[sectionId];
     }
 
     /**

package/src/instances/routes.js

@@ -84,9 +84,14 @@ router.get('/:systemId/:instanceId/logs', (req, res) => {
 });
 
 router.use('/', require('../middleware/stringBody'));
-
-
 router.use('/', require('../middleware/kapeta'));
+router.use('/', (req, res, next) => {
+    if (!req.kapeta.blockRef) {
+        res.status(400).send({error: 'Missing X-Kapeta-Block header.'});
+        return;
+    }
+    next();
+})
 
 /**
  * Updates the full configuration for a given service.

package/src/middleware/kapeta.js

@@ -5,11 +5,6 @@ module.exports = function kapeta(req, res, next) {
     let systemId = req.headers['x-kapeta-system'];
     let instanceId = req.headers['x-kapeta-instance'];
 
-    if (!blockRef) {
-        res.status(400).send({error: 'Missing X-Kapeta-Block header.'});
-        return;
-    }
-
     req.kapeta = {
         blockRef,
         instanceId,