@techsee/techsee-media-service 999.7.1-mbariyehAlpha2 → 999.7.2
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 +1 -20
- package/lib/LocalStreamManager.d.ts.map +1 -1
- package/lib/LocalStreamManager.js +78 -163
- package/lib/LocalStreamManager.js.map +1 -1
- package/lib/MediaConstants.d.ts +1 -29
- package/lib/MediaConstants.d.ts.map +1 -1
- package/lib/MediaConstants.js +5 -39
- package/lib/MediaConstants.js.map +1 -1
- package/lib/MediaContracts.d.ts +14 -24
- 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 +3 -4
- package/lib/MediaPublisher.d.ts.map +1 -1
- package/lib/MediaPublisher.js +13 -11
- package/lib/MediaPublisher.js.map +1 -1
- package/lib/MediaServiceBase.d.ts +7 -22
- package/lib/MediaServiceBase.d.ts.map +1 -1
- package/lib/MediaServiceBase.js +192 -291
- package/lib/MediaServiceBase.js.map +1 -1
- package/lib/MediaSession/MediaSessionBase.d.ts +1 -11
- package/lib/MediaSession/MediaSessionBase.d.ts.map +1 -1
- package/lib/MediaSession/MediaSessionBase.js +25 -50
- package/lib/MediaSession/MediaSessionBase.js.map +1 -1
- package/lib/MediaSession/SessionOpentok.d.ts +9 -12
- package/lib/MediaSession/SessionOpentok.d.ts.map +1 -1
- package/lib/MediaSession/SessionOpentok.js +120 -122
- package/lib/MediaSession/SessionOpentok.js.map +1 -1
- package/lib/MediaSession/SessionTurn.d.ts +1 -5
- package/lib/MediaSession/SessionTurn.d.ts.map +1 -1
- package/lib/MediaSession/SessionTurn.js +140 -152
- 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 -2
- package/lib/MediaSession/TurnConstants.js.map +1 -1
- package/lib/MediaSubscriber.d.ts +11 -12
- package/lib/MediaSubscriber.d.ts.map +1 -1
- package/lib/MediaSubscriber.js +55 -52
- package/lib/MediaSubscriber.js.map +1 -1
- package/lib/MediaUtils/Compatibility.d.ts +1 -5
- package/lib/MediaUtils/Compatibility.d.ts.map +1 -1
- package/lib/MediaUtils/Compatibility.js +33 -83
- 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 +61 -91
- 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 -3
- package/lib/MediaUtils/MediaTracer.js.map +1 -1
- package/lib/TechseeMediaStream.d.ts +6 -7
- package/lib/TechseeMediaStream.d.ts.map +1 -1
- package/lib/TechseeMediaStream.js +18 -16
- 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 +35 -0
- package/lib/oldCode/tracer.d.ts.map +1 -0
- package/lib/oldCode/tracer.js +151 -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 +58 -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 +144 -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 +53 -78
- package/lib/MediaSession/MediaServer.d.ts +0 -46
- package/lib/MediaSession/MediaServer.d.ts.map +0 -1
- package/lib/MediaSession/MediaServer.js +0 -393
- package/lib/MediaSession/MediaServer.js.map +0 -1
- 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/DetectWebRtcService.d.ts +0 -19
- package/lib/MultiParty/DetectWebRtcService.d.ts.map +0 -1
- package/lib/MultiParty/DetectWebRtcService.js +0 -107
- package/lib/MultiParty/DetectWebRtcService.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 -490
- 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 -18
- package/lib/MultiParty/opentok/OpentokVideoPublisher.d.ts.map +0 -1
- package/lib/MultiParty/opentok/OpentokVideoPublisher.js +0 -171
- 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 -462
- package/lib/MultiParty/types.d.ts +0 -31
- 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,40 +1,21 @@
|
|
|
1
1
|
import { Nullable } from '@techsee/techsee-common';
|
|
2
|
-
import {
|
|
2
|
+
import { LocalMediaConstraints, LocalVideoStreamConstraints, MediaRequestSuccessResult, IMediaEnvironment } from './MediaContracts';
|
|
3
3
|
declare global {
|
|
4
4
|
interface Window {
|
|
5
5
|
latestUserMediaStream: Nullable<MediaRequestSuccessResult>;
|
|
6
6
|
latestDesktopMediaStream: Nullable<MediaRequestSuccessResult>;
|
|
7
|
-
latestLocalMediaConstraints: Nullable<LocalMediaConstraints>;
|
|
8
|
-
mediaStreamAlreadyReplaced: boolean;
|
|
9
7
|
}
|
|
10
8
|
}
|
|
11
|
-
interface IGroupedDevices {
|
|
12
|
-
video: Nullable<{
|
|
13
|
-
back?: MediaDeviceInfo;
|
|
14
|
-
front?: MediaDeviceInfo;
|
|
15
|
-
}>;
|
|
16
|
-
audio: Nullable<MediaDeviceInfo>;
|
|
17
|
-
camerasCount: number;
|
|
18
|
-
}
|
|
19
9
|
export declare class LocalStreamManager {
|
|
20
10
|
private environment;
|
|
21
|
-
private _groupedDevices;
|
|
22
11
|
constructor(environment: IMediaEnvironment);
|
|
23
|
-
get groupedDevices(): IGroupedDevices;
|
|
24
12
|
getUserMediaStream(constraints: LocalMediaConstraints): Promise<MediaRequestSuccessResult>;
|
|
25
13
|
getDesktopMediaStream(constraints: LocalVideoStreamConstraints): Promise<MediaRequestSuccessResult>;
|
|
26
14
|
destroyUserMediaStream(): Promise<void>;
|
|
27
15
|
destroyDesktopMediaStream(): Promise<void>;
|
|
28
16
|
clearAllStreams(): Promise<void>;
|
|
29
17
|
private getHighestResolutionStream;
|
|
30
|
-
private getUserMediaStreamMediaDevice;
|
|
31
18
|
private getStreamPromiseByParsedConstraints;
|
|
32
|
-
setGroupedDevices(groupedDevices: {
|
|
33
|
-
video: MediaDeviceInfo[];
|
|
34
|
-
audio: MediaDeviceInfo[];
|
|
35
|
-
}): void;
|
|
36
19
|
private getParsedConstraints;
|
|
37
20
|
private parseMediaErrorThenThrow;
|
|
38
21
|
}
|
|
39
|
-
export {};
|
|
40
|
-
//# sourceMappingURL=LocalStreamManager.d.ts.map
|
|
@@ -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":"AAIA,OAAO,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AAEjD,OAAO,EAEH,qBAAqB,EACrB,2BAA2B,EAE3B,yBAAyB,EACzB,iBAAiB,EACpB,MAAM,kBAAkB,CAAC;AAS1B,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,qBAAqB,EAAE,QAAQ,CAAC,yBAAyB,CAAC,CAAC;QAC3D,wBAAwB,EAAE,QAAQ,CAAC,yBAAyB,CAAC,CAAC;KACjE;CACJ;AAcD,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,WAAW,CAAoB;gBAE3B,WAAW,EAAE,iBAAiB;IAO1C,kBAAkB,CAAC,WAAW,EAAE,qBAAqB,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAyC1F,qBAAqB,CAAC,WAAW,EAAE,2BAA2B,GAAG,OAAO,CAAC,yBAAyB,CAAC;IA0CnG,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAevC,yBAAyB,IAAI,OAAO,CAAC,IAAI,CAAC;IAe1C,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAShC,OAAO,CAAC,0BAA0B;IAqDlC,OAAO,CAAC,mCAAmC;IAsB3C,OAAO,CAAC,oBAAoB;IAsD5B,OAAO,CAAC,wBAAwB;CAoCnC","file":"LocalStreamManager.d.ts","sourcesContent":["import assign from 'lodash/assign';\nimport get from 'lodash/get';\nimport {Promise} from 'bluebird';\n\nimport {Nullable} from '@techsee/techsee-common';\n\nimport {\n VideoStreamResolution,\n LocalMediaConstraints,\n LocalVideoStreamConstraints,\n MediaRequestFailResult,\n MediaRequestSuccessResult,\n IMediaEnvironment\n} from './MediaContracts';\n\nimport {\n ConstraintType,\n DEFAULT_VIDEO_CONSTRAINT_TYPE,\n DEFAULT_VIDEO_RESOLUTION,\n MediaRequestErrorCode\n} from './MediaConstants';\n\ndeclare global {\n interface Window {\n latestUserMediaStream: Nullable<MediaRequestSuccessResult>;\n latestDesktopMediaStream: Nullable<MediaRequestSuccessResult>;\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\nimport {getMediaTracer} from './MediaUtils/MediaTracer';\n\nconst trace = getMediaTracer('LocalStreamManager');\n\nexport class LocalStreamManager {\n private environment: IMediaEnvironment;\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 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 this.destroyUserMediaStream();\n\n }\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 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 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 window.latestUserMediaStream = null;\n userMediaPromise = null;\n\n if (streamResult) {\n streamResult.mediaStream.getTracks().forEach((track: MediaStreamTrack) => {\n track.stop();\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) {\n streamResult.mediaStream.getTracks().forEach((track: MediaStreamTrack) => {\n track.stop();\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 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 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 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 //@ts-ignore\n private getStreamPromiseByParsedConstraints(constraints: MediaStreamConstraints, isDesktopMedia: boolean): Promise<MediaStream> {\n let streamPromise = null;\n\n trace.info('getStreamPromiseByParsedConstraints', constraints);\n\n try {\n if (!isDesktopMedia) {\n streamPromise = navigator.mediaDevices.getUserMedia(constraints);\n } else {\n //@ts-ignore\n streamPromise = navigator.mediaDevices.getDisplayMedia\n //@ts-ignore\n ? navigator.mediaDevices.getDisplayMedia(constraints)\n : navigator.getDisplayMedia(constraints);\n }\n\n return streamPromise.catch(this.parseMediaErrorThenThrow);\n } catch (e) {\n this.parseMediaErrorThenThrow(e);\n }\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 baseConstraints.video = {\n facingMode: 'environment',\n frameRate: {ideal: 15, max: 30}\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 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,49 +1,37 @@
|
|
|
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
|
-
exports.LocalStreamManager = void 0;
|
|
18
19
|
var assign_1 = __importDefault(require("lodash/assign"));
|
|
19
20
|
var get_1 = __importDefault(require("lodash/get"));
|
|
20
|
-
var last_1 = __importDefault(require("lodash/last"));
|
|
21
|
-
var first_1 = __importDefault(require("lodash/first"));
|
|
22
|
-
var cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
|
|
23
21
|
var bluebird_1 = require("bluebird");
|
|
24
22
|
var MediaConstants_1 = require("./MediaConstants");
|
|
25
|
-
var MediaTracer_1 = require("./MediaUtils/MediaTracer");
|
|
26
23
|
window.latestUserMediaStream = null;
|
|
27
24
|
var userMediaPromise = null;
|
|
28
25
|
window.latestDesktopMediaStream = null;
|
|
29
26
|
var desktopMediaPromise = null;
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
var
|
|
33
|
-
var LocalStreamManager = (function () {
|
|
27
|
+
var MediaTracer_1 = require("./MediaUtils/MediaTracer");
|
|
28
|
+
var trace = MediaTracer_1.getMediaTracer('LocalStreamManager');
|
|
29
|
+
var LocalStreamManager = /** @class */function () {
|
|
34
30
|
function LocalStreamManager(environment) {
|
|
35
|
-
this._groupedDevices = { video: null, audio: null, camerasCount: 0 };
|
|
36
31
|
this.environment = environment;
|
|
37
32
|
this.parseMediaErrorThenThrow = this.parseMediaErrorThenThrow.bind(this);
|
|
38
33
|
this.clearAllStreams = this.clearAllStreams.bind(this);
|
|
39
34
|
}
|
|
40
|
-
Object.defineProperty(LocalStreamManager.prototype, "groupedDevices", {
|
|
41
|
-
get: function () {
|
|
42
|
-
return this._groupedDevices;
|
|
43
|
-
},
|
|
44
|
-
enumerable: false,
|
|
45
|
-
configurable: true
|
|
46
|
-
});
|
|
47
35
|
LocalStreamManager.prototype.getUserMediaStream = function (constraints) {
|
|
48
36
|
var _this = this;
|
|
49
37
|
trace.info('getUserMediaStream', constraints);
|
|
@@ -53,30 +41,24 @@ var LocalStreamManager = (function () {
|
|
|
53
41
|
if (window.latestUserMediaStream) {
|
|
54
42
|
var videoTrack = window.latestUserMediaStream.mediaStream.getVideoTracks();
|
|
55
43
|
if (videoTrack.length > 0 && videoTrack[0].readyState === 'live') {
|
|
56
|
-
return bluebird_1.Promise.resolve(__assign(
|
|
44
|
+
return bluebird_1.Promise.resolve(__assign({}, window.latestUserMediaStream, { isNew: false }));
|
|
57
45
|
}
|
|
58
46
|
this.destroyUserMediaStream();
|
|
59
47
|
}
|
|
60
48
|
userMediaPromise = new bluebird_1.Promise(function (resolve, reject) {
|
|
61
|
-
var catchHandler = function (err) {
|
|
49
|
+
var catchHandler = function catchHandler(err) {
|
|
62
50
|
userMediaPromise = null;
|
|
63
51
|
window.latestUserMediaStream = null;
|
|
64
52
|
trace.error('getUserMedia error', err);
|
|
65
53
|
reject(err);
|
|
66
54
|
};
|
|
67
55
|
try {
|
|
68
|
-
_this.getHighestResolutionStream(false, constraints)
|
|
69
|
-
.then(function (streamResult) {
|
|
56
|
+
_this.getHighestResolutionStream(false, constraints).then(function (streamResult) {
|
|
70
57
|
userMediaPromise = null;
|
|
71
58
|
window.latestUserMediaStream = streamResult;
|
|
72
|
-
window.
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
resolve(__assign(__assign({}, window.latestUserMediaStream), { isNew: true }));
|
|
76
|
-
})
|
|
77
|
-
.catch(catchHandler);
|
|
78
|
-
}
|
|
79
|
-
catch (err) {
|
|
59
|
+
resolve(__assign({}, window.latestUserMediaStream, { isNew: true }));
|
|
60
|
+
}).catch(catchHandler);
|
|
61
|
+
} catch (err) {
|
|
80
62
|
catchHandler(err);
|
|
81
63
|
}
|
|
82
64
|
});
|
|
@@ -87,33 +69,30 @@ var LocalStreamManager = (function () {
|
|
|
87
69
|
if (desktopMediaPromise) {
|
|
88
70
|
return desktopMediaPromise;
|
|
89
71
|
}
|
|
90
|
-
trace.info('getDesktopMediaStream', constraints);
|
|
91
72
|
if (window.latestDesktopMediaStream) {
|
|
92
73
|
var track = window.latestDesktopMediaStream.mediaStream.getVideoTracks();
|
|
93
74
|
if (track.length > 0 && track[0].readyState === 'live') {
|
|
94
|
-
return
|
|
75
|
+
//return Promise.resolve();
|
|
76
|
+
return bluebird_1.Promise.resolve(__assign({}, window.latestDesktopMediaStream, { isNew: false }));
|
|
95
77
|
}
|
|
96
78
|
this.destroyDesktopMediaStream().catch(function (error) {
|
|
97
79
|
trace.error('Error destroying desktop media stream', error);
|
|
98
80
|
});
|
|
99
81
|
}
|
|
100
82
|
desktopMediaPromise = new bluebird_1.Promise(function (resolve, reject) {
|
|
101
|
-
var mediaCatchHandler = function (err) {
|
|
83
|
+
var mediaCatchHandler = function mediaCatchHandler(err) {
|
|
102
84
|
desktopMediaPromise = null;
|
|
103
85
|
window.latestDesktopMediaStream = null;
|
|
104
86
|
trace.error('getDisplayMedia error', err);
|
|
105
87
|
reject(err);
|
|
106
88
|
};
|
|
107
89
|
try {
|
|
108
|
-
_this.getHighestResolutionStream(true, { video: constraints, audio: false })
|
|
109
|
-
.then(function (streamResult) {
|
|
90
|
+
_this.getHighestResolutionStream(true, { video: constraints, audio: false }).then(function (streamResult) {
|
|
110
91
|
desktopMediaPromise = null;
|
|
111
92
|
window.latestDesktopMediaStream = streamResult;
|
|
112
|
-
resolve(__assign(
|
|
113
|
-
})
|
|
114
|
-
|
|
115
|
-
}
|
|
116
|
-
catch (err) {
|
|
93
|
+
resolve(__assign({}, window.latestDesktopMediaStream, { isNew: true }));
|
|
94
|
+
}).catch(mediaCatchHandler);
|
|
95
|
+
} catch (err) {
|
|
117
96
|
mediaCatchHandler(err);
|
|
118
97
|
}
|
|
119
98
|
});
|
|
@@ -121,20 +100,12 @@ var LocalStreamManager = (function () {
|
|
|
121
100
|
};
|
|
122
101
|
LocalStreamManager.prototype.destroyUserMediaStream = function () {
|
|
123
102
|
var streamResult = window.latestUserMediaStream;
|
|
124
|
-
userMediaPromise = null;
|
|
125
103
|
window.latestUserMediaStream = null;
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
track.stop();
|
|
132
|
-
});
|
|
133
|
-
trace.info('destroyUserMediaStream - stop all tracks');
|
|
134
|
-
}
|
|
135
|
-
catch (e) {
|
|
136
|
-
trace.info('destroyUserMediaStream - Failed to stop all tracks', e);
|
|
137
|
-
}
|
|
104
|
+
userMediaPromise = null;
|
|
105
|
+
if (streamResult) {
|
|
106
|
+
streamResult.mediaStream.getTracks().forEach(function (track) {
|
|
107
|
+
track.stop();
|
|
108
|
+
});
|
|
138
109
|
}
|
|
139
110
|
return bluebird_1.Promise.resolve();
|
|
140
111
|
};
|
|
@@ -142,27 +113,22 @@ var LocalStreamManager = (function () {
|
|
|
142
113
|
var streamResult = window.latestDesktopMediaStream;
|
|
143
114
|
window.latestDesktopMediaStream = null;
|
|
144
115
|
desktopMediaPromise = null;
|
|
145
|
-
if (streamResult
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
});
|
|
150
|
-
trace.info('destroyDesktopMediaStream - stop all tracks');
|
|
151
|
-
}
|
|
152
|
-
catch (e) {
|
|
153
|
-
trace.info('destroyDesktopMediaStream - Failed to stop all tracks', e);
|
|
154
|
-
}
|
|
116
|
+
if (streamResult) {
|
|
117
|
+
streamResult.mediaStream.getTracks().forEach(function (track) {
|
|
118
|
+
track.stop();
|
|
119
|
+
});
|
|
155
120
|
}
|
|
156
121
|
return bluebird_1.Promise.resolve();
|
|
157
122
|
};
|
|
158
123
|
LocalStreamManager.prototype.clearAllStreams = function () {
|
|
159
124
|
trace.info('LocalStreamManager Clearing all streams');
|
|
160
|
-
return bluebird_1.Promise.all([this.destroyDesktopMediaStream(), this.destroyUserMediaStream()]).then(function () {
|
|
125
|
+
return bluebird_1.Promise.all([this.destroyDesktopMediaStream(), this.destroyUserMediaStream()]).then(function () {
|
|
126
|
+
return undefined;
|
|
127
|
+
});
|
|
161
128
|
};
|
|
162
129
|
LocalStreamManager.prototype.getHighestResolutionStream = function (isDesktopMedia, constraints) {
|
|
163
130
|
var _this = this;
|
|
164
131
|
var constraintsCandidates = this.getParsedConstraints(isDesktopMedia, constraints);
|
|
165
|
-
trace.info('getHighestResolutionStream - constraintsCandidates:', constraintsCandidates);
|
|
166
132
|
if (constraintsCandidates.length === 0) {
|
|
167
133
|
return bluebird_1.Promise.reject(new Error('No constraints to retrieve the stream'));
|
|
168
134
|
}
|
|
@@ -170,15 +136,12 @@ var LocalStreamManager = (function () {
|
|
|
170
136
|
var lastSuccessfulResult = null;
|
|
171
137
|
var lastFailedResult = null;
|
|
172
138
|
var isStreamRequestFulfilled = false;
|
|
173
|
-
bluebird_1.Promise
|
|
174
|
-
.reduce(constraintsCandidates, function (total, candidate) {
|
|
139
|
+
bluebird_1.Promise.reduce(constraintsCandidates, function (total, candidate) {
|
|
175
140
|
if (isStreamRequestFulfilled) {
|
|
176
141
|
return;
|
|
177
142
|
}
|
|
178
|
-
var constraintType = (
|
|
179
|
-
|
|
180
|
-
return _this.getStreamPromiseByParsedConstraints(candidate, isDesktopMedia)
|
|
181
|
-
.then(function (stream) {
|
|
143
|
+
var constraintType = get_1.default(constraints, 'video.videoResolution.constraintType') || get_1.default(constraints, 'video.videoResolution[0].constraintType');
|
|
144
|
+
return _this.getStreamPromiseByParsedConstraints(candidate, isDesktopMedia).then(function (stream) {
|
|
182
145
|
lastSuccessfulResult = {
|
|
183
146
|
mediaStream: stream,
|
|
184
147
|
constraint: candidate,
|
|
@@ -188,16 +151,14 @@ var LocalStreamManager = (function () {
|
|
|
188
151
|
trace.info('getHighestResolutionStream Success', lastSuccessfulResult);
|
|
189
152
|
isStreamRequestFulfilled = true;
|
|
190
153
|
resolve(lastSuccessfulResult);
|
|
191
|
-
})
|
|
192
|
-
.catch(function (failResult) {
|
|
154
|
+
}).catch(function (failResult) {
|
|
193
155
|
lastFailedResult = failResult;
|
|
194
156
|
if (lastFailedResult.errorCode === MediaConstants_1.MediaRequestErrorCode.PermissionDenied) {
|
|
195
157
|
isStreamRequestFulfilled = true;
|
|
196
158
|
reject(lastFailedResult);
|
|
197
159
|
}
|
|
198
160
|
});
|
|
199
|
-
}, 0)
|
|
200
|
-
.then(function () {
|
|
161
|
+
}, 0).then(function () {
|
|
201
162
|
if (!isStreamRequestFulfilled) {
|
|
202
163
|
if (!lastFailedResult) {
|
|
203
164
|
lastFailedResult = {
|
|
@@ -210,72 +171,27 @@ var LocalStreamManager = (function () {
|
|
|
210
171
|
});
|
|
211
172
|
});
|
|
212
173
|
};
|
|
213
|
-
|
|
214
|
-
var streamPromise = null;
|
|
215
|
-
if (!isDesktopMedia) {
|
|
216
|
-
streamPromise = navigator.mediaDevices.getUserMedia(constraints);
|
|
217
|
-
}
|
|
218
|
-
else {
|
|
219
|
-
streamPromise = navigator.mediaDevices.getDisplayMedia
|
|
220
|
-
?
|
|
221
|
-
navigator.mediaDevices.getDisplayMedia(constraints)
|
|
222
|
-
:
|
|
223
|
-
navigator.getDisplayMedia(constraints);
|
|
224
|
-
}
|
|
225
|
-
return streamPromise;
|
|
226
|
-
};
|
|
174
|
+
//@ts-ignore
|
|
227
175
|
LocalStreamManager.prototype.getStreamPromiseByParsedConstraints = function (constraints, isDesktopMedia) {
|
|
228
|
-
var
|
|
176
|
+
var streamPromise = null;
|
|
229
177
|
trace.info('getStreamPromiseByParsedConstraints', constraints);
|
|
230
178
|
try {
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
exact: constraints.video.deviceId
|
|
243
|
-
};
|
|
244
|
-
streamPromise = _this.getStreamPromiseByParsedConstraints(newConstraints, isDesktopMedia);
|
|
245
|
-
}
|
|
246
|
-
else if (err && err.name && constraints.audio && !constraints.video) {
|
|
247
|
-
trace.info('getStreamPromiseByParsedConstraints - audioStreamFailed - Failed to get audio user media stream', err.name);
|
|
248
|
-
return _this.parseMediaErrorThenThrow({ name: 'audioStreamFailed' });
|
|
249
|
-
}
|
|
250
|
-
else if (err && err.name && constraints.audio) {
|
|
251
|
-
var newConstraints = constraints;
|
|
252
|
-
trace.info('getStreamPromiseByParsedConstraints - Failed to get video and audio user media stream, try to get video media stream only', err.name);
|
|
253
|
-
newConstraints.audio = false;
|
|
254
|
-
streamPromise = _this.getStreamPromiseByParsedConstraints(newConstraints, isDesktopMedia);
|
|
255
|
-
}
|
|
256
|
-
else if (err && !streamPromise) {
|
|
257
|
-
trace.info('getStreamPromiseByParsedConstraints - Failed to get video user media stream', err && err.name);
|
|
258
|
-
streamPromise = bluebird_1.Promise.reject(err);
|
|
259
|
-
}
|
|
260
|
-
return streamPromise && streamPromise.catch(_this.parseMediaErrorThenThrow);
|
|
261
|
-
});
|
|
262
|
-
}
|
|
263
|
-
catch (e) {
|
|
264
|
-
return this.parseMediaErrorThenThrow(e);
|
|
179
|
+
if (!isDesktopMedia) {
|
|
180
|
+
streamPromise = navigator.mediaDevices.getUserMedia(constraints);
|
|
181
|
+
} else {
|
|
182
|
+
//@ts-ignore
|
|
183
|
+
streamPromise = navigator.mediaDevices.getDisplayMedia
|
|
184
|
+
//@ts-ignore
|
|
185
|
+
? navigator.mediaDevices.getDisplayMedia(constraints) : navigator.getDisplayMedia(constraints);
|
|
186
|
+
}
|
|
187
|
+
return streamPromise.catch(this.parseMediaErrorThenThrow);
|
|
188
|
+
} catch (e) {
|
|
189
|
+
this.parseMediaErrorThenThrow(e);
|
|
265
190
|
}
|
|
266
191
|
};
|
|
267
|
-
LocalStreamManager.prototype.setGroupedDevices = function (groupedDevices) {
|
|
268
|
-
var _a;
|
|
269
|
-
trace.info('setGroupedDevices', groupedDevices);
|
|
270
|
-
this._groupedDevices = {
|
|
271
|
-
video: groupedDevices.video
|
|
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
|
-
};
|
|
276
|
-
};
|
|
277
192
|
LocalStreamManager.prototype.getParsedConstraints = function (isDesktopMedia, streamConstraints) {
|
|
278
193
|
var constraintCandidates = [];
|
|
194
|
+
//TODO - Alex: need to understand which constraints not compatible with screen share
|
|
279
195
|
if (isDesktopMedia) {
|
|
280
196
|
return [{ video: true }];
|
|
281
197
|
}
|
|
@@ -287,32 +203,22 @@ var LocalStreamManager = (function () {
|
|
|
287
203
|
if (!streamConstraints.video) {
|
|
288
204
|
return [baseConstraints];
|
|
289
205
|
}
|
|
290
|
-
var cameraType = streamConstraints.video !== 'boolean' &&
|
|
291
|
-
streamConstraints.video.videoSourceType;
|
|
292
206
|
baseConstraints.video = {
|
|
293
|
-
facingMode:
|
|
207
|
+
facingMode: 'environment',
|
|
294
208
|
frameRate: { ideal: 15, max: 30 }
|
|
295
209
|
};
|
|
296
|
-
var
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
};
|
|
303
|
-
}
|
|
304
|
-
}
|
|
305
|
-
var assignConstraint = function (videoResolution) {
|
|
306
|
-
var _a = videoResolution.resolution.split('x'), width = _a[0], height = _a[1];
|
|
307
|
-
var constraintCandidate = (0, assign_1.default)({}, baseConstraints);
|
|
308
|
-
constraintCandidate.video = (0, assign_1.default)({}, baseConstraints.video, {
|
|
210
|
+
var assignConstraint = function assignConstraint(videoResolution) {
|
|
211
|
+
var _a = videoResolution.resolution.split('x'),
|
|
212
|
+
width = _a[0],
|
|
213
|
+
height = _a[1];
|
|
214
|
+
var constraintCandidate = assign_1.default({}, baseConstraints);
|
|
215
|
+
constraintCandidate.video = assign_1.default({}, baseConstraints.video, {
|
|
309
216
|
width: _constraintByType(width, videoResolution.constraintType),
|
|
310
217
|
height: _constraintByType(height, videoResolution.constraintType)
|
|
311
218
|
});
|
|
312
219
|
constraintCandidates.push(constraintCandidate);
|
|
313
220
|
};
|
|
314
|
-
if (
|
|
315
|
-
!(streamConstraints.video.videoResolution instanceof Array)) {
|
|
221
|
+
if (baseConstraints.video && typeof streamConstraints.video === 'boolean' || !(streamConstraints.video.videoResolution instanceof Array)) {
|
|
316
222
|
var defaultResolution = {
|
|
317
223
|
resolution: MediaConstants_1.DEFAULT_VIDEO_RESOLUTION,
|
|
318
224
|
constraintType: MediaConstants_1.DEFAULT_VIDEO_CONSTRAINT_TYPE
|
|
@@ -324,14 +230,21 @@ var LocalStreamManager = (function () {
|
|
|
324
230
|
return constraintCandidates;
|
|
325
231
|
};
|
|
326
232
|
LocalStreamManager.prototype.parseMediaErrorThenThrow = function (error) {
|
|
327
|
-
if (error && error.errorCode) {
|
|
328
|
-
throw error;
|
|
329
|
-
}
|
|
330
233
|
trace.error('Get media stream error.', error);
|
|
331
234
|
var errorName = error && error.name ? error.name : '';
|
|
332
235
|
var permissionErrorNames = ['NotAllowedError', 'PermissionDismissedError', 'PermissionDeniedError'];
|
|
236
|
+
// const generalError = [
|
|
237
|
+
// 'NotFoundError',
|
|
238
|
+
// 'DevicesNotFoundError',
|
|
239
|
+
// 'NotReadableError',
|
|
240
|
+
// 'TrackStartError'
|
|
241
|
+
// ];
|
|
333
242
|
var constraintsErrors = ['OverconstrainedError', 'ConstraintNotSatisfiedError'];
|
|
334
|
-
var isErrorOfType = function (errorsArr) {
|
|
243
|
+
var isErrorOfType = function isErrorOfType(errorsArr) {
|
|
244
|
+
return errorsArr.filter(function (err) {
|
|
245
|
+
return err === errorName;
|
|
246
|
+
}).length > 0;
|
|
247
|
+
};
|
|
335
248
|
if (isErrorOfType(permissionErrorNames)) {
|
|
336
249
|
throw { errorCode: MediaConstants_1.MediaRequestErrorCode.PermissionDenied, message: errorName };
|
|
337
250
|
}
|
|
@@ -341,7 +254,7 @@ var LocalStreamManager = (function () {
|
|
|
341
254
|
throw { errorCode: MediaConstants_1.MediaRequestErrorCode.GeneralError, message: errorName };
|
|
342
255
|
};
|
|
343
256
|
return LocalStreamManager;
|
|
344
|
-
}()
|
|
257
|
+
}();
|
|
345
258
|
exports.LocalStreamManager = LocalStreamManager;
|
|
346
259
|
function _constraintByType(value, type) {
|
|
347
260
|
switch (type) {
|
|
@@ -351,4 +264,6 @@ function _constraintByType(value, type) {
|
|
|
351
264
|
return { ideal: value };
|
|
352
265
|
}
|
|
353
266
|
}
|
|
354
|
-
|
|
267
|
+
|
|
268
|
+
//# sourceMappingURL=LocalStreamManager.js.map
|
|
269
|
+
//# sourceMappingURL=LocalStreamManager.js.map
|