Merge pull request #172 from grgustaf/eslint-cleanup

Eslint cleanup

Author: jianjunz

package-lock.json

@@ -20,8 +20,10 @@
     "@babel/core": "^7.1.2",
     "@babel/preset-env": "^7.1.0",
     "babelify": "^10.0.0",
+    "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "eslint-config-google": "^0.11.0",
+    "eslint-config-webrtc": "^1.0.0",
     "grunt": "^1.0.4",
     "grunt-browserify": "^5.2.0",
     "grunt-cli": "~1.3.1",

package.json

@@ -258,6 +258,7 @@ window.L = L;\n\
   grunt.loadNpmTasks('grunt-contrib-connect');
   grunt.loadNpmTasks('grunt-jsdoc');
 
+  grunt.registerTask('check', ['eslint:src']);
   grunt.registerTask('prepare', ['browserify:sinon', 'browserify:chai_as_promised']);
   grunt.registerTask('pack', ['browserify:dist', 'concat:rest', 'uglify:dist', 'copy:dist', 'string-replace', 'compress:dist', 'jsdoc:dist']);
   grunt.registerTask('dev', ['browserify:dev', 'connect:server']);

scripts/Gruntfile.js

@@ -26,7 +26,7 @@
 
 // This file is borrowed from lynckia/licode with some modifications.
 
-/* global console,window */
+/* global window */
 
 'use strict';
 

src/sdk/base/logger.js

@@ -2,11 +2,10 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-/* global console, window, Promise, chrome, navigator */
+/* global Promise, navigator */
 
 'use strict';
 import * as utils from './utils.js';
