@kapeta/local-cluster-service 0.20.4 → 0.21.0

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

@@ -34,12 +34,19 @@ async function getProvider(uri) {
         return (0, nodejs_utils_1.parseKapetaUri)(ref).id === uri.id;
     });
 }
-function getProviderPorts(assetVersion) {
-    return (assetVersion.definition?.spec?.providers
+function getProviderPorts(assetVersion, providerVersion) {
+    const out = assetVersion.definition?.spec?.providers
         ?.map((provider) => {
         return provider.spec?.port?.type;
     })
-        .filter((t) => !!t) ?? []);
+        .filter((t) => !!t) ?? [];
+    if (out.length === 0) {
+        if (providerVersion.definition.spec?.defaultPort?.type) {
+            return [providerVersion.definition.spec?.defaultPort?.type];
+        }
+        return [serviceManager_1.DEFAULT_PORT_TYPE];
+    }
+    return out;
 }
 class BlockInstanceRunner {
     _systemId;
@@ -49,7 +56,7 @@ class BlockInstanceRunner {
          * @type {string}
          * @private
          */
-        this._systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        this._systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
     }
     /**
      * Start a block
@@ -92,7 +99,7 @@ class BlockInstanceRunner {
         }
         else {
             //We need a port type to know how to connect to the block consistently
-            const portTypes = getProviderPorts(assetVersion);
+            const portTypes = getProviderPorts(assetVersion, providerVersion);
             if (blockUri.version === 'local') {
                 processInfo = await this._startLocalProcess(blockInstance, blockUri, env, assetVersion);
             }
@@ -117,14 +124,19 @@ class BlockInstanceRunner {
         if (!assetVersion.definition.spec?.target?.kind) {
             throw new Error('Missing target kind in block definition');
         }
-        const kindUri = (0, nodejs_utils_1.parseKapetaUri)(assetVersion.definition.spec?.target?.kind);
-        const targetVersion = await getProvider(kindUri);
+        const kindUri = (0, nodejs_utils_1.parseKapetaUri)(assetVersion.definition.kind);
+        const providerVersion = await getProvider(kindUri);
+        if (!providerVersion) {
+            throw new Error(`Block type not found: ${kindUri.id}`);
+        }
+        const targetKindUri = (0, nodejs_utils_1.parseKapetaUri)(assetVersion.definition.spec?.target?.kind);
+        const targetVersion = await getProvider(targetKindUri);
         if (!targetVersion) {
-            throw new Error(`Target not found: ${kindUri.id}`);
+            throw new Error(`Target not found: ${targetKindUri.id}`);
         }
         const localContainer = targetVersion.definition.spec.local;
         if (!localContainer) {
-            throw new Error(`Missing local container information from target: ${kindUri.id}`);
+            throw new Error(`Missing local container information from target: ${targetKindUri.id}`);
         }
         const dockerImage = localContainer.image;
         if (!dockerImage) {
@@ -141,7 +153,7 @@ class BlockInstanceRunner {
         delete localContainer.HostConfig;
         delete localContainer.Labels;
         delete localContainer.Env;
-        const { PortBindings, ExposedPorts, addonEnv } = await this.getDockerPortBindings(blockInstance, assetVersion);
+        const { PortBindings, ExposedPorts, addonEnv } = await this.getDockerPortBindings(blockInstance, assetVersion, providerVersion);
         let HealthCheck = undefined;
         if (localContainer.healthcheck) {
             HealthCheck = containerManager_1.containerManager.toDockerHealth({ cmd: localContainer.healthcheck });
@@ -194,7 +206,12 @@ class BlockInstanceRunner {
         if (!dockerImage) {
             throw new Error(`Missing docker image information: ${JSON.stringify(versionInfo?.artifact?.details)}`);
         }
-        const { PortBindings, ExposedPorts, addonEnv } = await this.getDockerPortBindings(blockInstance, assetVersion);
+        const kindUri = (0, nodejs_utils_1.parseKapetaUri)(assetVersion.definition.kind);
+        const providerVersion = await getProvider(kindUri);
+        if (!providerVersion) {
+            throw new Error(`Block type not found: ${kindUri.id}`);
+        }
+        const { PortBindings, ExposedPorts, addonEnv } = await this.getDockerPortBindings(blockInstance, assetVersion, providerVersion);
         const containerName = (0, utils_1.getBlockInstanceContainerName)(this._systemId, blockInstance.id);
         // For windows we need to default to root
         const innerHome = process.platform === 'win32' ? '/root/.kapeta' : local_cluster_config_1.default.getKapetaBasedir();
@@ -252,7 +269,8 @@ class BlockInstanceRunner {
         const PortBindings = {};
         let HealthCheck = undefined;
         let Mounts = [];
-        const promises = Object.entries(spec.local.ports).map(async ([portType, value]) => {
+        const localPorts = spec.local.ports;
+        const promises = Object.entries(localPorts).map(async ([portType, value]) => {
             const dockerPort = `${value.port}/${value.type}`;
             ExposedPorts[dockerPort] = {};
             addonEnv[`KAPETA_LOCAL_SERVER_PORT_${portType.toUpperCase()}`] = value.port;
@@ -315,12 +333,12 @@ class BlockInstanceRunner {
         }
         return out;
     }
-    async getDockerPortBindings(blockInstance, assetVersion) {
+    async getDockerPortBindings(blockInstance, assetVersion, providerVersion) {
         const bindHost = (0, utils_1.getBindHost)();
         const ExposedPorts = {};
         const addonEnv = {};
         const PortBindings = {};
-        const portTypes = getProviderPorts(assetVersion);
+        const portTypes = getProviderPorts(assetVersion, providerVersion);
         let port = 80;
         const promises = portTypes.map(async (portType) => {
             const publicPort = await serviceManager_1.serviceManager.ensureServicePort(this._systemId, blockInstance.id, portType);

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

@@ -1,7 +1,6 @@
 import { EntityList } from '@kapeta/schemas';
 import { AnyMap } from '../types';
 export declare function getBlockInstanceContainerName(systemId: string, instanceId: string): string;
-export declare function normalizeKapetaUri(uri: string): string;
 export declare function readYML(path: string): any;
 export declare function isWindows(): boolean;
 export declare function isMac(): boolean;

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

@@ -3,27 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getResolvedConfiguration = exports.getBindHost = exports.isLinux = exports.isMac = exports.isWindows = exports.readYML = exports.normalizeKapetaUri = exports.getBlockInstanceContainerName = void 0;
+exports.getResolvedConfiguration = exports.getBindHost = exports.isLinux = exports.isMac = exports.isWindows = exports.readYML = exports.getBlockInstanceContainerName = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const yaml_1 = __importDefault(require("yaml"));
-const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const md5_1 = __importDefault(require("md5"));
 const lodash_1 = __importDefault(require("lodash"));
 function getBlockInstanceContainerName(systemId, instanceId) {
     return `kapeta-block-instance-${(0, md5_1.default)(systemId + instanceId)}`;
 }
 exports.getBlockInstanceContainerName = getBlockInstanceContainerName;
-function normalizeKapetaUri(uri) {
-    if (!uri) {
-        return '';
-    }
-    const uriObj = (0, nodejs_utils_1.parseKapetaUri)(uri);
-    if (!uriObj.version) {
-        return `kapeta://${(0, nodejs_utils_1.parseKapetaUri)(uri).fullName}`;
-    }
-    return `kapeta://${(0, nodejs_utils_1.parseKapetaUri)(uri).id}`;
-}
-exports.normalizeKapetaUri = normalizeKapetaUri;
 function readYML(path) {
     const rawYaml = node_fs_1.default.readFileSync(path);
     try {

package/dist/cjs/test/proxy/types/rest.test.js

@@ -4,42 +4,41 @@ const rest_1 = require("../../../src/proxy/types/rest");
 describe('getRestMethodId', () => {
     it('should match @Query in url', () => {
         const restResource = new TestResource();
-        const restMethodId = (0, rest_1.getRestMethodId)(restResource, "POST", "/names?name=Ib");
+        const restMethodId = (0, rest_1.getRestMethodId)(restResource, 'POST', '/names?name=Ib');
         expect(restMethodId).toBeDefined();
     });
 });
 class TestResource {
-    kind = "";
+    kind = '';
     metadata = new TestResourceMetaData();
     get spec() {
         return {
             methods: [
                 {
                     responseType: {
-                        ref: "Name[]"
+                        ref: 'Name[]',
                     },
-                    method: "GET",
-                    path: "/names",
-                    arguments: {}
+                    method: 'GET',
+                    path: '/names',
+                    arguments: {},
                 },
                 {
                     responseType: {
-                        ref: "Name"
+                        ref: 'Name',
                     },
-                    method: "POST",
-                    path: "/names",
+                    method: 'POST',
+                    path: '/names',
                     arguments: {
                         name: {
-                            type: "string",
-                            transport: "QUERY"
-                        }
-                    }
-                }
-            ]
+                            type: 'string',
+                            transport: 'QUERY',
+                        },
+                    },
+                },
+            ],
         };
     }
-    ;
 }
 class TestResourceMetaData {
-    name = "";
+    name = '';
 }

package/dist/esm/src/assetManager.js

@@ -13,7 +13,6 @@ const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const repositoryManager_1 = require("./repositoryManager");
 const nodejs_registry_utils_1 = require("@kapeta/nodejs-registry-utils");
 const definitionsManager_1 = require("./definitionsManager");
-const utils_1 = require("./utils/utils");
 const taskManager_1 = require("./taskManager");
 const cacheManager_1 = require("./cacheManager");
 const node_uuid_1 = __importDefault(require("node-uuid"));
@@ -85,7 +84,7 @@ class AssetManager {
         return instance;
     }
     async getAsset(ref, noCache = false, autoFetch = true) {
-        ref = (0, utils_1.normalizeKapetaUri)(ref);
+        ref = (0, nodejs_utils_1.normalizeKapetaUri)(ref);
         const cacheKey = toKey(ref);
         if (!noCache && cacheManager_1.cacheManager.has(cacheKey)) {
             return cacheManager_1.cacheManager.get(cacheKey);
@@ -117,7 +116,7 @@ class AssetManager {
         await fs_extra_1.default.writeFile(path, yaml_1.default.stringify(yaml));
         const asset = await this.importFile(path);
         asset.forEach((a) => {
-            const ref = (0, utils_1.normalizeKapetaUri)(a.ref);
+            const ref = (0, nodejs_utils_1.normalizeKapetaUri)(a.ref);
             const key = toKey(ref);
             cacheManager_1.cacheManager.set(key, a, CACHE_TTL);
         });
@@ -128,7 +127,7 @@ class AssetManager {
         return asset;
     }
     async updateAsset(ref, yaml, sourceOfChange = 'filesystem') {
-        ref = (0, utils_1.normalizeKapetaUri)(ref);
+        ref = (0, nodejs_utils_1.normalizeKapetaUri)(ref);
         const asset = await this.getAsset(ref, true, false);
         if (!asset) {
             throw new Error('Attempted to update unknown asset: ' + ref);
@@ -157,7 +156,7 @@ class AssetManager {
         const assetInfos = yaml_1.default.parseAllDocuments(content.toString()).map((doc) => doc.toJSON());
         await nodejs_registry_utils_1.Actions.link(new progressListener_1.ProgressListener(), node_path_1.default.dirname(filePath));
         const version = 'local';
-        const refs = assetInfos.map((assetInfo) => (0, utils_1.normalizeKapetaUri)(`kapeta://${assetInfo.metadata.name}:${version}`));
+        const refs = assetInfos.map((assetInfo) => (0, nodejs_utils_1.normalizeKapetaUri)(`kapeta://${assetInfo.metadata.name}:${version}`));
         refs.forEach((ref) => {
             const key = toKey(ref);
             cacheManager_1.cacheManager.remove(key);
@@ -189,7 +188,7 @@ class AssetManager {
         return await repositoryManager_1.repositoryManager.ensureAsset(uri.handle, uri.name, uri.version, false);
     }
     async maybeGenerateCode(ref, ymlPath, block) {
-        ref = (0, utils_1.normalizeKapetaUri)(ref);
+        ref = (0, nodejs_utils_1.normalizeKapetaUri)(ref);
         if (await codeGeneratorManager_1.codeGeneratorManager.canGenerateCode(block)) {
             const assetTitle = block.metadata.title ? block.metadata.title : (0, nodejs_utils_1.parseKapetaUri)(block.metadata.name).name;
             const taskId = `codegen:${node_uuid_1.default.v4()}`;

package/dist/esm/src/clusterService.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clusterService = void 0;
-const utils_1 = require("./utils/utils");
+const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const net = require('net');
 const DEFAULT_SERVER_PORT = 35100;
 const DEFAULT_START_PORT = 40000;
@@ -109,7 +109,7 @@ class ClusterService {
      * @return {string}
      */
     getProxyPath(systemId, consumerInstanceId, consumerResourceName, portType) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         return `/proxy/${encodeURIComponent(systemId)}/${encodeURIComponent(consumerInstanceId)}/${encodeURIComponent(consumerResourceName)}/${encodeURIComponent(portType)}/`;
     }
 }

