@kapeta/local-cluster-service 0.76.0 → 0.76.2

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [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)
+
+
+### Bug Fixes
+
+* more handle logging ([80e8a4c](https://github.com/kapetacom/local-cluster-service/commit/80e8a4c50df9b40226e920ac28f8a7e843c72d73))
+
 # [0.76.0](https://github.com/kapetacom/local-cluster-service/compare/v0.75.0...v0.76.0) (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/PageGenerator.js

@@ -246,7 +246,7 @@ class PageQueue extends node_events_1.EventEmitter {
             console.warn('Skipping image reference of type %s for url %s', mimeType, prompt.url);
             return;
         }
-        const client = new stormClient_1.StormClient(this.systemId);
+        const client = new stormClient_1.StormClient(this.handle, this.systemId);
         this.images.set(prompt.url, prompt.description);
         const result = await client.createImage(`Create an image for the url "${prompt.url}" with this description: ${prompt.description}`.trim());
         let imageEvent = null;
@@ -263,7 +263,7 @@ class PageQueue extends node_events_1.EventEmitter {
         this.emit('image', imageEvent, prompt);
     }
     async generate(prompt, conversationId) {
-        const client = new stormClient_1.StormClient("", this.systemId);
+        const client = new stormClient_1.StormClient(this.handle, this.systemId);
         const screenStream = await client.createUIPage(prompt, conversationId);
         let pageEvent = null;
         screenStream.on('data', (event) => {
@@ -281,7 +281,7 @@ class PageQueue extends node_events_1.EventEmitter {
         await this.processPageEventWithReferences(pageEvent);
     }
     async resolveReferences(content) {
-        const client = new stormClient_1.StormClient("", this.systemId);
+        const client = new stormClient_1.StormClient(this.handle, this.systemId);
         const referenceStream = await client.classifyUIReferences(content);
         const references = [];
         referenceStream.on('data', (referenceData) => {

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

@@ -226,8 +226,9 @@ router.delete('/ui/serve/:systemId', async (req, res) => {
     }
     res.status(200).json({ status: 'ok' });
 });
-router.post('/ui/screen', async (req, res) => {
+router.post('/:handle/ui/screen', async (req, res) => {
     try {
+        const handle = req.params.handle;
         const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
         const systemId = req.headers[page_utils_1.SystemIdHeader.toLowerCase()];
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
@@ -236,7 +237,7 @@ router.post('/ui/screen', async (req, res) => {
         res.set('Access-Control-Expose-Headers', stormClient_1.ConversationIdHeader);
         res.set(stormClient_1.ConversationIdHeader, conversationId);
         const parentConversationId = systemId ?? '';
-        const queue = new PageGenerator_1.PageQueue("", parentConversationId, '', 5);
+        const queue = new PageGenerator_1.PageQueue(handle, parentConversationId, '', 5);
         onRequestAborted(req, res, () => {
             queue.cancel();
         });
@@ -539,13 +540,14 @@ router.post('/:handle/ui', async (req, res) => {
         }
     }
 });
-router.post('/ui/edit', async (req, res) => {
+router.post('/:handle/ui/edit', async (req, res) => {
     try {
+        const handle = req.params.handle;
         const systemId = (req.headers[page_utils_1.SystemIdHeader.toLowerCase()] ||
             req.headers[stormClient_1.ConversationIdHeader.toLowerCase()]);
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
         const storagePrefix = systemId ? systemId + '_' : 'mock_';
-        const queue = new PageGenerator_1.PageQueue("", systemId, '', 5);
+        const queue = new PageGenerator_1.PageQueue(handle, systemId, '', 5);
         onRequestAborted(req, res, () => {
             queue.cancel();
         });

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/PageGenerator.js

@@ -246,7 +246,7 @@ class PageQueue extends node_events_1.EventEmitter {
             console.warn('Skipping image reference of type %s for url %s', mimeType, prompt.url);
             return;
         }
-        const client = new stormClient_1.StormClient(this.systemId);
+        const client = new stormClient_1.StormClient(this.handle, this.systemId);
         this.images.set(prompt.url, prompt.description);
         const result = await client.createImage(`Create an image for the url "${prompt.url}" with this description: ${prompt.description}`.trim());
         let imageEvent = null;
@@ -263,7 +263,7 @@ class PageQueue extends node_events_1.EventEmitter {
         this.emit('image', imageEvent, prompt);
     }
     async generate(prompt, conversationId) {
-        const client = new stormClient_1.StormClient("", this.systemId);
+        const client = new stormClient_1.StormClient(this.handle, this.systemId);
         const screenStream = await client.createUIPage(prompt, conversationId);
         let pageEvent = null;
         screenStream.on('data', (event) => {
@@ -281,7 +281,7 @@ class PageQueue extends node_events_1.EventEmitter {
         await this.processPageEventWithReferences(pageEvent);
     }
     async resolveReferences(content) {
-        const client = new stormClient_1.StormClient("", this.systemId);
+        const client = new stormClient_1.StormClient(this.handle, this.systemId);
         const referenceStream = await client.classifyUIReferences(content);
         const references = [];
         referenceStream.on('data', (referenceData) => {

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

@@ -226,8 +226,9 @@ router.delete('/ui/serve/:systemId', async (req, res) => {
     }
     res.status(200).json({ status: 'ok' });
 });
-router.post('/ui/screen', async (req, res) => {
+router.post('/:handle/ui/screen', async (req, res) => {
     try {
+        const handle = req.params.handle;
         const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
         const systemId = req.headers[page_utils_1.SystemIdHeader.toLowerCase()];
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
@@ -236,7 +237,7 @@ router.post('/ui/screen', async (req, res) => {
         res.set('Access-Control-Expose-Headers', stormClient_1.ConversationIdHeader);
         res.set(stormClient_1.ConversationIdHeader, conversationId);
         const parentConversationId = systemId ?? '';
-        const queue = new PageGenerator_1.PageQueue("", parentConversationId, '', 5);
+        const queue = new PageGenerator_1.PageQueue(handle, parentConversationId, '', 5);
         onRequestAborted(req, res, () => {
             queue.cancel();
         });
@@ -539,13 +540,14 @@ router.post('/:handle/ui', async (req, res) => {
         }
     }
 });
-router.post('/ui/edit', async (req, res) => {
+router.post('/:handle/ui/edit', async (req, res) => {
     try {
+        const handle = req.params.handle;
         const systemId = (req.headers[page_utils_1.SystemIdHeader.toLowerCase()] ||
             req.headers[stormClient_1.ConversationIdHeader.toLowerCase()]);
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
         const storagePrefix = systemId ? systemId + '_' : 'mock_';
-        const queue = new PageGenerator_1.PageQueue("", systemId, '', 5);
+        const queue = new PageGenerator_1.PageQueue(handle, systemId, '', 5);
         onRequestAborted(req, res, () => {
             queue.cancel();
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.76.0",
+    "version": "0.76.2",
     "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/PageGenerator.ts

@@ -274,7 +274,7 @@ export class PageQueue extends EventEmitter {
             return;
         }
 
-        const client = new StormClient(this.systemId);
+        const client = new StormClient(this.handle, this.systemId);
         this.images.set(prompt.url, prompt.description);
         const result = await client.createImage(
             `Create an image for the url "${prompt.url}" with this description: ${prompt.description}`.trim()
@@ -297,7 +297,7 @@ export class PageQueue extends EventEmitter {
     }
 
     public async generate(prompt: UIPagePrompt, conversationId: string) {
-        const client = new StormClient("", this.systemId);
+        const client = new StormClient(this.handle, this.systemId);
         const screenStream = await client.createUIPage(prompt, conversationId);
         let pageEvent: StormEventPage | null = null;
         screenStream.on('data', (event: StormEvent) => {
@@ -317,7 +317,7 @@ export class PageQueue extends EventEmitter {
     }
 
     private async resolveReferences(content: string): Promise<ReferenceClassification[]> {
-        const client = new StormClient("", this.systemId);
+        const client = new StormClient(this.handle, this.systemId);
         const referenceStream = await client.classifyUIReferences(content);
 
         const references: ReferenceClassification[] = [];

package/src/storm/routes.ts

@@ -293,8 +293,9 @@ router.delete('/ui/serve/:systemId', async (req: KapetaBodyRequest, res: Respons
     res.status(200).json({ status: 'ok' });
 });
 
-router.post('/ui/screen', async (req: KapetaBodyRequest, res: Response) => {
+router.post('/:handle/ui/screen', async (req: KapetaBodyRequest, res: Response) => {
     try {
+        const handle = req.params.handle as string;
         const conversationId = req.headers[ConversationIdHeader.toLowerCase()] as string | undefined;
         const systemId = req.headers[SystemIdHeader.toLowerCase()] as string | undefined;
 
@@ -307,7 +308,7 @@ router.post('/ui/screen', async (req: KapetaBodyRequest, res: Response) => {
 
         const parentConversationId = systemId ?? '';
 
-        const queue = new PageQueue("", parentConversationId, '', 5);
+        const queue = new PageQueue(handle, parentConversationId, '', 5);
         onRequestAborted(req, res, () => {
             queue.cancel();
         });
@@ -672,15 +673,16 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
     }
 });
 
-router.post('/ui/edit', async (req: KapetaBodyRequest, res: Response) => {
+router.post('/:handle/ui/edit', async (req: KapetaBodyRequest, res: Response) => {
     try {
+        const handle = req.params.handle as string;
         const systemId = (req.headers[SystemIdHeader.toLowerCase()] ||
             req.headers[ConversationIdHeader.toLowerCase()]) as string | undefined;
 
         const aiRequest: StormContextRequest<UIPageEditRequest> = JSON.parse(req.stringBody ?? '{}');
         const storagePrefix = systemId ? systemId + '_' : 'mock_';
 
-        const queue = new PageQueue("",systemId!, '', 5);
+        const queue = new PageQueue(handle, systemId!, '', 5);
 
         onRequestAborted(req, res, () => {
             queue.cancel();