From c2e4f8369be64289ccab9d5cac592165c1fe8483 Mon Sep 17 00:00:00 2001
From: Daniel <daniel-blyth@live.com.au>
Date: Fri, 26 May 2023 07:59:42 +1000
Subject: [PATCH] refactor: Upgrade lru-cache from 7.12.0 to 9.1.1  (#8559)

---
 package-lock.json                     | 16 ++++++++--------
 package.json                          |  2 +-
 spec/SessionTokenCache.spec.js        |  2 +-
 src/Adapters/Cache/LRUCache.js        |  2 +-
 src/LiveQuery/ParseLiveQueryServer.js |  6 +++---
 src/LiveQuery/SessionTokenCache.js    |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 88bf2460..6af50dfd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
         "jwks-rsa": "2.1.5",
         "ldapjs": "2.3.3",
         "lodash": "4.17.21",
-        "lru-cache": "7.12.0",
+        "lru-cache": "9.1.1",
         "mime": "3.0.0",
         "mongodb": "4.10.0",
         "mustache": "4.2.0",
@@ -11056,11 +11056,11 @@
       }
     },
     "node_modules/lru-cache": {
-      "version": "7.12.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.12.0.tgz",
-      "integrity": "sha512-OIP3DwzRZDfLg9B9VP/huWBlpvbkmbfiBy8xmsXp4RPmE4A3MhwNozc5ZJ3fWnSg8fDcdlE/neRTPG2ycEKliw==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.1.tgz",
+      "integrity": "sha512-65/Jky17UwSb0BuB9V+MyDpsOtXKmYwzhyl+cOa9XUiI4uV2Ouy/2voFP3+al0BjZbJgMBD8FojMpAf+Z+qn4A==",
       "engines": {
-        "node": ">=12"
+        "node": "14 || >=16.14"
       }
     },
     "node_modules/lru-memoizer": {
@@ -29041,9 +29041,9 @@
       "dev": true
     },
     "lru-cache": {
-      "version": "7.12.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.12.0.tgz",
-      "integrity": "sha512-OIP3DwzRZDfLg9B9VP/huWBlpvbkmbfiBy8xmsXp4RPmE4A3MhwNozc5ZJ3fWnSg8fDcdlE/neRTPG2ycEKliw=="
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.1.tgz",
+      "integrity": "sha512-65/Jky17UwSb0BuB9V+MyDpsOtXKmYwzhyl+cOa9XUiI4uV2Ouy/2voFP3+al0BjZbJgMBD8FojMpAf+Z+qn4A=="
     },
     "lru-memoizer": {
       "version": "2.1.4",
diff --git a/package.json b/package.json
index 717f720a..9c1d33e6 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "jwks-rsa": "2.1.5",
     "ldapjs": "2.3.3",
     "lodash": "4.17.21",
-    "lru-cache": "7.12.0",
+    "lru-cache": "9.1.1",
     "mime": "3.0.0",
     "mongodb": "4.10.0",
     "mustache": "4.2.0",
diff --git a/spec/SessionTokenCache.spec.js b/spec/SessionTokenCache.spec.js
index de1b101c..6b3c83df 100644
--- a/spec/SessionTokenCache.spec.js
+++ b/spec/SessionTokenCache.spec.js
@@ -47,7 +47,7 @@ describe('SessionTokenCache', function () {
 
     sessionTokenCache.getUserId('sessionToken').then(userIdFromCache => {
       expect(userIdFromCache).toBe('userId');
-      expect(sessionTokenCache.cache.length).toBe(1);
+      expect(sessionTokenCache.cache.size).toBe(1);
       done();
     });
   });
diff --git a/src/Adapters/Cache/LRUCache.js b/src/Adapters/Cache/LRUCache.js
index f54d8503..129a0063 100644
--- a/src/Adapters/Cache/LRUCache.js
+++ b/src/Adapters/Cache/LRUCache.js
@@ -1,4 +1,4 @@
-import LRU from 'lru-cache';
+import { LRUCache as LRU } from 'lru-cache';
 import defaults from '../../defaults';
 
 export class LRUCache {
diff --git a/src/LiveQuery/ParseLiveQueryServer.js b/src/LiveQuery/ParseLiveQueryServer.js
index 0b71265f..1105a2a6 100644
--- a/src/LiveQuery/ParseLiveQueryServer.js
+++ b/src/LiveQuery/ParseLiveQueryServer.js
@@ -19,7 +19,7 @@ import {
 } from '../triggers';
 import { getAuthForSessionToken, Auth } from '../Auth';
 import { getCacheController, getDatabaseController } from '../Controllers';
-import LRU from 'lru-cache';
+import { LRUCache as LRU } from 'lru-cache';
 import UserRouter from '../Routers/UsersRouter';
 import DatabaseController from '../Controllers/DatabaseController';
 import { isDeepStrictEqual } from 'util';
@@ -518,7 +518,7 @@ class ParseLiveQueryServer {
           ]);
           auth1.auth?.clearRoleCache(sessionToken);
           auth2.auth?.clearRoleCache(sessionToken);
-          this.authCache.del(sessionToken);
+          this.authCache.delete(sessionToken);
         })
       );
     } catch (e) {
@@ -548,7 +548,7 @@ class ParseLiveQueryServer {
           result.error = error;
           this.authCache.set(sessionToken, Promise.resolve(result), this.config.cacheTimeout);
         } else {
-          this.authCache.del(sessionToken);
+          this.authCache.delete(sessionToken);
         }
         return result;
       });
diff --git a/src/LiveQuery/SessionTokenCache.js b/src/LiveQuery/SessionTokenCache.js
index 13b84c73..a7f52b65 100644
--- a/src/LiveQuery/SessionTokenCache.js
+++ b/src/LiveQuery/SessionTokenCache.js
@@ -1,5 +1,5 @@
 import Parse from 'parse/node';
-import LRU from 'lru-cache';
+import { LRUCache as LRU } from 'lru-cache';
 import logger from '../logger';
 
 function userForSessionToken(sessionToken) {