@techsee/techsee-media-service 999.20.0-nodejs20 → 999.20.1-alpha

package/lib/MediaServiceBase.js

@@ -1,17 +1,19 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
+
+var __assign = undefined && undefined.__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];
+            for (var p in s) {
+                if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+            }
         }
         return t;
     };
     return __assign.apply(this, arguments);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __importDefault = undefined && undefined.__importDefault || function (mod) {
+    return mod && mod.__esModule ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TechseeMediaServiceBase = void 0;
@@ -33,14 +35,14 @@ var guards_1 = require("@techsee/techsee-common/lib/core/guards");
 var MediaServer_1 = require("./MediaSession/MediaServer");
 var MediaTracer_1 = require("./MediaUtils/MediaTracer");
 var MediaSessionBase_1 = require("./MediaSession/MediaSessionBase");
-var trace = (0, MediaTracer_1.getMediaTracer)('MediaServiceBase');
-var traceStatsInfo = (0, debounce_1.default)(trace.info, 1000 * 5, { leading: true, maxWait: 1000 * 30 });
+var trace = MediaTracer_1.getMediaTracer('MediaServiceBase');
+var traceStatsInfo = debounce_1.default(trace.info, 1000 * 5, { leading: true, maxWait: 1000 * 30 });
 var privateEvents;
 (function (privateEvents) {
     privateEvents["STREAM_CREATED"] = "STREAM_CREATED";
     privateEvents["STREAM_DESTROYED"] = "STREAM_DESTROYED";
 })(privateEvents || (privateEvents = {}));
-var TechseeMediaServiceBase = (function () {
+var TechseeMediaServiceBase = /** @class */function () {
     function TechseeMediaServiceBase(environment, webRtcSupportInfo) {
         this._subscribers = new Map();
         this._publishers = new Map();
@@ -65,12 +67,12 @@ var TechseeMediaServiceBase = (function () {
             webRtcSupportInfo: webRtcSupportInfo
         };
         this._localStreamsManager = new LocalStreamManager_1.LocalStreamManager(this._environment);
-        this._isIOS_13_orLater =
-            this._environment.isIOS() && (!this._environment.majorVersion() || this._environment.majorVersion() >= 13);
-        this._isIOS_14_orLater =
-            this._environment.isIOS() && (!this._environment.majorVersion() || this._environment.majorVersion() >= 14);
-        trace.info("TechseeMediaServiceBase: isIOS_13_orLater: ".concat(this._isIOS_13_orLater));
-        trace.info("TechseeMediaServiceBase: isIOS_14_orLater: ".concat(this._isIOS_14_orLater));
+        // TODO: Hack as IOS 13.3 and above sometimes do not return the video/audio device. This
+        // is a hack to work around the issue until Apple resolve it
+        this._isIOS_13_orLater = this._environment.isIOS() && (!this._environment.majorVersion() || this._environment.majorVersion() >= 13);
+        this._isIOS_14_orLater = this._environment.isIOS() && (!this._environment.majorVersion() || this._environment.majorVersion() >= 14);
+        trace.info("TechseeMediaServiceBase: isIOS_13_orLater: " + this._isIOS_13_orLater);
+        trace.info("TechseeMediaServiceBase: isIOS_14_orLater: " + this._isIOS_14_orLater);
         this._sessionStreamsManager = {
             getMediaStreamForRole: this.getStreamForDestinationRole,
             addRemoteMediaTrack: this.registerRemoteMediaTrack,
@@ -78,34 +80,39 @@ var TechseeMediaServiceBase = (function () {
         };
     }
     Object.defineProperty(TechseeMediaServiceBase.prototype, "deviceSupportInfo", {
-        get: function () {
+        get: function get() {
             this.serviceInitGuard(false);
-            return (0, cloneDeep_1.default)(this._deviceSupportFlags);
+            return cloneDeep_1.default(this._deviceSupportFlags);
         },
         enumerable: false,
         configurable: true
     });
     Object.defineProperty(TechseeMediaServiceBase.prototype, "isVoipEnabled", {
-        get: function () {
+        get: function get() {
             return this._isVoipEnabled;
         },
         enumerable: false,
         configurable: true
     });
     Object.defineProperty(TechseeMediaServiceBase.prototype, "isSessionActive", {
-        get: function () {
+        get: function get() {
             return this._session !== null;
         },
         enumerable: false,
         configurable: true
     });
     Object.defineProperty(TechseeMediaServiceBase.prototype, "isLocalStreamInitialized", {
-        get: function () {
+        get: function get() {
             return this._initLocalStreamsPromise !== null;
         },
         enumerable: false,
         configurable: true
     });
+    /*
+        Initializes media service. Before using anything from this service it should be initialized first.
+        All of serviceOptions should be retrieved from account settings and by evaluating application state.
+        For example, when initializing service, accountSettings is already loaded, and we know if FS session is audio enabled.
+    */
     TechseeMediaServiceBase.prototype.initMediaService = function (serviceOptions) {
         var _this = this;
         trace.info('TechseeMediaServiceBase.initMediaService', serviceOptions);
@@ -114,45 +121,55 @@ var TechseeMediaServiceBase = (function () {
             console.warn(warnMessage);
             return this._initServicePromise ? this._initServicePromise : Promise.resolve();
         }
-        this._serviceOptions = (0, cloneDeep_1.default)(serviceOptions);
-        this._initServicePromise = Promise.all([
-            (0, Compatibility_1.isVideoPlaySupportedOnDevice)(this._serviceOptions.mediaServiceType).then(function (isSupported) { return (_this._deviceSupportFlags.videoPlayback = isSupported); }),
-            (this._isIOS_14_orLater || !this._deviceSupportFlags.webRtcSupportInfo.isWebRTCSupported
-                ? Promise.resolve([])
-                : (0, Compatibility_1.enumerateMediaDevices)())
-                .catch(function (error) {
-                trace.warn(error);
-                return [];
-            })
-                .then(function (localDevicesList) {
-                var groupedDevices = {
-                    video: (0, filter_1.default)(localDevicesList, function (device) { return device.kind.toLowerCase() === 'videoinput'; }),
-                    audio: (0, filter_1.default)(localDevicesList, function (device) { return device.kind.toLowerCase() === 'audioinput'; })
-                };
-                _this._localStreamsManager.setGroupedDevices(groupedDevices);
-                _this._deviceSupportFlags.hasCamera = _this._isIOS_13_orLater || groupedDevices.video.length > 0;
-                _this._deviceSupportFlags.hasMicrophone = _this._isIOS_13_orLater || groupedDevices.audio.length > 0;
-            })
-        ]).then(function () { return undefined; });
+        this._serviceOptions = cloneDeep_1.default(serviceOptions);
+        this._initServicePromise = Promise.all([Compatibility_1.isVideoPlaySupportedOnDevice(this._serviceOptions.mediaServiceType).then(function (isSupported) {
+            return _this._deviceSupportFlags.videoPlayback = isSupported;
+        }), (this._isIOS_14_orLater ? Promise.resolve([]) : Compatibility_1.enumerateMediaDevices()).catch(function (error) {
+            trace.warn(error);
+            return [];
+        }).then(function (localDevicesList) {
+            var groupedDevices = {
+                video: filter_1.default(localDevicesList, function (device) {
+                    return device.kind.toLowerCase() === 'videoinput';
+                }),
+                audio: filter_1.default(localDevicesList, function (device) {
+                    return device.kind.toLowerCase() === 'audioinput';
+                })
+            };
+            _this._localStreamsManager.setGroupedDevices(groupedDevices);
+            _this._deviceSupportFlags.hasCamera = _this._isIOS_13_orLater || groupedDevices.video.length > 0;
+            _this._deviceSupportFlags.hasMicrophone = _this._isIOS_13_orLater || groupedDevices.audio.length > 0;
+        })]).then(function () {
+            return undefined;
+        });
         return this._initServicePromise;
     };
+    //#region Media Streams Management
+    /*
+        The main method to start the initialization of local media streams.
+        This method can be executed many times and it will insure all calls are synced and only relevant stream will be created.
+        DO NOT USE ANY OTHER METHOD THAT FORCES "navigator.getUserMedia" OTHER THAN THIS ONE.
+     */
     TechseeMediaServiceBase.prototype.initLocalMediaStreams = function () {
         this.serviceInitGuard();
-        var isDashboardOpentok = this._serviceOptions.mediaServiceType === MediaConstants_1.MediaServiceType.OPENTOK &&
-            (this._serviceOptions.clientRole === MediaConstants_1.SessionClientRole.AGENT ||
-                this._serviceOptions.clientRole === MediaConstants_1.SessionClientRole.OBSERVER);
-        if (!this._initLocalStreamsPromise || (this._isIOS_14_orLater && !isDashboardOpentok)) {
+        var isDashboardOpentok = this._serviceOptions.mediaServiceType === MediaConstants_1.MediaServiceType.OPENTOK && (this._serviceOptions.clientRole === MediaConstants_1.SessionClientRole.AGENT || this._serviceOptions.clientRole === MediaConstants_1.SessionClientRole.OBSERVER);
+        // This hack for IOS 14 force a recreation of stream on seemingly unnecessary occasions (like agent page refresh).
+        // we're not sure why but the stream breaks
+        if (!this._initLocalStreamsPromise || this._isIOS_14_orLater && !isDashboardOpentok) {
             trace.info('initLocalMediaStreams creating media streams');
             this._initLocalStreamsPromise = this.getLocalMediaImplementation().catch(function (mediaRequestFailResult) {
-                trace.error("initLocalMediaStreams failure: ".concat(mediaRequestFailResult));
+                trace.error("initLocalMediaStreams failure: " + mediaRequestFailResult);
                 throw mediaRequestFailResult;
             });
-        }
-        else {
+        } else {
             trace.info('initLocalMediaStreams already done or in progress');
         }
         return this._initLocalStreamsPromise;
     };
+    /*
+        Creates an instance of subscriber that will "listen" to the requested stream.
+        Whenever requested stream is available, subscriber will render it.
+     */
     TechseeMediaServiceBase.prototype.createSubscriber = function (subscriberParams) {
         if (this._subscribers.has(subscriberParams.container)) {
             return Promise.reject('Subscriber for provided DIV element already exists');
@@ -161,14 +178,16 @@ var TechseeMediaServiceBase = (function () {
         this._subscribers.set(subscriberParams.container, subscriber);
         var streamForSubscriber = this.getRegisteredStreamByType(subscriber.streamType);
         if (streamForSubscriber) {
-            trace.info("Stream for ".concat(subscriberParams.streamType, " is ready."));
+            trace.info("Stream for " + subscriberParams.streamType + " is ready.");
             subscriber.renderStream(streamForSubscriber);
-        }
-        else {
-            trace.info("Stream for ".concat(subscriberParams.streamType, " not created yet"));
+        } else {
+            trace.info("Stream for " + subscriberParams.streamType + " not created yet");
         }
         return Promise.resolve(subscriber);
     };
+    /*
+        Destroys the subscriber for provided HTML DIV container
+     */
     TechseeMediaServiceBase.prototype.destroySubscriber = function (container) {
         if (this._subscribers.has(container)) {
             var subscriber = this._subscribers.get(container);
@@ -199,44 +218,39 @@ var TechseeMediaServiceBase = (function () {
         }
     };
     TechseeMediaServiceBase.prototype.getSwitchCameraConstraints = function () {
-        var constraints = (0, cloneDeep_1.default)(window.latestLocalMediaConstraints);
+        var constraints = cloneDeep_1.default(window.latestLocalMediaConstraints);
         if (!constraints) {
             throw new Error('getSwitchCameraConstraints: unexpected use case constraints is null.');
         }
         trace.info('getSwitchCameraConstraints - Start switch camera with constraints:', constraints);
-        var videoSourceType = constraints.video.videoSourceType === MediaConstants_1.LocalVideoSourceType.CAMERA
-            ? MediaConstants_1.LocalVideoSourceType.CAMERA_FRONT
-            : MediaConstants_1.LocalVideoSourceType.CAMERA;
-        trace.info("getSwitchCameraConstraints - switch to videoSourceType: ".concat(videoSourceType));
+        var videoSourceType = constraints.video.videoSourceType === MediaConstants_1.LocalVideoSourceType.CAMERA ? MediaConstants_1.LocalVideoSourceType.CAMERA_FRONT : MediaConstants_1.LocalVideoSourceType.CAMERA;
+        trace.info("getSwitchCameraConstraints - switch to videoSourceType: " + videoSourceType);
         constraints.video.videoSourceType = videoSourceType;
         return constraints;
     };
     TechseeMediaServiceBase.prototype.switchCamera = function (revertCameraWhenFailed) {
         var _this = this;
         trace.info('switchCamera: start');
-        var latestLocalMediaConstraints = (0, cloneDeep_1.default)(window.latestLocalMediaConstraints);
+        var latestLocalMediaConstraints = cloneDeep_1.default(window.latestLocalMediaConstraints);
         var constraints = !revertCameraWhenFailed ? this.getSwitchCameraConstraints() : latestLocalMediaConstraints;
         if (!constraints) {
             throw new Error('switchCamera - unexpected use case constraints is null.');
         }
-        return this._localStreamsManager
-            .destroyUserMediaStream()
-            .then(function () {
-            return _this._localStreamsManager
-                .getUserMediaStream(constraints)
-                .then(function (streamResult) {
+        return this._localStreamsManager.destroyUserMediaStream().then(function () {
+            return _this._localStreamsManager.getUserMediaStream(constraints).then(function (streamResult) {
                 var stream = streamResult.mediaStream;
                 trace.info('switchCamera: new stream: ', stream);
                 return _this.replaceStreamTracks(stream).then(function () {
-                    return _this.registerStreamResult(constraints, streamResult, true).then(function () { return ({
-                        revertCameraWhenFailed: revertCameraWhenFailed,
-                        constraints: constraints,
-                        streamResult: streamResult
-                    }); });
+                    return _this.registerStreamResult(constraints, streamResult, true).then(function () {
+                        return {
+                            revertCameraWhenFailed: revertCameraWhenFailed,
+                            constraints: constraints,
+                            streamResult: streamResult
+                        };
+                    });
                 });
             });
-        })
-            .catch(function (err) {
+        }).catch(function (err) {
             trace.error('switchCamera: Failed to switch camera: ', err);
             if (!revertCameraWhenFailed) {
                 window.latestLocalMediaConstraints = latestLocalMediaConstraints;
@@ -246,8 +260,7 @@ var TechseeMediaServiceBase = (function () {
         });
     };
     TechseeMediaServiceBase.prototype.replaceStreamTracks = function (mediaStream) {
-        var _a;
-        if ((_a = this._session) === null || _a === void 0 ? void 0 : _a.instance) {
+        if (this._session.instance) {
             return this._session.instance.replaceStreamTracks(mediaStream);
         }
         return Promise.reject('replaceStreamTracks - session instance is not exists.');
@@ -260,18 +273,12 @@ var TechseeMediaServiceBase = (function () {
             trace.info('registerStreamResult: stream result from getUserMediaStream:', streamResult.mediaStream);
             streamResult.mediaStream.getTracks().forEach(function (mediaTrack) {
                 trace.info('registerStreamResult: stream result from mediaTrack:', mediaTrack);
-                var streamType = addStreamType ||
-                    (mediaTrack.kind === 'video'
-                        ? MediaConstants_1.KnownMediaStream.USER_VIDEO_STREAM
-                        : MediaConstants_1.KnownMediaStream.USER_AUDIO_STREAM);
+                var streamType = addStreamType || (mediaTrack.kind === 'video' ? MediaConstants_1.KnownMediaStream.USER_VIDEO_STREAM : MediaConstants_1.KnownMediaStream.USER_AUDIO_STREAM);
                 var newDedicatedStream = new TechseeMediaStream_1.TechseeMediaStream(mediaTrack, streamType, false);
                 if (isOpentok) {
                     regPromises.push(_this.registerStream(newDedicatedStream));
-                }
-                else {
-                    regPromises.push(switchCamera
-                        ? _this.registerTrack(newDedicatedStream)
-                        : _this.registerLocalMediaStream(newDedicatedStream));
+                } else {
+                    regPromises.push(switchCamera ? _this.registerTrack(newDedicatedStream) : _this.registerLocalMediaStream(newDedicatedStream));
                 }
             });
         }
@@ -283,7 +290,7 @@ var TechseeMediaServiceBase = (function () {
         }
     };
     Object.defineProperty(TechseeMediaServiceBase.prototype, "supportSwitchCameras", {
-        get: function () {
+        get: function get() {
             return this._isIOS_13_orLater || this._localStreamsManager.groupedDevices.camerasCount > 1;
         },
         enumerable: false,
@@ -293,9 +300,14 @@ var TechseeMediaServiceBase = (function () {
         var _this = this;
         this.serviceInitGuard();
         if (!this._session) {
-            this._session = { params: (0, cloneDeep_1.default)(sessionParams) };
+            this._session = { params: cloneDeep_1.default(sessionParams) };
             this._session.connectPromise = new Promise(function (resolve, reject) {
-                var doAsyncReject = function (error) {
+                var doAsyncReject = function doAsyncReject(error) {
+                    /*
+                        Reject with timeout, to change JS 'execution flow'.
+                        If timeout removed, session is assigned to null, before promise returns, and "catch" will not
+                        work on promise that is returned.
+                    */
                     setTimeout(function () {
                         _this._session = null;
                         reject(error);
@@ -304,10 +316,9 @@ var TechseeMediaServiceBase = (function () {
                 var sessionHandlers = {
                     onDisconnectedHandler: _this.onSessionDisconnectHandler
                 };
-                var mediaSessionParams = __assign(__assign({}, sessionParams), { peerConnectivityTimeoutSeconds: _this._serviceOptions.peerConnectivityTimeoutSeconds ||
-                        MediaConstants_1.DEFAULT_PEER_CONNECTIVITY_TIMEOUT_SECONDS });
+                var mediaSessionParams = __assign(__assign({}, sessionParams), { peerConnectivityTimeoutSeconds: _this._serviceOptions.peerConnectivityTimeoutSeconds || MediaConstants_1.DEFAULT_PEER_CONNECTIVITY_TIMEOUT_SECONDS });
                 trace.info('connectToSession', sessionParams);
-                var allowedValues = (0, values_1.default)(MediaConstants_1.MediaServiceType);
+                var allowedValues = values_1.default(MediaConstants_1.MediaServiceType);
                 switch (_this._serviceOptions.mediaServiceType) {
                     case MediaConstants_1.MediaServiceType.TURNSERVER:
                         _this._session.instance = new SessionTurn_1.TurnWebRtcSession(mediaSessionParams, sessionHandlers, _this._sessionStreamsManager);
@@ -319,41 +330,50 @@ var TechseeMediaServiceBase = (function () {
                         _this._session.instance = new MediaServer_1.MediaServerSession(mediaSessionParams, _this._sessionStreamsManager);
                         break;
                     default:
-                        trace.error("mediaServiceType '".concat(_this._serviceOptions.mediaServiceType, "' is not supported."), {
-                            allowedValues: allowedValues
-                        });
+                        trace.error("mediaServiceType '" + _this._serviceOptions.mediaServiceType + "' is not supported.", { allowedValues: allowedValues });
                         doAsyncReject(new Error('mediaServiceType is not supported'));
                 }
                 if (_this._session && _this._session.instance) {
-                    _this._session.instance.connect()
-                        .then(function () {
+                    _this._session.instance.connect().then(function () {
                         trace.info('Session is connected');
                         resolve();
-                    })
-                        .catch(function (error) {
+                    }).catch(function (error) {
                         trace.error('Failed to connect to session', error);
                         doAsyncReject(error);
                     });
                 }
             });
-        }
-        else {
+        } else {
             trace.warn('Session connected already. Disconnect before connect to new session again');
         }
+        //TODO - Alex: Change a structure of this function to be more safe
+        //(when we return, there should not be case when session or promise is null)
+        //To fix, need to return promise immediately, then execute process in setTimeout(fn, 0);
         return this._session.connectPromise;
     };
+    //#endregion Media Streams Management
+    //#region Session Management
+    /*
+        Creates instance of WebRTC session which connects to (signaling server), and begins to listen to WebRTC events.
+     */
     TechseeMediaServiceBase.prototype.connectToSession = function (sessionParams) {
         return this._connectToSession(sessionParams);
     };
+    /*
+        Disconnects from WebRTC session.
+    */
     TechseeMediaServiceBase.prototype.disconnectFromSession = function () {
         return this.disconnectFromSessionInternal(MediaConstants_1.MediaSessionDisconnectReason.ForcedByConsumer);
     };
+    /*
+        Updates a credentials for turn server
+    */
     TechseeMediaServiceBase.prototype.updateSessionCredentials = function (credentials) {
         trace.info('updateSessionCredentials');
         if (!this.sessionExistsGuard(false)) {
             return Promise.reject('There no session to update credentials');
         }
-        this._session.params.credentials = (0, cloneDeep_1.default)(credentials);
+        this._session.params.credentials = cloneDeep_1.default(credentials);
         return Promise.resolve();
     };
     TechseeMediaServiceBase.prototype.enableVoipDuringSession = function () {
@@ -363,14 +383,15 @@ var TechseeMediaServiceBase = (function () {
         this._isVoipEnabled = true;
     };
     TechseeMediaServiceBase.prototype.disconnectFromSessionInternal = function (reason) {
-        var _a;
         if (!this._session) {
             return Promise.resolve();
         }
         trace.info('Disconnecting from session', reason);
         var lastSession = this._session;
         this._session = null;
-        return Promise.all([(_a = lastSession.instance) === null || _a === void 0 ? void 0 : _a.disconnect(), this.clearPublishers()]).then(function () { return undefined; });
+        return Promise.all([lastSession.instance.disconnect(), this.clearPublishers()]).then(function () {
+            return undefined;
+        });
     };
     TechseeMediaServiceBase.prototype.getStatsForRemoteTrack = function (streamType) {
         if (!this.sessionExistsGuard(false)) {
@@ -381,7 +402,7 @@ var TechseeMediaServiceBase = (function () {
             return Promise.reject(new Error('Stream for requested type was not found'));
         }
         return this._session.instance.getRemoteTrackStats(streamForStats.mediaTrack).then(function (trackStats) {
-            traceStatsInfo("MediaTrackStats for ".concat(streamType, ": ").concat(JSON.stringify(trackStats)));
+            traceStatsInfo("MediaTrackStats for " + streamType + ": " + JSON.stringify(trackStats));
             return {
                 trackId: streamForStats.mediaTrack.id,
                 trackStats: trackStats
@@ -394,24 +415,16 @@ var TechseeMediaServiceBase = (function () {
         if (reason !== MediaConstants_1.MediaSessionDisconnectReason.ForcedByConsumer) {
             var lastParams_1 = this._session && this._session.params ? this._session.params : null;
             this.disconnectFromSessionInternal(reason).then(function () {
-                var reconnectReasons = [
-                    MediaConstants_1.MediaSessionDisconnectReason.InitiatorPeerReconnected,
-                    MediaConstants_1.MediaSessionDisconnectReason.SignalingChannelDisconnect,
-                    MediaConstants_1.MediaSessionDisconnectReason.PeerConnectionInterrupted,
-                    MediaConstants_1.MediaSessionDisconnectReason.PeerConnectionStateChangeTimeout
-                ];
-                if (lastParams_1 && (0, includes_1.default)(reconnectReasons, reason) && _this._autoReconnectEnabled) {
+                var reconnectReasons = [MediaConstants_1.MediaSessionDisconnectReason.InitiatorPeerReconnected, MediaConstants_1.MediaSessionDisconnectReason.SignalingChannelDisconnect, MediaConstants_1.MediaSessionDisconnectReason.PeerConnectionInterrupted, MediaConstants_1.MediaSessionDisconnectReason.PeerConnectionStateChangeTimeout];
+                if (lastParams_1 && includes_1.default(reconnectReasons, reason) && _this._autoReconnectEnabled) {
                     _this.reconnectToSession(lastParams_1);
-                }
-                else if (!_this._autoReconnectEnabled) {
+                } else if (!_this._autoReconnectEnabled) {
                     trace.info('No reconnection- auto reconnect disabled');
-                }
-                else {
+                } else {
                     trace.info('No params for reconnection to media session');
                 }
             });
-        }
-        else {
+        } else {
             trace.info('Ignore Session disconnect event');
         }
     };
@@ -428,19 +441,18 @@ var TechseeMediaServiceBase = (function () {
     };
     TechseeMediaServiceBase.prototype.reconnectToSession = function (lastParams) {
         trace.info('Reconnecting to media session, sessionParams:', lastParams);
-        this._connectToSession(lastParams)
-            .then(function () {
+        this._connectToSession(lastParams).then(function () {
             trace.info('Media session reconnected');
-        })
-            .catch(function (error) {
+        }).catch(function (error) {
             trace.error('Error while reconnecting to media session', error);
         });
     };
+    //#endregion Session Management
+    //#region Utils
     TechseeMediaServiceBase.prototype.getSnapshotFromKnownStream = function (sourceStream, snapshotOptions) {
         var _this = this;
         return new Promise(function (resolve, reject) {
-            if (sourceStream !== MediaConstants_1.KnownMediaStream.USER_VIDEO_STREAM &&
-                sourceStream !== MediaConstants_1.KnownMediaStream.USER_SCREEN_SHARE_STREAM) {
+            if (sourceStream !== MediaConstants_1.KnownMediaStream.USER_VIDEO_STREAM && sourceStream !== MediaConstants_1.KnownMediaStream.USER_SCREEN_SHARE_STREAM) {
                 trace.error('The requested stream is not video stream, and cannot be used for snapshot');
                 reject(new Error('INCOMPATIBLE_STREAM_FOR_SNAPSHOT'));
                 return;
@@ -448,11 +460,10 @@ var TechseeMediaServiceBase = (function () {
             var snapshotStream = _this.getRegisteredStreamByType(sourceStream);
             if (!snapshotStream) {
                 trace.error('Cannot make snapshot: The requested stream not exists yet.');
-                reject(new Error(MediaConstants_1.NO_REQUESTED_STREAM));
+                reject(new Error('NO_REQUESTED_STREAM'));
                 return;
             }
-            (0, MediaDomUtils_1.getSnapshotFromMediaStream)(snapshotStream.mediaStream, sourceStream, snapshotOptions)
-                .then(function (imageData) {
+            MediaDomUtils_1.getSnapshotFromMediaStream(snapshotStream.mediaStream, snapshotOptions).then(function (imageData) {
                 var urlComponents = imageData.split(';base64,');
                 var mimeType = urlComponents[0].split(':')[1];
                 var bytes = atob(urlComponents[1]);
@@ -471,36 +482,36 @@ var TechseeMediaServiceBase = (function () {
                     mimeType: mimeType
                 };
                 resolve(result);
-            })
-                .catch(function (error) {
+            }).catch(function (error) {
                 trace.error('Error creating snapshot', error);
                 reject(error);
             });
         });
     };
+    //Will clean streams, publishers and subscribers, but will not remove event listeners
     TechseeMediaServiceBase.prototype.clearService = function () {
         var _this = this;
         trace.info('MediaService clearing all resources');
-        return this.disconnectFromSessionInternal(MediaConstants_1.MediaSessionDisconnectReason.ForcedByConsumer)
-            .then(this.clearSubscribers)
-            .then(this.clearRegisteredStreams)
-            .then(this._localStreamsManager.clearAllStreams)
-            .then(function () {
+        return this.disconnectFromSessionInternal(MediaConstants_1.MediaSessionDisconnectReason.ForcedByConsumer).then(this.clearSubscribers).then(this.clearRegisteredStreams).then(this._localStreamsManager.clearAllStreams).then(function () {
             _this._initLocalStreamsPromise = null;
             _this._isVoipEnabled = false;
-        })
-            .then(function () { return undefined; });
+        }).then(function () {
+            return undefined;
+        });
     };
+    //Will clear the service and remove all event listeners
     TechseeMediaServiceBase.prototype.dispose = function () {
         var _this = this;
-        return this.clearService()
-            .catch(function () { return undefined; })
-            .then(function () {
+        return this.clearService().catch(function () {
+            return undefined;
+        }).then(function () {
             _this._emitter.removeAllListeners();
         });
     };
     Object.defineProperty(TechseeMediaServiceBase.prototype, "subscribers", {
-        get: function () {
+        //#endregion
+        //#region Protected Methods
+        get: function get() {
             return this._subscribers;
         },
         enumerable: false,
@@ -509,7 +520,7 @@ var TechseeMediaServiceBase = (function () {
     TechseeMediaServiceBase.prototype.registerLocalMediaStream = function (tsMediaStream) {
         trace.info('Registering local stream', tsMediaStream.streamType);
         if (this._registeredStreams.has(tsMediaStream.streamType)) {
-            return Promise.reject(new Error("Stream ".concat(tsMediaStream.streamType, " already registered")));
+            return Promise.reject(new Error("Stream " + tsMediaStream.streamType + " already registered"));
         }
         return this.registerStream(tsMediaStream);
     };
@@ -520,8 +531,7 @@ var TechseeMediaServiceBase = (function () {
         var streamToChangeState = this.getRegisteredStreamByType(streamType);
         if (!streamToChangeState) {
             trace.warn('There no stream found to change enable state', streamType);
-        }
-        else {
+        } else {
             streamToChangeState.mediaTrack.enabled = !isPaused;
             if (streamToChangeState.isRemote && streamToChangeState.streamKind === MediaConstants_1.KnownMediaStreamKind.Audio) {
                 this.subscribers.forEach(function (subscriber) {
@@ -545,8 +555,10 @@ var TechseeMediaServiceBase = (function () {
             _this._emitter.emit(event, eventArgs);
         });
     };
+    //#endregion Protected Methods
+    //#region Private Methods
     TechseeMediaServiceBase.prototype.registerRemoteMediaTrack = function (remoteMediaTrack) {
-        trace.info("Registering remote ".concat(remoteMediaTrack.trackType, " MediaStreamTrack"), remoteMediaTrack.mediaTrack);
+        trace.info("Registering remote " + remoteMediaTrack.trackType + " MediaStreamTrack", remoteMediaTrack.mediaTrack);
         var currentStream = this._registeredStreams.get(remoteMediaTrack.trackType);
         if (currentStream && !currentStream.isRemote) {
             return Promise.reject(new Error('Cannot register remote stream with the same type as local stream'));
@@ -560,7 +572,7 @@ var TechseeMediaServiceBase = (function () {
             return _this.unregisterTechseeMediaStream(mediaStream, MediaConstants_1.MediaStreamUnregisterReason.NativeEvent);
         };
         this._registeredStreams.set(mediaStream.streamType, mediaStream);
-        trace.info("TechseeMediaStream registered - ".concat(mediaStream.streamType), TechseeMediaStream_1.TechseeMediaStream);
+        trace.info("TechseeMediaStream registered - " + mediaStream.streamType, TechseeMediaStream_1.TechseeMediaStream);
         return this.updateSubscribersWithNewStream(mediaStream).then(function () {
             var eventArgs = { streamType: mediaStream.streamType };
             _this.emitEvent(privateEvents.STREAM_CREATED, eventArgs);
@@ -570,13 +582,15 @@ var TechseeMediaServiceBase = (function () {
         var _this = this;
         var currentStream = this._registeredStreams.get(mediaStream.streamType);
         if (currentStream) {
-            return this.unregisterTechseeMediaStream(currentStream, MediaConstants_1.MediaStreamUnregisterReason.ReplacingStream).then(function () { return _this.registerTrack(mediaStream); });
+            return this.unregisterTechseeMediaStream(currentStream, MediaConstants_1.MediaStreamUnregisterReason.ReplacingStream).then(function () {
+                return _this.registerTrack(mediaStream);
+            });
         }
         return this.registerTrack(mediaStream);
     };
     TechseeMediaServiceBase.prototype.unregisterTechseeMediaStream = function (streamToUnregister, reason) {
         var _this = this;
-        var traceError = function (error) {
+        var traceError = function traceError(error) {
             trace.warn('Unregister TechseeMediaStream error:', error);
         };
         var promises = [];
@@ -588,7 +602,9 @@ var TechseeMediaServiceBase = (function () {
         });
         if (!streamToUnregister.isRemote) {
             this._publishers.forEach(function (publisher) {
-                if (publisher.streamTypes.find(function (streamType) { return streamType === streamToUnregister.streamType; })) {
+                if (publisher.streamTypes.find(function (streamType) {
+                    return streamType === streamToUnregister.streamType;
+                })) {
                     if (_this._session && _this._session.instance) {
                         promises.push(_this._session.instance.onMediaStreamDestroyed(publisher.destinationRole).catch(traceError));
                     }
@@ -610,7 +626,9 @@ var TechseeMediaServiceBase = (function () {
                 promises.push(_this.unregisterTechseeMediaStream(registeredStream, MediaConstants_1.MediaStreamUnregisterReason.ClosedRemotely));
             }
         });
-        return Promise.all(promises).then(function () { return undefined; });
+        return Promise.all(promises).then(function () {
+            return undefined;
+        });
     };
     TechseeMediaServiceBase.prototype.removePublisher = function (publisher) {
         this._publishers.delete(publisher.destinationRole);
@@ -626,21 +644,20 @@ var TechseeMediaServiceBase = (function () {
         var _this = this;
         this.serviceInitGuard();
         if (this._publishers.has(destinationRole)) {
-            trace.info("Publisher for ".concat(destinationRole, " already exists"));
+            trace.info("Publisher for " + destinationRole + " already exists");
             return Promise.resolve(this._publishers.get(destinationRole).mediaStream);
         }
         if (!this._publisherPromises.get(destinationRole)) {
-            trace.info("Creating publisher for ".concat(destinationRole));
-            var publisherPromise = this.initLocalMediaStreams()
-                .then(function () { return _this.createMediaPublisher(destinationRole); })
-                .then(function (mediaPublisher) {
+            trace.info("Creating publisher for " + destinationRole);
+            var publisherPromise = this.initLocalMediaStreams().then(function () {
+                return _this.createMediaPublisher(destinationRole);
+            }).then(function (mediaPublisher) {
                 if (mediaPublisher) {
                     _this._publishers.set(destinationRole, mediaPublisher);
                 }
                 _this._publisherPromises.delete(destinationRole);
                 return mediaPublisher ? mediaPublisher.mediaStream : null;
-            })
-                .catch(function (ex) {
+            }).catch(function (ex) {
                 if (ex && ex.message === 'audioStreamFailed') {
                     _this._isVoipEnabled = false;
                     return null;
@@ -649,23 +666,21 @@ var TechseeMediaServiceBase = (function () {
                 throw ex;
             });
             this._publisherPromises.set(destinationRole, publisherPromise);
-        }
-        else {
-            trace.info("Create publisher promise for ".concat(destinationRole, " already exists"));
+        } else {
+            trace.info("Create publisher promise for " + destinationRole + " already exists");
         }
         return this._publisherPromises.get(destinationRole);
     };
     TechseeMediaServiceBase.prototype.updateSubscribersWithNewStream = function (registeredStream) {
-        trace.info("Updating subscribers of ".concat(registeredStream.streamType, " with new stream"));
+        trace.info("Updating subscribers of " + registeredStream.streamType + " with new stream");
         if (this._subscribers.size === 0) {
-            trace.warn("No subscribers exists for the ".concat(registeredStream.streamType, "."));
-        }
-        else {
-            trace.info("Total ".concat(this._subscribers.size, " subscribers exists, will check if rerender needed."));
+            trace.warn("No subscribers exists for the " + registeredStream.streamType + ".");
+        } else {
+            trace.info("Total " + this._subscribers.size + " subscribers exists, will check if rerender needed.");
         }
         this._subscribers.forEach(function (subscriber) {
             if (subscriber.streamType === registeredStream.streamType) {
-                trace.info("".concat(registeredStream.streamType, " rendering on subscriber"));
+                trace.info(registeredStream.streamType + " rendering on subscriber");
                 subscriber.renderStream(registeredStream);
             }
         });
@@ -686,8 +701,8 @@ var TechseeMediaServiceBase = (function () {
         this.clearSubscribers = this.clearSubscribers.bind(this);
         this._connectToSession = this._connectToSession.bind(this);
         this.disconnectFromMediaSession = this.disconnectFromMediaSession.bind(this);
-        this.getSnapshotFromKnownStream = this.getSnapshotFromKnownStream.bind(this);
     };
+    //region Cleanup
     TechseeMediaServiceBase.prototype.clearRegisteredStreams = function () {
         var _this = this;
         trace.info('Clearing registered streams');
@@ -695,7 +710,9 @@ var TechseeMediaServiceBase = (function () {
         this._registeredStreams.forEach(function (streamToUnregister) {
             promises.push(_this.unregisterTechseeMediaStream(streamToUnregister, MediaConstants_1.MediaStreamUnregisterReason.ServiceCleanUp));
         });
-        return Promise.all(promises).then(function () { return undefined; });
+        return Promise.all(promises).then(function () {
+            return undefined;
+        });
     };
     TechseeMediaServiceBase.prototype.clearSubscribers = function () {
         var _this = this;
@@ -704,7 +721,9 @@ var TechseeMediaServiceBase = (function () {
         this._subscribers.forEach(function (subscriber) {
             promises.push(_this.destroySubscriber(subscriber.container));
         });
-        return Promise.all(promises).then(function () { return undefined; });
+        return Promise.all(promises).then(function () {
+            return undefined;
+        });
     };
     TechseeMediaServiceBase.prototype.clearPublishers = function () {
         var _this = this;
@@ -713,17 +732,27 @@ var TechseeMediaServiceBase = (function () {
         this._publishers.forEach(function (publisher) {
             promises.push(_this.removePublisher(publisher));
         });
-        return Promise.all(promises).then(function () { return undefined; });
+        return Promise.all(promises).then(function () {
+            return undefined;
+        });
     };
+    //#endregion Cleanup
+    //#region Simple Validation Methods
     TechseeMediaServiceBase.prototype.serviceInitGuard = function (shouldThrow) {
-        if (shouldThrow === void 0) { shouldThrow = true; }
-        return (0, guards_1.throwableGuard)(!!this._serviceOptions, 'Media service is not initialized', shouldThrow);
+        if (shouldThrow === void 0) {
+            shouldThrow = true;
+        }
+        return guards_1.throwableGuard(!!this._serviceOptions, 'Media service is not initialized', shouldThrow);
     };
     TechseeMediaServiceBase.prototype.sessionExistsGuard = function (shouldThrow) {
-        if (shouldThrow === void 0) { shouldThrow = true; }
-        return (0, guards_1.throwableGuard)(!!this._session, 'There no active session', shouldThrow);
+        if (shouldThrow === void 0) {
+            shouldThrow = true;
+        }
+        return guards_1.throwableGuard(!!this._session, 'There no active session', shouldThrow);
     };
     return TechseeMediaServiceBase;
-}());
+}();
 exports.TechseeMediaServiceBase = TechseeMediaServiceBase;
-//# sourceMappingURL=MediaServiceBase.js.map
+
+//# sourceMappingURL=MediaServiceBase.js.map
+//# sourceMappingURL=MediaServiceBase.js.map