itlab-internal-services 2.13.3 → 2.13.5

package/dist/modules/cache/cache-response.interceptor.d.ts

@@ -12,4 +12,4 @@
  *
  * @returns {MethodDecorator} The decorator function that applies the cache interceptor to the method.
  */
-export declare const CacheResponse: () => MethodDecorator;
+export declare const CacheResponse: (ttl?: number) => MethodDecorator;

package/dist/modules/cache/cache-response.interceptor.js

@@ -17,7 +17,9 @@ const common_1 = require("@nestjs/common");
  *
  * @returns {MethodDecorator} The decorator function that applies the cache interceptor to the method.
  */
-const CacheResponse = () => {
+const CacheResponse = (ttl) => {
+    if (ttl)
+        return (0, common_1.applyDecorators)((0, cache_manager_1.CacheTTL)(ttl), (0, common_1.UseInterceptors)(cache_manager_1.CacheInterceptor));
     return (0, common_1.UseInterceptors)(cache_manager_1.CacheInterceptor);
 };
 exports.CacheResponse = CacheResponse;

package/dist/modules/cache/cache.module.d.ts

@@ -3,9 +3,8 @@ import { DynamicModule } from '@nestjs/common';
  * CacheModule
  *
  * This module is responsible for setting up and configuring caching mechanisms within the application.
- * It provides a flexible caching solution that integrates with Redis for persistent caching and falls back
- * to an in-memory cache if Redis is unavailable. The module leverages `Keyv` for Redis integration and
- * `CacheableMemory` for the in-memory store. Designed to be imported globally, it offers a `CacheService`
+ * It provides a flexible caching solution that integrates with Redis for persistent caching. The module
+ * leverages `Keyv` for Redis integration. Designed to be imported globally, it offers a `CacheService`
  * to manage cache interactions efficiently.
  */
 export declare class CacheModule {
@@ -13,8 +12,8 @@ export declare class CacheModule {
      * Configures the CacheModule globally with the necessary providers and imports.
      *
      * This method sets up the cache stores, attempting to connect to a Redis instance using configuration
-     * values from the environment. If Redis is unavailable, it defaults to using an in-memory store.
-     * It registers the cache stores with the `NestCacheModule` and makes the `CacheService` available
+     * values from the environment. If Redis is unavailable, it won't cache anything.
+     * It registers the cache store with the `NestCacheModule` and makes the `CacheService` available
      * globally for caching operations.
      *
      * @param {string} namespace - The namespace used for cache keys to avoid key collisions.

package/dist/modules/cache/cache.module.js

@@ -15,9 +15,8 @@ const cache_service_1 = require("./cache.service");
  * CacheModule
  *
  * This module is responsible for setting up and configuring caching mechanisms within the application.
- * It provides a flexible caching solution that integrates with Redis for persistent caching and falls back
- * to an in-memory cache if Redis is unavailable. The module leverages `Keyv` for Redis integration and
- * `CacheableMemory` for the in-memory store. Designed to be imported globally, it offers a `CacheService`
+ * It provides a flexible caching solution that integrates with Redis for persistent caching. The module
+ * leverages `Keyv` for Redis integration. Designed to be imported globally, it offers a `CacheService`
  * to manage cache interactions efficiently.
  */
 let CacheModule = CacheModule_1 = class CacheModule {
@@ -25,8 +24,8 @@ let CacheModule = CacheModule_1 = class CacheModule {
      * Configures the CacheModule globally with the necessary providers and imports.
      *
      * This method sets up the cache stores, attempting to connect to a Redis instance using configuration
-     * values from the environment. If Redis is unavailable, it defaults to using an in-memory store.
-     * It registers the cache stores with the `NestCacheModule` and makes the `CacheService` available
+     * values from the environment. If Redis is unavailable, it won't cache anything.
+     * It registers the cache store with the `NestCacheModule` and makes the `CacheService` available
      * globally for caching operations.
      *
      * @param {string} namespace - The namespace used for cache keys to avoid key collisions.
@@ -36,7 +35,7 @@ let CacheModule = CacheModule_1 = class CacheModule {
         return {
             global: true,
             module: CacheModule_1,
-            imports: [cache_manager_1.CacheModule.register({ isGlobal: true, namespace })],
+            imports: [cache_manager_1.CacheModule.register({ isGlobal: true, namespace, ttl: 300000 })], // Default TTL = 5 minutes
             providers: [cache_service_1.CacheService, { provide: 'CACHE_NAMESPACE', useValue: namespace }],
             exports: [cache_service_1.CacheService],
         };
@@ -55,7 +54,7 @@ let CacheModule = CacheModule_1 = class CacheModule {
         return {
             global: false,
             module: CacheModule_1,
-            imports: [cache_manager_1.CacheModule.register({ isGlobal: true, namespace })],
+            imports: [cache_manager_1.CacheModule.register({ isGlobal: true, namespace, ttl: 300000 })], // Default TTL = 5 minutes
             providers: [cache_service_1.CacheService, { provide: 'CACHE_NAMESPACE', useValue: namespace }],
             exports: [cache_service_1.CacheService],
         };

package/dist/modules/cache/cache.service.d.ts

@@ -6,9 +6,7 @@ import { Cache } from 'cache-manager';
  *
  * This service manages caching operations in a centralized manner, providing methods for
  * retrieving, storing, and deleting cached values. It handles cache misses by executing a
- * fallback function and asynchronously storing the result. The service supports both Redis
- * and in-memory caching, using Redis for persistent storage and falling back to in-memory
- * caching if Redis is unavailable.
+ * fallback function and asynchronously storing the result. The service supports Redis caching.
  */
 export declare class CacheService implements OnModuleInit {
     private readonly cache;
@@ -33,11 +31,11 @@ export declare class CacheService implements OnModuleInit {
      */
     onModuleInit(): Promise<void>;
     /**
-     * Sets up the cache stores, attempting to connect to Redis and falling back to memory if necessary.
+     * Sets up the cache store, attempting to connect to Redis.
      *
      * @returns {Promise<void>} - Resolves when the cache stores are initialized.
      */
-    private setupStores;
+    private setupStore;
     /**
      * Fetches the value associated with the given key from the cache.
      *

package/dist/modules/cache/cache.service.js

@@ -28,16 +28,13 @@ const redis_1 = require("@keyv/redis");
 const cache_manager_1 = require("@nestjs/cache-manager");
 const common_1 = require("@nestjs/common");
 const config_1 = require("@nestjs/config");
-const cacheable_1 = require("cacheable");
 const env_1 = require("../../env");
 /**
  * CacheService
  *
  * This service manages caching operations in a centralized manner, providing methods for
  * retrieving, storing, and deleting cached values. It handles cache misses by executing a
- * fallback function and asynchronously storing the result. The service supports both Redis
- * and in-memory caching, using Redis for persistent storage and falling back to in-memory
- * caching if Redis is unavailable.
+ * fallback function and asynchronously storing the result. The service supports Redis caching.
  */
 let CacheService = CacheService_1 = class CacheService {
     /**
@@ -63,18 +60,16 @@ let CacheService = CacheService_1 = class CacheService {
      */
     onModuleInit() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.setupStores();
+            yield this.setupStore();
         });
     }
     /**
-     * Sets up the cache stores, attempting to connect to Redis and falling back to memory if necessary.
+     * Sets up the cache store, attempting to connect to Redis.
      *
      * @returns {Promise<void>} - Resolves when the cache stores are initialized.
      */
-    setupStores() {
+    setupStore() {
         return __awaiter(this, void 0, void 0, function* () {
-            // Initialize in-memory cache store using CacheableMemory
-            const memoryStore = new redis_1.Keyv({ store: new cacheable_1.CacheableMemory(), namespace: this.namespace });
             try {
                 // Configure Redis store using environment variables
                 const host = this.configService.getOrThrow(env_1.ENV_REDIS_HOST);
@@ -88,20 +83,23 @@ let CacheService = CacheService_1 = class CacheService {
                 const { token: password, refreshAfterTimestamp } = accessToken;
                 this.logger.log(`New token received. Refresh at: ${new Date(refreshAfterTimestamp).toISOString()}`);
                 // Initialize Redis store using Keyv and Redis
-                const redisStore = (0, redis_1.createKeyv)({ username: user, password, socket: { host, port, tls: true, timeout: 5000 } }, { namespace: this.namespace });
+                const redisStore = (0, redis_1.createKeyv)({ username: user, password, socket: { host, port, tls: true, timeout: 5000 }, pingInterval: 60000 }, { namespace: this.namespace });
                 // Check Redis server availability
                 yield redisStore.get('ping');
                 this.logger.log('Redis is available. Using Redis store for caching.');
                 const now = Date.now();
                 const refreshDelay = Math.max(refreshAfterTimestamp - now, 0); // Ensure non-negative delay
-                this.logger.log(`Next token refresh scheduled in ${refreshDelay / 1000 / 60} minutes.`);
-                setTimeout(() => __awaiter(this, void 0, void 0, function* () { return yield this.setupStores(); }), refreshDelay);
-                this.cache.stores = [redisStore, memoryStore];
+                // Calculate total minutes and break it into hours and minutes
+                const totalMinutes = refreshDelay / 1000 / 60;
+                const hours = Math.floor(totalMinutes / 60).toString(); // Get the whole number of hours
+                const minutes = Math.floor(totalMinutes % 60).toString(); // Get the remaining minutes
+                this.logger.log(`Next token refresh scheduled in ${hours.padStart(2, '0')}h ${minutes.padStart(2, '0')}m.`);
+                setTimeout(() => __awaiter(this, void 0, void 0, function* () { return yield this.setupStore(); }), refreshDelay);
+                this.cache.stores = [redisStore];
             }
             catch (error) {
-                // Log error and fall back to memory store if Redis is unavailable
-                this.logger.error('Redis is unavailable, falling back to memory store: ' + error);
-                this.cache.stores = [memoryStore];
+                this.logger.error('Redis is unavailable: ' + error);
+                this.cache.stores = [];
             }
         });
     }

package/package.json

@@ -5,7 +5,7 @@
     "email": "timo.scheuermann@sv-informatik.de",
     "url": "https://timos.design"
   },
-  "version": "2.13.3",
+  "version": "2.13.5",
   "type": "commonjs",
   "files": [
     "dist"
@@ -29,9 +29,7 @@
     "@nestjs/jwt": "^11.0.0",
     "axios": "^1.8.3",
     "cache-manager": "^6.4.1",
-    "cacheable": "^1.8.9",
-    "itlab-functions": "^0.7.9",
-    "keyv": "^5.3.2"
+    "itlab-functions": "^0.7.9"
   },
   "devDependencies": {
     "@nestjs/common": "^11.0.11",