petty-cache 3.5.0 → 3.6.0

package/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.6.0] - 2026-02-12
+### Changed
+- Added the ability for `pettyCache.get`, `pettyCache.set`, and `pettyCache.patch` functions to support callbacks and promises.
+
 ## [3.5.0] - 2025-05-01
 ### Changed
 - Added the ability for `pettyCache.del` functions to support callbacks and promises.

package/LICENSE

@@ -1,201 +1,21 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+MIT License
+
+Copyright (c) 2026 Stores.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,7 +1,7 @@
 # petty-cache
 
-[![Build Status](https://github.com/mediocre/petty-cache/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/mediocre/petty-cache/actions?query=workflow%3Abuild+branch%3Amain)
-[![Coverage Status](https://coveralls.io/repos/github/mediocre/petty-cache/badge.svg?branch=main)](https://coveralls.io/github/mediocre/petty-cache?branch=main)
+[![Build Status](https://github.com/stores-com/petty-cache/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/stores-com/petty-cache/actions?query=workflow%3Abuild+branch%3Amain)
+[![Coverage Status](https://coveralls.io/repos/github/stores-com/petty-cache/badge.svg?branch=main)](https://coveralls.io/github/stores-com/petty-cache?branch=main)
 
 A cache module for Node.js that uses a two-level cache (in-memory cache for recently accessed data plus Redis for distributed caching) with automatic serialization plus some extra features to avoid cache stampedes and thundering herds.
 
@@ -28,8 +28,8 @@ Provides a pool of distributed locks with the ability to release a slot back to
 
 ```javascript
 // Setup petty-cache
-var PettyCache = require('petty-cache');
-var pettyCache = new PettyCache();
+const PettyCache = require('petty-cache');
+const pettyCache = new PettyCache();
 
 // Fetch some data
 pettyCache.fetch('key', function(callback) {
@@ -71,7 +71,7 @@ Attempts to retrieve the values of the keys specified in the `keys` array. Any k
 ```javascript
 // Let's assume a and b are already cached as 1 and 2
 pettyCache.bulkFetch(['a', 'b', 'c', 'd'], function(keys, callback) {
-    var results = {};
+    const results = {};
 
     keys.forEach(function(key) {
         results[key] = key.toUpperCase();
@@ -145,6 +145,24 @@ pettyCache.set({ key1: 'one', key2: 2, key3: 'three' }, function(err) {
 }
 ```
 
+### pettyCache.del(key, [callback])
+
+Deletes a value from both the in-memory cache and Redis. Supports both callbacks and promises.
+
+**Example**
+
+```javascript
+pettyCache.del('key', function(err) {
+    if (err) {
+        // Handle redis error
+    }
+});
+```
+
+```javascript
+await pettyCache.del('key');
+```
+
 ### pettyCache.fetch(key, cacheMissFunction, [options,] callback)
 
 Attempts to retrieve the value from cache at the specified key. If it doesn't exist, it executes the specified cacheMissFunction that takes two parameters: an error and a value. `cacheMissFunction` should retrieve the expected value for the key from another source and pass it to the given callback. Either way, the resulting error or value is passed to `callback`.
@@ -222,9 +240,9 @@ pettyCache.fetchAndRefresh('key', function(callback) {
 }
 ```
 
-### pettyCache.get(key, callback)
+### pettyCache.get(key, [callback])
 
-Attempts to retrieve the value from cache at the specified key. Returns `null` if the key doesn't exist.
+Attempts to retrieve the value from cache at the specified key. Returns `null` if the key doesn't exist. Supports both callbacks and promises.
 
 **Example**
 
@@ -235,14 +253,18 @@ pettyCache.get('key', function(err, value) {
 });
 ```
 
-### pettyCache.patch(key, value, [options,] callback)
+```javascript
+const value = await pettyCache.get('key');
+```
+
+### pettyCache.patch(key, value, [options, [callback]])
 
-Updates an object at the given key with the property values provided. Sends an error to the callback if the key does not exist.
+Updates an object at the given key with the property values provided. Sends an error to the callback if the key does not exist. Supports both callbacks and promises.
 
 **Example**
 
 ```javascript
-pettyCache.patch('key', { a: 1 }, function(callback) {
+pettyCache.patch('key', { a: 1 }, function(err) {
     if (err) {
         // Handle redis or key not found error
     }
@@ -251,6 +273,10 @@ pettyCache.patch('key', { a: 1 }, function(callback) {
 });
 ```
 
+```javascript
+await pettyCache.patch('key', { a: 1 });
+```
+
 **Options**
 
 ```
@@ -269,9 +295,9 @@ pettyCache.patch('key', { a: 1 }, function(callback) {
 }
 ```
 
-### pettyCache.set(key, value, [options,] callback)
+### pettyCache.set(key, value, [options, [callback]])
 
-Unconditionally sets a value for a given key.
+Unconditionally sets a value for a given key. Supports both callbacks and promises.
 
 **Example**
 
@@ -283,6 +309,10 @@ pettyCache.set('key', { a: 'b' }, function(err) {
 });
 ```
 
+```javascript
+await pettyCache.set('key', { a: 'b' });
+```
+
 **Options**
 
 ```
@@ -305,7 +335,7 @@ pettyCache.set('key', { a: 'b' }, function(err) {
 
 ### pettyCache.mutex.lock(key, [options, [callback]])
 
-Attempts to acquire a distributed lock for the specified key. Optionally retries a specified number of times by waiting a specified amount of time between attempts.
+Attempts to acquire a distributed lock for the specified key. Optionally retries a specified number of times by waiting a specified amount of time between attempts. Supports both callbacks and promises.
 
 ```javascript
 pettyCache.mutex.lock('key', { retry: { interval: 100, times: 5 }, ttl: 1000 }, function(err) {
@@ -318,6 +348,13 @@ pettyCache.mutex.lock('key', { retry: { interval: 100, times: 5 }, ttl: 1000 },
 });
 ```
 
+```javascript
+await pettyCache.mutex.lock('key', { retry: { interval: 100, times: 5 }, ttl: 1000 });
+
+// We were able to acquire the lock. Do work and then unlock.
+await pettyCache.mutex.unlock('key');
+```
+
 **Options**
 
 ```javascript
@@ -332,7 +369,7 @@ pettyCache.mutex.lock('key', { retry: { interval: 100, times: 5 }, ttl: 1000 },
 
 ### pettyCache.mutex.unlock(key, [callback])
 
-Releases the distributed lock for the specified key.
+Releases the distributed lock for the specified key. Supports both callbacks and promises.
 
 ```javascript
 pettyCache.mutex.unlock('key', function(err) {
@@ -342,6 +379,10 @@ pettyCache.mutex.unlock('key', function(err) {
 });
 ```
 
+```javascript
+await pettyCache.mutex.unlock('key');
+```
+
 ## Semaphore
 
 Provides a pool of distributed locks. Once a consumer acquires a lock they have the ability to release the lock back to the pool or mark the lock as "consumed" so that it's not used again.
@@ -471,6 +512,6 @@ pettyCache.semaphore.retrieveOrCreate('key', { size: 10 }, function(err) {
 
 ```javascript
 {
-    size: 1 || function() { var x = 1 + 1; callback(null, x); } // The number of locks to create in the semaphore's pool. Optionally, size can be a `callback(err, size)` function.
+    size: 1 || function() { const x = 1 + 1; callback(null, x); } // The number of locks to create in the semaphore's pool. Optionally, size can be a `callback(err, size)` function.
 }
 ```

package/eslint.config.js

@@ -4,30 +4,16 @@ const js = require('@eslint/js');
 module.exports = [
     js.configs.recommended,
     {
-        ignores: ['node_modules/*'],
         languageOptions: {
-            ecmaVersion: 2020,
-            sourceType: 'module',
-            parserOptions: {
-                ecmaFeatures: {
-                    jsx: true
-                }
-            },
             globals: {
-                ...globals.es2020,
-                ...globals.mocha,
-                ...globals.node,
-                //added for 'fetch()' access
-                ...globals.serviceworker
+                ...globals.node
             }
         },
         rules: {
             'brace-style': ['error', '1tbs', { allowSingleLine: true }],
             'comma-dangle': ['error', 'never'],
             'dot-notation': 'error',
-            'no-array-constructor': 'error',
             'no-console': 'error',
-            'no-fallthrough': 'off',
             'no-inline-comments': 'warn',
             'no-trailing-spaces': 'error',
             'no-unused-vars': ['error', { caughtErrors: 'none' }],

package/index.js

@@ -18,16 +18,16 @@ function PettyCache() {
 
     function bulkGetFromRedis(keys, callback) {
         // Try to get values from Redis
-        redisClient.mget(keys, function(err, data) {
+        redisClient.mget(keys, (err, data) => {
             if (err) {
                 return callback(err);
             }
 
             const values = {};
 
-            for (var i = 0; i < keys.length; i++) {
-                var key = keys[i];
-                var value = data[i];
+            for (let i = 0; i < keys.length; i++) {
+                const key = keys[i];
+                const value = data[i];
 
                 if (value === null) {
                     values[key] = { exists: false };
@@ -61,7 +61,7 @@ function PettyCache() {
 
     function getFromRedis(key, callback) {
         // Try to get value from Redis
-        redisClient.get(key, function(err, data) {
+        redisClient.get(key, (err, data) => {
             if (err) {
                 return callback(err);
             }
@@ -103,7 +103,7 @@ function PettyCache() {
     /**
      * @param {Array} keys - An array of keys.
      */
-    this.bulkFetch = function(keys, func, options, callback) {
+    this.bulkFetch = (keys, func, options, callback) => {
         // Options are optional
         if (!callback) {
             callback = options;
@@ -119,7 +119,7 @@ function PettyCache() {
         const values = {};
 
         // Try to get values from memory cache
-        for (var i = _keys.length - 1; i >= 0; i--) {
+        for (let i = _keys.length - 1; i >= 0; i--) {
             const key = _keys[i];
             const result = getFromMemoryCache(key);
 
@@ -137,12 +137,12 @@ function PettyCache() {
         const _this = this;
 
         // Try to get values from Redis
-        bulkGetFromRedis(_keys, function(err, results) {
+        bulkGetFromRedis(_keys, (err, results) => {
             if (err) {
                 return callback(err);
             }
 
-            for (var i = _keys.length - 1; i >= 0; i--) {
+            for (let i = _keys.length - 1; i >= 0; i--) {
                 const key = _keys[i];
                 const result = results[key];
 
@@ -161,7 +161,7 @@ function PettyCache() {
             }
 
             // Execute the specified function for remaining keys
-            func(_keys, function(err, data) {
+            func(_keys, (err, data) => {
                 if (err) {
                     return callback(err);
                 }
@@ -176,7 +176,7 @@ function PettyCache() {
     /**
      * @param {Array} keys - An array of keys.
      */
-    this.bulkGet = function(keys, callback) {
+    this.bulkGet = (keys, callback) => {
         // If there aren't any keys, return
         if (!keys.length) {
             return callback(null, {});
@@ -186,7 +186,7 @@ function PettyCache() {
         const values = {};
 
         // Try to get values from memory cache
-        for (var i = _keys.length - 1; i >= 0; i--) {
+        for (let i = _keys.length - 1; i >= 0; i--) {
             const key = _keys[i];
             const result = getFromMemoryCache(key);
 
@@ -202,14 +202,14 @@ function PettyCache() {
         }
 
         // Try to get values from Redis
-        bulkGetFromRedis(_keys, function(err, results) {
+        bulkGetFromRedis(_keys, (err, results) => {
             if (err) {
                 return callback(err);
             }
 
-            for (var i = 0; i < _keys.length; i++) {
-                var key = _keys[i];
-                var result = results[key];
+            for (let i = 0; i < _keys.length; i++) {
+                const key = _keys[i];
+                const result = results[key];
 
                 if (!result.exists) {
                     values[key] = null;
@@ -226,7 +226,7 @@ function PettyCache() {
         });
     };
 
-    this.bulkSet = function(values, options, callback) {
+    this.bulkSet = (values, options, callback) => {
         // Options are optional
         if (!callback) {
             callback = options;
@@ -249,15 +249,15 @@ function PettyCache() {
             batch.psetex(key, random(ttl.min, ttl.max), PettyCache.stringify(value));
         });
 
-        batch.exec(function(err) {
+        batch.exec((err) => {
             callback(err);
         });
     };
 
-    this.del = function(key, callback) {
+    this.del = (key, callback) => {
         const executor = () => {
             return new Promise((resolve, reject) => {
-                redisClient.del(key, function(err) {
+                redisClient.del(key, (err) => {
                     if (err) {
                         return reject(err);
                     }
@@ -277,7 +277,7 @@ function PettyCache() {
 
     // Returns data from cache if available;
     // otherwise executes the specified function and places the results in cache before returning the data.
-    this.fetch = function(key, func, options, callback) {
+    this.fetch = (key, func, options, callback) => {
         options = options || {};
 
         if (typeof options === 'function') {
@@ -286,10 +286,10 @@ function PettyCache() {
         }
 
         // Default callback is a noop
-        callback = callback || function() {};
+        callback = callback || (() => {});
 
         // Try to get value from memory cache
-        var result = getFromMemoryCache(key);
+        let result = getFromMemoryCache(key);
 
         // Return value from memory cache if it exists
         if (result.exists) {
@@ -299,8 +299,8 @@ function PettyCache() {
         const _this = this;
 
         // Double-checked locking: http://en.wikipedia.org/wiki/Double-checked_locking
-        lock(`fetch-memory-cache-lock-${key}`, function(releaseMemoryCacheLock) {
-            async.reflect(function(callback) {
+        lock(`fetch-memory-cache-lock-${key}`, (releaseMemoryCacheLock) => {
+            async.reflect((callback) => {
                 // Try to get value from memory cache
                 result = getFromMemoryCache(key);
 
@@ -310,7 +310,7 @@ function PettyCache() {
                 }
 
                 // Try to get value from Redis
-                getFromRedis(key, function(err, result) {
+                getFromRedis(key, (err, result) => {
                     if (err) {
                         return callback(err);
                     }
@@ -322,8 +322,8 @@ function PettyCache() {
                     }
 
                     // Double-checked locking: http://en.wikipedia.org/wiki/Double-checked_locking
-                    lock(`fetch-redis-lock-${key}`, function(releaseRedisLock) {
-                        async.reflect(function(callback) {
+                    lock(`fetch-redis-lock-${key}`, (releaseRedisLock) => {
+                        async.reflect((callback) => {
                             // Try to get value from memory cache
                             result = getFromMemoryCache(key);
 
@@ -333,7 +333,7 @@ function PettyCache() {
                             }
 
                             // Try to get value from Redis
-                            getFromRedis(key, async function(err, result) {
+                            getFromRedis(key, async (err, result) => {
                                 if (err) {
                                     return callback(err);
                                 }
@@ -350,7 +350,7 @@ function PettyCache() {
                                     try {
                                         const data = await func();
 
-                                        _this.set(key, data, options, function(err) {
+                                        _this.set(key, data, options, (err) => {
                                             callback(err, data);
                                         });
                                     } catch(err) {
@@ -358,18 +358,18 @@ function PettyCache() {
                                     }
                                 } else {
                                     // If the function has arguments, there was a callback provided
-                                    func(function(err, data) {
+                                    func((err, data) => {
                                         if (err) {
                                             return callback(err);
                                         }
 
-                                        _this.set(key, data, options, function(err) {
+                                        _this.set(key, data, options, (err) => {
                                             callback(err, data);
                                         });
                                     });
                                 }
                             });
-                        })(releaseRedisLock(function(err, result) {
+                        })(releaseRedisLock((err, result) => {
                             if (result.error) {
                                 return callback(result.error);
                             }
@@ -378,7 +378,7 @@ function PettyCache() {
                         }));
                     });
                 });
-            })(releaseMemoryCacheLock(function(err, result) {
+            })(releaseMemoryCacheLock((err, result) => {
                 if (result.error) {
                     return callback(result.error);
                 }
@@ -388,7 +388,7 @@ function PettyCache() {
         });
     };
 
-    this.fetchAndRefresh = function(key, func, options, callback) {
+    this.fetchAndRefresh = (key, func, options, callback) => {
         options = options || {};
 
         if (typeof options === 'function') {
@@ -400,22 +400,22 @@ function PettyCache() {
         const ttl = getTtl(options);
 
         // Default callback is a noop
-        callback = callback || function() {};
+        callback = callback || (() => {});
 
         const _this = this;
 
         if (!intervals[key]) {
             const delay = ttl.min / 2;
 
-            intervals[key] = setInterval(function() {
+            intervals[key] = setInterval(() => {
                 // This distributed lock prevents multiple clients from executing func at the same time
-                _this.mutex.lock(`interval-${key}`, { ttl: delay - 100 }, function(err) {
+                _this.mutex.lock(`interval-${key}`, { ttl: delay - 100 }, (err) => {
                     if (err) {
                         return;
                     }
 
                     // Execute the specified function and update cache
-                    func(function(err, data) {
+                    func((err, data) => {
                         if (err) {
                             return;
                         }
@@ -429,46 +429,56 @@ function PettyCache() {
         this.fetch(key, func, options, callback);
     };
 
-    this.get = function(key, callback) {
-        // Try to get value from memory cache
-        let result = getFromMemoryCache(key);
-
-        // Return value from memory cache if it exists
-        if (result.exists) {
-            return callback(null, result.value);
-        }
-
-        // Double-checked locking: http://en.wikipedia.org/wiki/Double-checked_locking
-        lock(`get-memory-cache-lock-${key}`, function(releaseMemoryCacheLock) {
-            async.reflect(function(callback) {
+    this.get = (key, callback) => {
+        const executor = () => {
+            return new Promise((resolve, reject) => {
                 // Try to get value from memory cache
-                result = getFromMemoryCache(key);
+                let result = getFromMemoryCache(key);
 
                 // Return value from memory cache if it exists
                 if (result.exists) {
-                    return callback(null, result.value);
+                    return resolve(result.value);
                 }
 
-                getFromRedis(key, function(err, result) {
-                    if (err) {
-                        return callback(err);
-                    }
+                // Double-checked locking: http://en.wikipedia.org/wiki/Double-checked_locking
+                lock(`get-memory-cache-lock-${key}`, (releaseMemoryCacheLock) => {
+                    async.reflect((callback) => {
+                        // Try to get value from memory cache
+                        result = getFromMemoryCache(key);
 
-                    if (!result.exists) {
-                        return callback(null, null);
-                    }
+                        // Return value from memory cache if it exists
+                        if (result.exists) {
+                            return callback(null, result.value);
+                        }
 
-                    memoryCache.put(key, result.value, random(2000, 5000));
-                    callback(null, result.value);
+                        getFromRedis(key, (err, result) => {
+                            if (err) {
+                                return callback(err);
+                            }
+
+                            if (!result.exists) {
+                                return callback(null, null);
+                            }
+
+                            memoryCache.put(key, result.value, random(2000, 5000));
+                            callback(null, result.value);
+                        });
+                    })(releaseMemoryCacheLock((err, result) => {
+                        if (result.error) {
+                            return reject(result.error);
+                        }
+
+                        resolve(result.value);
+                    }));
                 });
-            })(releaseMemoryCacheLock(function(err, result) {
-                if (result.error) {
-                    return callback(result.error);
-                }
+            });
+        };
 
-                callback(null, result.value);
-            }));
-        });
+        if (callback) {
+            executor().then(result => callback(null, result)).catch(callback);
+        } else {
+            return executor();
+        }
     };
 
     this.mutex = {
@@ -489,7 +499,7 @@ function PettyCache() {
             const executor = () => {
                 return new Promise((resolve, reject) => {
                     async.retry({ interval: options.retry.interval, times: options.retry.times }, callback => {
-                        redisClient.set(key, '1', 'NX', 'PX', options.ttl, function(err, res) {
+                        redisClient.set(key, '1', 'NX', 'PX', options.ttl, (err, res) => {
                             if (err) {
                                 return callback(err);
                             }
@@ -504,7 +514,7 @@ function PettyCache() {
 
                             callback();
                         });
-                    }, function(err) {
+                    }, (err) => {
                         if (err) {
                             return reject(err);
                         }
@@ -523,7 +533,7 @@ function PettyCache() {
         unlock: (key, callback) => {
             const executor = () => {
                 return new Promise((resolve, reject) => {
-                    redisClient.del(key, function(err) {
+                    redisClient.del(key, (err) => {
                         if (err) {
                             return reject(err);
                         }
@@ -541,33 +551,51 @@ function PettyCache() {
         }
     };
 
-    this.patch = function(key, value, options, callback) {
-        if (!callback) {
+    this.patch = (key, value, options, callback) => {
+        if (!callback && typeof options === 'function') {
             callback = options;
             options = {};
         }
 
+        options = options || {};
+
         const _this = this;
 
-        this.get(key, function(err, data) {
-            if (err) {
-                return callback(err);
-            }
+        const executor = () => {
+            return new Promise((resolve, reject) => {
+                _this.get(key, (err, data) => {
+                    if (err) {
+                        return reject(err);
+                    }
 
-            if (!data) {
-                return callback(new Error(`Key ${key} does not exist`));
-            }
+                    if (!data) {
+                        return reject(new Error(`Key ${key} does not exist`));
+                    }
 
-            for (var k in value) {
-                data[k] = value[k];
-            }
+                    for (let k in value) {
+                        data[k] = value[k];
+                    }
 
-            _this.set(key, data, options, callback);
-        });
+                    _this.set(key, data, options, (err) => {
+                        if (err) {
+                            return reject(err);
+                        }
+
+                        resolve();
+                    });
+                });
+            });
+        };
+
+        if (callback) {
+            executor().then(result => callback(null, result)).catch(callback);
+        } else {
+            return executor();
+        }
     };
 
     this.semaphore = {
-        acquireLock: function(key, options, callback) {
+        acquireLock: (key, options, callback) => {
             // Options are optional
             if (!callback && typeof options === 'function') {
                 callback = options;
@@ -583,14 +611,14 @@ function PettyCache() {
 
             const _this = this;
 
-            async.retry({ interval: options.retry.interval, times: options.retry.times }, function(callback) {
+            async.retry({ interval: options.retry.interval, times: options.retry.times }, (callback) => {
                 // Mutex lock around semaphore
-                _this.mutex.lock(`lock:${key}`, { retry: { times: 100 } }, function(err) {
+                _this.mutex.lock(`lock:${key}`, { retry: { times: 100 } }, (err) => {
                     if (err) {
                         return callback(err);
                     }
 
-                    redisClient.get(key, function(err, data) {
+                    redisClient.get(key, (err, data) => {
                         // If we encountered an error, unlock the mutex lock and return error
                         if (err) {
                             return _this.mutex.unlock(`lock:${key}`, () => { callback(err); });
@@ -601,10 +629,10 @@ function PettyCache() {
                             return _this.mutex.unlock(`lock:${key}`, () => { callback(new Error(`Semaphore ${key} doesn't exist.`)); });
                         }
 
-                        var pool = JSON.parse(data);
+                        const pool = JSON.parse(data);
 
                         // Try to find a slot that's available.
-                        var index = pool.findIndex(s => s.status === 'available');
+                        let index = pool.findIndex(s => s.status === 'available');
 
                         if (index === -1) {
                             index = pool.findIndex(s => s.ttl <= Date.now());
@@ -617,7 +645,7 @@ function PettyCache() {
 
                         pool[index] = { status: 'acquired', ttl: Date.now() + options.ttl };
 
-                        redisClient.set(key, JSON.stringify(pool), function(err) {
+                        redisClient.set(key, JSON.stringify(pool), (err) => {
                             if (err) {
                                 return _this.mutex.unlock(`lock:${key}`, () => { callback(err); });
                             }
@@ -628,18 +656,18 @@ function PettyCache() {
                 });
             }, callback);
         },
-        consumeLock: function(key, index, callback) {
-            callback = callback || function() {};
+        consumeLock: (key, index, callback) => {
+            callback = callback || (() => {});
 
             const _this = this;
 
             // Mutex lock around semaphore
-            _this.mutex.lock(`lock:${key}`, { retry: { times: 100 } }, function(err) {
+            _this.mutex.lock(`lock:${key}`, { retry: { times: 100 } }, (err) => {
                 if (err) {
                     return callback(err);
                 }
 
-                redisClient.get(key, function(err, data) {
+                redisClient.get(key, (err, data) => {
                     // If we encountered an error, unlock the mutex lock and return error
                     if (err) {
                         return _this.mutex.unlock(`lock:${key}`, () => { callback(err); });
@@ -650,7 +678,7 @@ function PettyCache() {
                         return _this.mutex.unlock(`lock:${key}`, () => { callback(new Error(`Semaphore ${key} doesn't exist.`)); });
                     }
 
-                    var pool = JSON.parse(data);
+                    const pool = JSON.parse(data);
 
                     // Ensure index exists.
                     if (pool.length <= index) {
@@ -664,7 +692,7 @@ function PettyCache() {
                         pool[index] = { status: 'available' };
                     }
 
-                    redisClient.set(key, JSON.stringify(pool), function(err) {
+                    redisClient.set(key, JSON.stringify(pool), (err) => {
                         if (err) {
                             return _this.mutex.unlock(`lock:${key}`, () => { callback(err); });
                         }
@@ -674,17 +702,17 @@ function PettyCache() {
                 });
             });
         },
-        expand: function(key, size, callback) {
-            callback = callback || function() {};
+        expand: (key, size, callback) => {
+            callback = callback || (() => {});
 
             const _this = this;
 
-            _this.mutex.lock(`lock:${key}`, { retry: { times: 100 } }, function(err) {
+            _this.mutex.lock(`lock:${key}`, { retry: { times: 100 } }, (err) => {
                 if (err) {
                     return callback(err);
                 }
 
-                redisClient.get(key, function(err, data) {
+                redisClient.get(key, (err, data) => {
                     // If we encountered an error, unlock the mutex lock and return error
                     if (err) {
                         return _this.mutex.unlock(`lock:${key}`, () => { callback(err); });
@@ -695,7 +723,7 @@ function PettyCache() {
                         return _this.mutex.unlock(`lock:${key}`, () => { callback(new Error(`Semaphore ${key} doesn't exist.`)); });
                     }
 
-                    var pool = JSON.parse(data);
+                    let pool = JSON.parse(data);
 
                     if (pool.length > size) {
                         return _this.mutex.unlock(`lock:${key}`, () => { callback(new Error(`Cannot shrink pool, size is ${pool.length} and you requested a size of ${size}.`)); });
@@ -707,7 +735,7 @@ function PettyCache() {
 
                     pool = pool.concat(Array(size - pool.length).fill({ status: 'available' }));
 
-                    redisClient.set(key, JSON.stringify(pool), function(err) {
+                    redisClient.set(key, JSON.stringify(pool), (err) => {
                         if (err) {
                             return _this.mutex.unlock(`lock:${key}`, () => { callback(err); });
                         }
@@ -717,18 +745,18 @@ function PettyCache() {
                 });
             });
         },
-        releaseLock: function(key, index, callback) {
-            callback = callback || function() {};
+        releaseLock: (key, index, callback) => {
+            callback = callback || (() => {});
 
             const _this = this;
 
             // Mutex lock around semaphore
-            _this.mutex.lock(`lock:${key}`, { retry: { times: 100 } }, function(err) {
+            _this.mutex.lock(`lock:${key}`, { retry: { times: 100 } }, (err) => {
                 if (err) {
                     return callback(err);
                 }
 
-                redisClient.get(key, function(err, data) {
+                redisClient.get(key, (err, data) => {
                     // If we encountered an error, unlock the mutex lock and return error
                     if (err) {
                         return _this.mutex.unlock(`lock:${key}`, () => { callback(err); });
@@ -739,7 +767,7 @@ function PettyCache() {
                         return _this.mutex.unlock(`lock:${key}`, () => { callback(new Error(`Semaphore ${key} doesn't exist.`)); });
                     }
 
-                    var pool = JSON.parse(data);
+                    const pool = JSON.parse(data);
 
                     // Ensure index exists.
                     if (pool.length <= index) {
@@ -748,7 +776,7 @@ function PettyCache() {
 
                     pool[index] = { status: 'available' };
 
-                    redisClient.set(key, JSON.stringify(pool), function(err) {
+                    redisClient.set(key, JSON.stringify(pool), (err) => {
                         if (err) {
                             return _this.mutex.unlock(`lock:${key}`, () => { callback(err); });
                         }
@@ -758,19 +786,19 @@ function PettyCache() {
                 });
             });
         },
-        reset: function(key, callback) {
-            callback = callback || function() {};
+        reset: (key, callback) => {
+            callback = callback || (() => {});
 
             const _this = this;
 
             // Mutex lock around semaphore
-            this.mutex.lock(`lock:${key}`, { retry: { times: 100 } }, function(err) {
+            this.mutex.lock(`lock:${key}`, { retry: { times: 100 } }, (err) => {
                 if (err) {
                     return callback(err);
                 }
 
                 // Try to get previously created semaphore
-                redisClient.get(key, function(err, data) {
+                redisClient.get(key, (err, data) => {
                     // If we encountered an error, unlock the mutex lock and return error
                     if (err) {
                         return _this.mutex.unlock(`lock:${key}`, () => { callback(err); });
@@ -781,10 +809,10 @@ function PettyCache() {
                         return _this.mutex.unlock(`lock:${key}`, () => { callback(new Error(`Semaphore ${key} doesn't exist.`)); });
                     }
 
-                    var pool = JSON.parse(data);
+                    let pool = JSON.parse(data);
                     pool = Array(pool.length).fill({ status: 'available' });
 
-                    redisClient.set(key, JSON.stringify(pool), function(err) {
+                    redisClient.set(key, JSON.stringify(pool), (err) => {
                         if (err) {
                             return _this.mutex.unlock(`lock:${key}`, () => { callback(err); });
                         }
@@ -794,26 +822,26 @@ function PettyCache() {
                 });
             });
         },
-        retrieveOrCreate: function(key, options, callback) {
+        retrieveOrCreate: (key, options, callback) => {
             // Options are optional
             if (!callback && typeof options === 'function') {
                 callback = options;
                 options = {};
             }
 
-            callback = callback || function() {};
+            callback = callback || (() => {});
             options = options || {};
 
             const _this = this;
 
             // Mutex lock around semaphore retrival or creation
-            this.mutex.lock(`lock:${key}`, { retry: { times: 100 } }, function(err) {
+            this.mutex.lock(`lock:${key}`, { retry: { times: 100 } }, (err) => {
                 if (err) {
                     return callback(err);
                 }
 
                 // Try to get previously created semaphore
-                redisClient.get(key, function(err, data) {
+                redisClient.get(key, (err, data) => {
                     // If we encountered an error, unlock the mutex lock and return error
                     if (err) {
                         return _this.mutex.unlock(`lock:${key}`, () => { callback(err); });
@@ -824,7 +852,7 @@ function PettyCache() {
                         return _this.mutex.unlock(`lock:${key}`, () => { callback(null, JSON.parse(data)); });
                     }
 
-                    var getSize = function(callback) {
+                    const getSize = (callback) => {
                         if (typeof options.size === 'function') {
                             return options.size(callback);
                         }
@@ -832,15 +860,15 @@ function PettyCache() {
                         callback(null, Object.prototype.hasOwnProperty.call(options, 'size') ? options.size : 1);
                     };
 
-                    getSize(function(err, size) {
+                    getSize((err, size) => {
                         // If we encountered an error, unlock the mutex lock and return error
                         if (err) {
                             return _this.mutex.unlock(`lock:${key}`, () => { callback(err); });
                         }
 
-                        var pool = Array(Math.max(size, 1)).fill({ status: 'available' });
+                        const pool = Array(Math.max(size, 1)).fill({ status: 'available' });
 
-                        redisClient.set(key, JSON.stringify(pool), function(err) {
+                        redisClient.set(key, JSON.stringify(pool), (err) => {
                             if (err) {
                                 return _this.mutex.unlock(`lock:${key}`, () => { callback(err); });
                             }
@@ -853,7 +881,7 @@ function PettyCache() {
         }
     };
 
-    this.set = function(key, value, options, callback) {
+    this.set = (key, value, options, callback) => {
         options = options || {};
 
         if (typeof options === 'function') {
@@ -864,18 +892,31 @@ function PettyCache() {
         // Get TTL based on specified options
         const ttl = getTtl(options);
 
-        // Default callback is a noop
-        callback = callback || function() {};
+        const executor = () => {
+            return new Promise((resolve, reject) => {
+                // Store value in memory cache with a short expiration
+                memoryCache.put(key, value, random(2000, 5000));
 
-        // Store value in memory cache with a short expiration
-        memoryCache.put(key, value, random(2000, 5000));
+                // Store value in Redis
+                redisClient.psetex(key, random(ttl.min, ttl.max), PettyCache.stringify(value), (err) => {
+                    if (err) {
+                        return reject(err);
+                    }
+
+                    resolve();
+                });
+            });
+        };
 
-        // Store value is Redis
-        redisClient.psetex(key, random(ttl.min, ttl.max), PettyCache.stringify(value), callback);
+        if (callback) {
+            executor().then(result => callback(null, result)).catch(callback);
+        } else {
+            return executor();
+        }
     };
 
     // Semaphore functions need to be bound to the main PettyCache object
-    for (var method in this.semaphore) {
+    for (const method in this.semaphore) {
         this.semaphore[method] = this.semaphore[method].bind(this);
     }
 }
@@ -888,8 +929,8 @@ function random(min, max) {
     return Math.floor(Math.random() * (max - min + 1) + min);
 }
 
-PettyCache.parse = function(text) {
-    return JSON.parse(text, function(k, v) {
+PettyCache.parse = (text) => {
+    return JSON.parse(text, (k, v) => {
         if (v === '__NaN') {
             return NaN;
         } else if (v === '__null') {
@@ -902,8 +943,8 @@ PettyCache.parse = function(text) {
     });
 };
 
-PettyCache.stringify = function(value) {
-    return JSON.stringify(value, function(k, v) {
+PettyCache.stringify = (value) => {
+    return JSON.stringify(value, (k, v) => {
         if (typeof v === 'number' && isNaN(v)) {
             return '__NaN';
         } else if (v === null) {

package/package.json

@@ -1,36 +1,30 @@
 {
-  "description": "A cache module for node.js that uses a two-level cache (in-memory cache for recently accessed data plus Redis for distributed caching) with some extra features to avoid cache stampedes and thundering herds.",
-  "dependencies": {
-    "async": "~3.2.6",
-    "lock": "~1.1.0",
-    "memory-cache": "~0.2.0",
-    "redis": "~3.1.0"
-  },
-  "devDependencies": {
-    "@eslint/js": "*",
-    "globals": "*",
-    "coveralls": "*",
-    "mocha": "*",
-    "nyc": "*"
-  },
-  "homepage": "https://github.com/mediocre/petty-cache",
-  "keywords": [
-    "cache",
-    "lock",
-    "mutex",
-    "redis",
-    "semaphore"
-  ],
-  "license": "Apache-2.0",
-  "main": "index.js",
-  "name": "petty-cache",
-  "scripts": {
-    "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls",
-    "test": "mocha --exit --reporter spec"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/mediocre/petty-cache.git"
-  },
-  "version": "3.5.0"
+    "dependencies": {
+        "async": "~3.2.6",
+        "lock": "~1.1.0",
+        "memory-cache": "~0.2.0",
+        "redis": "~3.1.0"
+    },
+    "description": "A cache module for node.js that uses a two-level cache (in-memory cache for recently accessed data plus Redis for distributed caching) with some extra features to avoid cache stampedes and thundering herds.",
+    "devDependencies": {
+        "@eslint/js": "*",
+        "globals": "*"
+    },
+    "homepage": "https://github.com/stores-com/petty-cache",
+    "keywords": [
+        "cache",
+        "lock",
+        "mutex",
+        "redis",
+        "semaphore"
+    ],
+    "license": "MIT",
+    "main": "index.js",
+    "name": "petty-cache",
+    "repository": "https://github.com/stores-com/petty-cache",
+    "scripts": {
+        "coveralls": "node --test --test-concurrency=true --test-force-exit --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=lcov.info && coveralls < lcov.info",
+        "test": "node --test --test-concurrency=true --test-force-exit --test-reporter=spec"
+    },
+    "version": "3.6.0"
 }