From 39c9d48443e2ffd2a4bc99e8d73f75de40563fce Mon Sep 17 00:00:00 2001 From: hazre Date: Mon, 2 Mar 2026 18:27:29 +0100 Subject: [PATCH] fix: resolve initMatrix eslint violations --- src/client/initMatrix.ts | 160 +++++++++++++++++++++------------------ 1 file changed, 88 insertions(+), 72 deletions(-) diff --git a/src/client/initMatrix.ts b/src/client/initMatrix.ts index 8a7c0c4a5..0f6d290b3 100644 --- a/src/client/initMatrix.ts +++ b/src/client/initMatrix.ts @@ -28,6 +28,22 @@ const deleteDatabase = (name: string): Promise => req.onblocked = () => resolve(); }); +const deleteSyncStoreGroup = async (syncStoreName: string): Promise => { + await Promise.all([ + deleteDatabase(syncStoreName), + deleteDatabase(syncStoreName.replace(/^sync/, 'crypto')), + deleteDatabase(`${syncStoreName}::matrix-sdk-crypto`), + ]); +}; + +const deleteSessionStores = async (storeName: SessionStoreName): Promise => { + await Promise.all([ + deleteDatabase(storeName.sync), + deleteDatabase(storeName.crypto), + deleteDatabase(`${storeName.rustCryptoPrefix}::matrix-sdk-crypto`), + ]); +}; + /** * Reads the account stored in an IndexedDB sync store without opening a full MatrixClient. * Returns undefined if the database doesn't exist or has no account record. @@ -40,27 +56,31 @@ const readStoredAccount = (dbName: string): Promise => const db = req.result; try { if (!db.objectStoreNames.contains('account')) { - db.close(); - return resolve(undefined); - } - const tx = db.transaction('account', 'readonly'); - const store = tx.objectStore('account'); - const getReq = store.get('account'); - getReq.onsuccess = () => { - db.close(); - const record = getReq.result; - if (!record?.account_data) return resolve(undefined); - try { - const data = JSON.parse(record.account_data); - resolve(data?.user_id ?? undefined); - } catch { - resolve(undefined); - } - }; - getReq.onerror = () => { db.close(); resolve(undefined); - }; + } else { + const tx = db.transaction('account', 'readonly'); + const store = tx.objectStore('account'); + const getReq = store.get('account'); + getReq.onsuccess = () => { + db.close(); + const record = getReq.result; + if (!record?.account_data) { + resolve(undefined); + } else { + try { + const data = JSON.parse(record.account_data); + resolve(data?.user_id ?? undefined); + } catch { + resolve(undefined); + } + } + }; + getReq.onerror = () => { + db.close(); + resolve(undefined); + }; + } } catch { try { db.close(); @@ -95,53 +115,49 @@ export const clearMismatchedStores = async (): Promise => { // databases() not supported in all browsers } - for (const dbInfo of allDbs) { - const { name } = dbInfo; - if (!name) continue; + await Promise.all( + allDbs.map(async ({ name }) => { + if (!name) return; - const containsKnownUser = Array.from(knownUserIds).some((uid) => name.includes(uid)); - const looksLikeUserDb = name.includes('@'); - if (looksLikeUserDb && !containsKnownUser && !knownStoreNames.has(name)) { - log.warn(`clearMismatchedStores: "${name}" has unknown user — deleting`); - await deleteDatabase(name); - continue; - } - - if (name.startsWith('sync')) { - const storedUserId = await readStoredAccount(name); - if (storedUserId) { - if (!knownUserIds.has(storedUserId)) { - log.warn(`clearMismatchedStores: "${name}" has unknown user ${storedUserId} — deleting`); - await deleteDatabase(name); - await deleteDatabase(name.replace(/^sync/, 'crypto')); - await deleteDatabase(`${name}::matrix-sdk-crypto`); - } else { - const expectedStore = `sync${storedUserId}`; - if (name !== expectedStore && !knownStoreNames.has(name)) { - log.warn( - `clearMismatchedStores: "${name}" is misplaced for ${storedUserId} — deleting` - ); - await deleteDatabase(name); - await deleteDatabase(name.replace(/^sync/, 'crypto')); - await deleteDatabase(`${name}::matrix-sdk-crypto`); - } - } + const containsKnownUser = Array.from(knownUserIds).some((uid) => name.includes(uid)); + const looksLikeUserDb = name.includes('@'); + if (looksLikeUserDb && !containsKnownUser && !knownStoreNames.has(name)) { + log.warn(`clearMismatchedStores: "${name}" has unknown user — deleting`); + await deleteDatabase(name); + return; } - } - } - for (const session of sessions) { - const sn = getSessionStoreName(session); - const storedUserId = await readStoredAccount(sn.sync); - if (storedUserId && storedUserId !== session.userId) { - log.warn( - `clearMismatchedStores: "${sn.sync}" has ${storedUserId} but session is ${session.userId} — deleting` - ); - await deleteDatabase(sn.sync); - await deleteDatabase(sn.crypto); - await deleteDatabase(`${sn.rustCryptoPrefix}::matrix-sdk-crypto`); - } - } + if (!name.startsWith('sync')) return; + + const storedUserId = await readStoredAccount(name); + if (!storedUserId) return; + + if (!knownUserIds.has(storedUserId)) { + log.warn(`clearMismatchedStores: "${name}" has unknown user ${storedUserId} — deleting`); + await deleteSyncStoreGroup(name); + return; + } + + const expectedStore = `sync${storedUserId}`; + if (name !== expectedStore && !knownStoreNames.has(name)) { + log.warn(`clearMismatchedStores: "${name}" is misplaced for ${storedUserId} — deleting`); + await deleteSyncStoreGroup(name); + } + }) + ); + + await Promise.all( + sessions.map(async (session) => { + const sn = getSessionStoreName(session); + const storedUserId = await readStoredAccount(sn.sync); + if (storedUserId && storedUserId !== session.userId) { + log.warn( + `clearMismatchedStores: "${sn.sync}" has ${storedUserId} but session is ${session.userId} — deleting` + ); + await deleteSessionStores(sn); + } + }) + ); }; const buildClient = async (session: Session): Promise => { @@ -187,17 +203,17 @@ export const initClient = async (session: Session): Promise => { const wipeAllStores = async () => { log.warn('initClient: wiping all stores for', session.userId); - await deleteDatabase(storeName.sync); - await deleteDatabase(storeName.crypto); - await deleteDatabase(`${storeName.rustCryptoPrefix}::matrix-sdk-crypto`); + await deleteSessionStores(storeName); try { const allDbs = await window.indexedDB.databases(); - for (const db of allDbs) { - if (db.name && db.name.includes(session.userId)) { - log.warn('initClient: also wiping db', db.name); - await deleteDatabase(db.name); - } - } + await Promise.all( + allDbs.map(async ({ name }) => { + if (name && name.includes(session.userId)) { + log.warn('initClient: also wiping db', name); + await deleteDatabase(name); + } + }) + ); } catch { // databases() not available in all browsers }