Fix REST endpoints

Author: Brayden

src/index.ts

@@ -28,6 +28,7 @@ export interface Env {
     // MongoDB specific
     EXTERNAL_DB_MONGODB_URI?: string;
     EXTERNAL_DB_TURSO_URI?: string;
+    EXTERNAL_DB_TURSO_TOKEN?: string;
     EXTERNAL_DB_STARBASEDB_URI?: string;
     EXTERNAL_DB_STARBASEDB_TOKEN?: string;
     EXTERNAL_DB_CLOUDFLARE_API_KEY?: string;

src/literest/index.ts

@@ -54,8 +54,19 @@ export class LiteREST {
             }
         }
 
+        const isSQLite = this.dataSource.source === Source.internal || this.env.EXTERNAL_DB_TYPE?.toLowerCase() === 'sqlite'
         const schemaInfo = (await executeQuery(query, this.dataSource.source === Source.external ? {} : [], false, this.dataSource, this.env)) as any[];
-        const pkColumns = schemaInfo.map(col => col.name as string);
+        
+        let pkColumns = []
+
+        if (isSQLite) {
+            pkColumns = schemaInfo
+                .filter(col => typeof col.pk === 'number' && col.pk > 0 && col.name !== null)
+                .map(col => col.name as string);
+        } else {
+            pkColumns = schemaInfo.map(col => col.name as string);
+        }
+
         return pkColumns;
     }
 
@@ -175,8 +186,8 @@ export class LiteREST {
         }
 
         const tableName = this.sanitizeIdentifier(pathParts.length === 1 ? pathParts[0] : pathParts[1]);
