ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-browser: remove code smell in OpenVidu.ts

pull/803/head
pabloFuente 2023-05-05 13:20:33 +02:00
parent b4b808e3f1
commit 423e0d302f
1 changed files with 89 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

181
openvidu-browser/src/OpenVidu/OpenVidu.ts
View File

@ -512,107 +512,104 @@ export class OpenVidu {
* }); * });
* ``` * ```
*/ */
getUserMedia(options: PublisherProperties): Promise<MediaStream> { async getUserMedia(options: PublisherProperties): Promise<MediaStream> {
return new Promise<MediaStream>(async (resolve, reject) => { const askForAudioStreamOnly = async (previousMediaStream: MediaStream, constraints: MediaStreamConstraints) => {
const askForAudioStreamOnly = async (previousMediaStream: MediaStream, constraints: MediaStreamConstraints) => { const definedAudioConstraint = constraints.audio === undefined ? true : constraints.audio;
const definedAudioConstraint = constraints.audio === undefined ? true : constraints.audio; const constraintsAux: MediaStreamConstraints = { audio: definedAudioConstraint, video: false };
const constraintsAux: MediaStreamConstraints = { audio: definedAudioConstraint, video: false };
try {
const audioOnlyStream = await navigator.mediaDevices.getUserMedia(constraintsAux);
previousMediaStream.addTrack(audioOnlyStream.getAudioTracks()[0]);
return resolve(previousMediaStream);
} catch (error) {
previousMediaStream.getAudioTracks().forEach((track) => {
track.stop();
});
previousMediaStream.getVideoTracks().forEach((track) => {
track.stop();
});
return reject(this.generateAudioDeviceError(error, constraintsAux));
}
};
try { try {
const myConstraints = await this.generateMediaConstraints(options); const audioOnlyStream = await navigator.mediaDevices.getUserMedia(constraintsAux);
if ( previousMediaStream.addTrack(audioOnlyStream.getAudioTracks()[0]);
(!!myConstraints.videoTrack && !!myConstraints.audioTrack) || return previousMediaStream;
(!!myConstraints.audioTrack && myConstraints.constraints?.video === false) || } catch (error) {
(!!myConstraints.videoTrack && myConstraints.constraints?.audio === false) previousMediaStream.getAudioTracks().forEach((track) => {
) { track.stop();
// No need to call getUserMedia at all. Both tracks provided, or only AUDIO track provided or only VIDEO track provided });
return resolve(this.addAlreadyProvidedTracks(myConstraints, new MediaStream())); previousMediaStream.getVideoTracks().forEach((track) => {
} else { track.stop();
// getUserMedia must be called. AUDIO or VIDEO are requesting a new track });
throw this.generateAudioDeviceError(error, constraintsAux);
}
};
// Delete already provided constraints for audio or video try {
if (!!myConstraints.videoTrack) { const myConstraints = await this.generateMediaConstraints(options);
delete myConstraints.constraints!.video; if (
} (!!myConstraints.videoTrack && !!myConstraints.audioTrack) ||
if (!!myConstraints.audioTrack) { (!!myConstraints.audioTrack && myConstraints.constraints?.video === false) ||
delete myConstraints.constraints!.audio; (!!myConstraints.videoTrack && myConstraints.constraints?.audio === false)
} ) {
// No need to call getUserMedia at all. Both tracks provided, or only AUDIO track provided or only VIDEO track provided
return this.addAlreadyProvidedTracks(myConstraints, new MediaStream());
} else {
// getUserMedia must be called. AUDIO or VIDEO are requesting a new track
let mustAskForAudioTrackLater = false; // Delete already provided constraints for audio or video
if (typeof options.videoSource === 'string') { if (!!myConstraints.videoTrack) {
// Video is deviceId or screen sharing delete myConstraints.constraints!.video;
if ( }
options.videoSource === 'screen' || if (!!myConstraints.audioTrack) {
options.videoSource === 'window' || delete myConstraints.constraints!.audio;
(platform.isElectron() && options.videoSource.startsWith('screen:')) }
) {
// Video is screen sharing let mustAskForAudioTrackLater = false;
mustAskForAudioTrackLater = if (typeof options.videoSource === 'string') {
!myConstraints.audioTrack && options.audioSource !== null && options.audioSource !== false; // Video is deviceId or screen sharing
if (navigator.mediaDevices['getDisplayMedia'] && !platform.isElectron()) { if (
// getDisplayMedia supported options.videoSource === 'screen' ||
try { options.videoSource === 'window' ||
const mediaStream = await navigator.mediaDevices['getDisplayMedia']({ video: true }); (platform.isElectron() && options.videoSource.startsWith('screen:'))
this.addAlreadyProvidedTracks(myConstraints, mediaStream); ) {
if (mustAskForAudioTrackLater) { // Video is screen sharing
await askForAudioStreamOnly(mediaStream, <MediaStreamConstraints>myConstraints.constraints); mustAskForAudioTrackLater =
return; !myConstraints.audioTrack && options.audioSource !== null && options.audioSource !== false;
} else { if (navigator.mediaDevices['getDisplayMedia'] && !platform.isElectron()) {
return resolve(mediaStream); // getDisplayMedia supported
} try {
} catch (error) { const mediaStream = await navigator.mediaDevices['getDisplayMedia']({ video: true });
let errorName: OpenViduErrorName = OpenViduErrorName.SCREEN_CAPTURE_DENIED; this.addAlreadyProvidedTracks(myConstraints, mediaStream);
const errorMessage = error.toString(); if (mustAskForAudioTrackLater) {
return reject(new OpenViduError(errorName, errorMessage)); return await askForAudioStreamOnly(mediaStream, <MediaStreamConstraints>myConstraints.constraints);
} else {
return mediaStream;
} }
} else { } catch (error) {
// getDisplayMedia NOT supported. Can perform getUserMedia below with already calculated constraints let errorName: OpenViduErrorName = OpenViduErrorName.SCREEN_CAPTURE_DENIED;
const errorMessage = error.toString();
throw new OpenViduError(errorName, errorMessage);
} }
} else { } else {
// Video is deviceId. Can perform getUserMedia below with already calculated constraints // getDisplayMedia NOT supported. Can perform getUserMedia below with already calculated constraints
} }
} } else {
// Use already calculated constraints // Video is deviceId. Can perform getUserMedia below with already calculated constraints
const constraintsAux = mustAskForAudioTrackLater
? { video: myConstraints.constraints!.video }
: myConstraints.constraints;
try {
const mediaStream = await navigator.mediaDevices.getUserMedia(constraintsAux);
this.addAlreadyProvidedTracks(myConstraints, mediaStream);
if (mustAskForAudioTrackLater) {
await askForAudioStreamOnly(mediaStream, <MediaStreamConstraints>myConstraints.constraints);
} else {
return resolve(mediaStream);
}
} catch (error) {
let errorName: OpenViduErrorName;
const errorMessage = error.toString();
if (!(options.videoSource === 'screen')) {
errorName = OpenViduErrorName.DEVICE_ACCESS_DENIED;
} else {
errorName = OpenViduErrorName.SCREEN_CAPTURE_DENIED;
}
return reject(new OpenViduError(errorName, errorMessage));
} }
} }
} catch (error) { // Use already calculated constraints
reject(error); const constraintsAux = mustAskForAudioTrackLater
? { video: myConstraints.constraints!.video }
: myConstraints.constraints;
try {
const mediaStream = await navigator.mediaDevices.getUserMedia(constraintsAux);
this.addAlreadyProvidedTracks(myConstraints, mediaStream);
if (mustAskForAudioTrackLater) {
return await askForAudioStreamOnly(mediaStream, <MediaStreamConstraints>myConstraints.constraints);
} else {
return mediaStream;
}
} catch (error) {
let errorName: OpenViduErrorName;
const errorMessage = error.toString();
if (!(options.videoSource === 'screen')) {
errorName = OpenViduErrorName.DEVICE_ACCESS_DENIED;
} else {
errorName = OpenViduErrorName.SCREEN_CAPTURE_DENIED;
}
throw new OpenViduError(errorName, errorMessage);
}
} }
}); } catch (error) {
throw error;
}
} }
/* tslint:disable:no-empty */ /* tslint:disable:no-empty */
@ -990,7 +987,7 @@ export class OpenVidu {
/** /**
* @hidden * @hidden
*/ */
addAlreadyProvidedTracks(myConstraints: CustomMediaStreamConstraints, mediaStream: MediaStream, stream?: Stream) { addAlreadyProvidedTracks(myConstraints: CustomMediaStreamConstraints, mediaStream: MediaStream, stream?: Stream): MediaStream {
if (!!myConstraints.videoTrack) { if (!!myConstraints.videoTrack) {
mediaStream.addTrack(myConstraints.videoTrack); mediaStream.addTrack(myConstraints.videoTrack);
if (!!stream) { if (!!stream) {