package/dist/esm/src/codeGeneratorManager.js

@@ -8,7 +8,7 @@ const path_1 = __importDefault(require("path"));
 const codegen_1 = require("@kapeta/codegen");
 const definitionsManager_1 = require("./definitionsManager");
 const assetManager_1 = require("./assetManager");
-const utils_1 = require("./utils/utils");
+const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const repositoryManager_1 = require("./repositoryManager");
 const TARGET_KIND = 'core/language-target';
 const BLOCK_TYPE_KIND = 'core/block-type';
@@ -67,7 +67,7 @@ class CodeGeneratorManager {
             //Not all block types have targets
             return;
         }
-        const targetRef = (0, utils_1.normalizeKapetaUri)(yamlContent.spec.target?.kind);
+        const targetRef = (0, nodejs_utils_1.normalizeKapetaUri)(yamlContent.spec.target?.kind);
         // Automatically downloads target if not available
         const targetAsset = await assetManager_1.assetManager.getAsset(targetRef);
         if (!targetAsset) {

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

@@ -111,8 +111,19 @@ router.get('/identity', async (req, res) => {
  * already called the endpoint the same port is returned.
  */
 router.get('/provides/:type', async (req, res) => {
-    //Get service port
-    res.send('' + (await serviceManager_1.serviceManager.ensureServicePort(req.kapeta.systemId, req.kapeta.instanceId, req.params.type)));
+    if (req.kapeta.environment === 'docker' && ['web', 'rest'].includes(req.params.type)) {
+        // Happens when starting a local container with no providers.
+        res.send('80');
+        return;
+    }
+    try {
+        const port = await serviceManager_1.serviceManager.ensureServicePort(req.kapeta.systemId, req.kapeta.instanceId, req.params.type);
+        res.send('' + port);
+    }
+    catch (err) {
+        console.warn('Failed to resolve service port: ' + req.params.type, err);
+        res.status(400).send({ error: err.message });
+    }
 });
 /**
  * Used by services to get info for consumed operator resource.

package/dist/esm/src/configManager.js

@@ -12,19 +12,19 @@ class ConfigManager {
         this._config = storageService_1.storageService.section('config');
     }
     _forSystem(systemId) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         if (!this._config[systemId]) {
             this._config[systemId] = {};
         }
         return this._config[systemId];
     }
     setConfigForSystem(systemId, config) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         const systemConfig = config || {};
         storageService_1.storageService.put('config', systemId, systemConfig);
     }
     getConfigForSystem(systemId) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         return this._forSystem(systemId);
     }
     async getConfigForBlockInstance(systemId, instanceId) {
@@ -37,13 +37,13 @@ class ConfigManager {
         return (0, utils_1.getResolvedConfiguration)(blockAsset.data.spec.configuration, instanceConfig, blockInstance.defaultConfiguration);
     }
     setConfigForSection(systemId, sectionId, config) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         let systemConfig = this._forSystem(systemId);
         systemConfig[sectionId] = config || {};
         storageService_1.storageService.put('config', systemId, systemConfig);
     }
     getConfigForSection(systemId, sectionId) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         const systemConfig = this._forSystem(systemId);
         if (!systemConfig[sectionId]) {
             systemConfig[sectionId] = {};
@@ -67,9 +67,9 @@ class ConfigManager {
      * @returns {Promise<{systemId:string,instanceId:string}>}
      */
     async resolveIdentity(blockRef, systemId) {
-        blockRef = (0, utils_1.normalizeKapetaUri)(blockRef);
+        blockRef = (0, nodejs_utils_1.normalizeKapetaUri)(blockRef);
         if (systemId) {
-            systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+            systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         }
         const planAssets = await assetManager_1.assetManager.getPlans();
         const blockUri = (0, nodejs_utils_1.parseKapetaUri)(blockRef);
@@ -86,7 +86,7 @@ class ConfigManager {
                 const refUri = (0, nodejs_utils_1.parseKapetaUri)(blockInstance.block.ref);
                 if (refUri.equals(blockUri)) {
                     matchingIdentities.push({
-                        systemId: (0, utils_1.normalizeKapetaUri)(planAsset.ref),
+                        systemId: (0, nodejs_utils_1.normalizeKapetaUri)(planAsset.ref),
                         instanceId: blockInstance.id,
                     });
                 }
@@ -107,8 +107,8 @@ class ConfigManager {
         return matchingIdentities[0];
     }
     async verifyIdentity(blockRef, systemId, instanceId) {
-        blockRef = (0, utils_1.normalizeKapetaUri)(blockRef);
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        blockRef = (0, nodejs_utils_1.normalizeKapetaUri)(blockRef);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         const planAssets = await assetManager_1.assetManager.getPlans();
         const systemUri = systemId ? (0, nodejs_utils_1.parseKapetaUri)(systemId) : null;
         const blockUri = (0, nodejs_utils_1.parseKapetaUri)(blockRef);

package/dist/esm/src/definitionsManager.js

@@ -9,7 +9,6 @@ const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const cacheManager_1 = require("./cacheManager");
 const nodejs_api_client_1 = require("@kapeta/nodejs-api-client");
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const utils_1 = require("./utils/utils");
 const yaml_1 = __importDefault(require("yaml"));
 const nodejs_registry_utils_1 = require("@kapeta/nodejs-registry-utils");
 const progressListener_1 = require("./progressListener");
@@ -66,12 +65,12 @@ class DefinitionsManager {
             const blockUri = (0, nodejs_utils_1.parseKapetaUri)(b.block.ref);
             if (blockUri.version === 'local') {
                 blockRefs.add(blockUri.id);
-                b.block.ref = (0, utils_1.normalizeKapetaUri)(`${profile.handle}/${blockUri.name}:local`);
+                b.block.ref = (0, nodejs_utils_1.normalizeKapetaUri)(`${profile.handle}/${blockUri.name}:local`);
             }
         });
         // Rewrite all blocks that are referenced by the sample plan
         const rewrittenBlocks = Array.from(blockRefs)
-            .map((ref) => definitions.find((d) => (0, utils_1.normalizeKapetaUri)(d.definition.metadata.name + ':' + d.version) === (0, utils_1.normalizeKapetaUri)(ref)))
+            .map((ref) => definitions.find((d) => (0, nodejs_utils_1.normalizeKapetaUri)(d.definition.metadata.name + ':' + d.version) === (0, nodejs_utils_1.normalizeKapetaUri)(ref)))
             .filter((d) => d !== undefined)
             .map((d) => applyHandleChange(d, profile.handle));
         // Persist the rewritten assets

package/dist/esm/src/instanceManager.js

@@ -51,7 +51,7 @@ class InstanceManager {
         if (!this._instances) {
             return [];
         }
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         const planInfo = await definitionsManager_1.definitionsManager.getDefinition(systemId);
         if (!planInfo) {
             return [];
@@ -64,11 +64,11 @@ class InstanceManager {
         return this._instances.filter((instance) => instance.systemId === systemId && instanceIds.includes(instance.instanceId));
     }
     getInstance(systemId, instanceId) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         return this._instances.find((i) => i.systemId === systemId && i.instanceId === instanceId);
     }
     async exclusive(systemId, instanceId, fn) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         const key = `${systemId}/${instanceId}`;
         //console.log(`Acquiring lock for ${key}`, this.instanceLocks.isBusy(key));
         const result = await this.instanceLocks.acquire(key, fn);
@@ -105,9 +105,9 @@ class InstanceManager {
         return [];
     }
     async saveInternalInstance(instance) {
-        instance.systemId = (0, utils_1.normalizeKapetaUri)(instance.systemId);
+        instance.systemId = (0, nodejs_utils_1.normalizeKapetaUri)(instance.systemId);
         if (instance.ref) {
-            instance.ref = (0, utils_1.normalizeKapetaUri)(instance.ref);
+            instance.ref = (0, nodejs_utils_1.normalizeKapetaUri)(instance.ref);
         }
         //Get target address
         let address = await serviceManager_1.serviceManager.getProviderAddress(instance.systemId, instance.instanceId, instance.portType ?? DEFAULT_HEALTH_PORT_TYPE);
@@ -135,7 +135,7 @@ class InstanceManager {
      */
     async registerInstanceFromSDK(systemId, instanceId, info) {
         return this.exclusive(systemId, instanceId, async () => {
-            systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+            systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
             let instance = this.getInstance(systemId, instanceId);
             //Get target address
             const address = await serviceManager_1.serviceManager.getProviderAddress(systemId, instanceId, info.portType ?? DEFAULT_HEALTH_PORT_TYPE);
@@ -167,6 +167,9 @@ class InstanceManager {
                 if (healthUrl) {
                     instance.health = healthUrl;
                 }
+                if (info.portType) {
+                    instance.portType = info.portType;
+                }
                 socketManager_1.socketManager.emitSystemEvent(systemId, socketManager_1.EVENT_STATUS_CHANGED, instance);
             }
             else {
@@ -202,7 +205,7 @@ class InstanceManager {
     }
     markAsStopped(systemId, instanceId) {
         return this.exclusive(systemId, instanceId, async () => {
-            systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+            systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
             const instance = lodash_1.default.find(this._instances, { systemId, instanceId });
             if (instance && instance.owner === types_1.InstanceOwner.EXTERNAL && instance.status !== types_1.InstanceStatus.STOPPED) {
                 instance.status = types_1.InstanceStatus.STOPPED;
@@ -214,7 +217,7 @@ class InstanceManager {
         });
     }
     async startAllForPlan(systemId) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         const plan = await assetManager_1.assetManager.getPlan(systemId, true);
         if (!plan) {
             throw new Error(`Plan not found: ${systemId}`);
@@ -254,7 +257,7 @@ class InstanceManager {
     }
     async stopInner(systemId, instanceId, changeDesired = false) {
         return this.exclusive(systemId, instanceId, async () => {
-            systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+            systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
             const instance = this.getInstance(systemId, instanceId);
             if (!instance) {
                 return;
@@ -308,7 +311,7 @@ class InstanceManager {
         });
     }
     stopAllForPlan(systemId) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         const instancesForPlan = this._instances.filter((instance) => instance.systemId === systemId);
         return taskManager_1.taskManager.add(`plan:stop:${systemId}`, async () => {
             return this.stopInstances(instancesForPlan);
@@ -318,9 +321,9 @@ class InstanceManager {
     }
     async start(systemId, instanceId) {
         return this.exclusive(systemId, instanceId, async () => {
-            systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+            systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
             const blockInstance = await assetManager_1.assetManager.getBlockInstance(systemId, instanceId);
-            const blockRef = (0, utils_1.normalizeKapetaUri)(blockInstance.block.ref);
+            const blockRef = (0, nodejs_utils_1.normalizeKapetaUri)(blockInstance.block.ref);
             const blockAsset = await assetManager_1.assetManager.getAsset(blockRef, true);
             if (!blockAsset) {
                 throw new Error('Block not found: ' + blockRef);
@@ -436,7 +439,7 @@ class InstanceManager {
      * We do it this way to not cause the user to wait for the instance to start again
      */
     async prepareForRestart(systemId, instanceId) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         await this.stopInner(systemId, instanceId);
     }
     async stopAll() {
@@ -468,9 +471,9 @@ class InstanceManager {
                 if (!instance.systemId) {
                     return;
                 }
-                instance.systemId = (0, utils_1.normalizeKapetaUri)(instance.systemId);
+                instance.systemId = (0, nodejs_utils_1.normalizeKapetaUri)(instance.systemId);
                 if (instance.ref) {
-                    instance.ref = (0, utils_1.normalizeKapetaUri)(instance.ref);
+                    instance.ref = (0, nodejs_utils_1.normalizeKapetaUri)(instance.ref);
                 }
                 if (instance.desiredStatus === types_1.DesiredInstanceStatus.RUN) {
                     // Check if the plan still exists and the instance is still in the plan

package/dist/esm/src/middleware/kapeta.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.kapetaHeaders = void 0;
-const utils_1 = require("../utils/utils");
+const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 function kapetaHeaders(req, res, next) {
     let blockRef = req.headers['x-kapeta-block'];
     let systemId = req.headers['x-kapeta-system'];
     let instanceId = req.headers['x-kapeta-instance'];
     let environment = req.headers['x-kapeta-environment'];
     if (blockRef) {
-        blockRef = (0, utils_1.normalizeKapetaUri)(blockRef);
+        blockRef = (0, nodejs_utils_1.normalizeKapetaUri)(blockRef);
     }
     if (systemId) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
     }
     req.kapeta = {
         blockRef,

package/dist/esm/src/networkManager.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.networkManager = void 0;
 const node_uuid_1 = __importDefault(require("node-uuid"));
-const utils_1 = require("./utils/utils");
+const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 class NetworkManager {
     _connections;
     _sources;
@@ -24,7 +24,7 @@ class NetworkManager {
         this._targets = {};
     }
     _ensureSystem(systemId) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         if (!this._connections[systemId]) {
             this._connections[systemId] = {};
         }
@@ -36,7 +36,7 @@ class NetworkManager {
         }
     }
     _ensureConnection(systemId, connectionId) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         this._ensureSystem(systemId);
         if (!this._connections[systemId][connectionId]) {
             this._connections[systemId][connectionId] = [];
@@ -44,7 +44,7 @@ class NetworkManager {
         return this._connections[systemId][connectionId];
     }
     _ensureSource(systemId, sourceBlockInstanceId) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         this._ensureSystem(systemId);
         if (!this._sources[systemId][sourceBlockInstanceId]) {
             this._sources[systemId][sourceBlockInstanceId] = [];
@@ -52,7 +52,7 @@ class NetworkManager {
         return this._sources[systemId][sourceBlockInstanceId];
     }
     _ensureTarget(systemId, targetBlockInstanceId) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         this._ensureSystem(systemId);
         if (!this._targets[systemId][targetBlockInstanceId]) {
             this._targets[systemId][targetBlockInstanceId] = [];
@@ -60,7 +60,7 @@ class NetworkManager {
         return this._targets[systemId][targetBlockInstanceId];
     }
     addRequest(systemId, connection, request, consumerMethodId, providerMethodId) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         const traffic = new Traffic(connection, request, consumerMethodId, providerMethodId);
         this._ensureConnection(systemId, traffic.connectionId).push(traffic);
         this._ensureSource(systemId, connection.provider.blockId).push(traffic);

package/dist/esm/src/operatorManager.js

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.operatorManager = exports.KIND_OPERATOR = void 0;
 const path_1 = __importDefault(require("path"));
 const md5_1 = __importDefault(require("md5"));
-const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const serviceManager_1 = require("./serviceManager");
 const storageService_1 = require("./storageService");
 const containerManager_1 = require("./containerManager");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const definitionsManager_1 = require("./definitionsManager");
 const utils_1 = require("./utils/utils");
+const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const lodash_1 = __importDefault(require("lodash"));
 const async_lock_1 = __importDefault(require("async-lock"));
 const taskManager_1 = require("./taskManager");
@@ -69,7 +69,7 @@ class OperatorManager {
      * Get information about a specific consumed resource
      */
     async getConsumerResourceInfo(systemId, fromServiceId, resourceType, portType, name, environment) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         const plans = await definitionsManager_1.definitionsManager.getDefinitions(KIND_PLAN);
         const planUri = (0, nodejs_utils_1.parseKapetaUri)(systemId);
         const currentPlan = plans.find((plan) => plan.definition.metadata.name === planUri.fullName && plan.version === planUri.version);
@@ -117,7 +117,7 @@ class OperatorManager {
      * @return {Promise<ContainerInfo>}
      */
     async ensureResource(systemId, resourceType, version) {
-        systemId = (0, utils_1.normalizeKapetaUri)(systemId);
+        systemId = (0, nodejs_utils_1.normalizeKapetaUri)(systemId);
         const key = `${systemId}#${resourceType}:${version}`;
         return await this.operatorLock.acquire(key, async () => {
             const operator = await this.getOperator(resourceType, version);