-import Logger from './logger.js';
 import * as MediaFormatModule from './mediaformat.js';
 
 /**
@@ -52,7 +51,7 @@ export class VideoTrackConstraints {
   // eslint-disable-next-line require-jsdoc
   constructor(source) {
     if (!Object.values(MediaFormatModule.VideoSourceInfo)
-      .some((v) => v === source)) {
+        .some((v) => v === source)) {
       throw new TypeError('Invalid source.');
     }
     /**
@@ -130,7 +129,7 @@ export class MediaStreamFactory {
    * @static
    * @desc Create a MediaStream with given constraints. If you want to create a MediaStream for screen cast, please make sure both audio and video's source are "screen-cast".
    * @memberof Owt.Base.MediaStreamFactory
-   * @returns {Promise<MediaStream, Error>} Return a promise that is resolved when stream is successfully created, or rejected if one of the following error happened:
+   * @return {Promise<MediaStream, Error>} Return a promise that is resolved when stream is successfully created, or rejected if one of the following error happened:
    * - One or more parameters cannot be satisfied.
    * - Specified device is busy.
    * - Cannot obtain necessary permission or operation is canceled by user.
@@ -167,7 +166,7 @@ export class MediaStreamFactory {
     // Check and convert constraints.
     if (!constraints.audio && !constraints.video) {
       return Promise.reject(new TypeError(
-        'At least one of audio and video must be requested.'));
+          'At least one of audio and video must be requested.'));
     }
     const mediaConstraints = Object.create({});
     if (typeof constraints.audio === 'object' &&
@@ -181,7 +180,8 @@ export class MediaStreamFactory {
         };
       }
     } else {
-      if (constraints.audio.source === MediaFormatModule.AudioSourceInfo.SCREENCAST) {
+      if (constraints.audio.source ===
+          MediaFormatModule.AudioSourceInfo.SCREENCAST) {
         mediaConstraints.audio = true;
       } else {
         mediaConstraints.audio = constraints.audio;
@@ -195,24 +195,21 @@ export class MediaStreamFactory {
       if (constraints.video.resolution &&
           constraints.video.resolution.width &&
           constraints.video.resolution.height) {
-            if (constraints.video.source ===
+        if (constraints.video.source ===
               MediaFormatModule.VideoSourceInfo.SCREENCAST) {
-              mediaConstraints.video.width =
-                constraints.video.resolution.width;
-              mediaConstraints.video.height =
-                constraints.video.resolution.height;
-            } else {
-              mediaConstraints.video.width = Object.create({});
-              mediaConstraints.video.width.exact =
-                  constraints.video.resolution.width;
-              mediaConstraints.video.height = Object.create({});
-              mediaConstraints.video.height.exact =
-                  constraints.video.resolution.height;
-
-            }
+          mediaConstraints.video.width = constraints.video.resolution.width;
+          mediaConstraints.video.height = constraints.video.resolution.height;
+        } else {
+          mediaConstraints.video.width = Object.create({});
+          mediaConstraints.video.width.exact =
+            constraints.video.resolution.width;
+          mediaConstraints.video.height = Object.create({});
+          mediaConstraints.video.height.exact =
+            constraints.video.resolution.height;
+        }
       }
       if (typeof constraints.video.deviceId === 'string') {
-        mediaConstraints.video.deviceId = { exact: constraints.video.deviceId };
+        mediaConstraints.video.deviceId = {exact: constraints.video.deviceId};
       }
       if (utils.isFirefox() &&
           constraints.video.source ===

src/sdk/base/mediastream-factory.js

@@ -5,7 +5,6 @@
 'use strict';
 
 import * as Utils from './utils.js';
-import * as MediaFormat from './mediaformat.js';
 import {EventDispatcher} from '../base/event.js';
 
 /**

src/sdk/base/publication.js

@@ -3,10 +3,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 'use strict';
-import Logger from './logger.js'
-import {OwtEvent} from './event.js'
-import * as Utils from './utils.js'
-import { EventDispatcher} from './event.js';
+import {OwtEvent} from './event.js';
+import * as Utils from './utils.js';
+import {EventDispatcher} from './event.js';
 
 // eslint-disable-next-line require-jsdoc
 function isAllowedValue(obj, allowedValues) {

src/sdk/base/stream.js

@@ -43,10 +43,10 @@ export function sysInfo() {
   };
   // Runtime info.
   const userAgent = navigator.userAgent;
-  const firefoxRegex = /Firefox\/([0-9\.]+)/;
-  const chromeRegex = /Chrome\/([0-9\.]+)/;
-  const edgeRegex = /Edge\/([0-9\.]+)/;
-  const safariVersionRegex = /Version\/([0-9\.]+) Safari/;
+  const firefoxRegex = /Firefox\/([0-9.]+)/;
+  const chromeRegex = /Chrome\/([0-9.]+)/;
+  const edgeRegex = /Edge\/([0-9.]+)/;
+  const safariVersionRegex = /Version\/([0-9.]+) Safari/;
   let result = chromeRegex.exec(userAgent);
   if (result) {
     info.runtime = {
@@ -76,11 +76,11 @@ export function sysInfo() {
     };
   }
   // OS info.
-  const windowsRegex = /Windows NT ([0-9\.]+)/;
-  const macRegex = /Intel Mac OS X ([0-9_\.]+)/;
-  const iPhoneRegex = /iPhone OS ([0-9_\.]+)/;
+  const windowsRegex = /Windows NT ([0-9.]+)/;
+  const macRegex = /Intel Mac OS X ([0-9_.]+)/;
+  const iPhoneRegex = /iPhone OS ([0-9_.]+)/;
   const linuxRegex = /X11; Linux/;
-  const androidRegex = /Android( ([0-9\.]+))?/;
+  const androidRegex = /Android( ([0-9.]+))?/;
   const chromiumOsRegex = /CrOS/;
   if (result = windowsRegex.exec(userAgent)) {
     info.os = {

src/sdk/base/utils.js

@@ -13,12 +13,12 @@ import {
   MessageEvent,
   OwtEvent,
   ErrorEvent,
-  MuteEvent
+  MuteEvent,
 } from '../base/event.js';
-import { TrackKind } from '../base/mediaformat.js'
-import { Publication } from '../base/publication.js';
-import { Subscription } from './subscription.js'
-import { ConferenceError } from './error.js'
+import {TrackKind} from '../base/mediaformat.js';
+import {Publication} from '../base/publication.js';
+import {Subscription} from './subscription.js';
+import {ConferenceError} from './error.js';
 import * as Utils from '../base/utils.js';
 import * as SdpUtils from '../base/sdputils.js';
 
@@ -529,7 +529,7 @@ export class ConferencePeerConnectionChannel extends EventDispatcher {
 
   _rejectPromise(error) {
     if (!error) {
-      const error = new ConferenceError('Connection failed or closed.');
+      error = new ConferenceError('Connection failed or closed.');
     }
     // Rejecting corresponding promise if publishing and subscribing is ongoing.
     if (this._publishPromise) {
@@ -666,7 +666,7 @@ export class ConferencePeerConnectionChannel extends EventDispatcher {
     return this._handleError(errorMessage);
   }
 
-  _handleError(errorMessage){
+  _handleError(errorMessage) {
     const error = new ConferenceError(errorMessage);
     const p = this._publishPromise || this._subscribePromise;
     if (p) {

src/sdk/conference/channel.js

@@ -331,7 +331,7 @@ export const ConferenceClient = function(config, signalingImpl) {
    * @instance
    * @desc Join a conference.
    * @memberof Owt.Conference.ConferenceClient
-   * @returns {Promise<ConferenceInfo, Error>} Return a promise resolved with current conference's information if successfully join the conference. Or return a promise rejected with a newly created Owt.Error if failed to join the conference.
+   * @return {Promise<ConferenceInfo, Error>} Return a promise resolved with current conference's information if successfully join the conference. Or return a promise rejected with a newly created Owt.Error if failed to join the conference.
    * @param {string} tokenString Token is issued by conference server(nuve).
    */
   this.join = function(tokenString) {
@@ -395,7 +395,7 @@ export const ConferenceClient = function(config, signalingImpl) {
    * @param {Owt.Base.LocalStream} stream The stream to be published.
    * @param {Owt.Base.PublishOptions} options Options for publication.
    * @param {string[]} videoCodecs Video codec names for publishing. Valid values are 'VP8', 'VP9' and 'H264'. This parameter only valid when options.video is RTCRtpEncodingParameters. Publishing with RTCRtpEncodingParameters is an experimental feature. This parameter is subject to change.
-   * @returns {Promise<Publication, Error>} Returned promise will be resolved with a newly created Publication once specific stream is successfully published, or rejected with a newly created Error if stream is invalid or options cannot be satisfied. Successfully published means PeerConnection is established and server is able to process media data.
+   * @return {Promise<Publication, Error>} Returned promise will be resolved with a newly created Publication once specific stream is successfully published, or rejected with a newly created Error if stream is invalid or options cannot be satisfied. Successfully published means PeerConnection is established and server is able to process media data.
    */
   this.publish = function(stream, options, videoCodecs) {
     if (!(stream instanceof StreamModule.LocalStream)) {
@@ -416,7 +416,7 @@ export const ConferenceClient = function(config, signalingImpl) {
    * @desc Subscribe a RemoteStream from conference server.
    * @param {Owt.Base.RemoteStream} stream The stream to be subscribed.
    * @param {Owt.Conference.SubscribeOptions} options Options for subscription.
-   * @returns {Promise<Subscription, Error>} Returned promise will be resolved with a newly created Subscription once specific stream is successfully subscribed, or rejected with a newly created Error if stream is invalid or options cannot be satisfied. Successfully subscribed means PeerConnection is established and server was started to send media data.
+   * @return {Promise<Subscription, Error>} Returned promise will be resolved with a newly created Subscription once specific stream is successfully subscribed, or rejected with a newly created Error if stream is invalid or options cannot be satisfied. Successfully subscribed means PeerConnection is established and server was started to send media data.
    */
   this.subscribe = function(stream, options) {
     if (!(stream instanceof StreamModule.RemoteStream)) {