@livedigital/client 1.1.2 → 1.2.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "@livedigital/client",
   "author": "vlprojects",
   "license": "MIT",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "private": false,
   "bugs": {
     "url": "https://github.com/vlprojects/livedigital-sdk/issues"

package/src/engine/Peer.ts

@@ -47,7 +47,7 @@ class Peer {
 
   public uid?: string;
 
-  public appData = {};
+  public appData: Record<string, unknown>;
 
   private videoProducer?: ProducerData;
 
@@ -75,7 +75,8 @@ class Peer {
     videoConsumer,
     audioConsumer,
     engine,
-    appData = {},
+    appData,
+    uid,
   }: PeerConstructor) {
     this.id = id;
     this.channelId = channelId;
@@ -84,7 +85,8 @@ class Peer {
     this.isVirtual = isVirtual;
     this.originChannelId = originChannelId;
     this.originPeerId = originPeerId;
-    this.appData = appData;
+    this.appData = appData || {};
+    this.uid = uid;
     this.engine = engine;
     this.videoConsumer = videoConsumer;
     this.audioConsumer = audioConsumer;
@@ -163,7 +165,7 @@ class Peer {
     }
 
     if (this.videoConsumer) {
-      throw new Error('Already subscribed');
+      return;
     }
 
     await this.createConsumer(this.videoProducer);
@@ -175,7 +177,7 @@ class Peer {
     }
 
     if (this.audioConsumer) {
-      throw new Error('Already subscribed');
+      return;
     }
 
     await this.createConsumer(this.audioProducer);
@@ -357,7 +359,7 @@ class Peer {
       consumer.close();
     } catch (err) {
       this.logger.error('closeConsumer()', consumer, err);
-      throw new Error('Error subscribe media');
+      throw new Error('Error unsubscribe media');
     }
   }
 
@@ -384,7 +386,7 @@ class Peer {
       });
     } catch (err) {
       this.logger.error('changeConsumerPreferredLayers()', { consumerId: this.videoConsumer.id });
-      throw new Error('Error subscribe media');
+      throw new Error('Error change preferred layer');
     }
   }
 
