@flusys/nestjs-notification 5.1.2 → 5.1.3

package/adapters/notification.adapter.d.ts

@@ -1,10 +1,9 @@
-import { INotificationAdapter, NotificationSendOptions, NotificationBulkSendOptions, NotificationType } from '@flusys/nestjs-shared';
+import { INotificationAdapter, INotificationBulkSendOptions, INotificationSendOptions } from '@flusys/nestjs-shared';
 import { NotificationHelperService } from '../services/notification-helper.service';
 export declare class NotificationAdapter implements INotificationAdapter {
     private readonly notificationHelper;
     constructor(notificationHelper: NotificationHelperService);
-    send(options: NotificationSendOptions): Promise<void>;
-    sendToMany(options: NotificationBulkSendOptions): Promise<void>;
-    broadcastToCompany(companyId: string, title: string, message?: string, type?: NotificationType, data?: Record<string, unknown>): Promise<void>;
+    send(options: INotificationSendOptions): Promise<void>;
+    sendToMany(options: INotificationBulkSendOptions): Promise<void>;
     isUserOnline(userId: string): boolean;
 }

package/cjs/adapters/notification.adapter.js

@@ -39,27 +39,10 @@ function _ts_param(paramIndex, decorator) {
 }
 let NotificationAdapter = class NotificationAdapter {
     async send(options) {
-        await this.notificationHelper.send({
-            userId: options.userId,
-            title: options.title,
-            message: options.message,
-            type: options.type,
-            data: options.data,
-            companyId: options.companyId
-        });
+        await this.notificationHelper.send(options);
     }
     async sendToMany(options) {
-        await this.notificationHelper.sendToMany({
-            userIds: options.userIds,
-            title: options.title,
-            message: options.message,
-            type: options.type,
-            data: options.data,
-            companyId: options.companyId
-        });
-    }
-    async broadcastToCompany(companyId, title, message, type, data) {
-        await this.notificationHelper.sendToCompany(companyId, title, message, type, data);
+        await this.notificationHelper.sendToMany(options);
     }
     isUserOnline(userId) {
         return this.notificationHelper.isUserOnline(userId);

package/cjs/modules/notification.module.js

@@ -37,10 +37,6 @@ const ADAPTER_PROVIDER = {
 };
 let NotificationModule = class NotificationModule {
     static forRoot(options) {
-        const enableRealtime = options.config?.enableRealtime !== false;
-        const gatewayProviders = enableRealtime ? [
-            _gateways.NotificationGateway
-        ] : [];
         return {
             module: NotificationModule,
             global: options.global ?? false,
@@ -51,13 +47,13 @@ let NotificationModule = class NotificationModule {
             controllers: options.includeController !== false ? CONTROLLERS : [],
             providers: [
                 ...this.buildProviders(options),
-                ...gatewayProviders,
+                _gateways.NotificationGateway,
                 _adapters.NotificationAdapter,
                 ADAPTER_PROVIDER
             ],
             exports: [
                 ...EXPORTED_SERVICES,
-                ...gatewayProviders,
+                _gateways.NotificationGateway,
                 _interfaces.NOTIFICATION_ADAPTER
             ]
         };

package/cjs/services/notification-config.service.js

@@ -48,9 +48,6 @@ let NotificationConfigService = class NotificationConfigService {
     isMultiTenant() {
         return this.getDatabaseMode() === 'multi-tenant';
     }
-    isRealtimeEnabled() {
-        return this.options.config?.enableRealtime !== false;
-    }
     getJwtSecret() {
         return this.options.config?.jwtSecret;
     }

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

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "NotificationDataSourceProvider", {
     }
 });
 const _modules = require("@flusys/nestjs-shared/modules");
-const _constants = require("@flusys/nestjs-shared/constants");
 const _common = require("@nestjs/common");
 const _core = require("@nestjs/core");
 const _express = require("express");
@@ -109,50 +108,6 @@ let NotificationDataSourceProvider = class NotificationDataSourceProvider extend
         const entities = await this.getNotificationEntities(enableCompanyFeature);
         return super.createDataSourceFromConfig(config, entities);
     }
-    async getSingleDataSource() {
-        if (NotificationDataSourceProvider.singleDataSource?.isInitialized) {
-            return NotificationDataSourceProvider.singleDataSource;
-        }
-        if (NotificationDataSourceProvider.singleConnectionLock) {
-            return NotificationDataSourceProvider.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
-            });
-        }
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        NotificationDataSourceProvider.singleConnectionLock = connectionPromise;
-        try {
-            const dataSource = await connectionPromise;
-            NotificationDataSourceProvider.singleDataSource = dataSource;
-            return dataSource;
-        } finally{
-            NotificationDataSourceProvider.singleConnectionLock = null;
-        }
-    }
-    async getOrCreateTenantConnection(tenant) {
-        const existing = NotificationDataSourceProvider.tenantConnections.get(tenant.id);
-        if (existing?.isInitialized) {
-            return existing;
-        }
-        const pendingConnection = NotificationDataSourceProvider.connectionLocks.get(tenant.id);
-        if (pendingConnection) {
-            return pendingConnection;
-        }
-        const config = this.buildTenantDatabaseConfig(tenant);
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        NotificationDataSourceProvider.connectionLocks.set(tenant.id, connectionPromise);
-        try {
-            const dataSource = await connectionPromise;
-            NotificationDataSourceProvider.tenantConnections.set(tenant.id, dataSource);
-            return dataSource;
-        } finally{
-            NotificationDataSourceProvider.connectionLocks.delete(tenant.id);
-        }
-    }
     constructor(configService, request){
         super(NotificationDataSourceProvider.buildParentOptions(configService.getOptions()), request), _define_property(this, "configService", void 0), this.configService = configService;
     }

package/cjs/services/notification-helper.service.js

@@ -8,15 +8,15 @@ Object.defineProperty(exports, "NotificationHelperService", {
         return NotificationHelperService;
     }
 });
