@kapeta/local-cluster-service 0.74.1 → 0.74.2

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.74.2](https://github.com/kapetacom/local-cluster-service/compare/v0.74.1...v0.74.2) (2024-09-27)
+
+
+### Bug Fixes
+
+* add more bail checkpoints for aborted request ([1f4823c](https://github.com/kapetacom/local-cluster-service/commit/1f4823c648d21f3ea8c8f8f2ead156d1e43c7252))
+* define conversationIds for pages as early as possible ([7b020a5](https://github.com/kapetacom/local-cluster-service/commit/7b020a52ddeba60329989dafda62abc8d3565039))
+
 ## [0.74.1](https://github.com/kapetacom/local-cluster-service/compare/v0.74.0...v0.74.1) (2024-09-27)
 
 

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

@@ -37,6 +37,7 @@ const node_events_1 = require("node:events");
 const p_queue_1 = __importDefault(require("p-queue"));
 const page_utils_1 = require("./page-utils");
 const mimetypes = __importStar(require("mime-types"));
+const node_crypto_1 = require("node:crypto");
 class PageQueue extends node_events_1.EventEmitter {
     queue;
     eventQueue;
@@ -166,6 +167,8 @@ class PageQueue extends node_events_1.EventEmitter {
                         }
                         this.pages.set(normalizedPath, reference.description);
                         initialPrompts.push({
+                            conversationId: (0, node_crypto_1.randomUUID)(),
+                            id: (0, node_crypto_1.randomUUID)(),
                             name: reference.name,
                             title: reference.title,
                             path: normalizedPath,
@@ -193,20 +196,21 @@ class PageQueue extends node_events_1.EventEmitter {
                         reason: 'reference',
                         created: Date.now(),
                         payload: {
+                            id: prompt.id,
+                            conversationId: prompt.conversationId,
                             name: prompt.name,
                             title: prompt.title,
                             filename: prompt.filename,
                             method: 'GET',
                             path: prompt.path,
                             prompt: prompt.description,
-                            conversationId: '',
                             content: '',
                             description: prompt.description,
                         },
                     });
                 }
                 // Trigger but don't wait for the "bonus" pages
-                this.addPrompt(prompt).catch((err) => {
+                this.addPrompt(prompt, prompt.conversationId).catch((err) => {
                     console.error('Failed to generate page reference', prompt.name, err);
                     this.emit('error', err);
                 });

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

@@ -287,6 +287,7 @@ export interface StormEventPhases {
     };
 }
 export interface Page {
+    id: string;
     name: string;
     filename: string;
     title: string;
@@ -329,6 +330,7 @@ export interface UserJourneyScreen {
     path: string;
     method: string;
     nextScreens: string[];
+    conversationId?: string;
 }
 export interface UserJourney {
     title: string;

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

@@ -357,11 +357,11 @@ router.post('/:handle/ui', async (req, res) => {
         let systemPrompt = aiRequest.prompt;
         userJourneysStream.on('data', (data) => {
             try {
-                sendEvent(res, data);
                 if (data.type === 'PROMPT_IMPROVE') {
                     systemPrompt = data.payload.prompt;
                 }
                 if (data.type !== 'USER_JOURNEY') {
+                    sendEvent(res, data);
                     return;
                 }
                 if (userJourneysStream.isAborted()) {
@@ -369,9 +369,11 @@ router.post('/:handle/ui', async (req, res) => {
                 }
                 data.payload.screens.forEach((screen) => {
                     if (!uniqueUserJourneyScreens[screen.name]) {
+                        screen.conversationId = (0, crypto_1.randomUUID)();
                         uniqueUserJourneyScreens[screen.name] = screen;
                     }
                 });
+                sendEvent(res, data);
             }
             catch (e) {
                 console.error('Failed to process event', e);
@@ -422,6 +424,9 @@ router.post('/:handle/ui', async (req, res) => {
             });
         }
         await waitForStormStream(userJourneysStream);
+        if (req.socket.closed) {
+            return;
+        }
         // Get the UI shells
         const shellsStream = await stormClient.createUIShells({
             theme: theme || undefined,
@@ -456,6 +461,9 @@ router.post('/:handle/ui', async (req, res) => {
             sendError(error, res);
         });
         await waitForStormStream(shellsStream);
+        if (req.socket.closed) {
+            return;
+        }
         UI_SERVERS[outerConversationId] = new UIServer_1.UIServer(outerConversationId);
         await UI_SERVERS[outerConversationId].start();
         sendEvent(res, {
@@ -470,7 +478,7 @@ router.post('/:handle/ui', async (req, res) => {
         onRequestAborted(req, res, () => {
             queue.cancel();
         });
-        queue.on('page', (screenData) => sendPageEvent(outerConversationId, screenData, res));
+        queue.on('page', (pageEvent) => sendPageEvent(outerConversationId, pageEvent, res));
         queue.on('event', (event) => {
             if (event.type === 'FILE_CHUNK') {
                 return;
@@ -493,7 +501,7 @@ router.post('/:handle/ui', async (req, res) => {
                 filename: screen.filename,
                 storage_prefix: outerConversationId + '_',
                 theme,
-            })
+            }, screen.conversationId)
                 .catch((e) => {
                 console.error('Failed to generate page for screen %s', screen.name, e);
                 sendError(e, res);

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

@@ -37,6 +37,7 @@ const node_events_1 = require("node:events");
 const p_queue_1 = __importDefault(require("p-queue"));
 const page_utils_1 = require("./page-utils");
 const mimetypes = __importStar(require("mime-types"));
+const node_crypto_1 = require("node:crypto");
 class PageQueue extends node_events_1.EventEmitter {
     queue;
     eventQueue;
@@ -166,6 +167,8 @@ class PageQueue extends node_events_1.EventEmitter {
                         }
                         this.pages.set(normalizedPath, reference.description);
                         initialPrompts.push({
+                            conversationId: (0, node_crypto_1.randomUUID)(),
+                            id: (0, node_crypto_1.randomUUID)(),
                             name: reference.name,
                             title: reference.title,
                             path: normalizedPath,
@@ -193,20 +196,21 @@ class PageQueue extends node_events_1.EventEmitter {
                         reason: 'reference',
                         created: Date.now(),
                         payload: {
+                            id: prompt.id,
+                            conversationId: prompt.conversationId,
                             name: prompt.name,
                             title: prompt.title,
                             filename: prompt.filename,
                             method: 'GET',
                             path: prompt.path,
                             prompt: prompt.description,
-                            conversationId: '',
                             content: '',
                             description: prompt.description,
                         },
                     });
                 }
                 // Trigger but don't wait for the "bonus" pages
-                this.addPrompt(prompt).catch((err) => {
+                this.addPrompt(prompt, prompt.conversationId).catch((err) => {
                     console.error('Failed to generate page reference', prompt.name, err);
                     this.emit('error', err);
                 });

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

@@ -287,6 +287,7 @@ export interface StormEventPhases {
     };
 }
 export interface Page {
+    id: string;
     name: string;
     filename: string;
     title: string;
@@ -329,6 +330,7 @@ export interface UserJourneyScreen {
     path: string;
     method: string;
     nextScreens: string[];
+    conversationId?: string;
 }
 export interface UserJourney {
     title: string;

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

@@ -357,11 +357,11 @@ router.post('/:handle/ui', async (req, res) => {
         let systemPrompt = aiRequest.prompt;
         userJourneysStream.on('data', (data) => {
             try {
-                sendEvent(res, data);
                 if (data.type === 'PROMPT_IMPROVE') {
                     systemPrompt = data.payload.prompt;
                 }
                 if (data.type !== 'USER_JOURNEY') {
+                    sendEvent(res, data);
                     return;
                 }
                 if (userJourneysStream.isAborted()) {
@@ -369,9 +369,11 @@ router.post('/:handle/ui', async (req, res) => {
                 }
                 data.payload.screens.forEach((screen) => {
                     if (!uniqueUserJourneyScreens[screen.name]) {
+                        screen.conversationId = (0, crypto_1.randomUUID)();
                         uniqueUserJourneyScreens[screen.name] = screen;
                     }
                 });
+                sendEvent(res, data);
             }
             catch (e) {
                 console.error('Failed to process event', e);
@@ -422,6 +424,9 @@ router.post('/:handle/ui', async (req, res) => {
             });
         }
         await waitForStormStream(userJourneysStream);
+        if (req.socket.closed) {
+            return;
+        }
         // Get the UI shells
         const shellsStream = await stormClient.createUIShells({
             theme: theme || undefined,
@@ -456,6 +461,9 @@ router.post('/:handle/ui', async (req, res) => {
             sendError(error, res);
         });
         await waitForStormStream(shellsStream);
+        if (req.socket.closed) {
+            return;
+        }
         UI_SERVERS[outerConversationId] = new UIServer_1.UIServer(outerConversationId);
         await UI_SERVERS[outerConversationId].start();
         sendEvent(res, {
@@ -470,7 +478,7 @@ router.post('/:handle/ui', async (req, res) => {
         onRequestAborted(req, res, () => {
             queue.cancel();
         });
-        queue.on('page', (screenData) => sendPageEvent(outerConversationId, screenData, res));
+        queue.on('page', (pageEvent) => sendPageEvent(outerConversationId, pageEvent, res));
         queue.on('event', (event) => {
             if (event.type === 'FILE_CHUNK') {
                 return;
@@ -493,7 +501,7 @@ router.post('/:handle/ui', async (req, res) => {
                 filename: screen.filename,
                 storage_prefix: outerConversationId + '_',
                 theme,
-            })
+            }, screen.conversationId)
                 .catch((e) => {
                 console.error('Failed to generate page for screen %s', screen.name, e);
                 sendError(e, res);

package/package.json

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

package/src/storm/PageGenerator.ts

@@ -11,6 +11,7 @@ import PQueue from 'p-queue';
 
 import { hasPageOnDisk, normalizePath, writeImageToDisk } from './page-utils';
 import * as mimetypes from 'mime-types';
+import { randomUUID } from 'node:crypto';
 
 export interface ImagePrompt {
     name: string;
@@ -22,7 +23,10 @@ export interface ImagePrompt {
     content: string;
 }
 
-type InitialPrompt = Omit<UIPagePrompt, 'shell_page'> & { shellType?: 'public' | 'admin' | 'user' };
+type InitialPrompt = Omit<UIPagePrompt, 'shell_page'> & {
+    shellType?: 'public' | 'admin' | 'user';
+};
+type PagePrompt = InitialPrompt & { conversationId: string; id: string };
 
 export class PageQueue extends EventEmitter {
     private readonly queue: PQueue;
@@ -149,7 +153,7 @@ export class PageQueue extends EventEmitter {
                     new RegExp(`^${path.replaceAll('/*', '/[^/]+')}$`).test(url)
                 );
             };
-            const initialPrompts: InitialPrompt[] = [];
+            const initialPrompts: PagePrompt[] = [];
             const resourcePromises = references.map(async (reference) => {
                 if (
                     reference.url.startsWith('#') ||
@@ -185,6 +189,8 @@ export class PageQueue extends EventEmitter {
                         this.pages.set(normalizedPath, reference.description);
 
                         initialPrompts.push({
+                            conversationId: randomUUID(),
+                            id: randomUUID(),
                             name: reference.name,
                             title: reference.title,
                             path: normalizedPath,
@@ -215,20 +221,21 @@ export class PageQueue extends EventEmitter {
                         reason: 'reference',
                         created: Date.now(),
                         payload: {
+                            id: prompt.id,
+                            conversationId: prompt.conversationId,
                             name: prompt.name,
                             title: prompt.title,
                             filename: prompt.filename,
                             method: 'GET',
                             path: prompt.path,
                             prompt: prompt.description,
-                            conversationId: '',
                             content: '',
                             description: prompt.description,
                         },
                     });
                 }
                 // Trigger but don't wait for the "bonus" pages
-                this.addPrompt(prompt).catch((err) => {
+                this.addPrompt(prompt, prompt.conversationId).catch((err) => {
                     console.error('Failed to generate page reference', prompt.name, err);
                     this.emit('error', err);
                 });

package/src/storm/events.ts

@@ -347,6 +347,7 @@ export interface StormEventPhases {
 }
 
 export interface Page {
+    id: string;
     name: string;
     filename: string;
     title: string;
@@ -394,6 +395,7 @@ export interface UserJourneyScreen {
     path: string;
     method: string;
     nextScreens: string[];
+    conversationId?: string;
 }
 
 export interface UserJourney {

package/src/storm/routes.ts

@@ -458,11 +458,11 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
 
         userJourneysStream.on('data', (data: StormEvent) => {
             try {
-                sendEvent(res, data);
                 if (data.type === 'PROMPT_IMPROVE') {
                     systemPrompt = data.payload.prompt;
                 }
                 if (data.type !== 'USER_JOURNEY') {
+                    sendEvent(res, data);
                     return;
                 }
 
@@ -472,9 +472,12 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
 
                 data.payload.screens.forEach((screen) => {
                     if (!uniqueUserJourneyScreens[screen.name]) {
+                        screen.conversationId = randomUUID();
                         uniqueUserJourneyScreens[screen.name] = screen;
                     }
                 });
+
+                sendEvent(res, data);
             } catch (e) {
                 console.error('Failed to process event', e);
             }
@@ -528,6 +531,10 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
 
         await waitForStormStream(userJourneysStream);
 
+        if (req.socket.closed) {
+            return;
+        }
+
         // Get the UI shells
         const shellsStream = await stormClient.createUIShells(
             {
@@ -574,6 +581,10 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
 
         await waitForStormStream(shellsStream);
 
+        if (req.socket.closed) {
+            return;
+        }
+
         UI_SERVERS[outerConversationId] = new UIServer(outerConversationId);
         await UI_SERVERS[outerConversationId].start();
 
@@ -591,7 +602,7 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
             queue.cancel();
         });
 
-        queue.on('page', (screenData: StormEventPage) => sendPageEvent(outerConversationId, screenData, res));
+        queue.on('page', (pageEvent: StormEventPage) => sendPageEvent(outerConversationId, pageEvent, res));
 
         queue.on('event', (event: StormEvent) => {
             if (event.type === 'FILE_CHUNK') {
@@ -607,17 +618,20 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
 
         for (const screen of Object.values(uniqueUserJourneyScreens)) {
             queue
-                .addPrompt({
-                    prompt: screen.requirements,
-                    method: screen.method,
-                    path: screen.path,
-                    description: screen.requirements,
-                    name: screen.name,
-                    title: screen.title,
-                    filename: screen.filename,
-                    storage_prefix: outerConversationId + '_',
-                    theme,
-                })
+                .addPrompt(
+                    {
+                        prompt: screen.requirements,
+                        method: screen.method,
+                        path: screen.path,
+                        description: screen.requirements,
+                        name: screen.name,
+                        title: screen.title,
+                        filename: screen.filename,
+                        storage_prefix: outerConversationId + '_',
+                        theme,
+                    },
+                    screen.conversationId
+                )
                 .catch((e) => {
                     console.error('Failed to generate page for screen %s', screen.name, e);
                     sendError(e as any, res);