feat: apply luke's suggestions

Co-Authored-By: Luke Oliff <luke@lukeoliff.com>

Author: naomi-lgbt

src/lib/fetch.ts

@@ -22,22 +22,32 @@ export const resolveFetch = (customFetch?: Fetch): Fetch => {
   return (...args) => _fetch(...args);
 };
 
+interface FetchWithAuthOptions {
+  apiKey?: string;
+  customFetch?: Fetch;
+  accessToken?: string;
+}
+
 /**
  * Resolves a fetch function that includes an "Authorization" header with the provided API key.
  *
  * @param apiKey - The API key to include in the "Authorization" header.
  * @param customFetch - An optional custom fetch function to use instead of the global fetch function.
  * @returns A fetch function that can be used to make HTTP requests with the provided API key in the "Authorization" header.
  */
-export const fetchWithAuth = (apiKey: string, customFetch?: Fetch, token?: string): Fetch => {
+export const fetchWithAuth = ({
+  apiKey,
+  customFetch,
+  accessToken,
+}: Readonly<FetchWithAuthOptions>): Fetch => {
   const fetch = resolveFetch(customFetch);
   const HeadersConstructor = resolveHeadersConstructor();
 
   return async (input, init) => {
     const headers = new HeadersConstructor(init?.headers);
 
     if (!headers.has("Authorization")) {
-      headers.set("Authorization", token ? `Bearer ${token}` : `Token ${apiKey}`);
+      headers.set("Authorization", accessToken ? `Bearer ${accessToken}` : `Token ${apiKey}`);
     }
 
     return fetch(input, { ...init, headers });

src/lib/types/DeepgramClientOptions.ts

@@ -24,7 +24,7 @@ interface ITransport<C, O> {
 }
 
 export type DefaultNamespaceOptions = {
-  key: string;
+  key?: string;
   fetch: {
     options: { url: TransportUrl };
   };

src/packages/AbstractClient.ts

@@ -23,7 +23,7 @@ export const noop = () => {};
  */
 export abstract class AbstractClient extends EventEmitter {
   protected factory: Function | undefined = undefined;
-  protected key: string;
+  protected key: string | undefined = undefined;
   protected accessToken: string | undefined = undefined;
   protected options: DefaultClientOptions;
   public namespace: string = "global";
@@ -48,25 +48,21 @@ export abstract class AbstractClient extends EventEmitter {
       this.accessToken = options.accessToken;
     }
 
-    let key;
-
     if (typeof options.key === "function") {
       this.factory = options.key;
-      key = this.factory();
+      this.key = this.factory();
     } else {
-      key = options.key;
+      this.key = options.key;
     }
 
-    if (!key) {
-      key = process.env.DEEPGRAM_API_KEY as string;
+    if (!this.key) {
+      this.key = process.env.DEEPGRAM_API_KEY as string;
     }
 
-    if (!key && !this.accessToken) {
+    if (!this.key && !this.accessToken) {
       throw new DeepgramError("A deepgram API key or temporary auth token is required.");
     }
 
-    this.key = key;
-
     options = convertLegacyOptions(options);
 
     /**

src/packages/AbstractLiveClient.ts

@@ -145,9 +145,14 @@ export abstract class AbstractLiveClient extends AbstractClient {
      * Native websocket transport (browser)
      */
     if (NATIVE_WEBSOCKET_AVAILABLE) {
+      const accessToken = this.accessToken;
+      const apiKey = this.namespaceOptions.key;
+      if (!accessToken && !apiKey) {
+        throw new Error("Don't know how to set authentication headers for WebSocket connection.");
+      }
       this.conn = new WebSocket(
         requestUrl,
-        this.accessToken ? ["bearer", this.accessToken] : ["token", this.namespaceOptions.key]
+        accessToken ? ["bearer", accessToken] : ["token", apiKey!]
       );
       this.setupConnection();
       return;

src/packages/AbstractRestClient.ts

@@ -29,7 +29,9 @@ export abstract class AbstractRestClient extends AbstractClient {
       );
     }
 
-    this.fetch = fetchWithAuth(this.key, this.namespaceOptions.fetch.client, this.accessToken);
+    const { accessToken, key: apiKey, fetch: customFetch } = this;
+
+    this.fetch = fetchWithAuth({ accessToken, apiKey, customFetch });
 
     if (this.proxy) {
       this.baseUrl = this.namespaceOptions.fetch.options.proxy!.url;