@solidxai/core 0.1.10-beta.0 → 0.1.10-beta.11

package/src/services/queues/database-subscriber.service.ts

@@ -16,9 +16,9 @@ export abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscr
         protected readonly mqMessageQueueService: MqMessageQueueService,
         protected readonly poller: PollerService,
     ) {
-        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;
-        if (!this.serviceRole) {
-            this.logger.debug('Queue service Role is not defined in the environment variables');
+        this.serviceRole = process.env.QUEUES_SERVICE_ROLE || 'both';
+        if (!process.env.QUEUES_SERVICE_ROLE) {
+            this.logger.debug('QUEUES_SERVICE_ROLE is not defined. Defaulting DatabaseSubscriber service role to "both".');
         }
         // this.logger.debug(`DatabaseSubscriber instance created with options: ${JSON.stringify(this.options())}`);
     }
@@ -60,7 +60,7 @@ export abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscr
 
             await this.processMessage(message);
         }
-        catch (error) {
+        catch (error: any) {
             this.logger.error(`Error processing message: ${error.message}`);
 
             // if an error occurs then if retryCount is set we start retrying. 
@@ -108,7 +108,7 @@ export abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscr
                         this.logger.log(`DatabaseSubscriber for queue ${queueName} is disabled because it does not match QUEUES_QUEUE_NAME_REGEX_TO_ENABLE=${queueNameRegex}`);
                         return;
                     }
-                } catch (error) {
+                } catch (error: any) {
                     this.logger.error(`Invalid QUEUES_QUEUE_NAME_REGEX_TO_ENABLE regex "${queueNameRegex}". Subscriber for queue ${queueName} will not start.`);
                     return;
                 }
