From 95ab9e39af9587a09da9609cc0086c1349b3c3e7 Mon Sep 17 00:00:00 2001
From: Antoine Cormouls <contact.antoine.cormouls@gmail.com>
Date: Sun, 12 Jun 2022 20:39:24 +0200
Subject: [PATCH] refactor: lru-cache maxAge to ttl

---
 package-lock.json                     | 19 +++++++++++++------
 package.json                          |  2 +-
 src/Adapters/Cache/LRUCache.js        |  2 +-
 src/LiveQuery/ParseLiveQueryServer.js | 10 ++++++++--
 src/LiveQuery/SessionTokenCache.js    |  2 +-
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1ae6c24c21..097f001395 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9141,12 +9141,9 @@
       "dev": true
     },
     "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "requires": {
-        "yallist": "^4.0.0"
-      }
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.10.1.tgz",
+      "integrity": "sha512-BQuhQxPuRl79J5zSXRP+uNzPOyZw2oFI9JLRQ80XswSvg21KMKNtQza9eF42rfI/3Z40RvzBdXgziEkudzjo8A=="
     },
     "lru-memoizer": {
       "version": "2.1.4",
@@ -14392,6 +14389,16 @@
       "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
       "requires": {
         "lru-cache": "^6.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        }
       }
     },
     "semver-compare": {
diff --git a/package.json b/package.json
index 6b42186b25..46c1da2d42 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "jwks-rsa": "2.1.2",
     "ldapjs": "2.3.2",
     "lodash": "4.17.21",
-    "lru-cache": "6.0.0",
+    "lru-cache": "7.10.1",
     "mime": "3.0.0",
     "mongodb": "4.6.0",
     "mustache": "4.2.0",
diff --git a/src/Adapters/Cache/LRUCache.js b/src/Adapters/Cache/LRUCache.js
index 889ca3d015..a07d0347eb 100644
--- a/src/Adapters/Cache/LRUCache.js
+++ b/src/Adapters/Cache/LRUCache.js
@@ -5,7 +5,7 @@ export class LRUCache {
   constructor({ ttl = defaults.cacheTTL, maxSize = defaults.cacheMaxSize }) {
     this.cache = new LRU({
       max: maxSize,
-      maxAge: ttl,
+      ttl,
     });
   }
 
diff --git a/src/LiveQuery/ParseLiveQueryServer.js b/src/LiveQuery/ParseLiveQueryServer.js
index fa05f23711..5c9a4725dd 100644
--- a/src/LiveQuery/ParseLiveQueryServer.js
+++ b/src/LiveQuery/ParseLiveQueryServer.js
@@ -10,7 +10,13 @@ import { ParsePubSub } from './ParsePubSub';
 import SchemaController from '../Controllers/SchemaController';
 import _ from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
-import { runLiveQueryEventHandlers, getTrigger, runTrigger, resolveError, toJSONwithObjects } from '../triggers';
+import {
+  runLiveQueryEventHandlers,
+  getTrigger,
+  runTrigger,
+  resolveError,
+  toJSONwithObjects,
+} from '../triggers';
 import { getAuthForSessionToken, Auth } from '../Auth';
 import { getCacheController } from '../Controllers';
 import LRU from 'lru-cache';
@@ -58,7 +64,7 @@ class ParseLiveQueryServer {
     // The main benefit is to be able to reuse the same user / session token resolution.
     this.authCache = new LRU({
       max: 500, // 500 concurrent
-      maxAge: config.cacheTimeout,
+      ttl: config.cacheTimeout,
     });
     // Initialize websocket server
     this.parseWebSocketServer = new ParseWebSocketServer(
diff --git a/src/LiveQuery/SessionTokenCache.js b/src/LiveQuery/SessionTokenCache.js
index 0eb4c2ead5..13b84c7367 100644
--- a/src/LiveQuery/SessionTokenCache.js
+++ b/src/LiveQuery/SessionTokenCache.js
@@ -19,7 +19,7 @@ class SessionTokenCache {
   constructor(timeout: number = 30 * 24 * 60 * 60 * 1000, maxSize: number = 10000) {
     this.cache = new LRU({
       max: maxSize,
-      maxAge: timeout,
+      ttl: timeout,
     });
   }