-const _common = require("@nestjs/common");
-const _classes = require("@flusys/nestjs-shared/classes");
 const _nestjsshared = require("@flusys/nestjs-shared");
+const _classes = require("@flusys/nestjs-shared/classes");
+const _enums = require("@flusys/nestjs-shared/enums");
 const _modules = require("@flusys/nestjs-shared/modules");
+const _common = require("@nestjs/common");
+const _entities = require("../entities");
+const _gateways = require("../gateways");
 const _notificationconfigservice = require("./notification-config.service");
 const _notificationdatasourceprovider = require("./notification-datasource.provider");
-const _gateways = require("../gateways");
-const _entities = require("../entities");
-const _enums = require("@flusys/nestjs-shared/enums");
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -45,90 +45,68 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let NotificationHelperService = class NotificationHelperService {
-    async getDataSource() {
-        if (!this.dataSource) {
-            this.dataSource = await this.dataSourceProvider.getDataSource();
-        }
-        return this.dataSource;
-    }
-    async getRepository() {
-        const ds = await this.getDataSource();
-        const EntityClass = this.configService.isCompanyFeatureEnabled() ? _entities.NotificationWithCompany : _entities.Notification;
-        return ds.getRepository(EntityClass);
-    }
     async send(options) {
-        const { userId, title, message = null, type = _enums.NotificationType.INFO, data = null, companyId } = options;
         const repo = await this.getRepository();
-        const entity = {
-            userId,
-            type,
-            title,
-            message,
-            data,
-            isRead: false
-        };
-        if (this.configService.isCompanyFeatureEnabled() && companyId) {
-            entity.companyId = companyId;
-        }
+        const entity = this.buildEntity(options.userId, options);
         const saved = await repo.save(entity);
         await this.clearCache();
-        this.emitRealtime(saved);
+        this.emitToUser(saved, options.realtime !== false);
         return saved;
     }
     async sendToMany(options) {
-        const { userIds, title, message = null, type = _enums.NotificationType.INFO, data = null, companyId } = options;
         const repo = await this.getRepository();
-        const entities = userIds.map((userId)=>({
-                userId,
-                type,
-                title,
-                message,
-                data,
-                isRead: false,
-                ...this.configService.isCompanyFeatureEnabled() && companyId ? {
-                    companyId
-                } : {}
-            }));
+        const entities = options.userIds.map((userId)=>this.buildEntity(userId, options));
         const saved = await repo.save(entities);
         await this.clearCache();
-        for (const notification of saved){
-            this.emitRealtime(notification);
+        if (options.realtime !== false) {
+            setImmediate(()=>{
+                for (const notification of saved){
+                    this.emitToUser(notification, true);
+                }
+            });
         }
         return saved;
     }
-    async sendToCompany(companyId, title, message, type = _enums.NotificationType.INFO, data) {
-        if (!this.configService.isCompanyFeatureEnabled()) {
-            return;
-        }
-        if (this.configService.isRealtimeEnabled() && this.gateway) {
-            const payload = {
-                id: `broadcast-${Date.now()}`,
-                type,
-                title,
-                message: message ?? null,
-                data: data ?? null,
-                createdAt: new Date()
-            };
-            this.gateway.emitToCompany(companyId, 'notification:new', payload);
-        }
-    }
     isUserOnline(userId) {
         return this.gateway?.isUserOnline(userId) ?? false;
     }
     getOnlineUserCount() {
         return this.gateway?.getOnlineUserCount() ?? 0;
     }
-    emitRealtime(notification) {
-        if (!this.configService.isRealtimeEnabled() || !this.gateway) {
+    async getDataSource() {
+        if (!this.dataSource) {
+            this.dataSource = await this.dataSourceProvider.getDataSource();
+        }
+        return this.dataSource;
+    }
+    async getRepository() {
+        const ds = await this.getDataSource();
+        const EntityClass = this.configService.isCompanyFeatureEnabled() ? _entities.NotificationWithCompany : _entities.Notification;
+        return ds.getRepository(EntityClass);
+    }
+    buildEntity(userId, content) {
+        const entity = {
+            userId,
+            type: content.type ?? _enums.NotificationType.INFO,
+            title: content.title,
+            message: content.message ?? null,
+            data: content.data ?? null,
+            isRead: false
+        };
+        if (this.configService.isCompanyFeatureEnabled() && content.companyId) {
+            entity.companyId = content.companyId;
+        }
+        return entity;
+    }
+    emitToUser(notification, realtime) {
+        if (!realtime || !this.gateway) {
             return;
         }
         const ext = notification;
         const payload = this.toPayload(notification);
         if (this.configService.isCompanyFeatureEnabled() && ext.companyId) {
-            // Company feature enabled - emit only to sockets in matching company context
             this.gateway.emitToUserInCompany(notification.userId, ext.companyId, 'notification:new', payload);
         } else {
-            // No company feature or no companyId - emit to all user's sockets
             this.gateway.emitToUser(notification.userId, 'notification:new', payload);
         }
     }
@@ -143,7 +121,7 @@ let NotificationHelperService = class NotificationHelperService {
         };
     }
     async clearCache() {
-        await this.utilsService.clearCache(this.entityName, this.cacheManager);
+        await this.utilsService.clearCache('notification', this.cacheManager);
     }
     constructor(cacheManager, utilsService, configService, dataSourceProvider, gateway){
         _define_property(this, "cacheManager", void 0);
@@ -151,14 +129,12 @@ let NotificationHelperService = class NotificationHelperService {
         _define_property(this, "configService", void 0);
         _define_property(this, "dataSourceProvider", void 0);
         _define_property(this, "gateway", void 0);
-        _define_property(this, "entityName", void 0);
         _define_property(this, "dataSource", void 0);
         this.cacheManager = cacheManager;
         this.utilsService = utilsService;
         this.configService = configService;
         this.dataSourceProvider = dataSourceProvider;
         this.gateway = gateway;
-        this.entityName = 'notification';
         this.dataSource = null;
     }
 };
@@ -169,7 +145,7 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
-        typeof SendNotificationOptions === "undefined" ? Object : SendNotificationOptions
+        typeof _nestjsshared.INotificationSendOptions === "undefined" ? Object : _nestjsshared.INotificationSendOptions
     ]),
     _ts_metadata("design:returntype", Promise)
 ], NotificationHelperService.prototype, "send", null);
