fix: map 2 function

Signed-off-by: dev-callgent <[email protected]>

package.json

@@ -50,7 +50,7 @@
     "@nestjs/swagger": "^7.3.0",
     "@nodeteam/nestjs-prisma-pagination": "^1.0.6",
     "@prisma/client": "5.18.0",
-    "axios": "^1.6.7",
+    "axios": "^1.7.5",
     "bcrypt": "^5.1.1",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",

prisma/migrations/20240828045122_event_listener_desc/migration.sql

@@ -0,0 +1,27 @@
+-- AlterTable
+ALTER TABLE "Callgent" ALTER COLUMN "tenantPk" SET DEFAULT (current_setting('tenancy.tenantPk')::int);
+
+-- AlterTable
+ALTER TABLE "CallgentFunction" ALTER COLUMN "tenantPk" SET DEFAULT (current_setting('tenancy.tenantPk')::int);
+
+-- AlterTable
+ALTER TABLE "Endpoint" ALTER COLUMN "tenantPk" SET DEFAULT (current_setting('tenancy.tenantPk')::int);
+
+-- AlterTable
+ALTER TABLE "EndpointAuth" ALTER COLUMN "tenantPk" SET DEFAULT (current_setting('tenancy.tenantPk')::int);
+
+-- AlterTable
+ALTER TABLE "EventListener" ADD COLUMN     "description" VARCHAR(2000) NOT NULL DEFAULT '',
+ALTER COLUMN "tenantPk" SET DEFAULT (current_setting('tenancy.tenantPk')::int);
+
+-- AlterTable
+ALTER TABLE "Task" ALTER COLUMN "tenantPk" SET DEFAULT (current_setting('tenancy.tenantPk')::int);
+
+-- AlterTable
+ALTER TABLE "TaskAction" ALTER COLUMN "tenantPk" SET DEFAULT (current_setting('tenancy.tenantPk')::int);
+
+-- AlterTable
+ALTER TABLE "User" ALTER COLUMN "tenantPk" SET DEFAULT (current_setting('tenancy.tenantPk')::int);
+
+-- AlterTable
+ALTER TABLE "UserIdentity" ALTER COLUMN "tenantPk" SET DEFAULT (current_setting('tenancy.tenantPk')::int);

prisma/schema.prisma

@@ -468,6 +468,7 @@ model EventListener {
   serviceType ServiceType // callgent, service
   serviceName String      @db.VarChar(255)
   funName     String      @db.VarChar(255)
+  description String      @default("") @db.VarChar(2000)
   // TODO add the listener's input/output props in event.context, for automatic checking
 
   /// @DtoReadOnly
@@ -491,11 +492,11 @@ enum EventCallbackType {
 
 model EventStore {
   /// @DtoEntityHidden
-  pk       BigInt @id @default(autoincrement())
+  pk BigInt @id @default(autoincrement())
   /// @DtoCreateApiResponse
   /// @DtoUpdateApiResponse
   /// @DtoPlainApiResponse
-  id       String @unique @db.VarChar(36)
+  id String @unique @db.VarChar(36)
 
   /// @Description src entity id which bind to the listener
   srcId        String            @db.VarChar(36)

prisma/seed.ts

@@ -37,6 +37,7 @@ function initEventListeners() {
       serviceType: 'SERVICE',
       serviceName: 'EndpointsService',
       funName: 'preprocessClientRequest',
+      description: 'Find the CEP, then preprocess the request',
       createdBy: 'GLOBAL',
       priority: (priority += 100),
     },
@@ -50,6 +51,8 @@ function initEventListeners() {
       serviceType: 'SERVICE',
       serviceName: 'CallgentFunctionsService',
       funName: 'loadFunctions',
+      description:
+        'Load all entries of the callgent into event.context.functions',
       createdBy: 'GLOBAL',
       priority: (priority += 100),
     },
@@ -63,6 +66,8 @@ function initEventListeners() {
       serviceType: 'SERVICE',
       serviceName: 'EventStoresService',
       funName: 'loadTargetEvents',
+      description:
+        'Load all events of same targetId into event.context.tgtEvents',
       createdBy: 'GLOBAL',
       priority: (priority += 100),
     },
@@ -76,6 +81,8 @@ function initEventListeners() {
       serviceType: 'SERVICE',
       serviceName: 'AgentsService',
       funName: 'map2Function',
+      description:
+        'Map the request event to a endpoint function, put into event.context.map2Function and event.context.functions[0]',
       createdBy: 'GLOBAL',
       priority: (priority += 100),
     },
@@ -89,6 +96,7 @@ function initEventListeners() {
       serviceType: 'SERVICE',
       serviceName: 'SandBoxService',
       funName: 'map2Args',
+      description: 'Map the request event to the function arguments',
       createdBy: 'GLOBAL',
       priority: (priority += 100),
     },

src/agents/agents.service.ts

@@ -61,7 +61,7 @@ export class AgentsService {
       },
       { funName: '', mapping: '', question: '' },
     ); // TODO check `funName` exists in callgentFunctions, validating `mapping`
-    reqEvent.context.function = mapped;
+    reqEvent.context.map2Function = mapped;
 
     if (mapped.question) {
       if (!progressive)
@@ -81,6 +81,13 @@ export class AgentsService {
       if (statusCode == 1)
         return { event: reqEvent, callbackName: 'map2FunctionProgressive' };
       throw new HttpException(prEvent.message, statusCode);
+    } else {
+      const functions = reqEvent.context.functions.filter(
+        (f) => f.name == mapped.funName,
+      );
+      if (functions?.length != 1)
+        throw new BadRequestException('Failed to map to function: ' + mapped);
+      reqEvent.context.functions = functions;
     }
   }
 

src/event-listeners/event-object.ts

@@ -18,7 +18,7 @@ export class EventObject {
   }
   public readonly id: string;
   public statusCode = -1; // for response only
-  public readonly context: { [key: string]: JsonValue } = {};
+  public readonly context: { [key: string]: any } = {};
   public message: string;
   public stopPropagation = false;
   public defaultPrevented = false;