Add support for endpoint/token constructor

Author: alexleventer

src/collections/client.ts

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Db } from "./db";
-import { createAstraUri, createNamespace, parseUri } from "./utils";
+import {createAstraUri, createNamespace, getKeyspaceName, parseUri} from "./utils";
 import { HTTPClient } from "@/src/client";
 import { logger } from "@/src/logger";
 import { Collection } from "./collection";
@@ -155,9 +155,16 @@ export class Client {
 }
 
 export class AstraDB extends Client {
-  constructor(token: string, dbId: string, region: string, keyspace?: string) {
-    const keyspaceName = keyspace || "default_keyspace";
-    const endpoint = createAstraUri(dbId, region, keyspaceName);
-    super(endpoint, keyspaceName, { isAstra: true, applicationToken: token });
+  constructor(...args: any[]) {
+    // token: string, path: string
+    if (args.length === 2) {
+      const keyspaceName = getKeyspaceName(args[1]);
+      super(args[1], keyspaceName, { isAstra: true, applicationToken: args[0] });
+    } else {
+      // token: string, dbId: string, region: string, keyspace?: string
+      const keyspaceName = args[3] || "default_keyspace";
+      const endpoint = createAstraUri(args[1], args[2], keyspaceName);
+      super(endpoint, keyspaceName, { isAstra: true, applicationToken: args[0] });
+    }
   }
 }

src/collections/utils.ts

@@ -13,9 +13,9 @@
 // limitations under the License.
 
 import url from "url";
-import { logger } from "@/src/logger";
+import {logger} from "@/src/logger";
 import axios from "axios";
-import { HTTPClient, handleIfErrorResponse } from "@/src/client/httpClient";
+import {handleIfErrorResponse, HTTPClient} from "@/src/client/httpClient";
 
 interface ParsedUri {
   baseUrl: string;
@@ -66,6 +66,15 @@ function getBaseAPIPath(pathFromUrl?: string | null) {
     : baseApiPath.substring(1, baseApiPath.length - 1);
 }
 
+// Get the keyspace name from the path
+export function getKeyspaceName(pathFromUrl?: string | null) {
+  if (!pathFromUrl) {
+    return "";
+  }
+  const pathElements = pathFromUrl.split("/");
+  return pathElements[pathElements.length - 1];
+}
+
 /**
  * Create an Astra connection URI while connecting to Astra JSON API
  * @param databaseId the database id of the Astra database
@@ -269,3 +278,4 @@ function _updateHasKey(update: Record<string, any>, key: string) {
   }
   return false;
 }
+