From 4499d94a284745b2d33743f1d333bd501f20762f Mon Sep 17 00:00:00 2001 From: Zaksans Date: Fri, 6 Nov 2026 10:47:27 +0100 Subject: [PATCH] [SDK] Fix eviction of empty-string cache keys --- .changeset/empty-cache-keys-evict.md | 5 ++++ .../thirdweb/src/utils/caching/lru.test.ts | 28 +++++++++++++++++++ packages/thirdweb/src/utils/caching/lru.ts | 6 ++-- 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 .changeset/empty-cache-keys-evict.md diff --git a/.changeset/empty-cache-keys-evict.md b/.changeset/empty-cache-keys-evict.md new file mode 100644 index 00000000000..ddb9ff0cfd5 --- /dev/null +++ b/.changeset/empty-cache-keys-evict.md @@ -0,0 +1,5 @@ +--- +"thirdweb": patch +--- + +Fixed LRU cache eviction when an empty string is the oldest key, keeping SDK validation caches within their configured size. diff --git a/packages/thirdweb/src/utils/caching/lru.test.ts b/packages/thirdweb/src/utils/caching/lru.test.ts index 5c61ff82c62..4864dfa9603 100644 --- a/packages/thirdweb/src/utils/caching/lru.test.ts +++ b/packages/thirdweb/src/utils/caching/lru.test.ts @@ -36,3 +36,31 @@ test("update touched keys", () => { expect(cache.has("c")).toBe(false); expect(cache.has("d")).toBe(true); }); + +test("evicts an empty-string oldest key", () => { + const cache = new LruMap(2); + cache.set("", 0); + cache.set("a", 1); + cache.set("b", 2); + + expect(cache.size).toBe(2); + expect([...cache.keys()]).toEqual(["a", "b"]); + + cache.set("c", 3); + expect(cache.size).toBe(2); + expect([...cache.keys()]).toEqual(["b", "c"]); +}); + +test("refreshes an empty-string key before eventually evicting it", () => { + const cache = new LruMap(2); + cache.set("", 0); + cache.set("a", 1); + expect(cache.get("")).toBe(0); + + cache.set("b", 2); + expect([...cache.keys()]).toEqual(["", "b"]); + + cache.set("c", 3); + expect(cache.size).toBe(2); + expect([...cache.keys()]).toEqual(["b", "c"]); +}); diff --git a/packages/thirdweb/src/utils/caching/lru.ts b/packages/thirdweb/src/utils/caching/lru.ts index 103b42d4449..43e9d5cdf5a 100644 --- a/packages/thirdweb/src/utils/caching/lru.ts +++ b/packages/thirdweb/src/utils/caching/lru.ts @@ -25,9 +25,9 @@ export class LruMap extends Map { override set(key: string, value: value) { super.set(key, value); if (this.maxSize && this.size > this.maxSize) { - const firstKey = this.keys().next().value; - if (firstKey) { - this.delete(firstKey); + const firstKey = this.keys().next(); + if (!firstKey.done) { + this.delete(firstKey.value); } } return this;