The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(server): restore absolute TTL in PromiseMemoizer (#21480)
Charles Bochet08a36aa68f6b
diff --git a/packages/twenty-server/src/engine/twenty-orm/storage/__tests__/promise-memoizer.storage.spec.ts b/packages/twenty-server/src/engine/twenty-orm/storage/__tests__/promise-memoizer.storage.spec.tsindex a151b3e735d..c8f2fadb152 100644--- a/packages/twenty-server/src/engine/twenty-orm/storage/__tests__/promise-memoizer.storage.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/storage/__tests__/promise-memoizer.storage.spec.ts@@ -83,6 +83,29 @@ describe('PromiseMemoizer', () => {expect(mockFactory).toHaveBeenCalledTimes(2);});+ it('should re-execute factory after TTL expires even under continuous reads', async () => {+ mockFactory.mockResolvedValue('test-value');++ const startTime = Date.now();++ await memoizer.memoizePromiseAndExecute('test-key-1', mockFactory);++ for (const elapsedTime of [+ TTL_MS / 2,+ TTL_MS,+ (3 * TTL_MS) / 2,+ 2 * TTL_MS,+ ]) {+ jest+ .spyOn(global.Date, 'now')+ .mockImplementation(() => startTime + elapsedTime + 1);++ await memoizer.memoizePromiseAndExecute('test-key-1', mockFactory);+ }++ expect(mockFactory).toHaveBeenCalledTimes(3);+ });+it('should handle null values', async () => {mockFactory.mockResolvedValue(null);diff --git a/packages/twenty-server/src/engine/twenty-orm/storage/promise-memoizer.storage.ts b/packages/twenty-server/src/engine/twenty-orm/storage/promise-memoizer.storage.tsindex f0533b49293..b8171e755c9 100644--- a/packages/twenty-server/src/engine/twenty-orm/storage/promise-memoizer.storage.ts+++ b/packages/twenty-server/src/engine/twenty-orm/storage/promise-memoizer.storage.ts@@ -8,7 +8,7 @@ type AsyncFactoryCallback<T> = () => Promise<T | null>;const ONE_HOUR_IN_MS = 3600_000;export class PromiseMemoizer<T> {- private cache = new Map<CacheKey, { value: T; lastUsed: number }>();+ private cache = new Map<CacheKey, { value: T; expiresAt: number }>();private pending = new Map<CacheKey, Promise<T | null>>();private ttlMs: number;@@ -26,8 +26,6 @@ export class PromiseMemoizer<T> {const cachedEntry = this.cache.get(cacheKey);if (cachedEntry) {- cachedEntry.lastUsed = Date.now();-return cachedEntry.value;}@@ -42,7 +40,10 @@ export class PromiseMemoizer<T> {const value = await factory();if (value) {- this.cache.set(cacheKey, { value, lastUsed: Date.now() });+ this.cache.set(cacheKey, {+ value,+ expiresAt: Date.now() + this.ttlMs,+ });}return value;@@ -60,7 +61,7 @@ export class PromiseMemoizer<T> {const now = Date.now();for (const [cacheKey, cachedEntry] of this.cache.entries()) {- if (cachedEntry.lastUsed < now - this.ttlMs) {+ if (cachedEntry.expiresAt <= now) {await this.clearKey(cacheKey, onDelete);}}