@solidxai/core 0.1.10-beta.10 → 0.1.10-beta.12

package/src/commands/refresh-model.command.ts

@@ -1,14 +1,10 @@
-import { BadRequestException, forwardRef, Inject, Logger } from '@nestjs/common';
+import { forwardRef, Inject, Logger } from '@nestjs/common';
 import { Command, CommandRunner, Option } from 'nest-commander';
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { CommandError } from './helper';
-import { In } from 'typeorm';
 
 interface CommandOptions {
-  name?: string;
-  id?: number;
-  fieldIds?: number[];
-  fieldNames?: string[];
+  name: string;
   dryRun?: boolean;
 }
 
@@ -33,34 +29,20 @@ export class RefreshModelCommand extends CommandRunner {
     }
 
     const codeGenerationOptions = {
-      modelId: options.id,
       modelUserKey: options.name,
       dryRun: options.dryRun,
-      fieldIdsForRefresh: options.fieldIds,
-      fieldNamesForRefresh: options.fieldNames,
     };
     await this.modelMetadataService.handleGenerateCode(codeGenerationOptions);
   }
 
-  // Accept the model ID as an argument
   @Option({
-    flags: '-i, --id [model ID]',
-    description: 'Model ID from the ss_model_metadata table',
-  })
-  parseId(val: string): number {
-    return +val;
-  }
-
-  // Accept the module name as an argument
-  @Option({
-    flags: '-n, --name [model name]',
-    description: 'Model Name from the ss_model_metadata table',
+    flags: '-n, --name <model name>',
+    description: 'Model name (singularName) from the ss_model_metadata table',
   })
   parseName(val: string): string {
     return val;
   }
 
