Merge pull request #105 from anam-org/fix/remove-duplicate-stream

fix: remove duplicate stream

Author: ao-anam

src/AnamClient.ts

@@ -4,6 +4,7 @@ import {
   DEFAULT_ANAM_METRICS_BASE_URL,
   ErrorCode,
   setErrorMetricsBaseUrl,
+  setCurrentSessionInfo,
 } from './lib/ClientError';
 import {
   CoreApiRestClient,
@@ -34,6 +35,7 @@ export default class AnamClient {
   private inputAudioState: InputAudioState = { isMuted: false };
 
   private sessionId: string | null = null;
+  private organizationId: string | null = null;
 
   private streamingClient: StreamingClient | null = null;
   private apiClient: CoreApiRestClient;
@@ -111,6 +113,9 @@ export default class AnamClient {
     // Validate persona configuration based on session token
     if (sessionToken) {
       const decodedToken = this.decodeJwt(sessionToken);
+      this.organizationId = decodedToken.accountId;
+      setCurrentSessionInfo(this.sessionId, this.organizationId);
+
       const tokenType = decodedToken.type?.toLowerCase();
 
       if (tokenType === 'legacy') {
@@ -218,11 +223,15 @@ export default class AnamClient {
         'Failed to initialize streaming client',
         ErrorCode.CLIENT_ERROR_CODE_SERVER_ERROR,
         500,
-        { cause: error instanceof Error ? error.message : String(error) },
+        {
+          cause: error instanceof Error ? error.message : String(error),
+          sessionId,
+        },
       );
     }
 
     this.sessionId = sessionId;
+    setCurrentSessionInfo(this.sessionId, this.organizationId);
     return sessionId;
   }
 
@@ -290,6 +299,16 @@ export default class AnamClient {
     videoElementId: string,
     audioElementId: string,
     userProvidedAudioStream?: MediaStream,
+  ): Promise<void> {
+    console.warn(
+      'AnamClient: streamToVideoAndAudioElements is deprecated. Please use streamToVideoElement instead.',
+    );
+    await this.streamToVideoElement(videoElementId, userProvidedAudioStream);
+  }
+
+  public async streamToVideoElement(
+    videoElementId: string,
+    userProvidedAudioStream?: MediaStream,
   ): Promise<void> {
     if (this.clientOptions?.disableInputAudio && userProvidedAudioStream) {
       console.warn(
@@ -309,6 +328,7 @@ export default class AnamClient {
         500,
         {
           cause: error instanceof Error ? error.message : String(error),
+          sessionId: this.sessionId,
         },
       );
     }
@@ -321,10 +341,7 @@ export default class AnamClient {
       throw new Error('Failed to stream: streaming client is not available');
     }
 
-    this.streamingClient.setMediaStreamTargetsById(
-      videoElementId,
-      audioElementId,
-    );
+    this.streamingClient.setMediaStreamTargetById(videoElementId);
     this.streamingClient.startConnection();
   }
 
@@ -356,6 +373,7 @@ export default class AnamClient {
       this.streamingClient.stopConnection();
       this.streamingClient = null;
       this.sessionId = null;
+      setCurrentSessionInfo(null, this.organizationId);
       this._isStreaming = false;
     }
   }

src/lib/ClientError.ts

@@ -17,6 +17,9 @@ export const DEFAULT_ANAM_API_VERSION = '/v1';
 let anamCurrentBaseUrl = DEFAULT_ANAM_METRICS_BASE_URL;
 let anamCurrentApiVersion = DEFAULT_ANAM_API_VERSION;
 
+let currentSessionId: string | null = null;
+let currentOrganizationId: string | null = null;
+
 export const setErrorMetricsBaseUrl = (
   baseUrl: string,
   apiVersion: string = DEFAULT_ANAM_API_VERSION,
@@ -25,12 +28,33 @@ export const setErrorMetricsBaseUrl = (
   anamCurrentApiVersion = apiVersion;
 };
 
+export const setCurrentSessionInfo = (
+  sessionId: string | null,
+  organizationId: string | null,
+) => {
+  currentSessionId = sessionId;
+  currentOrganizationId = organizationId;
+};
+
 export const sendErrorMetric = async (
   name: string,
   value: string,
   tags?: Record<string, string | number>,
 ) => {
   try {
+    const metricTags: Record<string, string | number> = {
+      ...CLIENT_METADATA,
+      ...tags,
+    };
+
+    // Add session and organization IDs if available
+    if (currentSessionId) {
+      metricTags.sessionId = currentSessionId;
+    }
+    if (currentOrganizationId) {
+      metricTags.organizationId = currentOrganizationId;
+    }
+
     await fetch(
       `${anamCurrentBaseUrl}${anamCurrentApiVersion}/metrics/client`,
       {
@@ -41,10 +65,7 @@ export const sendErrorMetric = async (
         body: JSON.stringify({
           name,
           value,
-          tags: {
-            ...CLIENT_METADATA,
-            ...tags,
-          },
+          tags: metricTags,
         }),
       },
     );

src/modules/StreamingClient.ts

@@ -34,7 +34,6 @@ export class StreamingClient {
   private dataChannel: RTCDataChannel | null = null;
   private videoElement: HTMLVideoElement | null = null;
   private videoStream: MediaStream | null = null;
-  private audioElement: HTMLAudioElement | null = null;
   private audioStream: MediaStream | null = null;
   private inputAudioState: InputAudioState = { isMuted: false };
   private audioDeviceId: string | undefined;
@@ -155,10 +154,7 @@ export class StreamingClient {
     }
   }
 
-  public setMediaStreamTargetsById(
-    videoElementId: string,
-    audioElementId: string,
-  ) {
+  public setMediaStreamTargetById(videoElementId: string) {
     // set up streaming targets
     if (videoElementId) {
       const videoElement = document.getElementById(videoElementId);
@@ -169,15 +165,6 @@ export class StreamingClient {
       }
       this.videoElement = videoElement as HTMLVideoElement;
     }
-    if (audioElementId) {
-      const audioElement = document.getElementById(audioElementId);
-      if (!audioElement) {
-        throw new Error(
-          `StreamingClient: audio element with id ${audioElementId} not found`,
-        );
-      }
-      this.audioElement = audioElement as HTMLAudioElement;
-    }
   }
 
   public startConnection() {
@@ -400,9 +387,6 @@ export class StreamingClient {
         AnamEvent.AUDIO_STREAM_STARTED,
         this.audioStream,
       );
-      if (this.audioElement) {
-        this.audioElement.srcObject = this.audioStream;
-      }
     }
   }
   /**