@kapeta/local-cluster-service 0.69.0 → 0.70.1

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [0.70.1](https://github.com/kapetacom/local-cluster-service/compare/v0.70.0...v0.70.1) (2024-09-09)
+
+
+### Bug Fixes
+
+* filenames and lazier generation for refs ([#235](https://github.com/kapetacom/local-cluster-service/issues/235)) ([02c5589](https://github.com/kapetacom/local-cluster-service/commit/02c55895c4ae3ed5632f4b53f33509ec18c87dcb))
+
+# [0.70.0](https://github.com/kapetacom/local-cluster-service/compare/v0.69.0...v0.70.0) (2024-09-04)
+
+
+### Features
+
+* add "serve" endpoint to resume a UI conversation server ([a2eadb2](https://github.com/kapetacom/local-cluster-service/commit/a2eadb25298d0d59aaf47202eba0fc911ba5e2f8))
+* change endpoint to end conversation to same format as resume ([6161e5c](https://github.com/kapetacom/local-cluster-service/commit/6161e5ce2fda1261bb26abd6a608ea9e41d46099))
+
 # [0.69.0](https://github.com/kapetacom/local-cluster-service/compare/v0.68.0...v0.69.0) (2024-09-03)
 
 

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

@@ -103,6 +103,9 @@ class PageQueue extends node_events_1.EventEmitter {
         generator.on('event', (event) => this.emit('event', event));
         generator.on('page_refs', async ({ event, references }) => {
             try {
+                const matchesExistingPages = (url) => {
+                    return [...this.pages.keys()].some((path) => new RegExp(path.replaceAll('/*', '/[^/]+')).test(url));
+                };
                 const initialPrompts = [];
                 const resourcePromises = references.map(async (reference) => {
                     if (reference.url.startsWith('#') ||
@@ -124,6 +127,9 @@ class PageQueue extends node_events_1.EventEmitter {
                             break;
                         case 'html':
                             //console.log('Adding page generator for', reference);
+                            if (matchesExistingPages(reference.url)) {
+                                break;
+                            }
                             this.pages.set(reference.url, reference.description);
                             initialPrompts.push({
                                 name: reference.name,
@@ -134,7 +140,8 @@ class PageQueue extends node_events_1.EventEmitter {
                                 prompt: `Implement a page for ${reference.name} at ${reference.url} with the following description: ${reference.description}.\n` +
                                     `The page was referenced from this page: \n### PATH: ${event.payload.path}\n\`\`\`html\n${event.payload.content}\n\`\`\`\n`,
                                 description: reference.description,
-                                filename: '',
+                                // Only used for matching
+                                filename: reference.name + '.ref.html',
                                 theme: this.theme,
                             });
                             break;
@@ -153,7 +160,7 @@ class PageQueue extends node_events_1.EventEmitter {
                             payload: {
                                 name: prompt.name,
                                 title: prompt.title,
-                                filename: '',
+                                filename: prompt.filename,
                                 method: 'GET',
                                 path: prompt.path,
                                 prompt: prompt.description,

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

@@ -1,9 +1,11 @@
 import { StormEventPage } from './events';
 export declare class UIServer {
     private readonly systemId;
-    private port;
     private server;
+    private port;
     constructor(systemId: string);
+    isRunning(): boolean;
+    getUrl(): string;
     start(): Promise<void>;
     close(): void;
     resolveUrl(screenData: StormEventPage): string;

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

@@ -15,11 +15,17 @@ const http_1 = require("http");
 const path_1 = require("path");
 class UIServer {
     systemId;
-    port = 50000;
     server;
+    port = 50000;
     constructor(systemId) {
         this.systemId = systemId;
     }
+    isRunning() {
+        return !!this.server;
+    }
+    getUrl() {
+        return `http://localhost:${this.port}`;
+    }
     async start() {
         const app = (0, express_1.default)();
         app.get('/_reset', (req, res) => {

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

@@ -50,7 +50,7 @@ function convertPageEvent(screenData, innerConversationId, mainConversationId) {
                 description: screenData.payload.description,
                 prompt: screenData.payload.prompt,
                 path: screenData.payload.path,
-                url: server && screenData.payload.content ? server.resolveUrl(screenData) : '',
+                url: screenData.payload.content ? screenData.payload.path : '',
                 method: screenData.payload.method,
                 conversationId: innerConversationId,
             },
@@ -58,8 +58,17 @@ function convertPageEvent(screenData, innerConversationId, mainConversationId) {
     }
     return screenData;
 }
-router.all('/ui/:systemId/serve/:method/*', async (req, res) => {
-    (0, page_utils_1.readPageFromDisk)(req.params.systemId, req.params[0], req.params.method, res);
+router.post('/ui/serve/:systemId', async (req, res) => {
+    const systemId = req.params.systemId;
+    if (!systemId) {
+        res.status(404).send({ error: 'Missing "systemId" in URL' });
+        return;
+    }
+    const svr = (UI_SERVERS[systemId] = UI_SERVERS[systemId] || new UIServer_1.UIServer(systemId));
+    if (!svr.isRunning()) {
+        await UI_SERVERS[systemId].start();
+    }
+    res.status(200).send({ status: 'running', url: svr.getUrl() });
 });
 router.post('/ui/create-system/:systemId', async (req, res) => {
     const systemId = req.params.systemId;
@@ -75,6 +84,19 @@ router.post('/ui/create-system/:systemId', async (req, res) => {
     res.end();
     return;
 });
+router.delete('/ui/serve/:systemId', async (req, res) => {
+    const systemId = req.params.systemId;
+    if (!systemId) {
+        res.status(404).send({ error: 'Missing "systemId" in URL' });
+        return;
+    }
+    const server = UI_SERVERS[systemId];
+    if (server) {
+        server.close();
+        delete UI_SERVERS[systemId];
+    }
+    res.status(200).json({ status: 'ok' });
+});
 router.post('/ui/screen', async (req, res) => {
     try {
         const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
@@ -117,19 +139,6 @@ router.post('/ui/screen', async (req, res) => {
         }
     }
 });
-router.delete('/:handle/ui', async (req, res) => {
-    const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
-    if (!conversationId) {
-        res.status(400).send('Missing conversation id');
-        return;
-    }
-    const server = UI_SERVERS[conversationId];
-    if (server) {
-        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;
     try {

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

@@ -103,6 +103,9 @@ class PageQueue extends node_events_1.EventEmitter {
         generator.on('event', (event) => this.emit('event', event));
         generator.on('page_refs', async ({ event, references }) => {
             try {
+                const matchesExistingPages = (url) => {
+                    return [...this.pages.keys()].some((path) => new RegExp(path.replaceAll('/*', '/[^/]+')).test(url));
+                };
                 const initialPrompts = [];
                 const resourcePromises = references.map(async (reference) => {
                     if (reference.url.startsWith('#') ||
@@ -124,6 +127,9 @@ class PageQueue extends node_events_1.EventEmitter {
                             break;
                         case 'html':
                             //console.log('Adding page generator for', reference);
+                            if (matchesExistingPages(reference.url)) {
+                                break;
+                            }
                             this.pages.set(reference.url, reference.description);
                             initialPrompts.push({
                                 name: reference.name,
@@ -134,7 +140,8 @@ class PageQueue extends node_events_1.EventEmitter {
                                 prompt: `Implement a page for ${reference.name} at ${reference.url} with the following description: ${reference.description}.\n` +
                                     `The page was referenced from this page: \n### PATH: ${event.payload.path}\n\`\`\`html\n${event.payload.content}\n\`\`\`\n`,
                                 description: reference.description,
-                                filename: '',
+                                // Only used for matching
+                                filename: reference.name + '.ref.html',
                                 theme: this.theme,
                             });
                             break;
@@ -153,7 +160,7 @@ class PageQueue extends node_events_1.EventEmitter {
                             payload: {
                                 name: prompt.name,
                                 title: prompt.title,
-                                filename: '',
+                                filename: prompt.filename,
                                 method: 'GET',
                                 path: prompt.path,
                                 prompt: prompt.description,

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

@@ -1,9 +1,11 @@
 import { StormEventPage } from './events';
 export declare class UIServer {
     private readonly systemId;
-    private port;
     private server;
+    private port;
     constructor(systemId: string);
+    isRunning(): boolean;
+    getUrl(): string;
     start(): Promise<void>;
     close(): void;
     resolveUrl(screenData: StormEventPage): string;

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

@@ -15,11 +15,17 @@ const http_1 = require("http");
 const path_1 = require("path");
 class UIServer {
     systemId;
-    port = 50000;
     server;
+    port = 50000;
     constructor(systemId) {
         this.systemId = systemId;
     }
+    isRunning() {
+        return !!this.server;
+    }
+    getUrl() {
+        return `http://localhost:${this.port}`;
+    }
     async start() {
         const app = (0, express_1.default)();
         app.get('/_reset', (req, res) => {

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

@@ -50,7 +50,7 @@ function convertPageEvent(screenData, innerConversationId, mainConversationId) {
                 description: screenData.payload.description,
                 prompt: screenData.payload.prompt,
                 path: screenData.payload.path,
-                url: server && screenData.payload.content ? server.resolveUrl(screenData) : '',
+                url: screenData.payload.content ? screenData.payload.path : '',
                 method: screenData.payload.method,
                 conversationId: innerConversationId,
             },
@@ -58,8 +58,17 @@ function convertPageEvent(screenData, innerConversationId, mainConversationId) {
     }
     return screenData;
 }
-router.all('/ui/:systemId/serve/:method/*', async (req, res) => {
-    (0, page_utils_1.readPageFromDisk)(req.params.systemId, req.params[0], req.params.method, res);
+router.post('/ui/serve/:systemId', async (req, res) => {
+    const systemId = req.params.systemId;
+    if (!systemId) {
+        res.status(404).send({ error: 'Missing "systemId" in URL' });
+        return;
+    }
+    const svr = (UI_SERVERS[systemId] = UI_SERVERS[systemId] || new UIServer_1.UIServer(systemId));
+    if (!svr.isRunning()) {
+        await UI_SERVERS[systemId].start();
+    }
+    res.status(200).send({ status: 'running', url: svr.getUrl() });
 });
 router.post('/ui/create-system/:systemId', async (req, res) => {
     const systemId = req.params.systemId;
@@ -75,6 +84,19 @@ router.post('/ui/create-system/:systemId', async (req, res) => {
     res.end();
     return;
 });
+router.delete('/ui/serve/:systemId', async (req, res) => {
+    const systemId = req.params.systemId;
+    if (!systemId) {
+        res.status(404).send({ error: 'Missing "systemId" in URL' });
+        return;
+    }
+    const server = UI_SERVERS[systemId];
+    if (server) {
+        server.close();
+        delete UI_SERVERS[systemId];
+    }
+    res.status(200).json({ status: 'ok' });
+});
 router.post('/ui/screen', async (req, res) => {
     try {
         const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
@@ -117,19 +139,6 @@ router.post('/ui/screen', async (req, res) => {
         }
     }
 });
-router.delete('/:handle/ui', async (req, res) => {
-    const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
-    if (!conversationId) {
-        res.status(400).send('Missing conversation id');
-        return;
-    }
-    const server = UI_SERVERS[conversationId];
-    if (server) {
-        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;
     try {

package/package.json

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

package/src/storm/PageGenerator.ts

@@ -136,6 +136,9 @@ export class PageQueue extends EventEmitter {
         generator.on('event', (event: StormEvent) => this.emit('event', event));
         generator.on('page_refs', async ({ event, references }) => {
             try {
+                const matchesExistingPages = (url: string) => {
+                    return [...this.pages.keys()].some((path) => new RegExp(path.replaceAll('/*', '/[^/]+')).test(url));
+                };
                 const initialPrompts: InitialPrompt[] = [];
                 const resourcePromises = references.map(async (reference) => {
                     if (
@@ -160,6 +163,9 @@ export class PageQueue extends EventEmitter {
                             break;
                         case 'html':
                             //console.log('Adding page generator for', reference);
+                            if (matchesExistingPages(reference.url)) {
+                                break;
+                            }
                             this.pages.set(reference.url, reference.description);
 
                             initialPrompts.push({
@@ -172,7 +178,8 @@ export class PageQueue extends EventEmitter {
                                     `Implement a page for ${reference.name} at ${reference.url} with the following description: ${reference.description}.\n` +
                                     `The page was referenced from this page: \n### PATH: ${event.payload.path}\n\`\`\`html\n${event.payload.content}\n\`\`\`\n`,
                                 description: reference.description,
-                                filename: '',
+                                // Only used for matching
+                                filename: reference.name + '.ref.html',
                                 theme: this.theme,
                             });
                             break;
@@ -193,7 +200,7 @@ export class PageQueue extends EventEmitter {
                             payload: {
                                 name: prompt.name,
                                 title: prompt.title,
-                                filename: '',
+                                filename: prompt.filename,
                                 method: 'GET',
                                 path: prompt.path,
                                 prompt: prompt.description,

package/src/storm/UIServer.ts

@@ -12,13 +12,21 @@ import { join } from 'path';
 export class UIServer {
     private readonly systemId: string;
 
-    private port: number = 50000;
     private server: Server | undefined;
+    private port: number = 50000;
 
     constructor(systemId: string) {
         this.systemId = systemId;
     }
 
+    public isRunning() {
+        return !!this.server;
+    }
+
+    public getUrl() {
+        return `http://localhost:${this.port}`;
+    }
+
     public async start() {
         const app = express();
         app.get('/_reset', (req: Request, res: Response) => {

package/src/storm/routes.ts

@@ -35,7 +35,15 @@ import {
 import { StormCodegen } from './codegen';
 import { assetManager } from '../assetManager';
 import uuid from 'node-uuid';
-import { getSystemBaseDir, readPageFromDisk, resolveReadPath, SystemIdHeader, writeAssetToDisk, writeImageToDisk, writePageToDisk } from './page-utils';
+import {
+    getSystemBaseDir,
+    readPageFromDisk,
+    resolveReadPath,
+    SystemIdHeader,
+    writeAssetToDisk,
+    writeImageToDisk,
+    writePageToDisk,
+} from './page-utils';
 import { UIServer } from './UIServer';
 import { randomUUID } from 'crypto';
 import { ImagePrompt, PageQueue } from './PageGenerator';
@@ -69,7 +77,7 @@ function convertPageEvent(screenData: StormEvent, innerConversationId: string, m
                 description: screenData.payload.description,
                 prompt: screenData.payload.prompt,
                 path: screenData.payload.path,
-                url: server && screenData.payload.content ? server.resolveUrl(screenData) : '',
+                url: screenData.payload.content ? screenData.payload.path : '',
                 method: screenData.payload.method,
                 conversationId: innerConversationId,
             },
@@ -79,8 +87,19 @@ function convertPageEvent(screenData: StormEvent, innerConversationId: string, m
     return screenData;
 }
 
-router.all('/ui/:systemId/serve/:method/*', async (req: KapetaBodyRequest, res: Response) => {
-    readPageFromDisk(req.params.systemId, req.params[0], req.params.method, res);
+router.post('/ui/serve/:systemId', async (req: KapetaBodyRequest, res: Response) => {
+    const systemId = req.params.systemId as string | undefined;
+    if (!systemId) {
+        res.status(404).send({ error: 'Missing "systemId" in URL' });
+        return;
+    }
+
+    const svr = (UI_SERVERS[systemId] = UI_SERVERS[systemId] || new UIServer(systemId));
+    if (!svr.isRunning()) {
+        await UI_SERVERS[systemId].start();
+    }
+
+    res.status(200).send({ status: 'running', url: svr.getUrl() });
 });
 
 router.post('/ui/create-system/:systemId', async (req: KapetaBodyRequest, res: Response) => {
@@ -100,7 +119,20 @@ router.post('/ui/create-system/:systemId', async (req: KapetaBodyRequest, res: R
     return;
 });
 
+router.delete('/ui/serve/:systemId', async (req: KapetaBodyRequest, res: Response) => {
+    const systemId = req.params.systemId as string | undefined;
+    if (!systemId) {
+        res.status(404).send({ error: 'Missing "systemId" in URL' });
+        return;
+    }
 
+    const server = UI_SERVERS[systemId];
+    if (server) {
+        server.close();
+        delete UI_SERVERS[systemId];
+    }
+    res.status(200).json({ status: 'ok' });
+});
 
 router.post('/ui/screen', async (req: KapetaBodyRequest, res: Response) => {
     try {
@@ -152,21 +184,6 @@ router.post('/ui/screen', async (req: KapetaBodyRequest, res: Response) => {
     }
 });
 
-router.delete('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
-    const conversationId = req.headers[ConversationIdHeader.toLowerCase()] as string | undefined;
-    if (!conversationId) {
-        res.status(400).send('Missing conversation id');
-        return;
-    }
-
-    const server = UI_SERVERS[conversationId];
-    if (server) {
-        server.close();
-        delete UI_SERVERS[conversationId];
-    }
-    res.status(200).json({ status: 'ok' });
-});
-
 router.post('/:handle/ui/iterative', async (req: KapetaBodyRequest, res: Response) => {
     const handle = req.params.handle as string;
     try {