Merge pull request #27 from BunnyWay/database-shell-custom-fetch-client

use custom database shell fetch client

Author: jamie-at-bunny

.changeset/cyan-cameras-beam.md

@@ -0,0 +1,6 @@
+---
+"@bunny.net/database-shell": patch
+"@bunny.net/cli": patch
+---
+
+use custom fetch client for database shell

packages/cli/src/commands/db/shell.ts

@@ -175,8 +175,7 @@ export const dbShellCommand = defineCommand<{
     verbose,
     apiKey,
   }) => {
-    const { createClient } = await import("@libsql/client/web");
-    const { startShell, executeQuery, executeFile } = await import("@bunny.net/database-shell");
+    const { createShellClient, startShell, executeQuery, executeFile } = await import("@bunny.net/database-shell");
 
     // If database-id doesn't look like a database ID, treat it as the query
     let databaseId = databaseIdArg;
@@ -204,7 +203,7 @@ export const dbShellCommand = defineCommand<{
       verbose,
     );
 
-    const client = createClient({ url, authToken: token });
+    const client = createShellClient({ url, authToken: token });
     const log = shellLogger();
 
     // Non-interactive: execute and exit

packages/database-shell/src/cli.ts

@@ -1,7 +1,6 @@
 #!/usr/bin/env bun
 
-import { createClient } from "@libsql/client/web";
-import { startShell, executeQuery, executeFile, PRINT_MODES } from "./index.ts";
+import { createShellClient, startShell, executeQuery, executeFile, PRINT_MODES } from "./index.ts";
 import type { PrintMode } from "./types.ts";
 
 function printUsage() {
@@ -74,10 +73,7 @@ async function main() {
     process.exit(help ? 0 : 1);
   }
 
-  const client = createClient({
-    url,
-    authToken: token,
-  });
+  const client = createShellClient({ url, authToken: token });
 
   const options = { mode, masked: !unmask, timing };
 

packages/database-shell/src/client.ts

@@ -0,0 +1,25 @@
+import { createClient, type Client } from "@libsql/client/web";
+import pkg from "../package.json";
+
+const USER_AGENT = `${pkg.name}/${pkg.version}`;
+
+/**
+ * Create a libSQL client with a custom `User-Agent` header
+ * so requests from the CLI/shell can be identified server-side.
+ */
+export function createShellClient(opts: {
+  url: string;
+  authToken?: string;
+}): Client {
+  return createClient({
+    ...opts,
+    fetch: (input: string | Request | URL, init?: RequestInit) => {
+      const headers = new Headers(init?.headers);
+      if (input instanceof Request) {
+        input.headers.forEach((v, k) => headers.set(k, v));
+      }
+      headers.set("User-Agent", USER_AGENT);
+      return fetch(input, { ...init, headers });
+    },
+  });
+}

packages/database-shell/src/index.ts

@@ -1,4 +1,5 @@
 // Public API
+export { createShellClient } from "./client.ts";
 export { startShell, executeQuery, executeFile } from "./shell.ts";
 
 // Types