@kapeta/local-cluster-service 0.28.1 → 0.29.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [0.29.0](https://github.com/kapetacom/local-cluster-service/compare/v0.28.1...v0.29.0) (2023-12-12)
+
+
+### Features
+
+* Treat web, http and rest port types the same during port allocation ([#101](https://github.com/kapetacom/local-cluster-service/issues/101)) ([bd9f845](https://github.com/kapetacom/local-cluster-service/commit/bd9f8455ff05e273b900dcd1705aa67423f91d72))
+
 ## [0.28.1](https://github.com/kapetacom/local-cluster-service/compare/v0.28.0...v0.28.1) (2023-12-12)
 
 

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

@@ -115,7 +115,7 @@ router.get('/identity', async (req, res) => {
  * already called the endpoint the same port is returned.
  */
 router.get('/provides/:type', async (req, res) => {
-    if (req.kapeta.environment === 'docker' && ['web', 'rest'].includes(req.params.type)) {
+    if (req.kapeta.environment === 'docker' && serviceManager_1.HTTP_PORTS.includes(req.params.type)) {
         // Happens when starting a local container with no providers.
         res.send('80');
         return;

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

@@ -21,7 +21,7 @@ const router = (0, express_promise_router_1.default)();
  */
 const TYPE_HANDLERS = {
     rest: rest_1.proxyRestRequest,
-    web: web_1.proxyWebRequest,
+    http: web_1.proxyHttpRequest,
 };
 function getResource(resources, resourceName) {
     return resources.find((resource) => {
@@ -31,10 +31,10 @@ function getResource(resources, resourceName) {
 router.use('/:systemId/:consumerInstanceId/:consumerResourceName', stringBody_1.stringBody);
 router.all('/:systemId/:consumerInstanceId/:consumerResourceName/:type/*', async (req, res) => {
     try {
-        const typeHandler = TYPE_HANDLERS[req.params.type.toLowerCase()];
+        let typeHandler = TYPE_HANDLERS[req.params.type.toLowerCase()];
         if (!typeHandler) {
-            res.status(401).send({ error: 'Unknown connection type: ' + req.params.type });
-            return;
+            // Default to http
+            typeHandler = TYPE_HANDLERS['http'];
         }
         const plan = await assetManager_1.assetManager.getPlan(req.params.systemId);
         // We can find the connection by the consumer information alone since

package/dist/cjs/src/proxy/types/web.d.ts

@@ -5,4 +5,4 @@
 import { Response } from 'express';
 import { ProxyRequestInfo } from '../../types';
 import { StringBodyRequest } from '../../middleware/stringBody';
-export declare function proxyWebRequest(req: StringBodyRequest, res: Response, opts: ProxyRequestInfo): void;
+export declare function proxyHttpRequest(req: StringBodyRequest, res: Response, opts: ProxyRequestInfo): void;

package/dist/cjs/src/proxy/types/web.js

@@ -7,12 +7,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.proxyWebRequest = void 0;
+exports.proxyHttpRequest = void 0;
 const request_1 = __importDefault(require("request"));
 const lodash_1 = __importDefault(require("lodash"));
 const networkManager_1 = require("../../networkManager");
 const socketManager_1 = require("../../socketManager");
-function proxyWebRequest(req, res, opts) {
+function proxyHttpRequest(req, res, opts) {
     const requestHeaders = lodash_1.default.clone(req.headers);
     delete requestHeaders['content-length'];
     delete requestHeaders['content-encoding'];
@@ -54,4 +54,4 @@ function proxyWebRequest(req, res, opts) {
     //We need to pipe the proxy response to the client response to handle sockets and event streams
     proxyReq.pipe(res);
 }
-exports.proxyWebRequest = proxyWebRequest;
+exports.proxyHttpRequest = proxyHttpRequest;

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

@@ -3,7 +3,8 @@
  * SPDX-License-Identifier: BUSL-1.1
  */
 import { EnvironmentType } from './types';
-export declare const DEFAULT_PORT_TYPE = "rest";
+export declare const DEFAULT_PORT_TYPE = "http";
+export declare const HTTP_PORTS: string[];
 declare class ServiceManager {
     private _systems;
     constructor();

package/dist/cjs/src/serviceManager.js

@@ -7,12 +7,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serviceManager = exports.DEFAULT_PORT_TYPE = void 0;
+exports.serviceManager = exports.HTTP_PORTS = exports.DEFAULT_PORT_TYPE = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const clusterService_1 = require("./clusterService");
 const storageService_1 = require("./storageService");
 const nodejs_utils_1 = require("@kapeta/nodejs-utils");
-exports.DEFAULT_PORT_TYPE = 'rest';
+exports.DEFAULT_PORT_TYPE = 'http';
+exports.HTTP_PORTS = ['web', 'http', 'rest'];
 class ServiceManager {
     _systems;
     constructor() {
@@ -64,6 +65,9 @@ class ServiceManager {
         if (!portType) {
             portType = exports.DEFAULT_PORT_TYPE;
         }
+        if (exports.HTTP_PORTS.includes(portType)) {
+            portType = 'http';
+        }
         const service = this._ensureService(systemId, blockInstanceId);
         if (!service[portType]) {
             const port = await clusterService_1.clusterService.getNextAvailablePort();

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

@@ -115,7 +115,7 @@ router.get('/identity', async (req, res) => {
  * already called the endpoint the same port is returned.
  */
 router.get('/provides/:type', async (req, res) => {
-    if (req.kapeta.environment === 'docker' && ['web', 'rest'].includes(req.params.type)) {
+    if (req.kapeta.environment === 'docker' && serviceManager_1.HTTP_PORTS.includes(req.params.type)) {
         // Happens when starting a local container with no providers.
         res.send('80');
         return;

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

@@ -21,7 +21,7 @@ const router = (0, express_promise_router_1.default)();
  */
 const TYPE_HANDLERS = {
     rest: rest_1.proxyRestRequest,
-    web: web_1.proxyWebRequest,
+    http: web_1.proxyHttpRequest,
 };
 function getResource(resources, resourceName) {
     return resources.find((resource) => {
@@ -31,10 +31,10 @@ function getResource(resources, resourceName) {
 router.use('/:systemId/:consumerInstanceId/:consumerResourceName', stringBody_1.stringBody);
 router.all('/:systemId/:consumerInstanceId/:consumerResourceName/:type/*', async (req, res) => {
     try {
-        const typeHandler = TYPE_HANDLERS[req.params.type.toLowerCase()];
+        let typeHandler = TYPE_HANDLERS[req.params.type.toLowerCase()];
         if (!typeHandler) {
-            res.status(401).send({ error: 'Unknown connection type: ' + req.params.type });
-            return;
+            // Default to http
+            typeHandler = TYPE_HANDLERS['http'];
         }
         const plan = await assetManager_1.assetManager.getPlan(req.params.systemId);
         // We can find the connection by the consumer information alone since

package/dist/esm/src/proxy/types/web.d.ts

@@ -5,4 +5,4 @@
 import { Response } from 'express';
 import { ProxyRequestInfo } from '../../types';
 import { StringBodyRequest } from '../../middleware/stringBody';
-export declare function proxyWebRequest(req: StringBodyRequest, res: Response, opts: ProxyRequestInfo): void;
+export declare function proxyHttpRequest(req: StringBodyRequest, res: Response, opts: ProxyRequestInfo): void;

package/dist/esm/src/proxy/types/web.js

@@ -7,12 +7,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.proxyWebRequest = void 0;
+exports.proxyHttpRequest = void 0;
 const request_1 = __importDefault(require("request"));
 const lodash_1 = __importDefault(require("lodash"));
 const networkManager_1 = require("../../networkManager");
 const socketManager_1 = require("../../socketManager");
-function proxyWebRequest(req, res, opts) {
+function proxyHttpRequest(req, res, opts) {
     const requestHeaders = lodash_1.default.clone(req.headers);
     delete requestHeaders['content-length'];
     delete requestHeaders['content-encoding'];
@@ -54,4 +54,4 @@ function proxyWebRequest(req, res, opts) {
     //We need to pipe the proxy response to the client response to handle sockets and event streams
     proxyReq.pipe(res);
 }
-exports.proxyWebRequest = proxyWebRequest;
+exports.proxyHttpRequest = proxyHttpRequest;

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

@@ -3,7 +3,8 @@
  * SPDX-License-Identifier: BUSL-1.1
  */
 import { EnvironmentType } from './types';
-export declare const DEFAULT_PORT_TYPE = "rest";
+export declare const DEFAULT_PORT_TYPE = "http";
+export declare const HTTP_PORTS: string[];
 declare class ServiceManager {
     private _systems;
     constructor();

package/dist/esm/src/serviceManager.js

@@ -7,12 +7,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serviceManager = exports.DEFAULT_PORT_TYPE = void 0;
+exports.serviceManager = exports.HTTP_PORTS = exports.DEFAULT_PORT_TYPE = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const clusterService_1 = require("./clusterService");
 const storageService_1 = require("./storageService");
 const nodejs_utils_1 = require("@kapeta/nodejs-utils");
-exports.DEFAULT_PORT_TYPE = 'rest';
+exports.DEFAULT_PORT_TYPE = 'http';
+exports.HTTP_PORTS = ['web', 'http', 'rest'];
 class ServiceManager {
     _systems;
     constructor() {
@@ -64,6 +65,9 @@ class ServiceManager {
         if (!portType) {
             portType = exports.DEFAULT_PORT_TYPE;
         }
+        if (exports.HTTP_PORTS.includes(portType)) {
+            portType = 'http';
+        }
         const service = this._ensureService(systemId, blockInstanceId);
         if (!service[portType]) {
             const port = await clusterService_1.clusterService.getNextAvailablePort();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.28.1",
+    "version": "0.29.0",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {

package/src/config/routes.ts

@@ -5,7 +5,7 @@
 
 import Router from 'express-promise-router';
 import { configManager, SYSTEM_ID } from '../configManager';
-import { serviceManager } from '../serviceManager';
+import { HTTP_PORTS, serviceManager } from '../serviceManager';
 import { operatorManager } from '../operatorManager';
 import { instanceManager } from '../instanceManager';
 import { corsHandler } from '../middleware/cors';
@@ -125,7 +125,7 @@ router.get('/identity', async (req: KapetaRequest, res) => {
  * already called the endpoint the same port is returned.
  */
 router.get('/provides/:type', async (req: KapetaRequest, res) => {
-    if (req.kapeta!.environment === 'docker' && ['web', 'rest'].includes(req.params.type)) {
+    if (req.kapeta!.environment === 'docker' && HTTP_PORTS.includes(req.params.type)) {
         // Happens when starting a local container with no providers.
         res.send('80');
         return;

package/src/proxy/routes.ts

@@ -7,7 +7,7 @@ import Router from 'express-promise-router';
 import { Request, Response } from 'express';
 import { Resource } from '@kapeta/schemas';
 import { proxyRestRequest } from './types/rest';
-import { proxyWebRequest } from './types/web';
+import { proxyHttpRequest } from './types/web';
 import { ProxyRequestHandler } from '../types';
 import { stringBody, StringBodyRequest } from '../middleware/stringBody';
 import { serviceManager } from '../serviceManager';
@@ -22,7 +22,7 @@ const router = Router();
  */
 const TYPE_HANDLERS: { [p: string]: ProxyRequestHandler } = {
     rest: proxyRestRequest,
-    web: proxyWebRequest,
+    http: proxyHttpRequest,
 };
 
 function getResource(resources: Resource[], resourceName: string) {
@@ -37,10 +37,10 @@ router.all(
     '/:systemId/:consumerInstanceId/:consumerResourceName/:type/*',
     async (req: StringBodyRequest, res: Response) => {
         try {
-            const typeHandler = TYPE_HANDLERS[req.params.type.toLowerCase()];
+            let typeHandler = TYPE_HANDLERS[req.params.type.toLowerCase()];
             if (!typeHandler) {
-                res.status(401).send({ error: 'Unknown connection type: ' + req.params.type });
-                return;
+                // Default to http
+                typeHandler = TYPE_HANDLERS['http'];
             }
 
             const plan = await assetManager.getPlan(req.params.systemId);

package/src/proxy/types/web.ts

@@ -11,7 +11,7 @@ import { Request, Response } from 'express';
 import { ProxyRequestInfo, SimpleRequest, StringMap } from '../../types';
 import { StringBodyRequest } from '../../middleware/stringBody';
 
-export function proxyWebRequest(req: StringBodyRequest, res: Response, opts: ProxyRequestInfo) {
+export function proxyHttpRequest(req: StringBodyRequest, res: Response, opts: ProxyRequestInfo) {
     const requestHeaders = _.clone(req.headers);
 
     delete requestHeaders['content-length'];

package/src/serviceManager.ts

@@ -9,7 +9,9 @@ import { storageService } from './storageService';
 import { EnvironmentType } from './types';
 import { normalizeKapetaUri } from '@kapeta/nodejs-utils';
 
-export const DEFAULT_PORT_TYPE = 'rest';
+export const DEFAULT_PORT_TYPE = 'http';
+
+export const HTTP_PORTS = ['web', 'http', 'rest'];
 
 class ServiceManager {
     private _systems: any;
@@ -73,6 +75,10 @@ class ServiceManager {
             portType = DEFAULT_PORT_TYPE;
         }
 
+        if (HTTP_PORTS.includes(portType)) {
+            portType = 'http';
+        }
+
         const service = this._ensureService(systemId, blockInstanceId);
 
         if (!service[portType]) {