From 2f853017ee15b29f73858c30eb382233a86f4f65 Mon Sep 17 00:00:00 2001
From: Steve Korshakov <steve@korshakov.com>
Date: Thu, 24 Jul 2025 22:21:18 -0700
Subject: [PATCH] fix: fix deadlock

---
 sources/app/api.ts | 46 +++++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/sources/app/api.ts b/sources/app/api.ts
index 43766b9..33a0fda 100644
--- a/sources/app/api.ts
+++ b/sources/app/api.ts
@@ -918,6 +918,15 @@ export async function startApi(): Promise<{ app: FastifyInstance; io: Server }>
             // Start transaction to ensure consistency
             const result = await db.$transaction(async (tx) => {
 
+                // Get user for update (lock account first to prevent deadlocks)
+                const user = await tx.account.findUnique({
+                    where: { id: userId }
+                });
+
+                if (!user) {
+                    throw new Error('User not found');
+                }
+
                 // Verify session belongs to user and lock it
                 const session = await tx.session.findFirst({
                     where: {
@@ -930,15 +939,6 @@ export async function startApi(): Promise<{ app: FastifyInstance; io: Server }>
                     throw new Error('Session not found');
                 }
 
-                // Get user for update
-                const user = await tx.account.findUnique({
-                    where: { id: userId }
-                });
-
-                if (!user) {
-                    throw new Error('User not found');
-                }
-
                 // Get next sequence numbers
                 const msgSeq = session.seq + 1;
                 const updSeq = user.seq + 1;
@@ -1038,6 +1038,15 @@ export async function startApi(): Promise<{ app: FastifyInstance; io: Server }>
 
             // Start transaction to ensure consistency
             const result = await db.$transaction(async (tx) => {
+                // Get user for update (lock account first to prevent deadlocks)
+                const user = await tx.account.findUnique({
+                    where: { id: userId }
+                });
+                if (!user) {
+                    callback({ result: 'error' });
+                    return null;
+                }
+                
                 // Verify session belongs to user and lock it
                 const session = await tx.session.findFirst({
                     where: {
@@ -1045,10 +1054,7 @@ export async function startApi(): Promise<{ app: FastifyInstance; io: Server }>
                         accountId: userId
                     }
                 });
-                const user = await tx.account.findUnique({
-                    where: { id: userId }
-                });
-                if (!user || !session) {
+                if (!session) {
                     callback({ result: 'error' });
                     return null;
                 }
@@ -1128,6 +1134,15 @@ export async function startApi(): Promise<{ app: FastifyInstance; io: Server }>
 
             // Start transaction to ensure consistency
             const result = await db.$transaction(async (tx) => {
+                // Get user for update (lock account first to prevent deadlocks)
+                const user = await tx.account.findUnique({
+                    where: { id: userId }
+                });
+                if (!user) {
+                    callback({ result: 'error' });
+                    return null;
+                }
+                
                 // Verify session belongs to user and lock it
                 const session = await tx.session.findFirst({
                     where: {
@@ -1135,10 +1150,7 @@ export async function startApi(): Promise<{ app: FastifyInstance; io: Server }>
                         accountId: userId
                     }
                 });
-                const user = await tx.account.findUnique({
-                    where: { id: userId }
-                });
-                if (!user || !session) {
+                if (!session) {
                     callback({ result: 'error' });
                     return null;
                 }