@@ -152,7 +152,7 @@ export abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscr
     private async retryMessage(message: QueueMessage<T>) {
         try {
             await this.processMessage(message);
-        } catch (error) {
+        } catch (error: any) {
             if (message.currentRetry < message.retryCount) {
                 await this.updateStatusInDatabase('retrying', message);
 
@@ -203,7 +203,7 @@ export abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscr
                 this.logger.debug(`Message status updated to ${stage} for messageId: ${mqMessage.id}`);
             }
         }
-        catch (error) {
+        catch (error: any) {
             this.logger.error(error.message, error.stack);
         }
     }

package/src/services/queues/rabbitmq-publisher.service.ts

@@ -22,12 +22,12 @@ export abstract class RabbitMqPublisher<T> implements OnModuleDestroy, QueuePubl
         protected readonly mqMessageQueueService: MqMessageQueueService,
     ) {
         this.url = process.env.QUEUES_RABBIT_MQ_URL;
-        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;
+        this.serviceRole = process.env.QUEUES_SERVICE_ROLE || 'both';
         if (!this.url) {
             this.logger.debug('RabbitMqPublisher url is not defined in the environment variables');
         }
-        if (!this.serviceRole) {
-            this.logger.debug('Queue service Role is not defined in the environment variables');
+        if (!process.env.QUEUES_SERVICE_ROLE) {
+            this.logger.debug('QUEUES_SERVICE_ROLE is not defined. Defaulting RabbitMqPublisher service role to "both".');
         }
         // this.logger.debug(`RabbitMqPublisher instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);
     }
@@ -118,7 +118,7 @@ export abstract class RabbitMqPublisher<T> implements OnModuleDestroy, QueuePubl
         if (this.channel) {
             try {
                 await this.channel.close();
-            } catch (err) {
+            } catch (err: any) {
                 this.logger.warn(
                     `RabbitMqPublisher error closing channel: ${(err as Error).message}`,
                 );
@@ -130,7 +130,7 @@ export abstract class RabbitMqPublisher<T> implements OnModuleDestroy, QueuePubl
         if (this.connection) {
             try {
                 await this.connection.close();
-            } catch (err) {
+            } catch (err: any) {
                 this.logger.warn(
                     `RabbitMqPublisher error closing connection: ${(err as Error).message}`,
                 );
@@ -189,7 +189,7 @@ export abstract class RabbitMqPublisher<T> implements OnModuleDestroy, QueuePubl
             // }
             // await channel.waitForConfirms();
             // this.logger.debug('RabbitMqPublisher Message published successfully');
-        } catch (err) {
+        } catch (err: any) {
             this.logger.error(`RabbitMqPublisher Message publish failed: ${JSON.stringify(err)}`);
             if (err instanceof Error) {
                 this.logger.error(`RabbitMqPublisher Error stack: ${err.stack}`);
@@ -224,7 +224,7 @@ export abstract class RabbitMqPublisher<T> implements OnModuleDestroy, QueuePubl
                 mqMessageQueueId: mqMessageQueue.id,
             });
         }
-        catch (error) {
+        catch (error: any) {
             this.logger.error(error.message, error.stack);
         }
 

package/src/services/queues/rabbitmq-subscriber.service.ts

@@ -31,12 +31,12 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
 
     constructor(protected readonly mqMessageService: MqMessageService, protected readonly mqMessageQueueService: MqMessageQueueService) {
         this.url = process.env.QUEUES_RABBIT_MQ_URL;
-        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;
+        this.serviceRole = process.env.QUEUES_SERVICE_ROLE || 'both';
         if (!this.url) {
             this.logger.debug('RabbitMqPublisher url is not defined in the environment variables');
         }
-        if (!this.serviceRole) {
-            this.logger.debug('Queue service Role is not defined in the environment variables');
+        if (!process.env.QUEUES_SERVICE_ROLE) {
+            this.logger.debug('QUEUES_SERVICE_ROLE is not defined. Defaulting RabbitMqSubscriber service role to "both".');
         }
         // this.logger.debug(`RabbitMqSubscriber instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);
     }
@@ -85,7 +85,7 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
     async onModuleInit(): Promise<void> {
         // Not using SettingService here as that will necessitate all implementors of RabbitMqSubscriber to also inject SettingService which is not ideal. 
         // Instead we directly read the environment variables here.
-        const defaultBroker = process.env.QUEUES_DEFAULT_BROKER || 'rabbitmq';
+        const defaultBroker = process.env.QUEUES_DEFAULT_BROKER || 'database';
         const solidCliRunning = process.env.SOLID_CLI_RUNNING || "false";
         const queueNameRegex = (process.env.QUEUES_QUEUE_NAME_REGEX_TO_ENABLE || '').trim();
         const roleAllowed = ['both', 'subscriber'].includes(this.serviceRole);
@@ -107,7 +107,7 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
                         this.logger.log(`RabbitMqSubscriber for queue ${queueName} is disabled because it does not match QUEUES_QUEUE_NAME_REGEX_TO_ENABLE=${queueNameRegex}`);
                         return;
                     }
-                } catch (error) {
+                } catch (error: any) {
                     this.logger.error(`Invalid QUEUES_QUEUE_NAME_REGEX_TO_ENABLE regex "${queueNameRegex}". Subscriber for queue ${queueName} will not start.`);
                     return;
                 }
@@ -116,7 +116,7 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
             const namespacedQueueName = buildNamespacedQueueName(queueName);
             try {
                 await this.connectAndConsume(namespacedQueueName);
-            } catch (err) {
+            } catch (err: any) {
                 this.logger.error(`Failed to connect to RabbitMQ for queue ${namespacedQueueName}: ${(err as Error).message}`, (err as Error).stack);
                 this.triggerReconnect(namespacedQueueName, 'initial connection failure');
             }
@@ -142,7 +142,7 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
         let connection: amqp.Connection;
         try {
             connection = await this.establishConnection();
-        } catch (err) {
+        } catch (err: any) {
             this.logger.error(`Failed to connect to RabbitMQ for queue ${queueName}: ${(err as Error).message}`, (err as Error).stack);
             throw err;
         }
@@ -210,7 +210,7 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
                     const messageContentString = rawMessage.content.toString();
                     message = JSON.parse(messageContentString) as QueueMessage<T>;
                     this.logger.debug(`rabbitmq subscriber received message with id: ${message.messageId} for queue ${queueName}`);
-                } catch (error) {
+                } catch (error: any) {
                     this.logger.error(`Invalid JSON message on queue ${queueName}: ${(error as Error).message}`);
                     await this.publishToFailedQueue(queueName, rawMessage.content, channel, error);
                     channel.ack(rawMessage);
@@ -223,7 +223,7 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
 
                 try {
                     await this.processMessage(message, rawMessage, channel, queueName);
-                } catch (error) {
+                } catch (error: any) {
                     await this.handleProcessingError(message, rawMessage, channel, error, queueName);
                 }
             },
@@ -277,7 +277,7 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
             channel.sendToQueue(failedQueue, body, errorMessage ? {
                 headers: { 'x-error': errorMessage }
             } : undefined);
-        } catch (err) {
+        } catch (err: any) {
             this.logger.error(`Failed to publish to failed queue ${failedQueue}: ${(err as Error).message}`);
         }
     }
@@ -302,7 +302,7 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
                 this.reconnectAttempt = 0;
                 this.logger.log(`RabbitMqSubscriber reconnected for queue ${queueName}`);
                 return;
-            } catch (err) {
+            } catch (err: any) {
                 this.reconnectAttempt += 1;
                 const delay = this.backoff();
                 this.logger.warn(`RabbitMqSubscriber reconnect failed for queue ${queueName}; retrying in ${delay}ms`);
@@ -407,7 +407,7 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
                 await this.mqMessageService.repo.update(mqMessage.id, updatedFields);
             }
         }
