@techsee/techsee-media-service 7.0.2 → 8.0.0

package/lib/MultiParty/OpentokMultiPartyService.js

@@ -214,6 +214,8 @@ var MediaCapabilitiesUtils_1 = require("./MediaCapabilitiesUtils");
 
 var MultiPartyService_1 = require("./MultiPartyService");
 
+var MultipartyServiceEventTypes_1 = require("./MultipartyServiceEventTypes");
+
 var trace = MediaUtils_1.getMediaTracer('Multiparty'); // The preferred camera position to use for the video source
 
 var OpentokFacingMode;
@@ -259,11 +261,13 @@ function (_super) {
 
             _this.traceErrorCallback(error);
 
-            _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.connectFailed, {
+            var e = {
               meta: {
                 err: JSON.stringify(error)
               }
-            });
+            };
+
+            _this.emit(MultipartyServiceEventTypes_1.MULTI_PARTY_EVENTS.connectFailed, e);
 
             return;
           }
@@ -272,12 +276,13 @@ function (_super) {
         });
       } catch (err) {
         trace.error(JSON.stringify(err));
-
-        _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.connectFailed, {
+        var e = {
           meta: {
             err: JSON.stringify(err)
           }
-        });
+        };
+
+        _this.emit(MultipartyServiceEventTypes_1.MULTI_PARTY_EVENTS.connectFailed, e);
       }
     };
 
