Walkthrough

Updated lock implementations in packages/core/auth-js/src/lib/locks.ts: switched Promise.resolve().then(...) to await-based flows, added try/catch to convert navigator.locks AbortError into NavigatorLockAcquireTimeoutError, and reworked process lock timeout/race handling. Tests for navigatorLock error cases were added.

Changes

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

• 📝 Generate docstrings

packages/core/auth-js/src/lib/locks.ts (2)

279-284: Misleading comment describes unreachable code path.

The comment "Fall through to run fn() - previous operation finished with error" is misleading because previousOperationHandled catches all its errors internally (lines 236-238), so it never rejects. The only error that can reach this catch block is ProcessLockAcquireTimeoutError from timeoutPromise, which always has isAcquireTimeout = true and will be re-thrown.

Consider removing the dead fall-through path or updating the comment to clarify this is defensive coding.

💡 Suggested simplification

     } catch (e: any) {
       // Clear the timeout on error path as well
       if (timeoutId !== null) {
         clearTimeout(timeoutId)
       }

-      // Re-throw timeout errors, ignore others
-      if (e && e.isAcquireTimeout) {
-        throw e
-      }
-      // Fall through to run fn() - previous operation finished with error
+      // Only timeoutPromise can reject here (previousOperationHandled catches its own errors),
+      // so this is always a timeout error
+      throw e
     }

---

107-114: Consider clearing the timeout when lock is acquired.

The setTimeout for acquireTimeout is never cleared when the lock is acquired successfully. While functionally harmless (calling abort() on a completed request is a no-op), it causes a misleading debug log message saying "timed out" even when the lock was acquired in time.

💡 Suggested fix to clear timeout

+  let acquireTimeoutId: ReturnType<typeof setTimeout> | null = null
+
   if (acquireTimeout > 0) {
-    setTimeout(() => {
+    acquireTimeoutId = setTimeout(() => {
       abortController.abort()
       if (internals.debug) {
         console.log('@supabase/gotrue-js: navigatorLock acquire timed out', name)
       }
     }, acquireTimeout)
   }

Then clear it when the lock is acquired (around line 140):

if (acquireTimeoutId !== null) {
  clearTimeout(acquireTimeoutId)
}