@techsee/techsee-media-service 2.0.1 → 4.0.0

package/lib/MultiParty/{OpentokMultiparty.js → OpentokMultiPartyService.js}

@@ -26,6 +26,22 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
 var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -169,32 +185,22 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
-var __importDefault = void 0 && (void 0).__importDefault || function (mod) {
-  return mod && mod.__esModule ? mod : {
-    "default": mod
-  };
-};
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.OpentokMultiparty = void 0;
+exports.OpentokMultiPartyService = void 0;
 
-var MultiParty_1 = require("./MultiParty");
+var MultiPartyService_1 = require("./MultiPartyService");
 
 var MediaConstants_1 = require("../MediaConstants");
 
-var MediaTracer_1 = require("../MediaUtils/MediaTracer");
+var MediaUtils_1 = require("../MediaUtils");
 
-var get_1 = __importDefault(require("lodash/get"));
+var MediaCapabilitiesUtils_1 = require("./MediaCapabilitiesUtils");
 
-var filter_1 = __importDefault(require("lodash/filter"));
+var MediaCapabilitiesService_1 = require("./MediaCapabilitiesService");
 
-var cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
-
-var MediaCapabilitiesHelper_1 = require("./MediaCapabilitiesHelper");
-
-var trace = MediaTracer_1.getMediaTracer('Multiparty'); // The preferred camera position to use for the video source
+var trace = MediaUtils_1.getMediaTracer('Multiparty'); // The preferred camera position to use for the video source
 
 var OpentokFacingMode;
 
@@ -203,26 +209,24 @@ var OpentokFacingMode;
   OpentokFacingMode["ENVIRONMENT"] = "environment";
 })(OpentokFacingMode || (OpentokFacingMode = {}));
 