@@ -477,7 +482,7 @@ function (_super) {
 
     _this.switchCamera = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var mediaCapabilitiesService, deviceId, cameraType_1, err_1;
+        var mediaCapabilitiesService, deviceId, cameraSource_1, err_1;
 
         var _this = this;
 
@@ -503,12 +508,12 @@ function (_super) {
 
               switch (this.settings.selectedCamera) {
                 case MediaConstants_1.MultiPartyCameraTypes.BACK:
-                  cameraType_1 = MediaConstants_1.MultiPartyCameraTypes.FRONT;
+                  cameraSource_1 = MediaConstants_1.MultiPartyCameraTypes.FRONT;
                   deviceId = mediaCapabilitiesService.frontCameraDeviceId;
                   break;
 
                 case MediaConstants_1.MultiPartyCameraTypes.FRONT:
-                  cameraType_1 = MediaConstants_1.MultiPartyCameraTypes.BACK;
+                  cameraSource_1 = MediaConstants_1.MultiPartyCameraTypes.BACK;
                   deviceId = mediaCapabilitiesService.backCameraDeviceId;
                   break;
 
@@ -519,13 +524,15 @@ function (_super) {
               return [4
               /*yield*/
               , (_a = this.currentPublisher) === null || _a === void 0 ? void 0 : _a.setVideoSource(deviceId).then(function () {
-                _this.settings.selectedCamera = cameraType_1;
+                _this.settings.selectedCamera = cameraSource_1;
+                var e = {
+                  cameraSource: cameraSource_1,
+                  mirror: true
+                };
 
-                _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.cameraSourceChanged, {
-                  cameraSource: cameraType_1
-                });
+                _this.emit(MultipartyServiceEventTypes_1.MULTI_PARTY_EVENTS.cameraSourceChanged, e);
 
-                trace.info("Success to switch camera to cameraType: " + cameraType_1);
+                trace.info("Success to switch camera to cameraSource: " + cameraSource_1);
               })];
 
             case 2:
@@ -594,63 +601,61 @@ function (_super) {
                 this.currentPublisher.on('videoElementCreated', function (event) {
                   trace.info('videoElementCreated', event);
 
-                  _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.videoElementCreated, event);
+                  _this.emit(MultipartyServiceEventTypes_1.MULTI_PARTY_EVENTS.videoElementCreated);
                 });
                 this.currentPublisher.on('streamDestroyed', function (event) {
-                  var _a;
-
                   trace.info('Publisher stream destroyed', event);
+                  var connection = event.stream.connection;
+                  var connectionId = connection.connectionId;
+                  var e = {
+                    participantId: _this.getParticipantId(connectionId),
+                    connectionId: connectionId,
+                    isOwnConnection: true,
+                    clientRole: _this.getClientRole(connection)
+                  };
 
-                  _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.streamDestroyed, {
-                    event: event,
-                    participantId: _this.getParticipantId((_a = event === null || event === void 0 ? void 0 : event.stream) === null || _a === void 0 ? void 0 : _a.connection.connectionId)
-                  });
+                  _this.emit(MultipartyServiceEventTypes_1.MULTI_PARTY_EVENTS.streamDestroyed, e);
                 });
-                this.currentPublisher.on('accessDenied', function (event) {
-                  var _a;
-
-                  trace.info('Publisher denied media permissions', event);
-                  var connection = (_a = _this.session) === null || _a === void 0 ? void 0 : _a.connection;
-                  var connectionId = connection === null || connection === void 0 ? void 0 : connection.connectionId;
-
-                  var participantId = _this.getParticipantId(connectionId);
+                this.currentPublisher.on('accessDenied', function () {
+                  trace.info('Publisher denied media permissions');
+                  var e = {
+                    isOwnConnection: true
+                  };
 
-                  var isOwnConnection = _this.ownConnectionId === connectionId;
-
-                  _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.mediaDeviceAccessDenied, {
-                    connectionId: connectionId,
-                    isOwnConnection: isOwnConnection,
-                    participantId: participantId
-                  });
+                  _this.emit(MultipartyServiceEventTypes_1.MULTI_PARTY_EVENTS.mediaDeviceAccessDenied, e);
                 });
                 this.currentPublisher.on('streamCreated', function (event) {
                   return __awaiter(_this, void 0, void 0, function () {
-                    var participantId;
-
-                    var _a, _b, _c, _d, _e, _f, _g;
+                    var _a, hasAudio, hasVideo, connectionId, participantId, clientRole, e;
 
-                    return __generator(this, function (_h) {
-                      switch (_h.label) {
+                    return __generator(this, function (_b) {
+                      switch (_b.label) {
                         case 0:
                           return [4
                           /*yield*/
                           , MediaCapabilitiesService_1.MediaCapabilitiesService.setDevicesList()];
 
                         case 1:
-                          _h.sent();
+                          _b.sent();
 
-                          participantId = this.getParticipantId((_a = event === null || event === void 0 ? void 0 : event.stream) === null || _a === void 0 ? void 0 : _a.connection.connectionId);
-                          this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.streamCreated, {
-                            event: event,
+                          _a = event.stream, hasAudio = _a.hasAudio, hasVideo = _a.hasVideo;
+                          connectionId = event.stream.connection.connectionId;
+                          participantId = this.getParticipantId(connectionId);
+                          clientRole = this.getClientRole(event.stream.connection);
+                          e = {
                             participantId: participantId,
-                            startWithAudioMuted: this.settings.startWithAudioMuted,
-                            hasAudio: (_b = event === null || event === void 0 ? void 0 : event.stream) === null || _b === void 0 ? void 0 : _b.hasAudio,
-                            hasVideo: (_c = event === null || event === void 0 ? void 0 : event.stream) === null || _c === void 0 ? void 0 : _c.hasVideo,
-                            isOwnConnection: this.ownConnectionId === ((_e = (_d = event === null || event === void 0 ? void 0 : event.stream) === null || _d === void 0 ? void 0 : _d.connection) === null || _e === void 0 ? void 0 : _e.connectionId)
-                          });
+                            clientRole: clientRole,
+                            connectionId: connectionId,
+                            hasVideo: hasVideo,
+                            hasAudio: hasAudio,
+                            isOwnConnection: true,
+                            audioEnabled: !this.settings.startWithAudioMuted,
+                            mirror: true
+                          };
+                          this.emit(MultipartyServiceEventTypes_1.MULTI_PARTY_EVENTS.streamCreated, e);
                           trace.info('publisher stream created', {
                             event: event,
-                            hasAudio: (_g = (_f = this.currentPublisher) === null || _f === void 0 ? void 0 : _f.stream) === null || _g === void 0 ? void 0 : _g.hasAudio,
+                            hasAudio: hasAudio,
                             participantId: participantId
                           });
                           return [2
@@ -682,68 +687,51 @@ function (_super) {
 
     _this.reinitializeStreams = function (settings) {
       return __awaiter(_this, void 0, void 0, function () {
-        var _this = this;
-
-        return __generator(this, function (_a) {
-          switch (_a.label) {
-            case 0:
-              if (!this.session) {
-                return [2
-                /*return*/
-                ];
-              }
-
-              if (this.currentPublisher) {
-                this.currentPublisher.destroy();
-                this.currentPublisher = undefined;
-              }
-
-              return [4
-              /*yield*/
-              , this.createPublisher(settings)];
+        var _a;
 
-            case 1:
-              _a.sent();
+        return __generator(this, function (_b) {
+          if (!this.session) {
+            return [2
+            /*return*/
+            ];
+          }
 
-              this.subscriberList = this.subscriberList.map(function (s) {
-                var _a;
+          this.subscriberList.map(function (s) {
+            return s.subscriber;
+          }).forEach((_a = this.session) === null || _a === void 0 ? void 0 : _a.unsubscribe);
+          this.subscriberList = [];
 
-                var connectionId = s.connectionId,
-                    subscriber = s.subscriber;
-                var stream = subscriber.stream;
-                (_a = _this.session) === null || _a === void 0 ? void 0 : _a.unsubscribe(subscriber);
-                return __assign(__assign({}, s), {
-                  subscriber: _this.createSubscriber(stream, connectionId)
-                });
-              });
-              return [2
-              /*return*/
-              ];
+          if (this.currentPublisher) {
+            this.currentPublisher.destroy();
+            this.currentPublisher = undefined;
           }
+
+          return [2
+          /*return*/
+          , this.createPublisher(settings)];
         });
       });
     };
 
     _this.streamCreatedHandler = function (event) {
       return __awaiter(_this, void 0, void 0, function () {
-        var stream, connection, connectionId, participantId, subscriber;
-
-        var _a, _b;
-
-        return __generator(this, function (_c) {
-          switch (_c.label) {
+        var stream, connection, connectionId, hasAudio, hasVideo, participantId, clientRole, subscriber, e;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
             case 0:
               trace.info('streamCreatedHandler', event.stream);
               stream = event.stream;
               connection = stream.connection;
               connectionId = connection.connectionId;
+              hasAudio = stream.hasAudio, hasVideo = stream.hasVideo;
               participantId = this.getParticipantId(connectionId);
+              clientRole = this.getClientRole(connection);
               return [4
               /*yield*/
               , MediaCapabilitiesService_1.MediaCapabilitiesService.setDevicesList()];
 
             case 1:
-              _c.sent();
+              _a.sent();
 
               if (this.ownConnectionId && stream && connectionId !== this.ownConnectionId) {
                 if (this.subscriberList.length < MultiPartyService_1.maxParticipantsNumber - 1) {
@@ -751,21 +739,24 @@ function (_super) {
                   this.subscriberList.push({
                     subscriber: subscriber,
                     connectionId: connectionId,
-                    clientRole: this.getClientRole(connection)
+                    clientRole: clientRole
                   });
                 } else {
                   trace.info("a new subscriber cannot be added, as the number of participants reached its limit: " + MultiPartyService_1.maxParticipantsNumber);
                 }
               }
 
-              this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.streamCreated, {
-                event: event,
+              e = {
                 participantId: participantId,
-                startWithAudioMuted: this.settings.startWithAudioMuted,
-                isOwnConnection: this.ownConnectionId === connectionId,
-                hasVideo: (_a = event === null || event === void 0 ? void 0 : event.stream) === null || _a === void 0 ? void 0 : _a.hasVideo,
-                hasAudio: (_b = event === null || event === void 0 ? void 0 : event.stream) === null || _b === void 0 ? void 0 : _b.hasAudio
-              });
+                clientRole: clientRole,
+                connectionId: connectionId,
+                hasVideo: hasVideo,
+                hasAudio: hasAudio,
+                isOwnConnection: false,
+                audioEnabled: !this.settings.startWithAudioMuted,
+                mirror: true
+              };
+              this.emit(MultipartyServiceEventTypes_1.MULTI_PARTY_EVENTS.streamCreated, e);
               return [2
               /*return*/
               ];
@@ -774,80 +765,81 @@ function (_super) {
       });
     };
 
-    _this.streamPropertyChangedHandler = function (event) {
-      var _a;
-
-      trace.info('streamPropertyChangedHandler', event);
-      var stream = event.stream;
-
-      _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.videoAudioStatus, {
-        hasVideo: stream === null || stream === void 0 ? void 0 : stream.hasVideo,
-        hasAudio: stream === null || stream === void 0 ? void 0 : stream.hasAudio,
-        participantId: _this.getParticipantId(stream === null || stream === void 0 ? void 0 : stream.connection.connectionId),
-        isOwnConnection: _this.ownConnectionId === ((_a = stream === null || stream === void 0 ? void 0 : stream.connection) === null || _a === void 0 ? void 0 : _a.connectionId),
-        stream: stream
-      });
-    };
-
     _this.streamDestroyedHandler = function (event) {
-      var _a;
-
       trace.info('streamDestroyedHandler', event);
-      var stream = event.stream;
-      var destroyedConnectionId = stream && stream.connection && stream.connection.connectionId;
+      var connection = event.stream.connection;
+      var connectionId = connection.connectionId;
+      var e = {
+        participantId: _this.getParticipantId(connectionId),
+        connectionId: connectionId,
+        isOwnConnection: false,
+        clientRole: _this.getClientRole(connection)
+      };
       _this.subscriberList = _this.subscriberList.filter(function (subscriber) {
-        return subscriber.connectionId !== destroyedConnectionId;
+        return subscriber.connectionId !== connectionId;
       });
 
-      _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.streamDestroyed, {
-        event: event,
-        participantId: _this.getParticipantId((_a = event === null || event === void 0 ? void 0 : event.stream) === null || _a === void 0 ? void 0 : _a.connection.connectionId)
-      });
+      _this.emit(MultipartyServiceEventTypes_1.MULTI_PARTY_EVENTS.streamDestroyed, e);
     };
 
     _this.connectionCreatedHandler = function (event) {
       trace.info('connectionCreatedHandler', event);
       var connection = event.connection;
+      var connectionId = connection.connectionId;
 
       if (!_this.ownConnectionId || !connection) {
         return;
       }
 
-      _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.participantsNumberChanged, _this.subscriberList.length);
-
-      var clientRole = _this.getClientRole(connection);
+      var e = {
+        clientRole: _this.getClientRole(connection),
+        participantId: _this.getParticipantId(connectionId),
+        connectionId: connectionId,
+        isOwnConnection: _this.checkOwnConnection(connectionId)
+      };
 
-      _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.connectionCreated, {
-        clientRole: clientRole,
-        event: event,
-        participantId: _this.getParticipantId(connection.connectionId),
-        isOwnConnection: _this.ownConnectionId === connection.connectionId
-      });
+      _this.emit(MultipartyServiceEventTypes_1.MULTI_PARTY_EVENTS.connectionCreated, e);
     };
 
     _this.connectionDestroyedHandler = function (event) {
       var connection = event.connection;
-
-      var clientRole = _this.getClientRole(connection);
-
+      var connectionId = connection.connectionId;
       trace.info('connectionDestroyedHandler', event);
+      var e = {
+        clientRole: _this.getClientRole(connection),
+        participantId: _this.getParticipantId(connectionId),
+        connectionId: connectionId,
+        isOwnConnection: _this.checkOwnConnection(connectionId)
+      };
 
-      _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.connectionDestroyed, {
-        clientRole: clientRole,
-        event: event,
-        participantId: _this.getParticipantId(event === null || event === void 0 ? void 0 : event.connection.connectionId),
-        isOwnConnection: _this.ownConnectionId === connection.connectionId
-      });
+      _this.emit(MultipartyServiceEventTypes_1.MULTI_PARTY_EVENTS.connectionDestroyed, e);
 
-      if (!_this.ownConnectionId || !connection || connection.connectionId !== _this.ownConnectionId) {
+      if (connectionId !== _this.ownConnectionId || !_this.ownConnectionId) {
         return;
       }
 
-      _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.participantsNumberChanged, _this.subscriberList.length);
-
       _this.session = undefined;
     };
 
+    _this.streamPropertyChangedHandler = function (event) {
+      trace.info('streamPropertyChangedHandler', event);
+      var _a = event.stream,
+          hasVideo = _a.hasVideo,
+          hasAudio = _a.hasAudio,
+          connection = _a.connection;
+      var connectionId = connection.connectionId;
+      var e = {
+        hasVideo: hasVideo,
+        hasAudio: hasAudio,
+        participantId: _this.getParticipantId(connectionId),
+        connectionId: connectionId,
+        isOwnConnection: _this.checkOwnConnection(connectionId),
+        clientRole: _this.getClientRole(connection)
+      };
+
+      _this.emit(MultipartyServiceEventTypes_1.MULTI_PARTY_EVENTS.streamPropertyChanged, e);
+    };
+
     _this.traceErrorCallback = function (error) {
       trace.error(JSON.stringify(error));
     };
@@ -874,15 +866,18 @@ function (_super) {
         }
       }, function (err) {
         _this.traceErrorCallback(err);
-
-        subscriber === null || subscriber === void 0 ? void 0 : subscriber.on('videoElementCreated', function (event) {
-          trace.info('videoElementCreated', event);
-        });
       });
 
+      subscriber.on('videoElementCreated', function (event) {
+        trace.info('videoElementCreated', event);
+      });
       return subscriber;
     };
 
+    _this.checkOwnConnection = function (connectionId) {
+      return _this.ownConnectionId !== undefined && _this.ownConnectionId === connectionId;
+    };
+
     _this.branding = settings.branding;
     return _this;
   }