Skip to content

Commit

Permalink
Use ESLint in Erizo Client. (#937)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jcague
jcague authored Jun 28, 2017
1 parent 78599cd commit 8d84978
Show file tree
Hide file tree
Showing 25 changed files with 3,333 additions and 4,247 deletions.
6 changes: 6 additions & 0 deletions .eslintrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": "airbnb",
"rules": {
"no-cond-assign": ["error", "except-parens"]
}
}
322 changes: 157 additions & 165 deletions erizo_controller/erizoClient/src/Connection.js
View file
Original file line number Diff line number Diff line change
@@ -1,189 +1,181 @@
/*global L, window, chrome, navigator*/
'use strict';
var Erizo = Erizo || {};
/* global L, window, chrome, navigator, Erizo*/
this.Erizo = this.Erizo || {};

Erizo.sessionId = 103;

Erizo.Connection = function (spec) {
var that = {};
Erizo.Connection = (specInput) => {
let that = {};
const spec = specInput;
Erizo.sessionId += 1;

spec.sessionId = (Erizo.sessionId += 1);
spec.sessionId = Erizo.sessionId;

// Check which WebRTC Stack is installed.
that.browser = Erizo.getBrowser();
if (that.browser === 'fake') {
L.Logger.warning('Publish/subscribe video/audio streams not supported in erizofc yet');
that = Erizo.FcStack(spec);
} else if (that.browser === 'mozilla') {
L.Logger.debug('Firefox Stack');
that = Erizo.FirefoxStack(spec);
} else if (that.browser === 'bowser'){
L.Logger.debug('Bowser Stack');
that = Erizo.BowserStack(spec);
} else if (that.browser === 'chrome-stable' || that.browser === 'electron') {
L.Logger.debug('Chrome Stable Stack');
that = Erizo.ChromeStableStack(spec);
} else {
L.Logger.error('No stack available for this browser');
throw 'WebRTC stack not available';
}
if (!that.updateSpec){
that.updateSpec = function(newSpec, callback){
L.Logger.error('Update Configuration not implemented in this browser');
if (callback)
callback ('unimplemented');
};
}
// Check which WebRTC Stack is installed.
that.browser = Erizo.getBrowser();
if (that.browser === 'fake') {
L.Logger.warning('Publish/subscribe video/audio streams not supported in erizofc yet');
that = Erizo.FcStack(spec);
} else if (that.browser === 'mozilla') {
L.Logger.debug('Firefox Stack');
that = Erizo.FirefoxStack(spec);
} else if (that.browser === 'bowser') {
L.Logger.debug('Bowser Stack');
that = Erizo.BowserStack(spec);
} else if (that.browser === 'chrome-stable' || that.browser === 'electron') {
L.Logger.debug('Chrome Stable Stack');
that = Erizo.ChromeStableStack(spec);
} else {
L.Logger.error('No stack available for this browser');
throw new Error('WebRTC stack not available');
}
if (!that.updateSpec) {
that.updateSpec = (newSpec, callback) => {
L.Logger.error('Update Configuration not implemented in this browser');
if (callback) { callback('unimplemented'); }
};
}

return that;
return that;
};

Erizo.getBrowser = function () {
var browser = 'none';
Erizo.getBrowser = () => {
let browser = 'none';

if (typeof module!=='undefined' && module.exports){
browser = 'fake';
}else if (window.navigator.userAgent.match('Firefox') !== null) {
// Firefox
browser = 'mozilla';
} else if (window.navigator.userAgent.match('Bowser') !== null){
browser = 'bowser';
} else if (window.navigator.userAgent.match('Chrome') !== null) {
browser = 'chrome-stable';
if (window.navigator.userAgent.match('Electron') !== null) {
browser = 'electron';
}
} else if (window.navigator.userAgent.match('Safari') !== null) {
browser = 'bowser';
} else if (window.navigator.userAgent.match('AppleWebKit') !== null) {
browser = 'bowser';
if (typeof module !== 'undefined' && module.exports) {
browser = 'fake';
} else if (window.navigator.userAgent.match('Firefox') !== null) {
// Firefox
browser = 'mozilla';
} else if (window.navigator.userAgent.match('Bowser') !== null) {
browser = 'bowser';
} else if (window.navigator.userAgent.match('Chrome') !== null) {
browser = 'chrome-stable';
if (window.navigator.userAgent.match('Electron') !== null) {
browser = 'electron';
}
return browser;
} else if (window.navigator.userAgent.match('Safari') !== null) {
browser = 'bowser';
} else if (window.navigator.userAgent.match('AppleWebKit') !== null) {
browser = 'bowser';
}
return browser;
};

Erizo.GetUserMedia = function (config, callback, error) {
var promise;
navigator.getMedia = ( navigator.getUserMedia ||
Erizo.GetUserMedia = (config, callback, error) => {
let promise;
let screenConfig;
navigator.getMedia = (navigator.getUserMedia ||
navigator.webkitGetUserMedia ||
navigator.mozGetUserMedia ||
navigator.msGetUserMedia);

if (config.screen) {
L.Logger.debug('Screen access requested');
switch (Erizo.getBrowser()) {
case 'electron' :
L.Logger.debug('Screen sharing in Electron');
var screenConfig = {};
screenConfig.video = config.video || {};
screenConfig.video.mandatory = config.video.mandatory || {};
screenConfig.video.mandatory.chromeMediaSource = 'screen';
navigator.getMedia(screenConfig, callback, error);
break;
case 'mozilla':
L.Logger.debug('Screen sharing in Firefox');
var screenCfg = {};
if (config.video.mandatory !== undefined) {
screenCfg.video = config.video;
screenCfg.video.mediaSource = 'window' || 'screen';
} else {
screenCfg = {
audio: config.audio,
video: {mediaSource: 'window' || 'screen'}
};
}
if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
promise = navigator.mediaDevices.getUserMedia(screenCfg).then(callback);
// Google compressor complains about a func called catch
promise['catch'](error);
} else {
navigator.getMedia(screenCfg, callback, error);
}
break;
if (config.screen) {
L.Logger.debug('Screen access requested');
switch (Erizo.getBrowser()) {
case 'electron' :
L.Logger.debug('Screen sharing in Electron');
screenConfig = {};
screenConfig.video = config.video || {};
screenConfig.video.mandatory = config.video.mandatory || {};
screenConfig.video.mandatory.chromeMediaSource = 'screen';
navigator.getMedia(screenConfig, callback, error);
break;
case 'mozilla':
L.Logger.debug('Screen sharing in Firefox');
screenConfig = {};
if (config.video.mandatory !== undefined) {
screenConfig.video = config.video;
screenConfig.video.mediaSource = 'window' || 'screen';
} else {
screenConfig = {
audio: config.audio,
video: { mediaSource: 'window' || 'screen' },
};
}
if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
promise = navigator.mediaDevices.getUserMedia(screenConfig).then(callback);
promise.catch(error);
} else {
navigator.getMedia(screenConfig, callback, error);
}
break;

case 'chrome-stable':
L.Logger.debug('Screen sharing in Chrome');
if (config.desktopStreamId){
var theConfig = {};
theConfig.video = config.video || {};
theConfig.video.mandatory.chromeMediaSource = 'desktop';
theConfig.video.mandatory.chromeMediaSourceId = config.desktopStreamId;
navigator.getMedia(theConfig, callback, error);
} else {
// Default extensionId - this extension is only usable in our server,
// please make your own extension based on the code in
// erizo_controller/erizoClient/extras/chrome-extension
var extensionId = 'okeephmleflklcdebijnponpabbmmgeo';
if (config.extensionId){
L.Logger.debug('extensionId supplied, using ' + config.extensionId);
extensionId = config.extensionId;
}
L.Logger.debug('Screen access on chrome stable, looking for extension');
try {
chrome.runtime.sendMessage(extensionId, {getStream: true},
function (response){
var theConfig = {};
if (response === undefined){
L.Logger.error('Access to screen denied');
var theError = {code:'Access to screen denied'};
error(theError);
return;
case 'chrome-stable':
L.Logger.debug('Screen sharing in Chrome');
if (config.desktopStreamId) {
screenConfig.video = config.video || {};
screenConfig.video.mandatory.chromeMediaSource = 'desktop';
screenConfig.video.mandatory.chromeMediaSourceId = config.desktopStreamId;
navigator.getMedia(screenConfig, callback, error);
} else {
// Default extensionId - this extension is only usable in our server,
// please make your own extension based on the code in
// erizo_controller/erizoClient/extras/chrome-extension
let extensionId = 'okeephmleflklcdebijnponpabbmmgeo';
if (config.extensionId) {
L.Logger.debug(`extensionId supplied, using ${config.extensionId}`);
extensionId = config.extensionId;
}
L.Logger.debug('Screen access on chrome stable, looking for extension');
try {
chrome.runtime.sendMessage(extensionId, { getStream: true },
(response) => {
if (response === undefined) {
L.Logger.error('Access to screen denied');
const theError = { code: 'Access to screen denied' };
error(theError);
return;
}
var theId = response.streamId;
if(config.video.mandatory !== undefined){
theConfig.video = config.video;
theConfig.video.mandatory.chromeMediaSource = 'desktop';
theConfig.video.mandatory.chromeMediaSourceId = theId;

}else{
theConfig = {video: {mandatory: {chromeMediaSource: 'desktop',
chromeMediaSourceId: theId }}};
const theId = response.streamId;
if (config.video.mandatory !== undefined) {
screenConfig.video = config.video;
screenConfig.video.mandatory.chromeMediaSource = 'desktop';
screenConfig.video.mandatory.chromeMediaSourceId = theId;
} else {
screenConfig = { video: { mandatory: { chromeMediaSource: 'desktop',
chromeMediaSourceId: theId } } };
}
navigator.getMedia(theConfig, callback, error);
});
} catch(e) {
L.Logger.debug('Screensharing plugin is not accessible ');
var theError = {code:'no_plugin_present'};
error(theError);
return;
}
}
break;

default:
L.Logger.error('This browser does not support ScreenSharing');
navigator.getMedia(screenConfig, callback, error);
});
} catch (e) {
L.Logger.debug('Screensharing plugin is not accessible ');
const theError = { code: 'no_plugin_present' };
error(theError);
}
}
} else {
if (typeof module !== 'undefined' && module.exports) {
L.Logger.error('Video/audio streams not supported in erizofc yet');
} else {
if (config.video && Erizo.getBrowser() === 'mozilla') {
var ffConfig = {video:{}, audio: config.audio, screen: config.screen};
if (config.audio.mandatory !== undefined) {
var audioCfg = config.audio.mandatory;
if (audioCfg.sourceId) {
ffConfig.audio.deviceId = audioCfg.sourceId;
}
}
if (config.video.mandatory !== undefined) {
var videoCfg = config.video.mandatory;
ffConfig.video.width = {min: videoCfg.minWidth, max: videoCfg.maxWidth};
ffConfig.video.height = {min: videoCfg.minHeight, max: videoCfg.maxHeight};
if (videoCfg.sourceId) {
ffConfig.video.deviceId = videoCfg.sourceId;
}
break;

}
if (config.video.optional !== undefined) {
ffConfig.video.frameRate = config.video.optional[1].maxFrameRate;
}
if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
promise = navigator.mediaDevices.getUserMedia(ffConfig).then(callback);
// Google compressor complains about a func called catch
promise['catch'](error);
return;
}
}
navigator.getMedia(config, callback, error);
default:
L.Logger.error('This browser does not support ScreenSharing');
}
} else if (typeof module !== 'undefined' && module.exports) {
L.Logger.error('Video/audio streams not supported in erizofc yet');
} else {
if (config.video && Erizo.getBrowser() === 'mozilla') {
const ffConfig = { video: {}, audio: config.audio, screen: config.screen };
if (config.audio.mandatory !== undefined) {
const audioCfg = config.audio.mandatory;
if (audioCfg.sourceId) {
ffConfig.audio.deviceId = audioCfg.sourceId;
}
}
if (config.video.mandatory !== undefined) {
const videoCfg = config.video.mandatory;
ffConfig.video.width = { min: videoCfg.minWidth, max: videoCfg.maxWidth };
ffConfig.video.height = { min: videoCfg.minHeight, max: videoCfg.maxHeight };
if (videoCfg.sourceId) {
ffConfig.video.deviceId = videoCfg.sourceId;
}
}
if (config.video.optional !== undefined) {
ffConfig.video.frameRate = config.video.optional[1].maxFrameRate;
}
if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
promise = navigator.mediaDevices.getUserMedia(ffConfig).then(callback);
promise.catch(error);
return;
}
}
navigator.getMedia(config, callback, error);
}
};
Loading

0 comments on commit 8d84978

Please sign in to comment.