@kapeta/local-cluster-service 0.53.3 → 0.53.5

package/src/storm/event-parser.ts

@@ -26,7 +26,7 @@ import {
     DSLAPIParser,
     DSLController,
     DSLConverters,
-    DSLDataTypeParser,
+    DSLDataTypeParser, DSLEntityType,
     DSLMethod,
     DSLParser,
     KAPLANG_ID,
@@ -324,6 +324,17 @@ export class StormEventParser {
                 evt.payload.toBlockId = StormEventParser.toInstanceId(handle, evt.payload.toComponent);
                 this.connections.push(evt.payload);
                 break;
+            case 'API_RETRY':
+                Object.values(this.blocks).forEach((block) => {
+                    block.types = [];
+                    block.apis = [];
+                });
+                break;
+            case 'MODEL_RETRY':
+                Object.values(this.blocks).forEach((block) => {
+                    block.models = [];
+                });
+                break;
         }
 
         return this.toResult(handle);
@@ -526,7 +537,7 @@ export class StormEventParser {
 
             const blockSpec = blockDefinitionInfo.content.spec;
 
-            let apiResource: Resource | undefined = undefined;
+            const apiResources: { [key: string]: Resource | undefined } = {};
             let dbResource: Resource | undefined = undefined;
 
             blockInfo.resources.forEach((resource) => {
@@ -535,10 +546,7 @@ export class StormEventParser {
                 };
                 switch (resource.type) {
                     case 'API':
-                        if (apiResource) {
-                            break;
-                        }
-                        apiResource = {
+                        const apiResource = {
                             kind: this.toResourceKind(resource.type),
                             metadata: {
                                 name: resource.name,
@@ -554,6 +562,7 @@ export class StormEventParser {
                                 } satisfies SourceCode,
                             },
                         };
+                        apiResources[resource.name] = apiResource;
                         blockSpec.providers!.push(apiResource);
                         break;
                     case 'CLIENT':
@@ -635,11 +644,30 @@ export class StormEventParser {
                 }
             });
 
-            if (apiResource) {
-                blockInfo.apis.forEach((api) => {
-                    apiResource!.spec.source.value += api + '\n\n';
-                });
-            }
+            blockInfo.apis.forEach((api) => {
+                const dslApi = DSLAPIParser.parse(api, {
+                    ignoreSemantics: true,
+                }) as (DSLMethod | DSLController)[];
+
+                let exactMatch = false;
+                if (dslApi[0] && dslApi[0].type == DSLEntityType.CONTROLLER) {
+                    const name = dslApi[0].name.toLowerCase();
+                    const apiResourceName = Object.keys(apiResources).find((key) => key.indexOf(name) > -1);
+                    if (apiResourceName) {
+                        const exactResource = apiResources[apiResourceName];
+                        exactResource!.spec.source.value += api + '\n\n';
+                        exactMatch = true;
+                    }
+                }
+
+                if (!exactMatch) {
+                    // if we couldn't place the given api on the exact resource we just park it on the first
+                    // available rest resource
+                    const firstKey = Object.keys(apiResources)[0];
+                    const firstEntry = apiResources[firstKey];
+                    firstEntry!.spec.source.value += api + '\n\n';
+                }
+            });
 
             blockInfo.types.forEach((type) => {
                 blockSpec.entities!.source!.value += type + '\n';

package/src/storm/events.ts

@@ -118,6 +118,15 @@ export interface StormEventCreateDSLResource extends Omit<StormEventCreateDSL, '
     };
 }
 
+export interface StormEventCreateDSLRetry {
+    type: 'API_RETRY' | 'MODEL_RETRY';
+    reason: string;
+    created: number;
+    payload: {
+        error: string[];
+    };
+}
+
 export interface StormEventError {
     type: 'INVALID_RESPONSE' | 'ERROR_INTERNAL';
     reason: string;
@@ -320,4 +329,5 @@ export type StormEvent =
     | StormEventErrorDetails
     | StormEventBlockReady
     | StormEventPhases
-    | StormEventBlockStatus;
+    | StormEventBlockStatus
+    | StormEventCreateDSLRetry;

package/test/storm/event-parser.test.ts

@@ -5,6 +5,7 @@
 
 import { StormEventParser } from '../../src/storm/event-parser';
 import { StormEvent } from '../../src/storm/events';
+import simpleBlogEvents from './simple-blog-events.json';
 
 const parserOptions = {
     serviceKind: 'kapeta/block-service:local',
@@ -179,4 +180,22 @@ describe('event-parser', () => {
         expect(result.plan.spec.connections[0].provider.blockId).toBe(serviceBlockInstance.id);
         expect(result.plan.spec.connections[0].provider.resourceName).toBe(apiResource?.metadata.name);
     });
+
+    it('it will split api into correct provider', () => {
+        const events = simpleBlogEvents as StormEvent[];
+        const parser = new StormEventParser(parserOptions);
+        events.forEach((event) => parser.processEvent('kapeta', event));
+
+        const result = parser.toResult('kapeta');
+
+        const blogService = result.blocks.find((block) => block.aiName === 'blog-service');
+        expect(blogService).toBeDefined();
+        expect(blogService?.content).toBeDefined();
+
+        const apiProviders = blogService?.content?.spec?.providers?.filter((provider) => provider.kind === 'kapeta/block-type-api:local');
+        expect(apiProviders).toBeDefined();
+        expect(apiProviders!.length).toBe(2);
+        expect(apiProviders!["0"].spec.source.value).not.toBe('');
+        expect(apiProviders!["1"].spec.source.value).not.toBe('');
+    });
 });

package/test/storm/simple-blog-events.json

@@ -0,0 +1,470 @@
+[
+    {
+        "type": "MODEL_RESPONSE",
+        "reason": "",
+        "payload": {
+            "text": "Certainly! Here's how you can design a simple blog system. It will consist of a backend block for managing posts and users, a frontend block for displaying the blog, and a gateway block for making the blog publicly accessible."
+        },
+        "created": 1718365003668
+    },
+    {
+        "type": "CREATE_PLAN_PROPERTIES",
+        "reason": "Define the properties for the plan itself",
+        "payload": {
+            "description": "A simple blog system with a backend for managing posts and users, a frontend for displaying the blog, and a gateway for making the blog publicly accessible.",
+            "name": "Simple Blog"
+        },
+        "created": 1718365004184
+    },
+    {
+        "type": "CREATE_BLOCK",
+        "reason": "The system needs a backend to handle posts and users",
+        "payload": {
+            "description": "Handles posts and users",
+            "name": "blog-service",
+            "resources": [
+                {
+                    "description": "Stores blog posts",
+                    "name": "posts",
+                    "type": "DATABASE"
+                },
+                {
+                    "description": "Stores user information",
+                    "name": "users",
+                    "type": "DATABASE"
+                },
+                {
+                    "description": "Handles blog posts",
+                    "name": "posts",
+                    "type": "API"
+                },
+                {
+                    "description": "Handles user information",
+                    "name": "users",
+                    "type": "API"
+                },
+                {
+                    "description": "Handles JWT token generation and validation",
+                    "name": "jwt-provider",
+                    "type": "JWTPROVIDER"
+                },
+                {
+                    "description": "Sends emails for user registration and password reset",
+                    "name": "smtp-client",
+                    "type": "SMTPCLIENT"
+                }
+            ],
+            "type": "BACKEND",
+            "blockRef": "kapeta://kapeta/blog-service:local",
+            "instanceId": "d8d25816-bb83-5797-9881-a6282fe7a20b"
+        },
+        "created": 1718365005843
+    },
+    {
+        "type": "CREATE_BLOCK",
+        "reason": "The system needs a frontend to display the blog",
+        "payload": {
+            "description": "Displays the blog",
+            "name": "blog-ui",
+            "resources": [
+                {
+                    "description": "Fetches blog posts from the backend",
+                    "name": "posts",
+                    "type": "CLIENT"
+                },
+                {
+                    "description": "Handles user authentication and registration",
+                    "name": "users",
+                    "type": "CLIENT"
+                },
+                {
+                    "description": "Displays the main page of the blog",
+                    "name": "main",
+                    "type": "WEBPAGE"
+                }
+            ],
+            "type": "FRONTEND",
+            "blockRef": "kapeta://kapeta/blog-ui:local",
+            "instanceId": "79761687-1528-5f8f-8036-b8d49e23b49d"
+        },
+        "created": 1718365006823
+    },
+    {
+        "type": "CREATE_BLOCK",
+        "reason": "The system needs a gateway to make the blog publicly accessible",
+        "payload": {
+            "description": "Makes the blog publicly accessible",
+            "name": "gateway",
+            "resources": [
+                {
+                    "description": "Makes the posts API public under '/posts' path",
+                    "name": "posts",
+                    "path": "/posts",
+                    "type": "CLIENT"
+                },
+                {
+                    "description": "Makes the main page public under '/' path",
+                    "name": "main",
+                    "path": "/",
+                    "type": "WEBFRAGMENT"
+                }
+            ],
+            "type": "GATEWAY",
+            "blockRef": "kapeta://kapeta/gateway:local",
+            "instanceId": "f7327a25-7fc2-57b6-99e6-1b7e07378790"
+        },
+        "created": 1718365007689
+    },
+    {
+        "type": "CREATE_CONNECTION",
+        "reason": "The frontend needs to fetch blog posts from the backend",
+        "payload": {
+            "fromComponent": "blog-service",
+            "fromResource": "posts",
+            "fromResourceType": "API",
+            "toComponent": "blog-ui",
+            "toResource": "posts",
+            "toResourceType": "CLIENT",
+            "fromBlockId": "d8d25816-bb83-5797-9881-a6282fe7a20b",
+            "toBlockId": "79761687-1528-5f8f-8036-b8d49e23b49d"
+        },
+        "created": 1718365008108
+    },
+    {
+        "type": "CREATE_CONNECTION",
+        "reason": "The frontend needs to handle user authentication and registration",
+        "payload": {
+            "fromComponent": "blog-service",
+            "fromResource": "users",
+            "fromResourceType": "API",
+            "toComponent": "blog-ui",
+            "toResource": "users",
+            "toResourceType": "CLIENT",
+            "fromBlockId": "d8d25816-bb83-5797-9881-a6282fe7a20b",
+            "toBlockId": "79761687-1528-5f8f-8036-b8d49e23b49d"
+        },
+        "created": 1718365008526
+    },
+    {
+        "type": "CREATE_CONNECTION",
+        "reason": "The gateway needs to make the posts API publicly accessible",
+        "payload": {
+            "fromComponent": "blog-service",
+            "fromResource": "posts",
+            "fromResourceType": "API",
+            "toComponent": "gateway",
+            "toResource": "posts",
+            "toResourceType": "CLIENT",
+            "fromBlockId": "d8d25816-bb83-5797-9881-a6282fe7a20b",
+            "toBlockId": "f7327a25-7fc2-57b6-99e6-1b7e07378790"
+        },
+        "created": 1718365008990
+    },
+    {
+        "type": "CREATE_CONNECTION",
+        "reason": "The gateway needs to make the main page publicly accessible",
+        "payload": {
+            "fromComponent": "blog-ui",
+            "fromResource": "main",
+            "fromResourceType": "WEBPAGE",
+            "toComponent": "gateway",
+            "toResource": "main",
+            "toResourceType": "WEBFRAGMENT",
+            "fromBlockId": "79761687-1528-5f8f-8036-b8d49e23b49d",
+            "toBlockId": "f7327a25-7fc2-57b6-99e6-1b7e07378790"
+        },
+        "created": 1718365009823
+    },
+    {
+        "type": "CREATE_CONNECTION",
+        "reason": "The blog service needs to be able to authenticate requests",
+        "payload": {
+            "fromComponent": "blog-service",
+            "fromResource": "jwt-provider",
+            "fromResourceType": "JWTPROVIDER",
+            "toComponent": "blog-service",
+            "toResource": "jwt-consumer",
+            "toResourceType": "JWTCONSUMER",
+            "fromBlockId": "d8d25816-bb83-5797-9881-a6282fe7a20b",
+            "toBlockId": "d8d25816-bb83-5797-9881-a6282fe7a20b"
+        },
+        "created": 1718365009974
+    },
+    {
+        "type": "PLAN_RETRY",
+        "reason": "Found issues in the response but will try again",
+        "payload": {
+            "agent": "plan",
+            "errors": [
+                "Resource jwt-consumer is not defined for component blog-service in connection: 'blog-service.jwt-provider.JWTPROVIDER' to 'blog-service.jwt-consumer.JWTCONSUMER'"
+            ]
+        },
+        "created": 1718365010012
+    },
+    {
+        "type": "MODEL_RESPONSE",
+        "reason": "",
+        "payload": {
+            "text": "Certainly! Here's how you can design a simple blog system. It will consist of a backend block for managing posts and users, a frontend block for displaying the blog, and a gateway block for making the blog publicly accessible."
+        },
+        "created": 1718365011059
+    },
+    {
+        "type": "CREATE_PLAN_PROPERTIES",
+        "reason": "Define the properties for the plan itself",
+        "payload": {
+            "description": "A simple blog system with a backend for managing posts and users, a frontend for displaying the blog, and a gateway for making the blog publicly accessible.",
+            "name": "Simple Blog"
+        },
+        "created": 1718365011625
+    },
+    {
+        "type": "CREATE_BLOCK",
+        "reason": "The system needs a backend to handle posts and users",
+        "payload": {
+            "description": "Handles posts and users",
+            "name": "blog-service",
+            "resources": [
+                {
+                    "description": "Stores blog posts",
+                    "name": "posts",
+                    "type": "DATABASE"
+                },
+                {
+                    "description": "Stores user information",
+                    "name": "users",
+                    "type": "DATABASE"
+                },
+                {
+                    "description": "Handles blog posts",
+                    "name": "posts",
+                    "type": "API"
+                },
+                {
+                    "description": "Handles user information",
+                    "name": "users",
+                    "type": "API"
+                },
+                {
+                    "description": "Handles JWT token generation and validation",
+                    "name": "jwt-provider",
+                    "type": "JWTPROVIDER"
+                },
+                {
+                    "description": "Handles JWT token validation",
+                    "name": "jwt-consumer",
+                    "type": "JWTCONSUMER"
+                },
+                {
+                    "description": "Sends emails for user registration and password reset",
+                    "name": "smtp-client",
+                    "type": "SMTPCLIENT"
+                }
+            ],
+            "type": "BACKEND",
+            "blockRef": "kapeta://kapeta/blog-service:local",
+            "instanceId": "d8d25816-bb83-5797-9881-a6282fe7a20b"
+        },
+        "created": 1718365013238
+    },
+    {
+        "type": "CREATE_BLOCK",
+        "reason": "The system needs a frontend to display the blog",
+        "payload": {
+            "description": "Displays the blog",
+            "name": "blog-ui",
+            "resources": [
+                {
+                    "description": "Fetches blog posts from the backend",
+                    "name": "posts",
+                    "type": "CLIENT"
+                },
+                {
+                    "description": "Handles user authentication and registration",
+                    "name": "users",
+                    "type": "CLIENT"
+                },
+                {
+                    "description": "Displays the main page of the blog",
+                    "name": "main",
+                    "type": "WEBPAGE"
+                }
+            ],
+            "type": "FRONTEND",
+            "blockRef": "kapeta://kapeta/blog-ui:local",
+            "instanceId": "79761687-1528-5f8f-8036-b8d49e23b49d"
+        },
+        "created": 1718365014077
+    },
+    {
+        "type": "CREATE_BLOCK",
+        "reason": "The system needs a gateway to make the blog publicly accessible",
+        "payload": {
+            "description": "Makes the blog publicly accessible",
+            "name": "gateway",
+            "resources": [
+                {
+                    "description": "Makes the posts API public under '/posts' path",
+                    "name": "posts",
+                    "path": "/posts",
+                    "type": "CLIENT"
+                },
+                {
+                    "description": "Makes the main page public under '/' path",
+                    "name": "main",
+                    "path": "/",
+                    "type": "WEBFRAGMENT"
+                }
+            ],
+            "type": "GATEWAY",
+            "blockRef": "kapeta://kapeta/gateway:local",
+            "instanceId": "f7327a25-7fc2-57b6-99e6-1b7e07378790"
+        },
+        "created": 1718365015029
+    },
+    {
+        "type": "CREATE_CONNECTION",
+        "reason": "The frontend needs to fetch blog posts from the backend",
+        "payload": {
+            "fromComponent": "blog-service",
+            "fromResource": "posts",
+            "fromResourceType": "API",
+            "toComponent": "blog-ui",
+            "toResource": "posts",
+            "toResourceType": "CLIENT",
+            "fromBlockId": "d8d25816-bb83-5797-9881-a6282fe7a20b",
+            "toBlockId": "79761687-1528-5f8f-8036-b8d49e23b49d"
+        },
+        "created": 1718365015463
+    },
+    {
+        "type": "CREATE_CONNECTION",
+        "reason": "The frontend needs to handle user authentication and registration",
+        "payload": {
+            "fromComponent": "blog-service",
+            "fromResource": "users",
+            "fromResourceType": "API",
+            "toComponent": "blog-ui",
+            "toResource": "users",
+            "toResourceType": "CLIENT",
+            "fromBlockId": "d8d25816-bb83-5797-9881-a6282fe7a20b",
+            "toBlockId": "79761687-1528-5f8f-8036-b8d49e23b49d"
+        },
+        "created": 1718365016463
+    },
+    {
+        "type": "CREATE_CONNECTION",
+        "reason": "The gateway needs to make the posts API publicly accessible",
+        "payload": {
+            "fromComponent": "blog-service",
+            "fromResource": "posts",
+            "fromResourceType": "API",
+            "toComponent": "gateway",
+            "toResource": "posts",
+            "toResourceType": "CLIENT",
+            "fromBlockId": "d8d25816-bb83-5797-9881-a6282fe7a20b",
+            "toBlockId": "f7327a25-7fc2-57b6-99e6-1b7e07378790"
+        },
+        "created": 1718365016884
+    },
+    {
+        "type": "CREATE_CONNECTION",
+        "reason": "The gateway needs to make the main page publicly accessible",
+        "payload": {
+            "fromComponent": "blog-ui",
+            "fromResource": "main",
+            "fromResourceType": "WEBPAGE",
+            "toComponent": "gateway",
+            "toResource": "main",
+            "toResourceType": "WEBFRAGMENT",
+            "fromBlockId": "79761687-1528-5f8f-8036-b8d49e23b49d",
+            "toBlockId": "f7327a25-7fc2-57b6-99e6-1b7e07378790"
+        },
+        "created": 1718365017299
+    },
+    {
+        "type": "CREATE_CONNECTION",
+        "reason": "The blog service needs to be able to authenticate requests",
+        "payload": {
+            "fromComponent": "blog-service",
+            "fromResource": "jwt-provider",
+            "fromResourceType": "JWTPROVIDER",
+            "toComponent": "blog-service",
+            "toResource": "jwt-consumer",
+            "toResourceType": "JWTCONSUMER",
+            "fromBlockId": "d8d25816-bb83-5797-9881-a6282fe7a20b",
+            "toBlockId": "d8d25816-bb83-5797-9881-a6282fe7a20b"
+        },
+        "created": 1718365017692
+    },
+    {
+        "type": "CREATE_TYPE",
+        "reason": "",
+        "payload": {
+            "blockName": "blog-service",
+            "content": "type Post {\n\tid: string\n\ttitle: string\n\tcontent: string\n\tauthorId: string\n\tcreatedAt: date\n\tupdatedAt: date\n}",
+            "blockRef": "kapeta://kapeta/blog-service:local",
+            "instanceId": "d8d25816-bb83-5797-9881-a6282fe7a20b"
+        },
+        "created": 1718365018773
+    },
+    {
+        "type": "CREATE_TYPE",
+        "reason": "",
+        "payload": {
+            "blockName": "blog-service",
+            "content": "type User {\n\tid: string\n\tusername: string\n\temail: string\n\tpassword: string\n\tcreatedAt: date\n\tupdatedAt: date\n}",
+            "blockRef": "kapeta://kapeta/blog-service:local",
+            "instanceId": "d8d25816-bb83-5797-9881-a6282fe7a20b"
+        },
+        "created": 1718365019329
+    },
+    {
+        "type": "CREATE_API",
+        "reason": "",
+        "payload": {
+            "blockName": "blog-service",
+            "content": "controller Post(\"/posts\") {\n\n\t@GET(\"/\")\n\tgetPosts():Post[]\n\t\n\t@GET(\"/{id}\")\n\tgetPost(@Path(\"id\") id:string):Post\n\t\n\t@POST(\"/\")\n\tcreatePost(@Body post:Post):Post\n\t\n\t@PUT(\"/{id}\")\n\tupdatePost(@Path(\"id\") id:string, @Body post:Post):Post\n\t\n\t@DELETE(\"/{id}\")\n\tdeletePost(@Path(\"id\") id:string):void\n}",
+            "blockRef": "kapeta://kapeta/blog-service:local",
+            "instanceId": "d8d25816-bb83-5797-9881-a6282fe7a20b",
+            "resourceName": "posts"
+        },
+        "created": 1718365020235
+    },
+    {
+        "type": "CREATE_API",
+        "reason": "",
+        "payload": {
+            "blockName": "blog-service",
+            "content": "controller User(\"/users\") {\n\n\t@GET(\"/\")\n\tgetUsers():User[]\n\t\n\t@GET(\"/{id}\")\n\tgetUser(@Path(\"id\") id:string):User\n\t\n\t@POST(\"/\")\n\tcreateUser(@Body user:User):User\n\t\n\t@PUT(\"/{id}\")\n\tupdateUser(@Path(\"id\") id:string, @Body user:User):User\n\t\n\t@DELETE(\"/{id}\")\n\tdeleteUser(@Path(\"id\") id:string):void\n}",
+            "blockRef": "kapeta://kapeta/blog-service:local",
+            "instanceId": "d8d25816-bb83-5797-9881-a6282fe7a20b",
+            "resourceName": "posts"
+        },
+        "created": 1718365020558
+    },
+    {
+        "type": "CREATE_MODEL",
+        "reason": "",
+        "payload": {
+            "blockName": "blog-service",
+            "content": "type Post {\n\t@Id\n\tid: string\n\ttitle: string\n\tcontent: string\n\tauthorId: string\n\tcreatedAt: date\n\tupdatedAt: date\n}",
+            "blockRef": "kapeta://kapeta/blog-service:local",
+            "instanceId": "d8d25816-bb83-5797-9881-a6282fe7a20b",
+            "resourceName": "posts"
+        },
+        "created": 1718365022396
+    },
+    {
+        "type": "CREATE_MODEL",
+        "reason": "",
+        "payload": {
+            "blockName": "blog-service",
+            "content": "type User {\n\t@Id\n\tid: string\n\tusername: string\n\temail: string\n\tpassword: string\n\tcreatedAt: date\n\tupdatedAt: date\n}",
+            "blockRef": "kapeta://kapeta/blog-service:local",
+            "instanceId": "d8d25816-bb83-5797-9881-a6282fe7a20b",
+            "resourceName": "posts"
+        },
+        "created": 1718365022826
+    }
+]

package/tsconfig.json

@@ -5,7 +5,8 @@
         "moduleResolution": "node16",
         "outDir": "./dist",
         "declaration": true,
-        "strict": true
+        "strict": true,
+        "resolveJsonModule": true
     },
     "ts-node": {
         "files": true