-        const schemaName = pathParts.length === 1 ? undefined : this.sanitizeIdentifier(pathParts[0])
-        const id = pathParts.length === 1 ? pathParts[1] : pathParts[2];
+        const schemaName = this.sanitizeIdentifier(pathParts[0]) //pathParts.length === 1 ? undefined : this.sanitizeIdentifier(pathParts[0])
+        const id = pathParts.length === 3 ? pathParts[2] : undefined; // pathParts.length === 3 ? pathParts[1] : pathParts[2];
         const body = ['POST', 'PUT', 'PATCH'].includes(liteRequest.method) ? await liteRequest.json() : undefined;
 
         return {
@@ -397,7 +408,9 @@ export class LiteREST {
     private async handleDelete(tableName: string, schemaName: string | undefined, id: string | undefined): Promise<Response> {
         const pkColumns = await this.getPrimaryKeyColumns(tableName, schemaName);
 
-        const { conditions: pkConditions, params: pkParams, error } = this.getPrimaryKeyConditions(pkColumns, id, {}, new URLSearchParams());
+        let data: any = {}
+        data[pkColumns[0]] = id
+        const { conditions: pkConditions, params: pkParams, error } = this.getPrimaryKeyConditions(pkColumns, id, data, new URLSearchParams());
 
         if (error) {
             console.error('DELETE Operation Error:', error);

src/operation.ts

@@ -1,7 +1,7 @@
 // Import the native Node libraries for connecting to various databases
 import { Client as PgClient } from 'pg';
 import { createConnection as createMySqlConnection } from 'mysql2';
-import { createClient as createTursoConnection } from '@libsql/client';
+import { createClient as createTursoConnection } from '@libsql/client/web';
 
 // Import how we interact with the databases through the Outerbase SDK
 import { CloudflareD1Connection, MongoDBConnection, MySQLConnection, PostgreSQLConnection, StarbaseConnection, TursoConnection } from '@outerbase/sdk';
@@ -52,6 +52,11 @@ async function executeExternalQuery(sql: string, params: any, isRaw: boolean, da
         throw new Error('External connection not found.');
     }
 
+    // If not an Outerbase API request, forward to external database.
+    if (!env?.OUTERBASE_API_KEY) {
+        return await executeSDKQuery(sql, params, isRaw, dataSource, env);
+    }
+
     // Convert params from array to object if needed
     let convertedParams = params;
     if (Array.isArray(params)) {
@@ -91,13 +96,7 @@ export async function executeQuery(sql: string, params: any | undefined, isRaw:
         const response = await dataSource.internalConnection?.durableObject.executeQuery(sql, params, isRaw);
         return await afterQuery(sql, response, isRaw, dataSource, env);
     } else {
-        // If an Outerbase API key is present, external requests route through the Outerbase API
-        if (env?.OUTERBASE_API_KEY) {
-            return executeExternalQuery(sql, params, isRaw, dataSource, env);
-        }
-
-        // Fallback to determining which SDK library to use to query the database via native drivers.
-        return executeSDKQuery(sql, params, isRaw, dataSource, env);
+        return executeExternalQuery(sql, params, isRaw, dataSource, env);
     }
 }
 
@@ -180,9 +179,10 @@ async function createSDKMongoConnection(env: Env): Promise<ConnectionDetails> {
 }
 
 async function createSDKTursoConnection(env: Env): Promise<ConnectionDetails> {
-    const client = new TursoConnection(
-        createTursoConnection({ url: env.EXTERNAL_DB_TURSO_URI || '' })
-    );
+    const client = new TursoConnection(createTursoConnection({ 
+        url: env.EXTERNAL_DB_TURSO_URI || '',
+        authToken: env.EXTERNAL_DB_TURSO_TOKEN || ''
+    }));
 
     return {
         database: client,
@@ -229,7 +229,7 @@ export async function executeSDKQuery(sql: string, params: any | undefined, isRa
     } else if (env?.EXTERNAL_DB_TYPE === 'mysql' && env) {
         const { database } = await createSDKMySQLConnection(env)
         db = database
-    } else if (env?.EXTERNAL_DB_TYPE === 'turso' && env) {
+    } else if (env?.EXTERNAL_DB_TYPE === 'sqlite' && env?.EXTERNAL_DB_TURSO_URI && env) {
         const { database } = await createSDKTursoConnection(env)
         db = database
     } else if (env?.EXTERNAL_DB_TYPE === 'mongo' && env) {

worker-configuration.d.ts

@@ -3,22 +3,5 @@
 interface Env {
 	AUTHORIZATION_TOKEN: "ABC123";
 	REGION: "auto";
-	STUDIO_USER: "admin";
-	STUDIO_PASS: "123456";
-	EXTERNAL_DB_TYPE: "postgres";
-	EXTERNAL_DB_HOST: "";
-	EXTERNAL_DB_PORT: 0;
-	EXTERNAL_DB_USER: "";
-	EXTERNAL_DB_PASS: "";
-	EXTERNAL_DB_DATABASE: "";
-	EXTERNAL_DB_DEFAULT_SCHEMA: "public";
-	EXTERNAL_DB_MONGODB_URI: "";
-	EXTERNAL_DB_TURSO_URI: "";
-	EXTERNAL_DB_STARBASEDB_URI: "";
-	EXTERNAL_DB_STARBASEDB_TOKEN: "";
-	EXTERNAL_DB_CLOUDFLARE_API_KEY: "";
-	EXTERNAL_DB_CLOUDFLARE_ACCOUNT_ID: "";
-	EXTERNAL_DB_CLOUDFLARE_DATABASE_ID: "";
 	DATABASE_DURABLE_OBJECT: DurableObjectNamespace<import("./src/index").DatabaseDurableObject>;
-	DATA_MASKING: Fetcher;
 }

wrangler.toml

@@ -33,24 +33,25 @@ REGION = "auto"
 
 # Uncomment the section below to create a user for logging into your database UI.
 # You can access the Studio UI at: https://your_endpoint/studio
-STUDIO_USER = "admin"
-STUDIO_PASS = "123456"
+# STUDIO_USER = "admin"
+# STUDIO_PASS = "123456"
 
 # External database source details
 # This enables Starbase to connect to an external data source
 # OUTERBASE_API_KEY = ""
-EXTERNAL_DB_TYPE = "postgres"
-EXTERNAL_DB_HOST = ""
-EXTERNAL_DB_PORT = 0
-EXTERNAL_DB_USER = ""
-EXTERNAL_DB_PASS = ""
-EXTERNAL_DB_DATABASE = ""
-EXTERNAL_DB_DEFAULT_SCHEMA = "public"
-
-EXTERNAL_DB_MONGODB_URI = ""
-EXTERNAL_DB_TURSO_URI = ""
-EXTERNAL_DB_STARBASEDB_URI = ""
-EXTERNAL_DB_STARBASEDB_TOKEN = ""
-EXTERNAL_DB_CLOUDFLARE_API_KEY = ""
-EXTERNAL_DB_CLOUDFLARE_ACCOUNT_ID = ""
-EXTERNAL_DB_CLOUDFLARE_DATABASE_ID = ""
+# EXTERNAL_DB_TYPE = "sqlite"
+# EXTERNAL_DB_HOST = ""
+# EXTERNAL_DB_PORT = 0
+# EXTERNAL_DB_USER = ""
+# EXTERNAL_DB_PASS = ""
+# EXTERNAL_DB_DATABASE = ""
+# EXTERNAL_DB_DEFAULT_SCHEMA = "public"
+
+# EXTERNAL_DB_MONGODB_URI = ""
+# EXTERNAL_DB_TURSO_URI = ""
+# EXTERNAL_DB_TURSO_TOKEN = ""
+# EXTERNAL_DB_STARBASEDB_URI = ""
+# EXTERNAL_DB_STARBASEDB_TOKEN = ""
+# EXTERNAL_DB_CLOUDFLARE_API_KEY = ""
+# EXTERNAL_DB_CLOUDFLARE_ACCOUNT_ID = ""
+# EXTERNAL_DB_CLOUDFLARE_DATABASE_ID = ""