From fe5d2f9d641a69eac1518b80fbb5e8c0beb9d31f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Feb 2022 07:52:14 +0000 Subject: [PATCH 1/4] chore(deps): bump lru-cache from 6.0.0 to 7.4.0 Bumps [lru-cache](https://github.com/isaacs/node-lru-cache) from 6.0.0 to 7.4.0. - [Release notes](https://github.com/isaacs/node-lru-cache/releases) - [Changelog](https://github.com/isaacs/node-lru-cache/blob/main/CHANGELOG.md) - [Commits](https://github.com/isaacs/node-lru-cache/compare/v6.0.0...v7.4.0) --- updated-dependencies: - dependency-name: lru-cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 110 ++++++++++++++++++++++++++++++++++++++++------ package.json | 2 +- 2 files changed, 98 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 389c361..2e53485 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1684,6 +1684,17 @@ "dev": true, "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==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + } } } } @@ -1801,6 +1812,17 @@ "dev": true, "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==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + } } } } @@ -1903,6 +1925,17 @@ "dev": true, "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==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + } } } } @@ -4416,6 +4449,17 @@ "dev": true, "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==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + } } }, "html-encoding-sniffer": { @@ -5930,6 +5974,17 @@ "dev": true, "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==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + } } } } @@ -6458,19 +6513,9 @@ } }, "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" - }, - "dependencies": { - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - } - } + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.4.0.tgz", + "integrity": "sha512-YOfuyWa/Ee+PXbDm40j9WXyJrzQUynVbgn4Km643UYcWNcrSfRkKL0WaiUcxcIbkXcVTgNpDqSnPXntWXT75cw==" }, "make-dir": { "version": "3.1.0", @@ -6781,6 +6826,17 @@ "dev": true, "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==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + } } } } @@ -7881,6 +7937,17 @@ "dev": true, "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==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + } } }, "supports-color": { @@ -8241,6 +8308,17 @@ "dev": true, "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==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + } } } } @@ -8587,6 +8665,12 @@ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "yaml": { "version": "1.8.3", "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.8.3.tgz", diff --git a/package.json b/package.json index a39e452..fa59135 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ }, "dependencies": { "@types/lru-cache": "^5.1.0", - "lru-cache": "^6.0.0" + "lru-cache": "^7.4.0" }, "peerDependencies": { "boardgame.io": ">=0.41.1" From a73a7b0063398cb93726a10ca7a2127f3f9c28ed Mon Sep 17 00:00:00 2001 From: delucis Date: Thu, 24 Feb 2022 09:04:03 +0100 Subject: [PATCH 2/4] chore(deps): bump @types/lru-cache from 5.1.1 to 7.4.0 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2e53485..0e738ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1562,9 +1562,9 @@ } }, "@types/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@types/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw==" + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@types/lru-cache/-/lru-cache-7.4.0.tgz", + "integrity": "sha512-jZ/Tb2/3vXw4VYd9AImFC/n6XT3WywZNAxwY8Ox9eM87M9ta9G7KzCx4aKo2Zllvr02k40eY328cjOO3WuK5Kw==" }, "@types/mime": { "version": "1.3.2", diff --git a/package.json b/package.json index fa59135..fc6c4df 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "typescript": "^4.2.4" }, "dependencies": { - "@types/lru-cache": "^5.1.0", + "@types/lru-cache": "^7.4.0", "lru-cache": "^7.4.0" }, "peerDependencies": { From 5f0b5ad59868a27e060ca87b3a5966970ddc3fcd Mon Sep 17 00:00:00 2001 From: delucis Date: Thu, 24 Feb 2022 11:10:26 +0100 Subject: [PATCH 3/4] test: Use v7 `lru-cache` size/keys API --- test/bgio-storage-cache.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/bgio-storage-cache.test.ts b/test/bgio-storage-cache.test.ts index 3c5105e..b6284c5 100644 --- a/test/bgio-storage-cache.test.ts +++ b/test/bgio-storage-cache.test.ts @@ -109,8 +109,8 @@ describe('StorageCache', () => { await db.connect(); await db.setState('gameID', { a: 1 } as unknown as State); await db.setState('another', { b: 1 } as unknown as State); - expect(db.cache.state.itemCount).toBe(1); - expect(db.cache.state.keys()).toEqual(['another']); + expect(db.cache.state.size).toBe(1); + expect([...db.cache.state.keys()]).toEqual(['another']); }); test('race conditions', async () => { @@ -341,8 +341,8 @@ describe('StorageCache with a deprecated database connector', () => { await db.connect(); await db.setState('gameID', { a: 1 } as unknown as State); await db.setState('another', { b: 1 } as unknown as State); - expect(db.cache.state.itemCount).toBe(1); - expect(db.cache.state.keys()).toEqual(['another']); + expect(db.cache.state.size).toBe(1); + expect([...db.cache.state.keys()]).toEqual(['another']); }); test('race conditions', async () => { From 5065b9a02972c8a68e6ef8f45f12da1d8690ff14 Mon Sep 17 00:00:00 2001 From: delucis Date: Thu, 24 Feb 2022 11:11:02 +0100 Subject: [PATCH 4/4] refactor: Update deprecated v7 `lru-cache` APIs --- src/bgio-storage-cache.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bgio-storage-cache.ts b/src/bgio-storage-cache.ts index 155e002..50308ff 100644 --- a/src/bgio-storage-cache.ts +++ b/src/bgio-storage-cache.ts @@ -41,10 +41,10 @@ export class StorageCache extends Async { initialState: new LRU({ max: cacheSize }), log: new LRU({ max: cacheSize }), reset: (): void => { - this.cache.metadata.reset(); - this.cache.state.reset(); - this.cache.initialState.reset(); - this.cache.log.reset(); + this.cache.metadata.clear(); + this.cache.state.clear(); + this.cache.initialState.clear(); + this.cache.log.clear(); }, }; } @@ -190,10 +190,10 @@ export class StorageCache extends Async { */ async wipe(gameID: string): Promise { await this.db.wipe(gameID); - this.cache.metadata.del(gameID); - this.cache.state.del(gameID); - this.cache.initialState.del(gameID); - this.cache.log.del(gameID); + this.cache.metadata.delete(gameID); + this.cache.state.delete(gameID); + this.cache.initialState.delete(gameID); + this.cache.log.delete(gameID); } /**