Skip to content

Open source personal finance application

fix: restore cross-browser sync and purge stale offline ops

Ilya Komichevdb55ae26bd86
diff --git a/.gitignore b/.gitignore
index 81de5123..18524b89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,6 @@ logs
utils/migrate/data.json
ftp.config.js
+
+# Temporarily-installed admin functions (see apps/admin/)
+convex/admin/
diff --git a/app/components/app/useInitApp.ts b/app/components/app/useInitApp.ts
index 15f4583e..25b30c68 100644
--- a/app/components/app/useInitApp.ts
+++ b/app/components/app/useInitApp.ts
@@ -15,6 +15,7 @@ import { useTrnsStore } from '~/components/trns/useTrnsStore'
import { userSettingsSchema } from '~/components/user/types'
import { useUserStore } from '~/components/user/useUserStore'
import { useWalletsStore } from '~/components/wallets/useWalletsStore'
+import { hasAuthCookie } from '~/composables/useAuthCookie'
import { blockPersist, unblockPersist } from '~/composables/useStoreSync'
import { createLogger } from '~/utils/logger'
@@ -86,6 +87,25 @@ export function useInitApp() {
const { $waitForConvexAuth } = useNuxtApp()
await ($waitForConvexAuth as () => Promise<void>)()
+ // Auth cookie exists but session hasn't resolved yet (no cached user from previous login).
+ // Wait briefly for userStore.uid to appear before giving up.
+ if (!userStore.uid && hasAuthCookie()) {
+ await new Promise<void>((resolve) => {
+ let timer: ReturnType<typeof setTimeout>
+ const stop = watch(() => userStore.uid, (val) => {
+ if (val) {
+ stop()
+ clearTimeout(timer)
+ resolve()
+ }
+ })
+ timer = setTimeout(() => {
+ stop()
+ resolve()
+ }, 5000)
+ })
+ }
+
if (!userStore.uid)
return
diff --git a/app/components/offline/replay.test.ts b/app/components/offline/replay.test.ts
index 2bef00fc..06304c24 100644
--- a/app/components/offline/replay.test.ts
+++ b/app/components/offline/replay.test.ts
@@ -33,6 +33,7 @@ const mockGroupOpsByEntity = vi.fn(() => ({
categoryOps: [] as OfflineOp[],
settingsOps: [] as OfflineOp[],
trnOps: [] as OfflineOp[],
+ unknownOps: [] as OfflineOp[],
walletOps: [] as OfflineOp[],
}))
@@ -96,6 +97,7 @@ beforeEach(() => {
categoryOps: [],
settingsOps: [],
trnOps: [],
+ unknownOps: [],
walletOps: [],
})
})
@@ -182,6 +184,7 @@ describe('replayOfflineQueue', () => {
categoryOps: [makeOp(OfflineEntityType.Categories, 'c1', 'create')],
settingsOps: [makeOp(OfflineEntityType.UserSettings, 's1', 'update')],
trnOps: [makeOp(OfflineEntityType.Trns, 't1', 'create')],
+ unknownOps: [],
walletOps: [makeOp(OfflineEntityType.Wallets, 'w1', 'create')],
})
@@ -228,6 +231,7 @@ describe('replayOfflineQueue', () => {
categoryOps: [],
settingsOps: [],
trnOps: [makeOp(OfflineEntityType.Trns, 't1', 'create')],
+ unknownOps: [],
walletOps: [],
})
mockReplayTrnOps.mockResolvedValue(3)
@@ -237,6 +241,22 @@ describe('replayOfflineQueue', () => {
expect(mockShowWarningToast).toHaveBeenCalledWith('trns.errors.orphanedSkipped', { count: 3 })
})
+ it('removes ops with unknown entity from queue', async () => {
+ const unknownOp = { entity: 'loanPaymentLinks', id: 'x1', timestamp: 0, type: 'update' } as unknown as OfflineOp
+ mockGetAllOfflineOps.mockResolvedValue([unknownOp])
+ mockGroupOpsByEntity.mockReturnValue({
+ categoryOps: [],
+ settingsOps: [],
+ trnOps: [],
+ unknownOps: [unknownOp],
+ walletOps: [],
+ })
+
+ await replayOfflineQueue()
+
+ expect(mockRemoveOfflineOp).toHaveBeenCalledWith('loanPaymentLinks', 'x1')
+ })
+
it('does not show toast when no orphans', async () => {
mockGetAllOfflineOps.mockResolvedValue([
makeOp(OfflineEntityType.Trns, 't1', 'create'),
@@ -245,6 +265,7 @@ describe('replayOfflineQueue', () => {
categoryOps: [],
settingsOps: [],
trnOps: [makeOp(OfflineEntityType.Trns, 't1', 'create')],
+ unknownOps: [],
walletOps: [],
})
mockReplayTrnOps.mockResolvedValue(0)
diff --git a/app/components/offline/replay.ts b/app/components/offline/replay.ts
index beb94aa5..d8aba2d9 100644
--- a/app/components/offline/replay.ts
+++ b/app/components/offline/replay.ts
@@ -63,7 +63,20 @@ export async function replayOfflineQueue(): Promise<void> {
filteredOps.push(op)
}
- const { categoryOps, settingsOps, trnOps, walletOps } = groupOpsByEntity(filteredOps)
+ const { categoryOps, settingsOps, trnOps, unknownOps, walletOps } = groupOpsByEntity(filteredOps)
+
+ // Purge ops from removed/renamed features so the queue doesn't grow unbounded.
+ if (unknownOps.length > 0) {
+ logger.warn(`removing ${unknownOps.length} ops with unknown entity`)
+ for (const op of unknownOps) {
+ try {
+ await removeOfflineOp(op.entity, op.id)
+ }
+ catch (e) {
+ logger.error(`failed to remove unknown op ${op.entity}/${op.id}:`, e)
+ }
+ }
+ }
_isReplaying = true
const remapIds = new Map<string, string>()
diff --git a/app/components/offline/replayHelpers.test.ts b/app/components/offline/replayHelpers.test.ts
index 666bea92..cd44796b 100644
--- a/app/components/offline/replayHelpers.test.ts
+++ b/app/components/offline/replayHelpers.test.ts
@@ -150,6 +150,7 @@ describe('groupOpsByEntity', () => {
expect(result.categoryOps).toEqual([])
expect(result.trnOps).toEqual([])
expect(result.settingsOps).toEqual([])
+ expect(result.unknownOps).toEqual([])
})
it('preserves op references', () => {
@@ -157,6 +158,19 @@ describe('groupOpsByEntity', () => {
const result = groupOpsByEntity([op])
expect(result.trnOps[0]).toBe(op)
})
+
+ it('collects ops with unknown entity into unknownOps', () => {
+ const known = makeOp(OfflineEntityType.Trns, 't1')
+ const unknown = { entity: 'loanPaymentLinks', id: 'x1', timestamp: 0, type: 'update' } as unknown as OfflineOp
+ const result = groupOpsByEntity([known, unknown])
+
+ expect(result.trnOps).toHaveLength(1)
+ expect(result.walletOps).toHaveLength(0)
+ expect(result.categoryOps).toHaveLength(0)
+ expect(result.settingsOps).toHaveLength(0)
+ expect(result.unknownOps).toHaveLength(1)
+ expect(result.unknownOps[0]).toBe(unknown)
+ })
})
// --- splitCategoryOps ---
diff --git a/app/components/offline/replayHelpers.ts b/app/components/offline/replayHelpers.ts
index 34b8503a..54b3955a 100644
--- a/app/components/offline/replayHelpers.ts
+++ b/app/components/offline/replayHelpers.ts
@@ -71,6 +71,7 @@ type GroupedOps = {
categoryOps: OfflineOp[]
settingsOps: OfflineOp[]
trnOps: OfflineOp[]
+ unknownOps: OfflineOp[]
walletOps: OfflineOp[]
}
@@ -79,6 +80,7 @@ export function groupOpsByEntity(ops: OfflineOp[]): GroupedOps {
const categoryOps: OfflineOp[] = []
const trnOps: OfflineOp[] = []
const settingsOps: OfflineOp[] = []
+ const unknownOps: OfflineOp[] = []
for (const op of ops) {
switch (op.entity) {
@@ -94,10 +96,12 @@ export function groupOpsByEntity(ops: OfflineOp[]): GroupedOps {
case OfflineEntityType.UserSettings:
settingsOps.push(op)
break
+ default:
+ unknownOps.push(op)
}
}
- return { categoryOps, settingsOps, trnOps, walletOps }
+ return { categoryOps, settingsOps, trnOps, unknownOps, walletOps }
}
/**
diff --git a/app/components/user/useUserStore.ts b/app/components/user/useUserStore.ts
index 517bda79..e0a56482 100644
--- a/app/components/user/useUserStore.ts
+++ b/app/components/user/useUserStore.ts
@@ -12,7 +12,7 @@ import { useTrnsFormStore } from '~/components/trnForm/useTrnsFormStore'
import { useTrnsStore } from '~/components/trns/useTrnsStore'
import { userSettingsSchema } from '~/components/user/types'
import { useWalletsStore } from '~/components/wallets/useWalletsStore'
-import { clearAuthCookie, setSessionInitialized } from '~/composables/useAuthCookie'
+import { clearAuthCookie, hasAuthCookie, setSessionInitialized } from '~/composables/useAuthCookie'
import { blockPersist, handleMutationResult, isPersistBlocked } from '~/composables/useStoreSync'
import { createLogger } from '~/utils/logger'
@@ -37,8 +37,6 @@ export const useUserStore = defineStore('user', () => {
const baseCurrency = ref<CurrencyCode>('USD')
const locale = ref<LocaleSlug>('en')
- const isOnline = useOnline()
-
const currentUser = computed<User | null>(() => {
const s = session.value
const sessionUser = s?.data?.user
@@ -50,10 +48,7 @@ export const useUserStore = defineStore('user', () => {
uid: sessionUser.id,
}
}
- if (s?.isPending)
- return user.value
-
- if (!isOnline.value && user.value)
+ if (user.value && !isDemo.value && hasAuthCookie())
return user.value
return null
})
@@ -61,22 +56,43 @@ export const useUserStore = defineStore('user', () => {
const uid = computed<string | null>(() => currentUser.value?.uid || null)
function setUser(values: User | null) {
- if (!values) {
- user.value = null
- }
- else {
- user.value = {
- displayName: values.displayName,
- email: values.email,
- photoURL: values.photoURL,
- uid: values.uid,
- }
- }
+ user.value = values
+ ? {
+ displayName: values.displayName,
+ email: values.email,
+ photoURL: values.photoURL,
+ uid: values.uid,
+ }
+ : null
if (!isPersistBlocked())
- localforage.setItem(STORAGE_KEYS.user, user.value)
+ localforage.setItem(STORAGE_KEYS.user, user.value ? { ...user.value } : null)
}
+ // Persist session user to cache on resolution so next reload has `user` synchronously.
+ // Skipped in demo mode to avoid leaking real-auth session into demo's cleared cache.
+ watch(
+ () => session.value?.data?.user,
+ (sessionUser) => {
+ if (!sessionUser || isSigningOut.value || isDemo.value)
+ return
+ const next: User = {
+ displayName: sessionUser.name,
+ email: sessionUser.email,
+ photoURL: sessionUser.image,
+ uid: sessionUser.id,
+ }
+ if (user.value?.uid === next.uid
+ && user.value?.email === next.email
+ && user.value?.displayName === next.displayName
+ && user.value?.photoURL === next.photoURL) {
+ return
+ }
+ setUser(next)
+ },
+ { immediate: true },
+ )
+
function persistUserSettings() {
if (isPersistBlocked())
return
@@ -183,6 +199,7 @@ export const useUserStore = defineStore('user', () => {
isDemo.value = undefined
clearAuthCookie()
setSessionInitialized(false)
+ useCookie<boolean>('finapp.isOnboarded').value = false
window.location.href = '/login'
return
}
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 773c1ae3..36060aa6 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -156,6 +156,15 @@ export default defineNuxtConfig({
},
urlPattern: /^https:\/\/fonts\.(googleapis|gstatic)\.com\/.*/,
},
+ {
+ handler: 'CacheFirst',
+ options: {
+ cacheableResponse: { statuses: [0, 200] },
+ cacheName: 'user-avatars',
+ expiration: { maxAgeSeconds: 60 * 60 * 24 * 30, maxEntries: 20 },
+ },
+ urlPattern: /^https:\/\/lh3\.googleusercontent\.com\/.*/,
+ },
],
},
},
diff --git a/package.json b/package.json
index 396f7450..25bbb2e1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "@ilkome/finapp",
"type": "module",
- "version": "7.6.2",
+ "version": "7.7.0",
"packageManager": "[email protected]",
"description": "Finapp helps you easily track and manage personal finances.",
"author": "Ilya Komichev @ilkome",