@kapeta/local-cluster-service 0.70.1 → 0.70.3

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [0.70.3](https://github.com/kapetacom/local-cluster-service/compare/v0.70.2...v0.70.3) (2024-09-10)
+
+
+### Bug Fixes
+
+* better dedupe of refs ([48f676e](https://github.com/kapetacom/local-cluster-service/commit/48f676e0f6780580c2b77cdb8e6f3336f6633e77))
+* match full pattern in lazy check ([5b5e9d7](https://github.com/kapetacom/local-cluster-service/commit/5b5e9d7cfaf3e6e9b3eacf378e90362e99433d86))
+
+## [0.70.2](https://github.com/kapetacom/local-cluster-service/compare/v0.70.1...v0.70.2) (2024-09-09)
+
+
+### Bug Fixes
+
+* Wait for last ([#237](https://github.com/kapetacom/local-cluster-service/issues/237)) ([071bf9e](https://github.com/kapetacom/local-cluster-service/commit/071bf9ea19cb5d5393d7f895c2131311b38325b6))
+
 ## [0.70.1](https://github.com/kapetacom/local-cluster-service/compare/v0.70.0...v0.70.1) (2024-09-09)
 
 

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

@@ -44,6 +44,7 @@ export declare class PageQueue extends EventEmitter {
     private addPageGenerator;
     cancel(): void;
     wait(): Promise<void>;
+    get length(): number;
     private addImagePrompt;
 }
 export declare class PageGenerator extends EventEmitter {

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

@@ -104,7 +104,7 @@ class PageQueue extends node_events_1.EventEmitter {
         generator.on('page_refs', async ({ event, references }) => {
             try {
                 const matchesExistingPages = (url) => {
-                    return [...this.pages.keys()].some((path) => new RegExp(path.replaceAll('/*', '/[^/]+')).test(url));
+                    return [...this.pages.keys()].some((path) => new RegExp(`^${path.replaceAll('/*', '/[^/]+')}$`).test(url.replace(/\?.*$/gi, '')));
                 };
                 const initialPrompts = [];
                 const resourcePromises = references.map(async (reference) => {
@@ -125,16 +125,16 @@ class PageQueue extends node_events_1.EventEmitter {
                         case 'javascript':
                             //console.log('Ignoring reference', reference);
                             break;
-                        case 'html':
-                            //console.log('Adding page generator for', reference);
-                            if (matchesExistingPages(reference.url)) {
+                        case 'html': {
+                            const normalizedPath = (0, page_utils_1.normalizePath)(reference.url);
+                            if (matchesExistingPages(normalizedPath)) {
                                 break;
                             }
-                            this.pages.set(reference.url, reference.description);
+                            this.pages.set(normalizedPath, reference.description);
                             initialPrompts.push({
                                 name: reference.name,
                                 title: reference.title,
-                                path: reference.url,
+                                path: normalizedPath,
                                 method: 'GET',
                                 storage_prefix: this.systemId + '_',
                                 prompt: `Implement a page for ${reference.name} at ${reference.url} with the following description: ${reference.description}.\n` +
@@ -145,6 +145,7 @@ class PageQueue extends node_events_1.EventEmitter {
                                 theme: this.theme,
                             });
                             break;
+                        }
                     }
                 });
                 // Wait for resources to be generated
@@ -186,8 +187,13 @@ class PageQueue extends node_events_1.EventEmitter {
         this.eventQueue.cancel();
     }
     async wait() {
-        await this.eventQueue.wait();
-        await this.queue.wait();
+        while (!this.eventQueue.empty || !this.queue.empty) {
+            await this.eventQueue.wait();
+            await this.queue.wait();
+        }
+    }
+    get length() {
+        return this.queue.length + this.eventQueue.length;
     }
     async addImagePrompt(prompt) {
         if (this.images.has(prompt.url)) {

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

@@ -20,4 +20,6 @@ export declare class PromiseQueue {
     private next;
     cancel(): void;
     wait(): Promise<void>;
+    get empty(): boolean;
+    get length(): number;
 }

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

@@ -83,8 +83,15 @@ class PromiseQueue {
     }
     async wait() {
         while (this.queue.length > 0 || this.active.length > 0) {
-            await Promise.all(this.active);
+            await Promise.allSettled(this.active);
+            this.next();
         }
     }
+    get empty() {
+        return this.queue.length === 0 && this.active.length === 0;
+    }
+    get length() {
+        return this.queue.length + this.active.length;
+    }
 }
 exports.PromiseQueue = PromiseQueue;

package/dist/cjs/src/storm/page-utils.d.ts

@@ -7,6 +7,7 @@ import { Response } from 'express';
 import { ConversationItem } from './stream';
 import { ImagePrompt } from './PageGenerator';
 export declare const SystemIdHeader = "System-Id";
+export declare function normalizePath(path: string): string;
 export declare function writePageToDisk(systemId: string, event: StormEventPage): Promise<{
     path: string;
 }>;

package/dist/cjs/src/storm/page-utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeConversationToFile = exports.readConversationFromFile = exports.readPageFromDisk = exports.readPageFromDiskAsString = exports.resolveReadPath = exports.getSystemBaseDir = exports.hasPageOnDisk = exports.writeImageToDisk = exports.writeAssetToDisk = exports.writePageToDisk = exports.SystemIdHeader = void 0;
+exports.writeConversationToFile = exports.readConversationFromFile = exports.readPageFromDisk = exports.readPageFromDiskAsString = exports.resolveReadPath = exports.getSystemBaseDir = exports.hasPageOnDisk = exports.writeImageToDisk = exports.writeAssetToDisk = exports.writePageToDisk = exports.normalizePath = exports.SystemIdHeader = void 0;
 const node_os_1 = __importDefault(require("node:os"));
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -14,6 +14,7 @@ function normalizePath(path) {
         .replace(/:[a-z][a-z_]*\b/gi, '*')
         .replace(/\{[a-z-.]+}/gi, '*');
 }
+exports.normalizePath = normalizePath;
 async function writePageToDisk(systemId, event) {
     const baseDir = getSystemBaseDir(systemId);
     const filePath = getFilePath(event.payload.method);

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

@@ -420,7 +420,9 @@ router.post('/ui/edit', async (req, res) => {
         const promises = [];
         queue.on('page', (data) => {
             if (systemId) {
-                promises.push(sendPageEvent(systemId, data, res));
+                const promise = sendPageEvent(systemId, data, res);
+                promises.push(promise);
+                return promise;
             }
         });
         queue.on('event', (data) => {

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

@@ -44,6 +44,7 @@ export declare class PageQueue extends EventEmitter {
     private addPageGenerator;
     cancel(): void;
     wait(): Promise<void>;
+    get length(): number;
     private addImagePrompt;
 }
 export declare class PageGenerator extends EventEmitter {

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

@@ -104,7 +104,7 @@ class PageQueue extends node_events_1.EventEmitter {
         generator.on('page_refs', async ({ event, references }) => {
             try {
                 const matchesExistingPages = (url) => {
-                    return [...this.pages.keys()].some((path) => new RegExp(path.replaceAll('/*', '/[^/]+')).test(url));
+                    return [...this.pages.keys()].some((path) => new RegExp(`^${path.replaceAll('/*', '/[^/]+')}$`).test(url.replace(/\?.*$/gi, '')));
                 };
                 const initialPrompts = [];
                 const resourcePromises = references.map(async (reference) => {
@@ -125,16 +125,16 @@ class PageQueue extends node_events_1.EventEmitter {
                         case 'javascript':
                             //console.log('Ignoring reference', reference);
                             break;
-                        case 'html':
-                            //console.log('Adding page generator for', reference);
-                            if (matchesExistingPages(reference.url)) {
+                        case 'html': {
+                            const normalizedPath = (0, page_utils_1.normalizePath)(reference.url);
+                            if (matchesExistingPages(normalizedPath)) {
                                 break;
                             }
-                            this.pages.set(reference.url, reference.description);
+                            this.pages.set(normalizedPath, reference.description);
                             initialPrompts.push({
                                 name: reference.name,
                                 title: reference.title,
-                                path: reference.url,
+                                path: normalizedPath,
                                 method: 'GET',
                                 storage_prefix: this.systemId + '_',
                                 prompt: `Implement a page for ${reference.name} at ${reference.url} with the following description: ${reference.description}.\n` +
@@ -145,6 +145,7 @@ class PageQueue extends node_events_1.EventEmitter {
                                 theme: this.theme,
                             });
                             break;
+                        }
                     }
                 });
                 // Wait for resources to be generated
@@ -186,8 +187,13 @@ class PageQueue extends node_events_1.EventEmitter {
         this.eventQueue.cancel();
     }
     async wait() {
-        await this.eventQueue.wait();
-        await this.queue.wait();
+        while (!this.eventQueue.empty || !this.queue.empty) {
+            await this.eventQueue.wait();
+            await this.queue.wait();
+        }
+    }
+    get length() {
+        return this.queue.length + this.eventQueue.length;
     }
     async addImagePrompt(prompt) {
         if (this.images.has(prompt.url)) {

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

@@ -20,4 +20,6 @@ export declare class PromiseQueue {
     private next;
     cancel(): void;
     wait(): Promise<void>;
+    get empty(): boolean;
+    get length(): number;
 }

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

@@ -83,8 +83,15 @@ class PromiseQueue {
     }
     async wait() {
         while (this.queue.length > 0 || this.active.length > 0) {
-            await Promise.all(this.active);
+            await Promise.allSettled(this.active);
+            this.next();
         }
     }
+    get empty() {
+        return this.queue.length === 0 && this.active.length === 0;
+    }
+    get length() {
+        return this.queue.length + this.active.length;
+    }
 }
 exports.PromiseQueue = PromiseQueue;

package/dist/esm/src/storm/page-utils.d.ts

@@ -7,6 +7,7 @@ import { Response } from 'express';
 import { ConversationItem } from './stream';
 import { ImagePrompt } from './PageGenerator';
 export declare const SystemIdHeader = "System-Id";
+export declare function normalizePath(path: string): string;
 export declare function writePageToDisk(systemId: string, event: StormEventPage): Promise<{
     path: string;
 }>;

package/dist/esm/src/storm/page-utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeConversationToFile = exports.readConversationFromFile = exports.readPageFromDisk = exports.readPageFromDiskAsString = exports.resolveReadPath = exports.getSystemBaseDir = exports.hasPageOnDisk = exports.writeImageToDisk = exports.writeAssetToDisk = exports.writePageToDisk = exports.SystemIdHeader = void 0;
+exports.writeConversationToFile = exports.readConversationFromFile = exports.readPageFromDisk = exports.readPageFromDiskAsString = exports.resolveReadPath = exports.getSystemBaseDir = exports.hasPageOnDisk = exports.writeImageToDisk = exports.writeAssetToDisk = exports.writePageToDisk = exports.normalizePath = exports.SystemIdHeader = void 0;
 const node_os_1 = __importDefault(require("node:os"));
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -14,6 +14,7 @@ function normalizePath(path) {
         .replace(/:[a-z][a-z_]*\b/gi, '*')
         .replace(/\{[a-z-.]+}/gi, '*');
 }
+exports.normalizePath = normalizePath;
 async function writePageToDisk(systemId, event) {
     const baseDir = getSystemBaseDir(systemId);
     const filePath = getFilePath(event.payload.method);

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

@@ -420,7 +420,9 @@ router.post('/ui/edit', async (req, res) => {
         const promises = [];
         queue.on('page', (data) => {
             if (systemId) {
-                promises.push(sendPageEvent(systemId, data, res));
+                const promise = sendPageEvent(systemId, data, res);
+                promises.push(promise);
+                return promise;
             }
         });
         queue.on('event', (data) => {

package/package.json

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

package/src/storm/PageGenerator.ts

@@ -8,7 +8,7 @@ import { stormClient, UIPagePrompt } from './stormClient';
 import { ReferenceClassification, StormEvent, StormEventPage, StormImage, UIShell } from './events';
 import { EventEmitter } from 'node:events';
 import { PromiseQueue } from './PromiseQueue';
-import { hasPageOnDisk } from './page-utils';
+import { hasPageOnDisk, normalizePath } from './page-utils';
 
 export interface ImagePrompt {
     name: string;
@@ -137,7 +137,9 @@ export class PageQueue extends EventEmitter {
         generator.on('page_refs', async ({ event, references }) => {
             try {
                 const matchesExistingPages = (url: string) => {
-                    return [...this.pages.keys()].some((path) => new RegExp(path.replaceAll('/*', '/[^/]+')).test(url));
+                    return [...this.pages.keys()].some((path) =>
+                        new RegExp(`^${path.replaceAll('/*', '/[^/]+')}$`).test(url.replace(/\?.*$/gi, ''))
+                    );
                 };
                 const initialPrompts: InitialPrompt[] = [];
                 const resourcePromises = references.map(async (reference) => {
@@ -161,17 +163,17 @@ export class PageQueue extends EventEmitter {
                         case 'javascript':
                             //console.log('Ignoring reference', reference);
                             break;
-                        case 'html':
-                            //console.log('Adding page generator for', reference);
-                            if (matchesExistingPages(reference.url)) {
+                        case 'html': {
+                            const normalizedPath = normalizePath(reference.url);
+                            if (matchesExistingPages(normalizedPath)) {
                                 break;
                             }
-                            this.pages.set(reference.url, reference.description);
+                            this.pages.set(normalizedPath, reference.description);
 
                             initialPrompts.push({
                                 name: reference.name,
                                 title: reference.title,
-                                path: reference.url,
+                                path: normalizedPath,
                                 method: 'GET',
                                 storage_prefix: this.systemId + '_',
                                 prompt:
@@ -183,6 +185,7 @@ export class PageQueue extends EventEmitter {
                                 theme: this.theme,
                             });
                             break;
+                        }
                     }
                 });
 
@@ -227,8 +230,14 @@ export class PageQueue extends EventEmitter {
     }
 
     public async wait() {
-        await this.eventQueue.wait();
-        await this.queue.wait();
+        while (!this.eventQueue.empty || !this.queue.empty) {
+            await this.eventQueue.wait();
+            await this.queue.wait();
+        }
+    }
+
+    public get length() {
+        return this.queue.length + this.eventQueue.length;
     }
 
     private async addImagePrompt(prompt: ImagePrompt) {

package/src/storm/PromiseQueue.ts

@@ -114,7 +114,16 @@ export class PromiseQueue {
 
     public async wait() {
         while (this.queue.length > 0 || this.active.length > 0) {
-            await Promise.all(this.active);
+            await Promise.allSettled(this.active);
+            this.next();
         }
     }
+
+    public get empty() {
+        return this.queue.length === 0 && this.active.length === 0;
+    }
+
+    public get length() {
+        return this.queue.length + this.active.length;
+    }
 }

package/src/storm/page-utils.ts

@@ -15,7 +15,7 @@ import { ImagePrompt } from './PageGenerator';
 
 export const SystemIdHeader = 'System-Id';
 
-function normalizePath(path: string) {
+export function normalizePath(path: string) {
     return path
         .replace(/\?.*$/gi, '')
         .replace(/:[a-z][a-z_]*\b/gi, '*')

package/src/storm/routes.ts

@@ -519,7 +519,9 @@ router.post('/ui/edit', async (req: KapetaBodyRequest, res: Response) => {
 
         queue.on('page', (data) => {
             if (systemId) {
-                promises.push(sendPageEvent(systemId, data, res));
+                const promise = sendPageEvent(systemId, data, res);
+                promises.push(promise);
+                return promise;
             }
         });