simplify voice chat

browser-interface/packages/shared/comms/adapters/LivekitAdapter.ts

@@ -31,13 +31,11 @@ export class LivekitAdapter implements MinimumCommunicationsAdapter {
 
   private disposed = false
   private readonly room: Room
-  private voiceHandler: VoiceHandler
+  private voiceHandler: VoiceHandler | undefined = undefined
 
   constructor(private config: LivekitConfig) {
     this.room = new Room()
 
-    this.voiceHandler = createLiveKitVoiceHandler(this.room, this.config.globalAudioStream)
-
     this.room
       .on(RoomEvent.ParticipantConnected, (_: RemoteParticipant) => {
         this.config.logger.log(this.room.name, 'remote participant joined', _.identity)
@@ -79,7 +77,11 @@ export class LivekitAdapter implements MinimumCommunicationsAdapter {
       })
   }
 
-  async createVoiceHandler(): Promise<VoiceHandler> {
+  async getVoiceHandler(): Promise<VoiceHandler> {
+    if (!this.voiceHandler) {
+      this.voiceHandler = createLiveKitVoiceHandler(this.room, this.config.globalAudioStream)
+    }
+
     return this.voiceHandler
   }
 

browser-interface/packages/shared/comms/adapters/OfflineAdapter.ts

@@ -1,17 +1,18 @@
 import mitt from 'mitt'
 import { VoiceHandler } from 'shared/voiceChat/VoiceHandler'
 import { CommsAdapterEvents, MinimumCommunicationsAdapter, SendHints } from './types'
-import { createOpusVoiceHandler } from './voice/opusVoiceHandler'
 
 export class OfflineAdapter implements MinimumCommunicationsAdapter {
   events = mitt<CommsAdapterEvents>()
 
   constructor() {}
-  async createVoiceHandler(): Promise<VoiceHandler> {
-    return createOpusVoiceHandler()
+  async getVoiceHandler(): Promise<VoiceHandler | undefined> {
+    return undefined
   }
   async disconnect(_error?: Error | undefined): Promise<void> {}
   send(_data: Uint8Array, _hints: SendHints): void {}
   async connect(): Promise<void> {}
-  async getParticipants() { return [] } 
+  async getParticipants() {
+    return []
+  }
 }

browser-interface/packages/shared/comms/adapters/SimulatorAdapter.ts

@@ -12,15 +12,13 @@ import {
   Position,
   ProfileRequest,
   ProfileResponse,
-  Scene,
-  Voice
+  Scene
 } from 'shared/protocol/decentraland/kernel/comms/rfc4/comms.gen'
 import { lastPlayerPosition } from 'shared/world/positionThings'
 import { CommsEvents, RoomConnection } from '../interface'
 import { Rfc4RoomConnection } from '../logic/rfc-4-room-connection'
 import { CommsAdapterEvents, SendHints } from './types'
 import { VoiceHandler } from 'shared/voiceChat/VoiceHandler'
-import { createOpusVoiceHandler } from './voice/opusVoiceHandler'
 
 export class SimulationRoom implements RoomConnection {
   events = mitt<CommsEvents>()
@@ -51,17 +49,17 @@ export class SimulationRoom implements RoomConnection {
       send(_data: Uint8Array, _hints: SendHints): void {},
       async connect(): Promise<void> {},
       async disconnect(_error?: Error): Promise<void> {},
-      async createVoiceHandler() {
-        throw new Error('not implemented')
+      async getVoiceHandler(): Promise<VoiceHandler | undefined> {
+        return undefined
       },
       async getParticipants() {
         return Array.from(peers.keys())
       }
     })
   }
 
-  async createVoiceHandler(): Promise<VoiceHandler> {
-    return createOpusVoiceHandler()
+  async getVoiceHandler(): Promise<VoiceHandler | undefined> {
+    return this.roomConnection.getVoiceHandler()
   }
 
   async spawnPeer(): Promise<string> {
@@ -135,9 +133,6 @@ export class SimulationRoom implements RoomConnection {
   async sendChatMessage(message: Chat): Promise<void> {
     await this.roomConnection.sendChatMessage(message)
   }
-  async sendVoiceMessage(message: Voice): Promise<void> {
-    await this.roomConnection.sendVoiceMessage(message)
-  }
 
   update() {
     let i = 0

browser-interface/packages/shared/comms/adapters/WebSocketAdapter.ts

@@ -7,7 +7,6 @@ import { ExplorerIdentity } from 'shared/session/types'
 import { Authenticator } from '@dcl/crypto'
 import mitt from 'mitt'
 import { CommsAdapterEvents, MinimumCommunicationsAdapter, SendHints } from './types'
-import { createOpusVoiceHandler } from './voice/opusVoiceHandler'
 import { VoiceHandler } from 'shared/voiceChat/VoiceHandler'
 import { notifyStatusThroughChat } from 'shared/chat'
 import { wsAsAsyncChannel } from '../logic/ws-async-channel'
@@ -36,7 +35,10 @@ export class WebSocketAdapter implements MinimumCommunicationsAdapter {
 
   private ws: WebSocket | null = null
 
-  constructor(public url: string, private identity: ExplorerIdentity) {}
+  constructor(
+    public url: string,
+    private identity: ExplorerIdentity
+  ) {}
 
   async connect(): Promise<void> {
     if (this.ws) throw new Error('Cannot call connect twice per IBrokerTransport')
@@ -131,8 +133,8 @@ export class WebSocketAdapter implements MinimumCommunicationsAdapter {
     }
   }
 
-  async createVoiceHandler(): Promise<VoiceHandler> {
-    return createOpusVoiceHandler()
+  async getVoiceHandler(): Promise<VoiceHandler | undefined> {
+    return undefined
   }
 
   handleWelcomeMessage(welcomeMessage: rfc5.WsWelcome, socket: WebSocket) {

browser-interface/packages/shared/comms/adapters/types.ts

@@ -28,7 +28,7 @@ export interface MinimumCommunicationsAdapter {
    */
   events: Emitter<CommsAdapterEvents>
 
-  createVoiceHandler(): Promise<VoiceHandler>
+  getVoiceHandler(): Promise<VoiceHandler | undefined>
 
   getParticipants(): Promise<string[]>
 }