@common-stack/store-redis 8.3.1-alpha.7 → 8.4.1-alpha.0

package/lib/core/index.d.ts

@@ -1,8 +1,3 @@
-/**
- * Core utilities for Redis operations
- * @packageDocumentation
- */
 export * from './ioredis';
 export * from './upstash-redis';
 export * from './keyBuilder';
-export declare const __esModule = true;

package/lib/core/keyBuilder/generate-query-cache-key.d.ts

@@ -19,6 +19,45 @@ export type GenerateQueryCacheKeyOptions = {
     appName?: string;
     logger?: any;
 };
+export type GenerateQueryCachePatternOptions = {
+    appName: string;
+    tenantId?: string;
+    userId?: string;
+    queryName: string;
+};
+/**
+ * Generates a wildcard pattern for invalidating GraphQL query cache keys
+ *
+ * This function creates patterns that match the keys generated by `generateQueryCacheKey`.
+ * Use this for cache invalidation to ensure consistent pattern matching.
+ *
+ * Key pattern format: `appName:tenantId:[userId]:queryName:*`
+ * - All components are sanitized the same way as cache key generation
+ * - Trailing wildcard matches the query hash and variables hash
+ *
+ * @param options - Pattern generation options
+ * @returns Redis pattern string for SCAN/KEYS operations
+ *
+ * @example
+ * ```typescript
+ * generateQueryCachePattern({
+ *   appName: 'CDMBASE_TEST',
+ *   tenantId: 'default',
+ *   userId: 'auth0|123',
+ *   queryName: 'pageSettings'
+ * })
+ * // Returns: 'CDMBASE_TEST:default:auth0-123:pageSettings:*'
+ *
+ * // Without userId (for public queries)
+ * generateQueryCachePattern({
+ *   appName: 'CDMBASE_TEST',
+ *   tenantId: 'default',
+ *   queryName: 'pageSettings'
+ * })
+ * // Returns: 'CDMBASE_TEST:default:pageSettings:*'
+ * ```
+ */
+export declare const generateQueryCachePattern: ({ appName, tenantId, userId, queryName, }: GenerateQueryCachePatternOptions) => string;
 /**
  * Generates a cache key for GraphQL queries using standardized Redis key builder
  *

package/lib/core/keyBuilder/generate-query-cache-key.js

@@ -1,4 +1,4 @@
-import {createHash}from'crypto';import {print}from'graphql/language/index.js';import {buildRedisKey}from'./sanitize-redis-key.js';/**
+import {createHash}from'crypto';import {print}from'graphql/language/index.js';import {sanitizeRedisKeyComponent,buildRedisKey}from'./sanitize-redis-key.js';/**
  * @file generate-query-cache-key.ts
  * @description Generates consistent cache keys for GraphQL queries
  *
@@ -10,6 +10,50 @@ import {createHash}from'crypto';import {print}from'graphql/language/index.js';im
  * - Variables are optionally hashed if provided
  * - All components are sanitized for Redis key safety
  */
