@kapeta/local-cluster-service 0.70.0 → 0.70.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [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)
+
+
+### 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)
 
 

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

@@ -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,
@@ -179,8 +186,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/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

@@ -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,
@@ -179,8 +186,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/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.0",
+    "version": "0.70.2",
     "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,
@@ -220,8 +227,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/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;
             }
         });