refactor: simplify turso edge connection

outerbase · Mar 21, 2024 · 794c886 · 794c886
1 parent 42f4cb9
commit 794c886
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 30 deletions.
diff --git a/src/app/api/ops/[database_id]/batch/route.ts b/src/app/api/ops/[database_id]/batch/route.ts
@@ -1,8 +1,6 @@
-import { env } from "@/env";
-import { decrypt } from "@/lib/encryption-edge";
 import withDatabaseOperation from "@/lib/with-database-ops";
-import { createClient } from "@libsql/client/web";
 import { NextResponse } from "next/server";
+import createTursoEdgeClient from "../turso-edge-client";
 
 export const runtime = "edge";
 
@@ -21,13 +19,7 @@ export const POST = withDatabaseOperation<{
     );
   }
 
-  const url = database.host ?? "";
-  const token = await decrypt(env.ENCRYPTION_KEY, database.token ?? "");
-
-  const client = createClient({
-    url,
-    authToken: token,
-  });
+  const client = await createTursoEdgeClient(database);
 
   try {
     return NextResponse.json({ data: await client.batch(body.batch) });

diff --git a/src/app/api/ops/[database_id]/query/route.ts b/src/app/api/ops/[database_id]/query/route.ts
@@ -1,8 +1,6 @@
-import { env } from "@/env";
-import { decrypt } from "@/lib/encryption-edge";
 import withDatabaseOperation from "@/lib/with-database-ops";
-import { createClient } from "@libsql/client/web";
 import { NextResponse } from "next/server";
+import createTursoEdgeClient from "../turso-edge-client";
 
 export const runtime = "edge";
 
@@ -19,13 +17,7 @@ export const POST = withDatabaseOperation<{
     );
   }
 
-  const url = database.host ?? "";
-  const token = await decrypt(env.ENCRYPTION_KEY, database.token ?? "");
-
-  const client = createClient({
-    url,
-    authToken: token,
-  });
+  const client = await createTursoEdgeClient(database);
 
   try {
     return NextResponse.json({

diff --git a/src/app/api/ops/[database_id]/schema/route.ts b/src/app/api/ops/[database_id]/schema/route.ts
@@ -1,22 +1,14 @@
-import { env } from "@/env";
-import { decrypt } from "@/lib/encryption-edge";
 import withDatabaseOperation from "@/lib/with-database-ops";
-import { createClient } from "@libsql/client/web";
 import { NextResponse } from "next/server";
+import createTursoEdgeClient from "../turso-edge-client";
 
 export const runtime = "edge";
 
 export const GET = withDatabaseOperation(async function ({
   permission,
   database,
 }) {
-  const url = database.host ?? "";
-  const token = await decrypt(env.ENCRYPTION_KEY, database.token ?? "");
-
-  const client = createClient({
-    url,
-    authToken: token,
-  });
+  const client = await createTursoEdgeClient(database);
 
   try {
     const result = await client.execute("SELECT * FROM sqlite_schema;");

diff --git a/src/app/api/ops/[database_id]/turso-edge-client.ts b/src/app/api/ops/[database_id]/turso-edge-client.ts
@@ -0,0 +1,16 @@
+import { database } from "@/db/schema";
+import { env } from "@/env";
+import { decrypt } from "@/lib/encryption-edge";
+import { createClient } from "@libsql/client/web";
+
+export default async function createTursoEdgeClient(
+  db: typeof database.$inferSelect
+) {
+  const url = db.host ?? "";
+  const token = await decrypt(env.ENCRYPTION_KEY, db.token ?? "");
+
+  return createClient({
+    url,
+    authToken: token,
+  });
+}