@solidxai/core 0.1.8-beta.0 → 0.1.8-beta.2

package/src/services/agent-event.service.ts

@@ -0,0 +1,19 @@
+import { Injectable } from '@nestjs/common';
+import { ModuleRef } from '@nestjs/core';
+import { InjectEntityManager } from '@nestjs/typeorm';
+import { AgentEvent } from 'src/entities/agent-event.entity';
+import { AgentEventRepository } from 'src/repository/agent-event.repository';
+import { EntityManager } from 'typeorm';
+import { CRUDService } from './crud.service';
+
+@Injectable()
+export class AgentEventService extends CRUDService<AgentEvent> {
+  constructor(
+    @InjectEntityManager()
+    readonly entityManager: EntityManager,
+    readonly repo: AgentEventRepository,
+    readonly moduleRef: ModuleRef,
+  ) {
+    super(entityManager, repo, 'agentEvent', 'solid-core', moduleRef);
+  }
+}

package/src/services/agent-session.service.ts

@@ -0,0 +1,19 @@
+import { Injectable } from '@nestjs/common';
+import { ModuleRef } from '@nestjs/core';
+import { InjectEntityManager } from '@nestjs/typeorm';
+import { AgentSession } from 'src/entities/agent-session.entity';
+import { AgentSessionRepository } from 'src/repository/agent-session.repository';
+import { EntityManager } from 'typeorm';
+import { CRUDService } from './crud.service';
+
+@Injectable()
+export class AgentSessionService extends CRUDService<AgentSession> {
+  constructor(
+    @InjectEntityManager()
+    readonly entityManager: EntityManager,
+    readonly repo: AgentSessionRepository,
+    readonly moduleRef: ModuleRef,
+  ) {
+    super(entityManager, repo, 'agentSession', 'solid-core', moduleRef);
+  }
+}

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

@@ -18,7 +18,6 @@ import { ERROR_MESSAGES } from 'src/constants/error-messages';
 import qs from 'qs';
 import { ResolveS3UrlDto } from 'src/dtos/resolve-s3-url.dto';
 import { MediaStorageProviderMetadataRepository } from 'src/repository/media-storage-provider-metadata.repository';
-import { ConfigService } from '@nestjs/config';
 import { S3FileService } from './file';
 import { MediaStorageProviderMetadata } from 'src/entities/media-storage-provider-metadata.entity';
 
