address feedback

Author: deyaaeldeen

src/beta/realtime/websocket.ts

@@ -31,17 +31,17 @@ export class OpenAIRealtimeWebSocket extends OpenAIRealtimeEmitter {
        * @internal
        */
       onURL?: (url: URL) => void;
+      /** Indicates the token was resolved by the factory just before connecting. @internal */
+      __resolvedApiKey?: boolean;
     },
     client?: Pick<OpenAI, 'apiKey' | 'baseURL'>,
   ) {
     super();
-
+    const hasProvider = typeof (client as any)?._options?.apiKey === 'function';
     const dangerouslyAllowBrowser =
       props.dangerouslyAllowBrowser ??
       (client as any)?._options?.dangerouslyAllowBrowser ??
-      (typeof (client as any)?._options?.apiKey === 'string' && client?.apiKey?.startsWith('ek_') ?
-        true
-      : null);
+      (client?.apiKey?.startsWith('ek_') ? true : null);
     if (!dangerouslyAllowBrowser && isRunningInBrowser()) {
       throw new OpenAIError(
         "It looks like you're running in a browser-like environment.\n\nThis is disabled by default, as it risks exposing your secret API credentials to attackers.\n\nYou can avoid this error by creating an ephemeral session token:\nhttps://platform.openai.com/docs/api-reference/realtime-sessions\n",
@@ -50,7 +50,7 @@ export class OpenAIRealtimeWebSocket extends OpenAIRealtimeEmitter {
 
     client ??= new OpenAI({ dangerouslyAllowBrowser });
 
-    if (typeof (client as any)?._options?.apiKey !== 'string') {
+    if (hasProvider && !props?.__resolvedApiKey) {
       throw new Error(
         [
           'Cannot open Realtime WebSocket with a function-based apiKey.',
@@ -109,8 +109,7 @@ export class OpenAIRealtimeWebSocket extends OpenAIRealtimeEmitter {
     client: Pick<OpenAI, 'apiKey' | 'baseURL' | '_callApiKey'>,
     props: { model: string; dangerouslyAllowBrowser?: boolean },
   ): Promise<OpenAIRealtimeWebSocket> {
-    await client._callApiKey();
-    return new OpenAIRealtimeWebSocket(props, client);
+    return new OpenAIRealtimeWebSocket({ ...props, __resolvedApiKey: await client._callApiKey() }, client);
   }
 
   static async azure(
@@ -135,6 +134,7 @@ export class OpenAIRealtimeWebSocket extends OpenAIRealtimeEmitter {
         model: deploymentName,
         onURL,
         ...(dangerouslyAllowBrowser ? { dangerouslyAllowBrowser } : {}),
+        __resolvedApiKey: isToken,
       },
       client,
     );

src/beta/realtime/ws.ts

@@ -8,16 +8,21 @@ export class OpenAIRealtimeWS extends OpenAIRealtimeEmitter {
   socket: WS.WebSocket;
 
   constructor(
-    props: { model: string; options?: WS.ClientOptions | undefined },
+    props: {
+      model: string;
+      options?: WS.ClientOptions | undefined;
+      /** @internal */ __resolvedApiKey?: boolean;
+    },
     client?: Pick<OpenAI, 'apiKey' | 'baseURL'>,
   ) {
     super();
     client ??= new OpenAI();
-    if (typeof (client as any)._options.apiKey !== 'string') {
+    const hasProvider = typeof (client as any)?._options?.apiKey === 'function';
+    if (hasProvider && !props.__resolvedApiKey) {
       throw new Error(
         [
           'Cannot open Realtime WebSocket with a function-based apiKey.',
-          'Use the factory so the key is resolved before connecting:',
+          'Use the factory so the key is resolved just before connecting:',
           '- OpenAIRealtimeWS.create(client, { model })',
         ].join('\n'),
       );
@@ -27,7 +32,7 @@ export class OpenAIRealtimeWS extends OpenAIRealtimeEmitter {
       ...props.options,
       headers: {
         ...props.options?.headers,
-        ...(isAzure(client) ? {} : { Authorization: `Bearer ${client.apiKey}` }),
+        ...(isAzure(client) && !props.__resolvedApiKey ? {} : { Authorization: `Bearer ${client.apiKey}` }),
         'OpenAI-Beta': 'realtime=v1',
       },
     });
@@ -63,20 +68,30 @@ export class OpenAIRealtimeWS extends OpenAIRealtimeEmitter {
     client: Pick<OpenAI, 'apiKey' | 'baseURL' | '_callApiKey'>,
     props: { model: string; options?: WS.ClientOptions | undefined },
   ): Promise<OpenAIRealtimeWS> {
-    await client._callApiKey();
-    return new OpenAIRealtimeWS(props, client);
+    return new OpenAIRealtimeWS({ ...props, __resolvedApiKey: await client._callApiKey() }, client);
   }
 
   static async azure(
     client: Pick<AzureOpenAI, '_callApiKey' | 'apiVersion' | 'apiKey' | 'baseURL' | 'deploymentName'>,
-    options: { deploymentName?: string; options?: WS.ClientOptions | undefined } = {},
+    props: { deploymentName?: string; options?: WS.ClientOptions | undefined } = {},
   ): Promise<OpenAIRealtimeWS> {
-    const deploymentName = options.deploymentName ?? client.deploymentName;
+    const isToken = await client._callApiKey();
+    const deploymentName = props.deploymentName ?? client.deploymentName;
     if (!deploymentName) {
       throw new Error('No deployment name provided');
     }
     return new OpenAIRealtimeWS(
-      { model: deploymentName, options: { headers: await getAzureHeaders(client) } },
+      {
+        model: deploymentName,
+        options: {
+          ...props.options,
+          headers: {
+            ...props.options?.headers,
+            ...(isToken ? {} : { 'api-key': client.apiKey }),
+          },
+        },
+        __resolvedApiKey: isToken,
+      },
       client,
     );
   }
@@ -98,11 +113,4 @@ export class OpenAIRealtimeWS extends OpenAIRealtimeEmitter {
   }
 }
 
-async function getAzureHeaders(client: Pick<AzureOpenAI, '_callApiKey' | 'apiKey'>) {
-  const isToken = await client._callApiKey();
-  if (isToken) {
-    return { Authorization: `Bearer ${isToken}` };
-  } else {
-    return { 'api-key': client.apiKey };
-  }
-}
+// getAzureHeaders inlined into azure()