@kapeta/local-cluster-service 0.0.65 → 0.0.66

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kapeta/local-cluster-service",
3
- "version": "0.0.65",
3
+ "version": "0.0.66",
4
4
  "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
5
5
  "main": "index.js",
6
6
  "repository": {
@@ -1,35 +1,35 @@
1
1
  const Router = require('express-promise-router').default;
2
- const YAML = require('yaml');
3
2
  const configManager = require('../configManager');
4
3
  const serviceManager = require('../serviceManager');
5
4
  const operatorManager = require('../operatorManager');
6
5
 
7
6
  const router = new Router();
7
+ const SYSTEM_ID = '$system';
8
8
 
9
+ router.use('/', require('../middleware/cors'));
9
10
  router.use('/', require('../middleware/kapeta'));
10
11
  router.use('/', require('../middleware/stringBody'));
11
12
 
12
13
  /**
13
14
  * Returns the full configuration for a given service.
14
15
  */
15
- router.get('/', (req, res) => {
16
- //Get service YAML config
17
- const config = configManager.getConfigForService(req.kapeta.systemId, req.kapeta.instanceId);
16
+ router.get('/instance', (req, res) => {
17
+ const config = configManager.getConfigForSection(req.kapeta.systemId, req.kapeta.instanceId);
18
18
 
19
- res.send(YAML.stringify(config));
19
+ res.send(config);
20
20
  });
21
21
 
22
22
  /**
23
23
  * Updates the full configuration for a given service.
24
24
  */
25
- router.put('/', (req, res) => {
25
+ router.put('/instance', (req, res) => {
26
26
 
27
- let config = YAML.parse(req.stringBody);
27
+ let config = JSON.parse(req.stringBody);
28
28
  if (!config) {
29
29
  config = {};
30
30
  }
31
- //Get service YAML config
32
- configManager.setConfigForService(
31
+
32
+ configManager.setConfigForSection(
33
33
  req.kapeta.systemId,
34
34
  req.kapeta.instanceId,
35
35
  config
@@ -37,9 +37,35 @@ router.put('/', (req, res) => {
37
37
  res.status(202).send({ok:true});
38
38
  });
39
39
 
40
+ /**
41
+ * Returns the full configuration for a given service.
42
+ */
43
+ router.get('/system', (req, res) => {
44
+ const config = configManager.getConfigForSection(req.kapeta.systemId, SYSTEM_ID);
45
+
46
+ res.send(config);
47
+ });
48
+
49
+ /**
50
+ * Updates the full configuration for a given service.
51
+ */
52
+ router.put('/system', (req, res) => {
53
+
54
+ let config = JSON.parse(req.stringBody);
55
+ if (!config) {
56
+ config = {};
57
+ }
58
+ configManager.setConfigForSection(
59
+ req.kapeta.systemId,
60
+ SYSTEM_ID,
61
+ config
62
+ );
63
+ res.status(202).send({ok:true});
64
+ });
65
+
40
66
 
41
67
  /**
42
- * Resolves and checks the identify of a block instance
68
+ * Resolves and checks the identity of a block instance
43
69
  */
44
70
  router.get('/identity', async (req, res) => {
45
71
 
@@ -17,25 +17,21 @@ class ConfigManager {
17
17
  return this._config[systemId];
18
18
  }
19
19
 
20
- setConfigForService(systemId, serviceId, config) {
20
+ setConfigForSection(systemId, sectionId, config) {
21
21
  const systemConfig = this._forSystem(systemId);
22
- systemConfig[serviceId] = config || {};
22
+ systemConfig[sectionId] = config || {};
23
23
 
24
24
  storageService.put('config', systemId, systemConfig);
25
25
  }
26
26
 
27
- getConfigForService(systemId, serviceId) {
27
+ getConfigForSection(systemId, sectionId) {
28
28
  const systemConfig = this._forSystem(systemId);
29
29
 
30
- if (!systemConfig[serviceId]) {
31
- systemConfig[serviceId] = {};
30
+ if (!systemConfig[sectionId]) {
31
+ systemConfig[sectionId] = {};
32
32
  }
33
33
 
34
- if (!systemConfig[serviceId].kapeta) {
35
- systemConfig[serviceId].kapeta = {};
36
- }
37
-
38
- return systemConfig[serviceId];
34
+ return systemConfig[sectionId];
39
35
  }
40
36
 
41
37
  /**
@@ -84,9 +84,14 @@ router.get('/:systemId/:instanceId/logs', (req, res) => {
84
84
  });
85
85
 
86
86
  router.use('/', require('../middleware/stringBody'));
87
-
88
-
89
87
  router.use('/', require('../middleware/kapeta'));
88
+ router.use('/', (req, res, next) => {
89
+ if (!req.kapeta.blockRef) {
90
+ res.status(400).send({error: 'Missing X-Kapeta-Block header.'});
91
+ return;
92
+ }
93
+ next();
94
+ })
90
95
 
91
96
  /**
92
97
  * Updates the full configuration for a given service.
@@ -5,11 +5,6 @@ module.exports = function kapeta(req, res, next) {
5
5
  let systemId = req.headers['x-kapeta-system'];
6
6
  let instanceId = req.headers['x-kapeta-instance'];
7
7
 
8
- if (!blockRef) {
9
- res.status(400).send({error: 'Missing X-Kapeta-Block header.'});
10
- return;
11
- }
12
-
13
8
  req.kapeta = {
14
9
  blockRef,
15
10
  instanceId,