@@ -440,10 +442,10 @@ class Peer {
       if (producer.kind === ProducerKind.VIDEO) {
         this.setVideoProducer(producer);
       } else {
-        this.setVideoProducer(producer);
+        this.setAudioProducer(producer);
       }
 
-      this.engine.clientEventEmitter.safeEmit(PEER_EVENTS.mediaPublished, { kind: producer.kind });
+      this.observer.safeEmit(PEER_EVENTS.mediaPublished, { kind: producer.kind });
     });
 
     this.observer.on(MEDIASOUP_EVENTS.producerClose, (producer: ProducerData) => {
@@ -453,7 +455,22 @@ class Peer {
         this.removeAudioProducer();
       }
 
-      this.engine.clientEventEmitter.safeEmit(PEER_EVENTS.mediaUnPublished, { kind: producer.kind });
+      this.observer.safeEmit(PEER_EVENTS.mediaUnPublished, { kind: producer.kind });
+    });
+
+    this.observer.on(MEDIASOUP_EVENTS.closeConsumer, (consumerId) => {
+      if (this.videoConsumer?.id === consumerId) {
+        this.videoConsumer?.close();
+        this.videoConsumer = undefined;
+        this.observer.safeEmit(PEER_EVENTS.trackEnd, { kind: 'video' });
+        return;
+      }
+
+      if (this.audioConsumer?.id === consumerId) {
+        this.audioConsumer?.close();
+        this.audioConsumer = undefined;
+        this.observer.safeEmit(PEER_EVENTS.trackEnd, { kind: 'audio' });
+      }
     });
 
     this.observer.on(MEDIASOUP_EVENTS.pauseConsumer, (consumerId) => {

package/src/engine/handlers/MediaSoupEventHandler.ts

@@ -33,6 +33,15 @@ class MediaSoupEventHandler {
       peer.observer.safeEmit(MEDIASOUP_EVENTS.newProducer, producer);
     });
 
+    connection.on(MEDIASOUP_EVENTS.closeConsumer, (consumerId: string, peerId: string) => {
+      const peer = this.engine.peers.find((item) => item.id === peerId);
+      if (!peer) {
+        return;
+      }
+
+      peer.observer.safeEmit(MEDIASOUP_EVENTS.closeConsumer, consumerId);
+    });
+
     connection.on(MEDIASOUP_EVENTS.resumeConsumer, (consumerId: string, peerId: string) => {
       const peer = this.engine.peers.find((item) => item.id === peerId);
       if (!peer || peer.isMe) {

package/src/engine/index.ts

@@ -50,7 +50,8 @@ class Engine {
 
   private async initialize(): Promise<void> {
     try {
-      const rtpCapabilities = await this.network.socket.request('router.getRtpCapabilities') as RtpCapabilities;
+      const { rtpCapabilities } = await this.network.socket
+        .request('router.getRtpCapabilities') as { rtpCapabilities: RtpCapabilities };
       await this.media.loadDevice(rtpCapabilities);
       await this.network.createSendTransport(this.media.mediasoupDevice);
       await this.network.createRecvTransport(this.media.mediasoupDevice);
@@ -58,6 +59,7 @@ class Engine {
       this.logger.debug('initialize()');
     } catch (error) {
       this.logger.error('initialize()', error);
+      throw new Error('Error initialize engine');
     }
   }
 
@@ -85,6 +87,7 @@ class Engine {
       this.logger.debug('release()');
     } catch (err) {
       this.logger.error('release()', err);
+      throw new Error('Error release engine');
     }
   }
 
@@ -121,6 +124,7 @@ class Engine {
       this.isJoined = true;
     } catch (error) {
       this.logger.error('join()', error);
+      throw new Error(error);
     }
   }
 
@@ -146,7 +150,7 @@ class Engine {
     }
 
     if (!this.media.mediasoupDevice.canProduce('video')) {
-      return;
+      throw new Error('Cant produce video');
     }
 
     if (!this.system.availableVideoDevices.length) {
@@ -210,6 +214,10 @@ class Engine {
       return;
     }
 
+    if (!this.media.mediasoupDevice.canProduce('audio')) {
+      throw new Error('Cant produce audio');
+    }
+
     const audioStream = await this.system.startAudioStream();
     this.system.setIsEnableAudioDevicesLock(true);
 
@@ -247,7 +255,6 @@ class Engine {
       this.logger.debug('publishAudio()');
     } catch (error) {
       this.logger.error('publishAudio()');
-
       throw new Error('Enable audio error');
     } finally {
       this.system.setIsEnableAudioDevicesLock(false);

package/src/engine/network/LoadBalancerClient.ts

@@ -7,7 +7,7 @@ class LoadBalancerApiClient {
 
   constructor() {
     this.api = axios.create({
-      baseURL: 'https://lb.livedigital.space/v1',
+      baseURL: process.env.LIVEDIGITAL_APP_LOAD_BALANCER_BASE_URL,
       timeout: 5000,
       withCredentials: false,
       paramsSerializer: (params) => qs.stringify(params),

package/src/engine/system/index.ts

@@ -21,14 +21,11 @@ class System {
 
   public currentVideoDeviceId?: string;
 
-  public getUserMediaError?: string = undefined;
-
-  public deviceIsBusy?: boolean = false;
-
   private readonly logger: Logger;
 
   constructor() {
     this.logger = new Logger('System');
+    this.listenDevices();
   }
 
   setIsEnableVideoDevicesLock(value: boolean): void {
@@ -98,7 +95,19 @@ class System {
     };
   }
 
-  async startVideoStream(params?: VideoConstraintParams): Promise<MediaStream | undefined> {
+  async getVideoTrack(): Promise<MediaStreamTrack> {
+    const videoStream = this.videoStream || await this.startVideoStream();
+    const [track] = videoStream.getVideoTracks();
+    return track;
+  }
+
+  async getAudioTrack(): Promise<MediaStreamTrack> {
+    const videoStream = this.videoStream || await this.startAudioStream();
+    const [track] = videoStream.getAudioTracks();
+    return track;
+  }
+
+  async startVideoStream(params?: VideoConstraintParams): Promise<MediaStream> {
     if (!this.videoStream || !this.videoStream.active) {
       try {
         this.videoStream = await navigator.mediaDevices.getUserMedia({
@@ -108,16 +117,12 @@ class System {
         this.logger.error('startVideoStream()');
 
         if (error.name === 'NotReadableError') {
-          this.deviceIsBusy = true;
           this.videoStream = undefined;
-
-          return undefined;
+          throw new Error('DeviceIsBusy');
         }
 
-        if (error.name === 'NotAllowedError') {
-          this.getUserMediaError = error.name;
-
-          return undefined;
+        if (error.name === 'This action is not allowed') {
+          throw new Error('NotAllowedError');
         }
 
         throw new Error('Can`t start video stream');
@@ -127,7 +132,7 @@ class System {
     return this.videoStream;
   }
 
-  async startAudioStream(params?: AudioConstraintParams): Promise<MediaStream | undefined> {
+  async startAudioStream(params?: AudioConstraintParams): Promise<MediaStream> {
     if (!this.audioStream || !this.audioStream.active) {
       try {
         this.audioStream = await navigator.mediaDevices.getUserMedia({
@@ -137,16 +142,12 @@ class System {
         this.logger.error('startAudioStream()', error);
 
         if (error.name === 'NotReadableError') {
-          this.deviceIsBusy = true;
           this.audioStream = undefined;
-
-          return undefined;
+          throw new Error('DeviceIsBusy');
         }
 
         if (error.name === 'NotAllowedError') {
-          this.getUserMediaError = error.name;
-
-          return undefined;
+          throw new Error('Device access denied');
         }
 
         throw new Error('Can`t start audio stream');
@@ -158,8 +159,6 @@ class System {
 
   async detectDevices(): Promise<void> {
     this.isDevicesLoaded = false;
-    this.deviceIsBusy = false;
-    this.getUserMediaError = undefined;
 
     try {
       const mediaDevices = await navigator.mediaDevices.enumerateDevices();
@@ -176,7 +175,7 @@ class System {
         });
       } catch (error) {
         if (error.name === 'NotReadableError') {
-          this.deviceIsBusy = true;
+          throw new Error('DeviceIsBusy');
         }
       }
 
@@ -202,12 +201,19 @@ class System {
       this.setAvailableAudioDevices(audioDevices);
       this.isDevicesLoaded = true;
     } catch (error) {
-      this.getUserMediaError = error.name || error;
       this.logger.error('detectDevices()');
       throw new Error('Can`t detect devices');
     }
   }
 
+  listenDevices(): void {
+    navigator.mediaDevices.ondevicechange = () => {
+      if (this.isDevicesLoaded) {
+        this.detectDevices();
+      }
+    };
+  }
+
   stopVideoStream(): void {
     if (!this.videoStream) {
       return;

package/src/index.ts

@@ -43,7 +43,23 @@ class Client {
     return !!this.engine.media.audioProducer?.paused;
   }
 
-  async getDevices(): Promise<AvailableMediaDevices> {
+  get availableVideoDevices(): MediaDeviceInfo[] {
+    return this.engine.system.availableVideoDevices;
+  }
+
+  get availableAudioDevices(): MediaDeviceInfo[] {
+    return this.engine.system.availableAudioDevices;
+  }
+
+  get currentAudioDeviceId(): string | undefined {
+    return this.engine.system.currentAudioDeviceId;
+  }
+
+  get currentVideoDeviceId(): string | undefined {
+    return this.engine.system.currentVideoDeviceId;
+  }
+
+  async detectDevices(): Promise<AvailableMediaDevices> {
     await this.engine.system.detectDevices();
     return {
       video: this.engine.system.availableVideoDevices,
@@ -51,6 +67,22 @@ class Client {
     };
   }
 
+  async getVideoStream(): Promise<MediaStream> {
+    return this.engine.system.videoStream || this.engine.system.startVideoStream();
+  }
+
+  async getAudioStream(): Promise<MediaStream> {
+    return this.engine.system.audioStream || this.engine.system.startAudioStream();
+  }
+
+  async getVideoTrack(): Promise<MediaStreamTrack> {
+    return this.engine.system.getVideoTrack();
+  }
+
+  async getAudioTrack(): Promise<MediaStreamTrack> {
+    return this.engine.system.getAudioTrack();
+  }
+
   setVideoDevice(deviceId: string): void {
     this.engine.system.setCurrentVideoDevice(deviceId);
   }