-  // Accept dry run as an argument
   @Option({
     flags: '-d, --dryRun [dry run]',
     description: 'Dry run the command',
@@ -70,36 +52,9 @@ export class RefreshModelCommand extends CommandRunner {
     return (val === 'false') ? false : true;
   }
 
-  // Accept field IDs as an argument
-  @Option({
-    flags: '-fids, --fieldIds [Array of field IDs]',
-    description: 'Json array of Field IDs from the ss_field_metadata table',
-  })
-  parseFieldIds(val: string): number[] {
-    //Check if the value is a json array
-    if (!val.startsWith('[') || !val.endsWith(']')) {
-      throw new BadRequestException('Field IDs should be a json array');
-    }
-    return JSON.parse(val).map((id: string) => parseInt(id));
-  }
-
-  // Accept field Names as an argument
-  @Option({
-    flags: '-fnames, --fieldNames [Array of field Names]',
-    description: 'Json array of Field Names from the ss_field_metadata table',
-  })
-  parseFieldNames(val: string): string[] {
-    //Check if the value is a json array
-    if (!val.startsWith('[') || !val.endsWith(']')) {
-      throw new BadRequestException('Field Names should be a json array');
-    }
-    return JSON.parse(val).map((name: string) => name.toString());
-  }
-
-  // Validate the options passed
   private validate(options: CommandOptions): CommandError[] {
-    if (!options.id && !options.name) {
-      return [new CommandError('Model ID or Model Name is required')];
+    if (!options.name) {
+      return [new CommandError('Model Name is required')];
     }
     return [];
   }

package/src/commands/refresh-module.command.ts

@@ -4,7 +4,6 @@ import { ModuleMetadataService } from '../services/module-metadata.service';
 import { CommandError } from './helper';
 
 interface CommandOptions {
-  id: number;
   name: string;
   dryRun: boolean;
 }
@@ -28,7 +27,6 @@ export class RefreshModuleCommand extends CommandRunner {
       return;
     }
     const codeGenerationOptions = {
-      moduleId: options.id,
       moduleUserKey: options.name,
       dryRun: options.dryRun,
     };
@@ -36,16 +34,7 @@ export class RefreshModuleCommand extends CommandRunner {
   }
 
   @Option({
-    flags: '-i, --id [module ID]',
-    description: 'Module ID from the ss_module_metadata table',
-  })
-  parseId(val: string): number {
-    return +val;
-  }
-
-  // Accept the module name as an argument
-  @Option({
-    flags: '-n, --name [module name]',
+    flags: '-n, --name <module name>',
     description: 'Module Name from the ss_module_metadata table',
   })
   parseName(val: string): string {
@@ -61,11 +50,9 @@ export class RefreshModuleCommand extends CommandRunner {
     return (val === 'false') ? false : true;
   }
 
-
-  // Validate the options passed
   validate(options: CommandOptions): CommandError[] {
-    if (!options.id && !options.name) {
-      return [new CommandError('Module ID or Module Name is required')];
+    if (!options.name) {
+      return [new CommandError('Module Name is required')];
     }
     return [];
   }

package/src/controllers/mcp-audit-log.controller.ts

@@ -0,0 +1,70 @@
+import { Body, Controller, Delete, Get, Param, Patch, Post, Put, Query, UploadedFiles, UseInterceptors } from '@nestjs/common';
+import { AnyFilesInterceptor } from '@nestjs/platform-express';
+import { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';
+import { CreateMcpAuditLogDto } from 'src/dtos/create-mcp-audit-log.dto';
+import { UpdateMcpAuditLogDto } from 'src/dtos/update-mcp-audit-log.dto';
+import { McpAuditLogService } from 'src/services/mcp-audit-log.service';
+
+@ApiTags('Solid Core')
+@Controller('mcp-audit-log')
+export class McpAuditLogController {
+  constructor(private readonly service: McpAuditLogService) {}
+
+  @ApiBearerAuth('jwt')
+  @Post()
+  @UseInterceptors(AnyFilesInterceptor())
+  create(@Body() createDto: CreateMcpAuditLogDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.create(createDto, files);
+  }
+
+  @ApiBearerAuth('jwt')
+  @Post('/bulk')
+  @UseInterceptors(AnyFilesInterceptor())
+  insertMany(@Body() createDtos: CreateMcpAuditLogDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
+    return this.service.insertMany(createDtos, filesArray);
+  }
+
+  @ApiBearerAuth('jwt')
+  @Put(':id')
+  @UseInterceptors(AnyFilesInterceptor())
+  update(@Param('id') id: number, @Body() updateDto: UpdateMcpAuditLogDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.update(id, updateDto, files);
+  }
+
+  @ApiBearerAuth('jwt')
+  @Patch(':id')
+  @UseInterceptors(AnyFilesInterceptor())
+  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateMcpAuditLogDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.update(id, updateDto, files, true);
+  }
+
+  @ApiBearerAuth('jwt')
+  @ApiQuery({ name: 'limit', required: false, type: Number })
+  @ApiQuery({ name: 'offset', required: false, type: Number })
+  @ApiQuery({ name: 'fields', required: false, type: Array })
+  @ApiQuery({ name: 'sort', required: false, type: Array })
+  @ApiQuery({ name: 'populate', required: false, type: Array })
+  @ApiQuery({ name: 'filters', required: false, type: Array })
+  @Get()
+  findMany(@Query() query: any) {
+    return this.service.find(query);
+  }
+
+  @ApiBearerAuth('jwt')
+  @Get(':id')
+  findOne(@Param('id') id: string, @Query() query: any) {
+    return this.service.findOne(+id, query);
+  }
+
+  @ApiBearerAuth('jwt')
+  @Delete('/bulk')
+  deleteMany(@Body() ids: number[]) {
+    return this.service.deleteMany(ids);
+  }
+
+  @ApiBearerAuth('jwt')
+  @Delete(':id')
+  delete(@Param('id') id: number) {
+    return this.service.delete(id);
+  }
+}

package/src/controllers/model-metadata.controller.ts

@@ -92,7 +92,7 @@ export class ModelMetadataController {
     @ApiBearerAuth("jwt")
     @Post(':id/generate-code')
     generateCode(@Param('id', ParseIntPipe) id: number) {
-        return this.modelMetadataService.handleGenerateCode({ modelId: id });
+        return this.modelMetadataService.generateCodeViaCtl(id);
     }
 
     @ApiBearerAuth("jwt")

package/src/controllers/module-metadata.controller.ts

@@ -62,7 +62,7 @@ export class ModuleMetadataController {
   @ApiBearerAuth("jwt")
   @Post(':id/generate-code')
   generateCode(@Param('id', ParseIntPipe) id: number) {
-    return this.moduleMetadataService.generateCode({ moduleId: id });
+    return this.moduleMetadataService.generateCodeViaCtl(id);
   }
  
 

package/src/dtos/create-mcp-audit-log.dto.ts

@@ -0,0 +1,84 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsDate, IsInt, IsNotEmpty, IsNumber, IsOptional, IsString } from 'class-validator';
+
+export class CreateMcpAuditLogDto {
+  @IsOptional()
+  @IsInt()
+  @ApiProperty()
+  userId: number;
+
+  @IsOptional()
+  @IsInt()
+  @ApiProperty()
+  apiKeyId: number;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  username: string;
+
+  @IsNotEmpty()
+  @IsString()
+  @ApiProperty()
+  transport: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  mcpSessionId: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  clientAddr: string;
+
+  @IsNotEmpty()
+  @IsString()
+  @ApiProperty()
+  method: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  requestId: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  toolName: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  requestParams: string;
+
+  @IsNotEmpty()
+  @IsString()
+  @ApiProperty()
+  status: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  responseResult: string;
+
+  @IsOptional()
+  @IsInt()
+  @ApiProperty()
+  errorCode: number;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  errorMessage: string;
+
+  @IsOptional()
+  @IsNumber()
+  @ApiProperty()
+  durationMs: number;
+
+  @IsOptional()
+  @IsDate()
+  @ApiProperty()
+  createdAt: Date;
+}

package/src/dtos/update-mcp-audit-log.dto.ts

@@ -0,0 +1,83 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsInt, IsNumber, IsOptional, IsString } from 'class-validator';
+
+export class UpdateMcpAuditLogDto {
+  @IsOptional()
+  @IsInt()
+  id: number;
+
+  @IsOptional()
+  @IsInt()
+  @ApiProperty()
+  userId: number;
+
+  @IsOptional()
+  @IsInt()
+  @ApiProperty()
+  apiKeyId: number;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  username: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  transport: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  mcpSessionId: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  clientAddr: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  method: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  requestId: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  toolName: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  requestParams: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  status: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  responseResult: string;
+
+  @IsOptional()
+  @IsInt()
+  @ApiProperty()
+  errorCode: number;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  errorMessage: string;
+
+  @IsOptional()
+  @IsNumber()
+  @ApiProperty()
+  durationMs: number;
+}

package/src/entities/mcp-audit-log.entity.ts

@@ -0,0 +1,55 @@
+import { Column, Entity, Index } from 'typeorm';
+import { CommonEntity } from 'src/entities/common.entity';
+import { getColumnType } from 'src/helpers/typeorm-db-helper';
+
+@Entity({ name: 'ss_mcp_audit_log' })
+export class McpAuditLog extends CommonEntity {
+  @Index()
+  @Column({ nullable: true })
+  userId: number;
+
+  @Column({ nullable: true })
+  apiKeyId: number;
+
+  @Column({ nullable: true, length: 128 })
+  username: string;
+
+  @Column({ length: 32 })
+  transport: string;
+
+  @Index()
+  @Column({ nullable: true, length: 64 })
+  mcpSessionId: string;
+
+  @Column({ nullable: true, length: 64 })
+  clientAddr: string;
+
+  @Index()
+  @Column({ length: 64 })
+  method: string;
+
+  @Column({ nullable: true, length: 64 })
+  requestId: string;
+
+  @Index()
+  @Column({ nullable: true, length: 128 })
+  toolName: string;
+
+  @Column({ nullable: true, ...getColumnType('longText') })
+  requestParams: string;
+
+  @Column({ length: 16 })
+  status: string;
+
+  @Column({ nullable: true, ...getColumnType('longText') })
+  responseResult: string;
+
+  @Column({ nullable: true })
+  errorCode: number;
+
+  @Column({ nullable: true, ...getColumnType('longText') })
+  errorMessage: string;
+
+  @Column({ nullable: true, ...getColumnType('decimal') })
+  durationMs: number;
+}

package/src/helpers/command.service.ts

@@ -4,6 +4,7 @@ import { spawn } from 'child_process';
 export type CommandWithArgs = {
   command: string;
   args: string[];
+  cwd?: string;
 };
 
 @Injectable()
@@ -43,6 +44,7 @@ export class CommandService {
       const child = spawn(command, spawnArgs, {
         shell: isWindows, // Use shell on Windows to handle .cmd files
         stdio: ['pipe', 'pipe', 'pipe'],
+        cwd: commandWithArgs.cwd,
       });
 
       let stdout = '';

package/src/index.ts

@@ -49,6 +49,7 @@ export * from './dtos/create-mq-message-queue.dto'
 export * from './dtos/create-mq-message.dto'
 export * from './dtos/create-agent-session.dto'
 export * from './dtos/create-agent-event.dto'
+export * from './dtos/create-mcp-audit-log.dto'
 export * from './dtos/create-scheduled-job.dto'
 export * from './dtos/create-permission-metadata.dto'
 export * from './dtos/create-role-metadata.dto'
@@ -89,6 +90,7 @@ export * from './dtos/update-mq-message-queue.dto'
 export * from './dtos/update-mq-message.dto'
 export * from './dtos/update-agent-session.dto'
 export * from './dtos/update-agent-event.dto'
+export * from './dtos/update-mcp-audit-log.dto'
 export * from './dtos/update-scheduled-job.dto'
 export * from './dtos/update-permission-metadata.dto'
 export * from './dtos/update-role-metadata.dto'
@@ -122,6 +124,7 @@ export * from './entities/mq-message-queue.entity'
 export * from './entities/mq-message.entity'
 export * from './entities/agent-session.entity'
 export * from './entities/agent-event.entity'
+export * from './entities/mcp-audit-log.entity'
 export * from './entities/scheduled-job.entity'
 export * from './entities/permission-metadata.entity'
 export * from './entities/role-metadata.entity'
@@ -297,6 +300,7 @@ export * from './services/mq-message-queue.service'
 export * from './services/mq-message.service'
 export * from './services/agent-session.service'
 export * from './services/agent-event.service'
+export * from './services/mcp-audit-log.service'
 export * from './services/scheduled-job.service'
 export * from './services/pdf.service'
 export * from './services/permission-metadata.service'

package/src/interfaces.ts

@@ -121,8 +121,6 @@ export interface CodeGenerationOptions {
   fieldIdsForRemoval?: number[];
   fieldNamesForRemoval?: string[];
   dryRun?: boolean;
-  fieldIdsForRefresh?: number[];
-  fieldNamesForRefresh?: string[];
 }
 
 export interface TriggerMcpClientOptions {

package/src/repository/mcp-audit-log.repository.ts

@@ -0,0 +1,17 @@
+import { Injectable } from '@nestjs/common';
+import { McpAuditLog } from 'src/entities/mcp-audit-log.entity';
+import { RequestContextService } from 'src/services/request-context.service';
+import { DataSource } from 'typeorm';
+import { SecurityRuleRepository } from './security-rule.repository';
+import { SolidBaseRepository } from './solid-base.repository';
+
+@Injectable()
+export class McpAuditLogRepository extends SolidBaseRepository<McpAuditLog> {
+  constructor(
+    readonly dataSource: DataSource,
+    readonly requestContextService: RequestContextService,
+    readonly securityRuleRepository: SecurityRuleRepository,
+  ) {
+    super(McpAuditLog, dataSource, requestContextService, securityRuleRepository);
+  }
+}