Skip to content

Fix(db): update db-client connection options parsing #13772

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

Merged
merged 4 commits into from
May 10, 2025
Merged

Fix(db): update db-client connection options parsing #13772

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4942904
update AstroDB client
Adammatthiesen May 9, 2025
76ddcc3
Update packages/db/src/runtime/db-client.ts
Adammatthiesen May 9, 2025
5f61325
add test
Adammatthiesen May 10, 2025
637d863
fix function to ensure only values that are passed are actually being…
Adammatthiesen May 10, 2025
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
5 changes: 5 additions & 0 deletions .changeset/calm-drinks-beg.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/db': patch
---

Fix options parsing for the libsql client connection to ensure that proper values are being set when adding URLSearchParams to the `ASTRO_DB_REMOTE_URL`
25 changes: 19 additions & 6 deletions packages/db/src/runtime/db-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export function createRemoteDatabaseClient(options: RemoteDbClientOptions) {
}

function createRemoteLibSQLClient(appToken: string, remoteDbURL: URL, rawUrl: string) {
const options: Partial<LibSQLConfig> = Object.fromEntries(remoteDbURL.searchParams.entries());
const options: Record<string, string> = Object.fromEntries(remoteDbURL.searchParams.entries());
remoteDbURL.search = '';

let url = remoteDbURL.toString();
Expand All @@ -81,11 +81,24 @@ function createRemoteLibSQLClient(appToken: string, remoteDbURL: URL, rawUrl: st
url = 'file:' + remoteDbURL.pathname.substring(1);
}

const client = createClient({
...options,
authToken: appToken,
url,
});
// this function parses the options from a `Record<string, string>`
// provided from the object conversion of the searchParams and properly
// verifies that the Config object is providing the correct types.
// without this, there is runtime errors due to incorrect values
function parseOpts(config: Record<string, string>): LibSQLConfig {
return {
... config,
syncInterval: config.syncInterval ? parseInt(options.syncInterval) : undefined,
readYourWrites: config.readYourWrites ? !!config.readYourWrites : undefined,
offline: config.offline ? !!config.offline : undefined,
tls: config.tls ? !!config.tls : undefined,
concurrency: config.concurrency ? parseInt(options.concurrency) : undefined,
authToken: appToken,
url,
}
}

const client = createClient(parseOpts(options));
return drizzleLibsql(client);
}

Expand Down
Loading