feat: rename camera -> cameraTrack, microphone -> microphoneTrack

Author: 1egoman

packages/react/src/hooks/useAgent.ts

@@ -56,8 +56,8 @@ type AgentStateAvailable = AgentInstanceCommon & {
   /** Is the agent ready for user interaction? */
   isAvailable: true;
 
-  camera: TrackReference | null;
-  microphone: TrackReference | null;
+  cameraTrack: TrackReference | null;
+  microphoneTrack: TrackReference | null;
 };
 
 type AgentStateUnAvailable = AgentInstanceCommon & {
@@ -67,8 +67,8 @@ type AgentStateUnAvailable = AgentInstanceCommon & {
   /** Is the agent ready for user interaction? */
   isAvailable: false;
 
-  camera: null;
-  microphone: null;
+  cameraTrack: null;
+  microphoneTrack: null;
 };
 
 type AgentStateFailed = AgentInstanceCommon & {
@@ -78,8 +78,8 @@ type AgentStateFailed = AgentInstanceCommon & {
   /** Is the agent ready for user interaction? */
   isAvailable: false;
 
-  camera: null;
-  microphone: null;
+  cameraTrack: null;
+  microphoneTrack: null;
 };
 
 type AgentActions = {
@@ -397,8 +397,8 @@ export function useAgent(conversation: ConversationStub, _name?: string): AgentI
           ...generateDerivedStateValues(state),
           failureReasons: null,
 
-          camera: videoTrack,
-          microphone: audioTrack,
+          cameraTrack: videoTrack,
+          microphoneTrack: audioTrack,
         };
 
       case 'unset':
@@ -412,8 +412,8 @@ export function useAgent(conversation: ConversationStub, _name?: string): AgentI
           failureReasons: null,
 
           // Clear inner values if no longer connected
-          camera: null,
-          microphone: null,
+          cameraTrack: null,
+          microphoneTrack: null,
         };
 
       case 'failed':
@@ -425,8 +425,8 @@ export function useAgent(conversation: ConversationStub, _name?: string): AgentI
           failureReasons,
 
           // Clear inner values if no longer connected
-          camera: null,
-          microphone: null,
+          cameraTrack: null,
+          microphoneTrack: null,
         };
     }
   }, [

packages/react/src/hooks/useConversationWith.ts

@@ -74,8 +74,8 @@ type ConversationStateConnecting = ConversationStateCommon & {
   isReconnecting: false;
 
   local: {
-    camera: TrackReferencePlaceholder;
-    microphone: TrackReferencePlaceholder;
+    cameraTrack: TrackReferencePlaceholder;
+    microphoneTrack: TrackReferencePlaceholder;
   };
 };
 
@@ -85,8 +85,8 @@ type ConversationStateConnected = ConversationStateCommon & {
   isReconnecting: boolean;
 
   local: {
-    camera: TrackReferenceOrPlaceholder,
-    microphone: TrackReferenceOrPlaceholder,
+    cameraTrack: TrackReferenceOrPlaceholder,
+    microphoneTrack: TrackReferenceOrPlaceholder,
   };
 };
 
@@ -96,8 +96,8 @@ type ConversationStateDisconnected = ConversationStateCommon & {
   isReconnecting: false;
 
   local: {
-    camera: TrackReferencePlaceholder;
-    microphone: TrackReferencePlaceholder;
+    cameraTrack: TrackReferencePlaceholder;
+    microphoneTrack: TrackReferencePlaceholder;
   };
 };
 
@@ -214,8 +214,8 @@ export function useConversationWith(agentToDispatch: string | RoomAgentDispatch
           ...generateDerivedConnectionStateValues(ConnectionState.Connecting),
 
           local: {
-            camera: { participant: localParticipant, source: Track.Source.Camera },
-            microphone: { participant: localParticipant, source: Track.Source.Microphone },
+            cameraTrack: { participant: localParticipant, source: Track.Source.Camera },
+            microphoneTrack: { participant: localParticipant, source: Track.Source.Microphone },
           },
         };
 
@@ -229,8 +229,8 @@ export function useConversationWith(agentToDispatch: string | RoomAgentDispatch
           ...generateDerivedConnectionStateValues(roomConnectionState),
 
           local: {
-            camera: localCamera ?? { participant: localParticipant, source: Track.Source.Camera },
-            microphone: localMicrophone ?? { participant: localParticipant, source: Track.Source.Microphone },
+            cameraTrack: localCamera ?? { participant: localParticipant, source: Track.Source.Camera },
+            microphoneTrack: localMicrophone ?? { participant: localParticipant, source: Track.Source.Microphone },
           },
         };
 
@@ -242,8 +242,8 @@ export function useConversationWith(agentToDispatch: string | RoomAgentDispatch
           ...generateDerivedConnectionStateValues(ConnectionState.Disconnected),
 
           local: {
-            camera: { participant: localParticipant, source: Track.Source.Camera },
-            microphone: { participant: localParticipant, source: Track.Source.Microphone },
+            cameraTrack: { participant: localParticipant, source: Track.Source.Camera },
+            microphoneTrack: { participant: localParticipant, source: Track.Source.Microphone },
           },
         };
     }