Use @digitalbazaar/lru-memoize@4.

Author: dlongley

CHANGELOG.md

@@ -1,5 +1,11 @@
 # bedrock-oauth2-client ChangeLog
 
+## 7.2.0 - 2024-05-dd
+
+### Changed
+- Use `@digitalbazaar/lru-memoize@4`. Existing cache defaults and options
+  are coerced from previous versions to the new version.
+
 ## 7.1.0 - 2024-05-09
 
 ### Changed

lib/config.js

@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 - 2024 Digital Bazaar, Inc.
+ * Copyright 2021 - 2025 Digital Bazaar, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,9 +20,9 @@ import {config} from '@bedrock/core';
 
 config['oauth2-client'] = {
   accessTokenCache: {
-    maxSize: 100,
+    max: 100,
     // 5 minutes
-    maxAge: 5 * 60 * 1000
+    ttl: 5 * 60 * 1000
   },
   // time to live - the amount of a time a record will stay in the database
   // before it is expired. 2 week expiration in milliseconds.

lib/oauth2-client.js

@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 - 2024 Digital Bazaar, Inc.
+ * Copyright 2021 - 2025 Digital Bazaar, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,10 +32,22 @@ const RETRY_MAX_TIMEOUT = 30000;
 
 bedrock.events.on('bedrock.init', async () => {
   const cfg = bedrock.config['oauth2-client'];
-  ACCESS_TOKEN_CACHE = new LruCache({
-    max: cfg.accessTokenCache.maxSize,
-    maxAge: cfg.accessTokenCache.maxAge
-  });
+  let cacheConfig = cfg.accessTokenCache;
+
+  // coerce `maxSize` w/o `sizeCalculation` to `max`
+  if(cacheConfig.maxSize !== undefined &&
+    cacheConfig.sizeCalculation === undefined) {
+    cacheConfig = {...cacheConfig, max: cacheConfig.maxSize};
+    delete cacheConfig.maxSize;
+  }
+
+  // coerce `maxAge` to `ttl` in `cacheConfig`
+  if(cacheConfig.maxAge !== undefined) {
+    cacheConfig = {...cacheConfig, ttl: cacheConfig.maxAge};
+    delete cacheConfig.maxAge;
+  }
+
+  ACCESS_TOKEN_CACHE = new LruCache(cacheConfig);
 });
 
 /**

package.json

@@ -26,7 +26,7 @@
   "homepage": "https://github.com/digitalbazaar/bedrock-oauth2-client",
   "dependencies": {
     "@digitalbazaar/http-client": "^4.0.0",
-    "@digitalbazaar/lru-memoize": "^3.0.0",
+    "@digitalbazaar/lru-memoize": "^4.0.0",
     "p-retry": "^6.0.0"
   },
   "peerDependencies": {

test/mocha/10-api.js

@@ -130,7 +130,9 @@ describe('oauth2-client', () => {
     }
     should.exist(err);
     should.not.exist(result);
-    err.message.should.equal('Request failed with status code 403 Forbidden');
+    err.message.should.equal(
+      'Request failed with status code 403 Forbidden: ' +
+      'GET https://localhost:18443/geterrortest');
     err.status.should.equal(403);
   });
 });