@techsee/techsee-media-service 999.0.4-switch → 999.0.6-switch

package/lib/MediaServiceBase.js

@@ -30,7 +30,6 @@ var MediaDomUtils_1 = require("./MediaUtils/MediaDomUtils");
 var Compatibility_1 = require("./MediaUtils/Compatibility");
 var SessionOpentok_1 = require("./MediaSession/SessionOpentok");
 var MediaConstants_1 = require("./MediaConstants");
-var get_1 = __importDefault(require("lodash/get"));
 var guards_1 = require("@techsee/techsee-common/lib/core/guards");
 var MediaTracer_1 = require("./MediaUtils/MediaTracer");
 var trace = MediaTracer_1.getMediaTracer('MediaServiceBase');
@@ -193,53 +192,48 @@ var TechseeMediaServiceBase = /** @class */function () {
     TechseeMediaServiceBase.prototype.onStreamCreated = function (callback) {
         this.registerEventCallback(privateEvents.STREAM_CREATED, callback);
     };
+    TechseeMediaServiceBase.prototype.getSwitchCameraConstraints = function () {
+        var constraints = cloneDeep_1.default(window.latestLocalMediaConstraints);
+        if (!constraints) {
+            throw new Error('getSwitchCameraConstraints: unexpected use case constraints is null.');
+        }
+        trace.info('switchCamera - Start switch camera with constraints:', constraints);
+        var videoSourceType = constraints.video.videoSourceType === MediaConstants_1.LocalVideoSourceType.CAMERA ? MediaConstants_1.LocalVideoSourceType.CAMERA_FORNT : MediaConstants_1.LocalVideoSourceType.CAMERA;
+        trace.info("switchCamera - switch to videoSourceType: " + videoSourceType);
+        constraints.video.videoSourceType = videoSourceType;
+        return constraints;
+    };
     TechseeMediaServiceBase.prototype.switchCamera = function () {
         var _this = this;
-        trace.info('XXXXX: start switch camera');
-        var videoSourceType = MediaConstants_1.LocalVideoSourceType.CAMERA;
-        var constraints = cloneDeep_1.default(window.latestLocalMediaConstraints);
-        trace.info("XXXXX: switch camera - constraints " + JSON.stringify(constraints));
-        if (constraints) {
-            if (constraints.video.videoSourceType === MediaConstants_1.LocalVideoSourceType.CAMERA) {
-                videoSourceType = MediaConstants_1.LocalVideoSourceType.CAMERA_FORNT;
-            }
-            trace.info("XXXXX: switch camera - videoSourceType: " + videoSourceType);
-            constraints.video.videoSourceType = videoSourceType;
-            window.latestLocalMediaConstraints = null;
-            var regPromises_1 = [];
-            this._localStreamsManager.getUserMediaStreamMediaDevice({ audio: false, video: { deviceId: get_1.default(this._localStreamsManager.groupedDevices, 'video.front.deviceId'),
-                    frameRate: { ideal: 15, max: 30 },
-                    height: { ideal: 480 },
-                    width: { ideal: 640 } } }, false).then(function (stream) {
-                trace.info('XXXXX: new stream: ', stream);
-                trace.info('XXXXX: beore replaceTrack');
-                _this._session.instance && _this._session.instance.replaceStreamTracks(stream);
-                stream && stream.getTracks().forEach(function (track) {
-                    var newDedicatedStream = new TechseeMediaStream_1.TechseeMediaStream(track, MediaConstants_1.KnownMediaStream.USER_VIDEO_STREAM, false);
-                    regPromises_1.push(_this.registerStream(newDedicatedStream, true)); //phone
-                });
-                return Promise.all(regPromises_1).then(function () {
-                    return undefined;
-                });
+        var constraints = this.getSwitchCameraConstraints();
+        this._localStreamsManager.destroyUserMediaStream();
+        return this._localStreamsManager.getUserMediaStream(constraints).then(function (streamResult) {
+            var stream = streamResult.mediaStream;
+            trace.info('switchCamera: new stream: ', stream);
+            _this.replaceStreamTracks(stream);
+            return _this.registerStreamResult(constraints, streamResult, _this.registerTrack).then(function () {
+                return { constraints: constraints, streamResult: streamResult };
+            });
+        }).catch(function (err) {
+            trace.error('switchCamera: Failed to switch camera: ', err);
+            return Promise.reject('Failed to switch camera.');
+        });
+    };
+    TechseeMediaServiceBase.prototype.replaceStreamTracks = function (mediaStream) {
+        this._session.instance && this._session.instance.replaceStreamTracks(mediaStream);
+    };
+    TechseeMediaServiceBase.prototype.registerStreamResult = function (constraints, streamResult, registerMediaStream) {
+        var regPromises = [];
+        if (streamResult.isNew) {
+            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 = mediaTrack.kind === 'video' ? MediaConstants_1.KnownMediaStream.USER_VIDEO_STREAM : MediaConstants_1.KnownMediaStream.USER_AUDIO_STREAM;
+                var newDedicatedStream = new TechseeMediaStream_1.TechseeMediaStream(mediaTrack, streamType, false);
+                regPromises.push(registerMediaStream(newDedicatedStream));
             });
-            // return this._localStreamsManager.getUserMediaStream(constraints)
-            //     .then((streamResult: MediaRequestSuccessResult) => {
-            //         trace.info(`XXXXX: switch acmera- success create new stream: ${JSON.stringify(streamResult)}`, streamResult);
-            //         const stream = streamResult.mediaStream;
-            //         trace.info('XXXXX: switch camera- before replacing trace');
-            //         this._session && this._session.instance && this._session.instance.replaceStreamTracks(stream);
-            //         trace.info('XXXXX: switch camera- after replacing trace');
-            //         stream && stream.getTracks().forEach((track) => {
-            //             const newDedicatedStream = new TechseeMediaStream(track, KnownMediaStream.USER_VIDEO_STREAM, false);
-            //             trace.info(`XXXXX: switch camera- set register stream ${newDedicatedStream.streamType}`);
-            //             this._registeredStreams.set(newDedicatedStream.streamType, newDedicatedStream);
-            //         });
-            //     })
-            //     .catch((err) => {
-            //         trace.info(`XXXXX: switch acmera- error: ${err}`, err);
-            //     });
         }
-        return Promise.reject('Something wrong with constraints.');
+        return Promise.all(regPromises);
     };
     //#endregion Media Streams Management
     //#region Session Management
@@ -498,24 +492,27 @@ var TechseeMediaServiceBase = /** @class */function () {
         var newDedicatedStream = new TechseeMediaStream_1.TechseeMediaStream(remoteMediaTrack.mediaTrack, remoteMediaTrack.trackType, true);
         return this.registerStream(newDedicatedStream);
     };
-    TechseeMediaServiceBase.prototype.registerStream = function (mediaStream, update) {
+    TechseeMediaServiceBase.prototype.registerTrack = function (mediaStream) {
+        var _this = this;
+        mediaStream.mediaTrack.onended = function () {
+            return _this.unregisterTechseeMediaStream(mediaStream, MediaConstants_1.MediaStreamUnregisterReason.NativeEvent);
+        };
+        this._registeredStreams.set(mediaStream.streamType, mediaStream);
+        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);
+        });
+    };
+    TechseeMediaServiceBase.prototype.registerStream = function (mediaStream) {
         var _this = this;
         var currentStream = this._registeredStreams.get(mediaStream.streamType);
-        var registerTrack = function registerTrack() {
-            mediaStream.mediaTrack.onended = function () {
-                return _this.unregisterTechseeMediaStream(mediaStream, MediaConstants_1.MediaStreamUnregisterReason.NativeEvent);
-            };
-            _this._registeredStreams.set(mediaStream.streamType, mediaStream);
-            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);
+        if (currentStream) {
+            return this.unregisterTechseeMediaStream(currentStream, MediaConstants_1.MediaStreamUnregisterReason.ReplacingStream).then(function () {
+                return _this.registerTrack(mediaStream);
             });
-        };
-        if (currentStream && !update) {
-            return this.unregisterTechseeMediaStream(currentStream, MediaConstants_1.MediaStreamUnregisterReason.ReplacingStream).then(registerTrack);
         }
-        return registerTrack();
+        return this.registerTrack(mediaStream);
     };
     TechseeMediaServiceBase.prototype.unregisterTechseeMediaStream = function (streamToUnregister, reason) {
         var _this = this;