chore: rename to CachePersistenceLayer

Author: dreamorosi

packages/idempotency/package.json

@@ -52,13 +52,13 @@
       "import": "./lib/esm/types/DynamoDBPersistence.js",
       "require": "./lib/cjs/types/DynamoDBPersistence.js"
     },
-    "./redis": {
-      "import": "./lib/esm/persistence/RedisPersistenceLayer.js",
-      "require": "./lib/cjs/persistence/RedisPersistenceLayer.js"
+    "./cache": {
+      "import": "./lib/esm/persistence/CachePersistenceLayer.js",
+      "require": "./lib/cjs/persistence/CachePersistenceLayer.js"
     },
-    "./redis/types": {
-      "import": "./lib/esm/types/RedisPersistence.js",
-      "require": "./lib/cjs/types/RedisPersistence.js"
+    "./cache/types": {
+      "import": "./lib/esm/types/CachePersistence.js",
+      "require": "./lib/cjs/types/CachePersistence.js"
     },
     "./middleware": {
       "import": "./lib/esm/middleware/makeHandlerIdempotent.js",
@@ -83,13 +83,13 @@
         "lib/cjs/types/DynamoDBPersistence.d.ts",
         "lib/esm/types/DynamoDBPersistence.d.ts"
       ],
-      "redis": [
-        "lib/cjs/persistence/RedisPersistenceLayer.d.ts",
-        "lib/esm/persistence/RedisPersistenceLayer.d.ts"
+      "cache": [
+        "lib/cjs/persistence/CachePersistenceLayer.d.ts",
+        "lib/esm/persistence/CachePersistenceLayer.d.ts"
       ],
-      "redis/types": [
-        "lib/cjs/types/RedisPersistence.d.ts",
-        "lib/esm/types/RedisPersistence.d.ts"
+      "cache/types": [
+        "lib/cjs/types/CachePersistence.d.ts",
+        "lib/esm/types/CachePersistence.d.ts"
       ],
       "middleware": [
         "lib/cjs/middleware/makeHandlerIdempotent.d.ts",

packages/idempotency/src/persistence/RedisPersistenceLayer.ts renamed to packages/idempotency/src/persistence/CachePersistenceLayer.ts

@@ -1,4 +1,3 @@
-import type { JSONObject } from '@aws-lambda-powertools/commons/types';
 import {
   IdempotencyRecordStatus,
   PERSISTENCE_ATTRIBUTE_KEY_MAPPINGS,
@@ -9,54 +8,81 @@ import {
   IdempotencyPersistenceConsistencyError,
   IdempotencyUnknownError,
 } from '../errors.js';
-import type { IdempotencyRecordStatusValue } from '../types/IdempotencyRecord.js';
 import type {
-  RedisCompatibleClient,
-  RedisPersistenceOptions,
-} from '../types/RedisPersistence.js';
+  CacheClient,
+  CachePersistenceOptions,
+} from '../types/CachePersistence.js';
+import type { IdempotencyRecordStatusValue } from '../types/IdempotencyRecord.js';
 import { BasePersistenceLayer } from './BasePersistenceLayer.js';
 import { IdempotencyRecord } from './IdempotencyRecord.js';
 
 /**
- * Redis persistence layer for idempotency records.
+ * Valey- and Redis OOS-compatible persistence layer for idempotency records.
  *
- * This class uses Redis to write and read idempotency records. It supports any Redis client that
- * implements the RedisCompatibleClient interface.
+ * This class uses a cache client to write and read idempotency records. It supports any client that
+ * implements the {@link CacheClient | `CacheClient`} interface.
  *
  * There are various options to configure the persistence layer, such as attribute names for storing
- * status, expiry, data, and validation keys in Redis.
+ * status, expiry, data, and validation keys in the cache.
  *
- * You must provide your own connected Redis client instance by passing it through the `client` option.
+ * You must provide your own connected client instance by passing it through the `client` option.
  *
  * See the {@link https://docs.powertools.aws.dev/lambda/typescript/latest/utilities/idempotency/ Idempotency documentation}
- * for more details on the Redis configuration and usage patterns.
+ * for more details on the configuration and usage patterns.
+ *
+ * **Using Valkey Glide Client**
+ *
+ * @example
+ * ```ts
+ * import { GlideClient } from '@valkey/valkey-glide';
+ * import { CachePersistenceLayer } from '@aws-lambda-powertools/idempotency/cache';
+ *
+ * const client = await GlideClient.createClient({
+ *   addresses: [{
+ *     host: process.env.CACHE_ENDPOINT,
+ *     port: Number(process.env.CACHE_PORT),
+ *   }],
+ *   useTLS: true,
+ * });
+ *
+ * const persistence = new CachePersistenceLayer({
+ *   client,
+ * });
+ *
+ * // ... your function handler here
+ * ```
+ *
+ * **Using Redis Client**
  *
  * @example
  * ```ts
  * import { createClient } from '@redis/client';
- * import { RedisPersistenceLayer } from '@aws-lambda-powertools/idempotency/redis';
- * import { RedisCompatibleClient } from '@aws-lambda-powertools/idempotency/redis/types';
+ * import { CachePersistenceLayer } from '@aws-lambda-powertools/idempotency/cache';
  *
- * const redisClient = createClient({ url: 'redis://localhost:6379' });
- * await redisClient.connect();
+ * const client = await createClient({
+ *   url: `rediss://${process.env.CACHE_ENDPOINT}:${process.env.CACHE_PORT}`,
+ *   username: 'default',
+ * }).connect();
  *
- * const persistence = new RedisPersistenceLayer({
- *   client: redisClient as RedisCompatibleClient,
+ * const persistence = new CachePersistenceLayer({
+ *   client,
  * });
+ *
+ * // ... your function handler here
  * ```
  *
  * @category Persistence Layer
  */
-class RedisPersistenceLayer extends BasePersistenceLayer {
-  readonly #client: RedisCompatibleClient;
+class CachePersistenceLayer extends BasePersistenceLayer {
+  readonly #client: CacheClient;
   readonly #dataAttr: string;
   readonly #expiryAttr: string;
   readonly #inProgressExpiryAttr: string;
   readonly #statusAttr: string;
   readonly #validationKeyAttr: string;
   readonly #orphanLockTimeout: number;
 
-  public constructor(options: RedisPersistenceOptions) {
+  public constructor(options: CachePersistenceOptions) {
     super();
 
     this.#statusAttr =
@@ -76,9 +102,10 @@ class RedisPersistenceLayer extends BasePersistenceLayer {
   }
 
   /**
-   * Deletes the idempotency record associated with a given record from Redis.
+   * Deletes the idempotency record associated with a given record from the persistence store.
+   *
    * This function is designed to be called after a Lambda handler invocation has completed processing.
-   * It ensures that the idempotency key associated with the record is removed from Redis to
+   * It ensures that the idempotency key associated with the record is removed from the cache to
    * prevent future conflicts and to maintain the idempotency integrity.
    *
    * Note: it is essential that the idempotency key is not empty, as that would indicate the Lambda
@@ -110,25 +137,24 @@ class RedisPersistenceLayer extends BasePersistenceLayer {
         'Item does not exist in persistence store'
       );
     }
-    let item: JSONObject;
     try {
-      item = JSON.parse(response);
+      const item = JSON.parse(response as string);
+      return new IdempotencyRecord({
+        idempotencyKey: idempotencyKey,
+        status: item[this.#statusAttr] as IdempotencyRecordStatusValue,
+        expiryTimestamp: item[this.#expiryAttr] as number | undefined,
+        inProgressExpiryTimestamp: item[this.#inProgressExpiryAttr] as
+          | number
+          | undefined,
+        responseData: item[this.#dataAttr],
+        payloadHash: item[this.#validationKeyAttr] as string | undefined,
+      });
     } catch (error) {
       throw new IdempotencyPersistenceConsistencyError(
         'Idempotency persistency consistency error, needs to be removed',
         error as Error
       );
     }
-    return new IdempotencyRecord({
-      idempotencyKey: idempotencyKey,
-      status: item[this.#statusAttr] as IdempotencyRecordStatusValue,
-      expiryTimestamp: item[this.#expiryAttr] as number | undefined,
-      inProgressExpiryTimestamp: item[this.#inProgressExpiryAttr] as
-        | number
-        | undefined,
-      responseData: item[this.#dataAttr],
-      payloadHash: item[this.#validationKeyAttr] as string | undefined,
-    });
   }
 
   protected async _updateRecord(record: IdempotencyRecord): Promise<void> {
@@ -148,7 +174,8 @@ class RedisPersistenceLayer extends BasePersistenceLayer {
 
   /**
    * Put a record in the persistence store with a status of "INPROGRESS".
-   * The method guards against concurrent execution by using Redis' conditional write operations.
+   *
+   * The method guards against concurrent execution by using conditional write operations.
    */
   async #putInProgressRecord(record: IdempotencyRecord): Promise<void> {
     const item: Record<string, unknown> = {
@@ -180,9 +207,8 @@ class RedisPersistenceLayer extends BasePersistenceLayer {
        * The idempotency key does not exist:
        *   - first time that this invocation key is used
        *   - previous invocation with the same key was deleted due to TTL
-       *   - SET see https://redis.io/commands/set/
+       *   - SET see {@link https://valkey.io/commands/set/ | Valkey SET command}
        */
-
       const response = await this.#client.set(
         record.idempotencyKey,
         encodedItem,
@@ -193,7 +219,7 @@ class RedisPersistenceLayer extends BasePersistenceLayer {
       );
 
       /**
-       * If response is not `null`, the redis SET operation was successful and the idempotency key was not
+       * If response is not `null`, the SET operation was successful and the idempotency key was not
        * previously set. This indicates that we can safely proceed to the handler execution phase.
        * Most invocations should successfully proceed past this point.
        */
@@ -202,19 +228,21 @@ class RedisPersistenceLayer extends BasePersistenceLayer {
       }
 
       /**
-       * If response is `null`, it indicates an existing record in Redis for the given idempotency key.
+       * If response is `null`, it indicates an existing record in the cache for the given idempotency key.
+       *
        * This could be due to:
        *   - An active idempotency record from a previous invocation that has not yet expired.
        *   - An orphan record where a previous invocation has timed out.
-       *   - An expired idempotency record that has not been deleted by Redis.
+       *   - An expired idempotency record that has not been deleted yet.
        *
        * In any case, we proceed to retrieve the record for further inspection.
        */
       const existingRecord = await this._getRecord(record.idempotencyKey);
 
-      /** If the status of the idempotency record is `COMPLETED` and the record has not expired
-       *  then a valid completed record exists. We raise an error to prevent duplicate processing
-       *  of a request that has already been completed successfully.
+      /**
+       * If the status of the idempotency record is `COMPLETED` and the record has not expired
+       * then a valid completed record exists. We raise an error to prevent duplicate processing
+       * of a request that has already been completed successfully.
        */
       if (
         existingRecord.getStatus() === IdempotencyRecordStatus.COMPLETED &&
@@ -226,10 +254,11 @@ class RedisPersistenceLayer extends BasePersistenceLayer {
         );
       }
 
-      /** If the idempotency record has a status of 'INPROGRESS' and has a valid `inProgressExpiryTimestamp`
-       *  (meaning the timestamp is greater than the current timestamp in milliseconds), then we have encountered
-       *  a valid in-progress record. This indicates that another process is currently handling the request, and
-       *  to maintain idempotency, we raise an error to prevent concurrent processing of the same request.
+      /**
+       * If the idempotency record has a status of 'INPROGRESS' and has a valid `inProgressExpiryTimestamp`
+       * (meaning the timestamp is greater than the current timestamp in milliseconds), then we have encountered
+       * a valid in-progress record. This indicates that another process is currently handling the request, and
+       * to maintain idempotency, we raise an error to prevent concurrent processing of the same request.
        */
       if (
         existingRecord.getStatus() === IdempotencyRecordStatus.INPROGRESS &&
@@ -242,20 +271,22 @@ class RedisPersistenceLayer extends BasePersistenceLayer {
         );
       }
 
-      /** Reaching this point indicates that the idempotency record found is an orphan record. An orphan record is
-       *  one that is neither completed nor in-progress within its expected time frame. It may result from a
-       *  previous invocation that has timed out or an expired record that has yet to be cleaned up by Redis.
-       *  We raise an error to handle this exceptional scenario appropriately.
+      /**
+       * Reaching this point indicates that the idempotency record found is an orphan record. An orphan record is
+       * one that is neither completed nor in-progress within its expected time frame. It may result from a
+       * previous invocation that has timed out or an expired record that has yet to be cleaned up from the cache.
+       * We raise an error to handle this exceptional scenario appropriately.
        */
       throw new IdempotencyPersistenceConsistencyError(
         'Orphaned record detected'
       );
     } catch (error) {
       if (error instanceof IdempotencyPersistenceConsistencyError) {
-        /** Handle an orphan record by attempting to acquire a lock, which by default lasts for 10 seconds.
-         *  The purpose of acquiring the lock is to prevent race conditions with other processes that might
-         *  also be trying to handle the same orphan record. Once the lock is acquired, we set a new value
-         *  for the idempotency record in Redis with the appropriate time-to-live (TTL).
+        /**
+         * Handle an orphan record by attempting to acquire a lock, which by default lasts for 10 seconds.
+         * The purpose of acquiring the lock is to prevent race conditions with other processes that might
+         * also be trying to handle the same orphan record. Once the lock is acquired, we set a new value
+         * for the idempotency record in the cache with the appropriate time-to-live (TTL).
          */
         await this.#acquireLock(record.idempotencyKey);
 
@@ -280,7 +311,7 @@ class RedisPersistenceLayer extends BasePersistenceLayer {
 
   /**
    * Attempt to acquire a lock for a specified resource name, with a default timeout.
-   * This method attempts to set a lock using Redis to prevent concurrent access to a resource
+   * This method attempts to set a lock to prevent concurrent access to a resource
    * identified by 'idempotencyKey'. It uses the 'NX' flag to ensure that the lock is only
    * set if it does not already exist, thereby enforcing mutual exclusion.
    *
@@ -306,4 +337,4 @@ class RedisPersistenceLayer extends BasePersistenceLayer {
   }
 }
 
-export { RedisPersistenceLayer };
+export { CachePersistenceLayer };

packages/idempotency/src/types/CachePersistence.ts

@@ -0,0 +1,60 @@
+import type { CachePersistenceLayer } from './../persistence/CachePersistenceLayer.js';
+import type { BasePersistenceAttributes } from './BasePersistenceLayer.js';
+
+type CacheValue = string | Uint8Array<ArrayBufferLike>;
+
+/**
+ * Interface for clients compatible with Valkey and Redis-OSS operations.
+ *
+ * This interface defines the minimum set of operations that must be implemented
+ * by a client to be used with the cache persistence layer.
+ *
+ * It supports basic key-value operations like get, set, and delete.
+ */
+interface CacheClient {
+  /**
+   * Retrieves the value associated with the given key.
+   *
+   * @param name - The key to get the value for
+   */
+  get(name: string): Promise<CacheValue | null>;
+
+  /**
+   * Sets the value for the specified key with optional parameters.
+   *
+   * @param name - The key to set
+   * @param value - The value to set
+   * @param options - Optional parameters for setting the value
+   * @param options.EX - Set the specified expire time, in seconds (a positive integer)
+   * @param options.NX - Only set the key if it does not already exist
+   */
+  set(
+    name: CacheValue,
+    value: unknown,
+    options?: {
+      EX?: number;
+      NX?: boolean;
+    }
+  ): Promise<CacheValue | null>;
+
+  /**
+   * Deletes the specified keys from the cache.
+   *
+   * @param keys - The keys to delete
+   */
+  del(keys: string[]): Promise<number>;
+}
+
+/**
+ * Options for the {@link CachePersistenceLayer | `CachePersistenceLayer`} class constructor.
+ *
+ * @see {@link BasePersistenceAttributes} for full list of properties.
+ *
+ * @interface
+ * @property client - The client must be properly initialized and connected
+ */
+interface CachePersistenceOptions extends BasePersistenceAttributes {
+  client: CacheClient;
+}
+
+export type { CacheClient, CachePersistenceOptions };

packages/idempotency/src/types/RedisPersistence.ts

@@ -22,6 +22,6 @@ export type {
   DynamoDBPersistenceOptionsWithClientInstance,
 } from './DynamoDBPersistence.js';
 export type {
-  RedisCompatibleClient,
-  RedisPersistenceOptions,
-} from './RedisPersistence.js';
+  CacheClient,
+  CachePersistenceOptions,
+} from './CachePersistence.js';

packages/idempotency/src/types/index.ts

@@ -1,8 +1,8 @@
 import { vi } from 'vitest';
 import { BasePersistenceLayer } from '../../src/persistence/BasePersistenceLayer.js';
+import { CachePersistenceLayer } from '../../src/persistence/CachePersistenceLayer.js';
 import { DynamoDBPersistenceLayer } from '../../src/persistence/DynamoDBPersistenceLayer.js';
 import type { IdempotencyRecord } from '../../src/persistence/IdempotencyRecord.js';
-import { RedisPersistenceLayer } from '../../src/persistence/RedisPersistenceLayer.js';
 
 /**
  * Dummy class to test the abstract class BasePersistenceLayer.
@@ -38,12 +38,13 @@ class DynamoDBPersistenceLayerTestClass extends DynamoDBPersistenceLayer {
     return super._updateRecord(record);
   }
 }
+
 /**
- * Dummy class to test the abstract class RedisPersistenceLayer.
+ * Dummy class to test the abstract class `CachePersistenceLayer`.
  *
  * This class is used in the unit tests.
  */
-class RedisPersistenceLayerTestClass extends RedisPersistenceLayer {
+class CachePersistenceLayerTestClass extends CachePersistenceLayer {
   public _deleteRecord(record: IdempotencyRecord): Promise<void> {
     return super._deleteRecord(record);
   }
@@ -64,5 +65,5 @@ class RedisPersistenceLayerTestClass extends RedisPersistenceLayer {
 export {
   PersistenceLayerTestClass,
   DynamoDBPersistenceLayerTestClass,
-  RedisPersistenceLayerTestClass,
+  CachePersistenceLayerTestClass,
 };

packages/idempotency/tests/helpers/idempotencyUtils.ts

@@ -13,9 +13,7 @@ import {
   IdempotencyPersistenceConsistencyError,
 } from '../../../src/errors.js';
 import { IdempotencyRecord } from '../../../src/persistence/IdempotencyRecord.js';
-import { RedisPersistenceLayerTestClass } from '../../helpers/idempotencyUtils.js';
-
-vi.mock('../../../src/persistence/RedisConnection.js');
+import { CachePersistenceLayerTestClass } from '../../helpers/idempotencyUtils.js';
 
 const getFutureTimestamp = (seconds: number): number =>
   Math.floor(Date.now() / 1000) + seconds;
@@ -28,11 +26,11 @@ const client = {
   set: vi.fn(),
   del: vi.fn(),
 };
-const persistenceLayer = new RedisPersistenceLayerTestClass({
+const persistenceLayer = new CachePersistenceLayerTestClass({
   client,
 });
 
-describe('Class: RedisPersistenceLayerTestClass', () => {
+describe('Class: CachePersistenceLayerTestClass', () => {
   beforeAll(() => {
     vi.useFakeTimers().setSystemTime(new Date());
   });
@@ -46,7 +44,7 @@ describe('Class: RedisPersistenceLayerTestClass', () => {
   });
 
   describe('Method: _putRecord', () => {
-    it('puts a record with INPROGRESS status into Redis', async () => {
+    it('puts a record with INPROGRESS status into the cache', async () => {
       // Prepare
       const record = new IdempotencyRecord({
         idempotencyKey: dummyKey,
@@ -69,7 +67,7 @@ describe('Class: RedisPersistenceLayerTestClass', () => {
       );
     });
 
-    it('puts the record in Redis when using an in progress expiry timestamp', async () => {
+    it('puts the record in the cache when using an in progress expiry timestamp', async () => {
       // Prepare
       const status = IdempotencyRecordStatus.INPROGRESS;
       const expiryTimestamp = getFutureTimestamp(10);
@@ -96,7 +94,7 @@ describe('Class: RedisPersistenceLayerTestClass', () => {
       );
     });
 
-    it('puts record in Redis when using payload validation', async () => {
+    it('puts record in the cache when using payload validation', async () => {
       // Prepare
       const persistenceLayerSpy = vi
         .spyOn(persistenceLayer, 'isPayloadValidationEnabled')
@@ -125,7 +123,7 @@ describe('Class: RedisPersistenceLayerTestClass', () => {
       persistenceLayerSpy.mockRestore();
     });
 
-    it('puts record in Redis with default expiry timestamp', async () => {
+    it('puts record in the cache with default expiry timestamp', async () => {
       // Prepare
       const status = IdempotencyRecordStatus.INPROGRESS;
       const record = new IdempotencyRecord({
@@ -264,7 +262,7 @@ describe('Class: RedisPersistenceLayerTestClass', () => {
   });
 
   describe('Method: _deleteRecord', () => {
-    it('deletes a record from Redis', async () => {
+    it('deletes a record from the cache', async () => {
       // Prepare
       const record = new IdempotencyRecord({
         idempotencyKey: dummyKey,
@@ -281,7 +279,7 @@ describe('Class: RedisPersistenceLayerTestClass', () => {
   });
 
   describe('Method: _getRecord', () => {
-    it('gets a record from Redis', async () => {
+    it('gets a record from the cache', async () => {
       // Prepare
       const status = IdempotencyRecordStatus.INPROGRESS;
       const expiryTimestamp = getFutureTimestamp(15);
@@ -332,7 +330,7 @@ describe('Class: RedisPersistenceLayerTestClass', () => {
   });
 
   describe('Method: _updateRecord', () => {
-    it('updates a record in Redis', async () => {
+    it('updates a record in the cache', async () => {
       // Prepare
       const record = new IdempotencyRecord({
         idempotencyKey: dummyKey,