ISSUE DESCRIPTION magic-link verify deadlocks: runWithTransaction nests…
- User
ISSUE DESCRIPTION
magic-link verify deadlocks: runWithTransaction nests adapter.transaction (1.6.11 consumeVerificationValue) instead of reusing the active transaction
Is this suited for github?
- Yes, this is suited for github
Reproduction
- better-auth 1.6.11 with the
magicLinkplugin. - A database adapter whose
transactionis a real interactive DB transaction that holds a dedicated connection for its duration (e.g. the Kysely adapter, or@zenstackhq/better-auth, backed bypg). - Limit the client connection pool to one connection:
new Pool({ max: 1 })-- standard when using Cloudflare Hyperdrive, which pools server-side so the worker keeps a tiny client pool. await auth.api.signInMagicLink({ body: { email } })-> works (single insert).await auth.api.magicLinkVerify({ query: { token } })(orGET /api/auth/magic-link/verify?token=...).
Minimal trigger: any setup where
adapter.transactionacquires a connection and the pool cannot hand out two connections at once.Current vs. Expected behavior
Current: the verify call hangs forever and never returns. Postgres shows the backend stuck
idle in transaction(wait_event = ClientRead) right after the verificationSELECT; the connection is never released, so every attempt leaks one idle-in-transaction connection.Trace of the cause:
internalAdapter.consumeVerificationValue(added in 1.6.11) runs insiderunWithTransaction-> opens transaction tx1 (BEGIN, takes the only pooled connection).- Consuming the row (
consumeOne) triggers anotherrunWithTransaction-> callsadapter.transactionagain -> transaction tx2, which tries to acquire a second connection. runWithTransactionin@better-auth/core(context/transaction.mjs) always opens a freshadapter.transaction; it does NOT checkadapterAsyncStorage.getStore()to see whether a transaction is already active in the current async context. So tx2 is nested inside tx1 and blocks forever waiting for the connection tx1 holds -> deadlock.
Note the CRUD path already reuses the active transaction:
getCurrentAdapter(adapter)returns thetrxadapter from the ALS store.runWithTransactionis inconsistent with this -- it doesn't reuse.Expected:
runWithTransactionshould be reentrant -- when an adapter/transaction is already active in the async-context store, runfnwithin it instead of opening a nestedadapter.transaction(mirroringgetCurrentAdapter). Then verify needs only one connection and works on any pool size. (Alternatively/additionally, document that adapters MUST support reentrant nested transactions -- currently adapters like@zenstackhq/better-authopen a brand-new transaction on the base client for eachadapter.transactioncall, which is a reasonable contract but incompatible with the current nesting.)This is security-relevant: the 1.6.11 change that introduced this nesting was the magic-link "mint multiple sessions from one token" race fix, so the fix effectively breaks magic-link verification on connection-limited adapters/pools.
What version of Better Auth are you using?
1.6.11
System info
> The `auth info` CLI can't introspect this project headlessly because the auth instance is built dynamically via a factory (no static `auth.ts` export), so the values below are assembled manually { "better-auth": { "version": "1.6.11", "@better-auth/core": "1.6.11" }, "adapter": { "name": "@zenstackhq/better-auth", "version": "3.6.4", "orm": "@zenstackhq/orm 3.6.4 (Kysely 0.28.17)" }, "database": { "driver": "pg 8.20.0", "pool": { "max": 1 }, "fronted_by": "Cloudflare Hyperdrive" }, "runtime": { "platform": "Cloudflare Workers (workerd)", "wrangler": "4.95.0", "node_for_tooling": "v22.22.1" }, "plugins": ["magicLink"], "os": "macOS (Darwin 25.5.0)" }Which area(s) are affected? (Select all that apply)
Backend
Auth config (if applicable)
import { betterAuth } from "better-auth" export const auth = betterAuth({ emailAndPassword: { enabled: true }, });Additional context
- Bisected away unrelated suspects: the hang reproduces on older framework code and is independent of DI scope changes -- it's purely
1.6.10 -> 1.6.11. - Reproduced deterministically in a real
workerdintegration test (request magic link -> capture token -> verify) that times out before the change. - Relevant code:
@better-auth/corecontext/transaction.mjsrunWithTransaction(opensadapter.transactionunconditionally) vsgetCurrentAdapter(reuses the activetrx);internalAdapter.consumeVerificationValue->consumeOneWithHooks-> adapterconsumeOne. - Worked around downstream by making the adapter's transaction reentrant (reuse the in-flight transaction via
AsyncLocalStorage), which is also the correct semantics (nested transaction = one atomic unit) -- but it seems likerunWithTransactionitself should reuse the active transaction.
Interface
No new interfaces are introduced.
ADDITIONAL ADVICE
Since you are given a git repository, you can use git commands to simplify your work. For example, if you made a mistake and want to revert your changes, you can use
git checkout <file>to restore the file to its original state. You can also reset all changes in the repository usinggit reset --hardcommand. Additionally, you can usegit stashandgit stash popto temporarily save your changes and restore them later. Finally, you can see the changes that you've made (which will be submitted when you callsubmit) usinggit statusorgit diffcommands. However you don't need to usegit addorgit commitbefore submitting your changes. In fact,submitonly submits currently unstaged changes because it usesgit diffto get the changes that need to be submitted.CHECKLIST
Before submitting your solution, please go over the following checklist and make sure you've done everything:
- If an error was reported in the issue description, I have successfully reproduced it.
- If an error was reported in the issue description, I have confirmed that my fix resolves the error.
- I have thought about edge cases and made sure my fix handles them as well.
- I have run existing tests in the repository that might have been affected by the change I made and confirmed that they pass. I want you to list every bullet from this checklist and write your reasoning for why you think you did it or didn't need to.
Repository has been uploaded and your shell is currently at the repository root. Time to solve the issue!
(Current directory: /better-auth, current file: none) bash-$
- Assistant
I'll start by exploring the repository structure and locating the
runWithTransactionimplementation that's causing the nested-transaction deadlock. - Assistant
Let me look at the transaction.ts file and related code.
- Assistant
I've confirmed
runWithTransactionalways opens a new transaction. Next I'll inspect call sites and related tests so the fix reuses an active ALS transaction. - Assistant
rg is not available, let me use grep.
- Assistant
Inspecting
consumeVerificationValueand magic-link nesting to pinpoint where the extra transaction is opened. - Assistant
Checking whether
consumeOne/consumeOneWithHooksalso opens transactions and reviewing the transaction test suite. - Assistant
There's already a nested-transaction test for
consumeOne; I'll inspect its expectations and the adapter transaction implementations next. - Assistant
Let me look at the factory fallback for consumeOne - it mentions nesting transactions:
- Assistant
Let me look more carefully at the factory transaction handling and how adapters that mark transaction:false work within a transaction. Also look at how kysely implements its transaction adapter.
- Assistant
I'll check for transaction-context tests and inspect
createAsIsTransactionso we can makerunWithTransactionreentrant correctly. - Assistant
Checking how
runWithAdapteris used and whether we can distinguish a real transaction from a plain adapter context. - Assistant
Important: requests already wrap handlers in
runWithAdapter, so I need a way to tell a real transaction context from a plain adapter context. - Assistant
I'll add an
inTransactionflag to the ALS store so nestedrunWithTransactioncan reuse the active transaction without treating plainrunWithAdapteras one. - Assistant
Implementing reentrant
runWithTransactionwith aninTransactionflag so plainrunWithAdaptercontexts still open real transactions. - Assistant
Checking how
queueAfterTransactionHookis used so I don't break deferred-hook behavior. - Assistant
I'll simplify: only make
runWithTransactionreentrant, and leavequeueAfterTransactionHook/runWithAdapterbehavior otherwise unchanged. - Assistant
Cleaning up corrupted characters in comments.
- Assistant
Checking whether the factory's
consumeOnefallback should also reusean active ALS transaction. - Assistant
Writing a temporary script to verify reentrancy, then reading the rest of the file for correctness.
- Assistant
Building core and running a temporary verification script.
- Assistant
Build timed out. Let me try a different approach - maybe run vitest with were ts directly, or лица a simpler transpile.
- Assistant
I'll run a temporary vitest against the source directly, since the full package build is slow.
- Assistant
Checking what went wrong with the test file and vitest run.
- Assistant
The create command failed somehow - only 1 line. Let me write the file properly.
- Assistant
Vitest keeps timing out—trying a simpler direct Node/tsx approach next.
- Assistant
Corepack is prompting for pnpm download and hanging the session — switching to local binaries instead.
- Assistant
Good. Let me run vitest with the full path.
- Assistant
I need to put the testinside the package so vitest can find it.
- Assistant
Need to check how other tests import things and if package exports are set up. Maybe need to build first briefly.
- Assistant
The package needs to be built first for the exports本来 to work. The dist folder is missing. Let me try building with a longer timeout or check vitest alias config.
- Assistant
Build completed. Now run tests from root with vitest config that has;of /dev-source.
- Assistant
All 4 tests passed. Removing the temporary test file next, since repository tests shouldn't be modified.
- Assistant
Simulating the single-connection pool deadlock pattern to confirm the fix.
- Assistant
Verifying the simulation deadlocks without the fix,tomeet the reproduction checklist.
- Assistant
No python3. Let me use node/sed.
- Assistant
Confirming the working tree is clean aside from the intended fix, then submitting.
Other models, same or similar prompt
Responses were produced in different, uncontrolled contexts (system prompts, settings, prior turns). This is not a benchmark.
Identical first prompt
claude-sonnet-5Compare side by side →
claude-sonnet-5Compare side by side →
claude-sonnet-5Compare side by side →
claude-sonnet-5Compare side by side →
claude-sonnet-5Compare side by side →
Qwen/Qwen3.6-35B-A3BCompare side by side →
Qwen/Qwen3.6-35B-A3BCompare side by side →
Qwen/Qwen3.6-35B-A3BCompare side by side →
Qwen/Qwen3.6-35B-A3BCompare side by side →
Qwen/Qwen3.6-35B-A3BCompare side by side →
Qwen/Qwen3.6-27BCompare side by side →
Qwen/Qwen3.6-27BCompare side by side →