pr feedback

packages/shared/renderer/sagas.ts

@@ -111,6 +111,7 @@ function convertCurrentRealmType(realm: Realm, contentServerUrl: string): Curren
 
 function* updateUserVoicePlayingRenderer(action: VoicePlayingUpdateAction) {
   const { playing, userId } = action.payload
+  yield call(waitForRendererInstance)
   getUnityInstance().SetUserTalking(userId, playing)
 }
 
@@ -120,6 +121,7 @@ function* updatePlayerVoiceRecordingRenderer(action: VoiceRecordingUpdateAction)
 }
 
 function* updateChangeVoiceChatHandler(action: SetVoiceChatHandlerAction) {
+  yield call(waitForRendererInstance)
   if (action.payload.voiceHandler) {
     getUnityInstance().SetVoiceChatStatus({ isConnected: true })
   } else {
@@ -129,6 +131,7 @@ function* updateChangeVoiceChatHandler(action: SetVoiceChatHandlerAction) {
 
 function* handleVoiceChatError(action: SetVoiceChatErrorAction) {
   const message = action.payload.message
+  yield call(waitForRendererInstance)
   if (message) {
     getUnityInstance().ShowNotification({
       type: NotificationType.GENERIC,

packages/shared/voiceChat/actions.ts

@@ -64,7 +64,7 @@ export const setVoiceChatPolicy = (policy: VoicePolicy) => action(SET_VOICE_CHAT
 export type SetVoiceChatPolicyAction = ReturnType<typeof setVoiceChatPolicy>
 
 export const SET_VOICE_CHAT_MEDIA = '[VC] setVoiceChatMedia'
-export const setVoiceChatMedia = (media: any | undefined) => action(SET_VOICE_CHAT_MEDIA, { media })
+export const setVoiceChatMedia = (media: MediaStream | undefined) => action(SET_VOICE_CHAT_MEDIA, { media })
 export type SetVoiceChatMediaAction = ReturnType<typeof setVoiceChatMedia>
 
 export type VoiceChatActions =

packages/shared/voiceChat/handlers.ts

@@ -1,26 +1,37 @@
 import { getCurrentUserProfile } from '../profiles/selectors'
 import { Package, VoiceFragment } from '../comms/interface/types'
-import { setupPeer } from '../comms/peers'
+import { getPeer } from '../comms/peers'
 import { store } from '../store/isolatedStore'
 import { getVoiceHandler, shouldPlayVoice } from './selectors'
 import { voiceChatLogger } from './context'
+import { trackEvent } from 'shared/analytics'
 
 export function processVoiceFragment(message: Package<VoiceFragment>) {
   const state = store.getState()
   const voiceHandler = getVoiceHandler(state)
   const profile = getCurrentUserProfile(state)
 
-  const peerTrackingInfo = setupPeer(message.sender)
+  // use getPeed instead of setupPeer to only reproduce voice messages from
+  // known avatars
+  const peerTrackingInfo = getPeer(message.sender)
 
   if (
     voiceHandler &&
     profile &&
+    peerTrackingInfo &&
     peerTrackingInfo.ethereumAddress &&
     peerTrackingInfo.position &&
     shouldPlayVoice(state, profile, peerTrackingInfo.ethereumAddress)
   ) {
     voiceHandler
       .playEncodedAudio(peerTrackingInfo.ethereumAddress, peerTrackingInfo.position, message.data)
-      .catch((e) => voiceChatLogger.error('Error playing encoded audio!', e))
+      .catch((e: any) => {
+        trackEvent('error', {
+          context: 'voice-chat',
+          message: e.message,
+          stack: ''
+        })
+        voiceChatLogger.error('Error playing encoded audio!', e)
+      })
   }
 }

packages/shared/voiceChat/sagas.ts

@@ -130,9 +130,9 @@ function* handleJoinVoiceChat() {
   const commsContext = yield select(getCommsContext)
   const voiceChatState: VoiceChatState = yield select(getVoiceChatState)
   if (commsContext) {
-    const voiceHandler =
+    const voiceHandler: VoiceHandler =
       voiceChatState.liveKitRoom !== null
-        ? yield createLiveKitVoiceHandler(voiceChatState.liveKitRoom)
+        ? yield call(createLiveKitVoiceHandler, voiceChatState.liveKitRoom)
         : createOpusVoiceHandler(commsContext.worldInstanceConnection)
 
     yield put(clearVoiceChatError())
@@ -146,7 +146,6 @@ function* handleJoinVoiceChat() {
     })
 
     voiceHandler.onError((message) => {
-      //store.dispatch(setVoiceChatError(message))
       put(setVoiceChatError(message))
     })
 
@@ -191,7 +190,7 @@ function* handleLeaveVoiceChat() {
 
 function* handleVoiceChatMedia({ payload }: SetVoiceChatMediaAction) {
   const voiceHandler: VoiceHandler | null = yield select(getVoiceHandler)
-  if (voiceHandler) {
+  if (voiceHandler && payload.media) {
     yield voiceHandler.setInputStream(payload.media)
   }
 }
@@ -223,13 +222,14 @@ function* handleVoiceChatMute(action: SetVoiceChatMuteAction) {
 
 let audioRequestPending = false
 
-async function requestMediaDevice() {
+async function requestMediaDevice(deviceId?: string) {
   if (!audioRequestPending) {
     audioRequestPending = true
 
     try {
       const media = await navigator.mediaDevices.getUserMedia({
         audio: {
+          deviceId,
           channelCount: 1,
           sampleRate: VOICE_CHAT_SAMPLE_RATE,
           echoCancellation: true,