@kapeta/local-cluster-service 0.33.1 → 0.33.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.33.3](https://github.com/kapetacom/local-cluster-service/compare/v0.33.2...v0.33.3) (2024-01-02)
+
+
+### Bug Fixes
+
+* Be consistent when mapping web + rest to http ([#109](https://github.com/kapetacom/local-cluster-service/issues/109)) ([9fde7d6](https://github.com/kapetacom/local-cluster-service/commit/9fde7d6ca4efa76888c25e2b7ad05f452d6c38db))
+
+## [0.33.2](https://github.com/kapetacom/local-cluster-service/compare/v0.33.1...v0.33.2) (2023-12-30)
+
+
+### Bug Fixes
+
+* Bump registry utils to fix broken installs ([7e6b04f](https://github.com/kapetacom/local-cluster-service/commit/7e6b04f7ae11de122f747d564abaa2f910e7ef32))
+
 ## [0.33.1](https://github.com/kapetacom/local-cluster-service/compare/v0.33.0...v0.33.1) (2023-12-30)
 
 

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

@@ -25,7 +25,7 @@ function proxyHttpRequest(req, res, opts) {
     if (opts.consumerPath.startsWith(sourceBasePath)) {
         path = path.replace(sourceBasePath, targetBasePath);
     }
-    console.log('Proxy request to provider: %s => %s%s [web]', opts.consumerPath, opts.address, path);
+    console.log('Proxy request to provider: %s => %s%s [http]', opts.consumerPath, opts.address, path);
     const reqOpts = {
         method: req.method,
         url: opts.address + path,

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

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

package/dist/cjs/src/serviceManager.js

@@ -7,13 +7,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serviceManager = exports.HTTP_PORTS = exports.DEFAULT_PORT_TYPE = void 0;
+exports.serviceManager = exports.HTTP_PORTS = exports.DEFAULT_PORT_TYPE = exports.HTTP_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 = 'http';
-exports.HTTP_PORTS = ['web', 'http', 'rest'];
+const BlockInstanceRunner_1 = require("./utils/BlockInstanceRunner");
+exports.HTTP_PORT_TYPE = 'http';
+exports.DEFAULT_PORT_TYPE = exports.HTTP_PORT_TYPE;
+exports.HTTP_PORTS = [exports.HTTP_PORT_TYPE, 'web', 'rest'];
 class ServiceManager {
     _systems;
     constructor() {
@@ -65,9 +67,7 @@ class ServiceManager {
         if (!portType) {
             portType = exports.DEFAULT_PORT_TYPE;
         }
-        if (exports.HTTP_PORTS.includes(portType)) {
-            portType = 'http';
-        }
+        portType = (0, BlockInstanceRunner_1.resolvePortType)(portType);
         const service = this._ensureService(systemId, blockInstanceId);
         if (!service[portType]) {
             const port = await clusterService_1.clusterService.getNextAvailablePort();

package/dist/cjs/src/utils/BlockInstanceRunner.d.ts

@@ -5,6 +5,7 @@
 import { DefinitionInfo } from '@kapeta/local-cluster-config';
 import { KapetaURI } from '@kapeta/nodejs-utils';
 import { AnyMap, BlockProcessParams, ProcessInfo, StringMap } from '../types';
+export declare function resolvePortType(portType: string): string;
 export declare class BlockInstanceRunner {
     private readonly _systemId;
     constructor(systemId: string);

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

@@ -7,7 +7,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BlockInstanceRunner = void 0;
+exports.BlockInstanceRunner = exports.resolvePortType = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const local_cluster_config_1 = __importDefault(require("@kapeta/local-cluster-config"));
 const utils_1 = require("./utils");
@@ -39,17 +39,24 @@ async function getProvider(uri) {
         return (0, nodejs_utils_1.parseKapetaUri)(ref).id === uri.id;
     });
 }
+function resolvePortType(portType) {
+    if (serviceManager_1.HTTP_PORTS.includes(portType)) {
+        return serviceManager_1.HTTP_PORT_TYPE;
+    }
+    return portType;
+}
+exports.resolvePortType = resolvePortType;
 function getProviderPorts(assetVersion, providerVersion) {
     const out = assetVersion.definition?.spec?.providers
         ?.map((provider) => {
-        return provider.spec?.port?.type;
+        return resolvePortType(provider.spec?.port?.type);
     })
         .filter((t) => !!t) ?? [];
     if (out.length === 0) {
         if (providerVersion.definition.spec?.defaultPort?.type) {
-            return [providerVersion.definition.spec?.defaultPort?.type];
+            return [resolvePortType(providerVersion.definition.spec?.defaultPort?.type)];
         }
-        return [serviceManager_1.DEFAULT_PORT_TYPE];
+        return [resolvePortType(serviceManager_1.DEFAULT_PORT_TYPE)];
     }
     // Duplicated port types are not allowed
     return Array.from(new Set(out));

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

@@ -25,7 +25,7 @@ function proxyHttpRequest(req, res, opts) {
     if (opts.consumerPath.startsWith(sourceBasePath)) {
         path = path.replace(sourceBasePath, targetBasePath);
     }
-    console.log('Proxy request to provider: %s => %s%s [web]', opts.consumerPath, opts.address, path);
+    console.log('Proxy request to provider: %s => %s%s [http]', opts.consumerPath, opts.address, path);
     const reqOpts = {
         method: req.method,
         url: opts.address + path,

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

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

package/dist/esm/src/serviceManager.js

@@ -7,13 +7,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serviceManager = exports.HTTP_PORTS = exports.DEFAULT_PORT_TYPE = void 0;
+exports.serviceManager = exports.HTTP_PORTS = exports.DEFAULT_PORT_TYPE = exports.HTTP_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 = 'http';
-exports.HTTP_PORTS = ['web', 'http', 'rest'];
+const BlockInstanceRunner_1 = require("./utils/BlockInstanceRunner");
+exports.HTTP_PORT_TYPE = 'http';
+exports.DEFAULT_PORT_TYPE = exports.HTTP_PORT_TYPE;
+exports.HTTP_PORTS = [exports.HTTP_PORT_TYPE, 'web', 'rest'];
 class ServiceManager {
     _systems;
     constructor() {
@@ -65,9 +67,7 @@ class ServiceManager {
         if (!portType) {
             portType = exports.DEFAULT_PORT_TYPE;
         }
-        if (exports.HTTP_PORTS.includes(portType)) {
-            portType = 'http';
-        }
+        portType = (0, BlockInstanceRunner_1.resolvePortType)(portType);
         const service = this._ensureService(systemId, blockInstanceId);
         if (!service[portType]) {
             const port = await clusterService_1.clusterService.getNextAvailablePort();

package/dist/esm/src/utils/BlockInstanceRunner.d.ts

@@ -5,6 +5,7 @@
 import { DefinitionInfo } from '@kapeta/local-cluster-config';
 import { KapetaURI } from '@kapeta/nodejs-utils';
 import { AnyMap, BlockProcessParams, ProcessInfo, StringMap } from '../types';
+export declare function resolvePortType(portType: string): string;
 export declare class BlockInstanceRunner {
     private readonly _systemId;
     constructor(systemId: string);

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

@@ -7,7 +7,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BlockInstanceRunner = void 0;
+exports.BlockInstanceRunner = exports.resolvePortType = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const local_cluster_config_1 = __importDefault(require("@kapeta/local-cluster-config"));
 const utils_1 = require("./utils");
@@ -39,17 +39,24 @@ async function getProvider(uri) {
         return (0, nodejs_utils_1.parseKapetaUri)(ref).id === uri.id;
     });
 }
+function resolvePortType(portType) {
+    if (serviceManager_1.HTTP_PORTS.includes(portType)) {
+        return serviceManager_1.HTTP_PORT_TYPE;
+    }
+    return portType;
+}
+exports.resolvePortType = resolvePortType;
 function getProviderPorts(assetVersion, providerVersion) {
     const out = assetVersion.definition?.spec?.providers
         ?.map((provider) => {
-        return provider.spec?.port?.type;
+        return resolvePortType(provider.spec?.port?.type);
     })
         .filter((t) => !!t) ?? [];
     if (out.length === 0) {
         if (providerVersion.definition.spec?.defaultPort?.type) {
-            return [providerVersion.definition.spec?.defaultPort?.type];
+            return [resolvePortType(providerVersion.definition.spec?.defaultPort?.type)];
         }
-        return [serviceManager_1.DEFAULT_PORT_TYPE];
+        return [resolvePortType(serviceManager_1.DEFAULT_PORT_TYPE)];
     }
     // Duplicated port types are not allowed
     return Array.from(new Set(out));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.33.1",
+    "version": "0.33.3",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {
@@ -51,7 +51,7 @@
         "@kapeta/local-cluster-config": ">= 0.3.0 <2",
         "@kapeta/nodejs-api-client": ">=0.1.3 <2",
         "@kapeta/nodejs-process": "<2",
-        "@kapeta/nodejs-registry-utils": "<2",
+        "@kapeta/nodejs-registry-utils": ">=0.8.4 <2",
         "@kapeta/nodejs-utils": "<2",
         "@kapeta/schemas": "<2",
         "@kapeta/sdk-config": "<2",

package/src/proxy/types/web.ts

@@ -27,7 +27,7 @@ export function proxyHttpRequest(req: StringBodyRequest, res: Response, opts: Pr
         path = path.replace(sourceBasePath, targetBasePath);
     }
 
-    console.log('Proxy request to provider: %s => %s%s [web]', opts.consumerPath, opts.address, path);
+    console.log('Proxy request to provider: %s => %s%s [http]', opts.consumerPath, opts.address, path);
 
     const reqOpts: SimpleRequest = {
         method: req.method,

package/src/serviceManager.ts

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

package/src/utils/BlockInstanceRunner.ts

@@ -7,7 +7,7 @@ import FS from 'node:fs';
 import ClusterConfig, { DefinitionInfo } from '@kapeta/local-cluster-config';
 import { getBindHost, getBlockInstanceContainerName, readYML } from './utils';
 import { KapetaURI, parseKapetaUri, normalizeKapetaUri } from '@kapeta/nodejs-utils';
-import { DEFAULT_PORT_TYPE, serviceManager } from '../serviceManager';
+import { DEFAULT_PORT_TYPE, HTTP_PORT_TYPE, HTTP_PORTS, serviceManager } from '../serviceManager';
 import {
     COMPOSE_LABEL_PROJECT,
     COMPOSE_LABEL_SERVICE,
@@ -45,19 +45,26 @@ async function getProvider(uri: KapetaURI) {
     });
 }
 
+export function resolvePortType(portType: string) {
+    if (HTTP_PORTS.includes(portType)) {
+        return HTTP_PORT_TYPE;
+    }
+    return portType;
+}
+
 function getProviderPorts(assetVersion: DefinitionInfo, providerVersion: DefinitionInfo): string[] {
     const out =
         assetVersion.definition?.spec?.providers
             ?.map((provider: any) => {
-                return provider.spec?.port?.type;
+                return resolvePortType(provider.spec?.port?.type);
             })
             .filter((t: any) => !!t) ?? [];
 
     if (out.length === 0) {
         if (providerVersion.definition.spec?.defaultPort?.type) {
-            return [providerVersion.definition.spec?.defaultPort?.type];
+            return [resolvePortType(providerVersion.definition.spec?.defaultPort?.type)];
         }
-        return [DEFAULT_PORT_TYPE];
+        return [resolvePortType(DEFAULT_PORT_TYPE)];
     }
     // Duplicated port types are not allowed
     return Array.from(new Set<string>(out));