@kapeta/local-cluster-service 0.76.1 → 0.76.3

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [0.76.3](https://github.com/kapetacom/local-cluster-service/compare/v0.76.2...v0.76.3) (2024-10-01)
+
+
+### Bug Fixes
+
+* Catch errors and return empty HTMPPage array ([01f780e](https://github.com/kapetacom/local-cluster-service/commit/01f780e0e808c9d2e26c44f9330df75dda09a6f5))
+
+## [0.76.2](https://github.com/kapetacom/local-cluster-service/compare/v0.76.1...v0.76.2) (2024-09-30)
+
+
+### Bug Fixes
+
+* gracefully handle missing docker ([973c2d3](https://github.com/kapetacom/local-cluster-service/commit/973c2d383b0315e7fd6aa376b248417f76bd8f62))
+* port conflict cant prevent server start ([0aac354](https://github.com/kapetacom/local-cluster-service/commit/0aac354742c3ccadd9da769a8802bea5b38df736))
+
 ## [0.76.1](https://github.com/kapetacom/local-cluster-service/compare/v0.76.0...v0.76.1) (2024-09-30)
 
 

package/dist/cjs/src/instanceManager.js

@@ -427,6 +427,10 @@ class InstanceManager {
         if (!blockAsset) {
             throw new Error('Block not found: ' + blockRef);
         }
+        const isAlive = containerManager_1.containerManager.isAlive();
+        if (!isAlive) {
+            throw new Error('Docker is not running or is not responding');
+        }
         if (checkForSingleton && (await this.isSingletonOperator(blockAsset))) {
             const instances = await this.getAllInstancesForKind(systemId, blockAsset.data.kind);
             if (instances.length > 1) {
@@ -584,6 +588,10 @@ class InstanceManager {
         //console.log('\n## Checking instances:');
         let changed = false;
         const all = [...this._instances];
+        if (!containerManager_1.containerManager.isAlive()) {
+            // No need to check anything if docker is not running
+            return;
+        }
         while (all.length > 0) {
             // Check a few instances at a time - docker doesn't like too many concurrent requests
             const chunk = all.splice(0, 30);
@@ -712,6 +720,10 @@ class InstanceManager {
     }
     async getExternalStatus(instance) {
         if (instance.type === types_1.InstanceType.DOCKER) {
+            if (!containerManager_1.containerManager.isAlive()) {
+                // Consider making this "unknown"
+                return types_1.InstanceStatus.STOPPED;
+            }
             const containerName = await (0, utils_1.getBlockInstanceContainerName)(instance.systemId, instance.instanceId);
             const container = await containerManager_1.containerManager.getContainerByName(containerName);
             if (!container) {

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

@@ -73,13 +73,16 @@ router.post('/:systemId/:instanceId/start', async (req, res) => {
                 taskId: result.id,
             });
         }
-        else {
+        else if (result) {
             res.status(202).send({
                 ok: true,
                 pid: result.pid,
                 type: result.type,
             });
         }
+        else {
+            res.status(500).send({ ok: false, error: 'Failed to start instance' });
+        }
     }
     catch (e) {
         res.status(500).send({ ok: false, error: e.message });

package/dist/cjs/src/serviceManager.js

@@ -24,10 +24,15 @@ class ServiceManager {
         if (!this._systems) {
             this._systems = {};
         }
-        lodash_1.default.forEach(this._systems, (system) => {
+        lodash_1.default.forEach(this._systems, (system, systemId) => {
             lodash_1.default.forEach(system, (services) => {
                 lodash_1.default.forEach(services, (portInfo) => {
-                    clusterService_1.clusterService.reservePort(portInfo.port);
+                    try {
+                        clusterService_1.clusterService.reservePort(portInfo.port);
+                    }
+                    catch (e) {
+                        console.warn('Failed to reserve port', systemId, portInfo.port, e);
+                    }
                 });
             });
         });

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

@@ -607,7 +607,7 @@ router.post('/ui/vote', async (req, res) => {
     const aiRequest = JSON.parse(req.stringBody ?? '{}');
     const { topic, vote, mainConversationId } = aiRequest;
     try {
-        const stormClient = new stormClient_1.StormClient("", mainConversationId);
+        const stormClient = new stormClient_1.StormClient('', mainConversationId);
         await stormClient.voteUIPage(topic, conversationId, vote, mainConversationId);
     }
     catch (e) {
@@ -619,7 +619,7 @@ router.post('/ui/get-vote', async (req, res) => {
     const aiRequest = JSON.parse(req.stringBody ?? '{}');
     const { topic, mainConversationId } = aiRequest;
     try {
-        const stormClient = new stormClient_1.StormClient("", mainConversationId);
+        const stormClient = new stormClient_1.StormClient('', mainConversationId);
         const vote = await stormClient.getVoteUIPage(topic, conversationId, mainConversationId);
         res.send({ vote });
     }

package/dist/cjs/src/storm/stormClient.js

@@ -25,7 +25,7 @@ class StormClient {
     _handle;
     constructor(handle, systemId) {
         this._baseUrl = (0, utils_1.getRemoteUrl)('ai-service', 'https://ai.kapeta.com');
-        this._systemId = systemId || "";
+        this._systemId = systemId || '';
         this._handle = handle;
     }
     async createOptions(path, method, body) {
@@ -148,15 +148,25 @@ class StormClient {
     }
     async replaceMockWithAPICall(prompt) {
         const u = `${this._baseUrl}/v2/ui/implement-api-clients-all`;
-        const response = await fetch(u, {
-            method: 'POST',
-            body: JSON.stringify(prompt.pages),
-            headers: {
-                'systemId': prompt.systemId,
-                'conversationId': prompt.systemId,
-            },
-        });
-        return (await response.json());
+        try {
+            const response = await fetch(u, {
+                method: 'POST',
+                body: JSON.stringify(prompt.pages),
+                headers: {
+                    systemId: prompt.systemId,
+                    conversationId: prompt.systemId,
+                },
+            });
+            if (!response.ok) {
+                console.error('Failed to implement api clients', response.status, await response.text());
+                return [];
+            }
+            return (await response.json());
+        }
+        catch (error) {
+            console.error('Failed to implement api clients', error);
+            return [];
+        }
     }
     async generatePrompt(pages) {
         const u = `${this._baseUrl}/v2/ui/prompt`;

package/dist/esm/src/instanceManager.js

@@ -427,6 +427,10 @@ class InstanceManager {
         if (!blockAsset) {
             throw new Error('Block not found: ' + blockRef);
         }
+        const isAlive = containerManager_1.containerManager.isAlive();
+        if (!isAlive) {
+            throw new Error('Docker is not running or is not responding');
+        }
         if (checkForSingleton && (await this.isSingletonOperator(blockAsset))) {
             const instances = await this.getAllInstancesForKind(systemId, blockAsset.data.kind);
             if (instances.length > 1) {
@@ -584,6 +588,10 @@ class InstanceManager {
         //console.log('\n## Checking instances:');
         let changed = false;
         const all = [...this._instances];
+        if (!containerManager_1.containerManager.isAlive()) {
+            // No need to check anything if docker is not running
+            return;
+        }
         while (all.length > 0) {
             // Check a few instances at a time - docker doesn't like too many concurrent requests
             const chunk = all.splice(0, 30);
@@ -712,6 +720,10 @@ class InstanceManager {
     }
     async getExternalStatus(instance) {
         if (instance.type === types_1.InstanceType.DOCKER) {
+            if (!containerManager_1.containerManager.isAlive()) {
+                // Consider making this "unknown"
+                return types_1.InstanceStatus.STOPPED;
+            }
             const containerName = await (0, utils_1.getBlockInstanceContainerName)(instance.systemId, instance.instanceId);
             const container = await containerManager_1.containerManager.getContainerByName(containerName);
             if (!container) {

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

@@ -73,13 +73,16 @@ router.post('/:systemId/:instanceId/start', async (req, res) => {
                 taskId: result.id,
             });
         }
-        else {
+        else if (result) {
             res.status(202).send({
                 ok: true,
                 pid: result.pid,
                 type: result.type,
             });
         }
+        else {
+            res.status(500).send({ ok: false, error: 'Failed to start instance' });
+        }
     }
     catch (e) {
         res.status(500).send({ ok: false, error: e.message });

package/dist/esm/src/serviceManager.js

@@ -24,10 +24,15 @@ class ServiceManager {
         if (!this._systems) {
             this._systems = {};
         }
-        lodash_1.default.forEach(this._systems, (system) => {
+        lodash_1.default.forEach(this._systems, (system, systemId) => {
             lodash_1.default.forEach(system, (services) => {
                 lodash_1.default.forEach(services, (portInfo) => {
-                    clusterService_1.clusterService.reservePort(portInfo.port);
+                    try {
+                        clusterService_1.clusterService.reservePort(portInfo.port);
+                    }
+                    catch (e) {
+                        console.warn('Failed to reserve port', systemId, portInfo.port, e);
+                    }
                 });
             });
         });

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

@@ -607,7 +607,7 @@ router.post('/ui/vote', async (req, res) => {
     const aiRequest = JSON.parse(req.stringBody ?? '{}');
     const { topic, vote, mainConversationId } = aiRequest;
     try {
-        const stormClient = new stormClient_1.StormClient("", mainConversationId);
+        const stormClient = new stormClient_1.StormClient('', mainConversationId);
         await stormClient.voteUIPage(topic, conversationId, vote, mainConversationId);
     }
     catch (e) {
@@ -619,7 +619,7 @@ router.post('/ui/get-vote', async (req, res) => {
     const aiRequest = JSON.parse(req.stringBody ?? '{}');
     const { topic, mainConversationId } = aiRequest;
     try {
-        const stormClient = new stormClient_1.StormClient("", mainConversationId);
+        const stormClient = new stormClient_1.StormClient('', mainConversationId);
         const vote = await stormClient.getVoteUIPage(topic, conversationId, mainConversationId);
         res.send({ vote });
     }

package/dist/esm/src/storm/stormClient.js

@@ -25,7 +25,7 @@ class StormClient {
     _handle;
     constructor(handle, systemId) {
         this._baseUrl = (0, utils_1.getRemoteUrl)('ai-service', 'https://ai.kapeta.com');
-        this._systemId = systemId || "";
+        this._systemId = systemId || '';
         this._handle = handle;
     }
     async createOptions(path, method, body) {
@@ -148,15 +148,25 @@ class StormClient {
     }
     async replaceMockWithAPICall(prompt) {
         const u = `${this._baseUrl}/v2/ui/implement-api-clients-all`;
-        const response = await fetch(u, {
-            method: 'POST',
-            body: JSON.stringify(prompt.pages),
-            headers: {
-                'systemId': prompt.systemId,
-                'conversationId': prompt.systemId,
-            },
-        });
-        return (await response.json());
+        try {
+            const response = await fetch(u, {
+                method: 'POST',
+                body: JSON.stringify(prompt.pages),
+                headers: {
+                    systemId: prompt.systemId,
+                    conversationId: prompt.systemId,
+                },
+            });
+            if (!response.ok) {
+                console.error('Failed to implement api clients', response.status, await response.text());
+                return [];
+            }
+            return (await response.json());
+        }
+        catch (error) {
+            console.error('Failed to implement api clients', error);
+            return [];
+        }
     }
     async generatePrompt(pages) {
         const u = `${this._baseUrl}/v2/ui/prompt`;

package/package.json

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

package/src/instanceManager.ts

@@ -575,6 +575,11 @@ export class InstanceManager {
             throw new Error('Block not found: ' + blockRef);
         }
 
+        const isAlive = containerManager.isAlive();
+        if (!isAlive) {
+            throw new Error('Docker is not running or is not responding');
+        }
+
         if (checkForSingleton && (await this.isSingletonOperator(blockAsset))) {
             const instances = await this.getAllInstancesForKind(systemId, blockAsset.data.kind);
             if (instances.length > 1) {
@@ -767,6 +772,12 @@ export class InstanceManager {
         //console.log('\n## Checking instances:');
         let changed = false;
         const all = [...this._instances];
+
+        if (!containerManager.isAlive()) {
+            // No need to check anything if docker is not running
+            return;
+        }
+
         while (all.length > 0) {
             // Check a few instances at a time - docker doesn't like too many concurrent requests
             const chunk = all.splice(0, 30);
@@ -932,6 +943,11 @@ export class InstanceManager {
 
     private async getExternalStatus(instance: InstanceInfo): Promise<InstanceStatus> {
         if (instance.type === InstanceType.DOCKER) {
+            if (!containerManager.isAlive()) {
+                // Consider making this "unknown"
+                return InstanceStatus.STOPPED;
+            }
+
             const containerName = await getBlockInstanceContainerName(instance.systemId, instance.instanceId);
             const container = await containerManager.getContainerByName(containerName);
             if (!container) {

package/src/instances/routes.ts

@@ -12,6 +12,7 @@ import { kapetaHeaders, KapetaRequest } from '../middleware/kapeta';
 import { stringBody } from '../middleware/stringBody';
 import { DesiredInstanceStatus, InstanceInfo, InstanceOwner, InstanceType, KapetaBodyRequest } from '../types';
 import { Task } from '../taskManager';
+import { containerManager } from '../containerManager';
 
 const router = Router();
 router.use('/', corsHandler);
@@ -76,12 +77,14 @@ router.post('/:systemId/:instanceId/start', async (req: Request, res: Response)
                 ok: true,
                 taskId: result.id,
             });
-        } else {
+        } else if (result) {
             res.status(202).send({
                 ok: true,
                 pid: result.pid,
                 type: result.type,
             });
+        } else {
+            res.status(500).send({ ok: false, error: 'Failed to start instance' });
         }
     } catch (e: any) {
         res.status(500).send({ ok: false, error: e.message });

package/src/serviceManager.ts

@@ -26,10 +26,14 @@ class ServiceManager {
             this._systems = {};
         }
 
-        _.forEach(this._systems, (system) => {
+        _.forEach(this._systems, (system, systemId) => {
             _.forEach(system, (services) => {
                 _.forEach(services, (portInfo) => {
-                    clusterService.reservePort(portInfo.port);
+                    try {
+                        clusterService.reservePort(portInfo.port);
+                    } catch (e) {
+                        console.warn('Failed to reserve port', systemId, portInfo.port, e);
+                    }
                 });
             });
         });

package/src/storm/routes.ts

@@ -163,7 +163,7 @@ router.post('/ui/create-system/:handle/:systemId', async (req: KapetaBodyRequest
     sendEvent(res, createPhaseStartEvent(StormEventPhaseType.IMPLEMENT_APIS));
 
     const pagesFromDisk = readFilesAndContent(srcDir);
-    const client = new StormClient(handle, systemId)
+    const client = new StormClient(handle, systemId);
     const pagesWithImplementation = await client.replaceMockWithAPICall({
         pages: pagesFromDisk,
         systemId: systemId,
@@ -756,7 +756,7 @@ router.post('/ui/vote', async (req: KapetaBodyRequest, res: Response) => {
     const aiRequest: UIPageVoteRequest = JSON.parse(req.stringBody ?? '{}');
     const { topic, vote, mainConversationId } = aiRequest;
     try {
-        const stormClient = new StormClient("", mainConversationId);
+        const stormClient = new StormClient('', mainConversationId);
         await stormClient.voteUIPage(topic, conversationId, vote, mainConversationId);
     } catch (e: any) {
         res.status(500).send({ error: e.message });
@@ -768,7 +768,7 @@ router.post('/ui/get-vote', async (req: KapetaBodyRequest, res: Response) => {
     const aiRequest: UIPageGetVoteRequest = JSON.parse(req.stringBody ?? '{}');
     const { topic, mainConversationId } = aiRequest;
     try {
-        const stormClient = new StormClient("", mainConversationId);
+        const stormClient = new StormClient('', mainConversationId);
         const vote = await stormClient.getVoteUIPage(topic, conversationId, mainConversationId);
         res.send({ vote });
     } catch (e: any) {

package/src/storm/stormClient.ts

@@ -93,7 +93,7 @@ export class StormClient {
     private readonly _handle: string;
     constructor(handle: string, systemId?: string) {
         this._baseUrl = getRemoteUrl('ai-service', 'https://ai.kapeta.com');
-        this._systemId = systemId || "";
+        this._systemId = systemId || '';
         this._handle = handle;
     }
 
@@ -116,10 +116,10 @@ export class StormClient {
             headers[ConversationIdHeader] = body.conversationId;
         }
         if (this._systemId) {
-            headers[SystemIdHeader] = this._systemId
+            headers[SystemIdHeader] = this._systemId;
         }
         if (this._handle) {
-            headers[HandleHeader] = this._handle
+            headers[HandleHeader] = this._handle;
         }
         return {
             url,
@@ -252,15 +252,26 @@ export class StormClient {
 
     public async replaceMockWithAPICall(prompt: ImplementAPIClients): Promise<HTMLPage[]> {
         const u = `${this._baseUrl}/v2/ui/implement-api-clients-all`;
-        const response = await fetch(u, {
-            method: 'POST',
-            body: JSON.stringify(prompt.pages),
-            headers: {
-                'systemId': prompt.systemId,
-                'conversationId': prompt.systemId,
-            },
-        });
-        return (await response.json()) as HTMLPage[];
+        try {
+            const response = await fetch(u, {
+                method: 'POST',
+                body: JSON.stringify(prompt.pages),
+                headers: {
+                    systemId: prompt.systemId,
+                    conversationId: prompt.systemId,
+                },
+            });
+
+            if (!response.ok) {
+                console.error('Failed to implement api clients', response.status, await response.text());
+                return [];
+            }
+
+            return (await response.json()) as HTMLPage[];
+        } catch (error) {
+            console.error('Failed to implement api clients', error);
+            return [];
+        }
     }
 
     public async generatePrompt(pages: string[]): Promise<string> {