test publish

client/app/composables/use-mediasoup.ts

@@ -4,6 +4,8 @@ import * as mediasoupClient from 'mediasoup-client'
 import { usePreferences } from '~/composables/use-preferences'
 import { useSignaling } from '~/composables/use-signaling'
 
+type ProducerType = 'microphone' | 'camera' | 'share'
+
 const ICE_SERVERS: RTCIceServer[] = [
   { urls: 'stun:stun.l.google.com:19302' },
   { urls: 'stun:stun.l.google.com:5349' },
@@ -31,7 +33,7 @@ export const useMediasoup = createSharedComposable(() => {
   const recvTransport = shallowRef<mediasoupClient.types.Transport>()
 
   const micProducer = shallowRef<mediasoupClient.types.Producer>()
-  const webcamProducer = shallowRef<mediasoupClient.types.Producer>()
+  const cameraProducer = shallowRef<mediasoupClient.types.Producer>()
   const shareProducer = shallowRef<mediasoupClient.types.Producer>()
 
   const consumers = shallowRef<Map<string, mediasoupClient.types.Consumer>>(new Map())
@@ -145,7 +147,7 @@ export const useMediasoup = createSharedComposable(() => {
     socket.on(
       'newConsumer',
       async (
-        { id, producerId, kind, rtpParameters, peerId: clientId, appData },
+        { id, producerId, kind, rtpParameters, socketId, appData, producerPaused },
         cb,
       ) => {
         if (!recvTransport.value)
@@ -156,13 +158,16 @@ export const useMediasoup = createSharedComposable(() => {
           producerId,
           kind,
           rtpParameters,
-          streamId: `${clientId}-${appData.share ? 'share' : 'mic-webcam'}`,
-          appData: { ...appData, clientId },
+          streamId: `${socketId}-${appData.share ? 'share' : 'mic-webcam'}`,
+          appData: { ...appData, socketId },
         })
 
+        if (producerPaused)
+          consumer.pause()
+
         consumer.on('transportclose', () => {
-          consumers.value.delete(consumer.id)
-          triggerRef(consumers)
+          if (consumers.value.delete(consumer.id))
+            triggerRef(consumers)
         })
 
         consumers.value.set(consumer.id, consumer)
@@ -177,13 +182,8 @@ export const useMediasoup = createSharedComposable(() => {
       async (
         { consumerId },
       ) => {
-        const consumer = consumers.value.get(consumerId)
-
-        if (!consumer)
-          return
-
-        consumers.value.delete(consumer.id)
-        triggerRef(consumers)
+        if (consumers.value.delete(consumerId))
+          triggerRef(consumers)
       },
     )
 
@@ -198,16 +198,40 @@ export const useMediasoup = createSharedComposable(() => {
       recvTransport.value = undefined
 
       micProducer.value = undefined
-      webcamProducer.value = undefined
+      cameraProducer.value = undefined
       shareProducer.value = undefined
 
       consumers.value = new Map()
       producers.value = new Map()
     })
+
+    socket.on('consumerPaused', ({ consumerId }) => {
+      const consumer = consumers.value.get(consumerId)
+
+      if (!consumer)
+        return
+
+      consumer.pause()
+
+      console.log(consumerId)
+
+      triggerRef(consumers)
+    })
+
+    socket.on('consumerResumed', ({ consumerId }) => {
+      const consumer = consumers.value.get(consumerId)
+
+      if (!consumer)
+        return
+
+      consumer.resume()
+
+      triggerRef(consumers)
+    })
   }, { immediate: true, flush: 'sync' })
 
-  function getClientConsumers(clientId: ChadClient['socketId']) {
-    return consumers.value.values().filter(consumer => consumer.appData.clientId === clientId)
+  function getClientConsumers(socketId: ChadClient['socketId']) {
+    return consumers.value.values().filter(consumer => consumer.appData.socketId === socketId)
   }
 
   async function enableMic() {
@@ -274,33 +298,48 @@ export const useMediasoup = createSharedComposable(() => {
     micProducer.value = undefined
   }
 
-  async function muteMic() {
-    if (!signaling.socket.value || !micProducer.value)
+  async function pauseProducer(type: ProducerType) {
+    if (!signaling.socket.value)
+      return
+
+    const producer = getProducerByType(type)
+
+    if (!producer)
+      return
+
+    if (producer.paused)
       return
 
     try {
-      micProducer.value.pause()
+      producer.pause()
 
       await signaling.socket.value.emitWithAck('pauseProducer', {
-        producerId: micProducer.value.id,
+        producerId: producer.id,
       })
     }
     catch {
+      producer.resume()
     }
   }
 
-  async function unmuteMic() {
-    if (!signaling.socket.value || !micProducer.value)
+  async function resumeProducer(type: ProducerType) {
+    if (!signaling.socket.value)
+      return
+
+    const producer = getProducerByType(type)
+
+    if (!producer)
       return
 
     try {
-      micProducer.value.resume()
+      producer.resume()
 
       await signaling.socket.value.emitWithAck('resumeProducer', {
-        producerId: micProducer.value.id,
+        producerId: producer.id,
       })
     }
     catch {
+      producer.pause()
     }
   }
 
@@ -308,6 +347,17 @@ export const useMediasoup = createSharedComposable(() => {
     signaling.connect()
   }
 
+  function getProducerByType(type: ProducerType) {
+    switch (type) {
+      case 'microphone':
+        return micProducer.value
+      case 'camera':
+        return cameraProducer.value
+      case 'share':
+        return shareProducer.value
+    }
+  }
+
   return {
     init,
     consumers,
@@ -317,10 +367,10 @@ export const useMediasoup = createSharedComposable(() => {
     rtpCapabilities,
     device,
     micProducer,
-    webcamProducer,
+    cameraProducer,
     shareProducer,
     getClientConsumers,
-    muteMic,
-    unmuteMic,
+    pauseProducer,
+    resumeProducer,
   }
 })