-        catch (error) {
+        catch (error: any) {
             this.logger.error(error.message, error.stack);
         }
 
@@ -485,7 +485,7 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
             // - If timeoutPromise rejects first, we fail fast with timeout error.
             // This ensures we mark DB status via normal error handling before broker ack-timeout.
             return await Promise.race([subscribePromise, timeoutPromise]);
-        } catch (error) {
+        } catch (error: any) {
             const errorMessage = (error as Error)?.message || String(error);
             this.logger.error(
                 `Subscriber execution failed for queue ${queueName} and messageId ${messageId}: ${errorMessage}`,

package/src/services/queues/redis-publisher.service.ts

@@ -16,7 +16,10 @@ export abstract class RedisPublisher<T> implements OnModuleDestroy, QueuePublish
         protected readonly mqMessageService: MqMessageService,
         protected readonly mqMessageQueueService: MqMessageQueueService,
     ) {
-        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;
+        this.serviceRole = process.env.QUEUES_SERVICE_ROLE || 'both';
+        if (!process.env.QUEUES_SERVICE_ROLE) {
+            this.logger.debug('QUEUES_SERVICE_ROLE is not defined. Defaulting RedisPublisher service role to "both".');
+        }
         if (!process.env.QUEUES_REDIS_URL) {
             this.logger.debug('RedisPublisher: QUEUES_REDIS_URL is not defined in the environment variables');
         }
@@ -65,7 +68,7 @@ export abstract class RedisPublisher<T> implements OnModuleDestroy, QueuePublish
             const client = this.getClient();
             await client.publish(namespacedQueueName, JSON.stringify(message));
             this.logger.debug(`RedisPublisher published message ${message.messageId} to channel ${namespacedQueueName}`);
-        } catch (err) {
+        } catch (err: any) {
             this.logger.error(`RedisPublisher failed to publish message: ${(err as Error).message}`, (err as Error).stack);
         }
 
@@ -87,8 +90,8 @@ export abstract class RedisPublisher<T> implements OnModuleDestroy, QueuePublish
                 parentEntity: message.parentEntity,
                 mqMessageQueueId: mqMessageQueue.id,
             });
-        } catch (error) {
+        } catch (error: any) {
             this.logger.error(error.message, error.stack);
         }
     }
-}
+}

package/src/services/queues/redis-subscriber.service.ts