-var OpentokMultiparty =
+var OpentokMultiPartyService =
 /** @class */
 function (_super) {
-  __extends(OpentokMultiparty, _super);
+  __extends(OpentokMultiPartyService, _super);
 
-  function OpentokMultiparty(settings, getParticipantDomId) {
+  function OpentokMultiPartyService(settings, getParticipantDomId) {
     var _this = _super.call(this, settings) || this;
 
     _this.subscribers = [];
     _this.participantCount = 0;
 
     _this.connect = function (credentials) {
-      _this.credentials = credentials;
-
       try {
         _this.session = window === null || window === void 0 ? void 0 : window.OT.initSession(credentials.apiKey, credentials.sessionId);
       } catch (err) {
         trace.error(JSON.stringify(err));
 
-        _this.emit(MultiParty_1.MULTI_PARTY_EVENTS.connectFailed, {
+        _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.connectFailed, {
           meta: {
             err: JSON.stringify(err)
           }
@@ -254,7 +258,7 @@ function (_super) {
                   (_a = this.session) === null || _a === void 0 ? void 0 : _a.off();
                   this.session = null;
                   this.traceErrorCallback(error);
-                  this.emit(MultiParty_1.MULTI_PARTY_EVENTS.connectFailed, {
+                  this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.connectFailed, {
                     meta: {
                       err: JSON.stringify(error)
                     }
@@ -264,13 +268,6 @@ function (_super) {
                   ];
                 }
 
-                if (this.settings.defaultCamera === MediaConstants_1.CameraTypes.NONE && this.settings.startWithAudioMuted) {
-                  trace.info('camera is none, no need to create publisher');
-                  return [2
-                  /*return*/
-                  ];
-                }
-
                 return [4
                 /*yield*/
                 , this.createPublisher(this.settings)];
@@ -302,119 +299,57 @@ function (_super) {
       }
     };
 
-    _this.couldStartPublishVideo = function (settings) {
+    _this.createPublisher = function (settings) {
       return __awaiter(_this, void 0, void 0, function () {
-        var mediaCapabilitiesHelper, err_1;
-        return __generator(this, function (_a) {
-          switch (_a.label) {
-            case 0:
-              _a.trys.push([0, 2,, 3]);
-
-              return [4
-              /*yield*/
-              , MediaCapabilitiesHelper_1.MediaCapabilitiesHelper.getInstance()];
-
-            case 1:
-              mediaCapabilitiesHelper = _a.sent();
-              return [2
-              /*return*/
-              , settings.defaultCamera !== MediaConstants_1.CameraTypes.NONE ? mediaCapabilitiesHelper.hasCamera() : false];
-
-            case 2:
-              err_1 = _a.sent();
-              trace.error(JSON.stringify(err_1));
-              throw err_1;
-
-            case 3:
-              return [2
-              /*return*/
-              ];
-          }
-        });
-      });
-    };
-
-    _this.couldStartPublishAudio = function (settings) {
-      return __awaiter(_this, void 0, void 0, function () {
-        var mediaCapabilitiesHelper, err_2;
-        return __generator(this, function (_a) {
-          switch (_a.label) {
-            case 0:
-              _a.trys.push([0, 2,, 3]);
-
-              return [4
-              /*yield*/
-              , MediaCapabilitiesHelper_1.MediaCapabilitiesHelper.getInstance()];
-
-            case 1:
-              mediaCapabilitiesHelper = _a.sent();
-              return [2
-              /*return*/
-              , !settings.startWithAudioMuted && mediaCapabilitiesHelper.hasMicrophone()];
-
-            case 2:
-              err_2 = _a.sent();
-              trace.error(JSON.stringify(err_2));
-              throw err_2;
-
-            case 3:
-              return [2
-              /*return*/
-              ];
-          }
-        });
-      });
-    };
-
-    _this.createPublisher = function (settingsForPublisher) {
-      return __awaiter(_this, void 0, void 0, function () {
-        var settings, couldStartPublishVideo, couldStartPublishAudio;
+        var canStartWithAudio, canStartWithVideo;
 
         var _a;
 
         return __generator(this, function (_b) {
           switch (_b.label) {
             case 0:
-              settings = cloneDeep_1["default"](settingsForPublisher);
               return [4
               /*yield*/
-              , this.couldStartPublishVideo(settings)];
+              , MediaCapabilitiesUtils_1.checkAudioCapabilities()];
 
             case 1:
-              couldStartPublishVideo = _b.sent();
+              canStartWithAudio = _b.sent();
               return [4
               /*yield*/
-              , this.couldStartPublishAudio(settings)];
+              , MediaCapabilitiesUtils_1.checkVideoCapabilities()];
 
             case 2:
-              couldStartPublishAudio = _b.sent();
+              canStartWithVideo = _b.sent();
 
-              if (!couldStartPublishVideo && !couldStartPublishAudio) {
+              if (!canStartWithAudio && !canStartWithVideo) {
                 // FIXME: use emitter
-                trace.error('could not create a publisher, due to lack of media capabilities or settings');
+                trace.error('Did not create publisher due to lack of media capabilities.');
                 return [2
                 /*return*/
                 ];
               }
 
-              if (!couldStartPublishVideo) {
-                settings.defaultCamera = MediaConstants_1.CameraTypes.NONE;
-              }
+              if (!!this.currentPublisher) return [3
+              /*break*/
+              , 4];
+              return [4
+              /*yield*/
+              , this.initPublisher(__assign(__assign({}, settings), {
+                cameraEnabled: settings.cameraEnabled && canStartWithVideo,
+                startWithAudioMuted: settings.startWithAudioMuted && canStartWithAudio
+              }))];
 
-              if (!couldStartPublishAudio) {
-                settings.startWithAudioMuted = true;
-              }
+            case 3:
+              _b.sent();
 
               if (!this.currentPublisher) {
-                this.initPublisher(settings);
-
-                if (!this.currentPublisher) {
-                  throw new Error('Creating session requires initialized publisher');
-                }
-
-                this.currentPublisher && ((_a = this.session) === null || _a === void 0 ? void 0 : _a.publish(this.currentPublisher, this.traceErrorCallback));
+                throw new Error('Creating session requires initialized publisher');
               }
 
+              this.currentPublisher && ((_a = this.session) === null || _a === void 0 ? void 0 : _a.publish(this.currentPublisher, this.traceErrorCallback));
+              _b.label = 4;
+
+            case 4:
               return [2
               /*return*/
               ];
@@ -425,27 +360,18 @@ function (_super) {
 
     _this.publishAudio = function (shouldMute) {
       return __awaiter(_this, void 0, void 0, function () {
-        var settings, _a;
-
-        return __generator(this, function (_b) {
-          switch (_b.label) {
+        var canPublishAudio;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
             case 0:
-              settings = cloneDeep_1["default"](this.settings);
-              settings.startWithAudioMuted = !shouldMute;
-              _a = shouldMute;
-              if (!_a) return [3
-              /*break*/
-              , 2];
               return [4
               /*yield*/
-              , this.couldStartPublishAudio(settings)];
+              , MediaCapabilitiesUtils_1.checkAudioCapabilities()];
 
             case 1:
-              _a = !_b.sent();
-              _b.label = 2;
+              canPublishAudio = _a.sent(); // why do we care about audio if 'shouldMute' is true?
 
-            case 2:
-              if (_a) {
+              if (shouldMute && !canPublishAudio) {
                 trace.error('could not publish audio');
                 return [2
                 /*return*/
@@ -454,23 +380,26 @@ function (_super) {
 
               if (!!this.currentPublisher) return [3
               /*break*/
-              , 4];
+              , 3];
               return [4
               /*yield*/
-              , this.createPublisher(settings)];
+              , this.createPublisher(__assign(__assign({}, this.settings), {
+                // so if 'shouldMute' is true then we DON't mute?
+                startWithAudioMuted: !shouldMute
+              }))];
 
-            case 3:
-              _b.sent();
+            case 2:
+              _a.sent();
 
               return [3
               /*break*/
-              , 5];
+              , 4];
 
-            case 4:
+            case 3:
               this.currentPublisher.publishAudio(shouldMute);
-              _b.label = 5;
+              _a.label = 4;
 
-            case 5:
+            case 4:
               return [2
               /*return*/
               ];
@@ -481,27 +410,18 @@ function (_super) {
 
     _this.publishVideo = function (shouldPublishVideo) {
       return __awaiter(_this, void 0, void 0, function () {
-        var settings, _a;
-
-        return __generator(this, function (_b) {
-          switch (_b.label) {
+        var canPublishVideo;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
             case 0:
-              settings = cloneDeep_1["default"](this.settings);
-              settings.defaultCamera = shouldPublishVideo ? this.settings.defaultCamera : MediaConstants_1.CameraTypes.NONE;
-              _a = shouldPublishVideo;
-              if (!_a) return [3
-              /*break*/
-              , 2];
               return [4
               /*yield*/
-              , this.couldStartPublishVideo(settings)];
+              , MediaCapabilitiesUtils_1.checkVideoCapabilities()];
 
             case 1:
-              _a = !_b.sent();
-              _b.label = 2;
+              canPublishVideo = _a.sent();
 
-            case 2:
-              if (_a) {
+              if (shouldPublishVideo && !canPublishVideo) {
                 trace.error('could not publish video');
                 return [2
                 /*return*/
@@ -510,23 +430,25 @@ function (_super) {
 
               if (!!this.currentPublisher) return [3
               /*break*/
-              , 4];
+              , 3];
               return [4
               /*yield*/
-              , this.createPublisher(settings)];
+              , this.createPublisher(__assign(__assign({}, this.settings), {
+                cameraEnabled: shouldPublishVideo
+              }))];
 
-            case 3:
-              _b.sent();
+            case 2:
+              _a.sent();
 
               return [3
               /*break*/
-              , 5];
+              , 4];
 
-            case 4:
+            case 3:
               this.currentPublisher.publishVideo(shouldPublishVideo);
-              _b.label = 5;
+              _a.label = 4;
 
-            case 5:
+            case 4:
               return [2
               /*return*/
               ];
@@ -537,7 +459,7 @@ function (_super) {
 
     _this.switchCamera = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var mediaCapabilitiesHelper, deviceId, cameraType_1, err_3;
+        var mediaCapabilitiesService, deviceId, cameraType_1, err_1;
 
         var _this = this;
 
@@ -550,44 +472,48 @@ function (_super) {
 
               return [4
               /*yield*/
-              , MediaCapabilitiesHelper_1.MediaCapabilitiesHelper.getInstance()];
+              , MediaCapabilitiesService_1.MediaCapabilitiesService.getInstance()];
 
             case 1:
-              mediaCapabilitiesHelper = _b.sent();
+              mediaCapabilitiesService = _b.sent();
 
-              if (!mediaCapabilitiesHelper.supportSwitchCamera) {
+              if (!mediaCapabilitiesService.supportSwitchCamera) {
                 throw new Error('Not Support switch camera');
               }
 
               deviceId = '';
-              cameraType_1 = MediaConstants_1.CameraTypes.NONE;
 
-              switch (this.settings.defaultCamera) {
-                case MediaConstants_1.CameraTypes.BACK:
-                  cameraType_1 = MediaConstants_1.CameraTypes.FRONT;
-                  deviceId = mediaCapabilitiesHelper.frontCameraDeviceId;
+              switch (this.settings.selectedCamera) {
+                case MediaConstants_1.MultiPartyCameraTypes.BACK:
+                  cameraType_1 = MediaConstants_1.MultiPartyCameraTypes.FRONT;
+                  deviceId = mediaCapabilitiesService.frontCameraDeviceId;
                   break;
 
-                case MediaConstants_1.CameraTypes.FRONT:
-                  cameraType_1 = MediaConstants_1.CameraTypes.BACK;
-                  deviceId = mediaCapabilitiesHelper.backCameraDeviceId;
+                case MediaConstants_1.MultiPartyCameraTypes.FRONT:
+                  cameraType_1 = MediaConstants_1.MultiPartyCameraTypes.BACK;
+                  deviceId = mediaCapabilitiesService.backCameraDeviceId;
                   break;
 
                 default:
-                  throw new Error("cameraType not valid: " + this.settings.defaultCamera);
+                  throw new Error("cameraType not valid: " + this.settings.selectedCamera);
               }
 
               return [2
               /*return*/
               , (_a = this.currentPublisher) === null || _a === void 0 ? void 0 : _a.setVideoSource(deviceId).then(function () {
-                _this.settings.defaultCamera = cameraType_1;
+                _this.settings.selectedCamera = cameraType_1;
+
+                _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.cameraSourceChanged, {
+                  cameraSource: cameraType_1
+                });
+
                 trace.info("Success to switch camera to cameraType: " + cameraType_1);
               })];
 
             case 2:
-              err_3 = _b.sent();
-              trace.error(JSON.stringify(err_3));
-              throw err_3;
+              err_1 = _b.sent();
+              trace.error(JSON.stringify(err_1));
+              throw err_1;
 
             case 3:
               return [2
@@ -599,101 +525,137 @@ function (_super) {
     };
 
     _this.initPublisher = function (settings) {
-      var _a, _b;
-
-      var properties = {
-        insertMode: 'append',
-        fitMode: 'cover',
-        width: '100%',
-        height: '100%',
-        style: {
-          buttonDisplayMode: 'off',
-          archiveStatusDisplayMode: 'off',
-          audioLevelDisplayMode: 'off',
-          backgroundImageURI: ((_a = _this.branding) === null || _a === void 0 ? void 0 : _a.backgroundImageURI) || MultiParty_1.DEFAULT_AVATAR_URI
-        },
-        publishAudio: !settings.startWithAudioMuted,
-        publishVideo: settings.defaultCamera !== MediaConstants_1.CameraTypes.NONE,
-        facingMode: settings.defaultCamera === MediaConstants_1.CameraTypes.FRONT ? OpentokFacingMode.USER : OpentokFacingMode.ENVIRONMENT
-      };
-      _this.currentPublisher = window === null || window === void 0 ? void 0 : window.OT.initPublisher(_this.getParticipantIdForStream((_b = _this.session) === null || _b === void 0 ? void 0 : _b.connection), properties, _this.traceErrorCallback);
-
-      if (!_this.currentPublisher) {
-        trace.error('failed to init publisher');
-      } else {
-        _this.currentPublisher.on('videoElementCreated', function (event) {
-          trace.info('videoElementCreated', event);
-
-          _this.emit(MultiParty_1.MULTI_PARTY_EVENTS.videoElementCreated, event);
-        });
+      return __awaiter(_this, void 0, void 0, function () {
+        var selectedCamera, isMobile, mediaCapabilitiesService, frontCameraDeviceId, backCameraDeviceId, videoSourceId, mobileCameraType, properties, err_2;
 
-        _this.currentPublisher.on('streamDestroyed', function (event) {
-          var _a;
+        var _this = this;
 
-          trace.info('Publisher stream destroyed', event);
+        var _a, _b;
 
-          _this.emit(MultiParty_1.MULTI_PARTY_EVENTS.streamDestroyed, {
-            event: event,
-            participantId: _this.getParticipantIdForStream((_a = event === null || event === void 0 ? void 0 : event.stream) === null || _a === void 0 ? void 0 : _a.connection)
-          });
-        });
+        return __generator(this, function (_c) {
+          switch (_c.label) {
+            case 0:
+              _c.trys.push([0, 2,, 3]);
 
-        _this.currentPublisher.on('accessDenied', function (event) {
-          var _a;
+              selectedCamera = settings.selectedCamera;
+              isMobile = MediaCapabilitiesUtils_1.checkIsMobile();
+              return [4
+              /*yield*/
+              , MediaCapabilitiesService_1.MediaCapabilitiesService.getInstance()];
 
-          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;
+            case 1:
+              mediaCapabilitiesService = _c.sent();
+              frontCameraDeviceId = mediaCapabilitiesService.frontCameraDeviceId, backCameraDeviceId = mediaCapabilitiesService.backCameraDeviceId;
+              videoSourceId = (selectedCamera === MediaConstants_1.MultiPartyCameraTypes.FRONT ? frontCameraDeviceId : backCameraDeviceId) || undefined;
+              mobileCameraType = settings.selectedCamera === MediaConstants_1.MultiPartyCameraTypes.FRONT ? OpentokFacingMode.USER : OpentokFacingMode.ENVIRONMENT;
+              properties = {
+                insertMode: 'append',
+                fitMode: 'cover',
+                width: '100%',
+                height: '100%',
+                style: {
+                  buttonDisplayMode: 'off',
+                  archiveStatusDisplayMode: 'off',
+                  audioLevelDisplayMode: 'off',
+                  backgroundImageURI: ((_a = this.branding) === null || _a === void 0 ? void 0 : _a.backgroundImageURI) || MultiPartyService_1.DEFAULT_AVATAR_URI
+                },
+                publishAudio: !settings.startWithAudioMuted,
+                publishVideo: settings.cameraEnabled,
+                videoSource: !isMobile ? videoSourceId : undefined,
+                facingMode: isMobile || !videoSourceId ? mobileCameraType : undefined
+              };
+              this.currentPublisher = window === null || window === void 0 ? void 0 : window.OT.initPublisher(this.getParticipantId((_b = this.session) === null || _b === void 0 ? void 0 : _b.connection.connectionId), properties, this.traceErrorCallback);
 
-          var participantId = _this.getParticipantIdForStream(connection);
+              if (!this.currentPublisher) {
+                trace.error('failed to init publisher');
+              } else {
+                this.currentPublisher.on('videoElementCreated', function (event) {
+                  trace.info('videoElementCreated', event);
 
-          var isOwnConnection = _this.ownConnectionId === connectionId;
+                  _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.videoElementCreated, event);
+                });
+                this.currentPublisher.on('streamDestroyed', function (event) {
+                  var _a;
 
-          _this.emit(MultiParty_1.MULTI_PARTY_EVENTS.mediaDeviceAccessDenied, {
-            connectionId: connectionId,
-            isOwnConnection: isOwnConnection,
-            participantId: participantId
-          });
-        });
+                  trace.info('Publisher stream destroyed', event);
 
-        _this.currentPublisher.on('streamCreated', function (event) {
-          return __awaiter(_this, void 0, void 0, function () {
-            var participantId;
+                  _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.currentPublisher.on('accessDenied', function (event) {
+                  var _a;
 
-            var _a, _b, _c, _d, _e;
+                  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;
 
-            return __generator(this, function (_f) {
-              switch (_f.label) {
-                case 0:
-                  return [4
-                  /*yield*/
-                  , MediaCapabilitiesHelper_1.MediaCapabilitiesHelper.setDevicesList()];
+                  var participantId = _this.getParticipantId(connection.connectionId);
 
-                case 1:
-                  _f.sent();
+                  var isOwnConnection = _this.ownConnectionId === connectionId;
 
-                  participantId = this.getParticipantIdForStream((_a = event === null || event === void 0 ? void 0 : event.stream) === null || _a === void 0 ? void 0 : _a.connection);
-                  this.emit(MultiParty_1.MULTI_PARTY_EVENTS.streamCreated, {
-                    event: event,
-                    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)
-                  });
-                  trace.info('publisher stream created', {
-                    event: event,
-                    hasAudio: get_1["default"](this.currentPublisher, 'stream.hasAudio'),
+                  _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.mediaDeviceAccessDenied, {
+                    connectionId: connectionId,
+                    isOwnConnection: isOwnConnection,
                     participantId: participantId
                   });
-                  return [2
-                  /*return*/
-                  ];
+                });
+                this.currentPublisher.on('streamCreated', function (event) {
+                  return __awaiter(_this, void 0, void 0, function () {
+                    var participantId;
+
+                    var _a, _b, _c, _d, _e, _f;
+
+                    return __generator(this, function (_g) {
+                      switch (_g.label) {
+                        case 0:
+                          return [4
+                          /*yield*/
+                          , MediaCapabilitiesService_1.MediaCapabilitiesService.setDevicesList()];
+
+                        case 1:
+                          _g.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,
+                            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)
+                          });
+                          trace.info('publisher stream created', {
+                            event: event,
+                            hasAudio: (_f = this.currentPublisher) === null || _f === void 0 ? void 0 : _f['stream.hasAudio'],
+                            participantId: participantId
+                          });
+                          return [2
+                          /*return*/
+                          ];
+                      }
+                    });
+                  });
+                });
               }
-            });
-          });
+
+              return [3
+              /*break*/
+              , 3];
+
+            case 2:
+              err_2 = _c.sent();
+              trace.error(JSON.stringify(err_2));
+              throw err_2;
+
+            case 3:
+              return [2
+              /*return*/
+              ];
+          }
         });
-      }
+      });
     };
 
     _this.streamCreatedHandler = function (event) {
@@ -710,15 +672,15 @@ function (_super) {
               trace.info('streamCreatedHandler', event.stream);
               stream = event.stream;
               connection = stream.connection;
-              participantId = this.getParticipantIdForStream(connection);
+              participantId = this.getParticipantId(connection.connectionId);
               return [4
               /*yield*/
-              , MediaCapabilitiesHelper_1.MediaCapabilitiesHelper.setDevicesList()];
+              , MediaCapabilitiesService_1.MediaCapabilitiesService.setDevicesList()];
 
             case 1:
               _f.sent();
 
-              this.emit(MultiParty_1.MULTI_PARTY_EVENTS.streamCreated, {
+              this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.streamCreated, {
                 event: event,
                 participantId: participantId,
                 startWithAudioMuted: this.settings.startWithAudioMuted,
@@ -733,8 +695,8 @@ function (_super) {
                 ];
               }
 
-              if (this.subscribers.length >= MultiParty_1.maxParticipantsNumber - 1) {
-                trace.info("a new subscriber cannot be added, as the number of participants reached its limit: " + MultiParty_1.maxParticipantsNumber);
+              if (this.subscribers.length >= MultiPartyService_1.maxParticipantsNumber - 1) {
+                trace.info("a new subscriber cannot be added, as the number of participants reached its limit: " + MultiPartyService_1.maxParticipantsNumber);
               } else {
                 properties = {
                   insertMode: 'append',
@@ -744,7 +706,7 @@ function (_super) {
                   style: {
                     buttonDisplayMode: 'off',
                     audioLevelDisplayMode: 'off',
-                    backgroundImageURI: ((_e = this.branding) === null || _e === void 0 ? void 0 : _e.backgroundImageURI) || MultiParty_1.DEFAULT_AVATAR_URI
+                    backgroundImageURI: ((_e = this.branding) === null || _e === void 0 ? void 0 : _e.backgroundImageURI) || MultiPartyService_1.DEFAULT_AVATAR_URI
                   }
                 };
                 subscriber_1 = event.target.subscribe(event.stream, participantId, properties, function (err) {
@@ -775,10 +737,10 @@ function (_super) {
       trace.info('streamPropertyChangedHandler', event);
       var stream = event.stream;
 
-      _this.emit(MultiParty_1.MULTI_PARTY_EVENTS.videoAudioStatus, {
+      _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.getParticipantIdForStream(stream === null || stream === void 0 ? void 0 : stream.connection),
+        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
       });
@@ -791,12 +753,12 @@ function (_super) {
       var stream = event.stream;
       var destroyedConnectionId = stream && stream.connection && stream.connection.connectionId;
 
-      _this.emit(MultiParty_1.MULTI_PARTY_EVENTS.streamDestroyed, {
+      _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.streamDestroyed, {
         event: event,
-        participantId: _this.getParticipantIdForStream((_a = event === null || event === void 0 ? void 0 : event.stream) === null || _a === void 0 ? void 0 : _a.connection)
+        participantId: _this.getParticipantId((_a = event === null || event === void 0 ? void 0 : event.stream) === null || _a === void 0 ? void 0 : _a.connection.connectionId)
       });
 
-      _this.subscribers = filter_1["default"](_this.subscribers, function (subscriber) {
+      _this.subscribers = _this.subscribers.filter(function (subscriber) {
         return subscriber.connectionId !== destroyedConnectionId;
       });
     };
@@ -811,14 +773,14 @@ function (_super) {
 
       ++_this.participantCount;
 
-      _this.emit(MultiParty_1.MULTI_PARTY_EVENTS.participantsNumberChanged, _this.participantCount);
+      _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.participantsNumberChanged, _this.participantCount);
 
       var clientRole = _this.getClientRole(connection);
 
-      _this.emit(MultiParty_1.MULTI_PARTY_EVENTS.connectionCreated, {
+      _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.connectionCreated, {
         clientRole: clientRole,
         event: event,
-        participantId: _this.getParticipantIdForStream(connection),
+        participantId: _this.getParticipantId(connection.connectionId),
         isOwnConnection: _this.ownConnectionId === connection.connectionId
       });
     };
@@ -830,10 +792,10 @@ function (_super) {
 
       trace.info('connectionDestroyedHandler', event);
 
-      _this.emit(MultiParty_1.MULTI_PARTY_EVENTS.connectionDestroyed, {
+      _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.connectionDestroyed, {
         clientRole: clientRole,
         event: event,
-        participantId: _this.getParticipantIdForStream(event === null || event === void 0 ? void 0 : event.connection)
+        participantId: _this.getParticipantId(event === null || event === void 0 ? void 0 : event.connection.connectionId)
       });
 
       if (!_this.ownConnectionId || !connection || connection.connectionId !== _this.ownConnectionId) {
@@ -842,7 +804,7 @@ function (_super) {
 
       --_this.participantCount;
 
-      _this.emit(MultiParty_1.MULTI_PARTY_EVENTS.participantsNumberChanged, _this.participantCount);
+      _this.emit(MultiPartyService_1.MULTI_PARTY_EVENTS.participantsNumberChanged, _this.participantCount);
 
       _this.session = null;
     };
@@ -865,7 +827,7 @@ function (_super) {
     return _this;
   }
 
-  Object.defineProperty(OpentokMultiparty.prototype, "ownConnectionId", {
+  Object.defineProperty(OpentokMultiPartyService.prototype, "ownConnectionId", {
     get: function get() {
       var _a, _b;
 
@@ -875,17 +837,12 @@ function (_super) {
     configurable: true
   });
 
-  OpentokMultiparty.prototype.getClientRole = function (connection) {
+  OpentokMultiPartyService.prototype.getClientRole = function (connection) {
     return (connection === null || connection === void 0 ? void 0 : connection.data) && JSON.parse(connection.data).clientRole || MediaConstants_1.SessionClientRole.USER;
   };
 
-  OpentokMultiparty.prototype.getParticipantIdForStream = function (connection) {
-    var clientRole = this.getClientRole(connection);
-    return this.getParticipantId(clientRole, connection.connectionId);
-  };
-
-  return OpentokMultiparty;
-}(MultiParty_1.MultiParty);
+  return OpentokMultiPartyService;
+}(MultiPartyService_1.MultiPartyService);
 
-exports.OpentokMultiparty = OpentokMultiparty;
-//# sourceMappingURL=OpentokMultiparty.js.map
+exports.OpentokMultiPartyService = OpentokMultiPartyService;
+//# sourceMappingURL=OpentokMultiPartyService.js.map