Cleanup code

Author: Brayden

src/export/index.ts

@@ -1,5 +1,3 @@
-// import { enqueueOperation, processNextOperation } from '../operation';
-
 import { DataSource } from "..";
 import { executeTransaction } from "../operation";
 

src/index.ts

@@ -17,11 +17,7 @@ export interface Env {
 
     // External database source details
     EXTERNAL_DB_TYPE?: string;
-    EXTERNAL_DB_HOST?: string;
-    EXTERNAL_DB_NAME?: string;
-    EXTERNAL_DB_USER?: string;
-    EXTERNAL_DB_PASS?: string;
-    EXTERNAL_DB_PORT?: string;
+    OUTERBASE_API_KEY?: string;
 
     // ## DO NOT REMOVE: TEMPLATE INTERFACE ##
 }
@@ -50,6 +46,19 @@ type DatabaseStub = DurableObjectStub & {
     executeTransaction(queries: { sql: string; params?: any[] }[], isRaw: boolean): any[];
 };
 
+enum RegionLocationHint {
+    AUTO = 'auto',
+    WNAM = 'wnam', // Western North America
+    ENAM = 'enam', // Eastern North America
+    SAM = 'sam', // South America
+    WEUR = 'weur', // Western Europe
+    EEUR = 'eeur', // Eastern Europe
+    APAC = 'apac', // Asia Pacific
+    OC = 'oc', // Oceania
+    AFR = 'afr', // Africa
+    ME = 'me', // Middle East
+}
+
 export default {
 	/**
 	 * This is the standard fetch handler for a Cloudflare Worker
@@ -113,8 +122,7 @@ export default {
                 durableObject: stub as unknown as DatabaseStub,
             },
             externalConnection: {
-                // TODO: Should the API key instead live in the `wrangler.toml` file instead of request headers?
-                outerbaseApiKey: request.headers.get('X-Outerbase-Source-Token') ?? url.searchParams.get('outerbaseApiKey') ?? '',
+                outerbaseApiKey: env.OUTERBASE_API_KEY ?? ''
             },
         };
 

src/literest/index.ts

@@ -179,8 +179,6 @@ export class LiteREST {
     }
 
     private async buildSelectQuery(tableName: string, id: string | undefined, searchParams: URLSearchParams): Promise<{ query: string, params: any[] }> {
-        console.log('Building SELECT Query');
-
         let query = `SELECT * FROM ${tableName}`;
         const params: any[] = [];
         const conditions: string[] = [];

src/operation.ts

@@ -55,7 +55,7 @@ export async function executeQuery(sql: string, params: any | undefined, isRaw:
 
         let results: any = await response.json();
         let items = results.response.results?.items;
-        return this.afterQuery(sql, items, isRaw, dataSource);
+        return afterQuery(sql, items, isRaw, dataSource);
     } 
 }
 
@@ -92,7 +92,7 @@ export async function executeTransaction(queries: { sql: string; params?: any[]
 
             const result: any = await response.json();
             const items = result.response.results?.items;
-            results.push(this.afterQuery(query.sql, items, isRaw, dataSource));
+            results.push(afterQuery(query.sql, items, isRaw, dataSource));
         }
 
         return results;

worker-configuration.d.ts

@@ -2,11 +2,8 @@
 
 interface Env {
 	AUTHORIZATION_TOKEN: "ABC123";
+	REGION: "auto";
 	EXTERNAL_DB_TYPE: "postgres";
-	EXTERNAL_DB_HOST: "";
-	EXTERNAL_DB_NAME: "";
-	EXTERNAL_DB_USER: "";
-	EXTERNAL_DB_PASS: "";
-	EXTERNAL_DB_PORT: "0";
+	OUTERBASE_API_KEY: "";
 	DATABASE_DURABLE_OBJECT: DurableObjectNamespace<import("./src/index").DatabaseDurableObject>;
 }

wrangler.toml

@@ -38,8 +38,4 @@ REGION = "auto"
 # External database source details
 # This enables Starbase to connect to an external data source
 EXTERNAL_DB_TYPE = "postgres"
-EXTERNAL_DB_HOST = ""
-EXTERNAL_DB_NAME = ""
-EXTERNAL_DB_USER = ""
-EXTERNAL_DB_PASS = ""
-EXTERNAL_DB_PORT = "0"
+OUTERBASE_API_KEY = ""