@kapeta/local-cluster-service 0.13.0 → 0.14.0
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/CHANGELOG.md +7 -0
- package/dist/cjs/index.js +2 -0
- package/dist/cjs/src/api.d.ts +3 -0
- package/dist/cjs/src/api.js +22 -0
- package/dist/cjs/src/assets/routes.js +1 -1
- package/dist/cjs/src/taskManager.js +0 -2
- package/dist/esm/index.js +2 -0
- package/dist/esm/src/api.d.ts +3 -0
- package/dist/esm/src/api.js +17 -0
- package/dist/esm/src/assets/routes.js +1 -1
- package/dist/esm/src/taskManager.js +0 -2
- package/index.ts +7 -0
- package/package.json +2 -1
- package/src/api.ts +21 -0
- package/src/assets/routes.ts +1 -1
- package/src/taskManager.ts +0 -2
package/CHANGELOG.md
CHANGED
@@ -1,3 +1,10 @@
|
|
1
|
+
# [0.14.0](https://github.com/kapetacom/local-cluster-service/compare/v0.13.0...v0.14.0) (2023-08-05)
|
2
|
+
|
3
|
+
|
4
|
+
### Features
|
5
|
+
|
6
|
+
* 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))
|
7
|
+
|
1
8
|
# [0.13.0](https://github.com/kapetacom/local-cluster-service/compare/v0.12.1...v0.13.0) (2023-08-03)
|
2
9
|
|
3
10
|
|
package/dist/cjs/index.js
CHANGED
@@ -21,6 +21,7 @@ const routes_7 = __importDefault(require("./src/assets/routes"));
|
|
21
21
|
const routes_8 = __importDefault(require("./src/providers/routes"));
|
22
22
|
const routes_9 = __importDefault(require("./src/attachments/routes"));
|
23
23
|
const routes_10 = __importDefault(require("./src/tasks/routes"));
|
24
|
+
const api_1 = __importDefault(require("./src/api"));
|
24
25
|
const utils_1 = require("./src/utils/utils");
|
25
26
|
const request_1 = __importDefault(require("request"));
|
26
27
|
let currentServer = null;
|
@@ -36,6 +37,7 @@ function createServer() {
|
|
36
37
|
app.use('/providers', routes_8.default);
|
37
38
|
app.use('/attachments', routes_9.default);
|
38
39
|
app.use('/tasks', routes_10.default);
|
40
|
+
app.use('/api', api_1.default);
|
39
41
|
app.get('/status', async (req, res) => {
|
40
42
|
res.send({
|
41
43
|
ok: true,
|
@@ -0,0 +1,22 @@
|
|
1
|
+
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
+
const express_promise_router_1 = __importDefault(require("express-promise-router"));
|
7
|
+
const cors_1 = require("./middleware/cors");
|
8
|
+
const nodejs_api_client_1 = require("@kapeta/nodejs-api-client");
|
9
|
+
const local_cluster_config_1 = __importDefault(require("@kapeta/local-cluster-config"));
|
10
|
+
const { createAPIRoute } = require('@kapeta/web-microfrontend/server');
|
11
|
+
const packageJson = require('../package.json');
|
12
|
+
const router = (0, express_promise_router_1.default)();
|
13
|
+
const remoteServices = local_cluster_config_1.default.getClusterConfig().remoteServices ?? {};
|
14
|
+
router.use('/', cors_1.corsHandler);
|
15
|
+
router.use('/registry', createAPIRoute(remoteServices.registry ?? 'https://registry.kapeta.com', {
|
16
|
+
nonce: false,
|
17
|
+
userAgent: `KapetaDesktopCluster/${packageJson.version}`,
|
18
|
+
tokenFetcher: () => {
|
19
|
+
return new nodejs_api_client_1.KapetaAPI().getAccessToken();
|
20
|
+
}
|
21
|
+
}));
|
22
|
+
exports.default = router;
|
@@ -29,7 +29,7 @@ router.use('/', stringBody_1.stringBody);
|
|
29
29
|
* Get all local assets available
|
30
30
|
*/
|
31
31
|
router.get('/', (req, res) => {
|
32
|
-
res.send(assetManager_1.assetManager.getAssets());
|
32
|
+
res.send(assetManager_1.assetManager.getAssets([]));
|
33
33
|
});
|
34
34
|
/**
|
35
35
|
* Get single asset
|
@@ -130,7 +130,6 @@ class TaskManager {
|
|
130
130
|
if (task.metadata.group) {
|
131
131
|
const existingTaskInGroup = this._tasks.find((t) => t.id !== task.id && t.metadata.group === task.metadata.group && t.status === TaskStatus.RUNNING);
|
132
132
|
if (existingTaskInGroup) {
|
133
|
-
console.log('existingTaskInGroup', existingTaskInGroup.toData());
|
134
133
|
return;
|
135
134
|
}
|
136
135
|
}
|
@@ -154,7 +153,6 @@ class TaskManager {
|
|
154
153
|
if (task.metadata.group) {
|
155
154
|
const nextTaskInGroup = this._tasks.find((t) => t.id !== task.id && t.metadata.group === task.metadata.group && t.status === TaskStatus.PENDING);
|
156
155
|
if (nextTaskInGroup) {
|
157
|
-
console.log('nextTaskInGroup', nextTaskInGroup.toData());
|
158
156
|
return this.invokeTask(nextTaskInGroup);
|
159
157
|
}
|
160
158
|
}
|
package/dist/esm/index.js
CHANGED
@@ -16,6 +16,7 @@ import AssetsRoutes from './src/assets/routes';
|
|
16
16
|
import ProviderRoutes from './src/providers/routes';
|
17
17
|
import AttachmentRoutes from './src/attachments/routes';
|
18
18
|
import TaskRoutes from './src/tasks/routes';
|
19
|
+
import APIRoutes from './src/api';
|
19
20
|
import { getBindHost } from './src/utils/utils';
|
20
21
|
import request from 'request';
|
21
22
|
let currentServer = null;
|
@@ -31,6 +32,7 @@ function createServer() {
|
|
31
32
|
app.use('/providers', ProviderRoutes);
|
32
33
|
app.use('/attachments', AttachmentRoutes);
|
33
34
|
app.use('/tasks', TaskRoutes);
|
35
|
+
app.use('/api', APIRoutes);
|
34
36
|
app.get('/status', async (req, res) => {
|
35
37
|
res.send({
|
36
38
|
ok: true,
|
@@ -0,0 +1,17 @@
|
|
1
|
+
import Router from 'express-promise-router';
|
2
|
+
import { corsHandler } from "./middleware/cors";
|
3
|
+
import { KapetaAPI } from "@kapeta/nodejs-api-client";
|
4
|
+
import ClusterConfiguration from '@kapeta/local-cluster-config';
|
5
|
+
const { createAPIRoute } = require('@kapeta/web-microfrontend/server');
|
6
|
+
const packageJson = require('../package.json');
|
7
|
+
const router = Router();
|
8
|
+
const remoteServices = ClusterConfiguration.getClusterConfig().remoteServices ?? {};
|
9
|
+
router.use('/', corsHandler);
|
10
|
+
router.use('/registry', createAPIRoute(remoteServices.registry ?? 'https://registry.kapeta.com', {
|
11
|
+
nonce: false,
|
12
|
+
userAgent: `KapetaDesktopCluster/${packageJson.version}`,
|
13
|
+
tokenFetcher: () => {
|
14
|
+
return new KapetaAPI().getAccessToken();
|
15
|
+
}
|
16
|
+
}));
|
17
|
+
export default router;
|
@@ -126,7 +126,6 @@ class TaskManager {
|
|
126
126
|
if (task.metadata.group) {
|
127
127
|
const existingTaskInGroup = this._tasks.find((t) => t.id !== task.id && t.metadata.group === task.metadata.group && t.status === TaskStatus.RUNNING);
|
128
128
|
if (existingTaskInGroup) {
|
129
|
-
console.log('existingTaskInGroup', existingTaskInGroup.toData());
|
130
129
|
return;
|
131
130
|
}
|
132
131
|
}
|
@@ -150,7 +149,6 @@ class TaskManager {
|
|
150
149
|
if (task.metadata.group) {
|
151
150
|
const nextTaskInGroup = this._tasks.find((t) => t.id !== task.id && t.metadata.group === task.metadata.group && t.status === TaskStatus.PENDING);
|
152
151
|
if (nextTaskInGroup) {
|
153
|
-
console.log('nextTaskInGroup', nextTaskInGroup.toData());
|
154
152
|
return this.invokeTask(nextTaskInGroup);
|
155
153
|
}
|
156
154
|
}
|
package/index.ts
CHANGED
@@ -17,8 +17,13 @@ import AssetsRoutes from './src/assets/routes';
|
|
17
17
|
import ProviderRoutes from './src/providers/routes';
|
18
18
|
import AttachmentRoutes from './src/attachments/routes';
|
19
19
|
import TaskRoutes from './src/tasks/routes';
|
20
|
+
import APIRoutes from './src/api';
|
20
21
|
import { getBindHost } from './src/utils/utils';
|
21
22
|
import request from 'request';
|
23
|
+
import ClusterConfiguration from "@kapeta/local-cluster-config";
|
24
|
+
import {KapetaAPI} from "@kapeta/nodejs-api-client";
|
25
|
+
import {corsHandler} from "./src/middleware/cors";
|
26
|
+
|
22
27
|
|
23
28
|
export type LocalClusterService = HTTP.Server & { host?: string; port?: number };
|
24
29
|
|
@@ -38,6 +43,8 @@ function createServer() {
|
|
38
43
|
app.use('/providers', ProviderRoutes);
|
39
44
|
app.use('/attachments', AttachmentRoutes);
|
40
45
|
app.use('/tasks', TaskRoutes);
|
46
|
+
app.use('/api', APIRoutes);
|
47
|
+
|
41
48
|
app.get('/status', async (req, res) => {
|
42
49
|
res.send({
|
43
50
|
ok: true,
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@kapeta/local-cluster-service",
|
3
|
-
"version": "0.
|
3
|
+
"version": "0.14.0",
|
4
4
|
"description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
|
5
5
|
"type": "commonjs",
|
6
6
|
"exports": {
|
@@ -50,6 +50,7 @@
|
|
50
50
|
"@kapeta/nodejs-utils": "<2",
|
51
51
|
"@kapeta/schemas": "^0.0.58",
|
52
52
|
"@kapeta/sdk-config": "<2",
|
53
|
+
"@kapeta/web-microfrontend": "^0.2.1",
|
53
54
|
"async-lock": "^1.4.0",
|
54
55
|
"express": "4.17.1",
|
55
56
|
"express-promise-router": "^4.1.1",
|
package/src/api.ts
ADDED
@@ -0,0 +1,21 @@
|
|
1
|
+
import Router from 'express-promise-router';
|
2
|
+
import {corsHandler} from "./middleware/cors";
|
3
|
+
import {KapetaAPI} from "@kapeta/nodejs-api-client";
|
4
|
+
import ClusterConfiguration from '@kapeta/local-cluster-config';
|
5
|
+
const { createAPIRoute } = require('@kapeta/web-microfrontend/server');
|
6
|
+
const packageJson = require('../package.json');
|
7
|
+
|
8
|
+
const router = Router();
|
9
|
+
|
10
|
+
const remoteServices = ClusterConfiguration.getClusterConfig().remoteServices ?? {};
|
11
|
+
router.use('/', corsHandler)
|
12
|
+
|
13
|
+
router.use('/registry', createAPIRoute(remoteServices.registry ?? 'https://registry.kapeta.com', {
|
14
|
+
nonce: false,
|
15
|
+
userAgent: `KapetaDesktopCluster/${packageJson.version}`,
|
16
|
+
tokenFetcher: () => {
|
17
|
+
return new KapetaAPI().getAccessToken();
|
18
|
+
}
|
19
|
+
}));
|
20
|
+
|
21
|
+
export default router;
|
package/src/assets/routes.ts
CHANGED
package/src/taskManager.ts
CHANGED
@@ -189,7 +189,6 @@ class TaskManager {
|
|
189
189
|
);
|
190
190
|
|
191
191
|
if (existingTaskInGroup) {
|
192
|
-
console.log('existingTaskInGroup', existingTaskInGroup.toData());
|
193
192
|
return;
|
194
193
|
}
|
195
194
|
}
|
@@ -215,7 +214,6 @@ class TaskManager {
|
|
215
214
|
(t) => t.id !== task.id && t.metadata.group === task.metadata.group && t.status === TaskStatus.PENDING
|
216
215
|
);
|
217
216
|
if (nextTaskInGroup) {
|
218
|
-
console.log('nextTaskInGroup', nextTaskInGroup.toData());
|
219
217
|
return this.invokeTask(nextTaskInGroup);
|
220
218
|
}
|
221
219
|
}
|