@@ -17,7 +17,10 @@ export abstract class RedisSubscriber<T> implements OnModuleInit, OnModuleDestro
         protected readonly mqMessageService: MqMessageService,
         protected readonly mqMessageQueueService: MqMessageQueueService,
     ) {
-        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;
+        this.serviceRole = process.env.QUEUES_SERVICE_ROLE || 'both';
+        if (!process.env.QUEUES_SERVICE_ROLE) {
+            this.logger.debug('QUEUES_SERVICE_ROLE is not defined. Defaulting RedisSubscriber service role to "both".');
+        }
         if (!process.env.QUEUES_REDIS_URL) {
             this.logger.debug('RedisSubscriber: QUEUES_REDIS_URL is not defined in the environment variables');
         }
@@ -50,7 +53,7 @@ export abstract class RedisSubscriber<T> implements OnModuleInit, OnModuleDestro
                         );
                         return;
                     }
-                } catch (error) {
+                } catch (error: any) {
                     this.logger.error(
                         `Invalid QUEUES_QUEUE_NAME_REGEX_TO_ENABLE regex "${queueNameRegex}". Subscriber for queue ${queueName} will not start.`,
                     );
@@ -92,7 +95,7 @@ export abstract class RedisSubscriber<T> implements OnModuleInit, OnModuleDestro
             let message: QueueMessage<T> = null;
             try {
                 message = JSON.parse(rawMessage) as QueueMessage<T>;
-            } catch (error) {
+            } catch (error: any) {
                 this.logger.error(`RedisSubscriber invalid JSON on channel ${channel}: ${(error as Error).message}`);
                 return;
             }
@@ -103,7 +106,7 @@ export abstract class RedisSubscriber<T> implements OnModuleInit, OnModuleDestro
 
             try {
                 await this.processMessage(message);
-            } catch (error) {
+            } catch (error: any) {
                 await this.handleProcessingError(message, error, channel);
             }
         });
@@ -147,7 +150,7 @@ export abstract class RedisSubscriber<T> implements OnModuleInit, OnModuleDestro
             try {
                 await this.connectAndSubscribe(channel);
                 this.logger.log(`RedisSubscriber reconnected for channel ${channel}`);
-            } catch (err) {
+            } catch (err: any) {
                 this.triggerReconnect(channel, `reconnect failed: ${(err as Error).message}`);
             }
         }, delay);
@@ -201,7 +204,7 @@ export abstract class RedisSubscriber<T> implements OnModuleInit, OnModuleDestro
                 if (stage === 'failed') updatedFields['error'] = error;
                 await this.mqMessageService.repo.update(mqMessage.id, updatedFields);
             }
-        } catch (err) {
+        } catch (err: any) {
             this.logger.error(err.message, err.stack);
         }
     }

package/src/services/role-metadata.service.ts

@@ -91,7 +91,7 @@ export class RoleMetadataService extends CRUDService<RoleMetadata> {
           }
           */
         }
-      } catch (error) {
+      } catch (error: any) {
         this.logger.error(error);
       }
     }

package/src/services/scheduled-jobs/scheduler.service.ts

