@flusys/nestjs-storage 5.1.2 → 5.2.0

package/cjs/controllers/upload.controller.js

@@ -1,3 +1,4 @@
+/// <reference types="multer" />
 "use strict";
 Object.defineProperty(exports, "__esModule", {
     value: true

package/cjs/services/file-manager.service.js

@@ -103,13 +103,10 @@ const DEFAULT_SELECT_FIELDS = [
     'createdAt',
     'deletedAt'
 ];
-let FileManagerService = class FileManagerService extends _classes.RequestScopedApiService {
+let FileManagerService = class FileManagerService extends _classes.ApiService {
     resolveEntity() {
         return this.storageConfig.isCompanyFeatureEnabled() ? _entities.FileManagerWithCompany : _entities.FileManager;
     }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
     // ─── Override Methods ───────────────────────────────────────────────────────
     async convertSingleDtoToEntity(dto, user) {
         let entity = {};
@@ -196,7 +193,7 @@ let FileManagerService = class FileManagerService extends _classes.RequestScoped
     }
     // ─── Public Methods ─────────────────────────────────────────────────────────
     async getFiles(dtos, protocol, host, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const ids = dtos.map((d)=>d.id).filter(Boolean);
         if (!ids.length) throw new _common.BadRequestException({
             message: 'No valid file IDs provided',
@@ -364,7 +361,7 @@ let FileManagerService = class FileManagerService extends _classes.RequestScoped
         };
     }
     constructor(cacheManager, utilsService, uploadService, storageConfig, dataSourceProvider){
-        super('file_manager', null, cacheManager, utilsService, FileManagerService.name, true, 'storage'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "uploadService", void 0), _define_property(this, "storageConfig", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.uploadService = uploadService, this.storageConfig = storageConfig, this.dataSourceProvider = dataSourceProvider;
+        super('file_manager', cacheManager, utilsService, FileManagerService.name, true, 'storage', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "uploadService", void 0), _define_property(this, "storageConfig", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.uploadService = uploadService, this.storageConfig = storageConfig, this.dataSourceProvider = dataSourceProvider;
     }
 };
 FileManagerService = _ts_decorate([

package/cjs/services/folder.service.js

@@ -42,13 +42,10 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-let FolderService = class FolderService extends _classes.RequestScopedApiService {
+let FolderService = class FolderService extends _classes.ApiService {
     resolveEntity() {
         return this.storageConfig.isCompanyFeatureEnabled() ? _entities.FolderWithCompany : _entities.Folder;
     }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
     // ─── Override Methods ───────────────────────────────────────────────────────
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
@@ -85,7 +82,7 @@ let FolderService = class FolderService extends _classes.RequestScopedApiService
         return result;
     }
     constructor(cacheManager, utilsService, storageConfig, dataSourceProvider){
-        super('folder', null, cacheManager, utilsService, FolderService.name, true, 'storage'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "storageConfig", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.storageConfig = storageConfig, this.dataSourceProvider = dataSourceProvider;
+        super('folder', cacheManager, utilsService, FolderService.name, true, 'storage', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "storageConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.storageConfig = storageConfig;
     }
 };
 FolderService = _ts_decorate([

package/cjs/services/storage-datasource.provider.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "StorageDataSourceProvider", {
         return StorageDataSourceProvider;
     }
 });
-const _constants = require("@flusys/nestjs-shared/constants");
 const _modules = require("@flusys/nestjs-shared/modules");
 const _common = require("@nestjs/common");
 const _core = require("@nestjs/core");
@@ -83,8 +82,7 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let StorageDataSourceProvider = class StorageDataSourceProvider extends _modules.MultiTenantDataSourceService {
-    // Factory Methods
-    /** Build parent options from StorageModuleOptions */ static buildParentOptions(options) {
+    static buildParentOptions(options) {
         return {
             bootstrapAppConfig: options.bootstrapAppConfig,
             defaultDatabaseConfig: options.config?.defaultDatabaseConfig,
@@ -92,19 +90,10 @@ let StorageDataSourceProvider = class StorageDataSourceProvider extends _modules
             tenants: options.config?.tenants
         };
     }
-    // Feature Flags
-    /**
-   * Get enable company feature for specific tenant
-   * Falls back to global setting if not specified per-tenant
-   */ getEnableCompanyFeatureForTenant(tenant) {
+    getEnableCompanyFeatureForTenant(tenant) {
         return tenant?.enableCompanyFeature ?? this.configService.isCompanyFeatureEnabled();
     }
-    // Entity Management
-    /**
-   * Get storage entities for migrations based on company feature flag.
-   * For TypeORM repositories, we always use the base entities (FileManager, etc.)
-   * but for migrations, we need the correct entity based on the feature flag.
-   */ async getStorageEntities(enableCompanyFeature) {
+    async getStorageEntities(enableCompanyFeature) {
         const enable = enableCompanyFeature ?? this.configService.isCompanyFeatureEnabled();
         const entities = await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("../entities")));
         return enable ? [
@@ -117,72 +106,16 @@ let StorageDataSourceProvider = class StorageDataSourceProvider extends _modules
             entities.StorageConfig
         ];
     }
-    // Overrides
-    /** Override to dynamically set entities based on tenant config */ async createDataSourceFromConfig(config) {
+    async createDataSourceFromConfig(config) {
         const currentTenant = this.getCurrentTenant();
         const enableCompanyFeature = this.getEnableCompanyFeatureForTenant(currentTenant ?? undefined);
         const entities = await this.getStorageEntities(enableCompanyFeature);
         return super.createDataSourceFromConfig(config, entities);
     }
-    /**
-   * Override to use Storage-specific static cache
-   */ async getSingleDataSource() {
-        // Return existing initialized connection from Storage-specific cache
-        if (StorageDataSourceProvider.singleDataSource?.isInitialized) {
-            return StorageDataSourceProvider.singleDataSource;
-        }
-        // If another request is creating the connection, wait for it
-        if (StorageDataSourceProvider.singleConnectionLock) {
-            return StorageDataSourceProvider.singleConnectionLock;
-        }
-        const config = this.getDefaultDatabaseConfig();
-        if (!config) {
-            throw new _common.InternalServerErrorException({
-                message: 'No database config available. Provide defaultDatabaseConfig or tenantDefaultDatabaseConfig.',
-                messageKey: _constants.SYSTEM_MESSAGES.DATABASE_CONFIG_NOT_AVAILABLE
-            });
-        }
-        // Create connection with lock to prevent race conditions
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        StorageDataSourceProvider.singleConnectionLock = connectionPromise;
-        try {
-            const dataSource = await connectionPromise;
-            StorageDataSourceProvider.singleDataSource = dataSource;
-            return dataSource;
-        } finally{
-            StorageDataSourceProvider.singleConnectionLock = null;
-        }
-    }
-    /**
-   * Override to use Storage-specific static cache for tenant connections
-   */ async getOrCreateTenantConnection(tenant) {
-        // Return existing initialized connection from Storage-specific cache
-        const existing = StorageDataSourceProvider.tenantConnections.get(tenant.id);
-        if (existing?.isInitialized) {
-            return existing;
-        }
-        // If another request is creating this tenant's connection, wait for it
-        const pendingConnection = StorageDataSourceProvider.connectionLocks.get(tenant.id);
-        if (pendingConnection) {
-            return pendingConnection;
-        }
-        // Create connection with lock to prevent race conditions
-        const config = this.buildTenantDatabaseConfig(tenant);
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        StorageDataSourceProvider.connectionLocks.set(tenant.id, connectionPromise);
-        try {
-            const dataSource = await connectionPromise;
-            StorageDataSourceProvider.tenantConnections.set(tenant.id, dataSource);
-            return dataSource;
-        } finally{
-            StorageDataSourceProvider.connectionLocks.delete(tenant.id);
-        }
-    }
     constructor(configService, request){
         super(StorageDataSourceProvider.buildParentOptions(configService.getOptions()), request), _define_property(this, "configService", void 0), this.configService = configService;
     }
 };
-// Override parent's static properties to have Storage-specific cache
 _define_property(StorageDataSourceProvider, "tenantConnections", new Map());
 _define_property(StorageDataSourceProvider, "singleDataSource", null);
 _define_property(StorageDataSourceProvider, "tenantsRegistry", new Map());

package/cjs/services/storage-provider-config.service.js

@@ -42,13 +42,10 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-let StorageProviderConfigService = class StorageProviderConfigService extends _classes.RequestScopedApiService {
+let StorageProviderConfigService = class StorageProviderConfigService extends _classes.ApiService {
     resolveEntity() {
         return this.storageConfig.isCompanyFeatureEnabled() ? _entities.StorageConfigWithCompany : _entities.StorageConfig;
     }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
     // ─── Override Methods ───────────────────────────────────────────────────────
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
@@ -89,7 +86,7 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
         return result;
     }
     async findByIdDirect(id) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         return await this.repository.findOne({
             where: {
                 id
@@ -97,7 +94,7 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
         });
     }
     async getDefaultConfig(user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const baseWhere = (0, _utils.buildCompanyWhereCondition)({
             isActive: true
         }, this.storageConfig.isCompanyFeatureEnabled(), user);
@@ -121,7 +118,7 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
         });
     }
     async getConfigByType(storage, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const where = (0, _utils.buildCompanyWhereCondition)({
             storage,
             isActive: true
@@ -131,7 +128,7 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
         });
     }
     constructor(cacheManager, utilsService, storageConfig, dataSourceProvider){
-        super('storageConfig', null, cacheManager, utilsService, StorageProviderConfigService.name, true, 'storage'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "storageConfig", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.storageConfig = storageConfig, this.dataSourceProvider = dataSourceProvider;
+        super('storageConfig', cacheManager, utilsService, StorageProviderConfigService.name, true, 'storage', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "storageConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.storageConfig = storageConfig;
     }
 };
 StorageProviderConfigService = _ts_decorate([

package/controllers/file-manager.controller.d.ts

@@ -4,19 +4,19 @@ import { CreateFileManagerDto, FileManagerResponseDto, FilesResponseDto, GetFile
 import { Request } from 'express';
 import { FileManagerService } from '../services/file-manager.service';
 declare const FileManagerController_base: abstract new (service: FileManagerService) => {
-    readonly enabledEndpoints: import("@flusys/nestjs-shared/classes").ApiEndpoint[] | "all";
+    readonly enabledEndpoints: import("@flusys/nestjs-shared").ApiEndpoint[] | "all";
     service: FileManagerService;
-    isEnabled(endpoint: import("@flusys/nestjs-shared/classes").ApiEndpoint): boolean;
+    isEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): boolean;
     insert(addDto: CreateFileManagerDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FileManagerResponseDto>>;
-    insertMany(addDto: CreateFileManagerDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared/dtos").BulkResponseDto<FileManagerResponseDto>>;
-    getById(id: string, body: import("@flusys/nestjs-shared/dtos").GetByIdBodyDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FileManagerResponseDto>>;
-    getByIds(body: import("@flusys/nestjs-shared/dtos").GetByIdsDto, user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared/dtos").ListResponseDto<FileManagerResponseDto>>;
+    insertMany(addDto: CreateFileManagerDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<FileManagerResponseDto>>;
+    getById(id: string, body: import("@flusys/nestjs-shared").GetByIdBodyDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FileManagerResponseDto>>;
+    getByIds(body: import("@flusys/nestjs-shared").GetByIdsDto, user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").ListResponseDto<FileManagerResponseDto>>;
     update(updateDto: UpdateFileManagerDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FileManagerResponseDto>>;
-    updateMany(updateDtos: UpdateFileManagerDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared/dtos").BulkResponseDto<FileManagerResponseDto>>;
-    bulkUpsert(dtos: (CreateFileManagerDto | UpdateFileManagerDto)[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared/dtos").BulkResponseDto<FileManagerResponseDto>>;
+    updateMany(updateDtos: UpdateFileManagerDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<FileManagerResponseDto>>;
+    bulkUpsert(dtos: (CreateFileManagerDto | UpdateFileManagerDto)[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<FileManagerResponseDto>>;
     getByFilter(filter: Record<string, any>, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FileManagerResponseDto>>;
-    getAll(filterAndPaginationDto: import("@flusys/nestjs-shared/dtos").FilterAndPaginationDto, user: ILoggedUserInfo | null, search?: string): Promise<import("@flusys/nestjs-shared/dtos").ListResponseDto<FileManagerResponseDto>>;
-    delete(deleteDto: import("@flusys/nestjs-shared/dtos").DeleteDto, user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared/dtos").MessageResponseDto>;
+    getAll(filterAndPaginationDto: import("@flusys/nestjs-shared").FilterAndPaginationDto, user: ILoggedUserInfo | null, search?: string): Promise<import("@flusys/nestjs-shared").ListResponseDto<FileManagerResponseDto>>;
+    delete(deleteDto: import("@flusys/nestjs-shared").DeleteDto, user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").MessageResponseDto>;
 };
 export declare class FileManagerController extends FileManagerController_base {
     protected fileService: FileManagerService;

package/controllers/folder.controller.d.ts

@@ -1,9 +1,9 @@
 import { CreateFolderDto, FolderResponseDto, UpdateFolderDto } from '../dtos';
 import { FolderService } from '../services/folder.service';
 declare const FolderController_base: abstract new (service: FolderService) => {
-    readonly enabledEndpoints: import("@flusys/nestjs-shared/classes").ApiEndpoint[] | "all";
+    readonly enabledEndpoints: import("@flusys/nestjs-shared").ApiEndpoint[] | "all";
     service: FolderService;
-    isEnabled(endpoint: import("@flusys/nestjs-shared/classes").ApiEndpoint): boolean;
+    isEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): boolean;
     insert(addDto: CreateFolderDto, user: import("@flusys/nestjs-shared").ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").SingleResponseDto<FolderResponseDto>>;
     insertMany(addDto: CreateFolderDto[], user: import("@flusys/nestjs-shared").ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<FolderResponseDto>>;
     getById(id: string, body: import("@flusys/nestjs-shared").GetByIdBodyDto, user: import("@flusys/nestjs-shared").ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").SingleResponseDto<FolderResponseDto>>;

package/controllers/storage-config.controller.d.ts

@@ -1,9 +1,9 @@
 import { CreateStorageConfigDto, StorageConfigResponseDto, UpdateStorageConfigDto } from '../dtos';
 import { StorageProviderConfigService } from '../services/storage-provider-config.service';
 declare const StorageConfigController_base: abstract new (service: StorageProviderConfigService) => {
-    readonly enabledEndpoints: import("@flusys/nestjs-shared/classes").ApiEndpoint[] | "all";
+    readonly enabledEndpoints: import("@flusys/nestjs-shared").ApiEndpoint[] | "all";
     service: StorageProviderConfigService;
-    isEnabled(endpoint: import("@flusys/nestjs-shared/classes").ApiEndpoint): boolean;
+    isEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): boolean;
     insert(addDto: CreateStorageConfigDto, user: import("@flusys/nestjs-shared").ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").SingleResponseDto<StorageConfigResponseDto>>;
     insertMany(addDto: CreateStorageConfigDto[], user: import("@flusys/nestjs-shared").ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<StorageConfigResponseDto>>;
     getById(id: string, body: import("@flusys/nestjs-shared").GetByIdBodyDto, user: import("@flusys/nestjs-shared").ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").SingleResponseDto<StorageConfigResponseDto>>;

package/fesm/controllers/upload.controller.js

@@ -25,6 +25,7 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
+/// <reference types="multer" />
 import { UPLOAD_CONFIG_PERMISSIONS } from '@flusys/nestjs-shared';
 import { ApiResponseDto, CurrentUser, RequirePermission } from '@flusys/nestjs-shared/decorators';
 import { JwtAuthGuard, PermissionGuard } from '@flusys/nestjs-shared/guards';

package/fesm/services/file-manager.service.js

@@ -25,7 +25,7 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
+import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { applyCompanyFilter } from '@flusys/nestjs-shared/utils';
 import { BadRequestException, Inject, Injectable, NotFoundException, Scope } from '@nestjs/common';
@@ -52,13 +52,10 @@ const DEFAULT_SELECT_FIELDS = [
     'createdAt',
     'deletedAt'
 ];
-export class FileManagerService extends RequestScopedApiService {
+export class FileManagerService extends ApiService {
     resolveEntity() {
         return this.storageConfig.isCompanyFeatureEnabled() ? FileManagerWithCompany : FileManager;
     }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
     // ─── Override Methods ───────────────────────────────────────────────────────
     async convertSingleDtoToEntity(dto, user) {
         let entity = {};
@@ -145,7 +142,7 @@ export class FileManagerService extends RequestScopedApiService {
     }
     // ─── Public Methods ─────────────────────────────────────────────────────────
     async getFiles(dtos, protocol, host, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const ids = dtos.map((d)=>d.id).filter(Boolean);
         if (!ids.length) throw new BadRequestException({
             message: 'No valid file IDs provided',
@@ -313,7 +310,7 @@ export class FileManagerService extends RequestScopedApiService {
         };
     }
     constructor(cacheManager, utilsService, uploadService, storageConfig, dataSourceProvider){
-        super('file_manager', null, cacheManager, utilsService, FileManagerService.name, true, 'storage'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "uploadService", void 0), _define_property(this, "storageConfig", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.uploadService = uploadService, this.storageConfig = storageConfig, this.dataSourceProvider = dataSourceProvider;
+        super('file_manager', cacheManager, utilsService, FileManagerService.name, true, 'storage', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "uploadService", void 0), _define_property(this, "storageConfig", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.uploadService = uploadService, this.storageConfig = storageConfig, this.dataSourceProvider = dataSourceProvider;
     }
 }
 FileManagerService = _ts_decorate([

package/fesm/services/folder.service.js

@@ -25,20 +25,17 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
+import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { applyCompanyFilter } from '@flusys/nestjs-shared/utils';
 import { Inject, Injectable, Scope } from '@nestjs/common';
 import { Folder, FolderWithCompany } from '../entities';
 import { StorageConfigService } from './storage-config.service';
 import { StorageDataSourceProvider } from './storage-datasource.provider';
-export class FolderService extends RequestScopedApiService {
+export class FolderService extends ApiService {
     resolveEntity() {
         return this.storageConfig.isCompanyFeatureEnabled() ? FolderWithCompany : Folder;
     }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
     // ─── Override Methods ───────────────────────────────────────────────────────
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
@@ -75,7 +72,7 @@ export class FolderService extends RequestScopedApiService {
         return result;
     }
     constructor(cacheManager, utilsService, storageConfig, dataSourceProvider){
-        super('folder', null, cacheManager, utilsService, FolderService.name, true, 'storage'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "storageConfig", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.storageConfig = storageConfig, this.dataSourceProvider = dataSourceProvider;
+        super('folder', cacheManager, utilsService, FolderService.name, true, 'storage', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "storageConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.storageConfig = storageConfig;
     }
 }
 FolderService = _ts_decorate([

package/fesm/services/storage-datasource.provider.js

@@ -25,15 +25,13 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { SYSTEM_MESSAGES } from '@flusys/nestjs-shared/constants';
 import { MultiTenantDataSourceService } from '@flusys/nestjs-shared/modules';
-import { Inject, Injectable, InternalServerErrorException, Optional, Scope } from '@nestjs/common';
+import { Inject, Injectable, Optional, Scope } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { Request } from 'express';
 import { StorageConfigService } from './storage-config.service';
 export class StorageDataSourceProvider extends MultiTenantDataSourceService {
-    // Factory Methods
-    /** Build parent options from StorageModuleOptions */ static buildParentOptions(options) {
+    static buildParentOptions(options) {
         return {
             bootstrapAppConfig: options.bootstrapAppConfig,
             defaultDatabaseConfig: options.config?.defaultDatabaseConfig,
@@ -41,19 +39,10 @@ export class StorageDataSourceProvider extends MultiTenantDataSourceService {
             tenants: options.config?.tenants
         };
     }
-    // Feature Flags
-    /**
-   * Get enable company feature for specific tenant
-   * Falls back to global setting if not specified per-tenant
-   */ getEnableCompanyFeatureForTenant(tenant) {
+    getEnableCompanyFeatureForTenant(tenant) {
         return tenant?.enableCompanyFeature ?? this.configService.isCompanyFeatureEnabled();
     }
-    // Entity Management
-    /**
-   * Get storage entities for migrations based on company feature flag.
-   * For TypeORM repositories, we always use the base entities (FileManager, etc.)
-   * but for migrations, we need the correct entity based on the feature flag.
-   */ async getStorageEntities(enableCompanyFeature) {
+    async getStorageEntities(enableCompanyFeature) {
         const enable = enableCompanyFeature ?? this.configService.isCompanyFeatureEnabled();
         const entities = await import('../entities');
         return enable ? [
@@ -66,72 +55,16 @@ export class StorageDataSourceProvider extends MultiTenantDataSourceService {
             entities.StorageConfig
         ];
     }
-    // Overrides
-    /** Override to dynamically set entities based on tenant config */ async createDataSourceFromConfig(config) {
+    async createDataSourceFromConfig(config) {
         const currentTenant = this.getCurrentTenant();
         const enableCompanyFeature = this.getEnableCompanyFeatureForTenant(currentTenant ?? undefined);
         const entities = await this.getStorageEntities(enableCompanyFeature);
         return super.createDataSourceFromConfig(config, entities);
     }
-    /**
-   * Override to use Storage-specific static cache
-   */ async getSingleDataSource() {
-        // Return existing initialized connection from Storage-specific cache
-        if (StorageDataSourceProvider.singleDataSource?.isInitialized) {
-            return StorageDataSourceProvider.singleDataSource;
-        }
-        // If another request is creating the connection, wait for it
-        if (StorageDataSourceProvider.singleConnectionLock) {
-            return StorageDataSourceProvider.singleConnectionLock;
-        }
-        const config = this.getDefaultDatabaseConfig();
-        if (!config) {
-            throw new InternalServerErrorException({
-                message: 'No database config available. Provide defaultDatabaseConfig or tenantDefaultDatabaseConfig.',
-                messageKey: SYSTEM_MESSAGES.DATABASE_CONFIG_NOT_AVAILABLE
-            });
-        }
-        // Create connection with lock to prevent race conditions
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        StorageDataSourceProvider.singleConnectionLock = connectionPromise;
-        try {
-            const dataSource = await connectionPromise;
-            StorageDataSourceProvider.singleDataSource = dataSource;
-            return dataSource;
-        } finally{
-            StorageDataSourceProvider.singleConnectionLock = null;
-        }
-    }
-    /**
-   * Override to use Storage-specific static cache for tenant connections
-   */ async getOrCreateTenantConnection(tenant) {
-        // Return existing initialized connection from Storage-specific cache
-        const existing = StorageDataSourceProvider.tenantConnections.get(tenant.id);
-        if (existing?.isInitialized) {
-            return existing;
-        }
-        // If another request is creating this tenant's connection, wait for it
-        const pendingConnection = StorageDataSourceProvider.connectionLocks.get(tenant.id);
-        if (pendingConnection) {
-            return pendingConnection;
-        }
-        // Create connection with lock to prevent race conditions
-        const config = this.buildTenantDatabaseConfig(tenant);
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        StorageDataSourceProvider.connectionLocks.set(tenant.id, connectionPromise);
-        try {
-            const dataSource = await connectionPromise;
-            StorageDataSourceProvider.tenantConnections.set(tenant.id, dataSource);
-            return dataSource;
-        } finally{
-            StorageDataSourceProvider.connectionLocks.delete(tenant.id);
-        }
-    }
     constructor(configService, request){
         super(StorageDataSourceProvider.buildParentOptions(configService.getOptions()), request), _define_property(this, "configService", void 0), this.configService = configService;
     }
 }
-// Override parent's static properties to have Storage-specific cache
 _define_property(StorageDataSourceProvider, "tenantConnections", new Map());
 _define_property(StorageDataSourceProvider, "singleDataSource", null);
 _define_property(StorageDataSourceProvider, "tenantsRegistry", new Map());

package/fesm/services/storage-provider-config.service.js

@@ -25,20 +25,17 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
+import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { applyCompanyFilter, buildCompanyWhereCondition } from '@flusys/nestjs-shared/utils';
 import { Inject, Injectable, Scope } from '@nestjs/common';
 import { StorageConfig, StorageConfigWithCompany } from '../entities';
 import { StorageConfigService } from './storage-config.service';
 import { StorageDataSourceProvider } from './storage-datasource.provider';
-export class StorageProviderConfigService extends RequestScopedApiService {
+export class StorageProviderConfigService extends ApiService {
     resolveEntity() {
         return this.storageConfig.isCompanyFeatureEnabled() ? StorageConfigWithCompany : StorageConfig;
     }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
     // ─── Override Methods ───────────────────────────────────────────────────────
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
@@ -79,7 +76,7 @@ export class StorageProviderConfigService extends RequestScopedApiService {
         return result;
     }
     async findByIdDirect(id) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         return await this.repository.findOne({
             where: {
                 id
@@ -87,7 +84,7 @@ export class StorageProviderConfigService extends RequestScopedApiService {
         });
     }
     async getDefaultConfig(user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const baseWhere = buildCompanyWhereCondition({
             isActive: true
         }, this.storageConfig.isCompanyFeatureEnabled(), user);
@@ -111,7 +108,7 @@ export class StorageProviderConfigService extends RequestScopedApiService {
         });
     }
     async getConfigByType(storage, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const where = buildCompanyWhereCondition({
             storage,
             isActive: true
@@ -121,7 +118,7 @@ export class StorageProviderConfigService extends RequestScopedApiService {
         });
     }
     constructor(cacheManager, utilsService, storageConfig, dataSourceProvider){
-        super('storageConfig', null, cacheManager, utilsService, StorageProviderConfigService.name, true, 'storage'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "storageConfig", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.storageConfig = storageConfig, this.dataSourceProvider = dataSourceProvider;
+        super('storageConfig', cacheManager, utilsService, StorageProviderConfigService.name, true, 'storage', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "storageConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.storageConfig = storageConfig;
     }
 }
 StorageProviderConfigService = _ts_decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-storage",
-  "version": "5.1.2",
+  "version": "5.2.0",
   "description": "Modular storage package with optional AWS S3, Azure Blob, and SFTP providers",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -85,25 +85,25 @@
     }
   },
   "peerDependencies": {
-    "@nestjs/common": "^10.0.0 || ^11.0.0",
-    "@nestjs/config": "^3.0.0 || ^4.0.0",
-    "@nestjs/core": "^10.0.0 || ^11.0.0",
-    "@nestjs/platform-express": "^10.0.0 || ^11.0.0",
-    "@nestjs/swagger": "^7.0.0 || ^11.0.0",
-    "@nestjs/typeorm": "^10.0.0 || ^11.0.0",
-    "class-transformer": "^0.5.0",
-    "class-validator": "^0.14.0",
+    "@nestjs/common": "^11.0.0",
+    "@nestjs/config": "^4.0.0",
+    "@nestjs/core": "^11.0.0",
+    "@nestjs/platform-express": "^11.0.0",
+    "@nestjs/swagger": "^11.0.0",
+    "@nestjs/typeorm": "^11.0.0",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.0 || ^0.15.0",
     "typeorm": "^0.3.0",
-    "multer": "^2.0.0",
+    "multer": "^2.1.0",
     "sharp": "^0.34.0",
-    "mime-types": "^2.1.0",
-    "uuid": "^9.0.0 || ^11.0.0",
-    "@aws-sdk/client-s3": "^3.400.0",
-    "@aws-sdk/lib-storage": "^3.400.0",
-    "@aws-sdk/s3-request-presigner": "^3.400.0",
-    "@azure/storage-blob": "^12.15.0",
-    "ssh2-sftp-client": "^12.0.0",
-    "express": "^4.18.0"
+    "mime-types": "^2.1.0 || ^3.0.0",
+    "uuid": "^11.0.0",
+    "@aws-sdk/client-s3": "^3.900.0",
+    "@aws-sdk/lib-storage": "^3.900.0",
+    "@aws-sdk/s3-request-presigner": "^3.900.0",
+    "@azure/storage-blob": "^12.29.0",
+    "ssh2-sftp-client": "^12.1.0",
+    "express": "^4.18.0 || ^5.0.0"
   },
   "peerDependenciesMeta": {
     "sharp": {
@@ -129,7 +129,7 @@
     }
   },
   "dependencies": {
-    "@flusys/nestjs-core": "5.1.2",
-    "@flusys/nestjs-shared": "5.1.2"
+    "@flusys/nestjs-core": "5.2.0",
+    "@flusys/nestjs-shared": "5.2.0"
   }
 }

package/services/file-manager.service.d.ts

@@ -1,4 +1,4 @@
-import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
+import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { DeleteDto, FilterAndPaginationDto } from '@flusys/nestjs-shared/dtos';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
@@ -9,7 +9,7 @@ import { IFileManager } from '../interfaces';
 import { StorageConfigService } from './storage-config.service';
 import { StorageDataSourceProvider } from './storage-datasource.provider';
 import { UploadService } from './upload.service';
-export declare class FileManagerService extends RequestScopedApiService<CreateFileManagerDto, UpdateFileManagerDto, IFileManager, FileManagerBase> {
+export declare class FileManagerService extends ApiService<CreateFileManagerDto, UpdateFileManagerDto, IFileManager, FileManagerBase> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
     protected uploadService: UploadService;
@@ -17,7 +17,6 @@ export declare class FileManagerService extends RequestScopedApiService<CreateFi
     private readonly dataSourceProvider;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, uploadService: UploadService, storageConfig: StorageConfigService, dataSourceProvider: StorageDataSourceProvider);
     protected resolveEntity(): EntityTarget<FileManagerBase>;
-    protected getDataSourceProvider(): StorageDataSourceProvider;
     convertSingleDtoToEntity(dto: CreateFileManagerDto | UpdateFileManagerDto, user: ILoggedUserInfo | null): Promise<FileManagerBase>;
     getSelectQuery(query: SelectQueryBuilder<FileManagerBase>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<FileManager>;

package/services/folder.service.d.ts

@@ -1,4 +1,4 @@
-import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
+import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { EntityTarget, SelectQueryBuilder } from 'typeorm';
@@ -7,14 +7,12 @@ import { Folder, FolderBase } from '../entities';
 import { IFolder } from '../interfaces';
 import { StorageConfigService } from './storage-config.service';
 import { StorageDataSourceProvider } from './storage-datasource.provider';
-export declare class FolderService extends RequestScopedApiService<CreateFolderDto, UpdateFolderDto, IFolder, FolderBase> {
+export declare class FolderService extends ApiService<CreateFolderDto, UpdateFolderDto, IFolder, FolderBase> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
     private readonly storageConfig;
-    private readonly dataSourceProvider;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, storageConfig: StorageConfigService, dataSourceProvider: StorageDataSourceProvider);
     protected resolveEntity(): EntityTarget<FolderBase>;
-    protected getDataSourceProvider(): StorageDataSourceProvider;
     convertSingleDtoToEntity(dto: CreateFolderDto | UpdateFolderDto, user: ILoggedUserInfo | null): Promise<FolderBase>;
     getSelectQuery(query: SelectQueryBuilder<FolderBase>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<Folder>;

package/services/storage-datasource.provider.d.ts

@@ -16,6 +16,4 @@ export declare class StorageDataSourceProvider extends MultiTenantDataSourceServ
     getEnableCompanyFeatureForTenant(tenant?: ITenantDatabaseConfig): boolean;
     getStorageEntities(enableCompanyFeature?: boolean): Promise<any[]>;
     protected createDataSourceFromConfig(config: IDatabaseConfig): Promise<DataSource>;
-    protected getSingleDataSource(): Promise<DataSource>;
-    protected getOrCreateTenantConnection(tenant: ITenantDatabaseConfig): Promise<DataSource>;
 }

package/services/storage-provider-config.service.d.ts

@@ -1,4 +1,4 @@
-import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
+import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { EntityTarget, SelectQueryBuilder } from 'typeorm';
@@ -7,14 +7,12 @@ import { StorageConfig, StorageConfigBase } from '../entities';
 import { IStorageConfig } from '../interfaces';
 import { StorageConfigService } from './storage-config.service';
 import { StorageDataSourceProvider } from './storage-datasource.provider';
-export declare class StorageProviderConfigService extends RequestScopedApiService<CreateStorageConfigDto, UpdateStorageConfigDto, IStorageConfig, StorageConfigBase> {
+export declare class StorageProviderConfigService extends ApiService<CreateStorageConfigDto, UpdateStorageConfigDto, IStorageConfig, StorageConfigBase> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
     private readonly storageConfig;
-    private readonly dataSourceProvider;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, storageConfig: StorageConfigService, dataSourceProvider: StorageDataSourceProvider);
     protected resolveEntity(): EntityTarget<StorageConfigBase>;
-    protected getDataSourceProvider(): StorageDataSourceProvider;
     convertSingleDtoToEntity(dto: CreateStorageConfigDto | UpdateStorageConfigDto, user: ILoggedUserInfo | null): Promise<StorageConfigBase>;
     getSelectQuery(query: SelectQueryBuilder<StorageConfigBase>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<StorageConfig>;