@@ -180,25 +156,10 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
-        typeof SendBulkNotificationOptions === "undefined" ? Object : SendBulkNotificationOptions
+        typeof _nestjsshared.INotificationBulkSendOptions === "undefined" ? Object : _nestjsshared.INotificationBulkSendOptions
     ]),
     _ts_metadata("design:returntype", Promise)
 ], NotificationHelperService.prototype, "sendToMany", null);
-_ts_decorate([
-    (0, _nestjsshared.LogAction)({
-        action: 'notification.sendToCompany',
-        module: 'notification'
-    }),
-    _ts_metadata("design:type", Function),
-    _ts_metadata("design:paramtypes", [
-        String,
-        String,
-        Object,
-        Object,
-        Object
-    ]),
-    _ts_metadata("design:returntype", Promise)
-], NotificationHelperService.prototype, "sendToCompany", null);
 NotificationHelperService = _ts_decorate([
     (0, _common.Injectable)(),
     _ts_param(0, (0, _common.Inject)('CACHE_INSTANCE')),

package/cjs/services/notification.service.js

@@ -46,13 +46,10 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-let NotificationService = class NotificationService extends _classes.RequestScopedApiService {
+let NotificationService = class NotificationService extends _classes.ApiService {
     resolveEntity() {
         return this.notificationConfig.isCompanyFeatureEnabled() ? _entities.NotificationWithCompany : _entities.Notification;
     }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
     async convertSingleDtoToEntity(dto, user) {
         let entity = {};
         if ('id' in dto && dto.id) {
@@ -125,11 +122,11 @@ let NotificationService = class NotificationService extends _classes.RequestScop
     async afterInsertOperation(entities, _user, _qr) {
         for (const entity of entities){
             const ext = entity;
-            this.emitToUserInCompanyIfRealtime(entity.userId, ext.companyId, 'notification:new', this.toPayload(entity));
+            this.emitToUser(entity.userId, ext.companyId, 'notification:new', this.toPayload(entity));
         }
     }
     async markAsRead(id, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const notification = await this.repository.findOne({
             where: {
                 id,
@@ -153,13 +150,13 @@ let NotificationService = class NotificationService extends _classes.RequestScop
         ]);
         // Emit to user's sockets in the same company context
         const ext = notification;
-        this.emitToUserInCompanyIfRealtime(user.id, ext.companyId ?? user.companyId, 'notification:read', {
+        this.emitToUser(user.id, ext.companyId ?? user.companyId, 'notification:read', {
             id
         });
         return notification;
     }
     async markAllAsRead(user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const where = {
             userId: user.id,
             isRead: false
@@ -173,11 +170,11 @@ let NotificationService = class NotificationService extends _classes.RequestScop
         });
         await this.clearCacheForAll();
         // Emit to user's sockets in the current company context
-        this.emitToUserInCompanyIfRealtime(user.id, user.companyId, 'notification:read-all', {});
+        this.emitToUser(user.id, user.companyId, 'notification:read-all', {});
         return result.affected ?? 0;
     }
     async getUnreadCount(user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const where = {
             userId: user.id,
             isRead: false
@@ -199,24 +196,18 @@ let NotificationService = class NotificationService extends _classes.RequestScop
             createdAt: entity.createdAt
         };
     }
-    /**
-   * Emit to user's sockets within a specific company context.
-   * If company feature is enabled and companyId is provided, only sockets
-   * connected with that company will receive the event.
-   */ emitToUserInCompanyIfRealtime(userId, companyId, event, payload) {
-        if (!this.notificationConfig.isRealtimeEnabled() || !this.gateway) {
+    emitToUser(userId, companyId, event, payload) {
+        if (!this.gateway) {
             return;
         }
         if (this.notificationConfig.isCompanyFeatureEnabled() && companyId) {
-            // Company feature enabled - emit only to sockets in matching company context
             this.gateway.emitToUserInCompany(userId, companyId, event, payload);
         } else {
-            // No company feature or no companyId - emit to all user's sockets
             this.gateway.emitToUser(userId, event, payload);
         }
     }
     constructor(cacheManager, utilsService, notificationConfig, dataSourceProvider, gateway){
-        super('notification', null, cacheManager, utilsService, NotificationService.name, false, 'notification'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "notificationConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "gateway", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.notificationConfig = notificationConfig, this.dataSourceProvider = dataSourceProvider, this.gateway = gateway;
+        super('notification', cacheManager, utilsService, NotificationService.name, false, 'notification', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "notificationConfig", void 0), _define_property(this, "gateway", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.notificationConfig = notificationConfig, this.gateway = gateway;
     }
 };
 _ts_decorate([

package/controllers/notification.controller.d.ts

@@ -4,19 +4,19 @@ import { CreateNotificationDto, MarkReadDto, NotificationResponseDto, SendBulkNo
 import { NotificationHelperService } from '../services/notification-helper.service';
 import { NotificationService } from '../services/notification.service';
 declare const NotificationController_base: abstract new (service: NotificationService) => {
-    readonly enabledEndpoints: import("@flusys/nestjs-shared/classes").ApiEndpoint[] | "all";
+    readonly enabledEndpoints: import("@flusys/nestjs-shared").ApiEndpoint[] | "all";
     service: NotificationService;
-    isEnabled(endpoint: import("@flusys/nestjs-shared/classes").ApiEndpoint): boolean;
+    isEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): boolean;
     insert(addDto: CreateNotificationDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<NotificationResponseDto>>;
     insertMany(addDto: CreateNotificationDto[], user: ILoggedUserInfo | null): Promise<BulkResponseDto<NotificationResponseDto>>;
-    getById(id: string, body: import("@flusys/nestjs-shared/dtos").GetByIdBodyDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<NotificationResponseDto>>;
-    getByIds(body: import("@flusys/nestjs-shared/dtos").GetByIdsDto, user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared/dtos").ListResponseDto<NotificationResponseDto>>;
+    getById(id: string, body: import("@flusys/nestjs-shared").GetByIdBodyDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<NotificationResponseDto>>;
+    getByIds(body: import("@flusys/nestjs-shared").GetByIdsDto, user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").ListResponseDto<NotificationResponseDto>>;
     update(updateDto: UpdateNotificationDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<NotificationResponseDto>>;
     updateMany(updateDtos: UpdateNotificationDto[], user: ILoggedUserInfo | null): Promise<BulkResponseDto<NotificationResponseDto>>;
     bulkUpsert(dtos: (CreateNotificationDto | UpdateNotificationDto)[], user: ILoggedUserInfo | null): Promise<BulkResponseDto<NotificationResponseDto>>;
     getByFilter(filter: Record<string, any>, user: ILoggedUserInfo | null): Promise<SingleResponseDto<NotificationResponseDto>>;
-    getAll(filterAndPaginationDto: import("@flusys/nestjs-shared/dtos").FilterAndPaginationDto, user: ILoggedUserInfo | null, search?: string): Promise<import("@flusys/nestjs-shared/dtos").ListResponseDto<NotificationResponseDto>>;
-    delete(deleteDto: import("@flusys/nestjs-shared/dtos").DeleteDto, user: ILoggedUserInfo | null): Promise<MessageResponseDto>;
+    getAll(filterAndPaginationDto: import("@flusys/nestjs-shared").FilterAndPaginationDto, user: ILoggedUserInfo | null, search?: string): Promise<import("@flusys/nestjs-shared").ListResponseDto<NotificationResponseDto>>;
+    delete(deleteDto: import("@flusys/nestjs-shared").DeleteDto, user: ILoggedUserInfo | null): Promise<MessageResponseDto>;
 };
 export declare class NotificationController extends NotificationController_base {
     service: NotificationService;

package/fesm/adapters/notification.adapter.js

@@ -25,31 +25,14 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { Injectable, Inject } from '@nestjs/common';
+import { Inject, Injectable } from '@nestjs/common';
 import { NotificationHelperService } from '../services/notification-helper.service';
 export class NotificationAdapter {
     async send(options) {
-        await this.notificationHelper.send({
-            userId: options.userId,
-            title: options.title,
-            message: options.message,
-            type: options.type,
-            data: options.data,
-            companyId: options.companyId
-        });
+        await this.notificationHelper.send(options);
     }
     async sendToMany(options) {
-        await this.notificationHelper.sendToMany({
-            userIds: options.userIds,
-            title: options.title,
-            message: options.message,
-            type: options.type,
-            data: options.data,
-            companyId: options.companyId
-        });
-    }
-    async broadcastToCompany(companyId, title, message, type, data) {
-        await this.notificationHelper.sendToCompany(companyId, title, message, type, data);
+        await this.notificationHelper.sendToMany(options);
     }
     isUserOnline(userId) {
         return this.notificationHelper.isUserOnline(userId);

package/fesm/modules/notification.module.js

@@ -27,10 +27,6 @@ const ADAPTER_PROVIDER = {
 };
 export class NotificationModule {
     static forRoot(options) {
-        const enableRealtime = options.config?.enableRealtime !== false;
-        const gatewayProviders = enableRealtime ? [
-            NotificationGateway
-        ] : [];
         return {
             module: NotificationModule,
             global: options.global ?? false,
@@ -41,13 +37,13 @@ export class NotificationModule {
             controllers: options.includeController !== false ? CONTROLLERS : [],
             providers: [
                 ...this.buildProviders(options),
-                ...gatewayProviders,
+                NotificationGateway,
                 NotificationAdapter,
                 ADAPTER_PROVIDER
             ],
             exports: [
                 ...EXPORTED_SERVICES,
-                ...gatewayProviders,
+                NotificationGateway,
                 NOTIFICATION_ADAPTER
             ]
         };

package/fesm/services/notification-config.service.js

@@ -38,9 +38,6 @@ export class NotificationConfigService {
     isMultiTenant() {
         return this.getDatabaseMode() === 'multi-tenant';
     }
-    isRealtimeEnabled() {
-        return this.options.config?.enableRealtime !== false;
-    }
     getJwtSecret() {
         return this.options.config?.jwtSecret;
     }

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

@@ -26,8 +26,7 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 import { MultiTenantDataSourceService } from '@flusys/nestjs-shared/modules';
-import { SYSTEM_MESSAGES } from '@flusys/nestjs-shared/constants';
-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 { NotificationConfigService } from './notification-config.service';
@@ -58,50 +57,6 @@ export class NotificationDataSourceProvider extends MultiTenantDataSourceService
         const entities = await this.getNotificationEntities(enableCompanyFeature);
         return super.createDataSourceFromConfig(config, entities);
     }
-    async getSingleDataSource() {
-        if (NotificationDataSourceProvider.singleDataSource?.isInitialized) {
-            return NotificationDataSourceProvider.singleDataSource;
-        }
-        if (NotificationDataSourceProvider.singleConnectionLock) {
-            return NotificationDataSourceProvider.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
-            });
-        }
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        NotificationDataSourceProvider.singleConnectionLock = connectionPromise;
-        try {
-            const dataSource = await connectionPromise;
-            NotificationDataSourceProvider.singleDataSource = dataSource;
-            return dataSource;
-        } finally{
-            NotificationDataSourceProvider.singleConnectionLock = null;
-        }
-    }
-    async getOrCreateTenantConnection(tenant) {
-        const existing = NotificationDataSourceProvider.tenantConnections.get(tenant.id);
-        if (existing?.isInitialized) {
-            return existing;
-        }
-        const pendingConnection = NotificationDataSourceProvider.connectionLocks.get(tenant.id);
-        if (pendingConnection) {
-            return pendingConnection;
-        }
-        const config = this.buildTenantDatabaseConfig(tenant);
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        NotificationDataSourceProvider.connectionLocks.set(tenant.id, connectionPromise);
-        try {
-            const dataSource = await connectionPromise;
-            NotificationDataSourceProvider.tenantConnections.set(tenant.id, dataSource);
-            return dataSource;
-        } finally{
-            NotificationDataSourceProvider.connectionLocks.delete(tenant.id);
-        }
-    }
     constructor(configService, request){
         super(NotificationDataSourceProvider.buildParentOptions(configService.getOptions()), request), _define_property(this, "configService", void 0), this.configService = configService;
     }

package/fesm/services/notification-helper.service.js

@@ -25,100 +25,78 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { Inject, Injectable, Optional } from '@nestjs/common';
+import { INotificationBulkSendOptions, INotificationSendOptions, LogAction } from '@flusys/nestjs-shared';
 import { HybridCache } from '@flusys/nestjs-shared/classes';
-import { LogAction } from '@flusys/nestjs-shared';
+import { NotificationType } from '@flusys/nestjs-shared/enums';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
+import { Inject, Injectable, Optional } from '@nestjs/common';
+import { Notification, NotificationWithCompany } from '../entities';
+import { NotificationGateway } from '../gateways';
 import { NotificationConfigService } from './notification-config.service';
 import { NotificationDataSourceProvider } from './notification-datasource.provider';
-import { NotificationGateway } from '../gateways';
-import { Notification, NotificationWithCompany } from '../entities';
-import { NotificationType } from '@flusys/nestjs-shared/enums';
 export class NotificationHelperService {
-    async getDataSource() {
-        if (!this.dataSource) {
-            this.dataSource = await this.dataSourceProvider.getDataSource();
-        }
-        return this.dataSource;
-    }
-    async getRepository() {
-        const ds = await this.getDataSource();
-        const EntityClass = this.configService.isCompanyFeatureEnabled() ? NotificationWithCompany : Notification;
-        return ds.getRepository(EntityClass);
-    }
     async send(options) {
-        const { userId, title, message = null, type = NotificationType.INFO, data = null, companyId } = options;
         const repo = await this.getRepository();
-        const entity = {
-            userId,
-            type,
-            title,
-            message,
-            data,
-            isRead: false
-        };
-        if (this.configService.isCompanyFeatureEnabled() && companyId) {
-            entity.companyId = companyId;
-        }
+        const entity = this.buildEntity(options.userId, options);
         const saved = await repo.save(entity);
         await this.clearCache();
-        this.emitRealtime(saved);
+        this.emitToUser(saved, options.realtime !== false);
         return saved;
     }
     async sendToMany(options) {
-        const { userIds, title, message = null, type = NotificationType.INFO, data = null, companyId } = options;
         const repo = await this.getRepository();
-        const entities = userIds.map((userId)=>({
-                userId,
-                type,
-                title,
-                message,
-                data,
-                isRead: false,
-                ...this.configService.isCompanyFeatureEnabled() && companyId ? {
-                    companyId
-                } : {}
-            }));
+        const entities = options.userIds.map((userId)=>this.buildEntity(userId, options));
         const saved = await repo.save(entities);
         await this.clearCache();
-        for (const notification of saved){
-            this.emitRealtime(notification);
+        if (options.realtime !== false) {
+            setImmediate(()=>{
+                for (const notification of saved){
+                    this.emitToUser(notification, true);
+                }
+            });
         }
         return saved;
     }
-    async sendToCompany(companyId, title, message, type = NotificationType.INFO, data) {
-        if (!this.configService.isCompanyFeatureEnabled()) {
-            return;
-        }
-        if (this.configService.isRealtimeEnabled() && this.gateway) {
-            const payload = {
-                id: `broadcast-${Date.now()}`,
-                type,
-                title,
-                message: message ?? null,
-                data: data ?? null,
-                createdAt: new Date()
-            };
-            this.gateway.emitToCompany(companyId, 'notification:new', payload);
-        }
-    }
     isUserOnline(userId) {
         return this.gateway?.isUserOnline(userId) ?? false;
     }
     getOnlineUserCount() {
         return this.gateway?.getOnlineUserCount() ?? 0;
     }
-    emitRealtime(notification) {
-        if (!this.configService.isRealtimeEnabled() || !this.gateway) {
+    async getDataSource() {
+        if (!this.dataSource) {
+            this.dataSource = await this.dataSourceProvider.getDataSource();
+        }
+        return this.dataSource;
+    }
+    async getRepository() {
+        const ds = await this.getDataSource();
+        const EntityClass = this.configService.isCompanyFeatureEnabled() ? NotificationWithCompany : Notification;
+        return ds.getRepository(EntityClass);
+    }
+    buildEntity(userId, content) {
+        const entity = {
+            userId,
+            type: content.type ?? NotificationType.INFO,
+            title: content.title,
+            message: content.message ?? null,
+            data: content.data ?? null,
+            isRead: false
+        };
+        if (this.configService.isCompanyFeatureEnabled() && content.companyId) {
+            entity.companyId = content.companyId;
+        }
+        return entity;
+    }
+    emitToUser(notification, realtime) {
+        if (!realtime || !this.gateway) {
             return;
         }
         const ext = notification;
         const payload = this.toPayload(notification);
         if (this.configService.isCompanyFeatureEnabled() && ext.companyId) {
-            // Company feature enabled - emit only to sockets in matching company context
             this.gateway.emitToUserInCompany(notification.userId, ext.companyId, 'notification:new', payload);
         } else {
-            // No company feature or no companyId - emit to all user's sockets
             this.gateway.emitToUser(notification.userId, 'notification:new', payload);
         }
     }
@@ -133,7 +111,7 @@ export class NotificationHelperService {
         };
     }
     async clearCache() {
-        await this.utilsService.clearCache(this.entityName, this.cacheManager);
+        await this.utilsService.clearCache('notification', this.cacheManager);
     }
     constructor(cacheManager, utilsService, configService, dataSourceProvider, gateway){
         _define_property(this, "cacheManager", void 0);
@@ -141,14 +119,12 @@ export class NotificationHelperService {
         _define_property(this, "configService", void 0);
         _define_property(this, "dataSourceProvider", void 0);
         _define_property(this, "gateway", void 0);
-        _define_property(this, "entityName", void 0);
         _define_property(this, "dataSource", void 0);
         this.cacheManager = cacheManager;
         this.utilsService = utilsService;
         this.configService = configService;
         this.dataSourceProvider = dataSourceProvider;
         this.gateway = gateway;
-        this.entityName = 'notification';
         this.dataSource = null;
     }
 }
@@ -159,7 +135,7 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
-        typeof SendNotificationOptions === "undefined" ? Object : SendNotificationOptions
+        typeof INotificationSendOptions === "undefined" ? Object : INotificationSendOptions
     ]),
     _ts_metadata("design:returntype", Promise)
 ], NotificationHelperService.prototype, "send", null);
@@ -170,25 +146,10 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
-        typeof SendBulkNotificationOptions === "undefined" ? Object : SendBulkNotificationOptions
+        typeof INotificationBulkSendOptions === "undefined" ? Object : INotificationBulkSendOptions
     ]),
     _ts_metadata("design:returntype", Promise)
 ], NotificationHelperService.prototype, "sendToMany", null);
-_ts_decorate([
-    LogAction({
-        action: 'notification.sendToCompany',
-        module: 'notification'
-    }),
-    _ts_metadata("design:type", Function),
-    _ts_metadata("design:paramtypes", [
-        String,
-        String,
-        Object,
-        Object,
-        Object
-    ]),
-    _ts_metadata("design:returntype", Promise)
-], NotificationHelperService.prototype, "sendToCompany", null);
 NotificationHelperService = _ts_decorate([
     Injectable(),
     _ts_param(0, Inject('CACHE_INSTANCE')),

package/fesm/services/notification.service.js

@@ -26,7 +26,7 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 import { LogAction } from '@flusys/nestjs-shared';
-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 { applyCompanyFilter } from '@flusys/nestjs-shared/utils';
@@ -36,13 +36,10 @@ import { Notification, NotificationWithCompany } from '../entities';
 import { NotificationGateway } from '../gateways';
 import { NotificationConfigService } from './notification-config.service';
 import { NotificationDataSourceProvider } from './notification-datasource.provider';
-export class NotificationService extends RequestScopedApiService {
+export class NotificationService extends ApiService {
     resolveEntity() {
         return this.notificationConfig.isCompanyFeatureEnabled() ? NotificationWithCompany : Notification;
     }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
     async convertSingleDtoToEntity(dto, user) {
         let entity = {};
         if ('id' in dto && dto.id) {
@@ -115,11 +112,11 @@ export class NotificationService extends RequestScopedApiService {
     async afterInsertOperation(entities, _user, _qr) {
         for (const entity of entities){
             const ext = entity;
-            this.emitToUserInCompanyIfRealtime(entity.userId, ext.companyId, 'notification:new', this.toPayload(entity));
+            this.emitToUser(entity.userId, ext.companyId, 'notification:new', this.toPayload(entity));
         }
     }
     async markAsRead(id, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const notification = await this.repository.findOne({
             where: {
                 id,
@@ -143,13 +140,13 @@ export class NotificationService extends RequestScopedApiService {
         ]);
         // Emit to user's sockets in the same company context
         const ext = notification;
-        this.emitToUserInCompanyIfRealtime(user.id, ext.companyId ?? user.companyId, 'notification:read', {
+        this.emitToUser(user.id, ext.companyId ?? user.companyId, 'notification:read', {
             id
         });
         return notification;
     }
     async markAllAsRead(user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const where = {
             userId: user.id,
             isRead: false
@@ -163,11 +160,11 @@ export class NotificationService extends RequestScopedApiService {
         });
         await this.clearCacheForAll();
         // Emit to user's sockets in the current company context
-        this.emitToUserInCompanyIfRealtime(user.id, user.companyId, 'notification:read-all', {});
+        this.emitToUser(user.id, user.companyId, 'notification:read-all', {});
         return result.affected ?? 0;
     }
     async getUnreadCount(user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const where = {
             userId: user.id,
             isRead: false
@@ -189,24 +186,18 @@ export class NotificationService extends RequestScopedApiService {
             createdAt: entity.createdAt
         };
     }
-    /**
-   * Emit to user's sockets within a specific company context.
-   * If company feature is enabled and companyId is provided, only sockets
-   * connected with that company will receive the event.
-   */ emitToUserInCompanyIfRealtime(userId, companyId, event, payload) {
-        if (!this.notificationConfig.isRealtimeEnabled() || !this.gateway) {
+    emitToUser(userId, companyId, event, payload) {
+        if (!this.gateway) {
             return;
         }
         if (this.notificationConfig.isCompanyFeatureEnabled() && companyId) {
-            // Company feature enabled - emit only to sockets in matching company context
             this.gateway.emitToUserInCompany(userId, companyId, event, payload);
         } else {
-            // No company feature or no companyId - emit to all user's sockets
             this.gateway.emitToUser(userId, event, payload);
         }
     }
     constructor(cacheManager, utilsService, notificationConfig, dataSourceProvider, gateway){
-        super('notification', null, cacheManager, utilsService, NotificationService.name, false, 'notification'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "notificationConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "gateway", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.notificationConfig = notificationConfig, this.dataSourceProvider = dataSourceProvider, this.gateway = gateway;
+        super('notification', cacheManager, utilsService, NotificationService.name, false, 'notification', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "notificationConfig", void 0), _define_property(this, "gateway", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.notificationConfig = notificationConfig, this.gateway = gateway;
     }
 }
 _ts_decorate([

package/interfaces/notification-module.interface.d.ts

@@ -1,7 +1,6 @@
 import { IBootstrapAppConfig, IDataSourceServiceOptions, IDynamicModuleConfig, IModuleOptionsFactory } from '@flusys/nestjs-core';
 import { ModuleMetadata, Type } from '@nestjs/common';
 export interface INotificationModuleConfig extends IDataSourceServiceOptions {
-    enableRealtime?: boolean;
     jwtSecret?: string;
 }
 export interface NotificationModuleOptions extends IDynamicModuleConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-notification",
-  "version": "5.1.2",
+  "version": "5.1.3",
   "description": "Notification module with real-time Socket.IO support",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -77,23 +77,23 @@
     }
   },
   "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",
-    "@nestjs/websockets": "^10.0.0 || ^11.0.0",
-    "@nestjs/platform-socket.io": "^10.0.0 || ^11.0.0",
-    "class-transformer": "^0.5.0",
-    "class-validator": "^0.14.0",
-    "socket.io": "^4.0.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",
+    "@nestjs/websockets": "^11.0.0",
+    "@nestjs/platform-socket.io": "^11.0.0",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.0 || ^0.15.0",
+    "socket.io": "^4.8.0",
     "typeorm": "^0.3.0",
-    "express": "^4.18.0"
+    "express": "^4.18.0 || ^5.0.0"
   },
   "dependencies": {
-    "@flusys/nestjs-core": "5.1.2",
-    "@flusys/nestjs-shared": "5.1.2",
+    "@flusys/nestjs-core": "5.1.3",
+    "@flusys/nestjs-shared": "5.1.3",
     "jsonwebtoken": "^9.0.0"
   }
 }

package/services/notification-config.service.d.ts

@@ -7,7 +7,6 @@ export declare class NotificationConfigService implements IModuleConfigService {
     isCompanyFeatureEnabled(): boolean;
     getDatabaseMode(): DatabaseMode;
     isMultiTenant(): boolean;
-    isRealtimeEnabled(): boolean;
     getJwtSecret(): string | undefined;
     getOptions(): NotificationModuleOptions;
 }

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

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

package/services/notification-helper.service.d.ts

@@ -1,43 +1,26 @@
+import { INotificationBulkSendOptions, INotificationSendOptions } from '@flusys/nestjs-shared';
 import { HybridCache } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
+import { NotificationBase } from '../entities';
+import { NotificationGateway } from '../gateways';
 import { NotificationConfigService } from './notification-config.service';
 import { NotificationDataSourceProvider } from './notification-datasource.provider';
-import { NotificationGateway } from '../gateways';
-import { NotificationBase } from '../entities';
-import { NotificationType } from '@flusys/nestjs-shared/enums';
-export interface SendNotificationOptions {
-    userId: string;
-    title: string;
-    message?: string | null;
-    type?: NotificationType | string;
-    data?: Record<string, unknown> | null;
-    companyId?: string | null;
-}
-export interface SendBulkNotificationOptions {
-    userIds: string[];
-    title: string;
-    message?: string | null;
-    type?: NotificationType | string;
-    data?: Record<string, unknown> | null;
-    companyId?: string | null;
-}
 export declare class NotificationHelperService {
     private readonly cacheManager;
     private readonly utilsService;
     private readonly configService;
     private readonly dataSourceProvider;
     private readonly gateway?;
-    private readonly entityName;
     private dataSource;
-    constructor(cacheManager: HybridCache, utilsService: UtilsService, configService: NotificationConfigService, dataSourceProvider: NotificationDataSourceProvider, gateway?: NotificationGateway);
-    private getDataSource;
-    private getRepository;
-    send(options: SendNotificationOptions): Promise<NotificationBase>;
-    sendToMany(options: SendBulkNotificationOptions): Promise<NotificationBase[]>;
-    sendToCompany(companyId: string, title: string, message?: string | null, type?: NotificationType | string, data?: Record<string, unknown> | null): Promise<void>;
+    constructor(cacheManager: HybridCache, utilsService: UtilsService, configService: NotificationConfigService, dataSourceProvider: NotificationDataSourceProvider, gateway?: NotificationGateway | undefined);
+    send(options: INotificationSendOptions): Promise<NotificationBase>;
+    sendToMany(options: INotificationBulkSendOptions): Promise<NotificationBase[]>;
     isUserOnline(userId: string): boolean;
     getOnlineUserCount(): number;
-    private emitRealtime;
+    private getDataSource;
+    private getRepository;
+    private buildEntity;
+    private emitToUser;
     private toPayload;
     private clearCache;
 }

package/services/notification.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, QueryRunner, SelectQueryBuilder } from 'typeorm';
@@ -8,15 +8,13 @@ import { NotificationGateway } from '../gateways';
 import { INotification } from '../interfaces';
 import { NotificationConfigService } from './notification-config.service';
 import { NotificationDataSourceProvider } from './notification-datasource.provider';
-export declare class NotificationService extends RequestScopedApiService<CreateNotificationDto, UpdateNotificationDto, INotification, NotificationBase> {
+export declare class NotificationService extends ApiService<CreateNotificationDto, UpdateNotificationDto, INotification, NotificationBase> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
     private readonly notificationConfig;
-    private readonly dataSourceProvider;
     private readonly gateway?;
-    constructor(cacheManager: HybridCache, utilsService: UtilsService, notificationConfig: NotificationConfigService, dataSourceProvider: NotificationDataSourceProvider, gateway?: NotificationGateway);
+    constructor(cacheManager: HybridCache, utilsService: UtilsService, notificationConfig: NotificationConfigService, dataSourceProvider: NotificationDataSourceProvider, gateway?: NotificationGateway | undefined);
     protected resolveEntity(): EntityTarget<NotificationBase>;
-    protected getDataSourceProvider(): NotificationDataSourceProvider;
     convertSingleDtoToEntity(dto: CreateNotificationDto | UpdateNotificationDto, user: ILoggedUserInfo | null): Promise<NotificationBase>;
     protected getFilterQuery(query: SelectQueryBuilder<NotificationBase>, filter: Record<string, unknown>, _user: ILoggedUserInfo | null): Promise<{
         query: SelectQueryBuilder<NotificationBase>;
@@ -31,5 +29,5 @@ export declare class NotificationService extends RequestScopedApiService<CreateN
     markAllAsRead(user: ILoggedUserInfo): Promise<number>;
     getUnreadCount(user: ILoggedUserInfo): Promise<number>;
     private toPayload;
-    private emitToUserInCompanyIfRealtime;
+    private emitToUser;
 }