@@ -36,7 +36,7 @@ export class SchedulerServiceImpl implements ISchedulerService {
         if (jobsRegexToEnable && jobsRegexToEnable !== "all") {
             try {
                 jobsRegex = new RegExp(jobsRegexToEnable);
-            } catch (error) {
+            } catch (error: any) {
                 this.logger.error(`Invalid SOLID_SCHEDULER_JOBS_REGEX_TO_ENABLE regex "${jobsRegexToEnable}". Scheduler loop will skip this run.`);
                 return;
             }
@@ -101,7 +101,7 @@ export class SchedulerServiceImpl implements ISchedulerService {
 
                 await this.scheduledJobRepo.save(job);
                 this.logger.log(`[${now.getTime()}]: scheduler service finished running job: ${job.job}`);
-            } catch (err) {
+            } catch (err: any) {
                 this.logger.error(`[${now.getTime()}]: scheduler service failed to run job ${job.job}`, err.stack);
             } finally {
                 this.runningJobs.delete(jobKey);
@@ -153,7 +153,7 @@ export class SchedulerServiceImpl implements ISchedulerService {
         try {
             const parsed = JSON.parse(dayOfWeek);
             return Array.isArray(parsed) ? parsed : [];
-        } catch (error) {
+        } catch (error: any) {
             this.logger.warn(`Invalid dayOfWeek JSON '${dayOfWeek}'`, error as any);
             return [];
         }
@@ -217,10 +217,10 @@ export class SchedulerServiceImpl implements ISchedulerService {
             if (runAfterNext.getTime() - nextRun.getTime() < 60000) {
                 throw new Error('Cron expression interval must be at least 1 minute');
             }
-            
+
             this.logger.log(`Custom cron '${job.cronExpression}' next run: ${nextRun}`);
             return nextRun;
-        } catch (error) {
+        } catch (error: any) {
             this.logger.error(`Invalid cron expression for job ${job.scheduleName}: ${job.cronExpression}. Reason: ${(error as Error).message}`);
             // Fallback to daily if cron parsing fails
             return new Date(base.getTime() + 24 * 60 * 60 * 1000);

package/src/services/settings/default-settings-provider.service.ts

@@ -724,7 +724,11 @@ const getSolidCoreSettings = (isProd: boolean) =>
       label: "Registration Validation Type",
       group: "authentication-settings",
       sortOrder: 30,
-      controlType: "shortText",
+      controlType: "selectionStatic",
+      options: [
+        { label: "Email", value: "email" },
+        { label: "Mobile", value: "mobile" },
+      ],
     },
     {
       moduleName: "solid-core",
@@ -734,7 +738,12 @@ const getSolidCoreSettings = (isProd: boolean) =>
       label: "Login Validation Type",
       group: "authentication-settings",
       sortOrder: 40,
-      controlType: "shortText",
+      controlType: "selectionStatic",
+      options: [
+        { label: "Email", value: "email" },
+        { label: "Mobile", value: "mobile" },
+        { label: "Selectable", value: "selectable" },
+      ],
     },
     {
       moduleName: "solid-core",
@@ -899,7 +908,11 @@ const getSolidCoreSettings = (isProd: boolean) =>
         (
           process.env.IAM_SEND_WELCOME_EMAIL_ON_SIGNUP ?? "false"
         ).toLowerCase() === "true",
-      level: SettingLevel.SystemEnv,
+      level: SettingLevel.SystemAdminEditable,
+      label: "Send Welcome Email On Signup",
+      group: "authentication-settings",
+      sortOrder: 180,
+      controlType: "boolean",
     },
     {
       moduleName: "solid-core",
@@ -908,7 +921,11 @@ const getSolidCoreSettings = (isProd: boolean) =>
         (
           process.env.IAM_SEND_WELCOME_SMS_ON_SIGNUP ?? "false"
         ).toLowerCase() === "true",
-      level: SettingLevel.SystemEnv,
+      level: SettingLevel.SystemAdminEditable,
+      label: "Send Welcome SMS On Signup",
+      group: "authentication-settings",
+      sortOrder: 190,
+      controlType: "boolean",
     },
     {
       moduleName: "solid-core",

package/src/services/sms/TwilioSMSService.ts

@@ -69,7 +69,7 @@ export class TwilioSMSService implements ISMS {
         try {
             const bodyTemplate = Handlebars.compile(smsTemplate.body);
             body = bodyTemplate(templateParams);
-        } catch (error) {
+        } catch (error: any) {
             throw new Error('Unable to compile sms template body');
         }
         // Finally send the email.
@@ -110,7 +110,7 @@ export class TwilioSMSService implements ISMS {
             }
 
             return r;
-        } catch (error) {
+        } catch (error: any) {
             throw new Error(error);
         }
     }

package/src/services/solid-introspect.service.ts

@@ -197,7 +197,7 @@ export class SolidIntrospectService implements OnApplicationBootstrap {
       let ds: DataSource | undefined;
       try {
         ds = this.moduleRef.get<DataSource>(token, { strict: false });
-      } catch (err) {
+      } catch (err: any) {
         this.logger.warn(`DataSource token for "${dsName ?? 'default'}" not found: ${err?.message ?? err}`);
       }
       if (!ds) {
@@ -209,7 +209,7 @@ export class SolidIntrospectService implements OnApplicationBootstrap {
       if (!ds.isInitialized) {
         try {
           await ds.initialize(); // only if you need to initialize here; in many apps datasources are created earlier
-        } catch (err) {
+        } catch (err: any) {
           this.logger.error(`Failed to initialize DataSource "${dsName}": ${err}`);
           continue;
         }

package/src/services/user-activity-history.service.ts

@@ -38,7 +38,7 @@ export class UserActivityHistoryService extends CRUDService<UserActivityHistory>
         ipAddress: ip,
         userAgent,
       });
-    } catch (err) {
+    } catch (err: any) {
       this._logger.warn(`Failed to log event "${event}" for user ${user?.id}: ${err}`);
     }
   }

package/src/services/view-metadata.service.ts

@@ -134,6 +134,7 @@ export class ViewMetadataService extends CRUDService<ViewMetadata> {
     let viewModes = [];
     const menuItemModelId = menuItem?.action?.model?.id;
     const menuItemModuleId = menuItem?.module?.id;
+    const collectionViewTypes = ['card', 'list', 'kanban', 'tree'];
     if (menuItemModelId && menuItemModuleId) {
       const actionQb = await this.actionMetadataService.repo.createSecurityRuleAwareQueryBuilder('action');
       const actionsForViewModes = await actionQb
@@ -142,16 +143,32 @@ export class ViewMetadataService extends CRUDService<ViewMetadata> {
         .leftJoinAndSelect('action.view', 'view')
         .where('model.id = :modelId', { modelId: menuItemModelId })
         .andWhere('module.id = :moduleId', { moduleId: menuItemModuleId })
-        .andWhere('view.type IN (:...viewTypes)', { viewTypes: ['card', 'list', 'kanban', 'tree'] })
+        .andWhere('view.type IN (:...viewTypes)', { viewTypes: collectionViewTypes })
         .getMany();
 
-      viewModes = actionsForViewModes.map(actionItem => ({
-        type: actionItem.view?.type ?? '',
-        menuItemId: menuItem.id,
-        menuItemName: menuItem.displayName,
-        actionId: actionItem.id ?? '',
-        actionName: actionItem.displayName ?? '',
-      }));
+      const canonicalActionsByViewType = new Map();
+      for (const actionItem of actionsForViewModes) {
+        const resolvedViewType = actionItem.view?.type;
+        if (!resolvedViewType || canonicalActionsByViewType.has(resolvedViewType)) {
+          continue;
+        }
+        canonicalActionsByViewType.set(resolvedViewType, actionItem);
+      }
+
+      if (action?.view?.type && collectionViewTypes.includes(action.view.type) && action?.id) {
+        canonicalActionsByViewType.set(action.view.type, action);
+      }
+
+      viewModes = collectionViewTypes
+        .map((resolvedViewType) => canonicalActionsByViewType.get(resolvedViewType))
+        .filter(Boolean)
+        .map(actionItem => ({
+          type: actionItem.view?.type ?? '',
+          menuItemId: menuItem.id,
+          menuItemName: menuItem.displayName,
+          actionId: actionItem.id ?? '',
+          actionName: actionItem.displayName ?? '',
+        }));
     }
 
     const viewId = action?.view?.id

package/src/solid-core.module.ts

@@ -1,3 +1,4 @@
+import 'multer';
 import { Global, MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
 import * as express from 'express';
 import { ConfigModule, ConfigService } from '@nestjs/config';
@@ -190,6 +191,7 @@ import { SavedFiltersController } from './controllers/saved-filters.controller';
 import { ScheduledJobController } from './controllers/scheduled-job.controller';
 import { AgentSessionController } from './controllers/agent-session.controller';
 import { AgentEventController } from './controllers/agent-event.controller';
+import { McpAuditLogController } from './controllers/mcp-audit-log.controller';
 import { SecurityRuleController } from './controllers/security-rule.controller';
 import { SettingController } from './controllers/setting.controller';
 import { InfoController } from './controllers/info.controller';
@@ -216,6 +218,7 @@ import { SavedFilters } from './entities/saved-filters.entity';
 import { ScheduledJob } from './entities/scheduled-job.entity';
 import { AgentSession } from './entities/agent-session.entity';
 import { AgentEvent } from './entities/agent-event.entity';
+import { McpAuditLog } from './entities/mcp-audit-log.entity';
 import { SecurityRule } from './entities/security-rule.entity';
 import { Setting } from './entities/setting.entity';
 import { UserActivityHistory } from './entities/user-activity-history.entity';
@@ -294,6 +297,7 @@ import { SavedFiltersRepository } from './repository/saved-filters.repository';
 import { ScheduledJobRepository } from './repository/scheduled-job.repository';
 import { AgentSessionRepository } from './repository/agent-session.repository';
 import { AgentEventRepository } from './repository/agent-event.repository';
+import { McpAuditLogRepository } from './repository/mcp-audit-log.repository';
 import { SecurityRuleRepository } from './repository/security-rule.repository';
 import { SettingRepository } from './repository/setting.repository';
 import { SmsTemplateRepository } from './repository/sms-template.repository';
@@ -343,6 +347,7 @@ import { SavedFiltersService } from './services/saved-filters.service';
 import { ScheduledJobService } from './services/scheduled-job.service';
 import { AgentSessionService } from './services/agent-session.service';
 import { AgentEventService } from './services/agent-event.service';
+import { McpAuditLogService } from './services/mcp-audit-log.service';
 import { SchedulerServiceImpl } from './services/scheduled-jobs/scheduler.service';
 import { SecurityRuleService } from './services/security-rule.service';
 import { ListOfDashboardQuestionProvidersSelectionProvider } from './services/selection-providers/list-of-dashboard-question-providers-selection-provider.service';
@@ -426,6 +431,7 @@ import { Entity } from 'typeorm';
       ScheduledJob,
       AgentSession,
       AgentEvent,
+      McpAuditLog,
       SecurityRule,
       Setting,
       SmsTemplate,
@@ -504,6 +510,7 @@ import { Entity } from 'typeorm';
     ScheduledJobController,
     AgentSessionController,
     AgentEventController,
+    McpAuditLogController,
     SecurityRuleController,
     ServiceController,
     SettingController,
@@ -773,8 +780,10 @@ import { Entity } from 'typeorm';
     ScheduledJobRepository,
     AgentSessionRepository,
     AgentEventRepository,
+    McpAuditLogRepository,
     AgentSessionService,
     AgentEventService,
+    McpAuditLogService,
     ScheduledJobSubscriber,
     AlphaNumExternalIdComputationProvider,
     ListOfValuesSubscriber,

package/src/subscribers/computed-entity-field.subscriber.ts

@@ -142,7 +142,7 @@ export class ComputedEntityFieldSubscriber implements EntitySubscriberInterface
             const providerInstance = provider.instance as IEntityPreComputeFieldProvider<any, any, any>; // IEntityComputedFieldProvider
             const computedValue = await providerInstance.preComputeValue(entity, computedFieldMetadata); //FIXME There should some way to check/assert if the provider actually has a postComputeAndSaveValue
             return computedValue; //TODO: This line here is just for backward compatibility, once the pre compute interface is change to return void, we will get rid of it.
-        } catch (error) {
+        } catch (error: any) {
             throw new InternalServerErrorException(`Error evaluating computed field ${computedFieldMetadata.fieldName} for model ${computedFieldMetadata.modelName} for triggered entity ${entity.constructor.name}: ${error.message}`);
         }
     }

package/src/subscribers/security-rule.subscriber.ts

@@ -27,19 +27,19 @@ export class SecurityRuleSubscriber implements EntitySubscriberInterface<Securit
     async afterInsert(event: InsertEvent<SecurityRule>) {
         await this.saveSecurityRules(event);
     }
-    
+
     async afterUpdate(event: UpdateEvent<SecurityRule>) {
         await this.saveSecurityRules(event);
     }
 
-    async saveSecurityRules(event: UpdateEvent<SecurityRule>| InsertEvent<SecurityRule>) {
+    async saveSecurityRules(event: UpdateEvent<SecurityRule> | InsertEvent<SecurityRule>) {
         const securityRule = event.entity as SecurityRule;
         const modelMetadata = event.entity.modelMetadata;
         if (!modelMetadata) {
             this.logger.error(`Model metadata not found for security rule with id ${event.entity.id}`);
             return;
         }
-        
+
         const modelMetadataRepo = this.dataSource.getRepository(ModelMetadata);
         const populatedModelMetadata = await modelMetadataRepo.findOne({
             where: {
@@ -58,7 +58,7 @@ export class SecurityRuleSubscriber implements EntitySubscriberInterface<Securit
         const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(populatedModelMetadata.module.name);
         try {
             await fs.access(filePath);
-        } catch (error) {
+        } catch (error: any) {
             // FIXME - Should we actually delete the security rule here, if the file is not found?
             this.logger.error(`File not found at path: ${filePath}`);
             return;
@@ -67,13 +67,13 @@ export class SecurityRuleSubscriber implements EntitySubscriberInterface<Securit
 
         if (metaData.securityRules) {
             const securityRuleIndex = metaData.securityRules?.findIndex((ruleFromFile: { name: string }) => ruleFromFile.name === securityRule.name);
-            const {id, roleId, modelMetadataId, ...requiredDto} = await this.securityRuleRepo.toDto(securityRule)
-            metaData.securityRules[securityRuleIndex] = {...requiredDto, securityRuleConfig: JSON.parse(securityRule.securityRuleConfig)}
+            const { id, roleId, modelMetadataId, ...requiredDto } = await this.securityRuleRepo.toDto(securityRule)
+            metaData.securityRules[securityRuleIndex] = { ...requiredDto, securityRuleConfig: JSON.parse(securityRule.securityRuleConfig) }
         }
         else {
             const securityRules = []
-            const {id, roleId, modelMetadataId, ...requiredDto} = await this.securityRuleRepo.toDto(securityRule)
-            securityRules.push({...requiredDto, securityRuleConfig: JSON.parse(securityRule.securityRuleConfig)})
+            const { id, roleId, modelMetadataId, ...requiredDto } = await this.securityRuleRepo.toDto(securityRule)
+            securityRules.push({ ...requiredDto, securityRuleConfig: JSON.parse(securityRule.securityRuleConfig) })
             metaData.securityRules = securityRules
         }
         // Write the updated object back to the file

package/src/subscribers/view-metadata.subscriber.ts

@@ -43,7 +43,7 @@ export class ViewMetadataSubsciber implements EntitySubscriberInterface<ViewMeta
             const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(viewMetadata.model.module.name);
             try {
                 await fs.access(filePath);
-            } catch (error) {
+            } catch (error: any) {
                 this.logger.error(`File not found at path: ${filePath}`);
                 return;
             }

package/src/testing/core/testing-engine.ts

@@ -57,7 +57,7 @@ export class TestingEngine {
         } else {
           await execute();
         }
-      } catch (err) {
+      } catch (err: any) {
         scenarioError = err;
       } finally {
         const durationMs = Date.now() - scenarioStart;
@@ -108,7 +108,7 @@ export class TestingEngine {
           // console.log(`Step ${resolvedStep.name} attempting to saveAs ${resolvedStep.saveAs}`, JSON.stringify(result));
           ctx.resources.set(resolvedStep.saveAs, result);
         }
-      } catch (err) {
+      } catch (err: any) {
         stepError = err;
         throw err;
       } finally {