+/**
+ * Generates a wildcard pattern for invalidating GraphQL query cache keys
+ *
+ * This function creates patterns that match the keys generated by `generateQueryCacheKey`.
+ * Use this for cache invalidation to ensure consistent pattern matching.
+ *
+ * Key pattern format: `appName:tenantId:[userId]:queryName:*`
+ * - All components are sanitized the same way as cache key generation
+ * - Trailing wildcard matches the query hash and variables hash
+ *
+ * @param options - Pattern generation options
+ * @returns Redis pattern string for SCAN/KEYS operations
+ *
+ * @example
+ * ```typescript
+ * generateQueryCachePattern({
+ *   appName: 'CDMBASE_TEST',
+ *   tenantId: 'default',
+ *   userId: 'auth0|123',
+ *   queryName: 'pageSettings'
+ * })
+ * // Returns: 'CDMBASE_TEST:default:auth0-123:pageSettings:*'
+ *
+ * // Without userId (for public queries)
+ * generateQueryCachePattern({
+ *   appName: 'CDMBASE_TEST',
+ *   tenantId: 'default',
+ *   queryName: 'pageSettings'
+ * })
+ * // Returns: 'CDMBASE_TEST:default:pageSettings:*'
+ * ```
+ */
+const generateQueryCachePattern = ({ appName, tenantId, userId, queryName, }) => {
+    const parts = [sanitizeRedisKeyComponent(appName)];
+    if (tenantId) {
+        parts.push(sanitizeRedisKeyComponent(tenantId));
+    }
+    if (userId) {
+        parts.push(sanitizeRedisKeyComponent(userId));
+    }
+    parts.push(sanitizeRedisKeyComponent(queryName));
+    parts.push('*'); // Wildcard to match queryHash and variablesHash
+    return parts.join(':');
+};
 /**
  * Generates a cache key for GraphQL queries using standardized Redis key builder
  *
@@ -79,4 +123,4 @@ const generateQueryCacheKey = ({ query, variables, logger, userId, tenantId, app
     });
     // Remove the temporary appName prefix: __temp__:
     return fullKey.substring('__temp__:'.length);
-};export{generateQueryCacheKey};//# sourceMappingURL=generate-query-cache-key.js.map
+};export{generateQueryCacheKey,generateQueryCachePattern};//# sourceMappingURL=generate-query-cache-key.js.map

package/lib/core/keyBuilder/generate-query-cache-key.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-query-cache-key.js","sources":["../../../src/core/keyBuilder/generate-query-cache-key.ts"],"sourcesContent":["/**\n * @file generate-query-cache-key.ts\n * @description Generates consistent cache keys for GraphQL queries\n *\n * This utility creates deterministic cache keys by hashing GraphQL queries and variables,\n * with proper sanitization for Redis key compatibility (e.g., Auth0 userIds with pipes).\n *\n * Key format: queryName:queryHash[:variablesHash]\n * - Query is hashed using SHA-256 for consistent, compact keys\n * - Variables are optionally hashed if provided\n * - All components are sanitized for Redis key safety\n */\n\nimport { createHash } from 'crypto';\nimport { DocumentNode, print } from 'graphql/language/index.js';\nimport { buildRedisKey } from './sanitize-redis-key';\n\nexport type GenerateQueryCacheKeyOptions = {\n    query: string | DocumentNode;\n    variables: Record<string, unknown>;\n    userId?: string;\n    tenantId?: string;\n    appName?: string;\n    logger?: any;\n};\n\n/**\n * Generates a cache key for GraphQL queries using standardized Redis key builder\n *\n * Key format: `[appName]:[tenantId]:[userId]:queryName:queryHash[:variablesHash]`\n * or legacy format: `[tenantId]:[userId]:queryName:queryHash[:variablesHash]`\n * - Query and variables are hashed for consistent, compact keys\n * - Uses buildRedisKey for proper sanitization and validation\n * - Optional components are omitted if not provided\n *\n * @param options - Cache key generation options\n * @returns Generated cache key string\n *\n * @example\n * ```typescript\n * // With appName (recommended)\n * generateQueryCacheKey({\n *   query: GetUserDocument,\n *   variables: { userId: '123' },\n *   userId: 'auth0|123',\n *   tenantId: 'default',\n *   appName: 'MY_APP',\n *   logger: myLogger\n * })\n * // Returns: 'MY_APP:default:auth0-123:user:hash1:hash2'\n *\n * // Legacy format without appName (for backward compatibility)\n * generateQueryCacheKey({\n *   query: GetUserDocument,\n *   variables: { userId: '123' },\n *   userId: 'auth0|123',\n *   tenantId: 'default',\n * })\n * // Returns: 'default:auth0-123:user:hash1:hash2'\n * ```\n */\nexport const generateQueryCacheKey = ({\n    query,\n    variables,\n    logger,\n    userId,\n    tenantId,\n    appName,\n}: GenerateQueryCacheKeyOptions): string => {\n    const normalizedQuery = (typeof query === 'string' ? query : print(query)).trim();\n    const [, queryName] = normalizedQuery?.match(/{\\s*(\\w+)/) ?? [];\n\n    // Log the data right before hashing\n    if (logger && typeof logger.trace === 'function') {\n        logger.trace('About to hash normalized query: [%s]', normalizedQuery);\n        logger.trace('About to hash variables: [%j]', variables);\n    }\n\n    const queryHash = createHash('sha256').update(normalizedQuery).digest('hex');\n    const variablesHash = variables ? createHash('sha256').update(JSON.stringify(variables)).digest('hex') : null;\n\n    // Build segments: queryName, queryHash, and optional variablesHash\n    const segments = [queryName, queryHash];\n    if (variablesHash) {\n        segments.push(variablesHash);\n    }\n\n    // If appName is provided, use the full standardized format\n    if (appName) {\n        return buildRedisKey({\n            appName,\n            tenantId,\n            userId,\n            segments,\n        });\n    }\n\n    // Legacy format for backward compatibility (no appName)\n    // Still uses buildRedisKey for sanitization, but strips the appName prefix\n    const fullKey = buildRedisKey({\n        appName: '__temp__',\n        tenantId,\n        userId,\n        segments,\n    });\n\n    // Remove the temporary appName prefix: __temp__:\n    return fullKey.substring('__temp__:'.length);\n};\n"],"names":[],"mappings":"kIAAA;;;;;;;;;;;AAWG;AAeH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkCG;AACU,MAAA,qBAAqB,GAAG,CAAC,EAClC,KAAK,EACL,SAAS,EACT,MAAM,EACN,MAAM,EACN,QAAQ,EACR,OAAO,GACoB,KAAY;IACvC,MAAM,eAAe,GAAG,CAAC,OAAO,KAAK,KAAK,QAAQ,GAAG,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;AAClF,IAAA,MAAM,GAAG,SAAS,CAAC,GAAG,eAAe,EAAE,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;;IAGhE,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,UAAU,EAAE;AAC9C,QAAA,MAAM,CAAC,KAAK,CAAC,sCAAsC,EAAE,eAAe,CAAC,CAAC;AACtE,QAAA,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE,SAAS,CAAC,CAAC;KAC5D;AAED,IAAA,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC7E,IAAA,MAAM,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;;AAG9G,IAAA,MAAM,QAAQ,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACxC,IAAI,aAAa,EAAE;AACf,QAAA,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;KAChC;;IAGD,IAAI,OAAO,EAAE;AACT,QAAA,OAAO,aAAa,CAAC;YACjB,OAAO;YACP,QAAQ;YACR,MAAM;YACN,QAAQ;AACX,SAAA,CAAC,CAAC;KACN;;;IAID,MAAM,OAAO,GAAG,aAAa,CAAC;AAC1B,QAAA,OAAO,EAAE,UAAU;QACnB,QAAQ;QACR,MAAM;QACN,QAAQ;AACX,KAAA,CAAC,CAAC;;IAGH,OAAO,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;AACjD"}
+{"version":3,"file":"generate-query-cache-key.js","sources":["../../../src/core/keyBuilder/generate-query-cache-key.ts"],"sourcesContent":["/**\n * @file generate-query-cache-key.ts\n * @description Generates consistent cache keys for GraphQL queries\n *\n * This utility creates deterministic cache keys by hashing GraphQL queries and variables,\n * with proper sanitization for Redis key compatibility (e.g., Auth0 userIds with pipes).\n *\n * Key format: queryName:queryHash[:variablesHash]\n * - Query is hashed using SHA-256 for consistent, compact keys\n * - Variables are optionally hashed if provided\n * - All components are sanitized for Redis key safety\n */\n\nimport { createHash } from 'crypto';\nimport { DocumentNode, print } from 'graphql/language/index.js';\nimport { buildRedisKey, sanitizeRedisKeyComponent } from './sanitize-redis-key';\n\nexport type GenerateQueryCacheKeyOptions = {\n    query: string | DocumentNode;\n    variables: Record<string, unknown>;\n    userId?: string;\n    tenantId?: string;\n    appName?: string;\n    logger?: any;\n};\n\nexport type GenerateQueryCachePatternOptions = {\n    appName: string;\n    tenantId?: string;\n    userId?: string;\n    queryName: string;\n};\n\n/**\n * Generates a wildcard pattern for invalidating GraphQL query cache keys\n *\n * This function creates patterns that match the keys generated by `generateQueryCacheKey`.\n * Use this for cache invalidation to ensure consistent pattern matching.\n *\n * Key pattern format: `appName:tenantId:[userId]:queryName:*`\n * - All components are sanitized the same way as cache key generation\n * - Trailing wildcard matches the query hash and variables hash\n *\n * @param options - Pattern generation options\n * @returns Redis pattern string for SCAN/KEYS operations\n *\n * @example\n * ```typescript\n * generateQueryCachePattern({\n *   appName: 'CDMBASE_TEST',\n *   tenantId: 'default',\n *   userId: 'auth0|123',\n *   queryName: 'pageSettings'\n * })\n * // Returns: 'CDMBASE_TEST:default:auth0-123:pageSettings:*'\n *\n * // Without userId (for public queries)\n * generateQueryCachePattern({\n *   appName: 'CDMBASE_TEST',\n *   tenantId: 'default',\n *   queryName: 'pageSettings'\n * })\n * // Returns: 'CDMBASE_TEST:default:pageSettings:*'\n * ```\n */\nexport const generateQueryCachePattern = ({\n    appName,\n    tenantId,\n    userId,\n    queryName,\n}: GenerateQueryCachePatternOptions): string => {\n    const parts: string[] = [sanitizeRedisKeyComponent(appName)];\n\n    if (tenantId) {\n        parts.push(sanitizeRedisKeyComponent(tenantId));\n    }\n\n    if (userId) {\n        parts.push(sanitizeRedisKeyComponent(userId));\n    }\n\n    parts.push(sanitizeRedisKeyComponent(queryName));\n    parts.push('*'); // Wildcard to match queryHash and variablesHash\n\n    return parts.join(':');\n};\n\n/**\n * Generates a cache key for GraphQL queries using standardized Redis key builder\n *\n * Key format: `[appName]:[tenantId]:[userId]:queryName:queryHash[:variablesHash]`\n * or legacy format: `[tenantId]:[userId]:queryName:queryHash[:variablesHash]`\n * - Query and variables are hashed for consistent, compact keys\n * - Uses buildRedisKey for proper sanitization and validation\n * - Optional components are omitted if not provided\n *\n * @param options - Cache key generation options\n * @returns Generated cache key string\n *\n * @example\n * ```typescript\n * // With appName (recommended)\n * generateQueryCacheKey({\n *   query: GetUserDocument,\n *   variables: { userId: '123' },\n *   userId: 'auth0|123',\n *   tenantId: 'default',\n *   appName: 'MY_APP',\n *   logger: myLogger\n * })\n * // Returns: 'MY_APP:default:auth0-123:user:hash1:hash2'\n *\n * // Legacy format without appName (for backward compatibility)\n * generateQueryCacheKey({\n *   query: GetUserDocument,\n *   variables: { userId: '123' },\n *   userId: 'auth0|123',\n *   tenantId: 'default',\n * })\n * // Returns: 'default:auth0-123:user:hash1:hash2'\n * ```\n */\nexport const generateQueryCacheKey = ({\n    query,\n    variables,\n    logger,\n    userId,\n    tenantId,\n    appName,\n}: GenerateQueryCacheKeyOptions): string => {\n    const normalizedQuery = (typeof query === 'string' ? query : print(query)).trim();\n    const [, queryName] = normalizedQuery?.match(/{\\s*(\\w+)/) ?? [];\n\n    // Log the data right before hashing\n    if (logger && typeof logger.trace === 'function') {\n        logger.trace('About to hash normalized query: [%s]', normalizedQuery);\n        logger.trace('About to hash variables: [%j]', variables);\n    }\n\n    const queryHash = createHash('sha256').update(normalizedQuery).digest('hex');\n    const variablesHash = variables ? createHash('sha256').update(JSON.stringify(variables)).digest('hex') : null;\n\n    // Build segments: queryName, queryHash, and optional variablesHash\n    const segments = [queryName, queryHash];\n    if (variablesHash) {\n        segments.push(variablesHash);\n    }\n\n    // If appName is provided, use the full standardized format\n    if (appName) {\n        return buildRedisKey({\n            appName,\n            tenantId,\n            userId,\n            segments,\n        });\n    }\n\n    // Legacy format for backward compatibility (no appName)\n    // Still uses buildRedisKey for sanitization, but strips the appName prefix\n    const fullKey = buildRedisKey({\n        appName: '__temp__',\n        tenantId,\n        userId,\n        segments,\n    });\n\n    // Remove the temporary appName prefix: __temp__:\n    return fullKey.substring('__temp__:'.length);\n};\n"],"names":[],"mappings":"4JAAA;;;;;;;;;;;AAWG;AAsBH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+BG;AACI,MAAM,yBAAyB,GAAG,CAAC,EACtC,OAAO,EACP,QAAQ,EACR,MAAM,EACN,SAAS,GACsB,KAAY;IAC3C,MAAM,KAAK,GAAa,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC;IAE7D,IAAI,QAAQ,EAAE;QACV,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC,CAAC;KACnD;IAED,IAAI,MAAM,EAAE;QACR,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,CAAC;KACjD;IAED,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC,CAAC;AACjD,IAAA,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEhB,IAAA,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC3B,EAAE;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkCG;AACU,MAAA,qBAAqB,GAAG,CAAC,EAClC,KAAK,EACL,SAAS,EACT,MAAM,EACN,MAAM,EACN,QAAQ,EACR,OAAO,GACoB,KAAY;IACvC,MAAM,eAAe,GAAG,CAAC,OAAO,KAAK,KAAK,QAAQ,GAAG,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;AAClF,IAAA,MAAM,GAAG,SAAS,CAAC,GAAG,eAAe,EAAE,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;;IAGhE,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,UAAU,EAAE;AAC9C,QAAA,MAAM,CAAC,KAAK,CAAC,sCAAsC,EAAE,eAAe,CAAC,CAAC;AACtE,QAAA,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE,SAAS,CAAC,CAAC;KAC5D;AAED,IAAA,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC7E,IAAA,MAAM,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;;AAG9G,IAAA,MAAM,QAAQ,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACxC,IAAI,aAAa,EAAE;AACf,QAAA,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;KAChC;;IAGD,IAAI,OAAO,EAAE;AACT,QAAA,OAAO,aAAa,CAAC;YACjB,OAAO;YACP,QAAQ;YACR,MAAM;YACN,QAAQ;AACX,SAAA,CAAC,CAAC;KACN;;;IAID,MAAM,OAAO,GAAG,aAAa,CAAC;AAC1B,QAAA,OAAO,EAAE,UAAU;QACnB,QAAQ;QACR,MAAM;QACN,QAAQ;AACX,KAAA,CAAC,CAAC;;IAGH,OAAO,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;AACjD"}

package/lib/index.js

@@ -1 +1 @@
-export{__esModule}from'./core/index.js';export{RedisCacheManager}from'./services/RedisCacheManager.js';export{invalidateCachePlugin}from'./plugins/invalidateCachePlugin.js';export{responseCachePlugin}from'./plugins/responseCachePlugin.js';export{IORedisClient}from'./core/ioredis.js';export{UpstashRedisClient}from'./core/upstash-redis.js';export{escapeRedisPattern,isHashLikeTenantId,isValidRedisKey,sanitizeRedisKey,sanitizeRedisKeyComponent}from'./core/keyBuilder/sanitize-redis-key.js';export{buildRedisKey,buildRedisKeyPattern}from'./core/keyBuilder/index.js';export{RedisNamespace,buildRedisKeyPatternWithNamespace,buildRedisKeyWithNamespace,extractNamespaceFromRedisKey,extractTenantIdFromRedisKey,isValidRedisKeyWithNamespace,parseRedisKey}from'./core/keyBuilder/redis-key-builder.js';export{generateQueryCacheKey}from'./core/keyBuilder/generate-query-cache-key.js';//# sourceMappingURL=index.js.map
+export{IORedisClient}from'./core/ioredis.js';export{UpstashRedisClient}from'./core/upstash-redis.js';export{buildRedisKey,buildRedisKeyPattern}from'./core/keyBuilder/index.js';export{RedisCacheManager}from'./services/RedisCacheManager.js';export{invalidateCachePlugin}from'./plugins/invalidateCachePlugin.js';export{responseCachePlugin}from'./plugins/responseCachePlugin.js';export{escapeRedisPattern,isHashLikeTenantId,isValidRedisKey,sanitizeRedisKey,sanitizeRedisKeyComponent}from'./core/keyBuilder/sanitize-redis-key.js';export{RedisNamespace,buildRedisKeyPatternWithNamespace,buildRedisKeyWithNamespace,extractNamespaceFromRedisKey,extractTenantIdFromRedisKey,isValidRedisKeyWithNamespace,parseRedisKey}from'./core/keyBuilder/redis-key-builder.js';export{generateQueryCacheKey,generateQueryCachePattern}from'./core/keyBuilder/generate-query-cache-key.js';//# sourceMappingURL=index.js.map

package/lib/module.d.ts

@@ -1,7 +1,6 @@
-import { Feature } from '@common-stack/server-core';
 import type { interfaces } from 'inversify';
 export declare const redisServiceGen: (container: interfaces.Container) => {
     redisCacheManager: IRedisCacheManager;
 };
-declare const _default: Feature<any, any>;
+declare const _default: any;
 export default _default;

package/lib/plugins/invalidateCachePlugin.js

@@ -1,4 +1,21 @@
-import {uniq}from'lodash-es';import {extractTenantId,getDirectiveArgsFromSchema,CACHE_CONTROL_DIRECTIVE}from'@common-stack/server-core';import {config}from'../config/env-config.js';const invalidateCachePlugin = ({ cache: redisClient, invalidateCacheKeyGenerator, }) => ({
+import {uniq}from'lodash-es';import {extractTenantId,getDirectiveArgsFromSchema,CACHE_CONTROL_DIRECTIVE}from'@common-stack/server-core';import {config}from'../config/env-config.js';import {generateQueryCachePattern}from'../core/keyBuilder/generate-query-cache-key.js';/**
+ * Scans Redis keys using SCAN command instead of KEYS for better performance.
+ * SCAN is non-blocking and safe to use in production environments.
+ */
+async function scanKeys(redisClient, pattern) {
+    const allKeys = [];
+    let cursor = '0';
+    do {
+        // SCAN returns [cursor, keys[]]
+        const [nextCursor, keys] = await redisClient.scan(cursor, 'MATCH', pattern, 'COUNT', 100);
+        cursor = nextCursor;
+        if (keys.length) {
+            allKeys.push(...keys);
+        }
+    } while (cursor !== '0');
+    return allKeys;
+}
+const invalidateCachePlugin = ({ cache: redisClient, invalidateCacheKeyGenerator, }) => ({
     requestDidStart(requestContext) {
         return {
             willSendResponse: async (responseContext) => {
@@ -9,38 +26,74 @@ import {uniq}from'lodash-es';import {extractTenantId,getDirectiveArgsFromSchema,
                 try {
                     const hasErrors = !!requestContext.errors?.length;
                     const { schema } = requestContext;
-                    const { queriesToInvalidate, user, req } = requestContext.contextValue;
+                    // Safely access contextValue properties
+                    const contextValue = requestContext.contextValue;
+                    if (!contextValue) {
+                        return;
+                    }
+                    const { queriesToInvalidate, user, req } = contextValue;
                     const tenantId = extractTenantId(req?.currentPageUriSegments?.authority);
-                    const [{ operation }] = responseContext.document.definitions;
+                    // Safely extract operation from document definitions
+                    const definitions = responseContext.document?.definitions;
+                    if (!definitions?.length) {
+                        return;
+                    }
+                    const firstDefinition = definitions[0];
+                    const operation = firstDefinition?.operation;
                     const isMutation = operation === 'mutation';
                     if (hasErrors || !queriesToInvalidate?.length || !isMutation) {
+                        if (isMutation) {
+                            console.log('🔍 invalidateCachePlugin: skipping - hasErrors:', hasErrors, 'queriesToInvalidate:', queriesToInvalidate);
+                        }
                         return;
                     }
+                    console.log('🗑️ invalidateCachePlugin: invalidating queries:', queriesToInvalidate);
                     const nestedKeys = await Promise.all(queriesToInvalidate.map(async (query) => {
                         // Build keys in order of specificity
                         let keys = [];
-                        const cachePolicy = getDirectiveArgsFromSchema({
-                            schema,
-                            queryName: query,
-                            directiveName: CACHE_CONTROL_DIRECTIVE,
-                        });
-                        const isPrivate = cachePolicy.scope?.toLowerCase() === 'private';
+                        // Safely get cache policy directive
+                        let cachePolicy = null;
+                        try {
+                            cachePolicy = getDirectiveArgsFromSchema({
+                                schema,
+                                queryName: query,
+                                directiveName: CACHE_CONTROL_DIRECTIVE,
+                            });
+                        }
+                        catch (e) {
+                            requestContext.logger?.warn?.(`Failed to get cache policy for query: ${query}`);
+                        }
+                        const isPrivate = cachePolicy?.scope?.toLowerCase() === 'private';
                         // Add tenant-specific key if tenant exists
                         if (tenantId) {
-                            keys.push(`${config.APP_NAME}:${tenantId}:${query}:*`);
-                            // Add user-specific key if user exists
+                            // Pattern without userId (for public queries or as fallback)
+                            keys.push(generateQueryCachePattern({
+                                appName: config.APP_NAME,
+                                tenantId,
+                                queryName: query,
+                            }));
+                            // Add user-specific pattern if user exists and query is private
                             if (user?.sub && isPrivate) {
-                                keys.push(`${config.APP_NAME}:${tenantId}:${user.sub}:${query}:*`);
+                                keys.push(generateQueryCachePattern({
+                                    appName: config.APP_NAME,
+                                    tenantId,
+                                    userId: user.sub,
+                                    queryName: query,
+                                }));
                             }
                         }
-                        // Add global key as fallback
-                        keys.push(`${config.APP_NAME}:${query}:*`);
+                        // Add global pattern as fallback (no tenant)
+                        keys.push(generateQueryCachePattern({
+                            appName: config.APP_NAME,
+                            queryName: query,
+                        }));
                         // Allow custom key generation if provided
                         if (typeof invalidateCacheKeyGenerator === 'function') {
                             keys = keys.map((key) => invalidateCacheKeyGenerator(requestContext, responseContext, key));
                         }
+                        // Use SCAN instead of KEYS for better performance (non-blocking)
                         const matchedKeys = await Promise.all(keys.map(async (key) => {
-                            const matchingKeys = await redisClient.keys(key);
+                            const matchingKeys = await scanKeys(redisClient, key);
                             if (matchingKeys.length) {
                                 return matchingKeys;
                             }

package/lib/plugins/invalidateCachePlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"invalidateCachePlugin.js","sources":["../../src/plugins/invalidateCachePlugin.ts"],"sourcesContent":["import { Redis, Cluster } from 'ioredis';\nimport { uniq } from 'lodash-es';\nimport { OperationDefinitionNode } from 'graphql/language/ast.js';\nimport type { BaseContext, GraphQLRequestContextWillSendResponse } from '@apollo/server';\nimport { ApolloServerOptions, GraphQLRequestContext } from '@apollo/server';\nimport { CACHE_CONTROL_DIRECTIVE, extractTenantId, getDirectiveArgsFromSchema } from '@common-stack/server-core';\nimport { IGraphQLCacheContext } from 'common/server';\nimport { config } from '../config';\n\nexport type InvalidationKeyGenerator = (\n    requestContext: GraphQLRequestContext<unknown>,\n    responseContext: GraphQLRequestContextWillSendResponse<unknown>,\n    cacheKey?: string,\n) => string;\nexport const invalidateCachePlugin = ({\n    cache: redisClient,\n    invalidateCacheKeyGenerator,\n}: {\n    cache: Redis | Cluster;\n    invalidateCacheKeyGenerator: InvalidationKeyGenerator;\n}) =>\n    ({\n        requestDidStart(requestContext: GraphQLRequestContext<IGraphQLCacheContext>) {\n            return {\n                willSendResponse: async (responseContext: GraphQLRequestContextWillSendResponse<unknown>) => {\n                    // in case of websocket request initially the requestContext comes empty\n                    if (!requestContext) {\n                        return;\n                    }\n                    try {\n                        const hasErrors = !!requestContext.errors?.length;\n                        const { schema } = requestContext;\n                        const { queriesToInvalidate, user, req } = requestContext.contextValue;\n                        const tenantId = extractTenantId(req?.currentPageUriSegments?.authority);\n                        const [{ operation }] = responseContext.document.definitions as OperationDefinitionNode[];\n                        const isMutation = operation === 'mutation';\n                        if (hasErrors || !queriesToInvalidate?.length || !isMutation) {\n                            return;\n                        }\n\n                        const nestedKeys = await Promise.all<string[]>(\n                            queriesToInvalidate.map(async (query: string) => {\n                                // Build keys in order of specificity\n                                let keys: string[] = [];\n                                const cachePolicy: { scope: string } = getDirectiveArgsFromSchema({\n                                    schema,\n                                    queryName: query,\n                                    directiveName: CACHE_CONTROL_DIRECTIVE,\n                                });\n                                const isPrivate = cachePolicy.scope?.toLowerCase() === 'private';\n                                // Add tenant-specific key if tenant exists\n                                if (tenantId) {\n                                    keys.push(`${config.APP_NAME}:${tenantId}:${query}:*`);\n                                    // Add user-specific key if user exists\n                                    if (user?.sub && isPrivate) {\n                                        keys.push(`${config.APP_NAME}:${tenantId}:${user.sub}:${query}:*`);\n                                    }\n                                }\n                                // Add global key as fallback\n                                keys.push(`${config.APP_NAME}:${query}:*`);\n\n                                // Allow custom key generation if provided\n                                if (typeof invalidateCacheKeyGenerator === 'function') {\n                                    keys = keys.map((key) =>\n                                        invalidateCacheKeyGenerator(requestContext, responseContext, key),\n                                    );\n                                }\n                                const matchedKeys = await Promise.all(\n                                    keys.map(async (key) => {\n                                        const matchingKeys = await redisClient.keys(key);\n                                        if (matchingKeys.length) {\n                                            return matchingKeys;\n                                        }\n                                        return [];\n                                    }),\n                                );\n                                return matchedKeys.flat();\n                            }),\n                        );\n                        const keys = nestedKeys.flat();\n                        if (keys?.length) {\n                            await redisClient.del(uniq(keys));\n                        }\n                    } catch (e) {\n                        requestContext.logger.error('Error occurred in invalidateCachePlugin');\n                        requestContext.logger.error(e);\n                    }\n                },\n            };\n        },\n    }) as unknown as ApolloServerOptions<BaseContext>['plugins'][0];\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"invalidateCachePlugin.js","sources":["../../src/plugins/invalidateCachePlugin.ts"],"sourcesContent":["import { Redis, Cluster } from 'ioredis';\nimport { uniq } from 'lodash-es';\nimport { OperationDefinitionNode } from 'graphql/language/ast.js';\nimport type { BaseContext, GraphQLRequestContextWillSendResponse } from '@apollo/server';\nimport { ApolloServerOptions, GraphQLRequestContext } from '@apollo/server';\nimport { CACHE_CONTROL_DIRECTIVE, extractTenantId, getDirectiveArgsFromSchema } from '@common-stack/server-core';\nimport { IGraphQLCacheContext } from 'common/server';\nimport { config } from '../config';\nimport { generateQueryCachePattern } from '../core/keyBuilder/generate-query-cache-key';\n\nexport type InvalidationKeyGenerator = (\n    requestContext: GraphQLRequestContext<unknown>,\n    responseContext: GraphQLRequestContextWillSendResponse<unknown>,\n    cacheKey?: string,\n) => string;\n\n/**\n * Scans Redis keys using SCAN command instead of KEYS for better performance.\n * SCAN is non-blocking and safe to use in production environments.\n */\nasync function scanKeys(redisClient: Redis | Cluster, pattern: string): Promise<string[]> {\n    const allKeys: string[] = [];\n    let cursor = '0';\n\n    do {\n        // SCAN returns [cursor, keys[]]\n        const [nextCursor, keys] = await redisClient.scan(cursor, 'MATCH', pattern, 'COUNT', 100);\n        cursor = nextCursor;\n        if (keys.length) {\n            allKeys.push(...keys);\n        }\n    } while (cursor !== '0');\n\n    return allKeys;\n}\n\nexport const invalidateCachePlugin = ({\n    cache: redisClient,\n    invalidateCacheKeyGenerator,\n}: {\n    cache: Redis | Cluster;\n    invalidateCacheKeyGenerator: InvalidationKeyGenerator;\n}) =>\n    ({\n        requestDidStart(requestContext: GraphQLRequestContext<IGraphQLCacheContext>) {\n            return {\n                willSendResponse: async (responseContext: GraphQLRequestContextWillSendResponse<unknown>) => {\n                    // in case of websocket request initially the requestContext comes empty\n                    if (!requestContext) {\n                        return;\n                    }\n                    try {\n                        const hasErrors = !!requestContext.errors?.length;\n                        const { schema } = requestContext;\n\n                        // Safely access contextValue properties\n                        const contextValue = requestContext.contextValue;\n                        if (!contextValue) {\n                            return;\n                        }\n                        const { queriesToInvalidate, user, req } = contextValue;\n                        const tenantId = extractTenantId(req?.currentPageUriSegments?.authority);\n\n                        // Safely extract operation from document definitions\n                        const definitions = responseContext.document?.definitions as OperationDefinitionNode[];\n                        if (!definitions?.length) {\n                            return;\n                        }\n                        const firstDefinition = definitions[0];\n                        const operation = firstDefinition?.operation;\n                        const isMutation = operation === 'mutation';\n\n                        if (hasErrors || !queriesToInvalidate?.length || !isMutation) {\n                            if (isMutation) {\n                                console.log(\n                                    '🔍 invalidateCachePlugin: skipping - hasErrors:',\n                                    hasErrors,\n                                    'queriesToInvalidate:',\n                                    queriesToInvalidate,\n                                );\n                            }\n                            return;\n                        }\n\n                        console.log('🗑️ invalidateCachePlugin: invalidating queries:', queriesToInvalidate);\n\n                        const nestedKeys = await Promise.all<string[]>(\n                            queriesToInvalidate.map(async (query: string) => {\n                                // Build keys in order of specificity\n                                let keys: string[] = [];\n\n                                // Safely get cache policy directive\n                                let cachePolicy: { scope?: string } | null = null;\n                                try {\n                                    cachePolicy = getDirectiveArgsFromSchema({\n                                        schema,\n                                        queryName: query,\n                                        directiveName: CACHE_CONTROL_DIRECTIVE,\n                                    });\n                                } catch (e) {\n                                    requestContext.logger?.warn?.(`Failed to get cache policy for query: ${query}`);\n                                }\n\n                                const isPrivate = cachePolicy?.scope?.toLowerCase() === 'private';\n                                // Add tenant-specific key if tenant exists\n                                if (tenantId) {\n                                    // Pattern without userId (for public queries or as fallback)\n                                    keys.push(\n                                        generateQueryCachePattern({\n                                            appName: config.APP_NAME,\n                                            tenantId,\n                                            queryName: query,\n                                        }),\n                                    );\n                                    // Add user-specific pattern if user exists and query is private\n                                    if (user?.sub && isPrivate) {\n                                        keys.push(\n                                            generateQueryCachePattern({\n                                                appName: config.APP_NAME,\n                                                tenantId,\n                                                userId: user.sub,\n                                                queryName: query,\n                                            }),\n                                        );\n                                    }\n                                }\n                                // Add global pattern as fallback (no tenant)\n                                keys.push(\n                                    generateQueryCachePattern({\n                                        appName: config.APP_NAME,\n                                        queryName: query,\n                                    }),\n                                );\n\n                                // Allow custom key generation if provided\n                                if (typeof invalidateCacheKeyGenerator === 'function') {\n                                    keys = keys.map((key) =>\n                                        invalidateCacheKeyGenerator(requestContext, responseContext, key),\n                                    );\n                                }\n                                // Use SCAN instead of KEYS for better performance (non-blocking)\n                                const matchedKeys = await Promise.all(\n                                    keys.map(async (key) => {\n                                        const matchingKeys = await scanKeys(redisClient, key);\n                                        if (matchingKeys.length) {\n                                            return matchingKeys;\n                                        }\n                                        return [];\n                                    }),\n                                );\n                                return matchedKeys.flat();\n                            }),\n                        );\n                        const keys = nestedKeys.flat();\n                        if (keys?.length) {\n                            await redisClient.del(uniq(keys));\n                        }\n                    } catch (e) {\n                        requestContext.logger.error('Error occurred in invalidateCachePlugin');\n                        requestContext.logger.error(e);\n                    }\n                },\n            };\n        },\n    }) as unknown as ApolloServerOptions<BaseContext>['plugins'][0];\n"],"names":[],"mappings":"4QAgBA;;;AAGG;AACH,eAAe,QAAQ,CAAC,WAA4B,EAAE,OAAe,EAAA;IACjE,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,MAAM,GAAG,GAAG,CAAC;AAEjB,IAAA,GAAG;;QAEC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QAC1F,MAAM,GAAG,UAAU,CAAC;AACpB,QAAA,IAAI,IAAI,CAAC,MAAM,EAAE;AACb,YAAA,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;SACzB;AACL,KAAC,QAAQ,MAAM,KAAK,GAAG,EAAE;AAEzB,IAAA,OAAO,OAAO,CAAC;AACnB,CAAC;AAEM,MAAM,qBAAqB,GAAG,CAAC,EAClC,KAAK,EAAE,WAAW,EAClB,2BAA2B,GAI9B,MACI;AACG,IAAA,eAAe,CAAC,cAA2D,EAAA;QACvE,OAAO;AACH,YAAA,gBAAgB,EAAE,OAAO,eAA+D,KAAI;;gBAExF,IAAI,CAAC,cAAc,EAAE;oBACjB,OAAO;iBACV;AACD,gBAAA,IAAI;oBACA,MAAM,SAAS,GAAG,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC;AAClD,oBAAA,MAAM,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;;AAGlC,oBAAA,MAAM,YAAY,GAAG,cAAc,CAAC,YAAY,CAAC;oBACjD,IAAI,CAAC,YAAY,EAAE;wBACf,OAAO;qBACV;oBACD,MAAM,EAAE,mBAAmB,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,YAAY,CAAC;oBACxD,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,EAAE,sBAAsB,EAAE,SAAS,CAAC,CAAC;;AAGzE,oBAAA,MAAM,WAAW,GAAG,eAAe,CAAC,QAAQ,EAAE,WAAwC,CAAC;AACvF,oBAAA,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE;wBACtB,OAAO;qBACV;AACD,oBAAA,MAAM,eAAe,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;AACvC,oBAAA,MAAM,SAAS,GAAG,eAAe,EAAE,SAAS,CAAC;AAC7C,oBAAA,MAAM,UAAU,GAAG,SAAS,KAAK,UAAU,CAAC;oBAE5C,IAAI,SAAS,IAAI,CAAC,mBAAmB,EAAE,MAAM,IAAI,CAAC,UAAU,EAAE;wBAC1D,IAAI,UAAU,EAAE;4BACZ,OAAO,CAAC,GAAG,CACP,iDAAiD,EACjD,SAAS,EACT,sBAAsB,EACtB,mBAAmB,CACtB,CAAC;yBACL;wBACD,OAAO;qBACV;AAED,oBAAA,OAAO,CAAC,GAAG,CAAC,kDAAkD,EAAE,mBAAmB,CAAC,CAAC;AAErF,oBAAA,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,mBAAmB,CAAC,GAAG,CAAC,OAAO,KAAa,KAAI;;wBAE5C,IAAI,IAAI,GAAa,EAAE,CAAC;;wBAGxB,IAAI,WAAW,GAA8B,IAAI,CAAC;AAClD,wBAAA,IAAI;4BACA,WAAW,GAAG,0BAA0B,CAAC;gCACrC,MAAM;AACN,gCAAA,SAAS,EAAE,KAAK;AAChB,gCAAA,aAAa,EAAE,uBAAuB;AACzC,6BAAA,CAAC,CAAC;yBACN;wBAAC,OAAO,CAAC,EAAE;4BACR,cAAc,CAAC,MAAM,EAAE,IAAI,GAAG,CAAyC,sCAAA,EAAA,KAAK,CAAE,CAAA,CAAC,CAAC;yBACnF;wBAED,MAAM,SAAS,GAAG,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,SAAS,CAAC;;wBAElE,IAAI,QAAQ,EAAE;;AAEV,4BAAA,IAAI,CAAC,IAAI,CACL,yBAAyB,CAAC;gCACtB,OAAO,EAAE,MAAM,CAAC,QAAQ;gCACxB,QAAQ;AACR,gCAAA,SAAS,EAAE,KAAK;AACnB,6BAAA,CAAC,CACL,CAAC;;AAEF,4BAAA,IAAI,IAAI,EAAE,GAAG,IAAI,SAAS,EAAE;AACxB,gCAAA,IAAI,CAAC,IAAI,CACL,yBAAyB,CAAC;oCACtB,OAAO,EAAE,MAAM,CAAC,QAAQ;oCACxB,QAAQ;oCACR,MAAM,EAAE,IAAI,CAAC,GAAG;AAChB,oCAAA,SAAS,EAAE,KAAK;AACnB,iCAAA,CAAC,CACL,CAAC;6BACL;yBACJ;;AAED,wBAAA,IAAI,CAAC,IAAI,CACL,yBAAyB,CAAC;4BACtB,OAAO,EAAE,MAAM,CAAC,QAAQ;AACxB,4BAAA,SAAS,EAAE,KAAK;AACnB,yBAAA,CAAC,CACL,CAAC;;AAGF,wBAAA,IAAI,OAAO,2BAA2B,KAAK,UAAU,EAAE;AACnD,4BAAA,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,KAChB,2BAA2B,CAAC,cAAc,EAAE,eAAe,EAAE,GAAG,CAAC,CACpE,CAAC;yBACL;;AAED,wBAAA,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,KAAI;4BACnB,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;AACtD,4BAAA,IAAI,YAAY,CAAC,MAAM,EAAE;AACrB,gCAAA,OAAO,YAAY,CAAC;6BACvB;AACD,4BAAA,OAAO,EAAE,CAAC;yBACb,CAAC,CACL,CAAC;AACF,wBAAA,OAAO,WAAW,CAAC,IAAI,EAAE,CAAC;qBAC7B,CAAC,CACL,CAAC;AACF,oBAAA,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;AAC/B,oBAAA,IAAI,IAAI,EAAE,MAAM,EAAE;wBACd,MAAM,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;qBACrC;iBACJ;gBAAC,OAAO,CAAC,EAAE;AACR,oBAAA,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;AACvE,oBAAA,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;iBAClC;aACJ;SACJ,CAAC;KACL;AACJ,CAAA"}

package/lib/plugins/responseCachePlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"responseCachePlugin.js","sources":["../../src/plugins/responseCachePlugin.ts"],"sourcesContent":["/* eslint-disable no-param-reassign */\nimport { GraphQLRequestContext } from '@apollo/server';\nimport { CACHE_CONTROL_DIRECTIVE, extractTenantId, getDirectiveArgsFromSchema } from '@common-stack/server-core';\nimport { isEmpty } from 'lodash-es';\nimport apolloCachePlugin from '@apollo/server-plugin-response-cache';\nimport { ILogger } from '@cdm-logger/core/lib/interface';\nimport { IGraphQLCacheContext, IGraphqlCacheKeyGenerator } from 'common/server';\nimport { generateQueryCacheKey } from '../core/keyBuilder/generate-query-cache-key';\n\n\nconst cachePlugin = (apolloCachePlugin as any).default ?? apolloCachePlugin;\n\ntype ApolloCachePluginOptions = {\n    logger: ILogger;\n    cacheKeyGenerator: IGraphqlCacheKeyGenerator;\n};\n\nexport const isCacheable = (requestContext: GraphQLRequestContext<IGraphQLCacheContext>) => {\n    const { document, schema } = requestContext;\n    const cache = getDirectiveArgsFromSchema({\n        schema,\n        document,\n        directiveName: CACHE_CONTROL_DIRECTIVE,\n    });\n    if (!cache) return false;\n    if (cache.scope && !cache.maxAge) {\n        cache.maxAge = 86400;\n    }\n    if (!requestContext.overallCachePolicy) {\n        // eslint-disable-next-line no-param-reassign\n        // to support test cases\n        (requestContext as any).overallCachePolicy = {};\n    }\n    // eslint-disable-next-line no-param-reassign\n    requestContext.overallCachePolicy.maxAge = cache.maxAge;\n    return cache.maxAge > 0;\n};\n\nexport const generateCacheKey =\n    ({ logger, cacheKeyGenerator }: ApolloCachePluginOptions) =>\n    (requestContext: GraphQLRequestContext<IGraphQLCacheContext>): string => {\n        if (!isCacheable(requestContext)) {\n            return null;\n        }\n        const { request, contextValue, document, schema } = requestContext;\n        const { user, req } = contextValue ?? {};\n        const { query, variables } = request;\n        const cacheControlDirective = getDirectiveArgsFromSchema({\n            schema,\n            document,\n            directiveName: CACHE_CONTROL_DIRECTIVE,\n        });\n        const { scope } = cacheControlDirective ?? {};\n        const isPrivate = scope?.toLowerCase() === 'private';\n        const tenantId = req.tenant ?? extractTenantId(req?.currentPageUriSegments?.authority);\n        const cacheKey = generateQueryCacheKey({\n            query,\n            variables,\n            logger,\n            userId: isPrivate ? user?.sub || null : null,\n            tenantId,\n        });\n        try {\n            if (typeof cacheKeyGenerator === 'function') {\n                const generatedKey = cacheKeyGenerator(requestContext, cacheKey);\n                return generatedKey || cacheKey;\n            }\n            return cacheKey;\n        } catch (e) {\n            console.warn('GenerateCacheKey Failed %s', e.message);\n            return cacheKey;\n        }\n    };\nexport const responseCachePlugin = ({ logger, cacheKeyGenerator }: ApolloCachePluginOptions) =>\n    cachePlugin({\n        sessionId: ({ contextValue }) => Promise.resolve(contextValue?.user?.sub ?? null),\n        generateCacheKey: generateCacheKey({ logger, cacheKeyGenerator }),\n        shouldWriteToCache: (ctx) =>\n            // Cache only successful responses\n            isCacheable(ctx) && isEmpty(ctx?.response?.body?.singleResult.errors),\n    });\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"responseCachePlugin.js","sources":["../../src/plugins/responseCachePlugin.ts"],"sourcesContent":["/* eslint-disable no-param-reassign */\nimport { GraphQLRequestContext } from '@apollo/server';\nimport { CACHE_CONTROL_DIRECTIVE, extractTenantId, getDirectiveArgsFromSchema } from '@common-stack/server-core';\nimport { isEmpty } from 'lodash-es';\nimport apolloCachePlugin from '@apollo/server-plugin-response-cache';\nimport { ILogger } from '@cdm-logger/core/lib/interface';\nimport { IGraphQLCacheContext, IGraphqlCacheKeyGenerator } from 'common/server';\nimport { generateQueryCacheKey } from '../core/keyBuilder/generate-query-cache-key';\n\nconst cachePlugin = (apolloCachePlugin as any).default ?? apolloCachePlugin;\n\ntype ApolloCachePluginOptions = {\n    logger: ILogger;\n    cacheKeyGenerator: IGraphqlCacheKeyGenerator;\n};\n\nexport const isCacheable = (requestContext: GraphQLRequestContext<IGraphQLCacheContext>) => {\n    const { document, schema } = requestContext;\n    const cache = getDirectiveArgsFromSchema({\n        schema,\n        document,\n        directiveName: CACHE_CONTROL_DIRECTIVE,\n    });\n    if (!cache) return false;\n    if (cache.scope && !cache.maxAge) {\n        cache.maxAge = 86400;\n    }\n    if (!requestContext.overallCachePolicy) {\n        // eslint-disable-next-line no-param-reassign\n        // to support test cases\n        (requestContext as any).overallCachePolicy = {};\n    }\n    // eslint-disable-next-line no-param-reassign\n    requestContext.overallCachePolicy.maxAge = cache.maxAge;\n    return cache.maxAge > 0;\n};\n\nexport const generateCacheKey =\n    ({ logger, cacheKeyGenerator }: ApolloCachePluginOptions) =>\n    (requestContext: GraphQLRequestContext<IGraphQLCacheContext>): string => {\n        if (!isCacheable(requestContext)) {\n            return null;\n        }\n        const { request, contextValue, document, schema } = requestContext;\n        const { user, req } = contextValue ?? {};\n        const { query, variables } = request;\n        const cacheControlDirective = getDirectiveArgsFromSchema({\n            schema,\n            document,\n            directiveName: CACHE_CONTROL_DIRECTIVE,\n        });\n        const { scope } = cacheControlDirective ?? {};\n        const isPrivate = scope?.toLowerCase() === 'private';\n        const tenantId = req.tenant ?? extractTenantId(req?.currentPageUriSegments?.authority);\n        const cacheKey = generateQueryCacheKey({\n            query,\n            variables,\n            logger,\n            userId: isPrivate ? user?.sub || null : null,\n            tenantId,\n        });\n        try {\n            if (typeof cacheKeyGenerator === 'function') {\n                const generatedKey = cacheKeyGenerator(requestContext, cacheKey);\n                return generatedKey || cacheKey;\n            }\n            return cacheKey;\n        } catch (e) {\n            console.warn('GenerateCacheKey Failed %s', e.message);\n            return cacheKey;\n        }\n    };\nexport const responseCachePlugin = ({ logger, cacheKeyGenerator }: ApolloCachePluginOptions) =>\n    cachePlugin({\n        sessionId: ({ contextValue }) => Promise.resolve(contextValue?.user?.sub ?? null),\n        generateCacheKey: generateCacheKey({ logger, cacheKeyGenerator }),\n        shouldWriteToCache: (ctx) =>\n            // Cache only successful responses\n            isCacheable(ctx) && isEmpty(ctx?.response?.body?.singleResult.errors),\n    });\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/store-redis",
-    "version": "8.3.1-alpha.7",
+    "version": "8.4.1-alpha.0",
     "description": "Redis store utilities and services for common-stack",
     "license": "UNLICENSED",
     "author": "CDMBase LLC",
@@ -24,16 +24,16 @@
         "watch": "npm run build:lib:watch"
     },
     "dependencies": {
-        "@common-stack/core": "8.3.1-alpha.7"
+        "@common-stack/core": "8.4.1-alpha.0",
+        "@upstash/redis": "^1.36.1",
+        "ioredis": "^5.4.1"
     },
     "devDependencies": {
-        "common": "8.3.1-alpha.7",
-        "ioredis": "^5.3.2"
+        "common": "8.3.1-alpha.12"
     },
     "peerDependencies": {
         "graphql": ">=16.0.0",
-        "inversify": "*",
-        "ioredis": ">=5.0.0"
+        "inversify": "*"
     },
     "publishConfig": {
         "access": "public"
@@ -54,7 +54,7 @@
             ]
         }
     },
-    "gitHead": "4bb669b7168f95f0a0ebe05100545ea5fd353cf4",
+    "gitHead": "ac86412a3e65f14ccbf8b3a6e46f9b82ed7299da",
     "typescript": {
         "definition": "lib/index.d.ts"
     }

package/lib/core/index.js

@@ -1,6 +0,0 @@
-import'ioredis';import'@upstash/redis/cloudflare';import'crypto';import'graphql/language/index.js';/**
- * Core utilities for Redis operations
- * @packageDocumentation
- */
-// Ensure this file generates a JS output in rollup build
-const __esModule = true;export{__esModule};//# sourceMappingURL=index.js.map

package/lib/core/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sources":["../../src/core/index.ts"],"sourcesContent":["/**\n * Core utilities for Redis operations\n * @packageDocumentation\n */\n\nexport * from './ioredis';\nexport * from './upstash-redis';\nexport * from './keyBuilder';\n\n// Ensure this file generates a JS output in rollup build\nexport const __esModule = true;\n"],"names":[],"mappings":"mGAAA;;;AAGG;AAMH;AACO,MAAM,UAAU,GAAG"}