From 4384599a79bf6d2e8553dd87fa7b7c31acb0cc26 Mon Sep 17 00:00:00 2001 From: Erwan Leboucher Date: Thu, 16 Jul 2026 22:08:45 +0200 Subject: [PATCH] fix: close IndexedDB connections to prevent leaks --- src/app/features/call/callRingtoneStorage.ts | 50 ++++++++++++-------- src/app/theme/cache.ts | 34 +++++++++++-- src/app/utils/featureCheck.ts | 1 + 3 files changed, 61 insertions(+), 24 deletions(-) diff --git a/src/app/features/call/callRingtoneStorage.ts b/src/app/features/call/callRingtoneStorage.ts index f4c0bafe6..92f193dbb 100644 --- a/src/app/features/call/callRingtoneStorage.ts +++ b/src/app/features/call/callRingtoneStorage.ts @@ -41,36 +41,48 @@ async function putCustomCallAudio( blob: file, }; - await new Promise((resolve, reject) => { - const tx = db.transaction(STORE, 'readwrite'); - tx.objectStore(STORE).put(entry); - tx.addEventListener('complete', () => resolve()); - tx.addEventListener('error', () => reject(tx.error)); - }); + try { + await new Promise((resolve, reject) => { + const tx = db.transaction(STORE, 'readwrite'); + tx.objectStore(STORE).put(entry); + tx.addEventListener('complete', () => resolve()); + tx.addEventListener('error', () => reject(tx.error)); + }); + } finally { + db.close(); + } return entry; } async function getCustomCallAudio(key: string): Promise { const db = await openDb(); - return new Promise((resolve, reject) => { - const tx = db.transaction(STORE, 'readonly'); - const req = tx.objectStore(STORE).get(key); - req.addEventListener('error', () => reject(req.error)); - req.addEventListener('success', () => { - resolve(req.result as StoredCallRingtone | undefined); + try { + return await new Promise((resolve, reject) => { + const tx = db.transaction(STORE, 'readonly'); + const req = tx.objectStore(STORE).get(key); + req.addEventListener('error', () => reject(req.error)); + req.addEventListener('success', () => { + resolve(req.result as StoredCallRingtone | undefined); + }); }); - }); + } finally { + db.close(); + } } async function clearCustomCallAudio(key: string): Promise { const db = await openDb(); - await new Promise((resolve, reject) => { - const tx = db.transaction(STORE, 'readwrite'); - tx.objectStore(STORE).delete(key); - tx.addEventListener('complete', () => resolve()); - tx.addEventListener('error', () => reject(tx.error)); - }); + try { + await new Promise((resolve, reject) => { + const tx = db.transaction(STORE, 'readwrite'); + tx.objectStore(STORE).delete(key); + tx.addEventListener('complete', () => resolve()); + tx.addEventListener('error', () => reject(tx.error)); + }); + } finally { + db.close(); + } } export const putCustomCallRingtone = ( diff --git a/src/app/theme/cache.ts b/src/app/theme/cache.ts index b10b68c1e..59b4519bf 100644 --- a/src/app/theme/cache.ts +++ b/src/app/theme/cache.ts @@ -82,6 +82,30 @@ function openDb(): Promise { }); } +let dbPromise: Promise | undefined; + +function getDb(): Promise { + if (dbPromise) return dbPromise; + const pending = openDb() + .then((db) => { + const forget = () => { + if (dbPromise === pending) dbPromise = undefined; + }; + db.addEventListener('close', forget); + db.addEventListener('versionchange', () => { + forget(); + db.close(); + }); + return db; + }) + .catch((error) => { + if (dbPromise === pending) dbPromise = undefined; + throw error; + }); + dbPromise = pending; + return pending; +} + export async function hashThemeCss(cssText: string): Promise { try { const bytes = new TextEncoder().encode(cssText); @@ -99,7 +123,7 @@ export async function hashThemeCss(cssText: string): Promise { } export async function getCachedThemeEntry(url: string): Promise { - const db = await openDb(); + const db = await getDb(); return new Promise((resolve, reject) => { const tx = db.transaction(STORE, 'readonly'); const req = tx.objectStore(STORE).get(url); @@ -109,7 +133,7 @@ export async function getCachedThemeEntry(url: string): Promise { - const db = await openDb(); + const db = await getDb(); return new Promise((resolve, reject) => { const tx = db.transaction(STORE, 'readwrite'); tx.objectStore(STORE).put(entry); @@ -196,7 +220,7 @@ export async function revalidateCachedThemeCss( } export async function clearThemeCache(): Promise { - const db = await openDb(); + const db = await getDb(); return new Promise((resolve, reject) => { const tx = db.transaction(STORE, 'readwrite'); tx.objectStore(STORE).clear(); @@ -206,7 +230,7 @@ export async function clearThemeCache(): Promise { } export async function getThemeCacheStats(): Promise { - const db = await openDb(); + const db = await getDb(); const entries = await new Promise((resolve, reject) => { const tx = db.transaction(STORE, 'readonly'); const req = tx.objectStore(STORE).getAll(); @@ -240,7 +264,7 @@ export async function getThemeCacheStats(): Promise { /** Clears only refetchable network CSS. Uploaded local theme packages are preserved. */ export async function clearRemoteThemeCache(): Promise { - const db = await openDb(); + const db = await getDb(); return new Promise((resolve, reject) => { const tx = db.transaction(STORE, 'readwrite'); const store = tx.objectStore(STORE); diff --git a/src/app/utils/featureCheck.ts b/src/app/utils/featureCheck.ts index d5564e749..16a82829a 100644 --- a/src/app/utils/featureCheck.ts +++ b/src/app/utils/featureCheck.ts @@ -11,6 +11,7 @@ export const checkIndexedDBSupport = async (): Promise => { } db.addEventListener('success', () => { resolve(true); + db.result.close(); indexedDB.deleteDatabase(dbName); }); db.addEventListener('error', () => {