Skip to content

refactor: dedupe busy/locked error detection into isBusyOrLockedError #1860

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.

Sign up for GitHub

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
carlos-alm wants to merge 1 commit into from
Closed

refactor: dedupe busy/locked error detection into isBusyOrLockedError #1860

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/db/connection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,16 @@ function openRepoNative(customDbPath?: string): { repo: Repository; close(): voi
}
}

/**
* True when an error message indicates the SQLite database is busy or locked
* (SQLITE_BUSY/SQLITE_LOCKED). Shared by openRepo()'s and
* openReadonlyWithNative()'s native-path catch blocks so the two call sites
* can't drift.
*/
function isBusyOrLockedError(msg: string): boolean {
return /\b(busy|locked|SQLITE_BUSY|SQLITE_LOCKED)\b/i.test(msg);
}

/** Validate and wrap an injected `opts.repo` Repository instance (no DB opened). */
function wrapInjectedRepo(repo: Repository): { repo: Repository; close(): void } {
if (!(repo instanceof Repository)) {
Expand Down Expand Up @@ -468,7 +478,7 @@ function tryOpenRepoNative(
// Re-throw locking/busy errors — falling back to better-sqlite3 would
// hit the same contention (and potentially hang without busy_timeout).
const msg = toErrorMessage(e);
if (/\b(busy|locked|SQLITE_BUSY|SQLITE_LOCKED)\b/i.test(msg)) {
if (isBusyOrLockedError(msg)) {
throw new DbError(`Database is busy (another process may be writing): ${msg}`, {});
}
debug(`openRepo: native path failed, falling back to better-sqlite3: ${msg}`);
Expand Down Expand Up @@ -553,7 +563,7 @@ export function openReadonlyWithNative(
nativeDb = native.NativeDatabase.openReadonly(dbPath);
} catch (e) {
const msg = toErrorMessage(e);
if (/\b(busy|locked|SQLITE_BUSY|SQLITE_LOCKED)\b/i.test(msg)) {
if (isBusyOrLockedError(msg)) {
debug(`openReadonlyWithNative: native path busy, skipping native DB: ${msg}`);
} else {
debug(`openReadonlyWithNative: native path failed: ${msg}`);
Expand Down
Loading