-
Notifications
You must be signed in to change notification settings - Fork 395
Backport: API credit top-up telemetry + topupTrackerStore (#6500) #6502
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
+206
−3
Closed
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| import { defineStore } from 'pinia' | ||
| import { ref, watch } from 'vue' | ||
|
|
||
| import { useTelemetry } from '@/platform/telemetry' | ||
| import type { AuditLog } from '@/services/customerEventsService' | ||
| import { | ||
| EventType, | ||
| useCustomerEventsService | ||
| } from '@/services/customerEventsService' | ||
| import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore' | ||
|
|
||
| type PendingTopupRecord = { | ||
| startedAtIso: string | ||
| amountUsd?: number | ||
| expectedCents?: number | ||
| } | ||
|
|
||
| const storageKeyForUser = (userId: string) => `topupTracker:pending:${userId}` | ||
|
|
||
| export const useTopupTrackerStore = defineStore('topupTracker', () => { | ||
| const telemetry = useTelemetry() | ||
| const authStore = useFirebaseAuthStore() | ||
| const pendingTopup = ref<PendingTopupRecord | null>(null) | ||
| const storageListenerInitialized = ref(false) | ||
|
|
||
| const loadFromStorage = () => { | ||
| const userId = authStore.userId | ||
| if (!userId) return | ||
| try { | ||
| const rawValue = localStorage.getItem(storageKeyForUser(userId)) | ||
| if (!rawValue) return | ||
| const parsedValue = JSON.parse(rawValue) as PendingTopupRecord | ||
| pendingTopup.value = parsedValue | ||
| } catch { | ||
| pendingTopup.value = null | ||
| } | ||
| } | ||
|
|
||
| const persistToStorage = () => { | ||
| const userId = authStore.userId | ||
| if (!userId) return | ||
| if (pendingTopup.value) { | ||
| localStorage.setItem( | ||
| storageKeyForUser(userId), | ||
| JSON.stringify(pendingTopup.value) | ||
| ) | ||
| } else { | ||
| localStorage.removeItem(storageKeyForUser(userId)) | ||
| } | ||
| } | ||
|
|
||
| const initializeStorageSynchronization = () => { | ||
| if (storageListenerInitialized.value) return | ||
| storageListenerInitialized.value = true | ||
| loadFromStorage() | ||
| window.addEventListener('storage', (e: StorageEvent) => { | ||
| const userId = authStore.userId | ||
| if (!userId) return | ||
| if (e.key === storageKeyForUser(userId)) { | ||
| loadFromStorage() | ||
| } | ||
| }) | ||
|
|
||
| watch( | ||
| () => authStore.userId, | ||
| (newUserId, oldUserId) => { | ||
| if (newUserId && newUserId !== oldUserId) { | ||
| loadFromStorage() | ||
| return | ||
| } | ||
| if (!newUserId && oldUserId) { | ||
| pendingTopup.value = null | ||
| } | ||
| } | ||
| ) | ||
| } | ||
|
|
||
| const startTopup = (amountUsd: number) => { | ||
| const userId = authStore.userId | ||
| if (!userId) return | ||
| const expectedCents = Math.round(amountUsd * 100) | ||
| pendingTopup.value = { | ||
| startedAtIso: new Date().toISOString(), | ||
| amountUsd, | ||
| expectedCents | ||
| } | ||
| persistToStorage() | ||
| } | ||
|
|
||
| const clearTopup = () => { | ||
| pendingTopup.value = null | ||
| persistToStorage() | ||
| } | ||
|
|
||
| const reconcileWithEvents = async ( | ||
| events: AuditLog[] | undefined | null | ||
| ): Promise<boolean> => { | ||
| if (!events || events.length === 0) return false | ||
| if (!pendingTopup.value) return false | ||
|
|
||
| const startedAt = new Date(pendingTopup.value.startedAtIso) | ||
| if (Number.isNaN(+startedAt)) { | ||
| clearTopup() | ||
| return false | ||
| } | ||
|
|
||
| const withinWindow = (createdAt: string) => { | ||
| const created = new Date(createdAt) | ||
| if (Number.isNaN(+created)) return false | ||
| const maxAgeMs = 1000 * 60 * 60 * 24 | ||
| return ( | ||
| created >= startedAt && | ||
| created.getTime() - startedAt.getTime() <= maxAgeMs | ||
| ) | ||
| } | ||
|
|
||
| let matched = events.filter((e) => { | ||
| if (e.event_type !== EventType.CREDIT_ADDED) return false | ||
| if (!e.createdAt || !withinWindow(e.createdAt)) return false | ||
| return true | ||
| }) | ||
|
|
||
| if (pendingTopup.value.expectedCents != null) { | ||
| matched = matched.filter((e) => | ||
| typeof e.params?.amount === 'number' | ||
| ? e.params.amount === pendingTopup.value?.expectedCents | ||
| : true | ||
| ) | ||
| } | ||
|
|
||
| if (matched.length === 0) return false | ||
|
|
||
| telemetry?.trackApiCreditTopupSucceeded() | ||
| await authStore.fetchBalance().catch(() => {}) | ||
| clearTopup() | ||
| return true | ||
| } | ||
|
|
||
| const reconcileByFetchingEvents = async (): Promise<boolean> => { | ||
| const service = useCustomerEventsService() | ||
| const response = await service.getMyEvents({ page: 1, limit: 10 }) | ||
| if (!response) return false | ||
| return await reconcileWithEvents(response.events) | ||
| } | ||
|
|
||
| initializeStorageSynchronization() | ||
|
|
||
| return { | ||
| pendingTopup, | ||
| startTopup, | ||
| clearTopup, | ||
| reconcileWithEvents, | ||
| reconcileByFetchingEvents | ||
| } | ||
| }) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new
reconcileByFetchingEventsaction instantiatesuseCustomerEventsService(), but that composable callsuseI18n()internally.useI18nrequires an active Vue component instance, which is not present whenreconcileByFetchingEventsruns (it is invoked fromauthActions.fetchBalance()and other event handlers after setup). This will throwgetCurrentInstance()/useI18nerrors as soon asfetchBalanceis called, breaking balance refresh and the top‑up reconciliation flow. Consider moving the service call into a component/composable scope or refactoring the service to avoiduseI18nwhen called from Pinia stores.Useful? React with 👍 / 👎.