@techsee/techsee-media-service 999.20.0-nodejs.lite.2 → 999.20.1-alpha
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +28 -27
- package/lib/LocalStreamManager.d.ts +0 -1
- package/lib/LocalStreamManager.d.ts.map +1 -1
- package/lib/LocalStreamManager.js +84 -82
- package/lib/LocalStreamManager.js.map +1 -1
- package/lib/MediaConstants.d.ts +3 -21
- package/lib/MediaConstants.d.ts.map +1 -1
- package/lib/MediaConstants.js +13 -32
- package/lib/MediaConstants.js.map +1 -1
- package/lib/MediaContracts.d.ts +3 -9
- package/lib/MediaContracts.d.ts.map +1 -1
- package/lib/MediaContracts.js +4 -1
- package/lib/MediaContracts.js.map +1 -1
- package/lib/MediaPublisher.d.ts +0 -1
- package/lib/MediaPublisher.d.ts.map +1 -1
- package/lib/MediaPublisher.js +10 -7
- package/lib/MediaPublisher.js.map +1 -1
- package/lib/MediaServiceBase.d.ts +0 -1
- package/lib/MediaServiceBase.d.ts.map +1 -1
- package/lib/MediaServiceBase.js +199 -170
- package/lib/MediaServiceBase.js.map +1 -1
- package/lib/MediaSession/MediaServer.d.ts +0 -1
- package/lib/MediaSession/MediaServer.d.ts.map +1 -1
- package/lib/MediaSession/MediaServer.js +74 -62
- package/lib/MediaSession/MediaServer.js.map +1 -1
- package/lib/MediaSession/MediaSessionBase.d.ts +0 -1
- package/lib/MediaSession/MediaSessionBase.d.ts.map +1 -1
- package/lib/MediaSession/MediaSessionBase.js +23 -19
- package/lib/MediaSession/MediaSessionBase.js.map +1 -1
- package/lib/MediaSession/SessionOpentok.d.ts +2 -3
- package/lib/MediaSession/SessionOpentok.d.ts.map +1 -1
- package/lib/MediaSession/SessionOpentok.js +80 -51
- package/lib/MediaSession/SessionOpentok.js.map +1 -1
- package/lib/MediaSession/SessionTurn.d.ts +0 -1
- package/lib/MediaSession/SessionTurn.d.ts.map +1 -1
- package/lib/MediaSession/SessionTurn.js +151 -109
- package/lib/MediaSession/SessionTurn.js.map +1 -1
- package/lib/MediaSession/TurnConstants.d.ts +0 -1
- package/lib/MediaSession/TurnConstants.d.ts.map +1 -1
- package/lib/MediaSession/TurnConstants.js +16 -1
- package/lib/MediaSession/TurnConstants.js.map +1 -1
- package/lib/MediaSubscriber.d.ts +0 -1
- package/lib/MediaSubscriber.d.ts.map +1 -1
- package/lib/MediaSubscriber.js +43 -37
- package/lib/MediaSubscriber.js.map +1 -1
- package/lib/MediaUtils/Compatibility.d.ts +0 -3
- package/lib/MediaUtils/Compatibility.d.ts.map +1 -1
- package/lib/MediaUtils/Compatibility.js +34 -76
- package/lib/MediaUtils/Compatibility.js.map +1 -1
- package/lib/MediaUtils/MediaDomUtils.d.ts +3 -6
- package/lib/MediaUtils/MediaDomUtils.d.ts.map +1 -1
- package/lib/MediaUtils/MediaDomUtils.js +65 -70
- package/lib/MediaUtils/MediaDomUtils.js.map +1 -1
- package/lib/MediaUtils/MediaTracer.d.ts +0 -1
- package/lib/MediaUtils/MediaTracer.d.ts.map +1 -1
- package/lib/MediaUtils/MediaTracer.js +5 -2
- package/lib/MediaUtils/MediaTracer.js.map +1 -1
- package/lib/MultiParty/DetectWebRtcService.d.ts +14 -17
- package/lib/MultiParty/DetectWebRtcService.d.ts.map +1 -1
- package/lib/MultiParty/DetectWebRtcService.js +54 -98
- package/lib/MultiParty/DetectWebRtcService.js.map +1 -1
- package/lib/MultiParty/MediaCapabilitiesHelper.d.ts +10 -0
- package/lib/MultiParty/MediaCapabilitiesHelper.d.ts.map +1 -0
- package/lib/MultiParty/MediaCapabilitiesHelper.js +140 -0
- package/lib/MultiParty/MediaCapabilitiesHelper.js.map +1 -0
- package/lib/MultiParty/MultiParty.d.ts +21 -0
- package/lib/MultiParty/MultiParty.d.ts.map +1 -0
- package/lib/MultiParty/MultiParty.js +160 -0
- package/lib/MultiParty/MultiParty.js.map +1 -0
- package/lib/MultiParty/OpentokMultiparty.d.ts +32 -0
- package/lib/MultiParty/OpentokMultiparty.d.ts.map +1 -0
- package/lib/MultiParty/OpentokMultiparty.js +184 -0
- package/lib/MultiParty/OpentokMultiparty.js.map +1 -0
- package/lib/TechseeMediaStream.d.ts +0 -1
- package/lib/TechseeMediaStream.d.ts.map +1 -1
- package/lib/TechseeMediaStream.js +12 -9
- package/lib/TechseeMediaStream.js.map +1 -1
- package/lib/oldCode/constants.js +20 -0
- package/lib/oldCode/constants.js.map +1 -0
- package/lib/oldCode/event-emitter.js +39 -0
- package/lib/oldCode/event-emitter.js.map +1 -0
- package/lib/oldCode/index.js +64 -0
- package/lib/oldCode/index.js.map +1 -0
- package/lib/oldCode/opentok/session.js +310 -0
- package/lib/oldCode/opentok/session.js.map +1 -0
- package/lib/oldCode/opentok/stream.js +310 -0
- package/lib/oldCode/opentok/stream.js.map +1 -0
- package/lib/oldCode/publisher.js +143 -0
- package/lib/oldCode/publisher.js.map +1 -0
- package/lib/oldCode/service.js +395 -0
- package/lib/oldCode/service.js.map +1 -0
- package/lib/oldCode/session.js +110 -0
- package/lib/oldCode/session.js.map +1 -0
- package/lib/oldCode/stream.js +195 -0
- package/lib/oldCode/stream.js.map +1 -0
- package/lib/oldCode/subscriber.js +90 -0
- package/lib/oldCode/subscriber.js.map +1 -0
- package/lib/oldCode/tracer.d.ts +36 -0
- package/lib/oldCode/tracer.d.ts.map +1 -0
- package/lib/oldCode/tracer.js +161 -0
- package/lib/oldCode/tracer.js.map +1 -0
- package/lib/oldCode/utils/ImageFixer.d.ts +1 -0
- package/lib/oldCode/utils/ImageFixer.d.ts.map +1 -0
- package/lib/oldCode/utils/ImageFixer.js +59 -0
- package/lib/oldCode/utils/ImageFixer.js.map +1 -0
- package/lib/oldCode/webrtc/constants.js +114 -0
- package/lib/oldCode/webrtc/constants.js.map +1 -0
- package/lib/oldCode/webrtc/helper.js +173 -0
- package/lib/oldCode/webrtc/helper.js.map +1 -0
- package/lib/oldCode/webrtc/session-kms.js +558 -0
- package/lib/oldCode/webrtc/session-kms.js.map +1 -0
- package/lib/oldCode/webrtc/session-loopback.js +336 -0
- package/lib/oldCode/webrtc/session-loopback.js.map +1 -0
- package/lib/oldCode/webrtc/session-turn.js +880 -0
- package/lib/oldCode/webrtc/session-turn.js.map +1 -0
- package/lib/oldCode/webrtc/session-turn.v2.js +583 -0
- package/lib/oldCode/webrtc/session-turn.v2.js.map +1 -0
- package/lib/oldCode/webrtc/session.js +52 -0
- package/lib/oldCode/webrtc/session.js.map +1 -0
- package/lib/oldCode/webrtc/stream.js +674 -0
- package/lib/oldCode/webrtc/stream.js.map +1 -0
- package/lib/oldCode/webrtc/temasys/adapter-loader.js +12 -0
- package/lib/oldCode/webrtc/temasys/adapter-loader.js.map +1 -0
- package/lib/oldCode/webrtc/temasys/adapter.js +5861 -0
- package/lib/oldCode/webrtc/temasys/adapter.js.map +1 -0
- package/lib/oldCode/webrtc/webrtc-ie-shim.js +3007 -0
- package/lib/oldCode/webrtc/webrtc-ie-shim.js.map +1 -0
- package/lib/qos/raw-qos.js +145 -84
- package/lib/qos/raw-qos.js.map +1 -1
- package/lib/webrtc-ie-shim.js +2950 -1896
- package/lib/webrtc-ie-shim.js.map +1 -1
- package/package.json +59 -65
- package/lib/MediaUtils/index.d.ts +0 -2
- package/lib/MediaUtils/index.d.ts.map +0 -1
- package/lib/MediaUtils/index.js +0 -6
- package/lib/MediaUtils/index.js.map +0 -1
- package/lib/MultiParty/MediaCapabilitiesService.d.ts +0 -18
- package/lib/MultiParty/MediaCapabilitiesService.d.ts.map +0 -1
- package/lib/MultiParty/MediaCapabilitiesService.js +0 -158
- package/lib/MultiParty/MediaCapabilitiesService.js.map +0 -1
- package/lib/MultiParty/MediaCapabilitiesUtils.d.ts +0 -6
- package/lib/MultiParty/MediaCapabilitiesUtils.d.ts.map +0 -1
- package/lib/MultiParty/MediaCapabilitiesUtils.js +0 -123
- package/lib/MultiParty/MediaCapabilitiesUtils.js.map +0 -1
- package/lib/MultiParty/MediaTracer.d.ts +0 -4
- package/lib/MultiParty/MediaTracer.d.ts.map +0 -1
- package/lib/MultiParty/MediaTracer.js +0 -10
- package/lib/MultiParty/MediaTracer.js.map +0 -1
- package/lib/MultiParty/MultiPartyService.d.ts +0 -49
- package/lib/MultiParty/MultiPartyService.d.ts.map +0 -1
- package/lib/MultiParty/MultiPartyService.js +0 -30
- package/lib/MultiParty/MultiPartyService.js.map +0 -1
- package/lib/MultiParty/MultiPartyServiceFactory.d.ts +0 -4
- package/lib/MultiParty/MultiPartyServiceFactory.d.ts.map +0 -1
- package/lib/MultiParty/MultiPartyServiceFactory.js +0 -13
- package/lib/MultiParty/MultiPartyServiceFactory.js.map +0 -1
- package/lib/MultiParty/MultipartyServiceEventTypes.d.ts +0 -89
- package/lib/MultiParty/MultipartyServiceEventTypes.d.ts.map +0 -1
- package/lib/MultiParty/MultipartyServiceEventTypes.js +0 -16
- package/lib/MultiParty/MultipartyServiceEventTypes.js.map +0 -1
- package/lib/MultiParty/index.d.ts +0 -7
- package/lib/MultiParty/index.d.ts.map +0 -1
- package/lib/MultiParty/index.js +0 -25
- package/lib/MultiParty/index.js.map +0 -1
- package/lib/MultiParty/opentok/OpentokMultiPartyService.d.ts +0 -38
- package/lib/MultiParty/opentok/OpentokMultiPartyService.d.ts.map +0 -1
- package/lib/MultiParty/opentok/OpentokMultiPartyService.js +0 -492
- package/lib/MultiParty/opentok/OpentokMultiPartyService.js.map +0 -1
- package/lib/MultiParty/opentok/OpentokPublisher.d.ts +0 -34
- package/lib/MultiParty/opentok/OpentokPublisher.d.ts.map +0 -1
- package/lib/MultiParty/opentok/OpentokPublisher.js +0 -121
- package/lib/MultiParty/opentok/OpentokPublisher.js.map +0 -1
- package/lib/MultiParty/opentok/OpentokPublisherEventMapper.d.ts +0 -20
- package/lib/MultiParty/opentok/OpentokPublisherEventMapper.d.ts.map +0 -1
- package/lib/MultiParty/opentok/OpentokPublisherEventMapper.js +0 -49
- package/lib/MultiParty/opentok/OpentokPublisherEventMapper.js.map +0 -1
- package/lib/MultiParty/opentok/OpentokScreenPublisher.d.ts +0 -6
- package/lib/MultiParty/opentok/OpentokScreenPublisher.d.ts.map +0 -1
- package/lib/MultiParty/opentok/OpentokScreenPublisher.js +0 -48
- package/lib/MultiParty/opentok/OpentokScreenPublisher.js.map +0 -1
- package/lib/MultiParty/opentok/OpentokSubscriber.d.ts +0 -2
- package/lib/MultiParty/opentok/OpentokSubscriber.d.ts.map +0 -1
- package/lib/MultiParty/opentok/OpentokSubscriber.js +0 -26
- package/lib/MultiParty/opentok/OpentokSubscriber.js.map +0 -1
- package/lib/MultiParty/opentok/OpentokVideoPublisher.d.ts +0 -19
- package/lib/MultiParty/opentok/OpentokVideoPublisher.d.ts.map +0 -1
- package/lib/MultiParty/opentok/OpentokVideoPublisher.js +0 -182
- package/lib/MultiParty/opentok/OpentokVideoPublisher.js.map +0 -1
- package/lib/MultiParty/opentok/trace.d.ts +0 -3
- package/lib/MultiParty/opentok/trace.d.ts.map +0 -1
- package/lib/MultiParty/opentok/trace.js +0 -18
- package/lib/MultiParty/opentok/trace.js.map +0 -1
- package/lib/MultiParty/opentok.d.ts +0 -463
- package/lib/MultiParty/types.d.ts +0 -33
- package/lib/MultiParty/types.d.ts.map +0 -1
- package/lib/MultiParty/types.js +0 -3
- package/lib/MultiParty/types.js.map +0 -1
- package/lib/MultiParty/utils.d.ts +0 -10
- package/lib/MultiParty/utils.d.ts.map +0 -1
- package/lib/MultiParty/utils.js +0 -17
- package/lib/MultiParty/utils.js.map +0 -1
- package/lib/qos/raw-qos.d.ts +0 -29
- package/lib/qos/raw-qos.d.ts.map +0 -1
- package/lib/webrtc-ie-shim.d.ts +0 -4
- package/lib/webrtc-ie-shim.d.ts.map +0 -1
package/README.md
CHANGED
|
@@ -1,25 +1,25 @@
|
|
|
1
1
|
# @techsee/techsee-media-service
|
|
2
2
|
|
|
3
3
|
**General Info**
|
|
4
|
-
This package is a starting point for creating Techsee Media SDK.
|
|
4
|
+
This package is a starting point for creating Techsee Media SDK.
|
|
5
5
|
It contains basic framework for creating applications that utilizes media abilities.
|
|
6
6
|
It can be video and/or audio, with or without streaming over WebRTC protocol.
|
|
7
|
-
The framework currently supports: Video+Voip over Techsee Video (Turn) + IE Plugin and OpenTOK + IE Plugin.
|
|
7
|
+
The framework currently supports: Video+Voip over Techsee Video (Turn) + IE Plugin and OpenTOK + IE Plugin.
|
|
8
8
|
|
|
9
9
|
You can see a very simple demo, which demonstrates how to create very basic MediaService implementation and use it for rendering video in react component.
|
|
10
|
-
Clone the repository, run `npm i`, then run `npm run demo`. The source code of the demo, can be found in ./demo folder.
|
|
10
|
+
Clone the repository, run `npm i`, then run `npm run demo`. The source code of the demo, can be found in ./demo folder.
|
|
11
11
|
|
|
12
12
|
---
|
|
13
13
|
|
|
14
14
|
Some basic framework principles are described below, which will help you to work with media framework.
|
|
15
15
|
|
|
16
16
|
**Framework actors**
|
|
17
|
-
`MediaStreamTrack` -
|
|
18
|
-
It can be video track (WebCam or ScreenShare), or audio track (Microphone stream).
|
|
19
|
-
|
|
17
|
+
`MediaStreamTrack` - WebRTC object, the most basic media unit.
|
|
18
|
+
It can be video track (WebCam or ScreenShare), or audio track (Microphone stream).
|
|
19
|
+
|
|
20
20
|
`MediaStream` - WebRTC object that just organizes multiple `MediaStreamTracks` into single group.
|
|
21
21
|
The same `MediaStreamTrack` can belong to multiple `MediaStreams`.
|
|
22
|
-
In Techsee Media Service implementation, `MediaStream` can not contain more than one `MediaStreamTrack` and it used only because HTML5 video element works with `MediaStream` object.
|
|
22
|
+
In Techsee Media Service implementation, `MediaStream` can not contain more than one `MediaStreamTrack` and it used only because HTML5 video element works with `MediaStream` object.
|
|
23
23
|
|
|
24
24
|
`TechseeMediaStream` - This is a logical wrapper for WebRTC `MediaStreamTrack` and manages some additional information regarding the specific `MediaStreamTrack`.
|
|
25
25
|
For example this object has the type of the `MediaStreamTrack` (USER_VIDEO, AGENT_AUDIO...etc), has indication if track is local or remote.
|
|
@@ -27,57 +27,58 @@ For example this object has the type of the `MediaStreamTrack` (USER_VIDEO, AGEN
|
|
|
27
27
|
`MediaSubscriber` - Techsee logical unit, that responsible to render `MediaStreams` into DOM.
|
|
28
28
|
In simple words this object creates video element in html, and renders `MediaStream` into it, when stream is ready.
|
|
29
29
|
`MediaSubscriber` is created for specific `MediaStream`, and whenever that stream created, the subscriber will start playing it.
|
|
30
|
-
The subscriber will notify it's consumers about the state changes through `onStateChanged` method.
|
|
30
|
+
The subscriber will notify it's consumers about the state changes through `onStateChanged` method.
|
|
31
31
|
|
|
32
32
|
`MediaSession` - Techsee logical unit, that used to stream video over WebRTC protocol. This object is responsible to handle all aspect of peers connectivity, including signaling, or third party service handling, like OpenTok.
|
|
33
33
|
When connection with peer established, this service registers `MediaStreamTracks` that received from peer and publishes local streams the connected peer.
|
|
34
34
|
Current implementation contains `MediaSessionBase` object, which have basic abstractions for all types of sessions. `SessionTurn` which handles the Techsee video sessions over TURN server.
|
|
35
35
|
`SessionOpentok` which handles the session connectivity over OpenTok third party service.
|
|
36
|
-
|
|
36
|
+
|
|
37
37
|
`RTCPeerConnection` - WebRTC object that represents connection with single peer, when SessionTurn is used for session. The same peer is used to send and/or receive media information.
|
|
38
38
|
|
|
39
|
-
`OTPeerConnection` - Design time only Typescript abstraction, which represents the connectivity with peer over OpenTok session.
|
|
39
|
+
`OTPeerConnection` - Design time only Typescript abstraction, which represents the connectivity with peer over OpenTok session.
|
|
40
40
|
|
|
41
41
|
`MediaPublisher` - Techsee logical unit which organizes local MediaStreamTracks into single MediaStream for publishing.
|
|
42
42
|
|
|
43
43
|
`MediaService` - Techsee logical unit. Represents the Facade of the framework and glues all of the above together.
|
|
44
44
|
Current implementation provides `MediaServiceBase` abstract object that contains all base logic and tools for displaying media locally or streaming it over WebRTC.
|
|
45
|
-
Each application should create its concrete `MediaService` and fill specific application logic gaps.
|
|
45
|
+
Each application should create its concrete `MediaService` and fill specific application logic gaps.
|
|
46
46
|
For example, currently exist `DashboardMediaService` in `techsee-app` and `MobileMediaService` in `techee-mobile`.
|
|
47
47
|
|
|
48
48
|
---
|
|
49
49
|
|
|
50
50
|
**Consuming media service - High Level Flow**
|
|
51
|
-
|
|
51
|
+
|
|
52
52
|
In order to be able to use media service, first you need to create and instance of it and initialize it.
|
|
53
|
-
Depending on application, the constructor parameters can be different, but MediaServiceBase need to get the following in it's constructor:
|
|
53
|
+
Depending on application, the constructor parameters can be different, but MediaServiceBase need to get the following in it's constructor:
|
|
54
54
|
|
|
55
55
|
`let mediaService = new SomeSpecificMediaService(environment, webRtcInfo);`
|
|
56
|
+
|
|
57
|
+
* **environment: IMediaEnvironment** - Service which will help understand in which environment the media service is currently running.
|
|
58
|
+
* **webRtcSupportInfo: ClientWebRtcInfo** - Information about WebRTC support on currently running device
|
|
56
59
|
|
|
57
|
-
- **environment: IMediaEnvironment** - Service which will help understand in which environment the media service is currently running.
|
|
58
|
-
- **webRtcSupportInfo: ClientWebRtcInfo** - Information about WebRTC support on currently running device
|
|
59
60
|
|
|
60
61
|
When instance of specific MediaService was created, it should be initialized with `mediaService.initMediaService(serviceOptions)` method.
|
|
61
62
|
See `MediaServiceOptions` for options details. The method returns promise that resolved when initialization is done.
|
|
62
63
|
Initialization process, detects what media support currently running device have.
|
|
63
64
|
It checks if video can be played (natively or using IE plugins), if device have mic and so on...
|
|
64
|
-
After initialization promise resolved, the device information get be accessed through `mediaService.deviceSupportInfo`.
|
|
65
|
+
After initialization promise resolved, the device information get be accessed through `mediaService.deviceSupportInfo`.
|
|
65
66
|
|
|
66
|
-
|
|
67
|
+
***Note:*** Before promise returned by `mediaService.initMediaService(serviceOptions)` was not resolved, you not able to call `mediaService.initLocalMediaStreams(serviceOptions)`,
|
|
67
68
|
but you can create media subscribers if needed by calling `mediaService.createSubscriber(subscriberParams)`.
|
|
68
69
|
|
|
69
70
|
If audio stream is needed during the session, `mediaService.enableVoipDuringSession()` method should be called before initializing local streams.
|
|
70
|
-
After initialization was done and promise was resolved `mediaService.initLocalMediaStreams(serviceOptions)` can be called when video/audio streams should be created.
|
|
71
|
+
After initialization was done and promise was resolved `mediaService.initLocalMediaStreams(serviceOptions)` can be called when video/audio streams should be created.
|
|
71
72
|
This method will start the local MediaStream creation process, and Camera/ScreenShare approval dialog will popup if there permission currently exists.
|
|
72
73
|
`initLocalMediaStreams` method is called by controller which displays local media stream on mobile, and in MediaSession, when `peerConnection ` is created.
|
|
73
|
-
`initLocalMediaStreams` synchronizes the calls and insures there only one instance of stream exists, and both sides receives the same one.
|
|
74
|
-
|
|
75
|
-
As mentioned before, `mediaService.createSubscriber(subscriberParams)` can be called even before initialization, so whenever you have the `div` container that should hold video element,
|
|
76
|
-
you can create the subscriber, by providing `KnownMediaStream` and `div` as container. Whenever the stream is ready, it will be played automatically by `MediaSubscriber`.
|
|
77
|
-
`MediaSubscriber` will create `video` element, add it to `div` container and will insure it plays.
|
|
78
|
-
`MediaSubscriber` has 'onStateChanged' method, which can be used for being notified on state changes of the subscriber.
|
|
79
|
-
It will notify when it starts or stops playing the video, or when it has been muted or unmuted. In event listener you can inspect properties of the subscriber to see in which state it currently exists.
|
|
80
|
-
In addition, `MediaSubscriber` has `onDispose` event handler, which will be called after `MediaSubscriber` was disposed and will never play video again, so references to it can be removed in order to avoid memory leaks.
|
|
74
|
+
`initLocalMediaStreams` synchronizes the calls and insures there only one instance of stream exists, and both sides receives the same one.
|
|
75
|
+
|
|
76
|
+
As mentioned before, `mediaService.createSubscriber(subscriberParams)` can be called even before initialization, so whenever you have the `div` container that should hold video element,
|
|
77
|
+
you can create the subscriber, by providing `KnownMediaStream` and `div` as container. Whenever the stream is ready, it will be played automatically by `MediaSubscriber`.
|
|
78
|
+
`MediaSubscriber` will create `video` element, add it to `div` container and will insure it plays.
|
|
79
|
+
`MediaSubscriber` has 'onStateChanged' method, which can be used for being notified on state changes of the subscriber.
|
|
80
|
+
It will notify when it starts or stops playing the video, or when it has been muted or unmuted. In event listener you can inspect properties of the subscriber to see in which state it currently exists.
|
|
81
|
+
In addition, `MediaSubscriber` has `onDispose` event handler, which will be called after `MediaSubscriber` was disposed and will never play video again, so references to it can be removed in order to avoid memory leaks.
|
|
81
82
|
|
|
82
83
|
**Connecting to WebRTC Media Session - High Level Flow**
|
|
83
84
|
|
|
@@ -85,4 +86,4 @@ After initialization promise was resolved, `mediaService.connectToSession(sessio
|
|
|
85
86
|
Connection to session can be done before media streams were initialized, if your use case requires it.
|
|
86
87
|
In case of of Techsee Live implementation, connection to session is done only when Terms and camera access approved by the user.
|
|
87
88
|
Depending on configuration passed in initialization method, `SessionTurn` or `SessionOpentok` will be created to manage the media session peers.
|
|
88
|
-
Whenever WebRTC peer will be connected, MediaSession instance will ask from `mediaService` for MediaStream that should be published to connected peer.
|
|
89
|
+
Whenever WebRTC peer will be connected, MediaSession instance will ask from `mediaService` for MediaStream that should be published to connected peer.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalStreamManager.d.ts","sourceRoot":"","sources":["../src/LocalStreamManager.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AAEjD,OAAO,EACH,iBAAiB,EACjB,qBAAqB,EACrB,2BAA2B,EAE3B,yBAAyB,EAE5B,MAAM,kBAAkB,CAAC;AAY1B,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,qBAAqB,EAAE,QAAQ,CAAC,yBAAyB,CAAC,CAAC;QAC3D,wBAAwB,EAAE,QAAQ,CAAC,yBAAyB,CAAC,CAAC;QAC9D,2BAA2B,EAAE,QAAQ,CAAC,qBAAqB,CAAC,CAAC;QAC7D,0BAA0B,EAAE,OAAO,CAAC;KACvC;CACJ;AAeD,UAAU,eAAe;IACrB,KAAK,EAAE,QAAQ,CAAC;QAAC,IAAI,CAAC,EAAE,eAAe,CAAC;QAAC,KAAK,CAAC,EAAE,eAAe,CAAA;KAAC,CAAC,CAAC;IACnE,KAAK,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,WAAW,CAAoB;IAEvC,OAAO,CAAC,eAAe,CAAgE;gBAE3E,WAAW,EAAE,iBAAiB;IAO1C,IAAI,cAAc,oBAEjB;IAED,kBAAkB,CAAC,WAAW,EAAE,qBAAqB,GAAG,OAAO,CAAC,yBAAyB,CAAC;IA4C1F,qBAAqB,CAAC,WAAW,EAAE,2BAA2B,GAAG,OAAO,CAAC,yBAAyB,CAAC;IA4CnG,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBvC,yBAAyB,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB1C,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAMhC,OAAO,CAAC,0BAA0B;IAkElC,OAAO,CAAC,6BAA6B;IAoBrC,OAAO,CAAC,mCAAmC;IA0E3C,iBAAiB,CAAC,cAAc,EAAE;QAAC,KAAK,EAAE,eAAe,EAAE,CAAC;QAAC,KAAK,EAAE,eAAe,EAAE,CAAA;KAAC;IAWtF,OAAO,CAAC,oBAAoB;IA6E5B,OAAO,CAAC,wBAAwB;CA+BnC"}
|
|
1
|
+
{"version":3,"sources":["../src/LocalStreamManager.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AAEjD,OAAO,EACH,iBAAiB,EACjB,qBAAqB,EACrB,2BAA2B,EAE3B,yBAAyB,EAE5B,MAAM,kBAAkB,CAAC;AAY1B,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,qBAAqB,EAAE,QAAQ,CAAC,yBAAyB,CAAC,CAAC;QAC3D,wBAAwB,EAAE,QAAQ,CAAC,yBAAyB,CAAC,CAAC;QAC9D,2BAA2B,EAAE,QAAQ,CAAC,qBAAqB,CAAC,CAAC;QAC7D,0BAA0B,EAAE,OAAO,CAAC;KACvC;CACJ;AAeD,UAAU,eAAe;IACrB,KAAK,EAAE,QAAQ,CAAC;QAAE,IAAI,CAAC,EAAE,eAAe,CAAC;QAAC,KAAK,CAAC,EAAE,eAAe,CAAA;KAAE,CAAC,CAAC;IACrE,KAAK,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,eAAe,CAAgE;gBAE3E,WAAW,EAAE,iBAAiB;IAO1C,IAAI,cAAc,oBAEjB;IAED,kBAAkB,CAAC,WAAW,EAAE,qBAAqB,GAAG,OAAO,CAAC,yBAAyB,CAAC;IA2C1F,qBAAqB,CAAC,WAAW,EAAE,2BAA2B,GAAG,OAAO,CAAC,yBAAyB,CAAC;IA4CnG,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBvC,yBAAyB,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB1C,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAShC,OAAO,CAAC,0BAA0B;IAwDlC,OAAO,CAAC,6BAA6B;IAsBrC,OAAO,CAAC,mCAAmC;IAoD3C,iBAAiB,CAAC,cAAc,EAAE;QAAC,KAAK,EAAE,eAAe,EAAE,CAAC;QAAC,KAAK,EAAE,eAAe,EAAE,CAAA;KAAC;IAStF,OAAO,CAAC,oBAAoB;IAuE5B,OAAO,CAAC,wBAAwB;CAwCnC","file":"LocalStreamManager.d.ts","sourcesContent":["import assign from 'lodash/assign';\nimport get from 'lodash/get';\nimport last from 'lodash/last';\nimport first from 'lodash/first';\nimport cloneDeep from 'lodash/cloneDeep';\nimport {Promise} from 'bluebird';\n\nimport {Nullable} from '@techsee/techsee-common';\n\nimport {\n IMediaEnvironment,\n LocalMediaConstraints,\n LocalVideoStreamConstraints,\n MediaRequestFailResult,\n MediaRequestSuccessResult,\n VideoStreamResolution\n} from './MediaContracts';\n\nimport {\n CameraTypes,\n ConstraintType,\n DEFAULT_VIDEO_CONSTRAINT_TYPE,\n DEFAULT_VIDEO_RESOLUTION,\n LocalVideoSourceType,\n MediaRequestErrorCode\n} from './MediaConstants';\nimport {getMediaTracer} from './MediaUtils/MediaTracer';\n\ndeclare global {\n interface Window {\n latestUserMediaStream: Nullable<MediaRequestSuccessResult>;\n latestDesktopMediaStream: Nullable<MediaRequestSuccessResult>;\n latestLocalMediaConstraints: Nullable<LocalMediaConstraints>;\n mediaStreamAlreadyReplaced: boolean;\n }\n}\n\ndeclare const window: Window;\n\nwindow.latestUserMediaStream = null;\nlet userMediaPromise: Nullable<Promise<MediaRequestSuccessResult>> = null;\n\nwindow.latestDesktopMediaStream = null;\nlet desktopMediaPromise: Nullable<Promise<MediaRequestSuccessResult>> = null;\n\nwindow.mediaStreamAlreadyReplaced = false;\nwindow.latestLocalMediaConstraints = null;\n\nconst trace = getMediaTracer('LocalStreamManager');\n\ninterface IGroupedDevices {\n video: Nullable<{ back?: MediaDeviceInfo; front?: MediaDeviceInfo }>;\n audio: Nullable<MediaDeviceInfo>;\n camerasCount: number;\n}\n\nexport class LocalStreamManager {\n private environment: IMediaEnvironment;\n private _groupedDevices: IGroupedDevices = {video: null, audio: null, camerasCount: 0};\n\n constructor(environment: IMediaEnvironment) {\n this.environment = environment;\n\n this.parseMediaErrorThenThrow = this.parseMediaErrorThenThrow.bind(this);\n this.clearAllStreams = this.clearAllStreams.bind(this);\n }\n\n get groupedDevices() {\n return this._groupedDevices;\n }\n\n getUserMediaStream(constraints: LocalMediaConstraints): Promise<MediaRequestSuccessResult> {\n trace.info('getUserMediaStream', constraints);\n if (userMediaPromise) {\n return userMediaPromise;\n }\n\n if (window.latestUserMediaStream) {\n const videoTrack = window.latestUserMediaStream.mediaStream.getVideoTracks();\n\n if (videoTrack.length > 0 && videoTrack[0].readyState === 'live') {\n return Promise.resolve({...window.latestUserMediaStream, isNew: false});\n }\n\n this.destroyUserMediaStream();\n }\n\n userMediaPromise = new Promise((resolve, reject) => {\n const catchHandler = (err: any): void => {\n userMediaPromise = null;\n window.latestUserMediaStream = null;\n trace.error('getUserMedia error', err);\n reject(err);\n };\n\n try {\n this.getHighestResolutionStream(false, constraints)\n .then((streamResult: MediaRequestSuccessResult) => {\n userMediaPromise = null;\n window.latestUserMediaStream = streamResult;\n window.latestLocalMediaConstraints = cloneDeep(constraints);\n window.latestLocalMediaConstraints.audio = (streamResult.constraint && streamResult.constraint.audio) as boolean;\n\n resolve({...window.latestUserMediaStream, isNew: true});\n })\n .catch(catchHandler);\n } catch (err) {\n catchHandler(err);\n }\n });\n\n return userMediaPromise;\n }\n\n getDesktopMediaStream(constraints: LocalVideoStreamConstraints): Promise<MediaRequestSuccessResult> {\n if (desktopMediaPromise) {\n return desktopMediaPromise;\n }\n\n trace.info('getDesktopMediaStream', constraints);\n\n if (window.latestDesktopMediaStream) {\n const track = window.latestDesktopMediaStream.mediaStream.getVideoTracks();\n\n if (track.length > 0 && track[0].readyState === 'live') {\n //return Promise.resolve();\n return Promise.resolve({...window.latestDesktopMediaStream, isNew: false});\n }\n this.destroyDesktopMediaStream().catch((error: any) => {\n trace.error('Error destroying desktop media stream', error);\n });\n\n }\n\n desktopMediaPromise = new Promise((resolve, reject) => {\n const mediaCatchHandler = (err: any): void => {\n desktopMediaPromise = null;\n window.latestDesktopMediaStream = null;\n trace.error('getDisplayMedia error', err);\n reject(err);\n };\n\n try {\n this.getHighestResolutionStream(true, {video: constraints, audio: false})\n .then((streamResult: MediaRequestSuccessResult) => {\n desktopMediaPromise = null;\n window.latestDesktopMediaStream = streamResult;\n\n resolve({...window.latestDesktopMediaStream, isNew: true});\n }).catch(mediaCatchHandler);\n } catch (err) {\n mediaCatchHandler(err);\n }\n });\n\n return desktopMediaPromise;\n }\n\n destroyUserMediaStream(): Promise<void> {\n const streamResult = window.latestUserMediaStream;\n\n userMediaPromise = null;\n window.latestUserMediaStream = null;\n window.latestLocalMediaConstraints = null;\n window.mediaStreamAlreadyReplaced = false;\n\n if (streamResult && streamResult.mediaStream) {\n try {\n streamResult.mediaStream.getTracks().forEach((track: MediaStreamTrack) => {\n track.stop();\n });\n\n trace.info('destroyUserMediaStream - stop all tracks');\n } catch (e) {\n trace.info('destroyUserMediaStream - Failed to stop all tracks', e);\n }\n }\n\n return Promise.resolve();\n }\n\n destroyDesktopMediaStream(): Promise<void> {\n const streamResult = window.latestDesktopMediaStream;\n\n window.latestDesktopMediaStream = null;\n desktopMediaPromise = null;\n\n if (streamResult && streamResult.mediaStream) {\n try {\n streamResult.mediaStream.getTracks().forEach((track: MediaStreamTrack) => {\n track.stop();\n });\n\n trace.info('destroyDesktopMediaStream - stop all tracks');\n } catch (e) {\n trace.info('destroyDesktopMediaStream - Failed to stop all tracks', e);\n }\n }\n\n return Promise.resolve();\n }\n\n clearAllStreams(): Promise<void> {\n trace.info('LocalStreamManager Clearing all streams');\n\n return Promise.all([\n this.destroyDesktopMediaStream(),\n this.destroyUserMediaStream()\n ]).then(() => undefined);\n }\n\n private getHighestResolutionStream(isDesktopMedia: boolean, constraints?: LocalMediaConstraints): Promise<MediaRequestSuccessResult> {\n const constraintsCandidates = this.getParsedConstraints(isDesktopMedia, constraints);\n\n trace.info('getHighestResolutionStream - constraintsCandidates:', constraintsCandidates);\n\n if (constraintsCandidates.length === 0) {\n return Promise.reject(new Error('No constraints to retrieve the stream'));\n }\n\n return new Promise((resolve, reject) => {\n let lastSuccessfulResult: Nullable<MediaRequestSuccessResult> = null;\n let lastFailedResult: Nullable<MediaRequestFailResult> = null;\n let isStreamRequestFulfilled = false;\n\n (Promise as any).reduce(constraintsCandidates, (total: any, candidate: MediaStreamConstraints) => {\n if (isStreamRequestFulfilled) {\n return;\n }\n\n const constraintType = get(constraints, 'video.videoResolution.constraintType') || get(constraints, 'video.videoResolution[0].constraintType');\n\n return this.getStreamPromiseByParsedConstraints(candidate, isDesktopMedia)\n .then((stream: MediaStream) => {\n lastSuccessfulResult = {\n mediaStream: stream,\n constraint: candidate,\n constraintType,\n isNew: true\n };\n trace.info('getHighestResolutionStream Success', lastSuccessfulResult);\n isStreamRequestFulfilled = true;\n resolve(lastSuccessfulResult);\n })\n .catch((failResult: MediaRequestFailResult) => {\n lastFailedResult = failResult;\n\n if (lastFailedResult.errorCode === MediaRequestErrorCode.PermissionDenied) {\n isStreamRequestFulfilled = true;\n reject(lastFailedResult);\n }\n });\n }, 0)\n .then(() => {\n if (!isStreamRequestFulfilled) {\n if (!lastFailedResult) {\n lastFailedResult = {\n errorCode: MediaRequestErrorCode.GeneralError,\n message: 'Suitable stream cannot be created'\n };\n }\n reject(lastFailedResult);\n }\n });\n });\n }\n\n private getUserMediaStreamMediaDevice(constraints: MediaStreamConstraints, isDesktopMedia: boolean) {\n let streamPromise = null;\n\n if (!isDesktopMedia) {\n streamPromise = navigator.mediaDevices.getUserMedia(constraints);\n } else {\n // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n //@ts-ignore\n streamPromise = navigator.mediaDevices.getDisplayMedia\n // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n //@ts-ignore\n ? navigator.mediaDevices.getDisplayMedia(constraints)\n // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n //@ts-ignore\n : navigator.getDisplayMedia(constraints);\n }\n\n return streamPromise;\n }\n\n // eslint-disable-next-line consistent-return,@typescript-eslint/ban-ts-comment\n // @ts-ignore\n private getStreamPromiseByParsedConstraints(constraints: MediaStreamConstraints, isDesktopMedia: boolean): Promise<MediaStream> {\n trace.info('getStreamPromiseByParsedConstraints', constraints);\n\n try {\n return this.getUserMediaStreamMediaDevice(constraints, isDesktopMedia).catch((err: any) => {\n let streamPromise = null;\n\n trace.info('getStreamPromiseByParsedConstraints - get user stream error', err.name);\n\n // Android (Galaxy esp.) have a bug that when using facingMode it might cause NotReadableError. So\n // we should try again but without facingMode. The exception to the rule is when we don't have specific\n // device to use (like in IOS13 bug, as can be seen in MediaServiceBase.ts), in that case, we might end\n // up using the front camera, which is a privacy concern and the preference is to fallback from video\n if (err && (err.name === 'NotReadableError') && get(constraints, 'video.facingMode') &&\n get(constraints, 'video.deviceId')) {\n\n const newConstraints = constraints;\n\n trace.info(`getStreamPromiseByParsedConstraints - NotReadableError - Failed to get video user media stream with facingMode=${get(constraints, 'video.facingMode')}`, err.name);\n\n // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n // @ts-ignore\n delete newConstraints.video.facingMode;\n ((newConstraints.video as MediaTrackConstraints).deviceId as ConstrainDOMStringParameters) = {\n exact: (constraints.video as MediaTrackConstraints).deviceId\n } as any as ConstrainDOMStringParameters;\n\n streamPromise = this.getStreamPromiseByParsedConstraints(newConstraints, isDesktopMedia);\n } else if (err && err.name && constraints.audio && !constraints.video) {\n trace.info('getStreamPromiseByParsedConstraints - audioStreamFailed - Failed to get audio user media stream', err.name);\n\n return this.parseMediaErrorThenThrow({name: 'audioStreamFailed'});\n } else if (err && err.name && constraints.audio) {\n const newConstraints = constraints;\n\n trace.info('getStreamPromiseByParsedConstraints - Failed to get video and audio user media stream, try to get video media stream only', err.name);\n\n newConstraints.audio = false;\n streamPromise = this.getStreamPromiseByParsedConstraints(newConstraints, isDesktopMedia);\n } else if (err && !streamPromise) {\n trace.info('getStreamPromiseByParsedConstraints - Failed to get video user media stream', err && err.name);\n\n streamPromise = Promise.reject(err);\n }\n\n return streamPromise && streamPromise.catch(this.parseMediaErrorThenThrow);\n });\n } catch (e) {\n this.parseMediaErrorThenThrow(e);\n }\n }\n\n setGroupedDevices(groupedDevices: {video: MediaDeviceInfo[]; audio: MediaDeviceInfo[]}) {\n trace.info('setGroupedDevices', groupedDevices);\n this._groupedDevices = {video: groupedDevices.video\n ? {[CameraTypes.BACK]: last(groupedDevices.video), [CameraTypes.FRONT]: first(groupedDevices.video)}\n : null,\n audio: last(groupedDevices.audio) || null,\n camerasCount: groupedDevices.video.length};\n }\n\n private getParsedConstraints(isDesktopMedia: boolean, streamConstraints?: LocalMediaConstraints): MediaStreamConstraints[] {\n const constraintCandidates: MediaStreamConstraints[] = [];\n\n //TODO - Alex: need to understand which constraints not compatible with screen share\n if (isDesktopMedia) {\n return [{video: true}];\n }\n\n if (!streamConstraints) {\n return constraintCandidates;\n }\n\n const baseConstraints: MediaStreamConstraints = {};\n\n baseConstraints.audio = typeof streamConstraints.audio === 'boolean' ? streamConstraints.audio : undefined;\n\n if (!streamConstraints.video) {\n return [baseConstraints];\n }\n\n const cameraType = (streamConstraints.video !== 'boolean') &&\n (streamConstraints.video as LocalVideoStreamConstraints).videoSourceType;\n\n baseConstraints.video = {\n facingMode: cameraType && cameraType === LocalVideoSourceType.CAMERA_FRONT\n ? 'user'\n : 'environment',\n frameRate: {ideal: 15, max: 30}\n };\n\n const deviceId = get(this._groupedDevices, `video.${cameraType === LocalVideoSourceType.CAMERA_FRONT\n ? CameraTypes.FRONT\n : CameraTypes.BACK}.deviceId`);\n\n if (deviceId) {\n baseConstraints.video.deviceId = deviceId;\n\n if (this._groupedDevices.camerasCount > 1) {\n baseConstraints.video.facingMode = {exact: baseConstraints.video.facingMode} as any as ConstrainDOMStringParameters;\n }\n }\n\n const assignConstraint = (videoResolution: VideoStreamResolution): void => {\n const [width, height] = videoResolution.resolution.split('x');\n const constraintCandidate = assign({}, baseConstraints);\n\n constraintCandidate.video = assign({}, baseConstraints.video, {\n width: _constraintByType(width, videoResolution.constraintType),\n height: _constraintByType(height, videoResolution.constraintType)\n });\n constraintCandidates.push(constraintCandidate);\n };\n\n if ((baseConstraints.video && typeof streamConstraints.video === 'boolean') ||\n !((streamConstraints.video as LocalVideoStreamConstraints).videoResolution instanceof Array)) {\n\n const defaultResolution: VideoStreamResolution = {\n resolution: DEFAULT_VIDEO_RESOLUTION,\n constraintType: DEFAULT_VIDEO_CONSTRAINT_TYPE\n };\n\n assignConstraint(defaultResolution);\n\n return constraintCandidates;\n }\n\n (streamConstraints.video as any).videoResolution.forEach(assignConstraint);\n\n return constraintCandidates;\n }\n\n private parseMediaErrorThenThrow(error: any): MediaRequestFailResult {\n if (error && error.errorCode) {\n throw error;\n }\n\n trace.error('Get media stream error.', error);\n const errorName = error && error.name ? error.name : '';\n\n const permissionErrorNames = [\n 'NotAllowedError',\n 'PermissionDismissedError',\n 'PermissionDeniedError'\n\n ];\n\n // const generalError = [\n // 'NotFoundError',\n // 'DevicesNotFoundError',\n // 'NotReadableError',\n // 'TrackStartError'\n // ];\n\n const constraintsErrors = [\n 'OverconstrainedError',\n 'ConstraintNotSatisfiedError'\n\n ];\n\n const isErrorOfType = (errorsArr: string[]) => errorsArr.filter((err: string) => err === errorName).length > 0;\n\n if (isErrorOfType(permissionErrorNames)) {\n throw {errorCode: MediaRequestErrorCode.PermissionDenied, message: errorName};\n }\n\n if (isErrorOfType(constraintsErrors)) {\n throw {errorCode: MediaRequestErrorCode.Overconstrained, message: errorName};\n }\n\n throw {errorCode: MediaRequestErrorCode.GeneralError, message: errorName};\n }\n}\n\nfunction _constraintByType(value: any, type: ConstraintType): any {\n switch (type) {\n case ConstraintType.MIN:\n return {min: value};\n default:\n return {ideal: value};\n }\n}\n"]}
|
|
@@ -1,17 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
|
|
3
|
+
var __assign = undefined && undefined.__assign || function () {
|
|
4
|
+
__assign = Object.assign || function (t) {
|
|
4
5
|
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
6
|
s = arguments[i];
|
|
6
|
-
for (var p in s)
|
|
7
|
-
t[p] = s[p];
|
|
7
|
+
for (var p in s) {
|
|
8
|
+
if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
|
|
9
|
+
}
|
|
8
10
|
}
|
|
9
11
|
return t;
|
|
10
12
|
};
|
|
11
13
|
return __assign.apply(this, arguments);
|
|
12
14
|
};
|
|
13
|
-
var __importDefault =
|
|
14
|
-
return
|
|
15
|
+
var __importDefault = undefined && undefined.__importDefault || function (mod) {
|
|
16
|
+
return mod && mod.__esModule ? mod : { "default": mod };
|
|
15
17
|
};
|
|
16
18
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
19
|
exports.LocalStreamManager = void 0;
|
|
@@ -29,8 +31,8 @@ window.latestDesktopMediaStream = null;
|
|
|
29
31
|
var desktopMediaPromise = null;
|
|
30
32
|
window.mediaStreamAlreadyReplaced = false;
|
|
31
33
|
window.latestLocalMediaConstraints = null;
|
|
32
|
-
var trace =
|
|
33
|
-
var LocalStreamManager =
|
|
34
|
+
var trace = MediaTracer_1.getMediaTracer('LocalStreamManager');
|
|
35
|
+
var LocalStreamManager = /** @class */function () {
|
|
34
36
|
function LocalStreamManager(environment) {
|
|
35
37
|
this._groupedDevices = { video: null, audio: null, camerasCount: 0 };
|
|
36
38
|
this.environment = environment;
|
|
@@ -38,7 +40,7 @@ var LocalStreamManager = (function () {
|
|
|
38
40
|
this.clearAllStreams = this.clearAllStreams.bind(this);
|
|
39
41
|
}
|
|
40
42
|
Object.defineProperty(LocalStreamManager.prototype, "groupedDevices", {
|
|
41
|
-
get: function () {
|
|
43
|
+
get: function get() {
|
|
42
44
|
return this._groupedDevices;
|
|
43
45
|
},
|
|
44
46
|
enumerable: false,
|
|
@@ -58,25 +60,21 @@ var LocalStreamManager = (function () {
|
|
|
58
60
|
this.destroyUserMediaStream();
|
|
59
61
|
}
|
|
60
62
|
userMediaPromise = new bluebird_1.Promise(function (resolve, reject) {
|
|
61
|
-
var catchHandler = function (err) {
|
|
63
|
+
var catchHandler = function catchHandler(err) {
|
|
62
64
|
userMediaPromise = null;
|
|
63
65
|
window.latestUserMediaStream = null;
|
|
64
66
|
trace.error('getUserMedia error', err);
|
|
65
67
|
reject(err);
|
|
66
68
|
};
|
|
67
69
|
try {
|
|
68
|
-
_this.getHighestResolutionStream(false, constraints)
|
|
69
|
-
.then(function (streamResult) {
|
|
70
|
+
_this.getHighestResolutionStream(false, constraints).then(function (streamResult) {
|
|
70
71
|
userMediaPromise = null;
|
|
71
72
|
window.latestUserMediaStream = streamResult;
|
|
72
|
-
window.latestLocalMediaConstraints =
|
|
73
|
-
window.latestLocalMediaConstraints.audio =
|
|
74
|
-
streamResult.constraint.audio);
|
|
73
|
+
window.latestLocalMediaConstraints = cloneDeep_1.default(constraints);
|
|
74
|
+
window.latestLocalMediaConstraints.audio = streamResult.constraint && streamResult.constraint.audio;
|
|
75
75
|
resolve(__assign(__assign({}, window.latestUserMediaStream), { isNew: true }));
|
|
76
|
-
})
|
|
77
|
-
|
|
78
|
-
}
|
|
79
|
-
catch (err) {
|
|
76
|
+
}).catch(catchHandler);
|
|
77
|
+
} catch (err) {
|
|
80
78
|
catchHandler(err);
|
|
81
79
|
}
|
|
82
80
|
});
|
|
@@ -91,6 +89,7 @@ var LocalStreamManager = (function () {
|
|
|
91
89
|
if (window.latestDesktopMediaStream) {
|
|
92
90
|
var track = window.latestDesktopMediaStream.mediaStream.getVideoTracks();
|
|
93
91
|
if (track.length > 0 && track[0].readyState === 'live') {
|
|
92
|
+
//return Promise.resolve();
|
|
94
93
|
return bluebird_1.Promise.resolve(__assign(__assign({}, window.latestDesktopMediaStream), { isNew: false }));
|
|
95
94
|
}
|
|
96
95
|
this.destroyDesktopMediaStream().catch(function (error) {
|
|
@@ -98,22 +97,19 @@ var LocalStreamManager = (function () {
|
|
|
98
97
|
});
|
|
99
98
|
}
|
|
100
99
|
desktopMediaPromise = new bluebird_1.Promise(function (resolve, reject) {
|
|
101
|
-
var mediaCatchHandler = function (err) {
|
|
100
|
+
var mediaCatchHandler = function mediaCatchHandler(err) {
|
|
102
101
|
desktopMediaPromise = null;
|
|
103
102
|
window.latestDesktopMediaStream = null;
|
|
104
103
|
trace.error('getDisplayMedia error', err);
|
|
105
104
|
reject(err);
|
|
106
105
|
};
|
|
107
106
|
try {
|
|
108
|
-
_this.getHighestResolutionStream(true, { video: constraints, audio: false })
|
|
109
|
-
.then(function (streamResult) {
|
|
107
|
+
_this.getHighestResolutionStream(true, { video: constraints, audio: false }).then(function (streamResult) {
|
|
110
108
|
desktopMediaPromise = null;
|
|
111
109
|
window.latestDesktopMediaStream = streamResult;
|
|
112
110
|
resolve(__assign(__assign({}, window.latestDesktopMediaStream), { isNew: true }));
|
|
113
|
-
})
|
|
114
|
-
|
|
115
|
-
}
|
|
116
|
-
catch (err) {
|
|
111
|
+
}).catch(mediaCatchHandler);
|
|
112
|
+
} catch (err) {
|
|
117
113
|
mediaCatchHandler(err);
|
|
118
114
|
}
|
|
119
115
|
});
|
|
@@ -131,8 +127,7 @@ var LocalStreamManager = (function () {
|
|
|
131
127
|
track.stop();
|
|
132
128
|
});
|
|
133
129
|
trace.info('destroyUserMediaStream - stop all tracks');
|
|
134
|
-
}
|
|
135
|
-
catch (e) {
|
|
130
|
+
} catch (e) {
|
|
136
131
|
trace.info('destroyUserMediaStream - Failed to stop all tracks', e);
|
|
137
132
|
}
|
|
138
133
|
}
|
|
@@ -148,8 +143,7 @@ var LocalStreamManager = (function () {
|
|
|
148
143
|
track.stop();
|
|
149
144
|
});
|
|
150
145
|
trace.info('destroyDesktopMediaStream - stop all tracks');
|
|
151
|
-
}
|
|
152
|
-
catch (e) {
|
|
146
|
+
} catch (e) {
|
|
153
147
|
trace.info('destroyDesktopMediaStream - Failed to stop all tracks', e);
|
|
154
148
|
}
|
|
155
149
|
}
|
|
@@ -157,7 +151,9 @@ var LocalStreamManager = (function () {
|
|
|
157
151
|
};
|
|
158
152
|
LocalStreamManager.prototype.clearAllStreams = function () {
|
|
159
153
|
trace.info('LocalStreamManager Clearing all streams');
|
|
160
|
-
return bluebird_1.Promise.all([this.destroyDesktopMediaStream(), this.destroyUserMediaStream()]).then(function () {
|
|
154
|
+
return bluebird_1.Promise.all([this.destroyDesktopMediaStream(), this.destroyUserMediaStream()]).then(function () {
|
|
155
|
+
return undefined;
|
|
156
|
+
});
|
|
161
157
|
};
|
|
162
158
|
LocalStreamManager.prototype.getHighestResolutionStream = function (isDesktopMedia, constraints) {
|
|
163
159
|
var _this = this;
|
|
@@ -170,15 +166,12 @@ var LocalStreamManager = (function () {
|
|
|
170
166
|
var lastSuccessfulResult = null;
|
|
171
167
|
var lastFailedResult = null;
|
|
172
168
|
var isStreamRequestFulfilled = false;
|
|
173
|
-
bluebird_1.Promise
|
|
174
|
-
.reduce(constraintsCandidates, function (total, candidate) {
|
|
169
|
+
bluebird_1.Promise.reduce(constraintsCandidates, function (total, candidate) {
|
|
175
170
|
if (isStreamRequestFulfilled) {
|
|
176
171
|
return;
|
|
177
172
|
}
|
|
178
|
-
var constraintType = (
|
|
179
|
-
|
|
180
|
-
return _this.getStreamPromiseByParsedConstraints(candidate, isDesktopMedia)
|
|
181
|
-
.then(function (stream) {
|
|
173
|
+
var constraintType = get_1.default(constraints, 'video.videoResolution.constraintType') || get_1.default(constraints, 'video.videoResolution[0].constraintType');
|
|
174
|
+
return _this.getStreamPromiseByParsedConstraints(candidate, isDesktopMedia).then(function (stream) {
|
|
182
175
|
lastSuccessfulResult = {
|
|
183
176
|
mediaStream: stream,
|
|
184
177
|
constraint: candidate,
|
|
@@ -188,16 +181,14 @@ var LocalStreamManager = (function () {
|
|
|
188
181
|
trace.info('getHighestResolutionStream Success', lastSuccessfulResult);
|
|
189
182
|
isStreamRequestFulfilled = true;
|
|
190
183
|
resolve(lastSuccessfulResult);
|
|
191
|
-
})
|
|
192
|
-
.catch(function (failResult) {
|
|
184
|
+
}).catch(function (failResult) {
|
|
193
185
|
lastFailedResult = failResult;
|
|
194
186
|
if (lastFailedResult.errorCode === MediaConstants_1.MediaRequestErrorCode.PermissionDenied) {
|
|
195
187
|
isStreamRequestFulfilled = true;
|
|
196
188
|
reject(lastFailedResult);
|
|
197
189
|
}
|
|
198
190
|
});
|
|
199
|
-
}, 0)
|
|
200
|
-
.then(function () {
|
|
191
|
+
}, 0).then(function () {
|
|
201
192
|
if (!isStreamRequestFulfilled) {
|
|
202
193
|
if (!lastFailedResult) {
|
|
203
194
|
lastFailedResult = {
|
|
@@ -214,16 +205,21 @@ var LocalStreamManager = (function () {
|
|
|
214
205
|
var streamPromise = null;
|
|
215
206
|
if (!isDesktopMedia) {
|
|
216
207
|
streamPromise = navigator.mediaDevices.getUserMedia(constraints);
|
|
217
|
-
}
|
|
218
|
-
|
|
208
|
+
} else {
|
|
209
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
210
|
+
//@ts-ignore
|
|
219
211
|
streamPromise = navigator.mediaDevices.getDisplayMedia
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
212
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
213
|
+
//@ts-ignore
|
|
214
|
+
? navigator.mediaDevices.getDisplayMedia(constraints)
|
|
215
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
216
|
+
//@ts-ignore
|
|
217
|
+
: navigator.getDisplayMedia(constraints);
|
|
224
218
|
}
|
|
225
219
|
return streamPromise;
|
|
226
220
|
};
|
|
221
|
+
// eslint-disable-next-line consistent-return,@typescript-eslint/ban-ts-comment
|
|
222
|
+
// @ts-ignore
|
|
227
223
|
LocalStreamManager.prototype.getStreamPromiseByParsedConstraints = function (constraints, isDesktopMedia) {
|
|
228
224
|
var _this = this;
|
|
229
225
|
trace.info('getStreamPromiseByParsedConstraints', constraints);
|
|
@@ -231,51 +227,47 @@ var LocalStreamManager = (function () {
|
|
|
231
227
|
return this.getUserMediaStreamMediaDevice(constraints, isDesktopMedia).catch(function (err) {
|
|
232
228
|
var streamPromise = null;
|
|
233
229
|
trace.info('getStreamPromiseByParsedConstraints - get user stream error', err.name);
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
230
|
+
// Android (Galaxy esp.) have a bug that when using facingMode it might cause NotReadableError. So
|
|
231
|
+
// we should try again but without facingMode. The exception to the rule is when we don't have specific
|
|
232
|
+
// device to use (like in IOS13 bug, as can be seen in MediaServiceBase.ts), in that case, we might end
|
|
233
|
+
// up using the front camera, which is a privacy concern and the preference is to fallback from video
|
|
234
|
+
if (err && err.name === 'NotReadableError' && get_1.default(constraints, 'video.facingMode') && get_1.default(constraints, 'video.deviceId')) {
|
|
238
235
|
var newConstraints = constraints;
|
|
239
|
-
trace.info("getStreamPromiseByParsedConstraints - NotReadableError - Failed to get video user media stream with facingMode="
|
|
236
|
+
trace.info("getStreamPromiseByParsedConstraints - NotReadableError - Failed to get video user media stream with facingMode=" + get_1.default(constraints, 'video.facingMode'), err.name);
|
|
237
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
238
|
+
// @ts-ignore
|
|
240
239
|
delete newConstraints.video.facingMode;
|
|
241
240
|
newConstraints.video.deviceId = {
|
|
242
241
|
exact: constraints.video.deviceId
|
|
243
242
|
};
|
|
244
243
|
streamPromise = _this.getStreamPromiseByParsedConstraints(newConstraints, isDesktopMedia);
|
|
245
|
-
}
|
|
246
|
-
else if (err && err.name && constraints.audio && !constraints.video) {
|
|
244
|
+
} else if (err && err.name && constraints.audio && !constraints.video) {
|
|
247
245
|
trace.info('getStreamPromiseByParsedConstraints - audioStreamFailed - Failed to get audio user media stream', err.name);
|
|
248
246
|
return _this.parseMediaErrorThenThrow({ name: 'audioStreamFailed' });
|
|
249
|
-
}
|
|
250
|
-
else if (err && err.name && constraints.audio) {
|
|
247
|
+
} else if (err && err.name && constraints.audio) {
|
|
251
248
|
var newConstraints = constraints;
|
|
252
249
|
trace.info('getStreamPromiseByParsedConstraints - Failed to get video and audio user media stream, try to get video media stream only', err.name);
|
|
253
250
|
newConstraints.audio = false;
|
|
254
251
|
streamPromise = _this.getStreamPromiseByParsedConstraints(newConstraints, isDesktopMedia);
|
|
255
|
-
}
|
|
256
|
-
else if (err && !streamPromise) {
|
|
252
|
+
} else if (err && !streamPromise) {
|
|
257
253
|
trace.info('getStreamPromiseByParsedConstraints - Failed to get video user media stream', err && err.name);
|
|
258
254
|
streamPromise = bluebird_1.Promise.reject(err);
|
|
259
255
|
}
|
|
260
256
|
return streamPromise && streamPromise.catch(_this.parseMediaErrorThenThrow);
|
|
261
257
|
});
|
|
262
|
-
}
|
|
263
|
-
|
|
264
|
-
return this.parseMediaErrorThenThrow(e);
|
|
258
|
+
} catch (e) {
|
|
259
|
+
this.parseMediaErrorThenThrow(e);
|
|
265
260
|
}
|
|
266
261
|
};
|
|
267
262
|
LocalStreamManager.prototype.setGroupedDevices = function (groupedDevices) {
|
|
268
263
|
var _a;
|
|
269
264
|
trace.info('setGroupedDevices', groupedDevices);
|
|
270
|
-
this._groupedDevices = {
|
|
271
|
-
|
|
272
|
-
? (_a = {}, _a[MediaConstants_1.CameraTypes.BACK] = (0, last_1.default)(groupedDevices.video), _a[MediaConstants_1.CameraTypes.FRONT] = (0, first_1.default)(groupedDevices.video), _a) : null,
|
|
273
|
-
audio: (0, last_1.default)(groupedDevices.audio) || null,
|
|
274
|
-
camerasCount: groupedDevices.video.length
|
|
275
|
-
};
|
|
265
|
+
this._groupedDevices = { video: groupedDevices.video ? (_a = {}, _a[MediaConstants_1.CameraTypes.BACK] = last_1.default(groupedDevices.video), _a[MediaConstants_1.CameraTypes.FRONT] = first_1.default(groupedDevices.video), _a) : null, audio: last_1.default(groupedDevices.audio) || null,
|
|
266
|
+
camerasCount: groupedDevices.video.length };
|
|
276
267
|
};
|
|
277
268
|
LocalStreamManager.prototype.getParsedConstraints = function (isDesktopMedia, streamConstraints) {
|
|
278
269
|
var constraintCandidates = [];
|
|
270
|
+
//TODO - Alex: need to understand which constraints not compatible with screen share
|
|
279
271
|
if (isDesktopMedia) {
|
|
280
272
|
return [{ video: true }];
|
|
281
273
|
}
|
|
@@ -287,32 +279,30 @@ var LocalStreamManager = (function () {
|
|
|
287
279
|
if (!streamConstraints.video) {
|
|
288
280
|
return [baseConstraints];
|
|
289
281
|
}
|
|
290
|
-
var cameraType =
|
|
291
|
-
streamConstraints.video.videoSourceType;
|
|
282
|
+
var cameraType = streamConstraints.video !== 'boolean' && streamConstraints.video.videoSourceType;
|
|
292
283
|
baseConstraints.video = {
|
|
293
284
|
facingMode: cameraType && cameraType === MediaConstants_1.LocalVideoSourceType.CAMERA_FRONT ? 'user' : 'environment',
|
|
294
285
|
frameRate: { ideal: 15, max: 30 }
|
|
295
286
|
};
|
|
296
|
-
var deviceId =
|
|
287
|
+
var deviceId = get_1.default(this._groupedDevices, "video." + (cameraType === MediaConstants_1.LocalVideoSourceType.CAMERA_FRONT ? MediaConstants_1.CameraTypes.FRONT : MediaConstants_1.CameraTypes.BACK) + ".deviceId");
|
|
297
288
|
if (deviceId) {
|
|
298
289
|
baseConstraints.video.deviceId = deviceId;
|
|
299
290
|
if (this._groupedDevices.camerasCount > 1) {
|
|
300
|
-
baseConstraints.video.facingMode = {
|
|
301
|
-
exact: baseConstraints.video.facingMode
|
|
302
|
-
};
|
|
291
|
+
baseConstraints.video.facingMode = { exact: baseConstraints.video.facingMode };
|
|
303
292
|
}
|
|
304
293
|
}
|
|
305
|
-
var assignConstraint = function (videoResolution) {
|
|
306
|
-
var _a = videoResolution.resolution.split('x'),
|
|
307
|
-
|
|
308
|
-
|
|
294
|
+
var assignConstraint = function assignConstraint(videoResolution) {
|
|
295
|
+
var _a = videoResolution.resolution.split('x'),
|
|
296
|
+
width = _a[0],
|
|
297
|
+
height = _a[1];
|
|
298
|
+
var constraintCandidate = assign_1.default({}, baseConstraints);
|
|
299
|
+
constraintCandidate.video = assign_1.default({}, baseConstraints.video, {
|
|
309
300
|
width: _constraintByType(width, videoResolution.constraintType),
|
|
310
301
|
height: _constraintByType(height, videoResolution.constraintType)
|
|
311
302
|
});
|
|
312
303
|
constraintCandidates.push(constraintCandidate);
|
|
313
304
|
};
|
|
314
|
-
if (
|
|
315
|
-
!(streamConstraints.video.videoResolution instanceof Array)) {
|
|
305
|
+
if (baseConstraints.video && typeof streamConstraints.video === 'boolean' || !(streamConstraints.video.videoResolution instanceof Array)) {
|
|
316
306
|
var defaultResolution = {
|
|
317
307
|
resolution: MediaConstants_1.DEFAULT_VIDEO_RESOLUTION,
|
|
318
308
|
constraintType: MediaConstants_1.DEFAULT_VIDEO_CONSTRAINT_TYPE
|
|
@@ -330,8 +320,18 @@ var LocalStreamManager = (function () {
|
|
|
330
320
|
trace.error('Get media stream error.', error);
|
|
331
321
|
var errorName = error && error.name ? error.name : '';
|
|
332
322
|
var permissionErrorNames = ['NotAllowedError', 'PermissionDismissedError', 'PermissionDeniedError'];
|
|
323
|
+
// const generalError = [
|
|
324
|
+
// 'NotFoundError',
|
|
325
|
+
// 'DevicesNotFoundError',
|
|
326
|
+
// 'NotReadableError',
|
|
327
|
+
// 'TrackStartError'
|
|
328
|
+
// ];
|
|
333
329
|
var constraintsErrors = ['OverconstrainedError', 'ConstraintNotSatisfiedError'];
|
|
334
|
-
var isErrorOfType = function (errorsArr) {
|
|
330
|
+
var isErrorOfType = function isErrorOfType(errorsArr) {
|
|
331
|
+
return errorsArr.filter(function (err) {
|
|
332
|
+
return err === errorName;
|
|
333
|
+
}).length > 0;
|
|
334
|
+
};
|
|
335
335
|
if (isErrorOfType(permissionErrorNames)) {
|
|
336
336
|
throw { errorCode: MediaConstants_1.MediaRequestErrorCode.PermissionDenied, message: errorName };
|
|
337
337
|
}
|
|
@@ -341,7 +341,7 @@ var LocalStreamManager = (function () {
|
|
|
341
341
|
throw { errorCode: MediaConstants_1.MediaRequestErrorCode.GeneralError, message: errorName };
|
|
342
342
|
};
|
|
343
343
|
return LocalStreamManager;
|
|
344
|
-
}()
|
|
344
|
+
}();
|
|
345
345
|
exports.LocalStreamManager = LocalStreamManager;
|
|
346
346
|
function _constraintByType(value, type) {
|
|
347
347
|
switch (type) {
|
|
@@ -351,4 +351,6 @@ function _constraintByType(value, type) {
|
|
|
351
351
|
return { ideal: value };
|
|
352
352
|
}
|
|
353
353
|
}
|
|
354
|
-
|
|
354
|
+
|
|
355
|
+
//# sourceMappingURL=LocalStreamManager.js.map
|
|
356
|
+
//# sourceMappingURL=LocalStreamManager.js.map
|