refactor(web): decouple repositories and services from QueryClient by pmilic021 · Pull Request #1163 · MakePrisms/agicash

pmilic021 · 2026-06-26T18:17:27Z

Repositories and services no longer take a TanStack QueryClient; they run their underlying async actions directly and return Promises. This is a prerequisite for the stateless @agicash/wallet-sdk extraction, where the SDK holds no read cache and the web keeps TanStack Query.

The Breez wallet connection is the one piece that must still be held: connect() opens a stateful, resource-owning session (disconnect/free, event listeners, background loops, a storageDir DB), so there must be exactly one instance per wallet, not a fresh one per account load. It moves to a process-wide singleton (getSparkWallet, keyed by mnemonic/network/storageDir), cleared on signOut alongside queryClient.clear().

Everything else is a plain read fetched directly:

Mint metadata (info/keysets/keys): getInitializedCashuWallet and account-service call the mint over HTTP directly (idempotent, nothing to leak). The web's mint *QueryOptions are untouched and still cache those reads for the settings form / token decode.
Accounts / exchange rate: claim-cashu-token-service reads via accountRepository.getAllActive and ExchangeRateService directly.

claim-cashu-token-service no longer writes to the cache either: it returns the changed accounts + updated user, and the token route's clientLoader applies them.

Behavior note: the account-load path (getInitializedCashuWallet via toAccount) no longer shares the QueryClient mint cache, so it refetches mint metadata on each load; only the web's own mint reads stay cached. typecheck + biome clean; web/bolt11/ecies/cashu unit tests pass.

Repositories and services no longer take a TanStack QueryClient; they run their underlying async actions directly and return Promises. This is a prerequisite for the stateless @agicash/wallet-sdk extraction, where the SDK holds no read cache and the web keeps TanStack Query. The Breez wallet connection is the one piece that must still be held: connect() opens a stateful, resource-owning session (disconnect/free, event listeners, background loops, a storageDir DB), so there must be exactly one instance per wallet, not a fresh one per account load. It moves to a process-wide singleton (getSparkWallet, keyed by mnemonic/network/storageDir), cleared on signOut alongside queryClient.clear(). Everything else is a plain read fetched directly: - Mint metadata (info/keysets/keys): getInitializedCashuWallet and account-service call the mint over HTTP directly (idempotent, nothing to leak). The web's mint *QueryOptions are untouched and still cache those reads for the settings form / token decode. - Accounts / exchange rate: claim-cashu-token-service reads via accountRepository.getAllActive and ExchangeRateService directly. claim-cashu-token-service no longer writes to the cache either: it returns the changed accounts + updated user, and the token route's clientLoader applies them. Behavior note: the account-load path (getInitializedCashuWallet via toAccount) no longer shares the QueryClient mint cache, so it refetches mint metadata on each load; only the web's own mint reads stay cached. typecheck + biome clean; web/bolt11/ecies/cashu unit tests pass. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

vercel · 2026-06-26T18:17:33Z

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
agicash	Ready	Preview, Comment	Jun 26, 2026 6:17pm

supabase · 2026-06-26T18:17:36Z

This pull request has been ignored for the connected project hrebgkfhjpkbxpztqqke because there are no changes detected in supabase directory. You can change this behaviour in Project Integrations Settings ↗︎.

Preview Branches by Supabase.
Learn more about Supabase Branching ↗︎.

pmilic021 · 2026-06-26T18:21:25Z

-      const { keysets } = await this.queryClient.fetchQuery(
-        allMintKeysetsQueryOptions(account.mintUrl),
-      );
+      const { keysets } = await new Mint(account.mintUrl).getKeySets();


Mint details throughout this PR are left uncached, and if we see issues with it we can try optimize it then. Makes sense @jbojcic1 ?

pmilic021 · 2026-06-26T18:22:50Z

      queryClient.clear();
+      // The spark wallet connection memo is framework-free (not in the query
+      // cache), so clear it alongside so a next session reconnects fresh.
+      clearSparkWallets();


This call would be part of sdk-exposed clear method in the future (like .stop).

jbojcic1 · 2026-06-27T11:49:45Z

      destinationAccount: Pick<Account, 'id' | 'purpose'>;
+      /**
+       * Accounts created or updated while claiming, for the caller to write into
+       * its cache (the service no longer owns one).


nit but (the service no longer owns one) should be removed. comments shouldn't reflect old state of the code

jbojcic1 · 2026-06-27T11:57:57Z

+    const changedAccounts = new Map<string, Account>();
+    let updatedUser: User | null = null;
+
+    const accounts = await this.accountRepository.getAllActive(user.id);


i would rather pass accounts as a new param. that way web won't be making one new db call

jbojcic1 · 2026-06-27T11:58:14Z

-        accountRepository: this.accountRepository,
-      }),
-    );
+    const changedAccounts = new Map<string, Account>();


why is this a map and not a simple array?

jbojcic1 · 2026-06-27T12:03:14Z

    }

    if (
      receiveAccount.currency !== user.defaultCurrency ||


i wonder if we should take this out of this service now and do it before calling it in the loader? the whole purpose of this is that when user is receiving to the account that is not the default, we set this one to default for ui benefits (if user is joining for the first time and don't have a balance on regular default account it's better to make this one default). this is probably irrelevant for mcp

jbojcic1 · 2026-06-27T12:03:45Z

    } else {
-      const exchangeRate = await getExchangeRate(
-        this.queryClient,
+      const exchangeRate = await new ExchangeRateService().getRate(


so we have one additional network request here right? because it was reading from the cache before. i wonder if we should change the service to just take the rate as param or change ExchangeRateService to handle caching

jbojcic1 · 2026-06-27T12:04:50Z

          ]),
          new Promise<never>((_, reject) => {
            setTimeout(() => {
-              queryClient.cancelQueries({


no way to cancel those?

jbojcic1 · 2026-06-27T12:08:37Z

+}): Promise<BreezSdk> {
+  const key = `${computeSHA256(mnemonic)}:${network}:${storageDir}`;
+  const existing = sparkWalletPromises.get(key);
+  if (existing) return existing;


hm not sure if we should even do this. is calling connect/disconnect multiple times "expensive"? remind me when would we even call it multiple times?

jbojcic1 · 2026-06-27T12:08:54Z

+    { 'spark.network': network },
+  );
+  sparkWalletPromises.set(key, walletPromise);
+  void walletPromise.catch(() => {


why is this void needed?

jbojcic1 · 2026-06-27T12:09:45Z

+  );
+  sparkWalletPromises.set(key, walletPromise);
+  void walletPromise.catch(() => {
+    if (sparkWalletPromises.get(key) === walletPromise) {


is this if check needed? can't you just do sparkWalletPromises.delete(key);?

pmilic021 requested a review from jbojcic1 June 26, 2026 18:17

pmilic021 self-assigned this Jun 26, 2026

pmilic021 commented Jun 26, 2026

View reviewed changes

pmilic021 mentioned this pull request Jun 27, 2026

docs(wallet-sdk): step 3 plan — react-agnostic domain extraction #1162

Open

jbojcic1 reviewed Jun 27, 2026

View reviewed changes

Uh oh!

Conversation

pmilic021 commented Jun 26, 2026

Uh oh!

vercel Bot commented Jun 26, 2026

Uh oh!

supabase Bot commented Jun 26, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jbojcic1 Jun 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jbojcic1 Jun 27, 2026 •

edited

Loading