@kapeta/local-cluster-service 0.63.0 → 0.63.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.63.1](https://github.com/kapetacom/local-cluster-service/compare/v0.63.0...v0.63.1) (2024-08-20)
+
+
+### Bug Fixes
+
+* handle port conflict and hanging response on close ([#219](https://github.com/kapetacom/local-cluster-service/issues/219)) ([e4f3b26](https://github.com/kapetacom/local-cluster-service/commit/e4f3b268fec9958aa315a186a306d2350354452b))
+
 # [0.63.0](https://github.com/kapetacom/local-cluster-service/compare/v0.62.2...v0.63.0) (2024-08-15)
 
 

package/dist/cjs/src/storm/UIServer.d.ts

@@ -1,4 +1,11 @@
+/// <reference types="node" />
+import { Server } from 'http';
 import { StormEventPage } from './events';
+declare module 'express-serve-static-core' {
+    interface Application {
+        listen(port: number, callback?: (err?: Error) => void): Server;
+    }
+}
 export declare class UIServer {
     private readonly express;
     private readonly systemId;

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

@@ -29,11 +29,16 @@ class UIServer {
                     window.sessionStorage.clear();
                 </script>`);
         });
-        this.express.all('/*', async (req, res) => {
+        this.express.all('/*', (req, res) => {
             (0, page_utils_1.readPageFromDisk)(this.systemId, req.params[0], req.method, res);
         });
-        return new Promise((resolve) => {
-            this.server = this.express.listen(this.port, () => {
+        return new Promise((resolve, reject) => {
+            this.server = this.express.listen(this.port, (err) => {
+                if (err) {
+                    console.error('Failed to start UI server', err);
+                    reject(err);
+                    return;
+                }
                 console.log(`UI Server started on port ${this.port}`);
                 resolve();
             });

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

@@ -100,6 +100,7 @@ router.delete('/:handle/ui', async (req, res) => {
         server.close();
         delete UI_SERVERS[conversationId];
     }
+    res.status(200).json({ status: 'ok' });
 });
 router.post('/:handle/ui/iterative', async (req, res) => {
     const handle = req.params.handle;

package/dist/esm/src/storm/UIServer.d.ts

@@ -1,4 +1,11 @@
+/// <reference types="node" />
+import { Server } from 'http';
 import { StormEventPage } from './events';
+declare module 'express-serve-static-core' {
+    interface Application {
+        listen(port: number, callback?: (err?: Error) => void): Server;
+    }
+}
 export declare class UIServer {
     private readonly express;
     private readonly systemId;

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

@@ -29,11 +29,16 @@ class UIServer {
                     window.sessionStorage.clear();
                 </script>`);
         });
-        this.express.all('/*', async (req, res) => {
+        this.express.all('/*', (req, res) => {
             (0, page_utils_1.readPageFromDisk)(this.systemId, req.params[0], req.method, res);
         });
-        return new Promise((resolve) => {
-            this.server = this.express.listen(this.port, () => {
+        return new Promise((resolve, reject) => {
+            this.server = this.express.listen(this.port, (err) => {
+                if (err) {
+                    console.error('Failed to start UI server', err);
+                    reject(err);
+                    return;
+                }
                 console.log(`UI Server started on port ${this.port}`);
                 resolve();
             });

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

@@ -100,6 +100,7 @@ router.delete('/:handle/ui', async (req, res) => {
         server.close();
         delete UI_SERVERS[conversationId];
     }
+    res.status(200).json({ status: 'ok' });
 });
 router.post('/:handle/ui/iterative', async (req, res) => {
     const handle = req.params.handle;

package/package.json

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

package/src/storm/UIServer.ts

@@ -8,6 +8,15 @@ import { clusterService } from '../clusterService';
 import { Server } from 'http';
 import { StormEventPage } from './events';
 
+declare module 'express-serve-static-core' {
+    interface Application {
+        // Adds error callback support
+        // From the docs:
+        // All the forms of Node’s http.Server.listen() method are in fact actually supported.
+        listen(port: number, callback?: (err?: Error) => void): Server;
+    }
+}
+
 export class UIServer {
     private readonly express: Express;
     private readonly systemId: string;
@@ -33,12 +42,17 @@ export class UIServer {
             );
         });
 
-        this.express.all('/*', async (req: Request, res: Response) => {
+        this.express.all('/*', (req: Request, res: Response) => {
             readPageFromDisk(this.systemId, req.params[0], req.method, res);
         });
 
-        return new Promise<void>((resolve) => {
-            this.server = this.express.listen(this.port, () => {
+        return new Promise<void>((resolve, reject) => {
+            this.server = this.express.listen(this.port, (err) => {
+                if (err) {
+                    console.error('Failed to start UI server', err);
+                    reject(err);
+                    return;
+                }
                 console.log(`UI Server started on port ${this.port}`);
                 resolve();
             });

package/src/storm/routes.ts

@@ -13,15 +13,8 @@ import { stringBody } from '../middleware/stringBody';
 import { KapetaBodyRequest } from '../types';
 import { StormCodegenRequest, StormContextRequest, StormCreateBlockRequest, StormStream } from './stream';
 
-import {
-    ConversationIdHeader,
-    stormClient,
-    UIPagePrompt,
-    UIPageEditPrompt,
-    UIPageEditRequest,
-    UIPageSamplePrompt,
-} from './stormClient';
-import { Page, StormEvent, StormEventPage, StormEventPhaseType, UIShell, UserJourneyScreen } from './events';
+import { ConversationIdHeader, stormClient, UIPagePrompt, UIPageEditPrompt, UIPageEditRequest } from './stormClient';
+import { Page, StormEvent, StormEventPage, StormEventPhaseType, UserJourneyScreen } from './events';
 
 import {
     createPhaseEndEvent,
@@ -33,18 +26,9 @@ import {
 import { StormCodegen } from './codegen';
 import { assetManager } from '../assetManager';
 import uuid from 'node-uuid';
-import { PromiseQueue } from './PromiseQueue';
-import {
-    readConversationFromFile,
-    readPageFromDisk,
-    readPageFromDiskAsString,
-    SystemIdHeader,
-    writeConversationToFile,
-    writePageToDisk,
-} from './page-utils';
+import { readPageFromDisk, readPageFromDiskAsString, SystemIdHeader, writePageToDisk } from './page-utils';
 import { UIServer } from './UIServer';
 import { PageQueue } from './PageGenerator';
-import FSExtra from 'fs-extra';
 
 const UI_SERVERS: { [key: string]: UIServer } = {};
 const router = Router();
@@ -140,6 +124,7 @@ router.delete('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
         server.close();
         delete UI_SERVERS[conversationId];
     }
+    res.status(200).json({ status: 'ok' });
 });
 
 router.post('/:handle/ui/iterative', async (req: KapetaBodyRequest, res: Response) => {