@@ -27,7 +26,6 @@ import { MediaStorageProviderMetadata } from 'src/entities/media-storage-provide
 export class FieldMetadataService implements OnApplicationBootstrap {
     constructor(
         private readonly fieldMetadataRepo: FieldMetadataRepository,
-        private readonly configService: ConfigService,
         private readonly fileService: S3FileService,
         private readonly mediaStorageProviderMetadataRepository: MediaStorageProviderMetadataRepository,
 
@@ -1291,7 +1289,6 @@ export class FieldMetadataService implements OnApplicationBootstrap {
     }
 
     async resolveS3Url(resolveS3UrlDto: ResolveS3UrlDto) {
-        let url = "";
         const normalizedKey = this.normalizeS3Key(resolveS3UrlDto.s3Key);
 
         let resolvedBucketName = resolveS3UrlDto.bucketName;
@@ -1308,14 +1305,11 @@ export class FieldMetadataService implements OnApplicationBootstrap {
         }
         this.logger.debug(`INSIDE::resolveS3Url:: resolvedBucketName: ${resolvedBucketName}`)
 
-        if (resolveS3UrlDto.isPrivate == "true") {
-            const expiryInSeconds = 60 * 60;
-            url = await this.fileService.getUrl(`${resolvedBucketName}:${normalizedKey}`, { expiresIn: expiryInSeconds });
-        } else {
-            url = `https://${resolvedBucketName}.s3.${this.configService.get(
-                'S3_AWS_REGION_NAME',
-            )}.amazonaws.com/${normalizedKey}`;
-        }
+        const expiryInSeconds = resolveS3UrlDto.isPrivate == "true" ? 60 * 60 : 0;
+        const url = await this.fileService.getUrl(`${resolvedBucketName}:${normalizedKey}`, {
+            expiresIn: expiryInSeconds,
+        });
+
         return { url: url }
     }
 
@@ -1332,4 +1326,3 @@ export class FieldMetadataService implements OnApplicationBootstrap {
     }
 }
 
-

package/src/services/file/disk-file.service.ts

@@ -44,7 +44,7 @@ export class DiskFileService implements IFileService {
   async write(filePath: string, data: Buffer | string, options?: WriteOptions): Promise<string> {
     await this.ensureDirectoryExists(filePath);
     await fsPromises.writeFile(filePath, data);
-    return `${this.baseUrl}/${filePath}`;
+    return this.buildUrl(filePath);
   }
 
   /**
@@ -57,7 +57,7 @@ export class DiskFileService implements IFileService {
     const writeStream = fs.createWriteStream(filePath);
     await pipeline(stream, writeStream);
     this.logger.debug(`File saved via stream: ${filePath}`);
-    return `${this.baseUrl}/${filePath}`;
+    return this.buildUrl(filePath);
   }
 
   /**
@@ -97,13 +97,10 @@ export class DiskFileService implements IFileService {
   }
 
   /**
-   * Get an accessible URL/path for the file
-   * For disk storage, returns the file path as-is
+   * Get an accessible URL for the file
    */
   async getUrl(filePath: string, options?: UrlOptions): Promise<string> {
-    // For disk storage, we simply return the path
-    // The caller is responsible for constructing a full URL if needed
-    return filePath;
+    return this.buildUrl(filePath);
   }
 
   /**
@@ -117,4 +114,15 @@ export class DiskFileService implements IFileService {
       await fsPromises.mkdir(dir, { recursive: true });
     }
   }
+
+  private buildUrl(filePath: string): string {
+    const normalizedBaseUrl = this.baseUrl.replace(/\/+$/, '');
+    const normalizedPath = filePath.replace(/^\/+/, '');
+
+    if (!normalizedBaseUrl) {
+      return `/${normalizedPath}`;
+    }
+
+    return `${normalizedBaseUrl}/${normalizedPath}`;
+  }
 }

package/src/services/media.service.ts

@@ -53,51 +53,29 @@ export class MediaService extends CRUDService<Media> {
     if (data.records) {
 
       for (const media of data.records) {
-        if (media.mediaStorageProviderMetadata?.type === MediaStorageProviderType.Filesystem) {
-          media.relativeUri = `${this.settingService.getConfigValue<SolidCoreSetting>("baseUrl")}/${this.getFullFilePathForDisk(media.relativeUri)}`;
-        } else if (media.mediaStorageProviderMetadata?.type === MediaStorageProviderType.AwsS3) {
-          media.relativeUri = this.getAwsS3FullFilePath(
-            media.relativeUri,
-            media.mediaStorageProviderMetadata.bucketName,
-            media.mediaStorageProviderMetadata.region
-          );
+        const mediaStorageProvider = media.mediaStorageProviderMetadata;
+
+        if (mediaStorageProvider?.type === MediaStorageProviderType.Filesystem) {
+          media.relativeUri = await this.diskFileService.getUrl(this.getFullFilePathForDisk(media.relativeUri));
+        } else if (mediaStorageProvider?.type === MediaStorageProviderType.AwsS3) {
+          media.relativeUri = await this.s3FileService.getUrl(`${mediaStorageProvider.bucketName}:${media.relativeUri}`, { region: mediaStorageProvider.region });
         }
       }
-      // data.records.forEach((media: Media) => {
-      //       if (media.mediaStorageProviderMetadata?.type === MediaStorageProviderType.Filesystem) {
-      //   media.relativeUri = `${process.env.BASE_URL}/${this.getFileSysytemFullFilePath(media.relativeUri)}`;
-      // } else if (media.mediaStorageProviderMetadata?.type === MediaStorageProviderType.AwsS3) {
-      //   media.relativeUri = this.getAwsS3FullFilePath(
-      //     media.relativeUri,
-      //     media.mediaStorageProviderMetadata.bucketName,
-      //     media.mediaStorageProviderMetadata.region
-      //   );
-      // }
-      // });
     }
     if (data.groupRecords) {
 
       for (const group of data.groupRecords) {
         for (const media of group.groupData.records) {
-          if (media.mediaStorageProviderMetadata?.type === MediaStorageProviderType.Filesystem) {
-            media.relativeUri = `${this.settingService.getConfigValue<SolidCoreSetting>("baseUrl")}/${this.getFullFilePathForDisk(media.relativeUri)}`;
+          const mediaStorageProvider = media.mediaStorageProviderMetadata;
+
+          if (mediaStorageProvider?.type === MediaStorageProviderType.Filesystem) {
+            media.relativeUri = await this.diskFileService.getUrl(this.getFullFilePathForDisk(media.relativeUri));
           }
-          else if (media.mediaStorageProviderMetadata?.type === MediaStorageProviderType.AwsS3) {
-            media.relativeUri = this.getAwsS3FullFilePath(media.relativeUri, media.mediaStorageProviderMetadata.bucketName, media.mediaStorageProviderMetadata.region);
+          else if (mediaStorageProvider?.type === MediaStorageProviderType.AwsS3) {
+            media.relativeUri = await this.s3FileService.getUrl(`${mediaStorageProvider.bucketName}:${media.relativeUri}`, { region: mediaStorageProvider.region });
           }
         }
       }
-
-      // data.groupRecords.forEach((group) => {
-      //   group.groupData.records.forEach((media) => {
-      //     if (media.mediaStorageProviderMetadata?.type === MediaStorageProviderType.Filesystem) {
-      //       media.relativeUri = `${process.env.BASE_URL}/${this.getFileSysytemFullFilePath(media.relativeUri)}`;
-      //     }
-      //     else if (media.mediaStorageProviderMetadata?.type === MediaStorageProviderType.AwsS3) {
-      //       media.relativeUri = this.getAwsS3FullFilePath(media.relativeUri, media.mediaStorageProviderMetadata.bucketName, media.mediaStorageProviderMetadata.region);
-      //     }
-      //   });
-      // });
     }
     return data
   }
@@ -172,24 +150,12 @@ export class MediaService extends CRUDService<Media> {
       }
     }
     );
-    // if (media.mediaStorageProviderMetadata.type === 'filesystem') {
-    //     const fileStorageProvider = new FileStorageProvider(this.configService, this.fileService, this);
-
-    //     await fileStorageProvider.delete(media, media.fieldMetadata);
-
-    // } else if (media.mediaStorageProviderMetadata.type === 'aws-s3') {
-    //     const fileStorageProvider = new FileS3StorageProvider(this.configService, this.fileService, this);
-    //     await fileStorageProvider.delete(media, media.fieldMetadata);
-
-    // } else {
-    // }
     const storageProviderType = media.mediaStorageProviderMetadata.type as MediaStorageProviderType;
     const storageProvider = await getMediaStorageProvider(this.moduleRef, storageProviderType);
     await storageProvider.delete(modelEntity, media.fieldMetadata);
 
     return this.repo.remove(media);
   }
-  //TODO: Move this to a app builder config
 
   private getFullFilePathForDisk(fileName: string): string {
     const base = this.settingService.getConfigValue<SolidCoreSetting>("fileStorageDir")
@@ -200,11 +166,6 @@ export class MediaService extends CRUDService<Media> {
     return `${base}/${fileName}`;
   }
 
-  private getAwsS3FullFilePath(awsMediaurl: string, bucketName: string, regionName: string): string {
-    // https://lunarismedia.s3.ap-south-1.amazonaws.com/LUNARIS_CP_REGISTRATION_CREATIVE.jpg
-    return `https://${bucketName}.s3.${regionName}.amazonaws.com/${awsMediaurl}`;
-  }
-
   private getFileName(file: Express.Multer.File): string {
     return `${file.filename}-${file.originalname}`;
   }

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

@@ -551,6 +551,7 @@ export class ModelMetadataService {
     return removedEntities
   }
 
+  @DisallowInProduction()
   async remove(id: number) {
     const entity = await this.findOne(id);
     await this.cleanupOnDelete(entity.id);

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

@@ -326,15 +326,14 @@ export class ModuleMetadataService {
     }
   }
 
+  @DisallowInProduction()
   async remove(id: number) {
     const entity = await this.findOne(id);
     await this.cleanupOnDelete(entity.id);
     const r = await this.moduleMetadataRepo.remove(entity);
     return r
-
   }
 
-
   async cleanupOnDelete(moduleEntityId: number) {
     const moduleEntity = await this.moduleMetadataRepo.findOne({
       where: {

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

@@ -34,8 +34,8 @@ const getSolidCoreSettings = (isProd: boolean) => ([
   { moduleName: "solid-core", key: "authScreenCenterBackgroundImage", value: null, level: SettingLevel.SystemAdminEditable },
   {
     moduleName: "solid-core", key: "solidXGenAiCodeBuilderConfig", value: JSON.stringify({
-      defaultProvider: "",
-      availableProviders: []
+      fastModel: { provider: "", availableProviders: [] },
+      defaultProvider: { provider: "", availableProviders: [] },
     }), level: SettingLevel.SystemAdminEditable
   },
   { moduleName: "solid-core", key: "mcpEnabled", value: process.env.MCP_ENABLED || false, level: SettingLevel.SystemAdminReadonly },

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

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import { InjectEntityManager } from '@nestjs/typeorm';
 import { ModuleRef } from "@nestjs/core";
 import { EntityManager } from 'typeorm';
@@ -13,6 +13,8 @@ import { UserActivityHistoryRepository } from 'src/repository/user-activity-hist
 
 @Injectable()
 export class UserActivityHistoryService extends CRUDService<UserActivityHistory> {
+  private readonly _logger = new Logger(UserActivityHistoryService.name);
+
   constructor(
     @InjectEntityManager()
     readonly entityManager: EntityManager,
@@ -26,15 +28,19 @@ export class UserActivityHistoryService extends CRUDService<UserActivityHistory>
     super(entityManager, repo, 'userActivityHistory', 'solid-core', moduleRef);
   }
   async logEvent(event: 'login' | 'logout' | 'tokenRefreshed', user: User) {
-    const ip = this.requestContextService.getIp();
-    const userAgent = this.requestContextService.getUserAgent();
-
-    await this.repo.save({
-      user,
-      event,
-      ipAddress: ip,
-      userAgent,
-    });
+    try {
+      const ip = this.requestContextService.getIp();
+      const userAgent = this.requestContextService.getUserAgent();
+
+      await this.repo.save({
+        user,
+        event,
+        ipAddress: ip,
+        userAgent,
+      });
+    } catch (err) {
+      this._logger.warn(`Failed to log event "${event}" for user ${user?.id}: ${err}`);
+    }
   }
 
 }

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

@@ -144,7 +144,7 @@ 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: ['list', 'kanban', 'tree'] })
+        .andWhere('view.type IN (:...viewTypes)', { viewTypes: ['card', 'list', 'kanban', 'tree'] })
         .getMany();
 
       viewModes = actionsForViewModes.map(actionItem => ({

package/src/solid-core.module.ts

@@ -173,6 +173,8 @@ import { LocaleController } from './controllers/locale.controller';
 import { RoleMetadataController } from './controllers/role-metadata.controller';
 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 { SecurityRuleController } from './controllers/security-rule.controller';
 import { SettingController } from './controllers/setting.controller';
 import { InfoController } from './controllers/info.controller';
@@ -197,6 +199,8 @@ import { Locale } from './entities/locale.entity';
 import { RoleMetadata } from './entities/role-metadata.entity';
 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 { SecurityRule } from './entities/security-rule.entity';
 import { Setting } from './entities/setting.entity';
 import { UserActivityHistory } from './entities/user-activity-history.entity';
@@ -273,6 +277,8 @@ import { PermissionMetadataRepository } from './repository/permission-metadata.r
 import { RoleMetadataRepository } from './repository/role-metadata.repository';
 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 { SecurityRuleRepository } from './repository/security-rule.repository';
 import { SettingRepository } from './repository/setting.repository';
 import { SmsTemplateRepository } from './repository/sms-template.repository';
@@ -319,6 +325,8 @@ import { RequestContextService } from './services/request-context.service';
 import { RoleMetadataService } from './services/role-metadata.service';
 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 { 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';
@@ -401,6 +409,8 @@ import { Entity } from 'typeorm';
       RoleMetadata,
       SavedFilters,
       ScheduledJob,
+      AgentSession,
+      AgentEvent,
       SecurityRule,
       Setting,
       SmsTemplate,
@@ -474,6 +484,8 @@ import { Entity } from 'typeorm';
     RoleMetadataController,
     SavedFiltersController,
     ScheduledJobController,
+    AgentSessionController,
+    AgentEventController,
     SecurityRuleController,
     ServiceController,
     SettingController,
@@ -735,6 +747,10 @@ import { Entity } from 'typeorm';
 
     ViewMetadataRepository,
     ScheduledJobRepository,
+    AgentSessionRepository,
+    AgentEventRepository,
+    AgentSessionService,
+    AgentEventService,
     ScheduledJobSubscriber,
     AlphaNumExternalIdComputationProvider,
     ListOfValuesSubscriber,