[eslint] prefer-template

.eslintrc.js

@@ -211,6 +211,7 @@ module.exports = {
         'prefer-const': 2,
         'prefer-reflect': 0,
         'prefer-spread': 2,
+        'prefer-template': 2,
         'require-yield': 2,
         'rest-spread-spacing': 2,
         'sort-imports': 0,

JitsiConference.js

@@ -591,7 +591,7 @@ JitsiConference.prototype._setupNewTrack = function(newTrack) {
         // Report active device to statistics
         const devices = RTC.getCurrentlyAvailableMediaDevices();
         const device = devices.find(function(d) {
-            return d.kind === newTrack.getTrack().kind + 'input'
+            return d.kind === `${newTrack.getTrack().kind}input`
                 && d.label === newTrack.getTrack().label;
         });
         if (device) {
@@ -776,7 +776,7 @@ JitsiConference.prototype.pinParticipant = function(participantId) {
  */
 JitsiConference.prototype.setLastN = function(lastN) {
     if (!Number.isInteger(lastN) && !Number.parseInt(lastN)) {
-        throw new Error('Invalid value for lastN: ' + lastN);
+        throw new Error(`Invalid value for lastN: ${lastN}`);
     }
     if (lastN < -1) {
         throw new RangeError('lastN cannot be smaller than -1');
@@ -1007,8 +1007,8 @@ JitsiConference.prototype.onIncomingCall
 = function(jingleSession, jingleOffer, now) {
     if (!this.room.isFocus(jingleSession.peerjid)) {
         // Error cause this should never happen unless something is wrong!
-        const errmsg = 'Rejecting session-initiate from non-focus user: '
-                + jingleSession.peerjid;
+        const errmsg = `Rejecting session-initiate from non-focus user: ${
+                 jingleSession.peerjid}`;
         GlobalOnErrorHandler.callErrorHandler(new Error(errmsg));
         logger.error(errmsg);
 
@@ -1134,7 +1134,7 @@ JitsiConference.prototype.onIncomingCall
  */
 JitsiConference.prototype.onCallEnded
 = function(JingleSession, reasonCondition, reasonText) {
-    logger.info('Call ended: ' + reasonCondition + ' - ' + reasonText);
+    logger.info(`Call ended: ${reasonCondition} - ${reasonText}`);
     this.wasStopped = true;
     // Send session.terminate event
     Statistics.sendEventToAll('session.terminate');
@@ -1414,7 +1414,7 @@ JitsiConference.prototype.getConnectionTimes = function() {
  * Sets a property for the local participant.
  */
 JitsiConference.prototype.setLocalParticipantProperty = function(name, value) {
-    this.sendCommand('jitsi_participant_' + name, {value});
+    this.sendCommand(`jitsi_participant_${name}`, {value});
 };
 
 /**

JitsiConferenceEventManager.js

@@ -73,13 +73,11 @@ JitsiConferenceEventManager.prototype.setupChatRoomListeners = function() {
 
             Object.keys(chatRoom.connectionTimes).forEach(key => {
                 const value = chatRoom.connectionTimes[key];
-                Statistics.analytics.sendEvent('conference.' + key,
-                    {value});
+                Statistics.analytics.sendEvent(`conference.${key}`, {value});
             });
             Object.keys(chatRoom.xmpp.connectionTimes).forEach(key => {
                 const value = chatRoom.xmpp.connectionTimes[key];
-                Statistics.analytics.sendEvent('xmpp.' + key,
-                    {value});
+                Statistics.analytics.sendEvent(`xmpp.${key}`, {value});
             });
         });
 
@@ -109,10 +107,9 @@ JitsiConferenceEventManager.prototype.setupChatRoomListeners = function() {
     this.chatRoomForwarder.forward(XMPPEvents.BRIDGE_DOWN,
         JitsiConferenceEvents.CONFERENCE_FAILED,
         JitsiConferenceErrors.VIDEOBRIDGE_NOT_AVAILABLE);
-    chatRoom.addListener(XMPPEvents.BRIDGE_DOWN,
-        function() {
-            Statistics.analytics.sendEvent('conference.bridgeDown');
-        });
+    chatRoom.addListener(
+        XMPPEvents.BRIDGE_DOWN,
+        () => Statistics.analytics.sendEvent('conference.bridgeDown'));
 
     this.chatRoomForwarder.forward(XMPPEvents.RESERVATION_ERROR,
         JitsiConferenceEvents.CONFERENCE_FAILED,
@@ -156,9 +153,8 @@ JitsiConferenceEventManager.prototype.setupChatRoomListeners = function() {
                 JitsiConferenceErrors.FOCUS_LEFT);
         });
 
-    const eventLogHandler = function(reason) {
-        Statistics.sendEventToAll('conference.error.' + reason);
-    };
+    const eventLogHandler
+        = reason => Statistics.sendEventToAll(`conference.error.${reason}`);
     chatRoom.addListener(XMPPEvents.SESSION_ACCEPT_TIMEOUT,
         eventLogHandler.bind(null, 'sessionAcceptTimeout'));
 
@@ -451,8 +447,9 @@ JitsiConferenceEventManager.prototype.setupRTCListeners = function() {
                     participant, payload);
             } else {
                 logger.warn(
-                    'Ignored ENDPOINT_MESSAGE_RECEIVED '
-                    + 'for not existing participant: ' + from, payload);
+                    'Ignored ENDPOINT_MESSAGE_RECEIVED for not existing '
+                        + `participant: ${from}`,
+                    payload);
             }
         });
 

JitsiConnection.js

@@ -20,7 +20,7 @@ function JitsiConnection(appID, token, options) {
     this.addEventListener(JitsiConnectionEvents.CONNECTION_FAILED,
         function(errType, msg) {
             // sends analytics and callstats event
-            Statistics.sendEventToAll('connection.failed.' + errType,
+            Statistics.sendEventToAll(`connection.failed.${errType}`,
                 {label: msg});
         });
 
@@ -31,7 +31,7 @@ function JitsiConnection(appID, token, options) {
             // when there is real error
             if(msg) {
                 Statistics.analytics.sendEvent(
-                    'connection.disconnected.' + msg);
+                    `connection.disconnected.${msg}`);
             }
             Statistics.sendLog(
                 JSON.stringify({id: 'connection.disconnected', msg}));

JitsiMeetJS.js

@@ -64,7 +64,7 @@ function addDeviceTypeToAnalyticsEvent(name, options) {
     }
     if (options.devices.indexOf('video') !== -1) {
         // we have video add resolution
-        name += '.video.' + options.resolution;
+        name += `.video.${options.resolution}`;
     }
 
     return name;
@@ -281,7 +281,7 @@ const LibJitsiMeet = {
                             newResolution);
 
                         Statistics.analytics.sendEvent(
-                            'getUserMedia.fail.resolution.' + oldResolution);
+                            `getUserMedia.fail.resolution.${oldResolution}`);
 
                         return LibJitsiMeet.createLocalTracks(options);
                     }
@@ -307,14 +307,17 @@ const LibJitsiMeet = {
                     };
                     Statistics.sendLog(JSON.stringify(logObject));
                     Statistics.analytics.sendEvent(
-                        'getUserMedia.deviceNotFound.'
-                            + error.gum.devices.join('.'));
+                        `getUserMedia.deviceNotFound.${
+                             error.gum.devices.join('.')}`);
                 } else {
                     // Report gUM failed to the stats
                     Statistics.sendGetUserMediaFailed(error);
+                    const event
+                        = addDeviceTypeToAnalyticsEvent(
+                            'getUserMedia.failed',
+                            options);
                     Statistics.analytics.sendEvent(
-                        addDeviceTypeToAnalyticsEvent(
-                            'getUserMedia.failed', options) + '.' + error.name,
+                        `${event}.${error.name}`,
                         {value: options});
                 }
 
@@ -367,10 +370,10 @@ const LibJitsiMeet = {
      */
     getGlobalOnErrorHandler(message, source, lineno, colno, error) {
         logger.error(
-            'UnhandledError: ' + message,
-            'Script: ' + source,
-            'Line: ' + lineno,
-            'Column: ' + colno,
+            `UnhandledError: ${message}`,
+            `Script: ${source}`,
+            `Line: ${lineno}`,
+            `Column: ${colno}`,
             'StackTrace: ', error);
         Statistics.reportGlobalError(error);
     },

doc/example/example.js

@@ -29,7 +29,7 @@ function onLocalTracks(tracks) {
     for(let i = 0; i < localTracks.length; i++) {
         localTracks[i].addEventListener(JitsiMeetJS.events.track.TRACK_AUDIO_LEVEL_CHANGED,
             function(audioLevel) {
-                console.log('Audio Level local: ' + audioLevel);
+                console.log(`Audio Level local: ${audioLevel}`);
             });
         localTracks[i].addEventListener(JitsiMeetJS.events.track.TRACK_MUTE_CHANGED,
             function() {
@@ -41,14 +41,14 @@ function onLocalTracks(tracks) {
             });
         localTracks[i].addEventListener(JitsiMeetJS.events.track.TRACK_AUDIO_OUTPUT_CHANGED,
             function(deviceId) {
-                console.log('track audio output device was changed to ' + deviceId);
+                console.log(`track audio output device was changed to ${deviceId}`);
             });
         if(localTracks[i].getType() == 'video') {
-            $('body').append('<video autoplay=\'1\' id=\'localVideo' + i + '\' />');
-            localTracks[i].attach($('#localVideo' + i)[0]);
+            $('body').append(`<video autoplay='1' id='localVideo${i}' />`);
+            localTracks[i].attach($(`#localVideo${i}`)[0]);
         } else {
-            $('body').append('<audio autoplay=\'1\' muted=\'true\' id=\'localAudio' + i + '\' />');
-            localTracks[i].attach($('#localAudio' + i)[0]);
+            $('body').append(`<audio autoplay='1' muted='true' id='localAudio${i}' />`);
+            localTracks[i].attach($(`#localAudio${i}`)[0]);
         }
         if(isJoined) {
             room.addTrack(localTracks[i]);
@@ -71,7 +71,7 @@ function onRemoteTrack(track) {
     const idx = remoteTracks[participant].push(track);
     track.addEventListener(JitsiMeetJS.events.track.TRACK_AUDIO_LEVEL_CHANGED,
         function(audioLevel) {
-            console.log('Audio Level remote: ' + audioLevel);
+            console.log(`Audio Level remote: ${audioLevel}`);
         });
     track.addEventListener(JitsiMeetJS.events.track.TRACK_MUTE_CHANGED,
         function() {
@@ -83,15 +83,15 @@ function onRemoteTrack(track) {
         });
     track.addEventListener(JitsiMeetJS.events.track.TRACK_AUDIO_OUTPUT_CHANGED,
         function(deviceId) {
-            console.log('track audio output device was changed to ' + deviceId);
+            console.log(`track audio output device was changed to ${deviceId}`);
         });
     const id = participant + track.getType() + idx;
     if(track.getType() == 'video') {
-        $('body').append('<video autoplay=\'1\' id=\'' + participant + 'video' + idx + '\' />');
+        $('body').append(`<video autoplay='1' id='${participant}video${idx}' />`);
     } else {
-        $('body').append('<audio autoplay=\'1\' id=\'' + participant + 'audio' + idx + '\' />');
+        $('body').append(`<audio autoplay='1' id='${participant}audio${idx}' />`);
     }
-    track.attach($('#' + id)[0]);
+    track.attach($(`#${id}`)[0]);
 }
 
 /**
@@ -112,7 +112,7 @@ function onUserLeft(id) {
     }
     const tracks = remoteTracks[id];
     for(let i = 0; i < tracks.length; i++) {
-        tracks[i].detach($('#' + id + tracks[i].getType()));
+        tracks[i].detach($(`#${id}${tracks[i].getType()}`));
     }
 }
 
@@ -123,7 +123,7 @@ function onConnectionSuccess() {
     room = connection.initJitsiConference('conference', confOptions);
     room.on(JitsiMeetJS.events.conference.TRACK_ADDED, onRemoteTrack);
     room.on(JitsiMeetJS.events.conference.TRACK_REMOVED, function(track) {
-        console.log('track removed!!!' + track);
+        console.log(`track removed!!!${track}`);
     });
     room.on(JitsiMeetJS.events.conference.CONFERENCE_JOINED, onConferenceJoined);
     room.on(JitsiMeetJS.events.conference.USER_JOINED, function(id) {
@@ -131,24 +131,24 @@ function onConnectionSuccess() {
     });
     room.on(JitsiMeetJS.events.conference.USER_LEFT, onUserLeft);
     room.on(JitsiMeetJS.events.conference.TRACK_MUTE_CHANGED, function(track) {
-        console.log(track.getType() + ' - ' + track.isMuted());
+        console.log(`${track.getType()} - ${track.isMuted()}`);
     });
     room.on(JitsiMeetJS.events.conference.DISPLAY_NAME_CHANGED, function(userID, displayName) {
-        console.log(userID + ' - ' + displayName);
+        console.log(`${userID} - ${displayName}`);
     });
     room.on(JitsiMeetJS.events.conference.TRACK_AUDIO_LEVEL_CHANGED,
       function(userID, audioLevel) {
-          console.log(userID + ' - ' + audioLevel);
+          console.log(`${userID} - ${audioLevel}`);
       });
     room.on(JitsiMeetJS.events.conference.RECORDER_STATE_CHANGED, function() {
-        console.log(room.isRecordingSupported() + ' - '
-            + room.getRecordingState() + ' - '
-            + room.getRecordingURL());
+        console.log(`${room.isRecordingSupported()} - ${
+             room.getRecordingState()} - ${
+             room.getRecordingURL()}`);
     });
     room.on(JitsiMeetJS.events.conference.PHONE_NUMBER_CHANGED, function() {
         console.log(
-            room.getPhoneNumber() + ' - '
-            + room.getPhonePin());
+            `${room.getPhoneNumber()} - ${
+             room.getPhonePin()}`);
     });
     room.join();
 }
@@ -271,7 +271,7 @@ if (JitsiMeetJS.mediaDevices.isDeviceChangeAvailable('output')) {
         if (audioOutputDevices.length > 1) {
             $('#audioOutputSelect').html(
                 audioOutputDevices.map(function(d) {
-                    return '<option value="' + d.deviceId + '">' + d.label + '</option>';
+                    return `<option value="${d.deviceId}">${d.label}</option>`;
                 }).join('\n')
             );
 

modules/RTC/DataChannels.js

@@ -139,8 +139,9 @@ DataChannels.prototype.onDataChannel = function(event) {
             } else if ('EndpointConnectivityStatusChangeEvent' === colibriClass) {
                 const endpoint = obj.endpoint;
                 const isActive = obj.active === 'true';
-                logger.info('Endpoint connection status changed: ' + endpoint
-                           + ' active ? ' + isActive);
+                logger.info(
+                    `Endpoint connection status changed: ${endpoint} active ? ${
+                        isActive}`);
                 self.eventEmitter.emit(RTCEvents.ENDPOINT_CONN_STATUS_CHANGED,
                     endpoint, isActive);
             } else {
@@ -149,7 +150,7 @@ DataChannels.prototype.onDataChannel = function(event) {
                 // (i.e. is a JSON object which assigns a value to the mandatory
                 // property colibriClass) so don't just swallow it, expose it to
                 // public consumption.
-                self.eventEmitter.emit('rtc.datachannel.' + colibriClass, obj);
+                self.eventEmitter.emit(`rtc.datachannel.${colibriClass}`, obj);
             }
         }
     };
@@ -215,20 +216,19 @@ DataChannels.prototype._onXXXEndpointChanged = function(xxx, userResource) {
     const lower = head.toLowerCase() + tail;
     const upper = head.toUpperCase() + tail;
     logger.log(
-            'sending ' + lower
-                + ' endpoint changed notification to the bridge: ',
+            `sending ${lower} endpoint changed notification to the bridge: `,
             userResource);
 
     const jsonObject = {};
 
-    jsonObject.colibriClass = upper + 'EndpointChangedEvent';
-    jsonObject[lower + 'Endpoint']
+    jsonObject.colibriClass = `${upper}EndpointChangedEvent`;
+    jsonObject[`${lower}Endpoint`]
         = userResource ? userResource : null;
 
     this.send(jsonObject);
 
     // Notify Videobridge about the specified endpoint change.
-    logger.log(lower + ' endpoint changed: ', userResource);
+    logger.log(`${lower} endpoint changed: `, userResource);
 };
 
 DataChannels.prototype._some = function(callback, thisArg) {
@@ -291,7 +291,7 @@ DataChannels.prototype.sendSetLastNMessage = function(value) {
     };
 
     this.send(jsonObject);
-    logger.log('Channel lastN set to: ' + value);
+    logger.log(`Channel lastN set to: ${value}`);
 };
 
 module.exports = DataChannels;

modules/RTC/JitsiLocalTrack.js

@@ -156,7 +156,7 @@ JitsiLocalTrack.prototype._initNoDataFromSourceHandlers = function() {
                 this._setHandler('track_unmute', () => {
                     this._clearNoDataFromSourceMuteResources();
                     Statistics.sendEventToAll(
-                        this.getType() + '.track_unmute',
+                        `${this.getType()}.track_unmute`,
                         {value: window.performance.now() - now});
                 });
             }
@@ -195,7 +195,7 @@ JitsiLocalTrack.prototype._onNoDataFromSourceError = function() {
  */
 JitsiLocalTrack.prototype._fireNoDataFromSourceEvent = function() {
     this.eventEmitter.emit(JitsiTrackEvents.NO_DATA_FROM_SOURCE);
-    const eventName = this.getType() + '.no_data_from_source';
+    const eventName = `${this.getType()}.no_data_from_source`;
     Statistics.analytics.sendEvent(eventName);
     const log = {name: eventName};
     if (this.isAudioTrack()) {
@@ -215,7 +215,7 @@ JitsiLocalTrack.prototype._setRealDeviceIdFromDeviceList = function(devices) {
     const track = this.getTrack();
     const device
         = devices.find(
-            d => d.kind === track.kind + 'input' && d.label === track.label);
+            d => d.kind === `${track.kind}input` && d.label === track.label);
 
     if (device) {
         this._realDeviceId = device.deviceId;

modules/RTC/JitsiRemoteTrack.js

@@ -64,7 +64,7 @@ JitsiRemoteTrack.prototype._bindMuteHandlers = function() {
     this.track.addEventListener('mute', function() {
 
         logger.debug(
-            '"onmute" event(' + Date.now() + '): ',
+            `"onmute" event(${Date.now()}): `,
             this.getParticipantId(), this.getType(), this.getSSRC());
 
         this.rtc.eventEmitter.emit(RTCEvents.REMOTE_TRACK_MUTE, this);
@@ -74,7 +74,7 @@ JitsiRemoteTrack.prototype._bindMuteHandlers = function() {
     this.track.addEventListener('unmute', function() {
 
         logger.debug(
-            '"onunmute" event(' + Date.now() + '): ',
+            `"onunmute" event(${Date.now()}): `,
             this.getParticipantId(), this.getType(), this.getSSRC());
 
         this.rtc.eventEmitter.emit(RTCEvents.REMOTE_TRACK_UNMUTE, this);
@@ -152,17 +152,17 @@ JitsiRemoteTrack.prototype._playCallback = function() {
     const type = this.isVideoTrack() ? 'video' : 'audio';
 
     const now = window.performance.now();
-    console.log('(TIME) Render ' + type + ':\t', now);
-    this.conference.getConnectionTimes()[type + '.render'] = now;
+    console.log(`(TIME) Render ${type}:\t`, now);
+    this.conference.getConnectionTimes()[`${type}.render`] = now;
 
     const ttfm = now
         - (this.conference.getConnectionTimes()['session.initiate']
         - this.conference.getConnectionTimes()['muc.joined'])
         - (window.connectionTimes['obtainPermissions.end']
         - window.connectionTimes['obtainPermissions.start']);
-    this.conference.getConnectionTimes()[type + '.ttfm'] = ttfm;
-    console.log('(TIME) TTFM ' + type + ':\t', ttfm);
-    let eventName = type + '.ttfm';
+    this.conference.getConnectionTimes()[`${type}.ttfm`] = ttfm;
+    console.log(`(TIME) TTFM ${type}:\t`, ttfm);
+    let eventName = `${type}.ttfm`;
     if(this.hasBeenMuted) {
         eventName += '.muted';
     }

modules/RTC/JitsiTrack.js

@@ -386,7 +386,7 @@ JitsiTrack.prototype.setAudioLevel = function(audioLevel) {
 JitsiTrack.prototype.getMSID = function() {
     const streamId = this.getStreamId();
     const trackId = this.getTrackId();
-    return streamId && trackId ? streamId + ' ' + trackId : null;
+    return streamId && trackId ? `${streamId} ${trackId}` : null;
 };
 
 /**

modules/RTC/RTCBrowserType.js

@@ -199,7 +199,7 @@ function detectChrome() {
         // We can assume that user agent is chrome, because it's
         // enforced when 'ext' streaming method is set
         const ver = parseInt(userAgent.match(/chrome\/(\d+)\./)[1], 10);
-        logger.log('This appears to be Chrome, ver: ' + ver);
+        logger.log(`This appears to be Chrome, ver: ${ver}`);
         return ver;
     }
     return null;
@@ -210,7 +210,7 @@ function detectOpera() {
     if (userAgent.match(/Opera|OPR/)) {
         currentBrowser = RTCBrowserType.RTC_BROWSER_OPERA;
         const version = userAgent.match(/(Opera|OPR) ?\/?(\d+)\.?/)[2];
-        logger.info('This appears to be Opera, ver: ' + version);
+        logger.info(`This appears to be Opera, ver: ${version}`);
         return version;
     }
     return null;
@@ -221,7 +221,7 @@ function detectFirefox() {
         currentBrowser = RTCBrowserType.RTC_BROWSER_FIREFOX;
         const version = parseInt(
             navigator.userAgent.match(/Firefox\/([0-9]+)\./)[1], 10);
-        logger.log('This appears to be Firefox, ver: ' + version);
+        logger.log(`This appears to be Firefox, ver: ${version}`);
         return version;
     }
     return null;
@@ -262,7 +262,7 @@ function detectIE() {
 
     if (version) {
         currentBrowser = RTCBrowserType.RTC_BROWSER_IEXPLORER;
-        logger.info('This appears to be IExplorer, ver: ' + version);
+        logger.info(`This appears to be IExplorer, ver: ${version}`);
     }
     return version;
 }
@@ -275,7 +275,7 @@ function detectElectron() {
     if (userAgent.match(/Electron/)) {
         currentBrowser = RTCBrowserType.RTC_BROWSER_ELECTRON;
         const version = userAgent.match(/Electron\/([\d.]+)/)[1];
-        logger.info('This appears to be Electron, ver: ' + version);
+        logger.info(`This appears to be Electron, ver: ${version}`);
         return version;
     }
     return null;
@@ -286,7 +286,7 @@ function detectNWJS() {
     if (userAgent.match(/JitsiMeetNW/)) {
         currentBrowser = RTCBrowserType.RTC_BROWSER_NWJS;
         const version = userAgent.match(/JitsiMeetNW\/([\d.]+)/)[1];
-        logger.info('This appears to be JitsiMeetNW, ver: ' + version);
+        logger.info(`This appears to be JitsiMeetNW, ver: ${version}`);
         return version;
     }
     return null;
@@ -308,7 +308,7 @@ function detectReactNative() {
         }
         name || (name = 'react-native');
         version || (version = 'unknown');
-        console.info('This appears to be ' + name + ', ver: ' + version);
+        console.info(`This appears to be ${name}, ver: ${version}`);
     } else {
         // We're not running in a React Native environment.
         version = null;

modules/RTC/RTCUIHelper.js

@@ -27,7 +27,7 @@ const RTCUIHelper = {
             return $(containerElement).find(videoElemName)[0];
         }
         const matching = $(containerElement).find(
-                ' ' + videoElemName + '>param[value="video"]');
+                ` ${videoElemName}>param[value="video"]`);
         if (matching.length) {
             if (matching.length > 1) {
                 logger.warn(

modules/RTC/RTCUtils.js

@@ -531,7 +531,7 @@ function convertMediaStreamTrackSource(source) {
         // not return 'audiooutput' devices but let's handle it in any
         // case
         kind: kind
-            ? kind === 'audiooutput' ? kind : kind + 'input'
+            ? kind === 'audiooutput' ? kind : `${kind}input`
             : null,
         deviceId: source.id,
         groupId: source.groupId || null
@@ -556,7 +556,7 @@ function obtainDevices(options) {
                 rtcUtils.stopMediaStream(options.streams[device]);
             });
             logger.error(
-                'failed to obtain ' + device + ' stream - stop', error);
+                `failed to obtain ${device} stream - stop`, error);
 
             options.errorCallback(error);
         });
@@ -733,11 +733,11 @@ class RTCUtils extends Listenable {
     init(options) {
         if (typeof options.disableAEC === 'boolean') {
             disableAEC = options.disableAEC;
-            logger.info('Disable AEC: ' + disableAEC);
+            logger.info(`Disable AEC: ${disableAEC}`);
         }
         if (typeof options.disableNS === 'boolean') {
             disableNS = options.disableNS;
-            logger.info('Disable NS: ' + disableNS);
+            logger.info(`Disable NS: ${disableNS}`);
         }
 
         return new Promise(function(resolve, reject) {
@@ -1262,7 +1262,7 @@ class RTCUtils extends Listenable {
                 audioOutputDeviceId = deviceId;
                 audioOutputChanged = true;
 
-                logger.log('Audio output device set to ' + deviceId);
+                logger.log(`Audio output device set to ${deviceId}`);
 
                 eventEmitter.emit(RTCEvents.AUDIO_OUTPUT_DEVICE_CHANGED,
                     deviceId);

modules/RTC/ScreenObtainer.js

@@ -189,8 +189,9 @@ const ScreenObtainer = {
                 && RTCBrowserType.getFirefoxVersion()
                     <= desktopSharingFirefoxMaxVersionExtRequired)) {
             extensionRequired = true;
-            logger.log('Jidesha extension required on firefox version '
-                + RTCBrowserType.getFirefoxVersion());
+            logger.log(
+                `Jidesha extension required on firefox version ${
+                    RTCBrowserType.getFirefoxVersion()}`);
         }
 
         if (!extensionRequired || firefoxExtInstalled === true) {
@@ -290,7 +291,7 @@ const ScreenObtainer = {
         }
 
         const msg
-            = 'Failed to install the extension from ' + webStoreInstallUrl;
+            = `Failed to install the extension from ${webStoreInstallUrl}`;
 
         logger.log(msg, e);
         failCallback(new JitsiTrackError(
@@ -337,8 +338,9 @@ function obtainWebRTCScreen(options, streamCallback, failCallback) {
  * @returns {string}
  */
 function getWebStoreInstallUrl(options) {
-    return 'https://chrome.google.com/webstore/detail/'
-        + options.desktopSharingChromeExtId;
+    return (
+        `https://chrome.google.com/webstore/detail/${
+            options.desktopSharingChromeExtId}`);
 }
 
 /**
@@ -400,7 +402,7 @@ function checkChromeExtInstalled(callback, options) {
             }
             // Check installed extension version
             const extVersion = response.version;
-            logger.log('Extension version is: ' + extVersion);
+            logger.log(`Extension version is: ${extVersion}`);
             const updateRequired
                 = isUpdateRequired(
                     options.desktopSharingChromeMinExtVersion,
@@ -458,8 +460,8 @@ function initChromeExtension(options) {
         chromeExtInstalled = installed;
         chromeExtUpdateRequired = updateRequired;
         logger.info(
-            'Chrome extension installed: ' + chromeExtInstalled
-            + ' updateRequired: ' + chromeExtUpdateRequired);
+            `Chrome extension installed: ${chromeExtInstalled
+                } updateRequired: ${chromeExtUpdateRequired}`);
     }, options);
 }
 
@@ -558,9 +560,9 @@ function initFirefoxExtensionDetection(options) {
     // "chrome://EXT_ID/content/DOMAIN.png"
     // Where EXT_ID is the ID of the extension with "@" replaced by ".", and
     // DOMAIN is a domain whitelisted by the extension.
-    const src = 'chrome://'
-        + options.desktopSharingFirefoxExtId.replace('@', '.')
-        + '/content/' + document.location.hostname + '.png';
+    const src
+        = `chrome://${options.desktopSharingFirefoxExtId.replace('@', '.')
+            }/content/${document.location.hostname}.png`;
     img.setAttribute('src', src);
 }
 

modules/RTC/TraceablePeerConnection.js

@@ -173,7 +173,7 @@ function TraceablePeerConnection(rtc, id, signalingLayer, ice_config,
                 const now = new Date();
                 for (let i = 0; i < results.length; ++i) {
                     results[i].names().forEach(function(name) {
-                        const id = results[i].id + '-' + name;
+                        const id = `${results[i].id}-${name}`;
                         if (!self.stats[id]) {
                             self.stats[id] = {
                                 startTime: now,
@@ -205,7 +205,7 @@ const dumpSDP = function(description) {
         return '';
     }
 
-    return 'type: ' + description.type + '\r\n' + description.sdp;
+    return `type: ${description.type}\r\n${description.sdp}`;
 };
 
 /**
@@ -266,15 +266,14 @@ TraceablePeerConnection.prototype._remoteTrackAdded = function(stream, track) {
     }
 
     const remoteSDP = new SDP(this.remoteDescription.sdp);
-    const mediaLines = remoteSDP.media.filter(
-        function(mediaLines) {
-            return mediaLines.startsWith('m=' + mediaType);
-        });
+    const mediaLines
+        = remoteSDP.media.filter(
+            mediaLines => mediaLines.startsWith(`m=${mediaType}`));
     if (!mediaLines.length) {
         GlobalOnErrorHandler.callErrorHandler(
             new Error(
-                'No media lines for type ' + mediaType
-                    + ' found in remote SDP for remote track: ' + streamId));
+                `No media lines for type ${mediaType
+                     } found in remote SDP for remote track: ${streamId}`));
         // Abort
         return;
     }
@@ -285,13 +284,13 @@ TraceablePeerConnection.prototype._remoteTrackAdded = function(stream, track) {
         function(line) {
             const msid
                 = RTCBrowserType.isTemasysPluginUsed() ? 'mslabel' : 'msid';
-            return line.indexOf(msid + ':' + streamId) !== -1;
+            return line.indexOf(`${msid}:${streamId}`) !== -1;
         });
     if (!ssrcLines.length) {
         GlobalOnErrorHandler.callErrorHandler(
             new Error(
-                'No SSRC lines for streamId ' + streamId
-                    + ' for remote track, media type: ' + mediaType));
+                `No SSRC lines for streamId ${streamId
+                     } for remote track, media type: ${mediaType}`));
         // Abort
         return;
     }
@@ -304,9 +303,9 @@ TraceablePeerConnection.prototype._remoteTrackAdded = function(stream, track) {
     if (!ownerEndpointId) {
         GlobalOnErrorHandler.callErrorHandler(
             new Error(
-                'No SSRC owner known for: ' + trackSsrc
-                    + ' for remote track, msid: ' + streamId
-                    + ' media type: ' + mediaType));
+                `No SSRC owner known for: ${trackSsrc
+                     } for remote track, msid: ${streamId
+                     } media type: ${mediaType}`));
         // Abort
         return;
     }
@@ -318,7 +317,7 @@ TraceablePeerConnection.prototype._remoteTrackAdded = function(stream, track) {
 
     if (!peerMediaInfo) {
         GlobalOnErrorHandler.callErrorHandler(
-            new Error('No peer media info available for: ' + ownerEndpointId));
+            new Error(`No peer media info available for: ${ownerEndpointId}`));
         // Abort
         return;
     }
@@ -728,7 +727,7 @@ TraceablePeerConnection.prototype.setRemoteDescription
 TraceablePeerConnection.prototype.generateRecvonlySsrc = function() {
     // FIXME replace with SDPUtil.generateSsrc (when it's added)
     const newSSRC = this.generateNewStreamSSRCInfo().ssrcs[0];
-    logger.info('Generated new recvonly SSRC: ' + newSSRC);
+    logger.info(`Generated new recvonly SSRC: ${newSSRC}`);
     this.sdpConsistency.setPrimarySsrc(newSSRC);
 };
 
@@ -838,8 +837,11 @@ TraceablePeerConnection.prototype.createAnswer
                  *  about unmapped ssrcs)
                  */
                 if (!RTCBrowserType.isFirefox()) {
-                    answer.sdp = this.sdpConsistency.makeVideoPrimarySsrcsConsistent(answer.sdp);
-                    this.trace('createAnswerOnSuccess::postTransform (make primary video ssrcs consistent)',
+                    answer.sdp
+                        = this.sdpConsistency.makeVideoPrimarySsrcsConsistent(
+                            answer.sdp);
+                    this.trace(
+                        'createAnswerOnSuccess::postTransform (make primary video ssrcs consistent)',
                         dumpSDP(answer));
                 }
 

modules/connectivity/ParticipantConnectionStatus.js

@@ -81,7 +81,7 @@ export default class ParticipantConnectionStatus {
          * @type {Object.<string, number>}
          */
         this.rtcMutedTimestamp = { };
-        logger.info('RtcMuteTimeout set to: ' + this.rtcMuteTimeout);
+        logger.info(`RtcMuteTimeout set to: ${this.rtcMuteTimeout}`);
     }
 
     /**
@@ -174,8 +174,8 @@ export default class ParticipantConnectionStatus {
     onEndpointConnStatusChanged(endpointId, isActive) {
 
         logger.debug(
-            'Detector RTCEvents.ENDPOINT_CONN_STATUS_CHANGED('
-                + Date.now() + '): ' + endpointId + ': ' + isActive);
+            `Detector RTCEvents.ENDPOINT_CONN_STATUS_CHANGED(${Date.now()}): ${
+                endpointId}: ${isActive}`);
 
         // Filter out events for the local JID for now
         if (endpointId !== this.conference.myUserId()) {
@@ -193,8 +193,8 @@ export default class ParticipantConnectionStatus {
             participant._setIsConnectionActive(newStatus);
 
             logger.debug(
-                'Emit endpoint conn status(' + Date.now() + ') '
-                    + endpointId + ': ' + newStatus);
+                `Emit endpoint conn status(${Date.now()}) ${endpointId}: ${
+                    newStatus}`);
 
             // Log the event on CallStats
             Statistics.sendLog(
@@ -250,8 +250,8 @@ export default class ParticipantConnectionStatus {
                 && remoteTrack.getType() === MediaType.VIDEO) {
 
             logger.debug(
-                'Detector on remote track added for: '
-                    + remoteTrack.getParticipantId());
+                `Detector on remote track added for: ${
+                    remoteTrack.getParticipantId()}`);
 
             remoteTrack.on(
                 JitsiTrackEvents.TRACK_MUTE_CHANGED,
@@ -272,8 +272,7 @@ export default class ParticipantConnectionStatus {
 
             const endpointId = remoteTrack.getParticipantId();
 
-            logger.debug(
-                'Detector on remote track removed: ' + endpointId);
+            logger.debug(`Detector on remote track removed: ${endpointId}`);
 
             remoteTrack.off(
                 JitsiTrackEvents.TRACK_MUTE_CHANGED,
@@ -329,7 +328,7 @@ export default class ParticipantConnectionStatus {
             // fired),
             // so we don't care, but let's print the warning for
             // debugging purpose
-            logger.warn('figure out conn status - no participant for: ' + id);
+            logger.warn(`figure out conn status - no participant for: ${id}`);
             return;
         }
 
@@ -348,10 +347,10 @@ export default class ParticipantConnectionStatus {
             = isConnActiveByJvb && (isVideoMuted || !isVideoTrackFrozen);
 
         logger.debug(
-            'Figure out conn status, is video muted: ' + isVideoMuted
-                + ' is active(jvb): ' + isConnActiveByJvb
-                + ' video track frozen: ' + isVideoTrackFrozen
-                + ' => ' + isConnectionActive);
+            `Figure out conn status, is video muted: ${isVideoMuted
+                 } is active(jvb): ${isConnActiveByJvb
+                 } video track frozen: ${isVideoTrackFrozen
+                 } => ${isConnectionActive}`);
 
         this._changeConnectionStatus(participant, isConnectionActive);
     }
@@ -365,9 +364,9 @@ export default class ParticipantConnectionStatus {
     onTrackRtcMuted(track) {
         const participantId = track.getParticipantId();
         const participant = this.conference.getParticipantById(participantId);
-        logger.debug('Detector track RTC muted: ' + participantId);
+        logger.debug(`Detector track RTC muted: ${participantId}`);
         if (!participant) {
-            logger.error('No participant for id: ' + participantId);
+            logger.error(`No participant for id: ${participantId}`);
             return;
         }
         this.rtcMutedTimestamp[participantId] = Date.now();
@@ -377,7 +376,7 @@ export default class ParticipantConnectionStatus {
             // triggered.
             this.clearTimeout(participantId);
             this.trackTimers[participantId] = window.setTimeout(function() {
-                logger.debug('RTC mute timeout for: ' + participantId);
+                logger.debug(`RTC mute timeout for: ${participantId}`);
                 this.clearTimeout(participantId);
                 this.figureOutConnectionStatus(participantId);
             }.bind(this), this.rtcMuteTimeout);
@@ -393,7 +392,7 @@ export default class ParticipantConnectionStatus {
     onTrackRtcUnmuted(track) {
         const participantId = track.getParticipantId();
 
-        logger.debug('Detector track RTC unmuted: ' + participantId);
+        logger.debug(`Detector track RTC unmuted: ${participantId}`);
 
         this.clearTimeout(participantId);
         this.clearRtcMutedTimestamp(participantId);
@@ -411,10 +410,9 @@ export default class ParticipantConnectionStatus {
         const participantId = track.getParticipantId();
 
         logger.debug(
-            'Detector on track signalling mute changed: '
-                + participantId, track.isMuted());
+            `Detector on track signalling mute changed: ${participantId}`,
+            track.isMuted());
 
         this.figureOutConnectionStatus(participantId);
     }
-
 }

modules/settings/Settings.js

@@ -15,7 +15,7 @@ function getLocalStorage() {
 }
 
 function _p8() {
-    return (Math.random().toString(16) + '000000000').substr(2, 8);
+    return `${Math.random().toString(16)}000000000`.substr(2, 8);
 }
 
 function generateUniqueId() {

modules/statistics/CallStats.js

@@ -55,7 +55,7 @@ let callStats = null;
 const DEFAULT_REMOTE_USER = 'jitsi';
 
 function initCallback(err, msg) {
-    logger.log('CallStats Status: err=' + err + ' msg=' + msg);
+    logger.log(`CallStats Status: err=${err} msg=${msg}`);
 
     CallStats.initializeInProgress = false;
 
@@ -153,7 +153,7 @@ const CallStats = _try_catch(function(jingleSession, options) {
         };
 
         // The confID is case sensitive!!!
-        this.confID = options.callStatsConfIDNamespace + '/' + options.roomName;
+        this.confID = `${options.callStatsConfIDNamespace}/${options.roomName}`;
 
         this.callStatsID = options.callStatsID;
         this.callStatsSecret = options.callStatsSecret;
@@ -237,7 +237,7 @@ const reportType = {
 
 CallStats.prototype.pcCallback = _try_catch(function(err, msg) {
     if (callStats && err !== 'success') {
-        logger.error('Monitoring status: ' + err + ' msg: ' + msg);
+        logger.error(`Monitoring status: ${err} msg: ${msg}`);
     }
 });
 

modules/statistics/RTPStatsCollector.js

@@ -181,7 +181,7 @@ function StatsCollector(
     this._browserType = RTCBrowserType.getBrowserType();
     const keys = KEYS_BY_BROWSER_TYPE[this._browserType];
     if (!keys) {
-        throw 'The browser type \'' + this._browserType + '\' isn\'t supported!';
+        throw `The browser type '${this._browserType}' isn't supported!`;
     }
     /**
      * The function which is to be used to retrieve the value associated in a
@@ -287,7 +287,7 @@ StatsCollector.prototype.start = function(startAudioLevelStats) {
                             self.processStatsReport();
                         } catch (e) {
                             GlobalOnErrorHandler.callErrorHandler(e);
-                            logger.error('Unsupported key:' + e, e);
+                            logger.error(`Unsupported key:${e}`, e);
                         }
 
                         self.previousStatsReport = self.currentStatsReport;
@@ -317,7 +317,7 @@ StatsCollector.prototype._defineGetStatValueMethod = function(keys) {
         if (key) {
             return key;
         }
-        throw 'The property \'' + name + '\' isn\'t supported!';
+        throw `The property '${name}' isn't supported!`;
 
     };
 
@@ -436,9 +436,9 @@ StatsCollector.prototype.processStatsReport = function() {
             const local = this.currentStatsReport[now.localCandidateId];
             const remote = this.currentStatsReport[now.remoteCandidateId];
             this.conferenceStats.transport.push({
-                ip: remote.ipAddress + ':' + remote.portNumber,
+                ip: `${remote.ipAddress}:${remote.portNumber}`,
                 type: local.transport,
-                localip: local.ipAddress + ':' + local.portNumber
+                localip: `${local.ipAddress}:${local.portNumber}`
             });
         }
 
@@ -621,7 +621,7 @@ StatsCollector.prototype.processAudioLevelReport = function() {
         const before = this.baselineAudioLevelsReport[idx];
         const ssrc = getStatValue(now, 'ssrc');
         if (!before) {
-            logger.warn(ssrc + ' not enough data');
+            logger.warn(`${ssrc} not enough data`);
             continue;
         }
 

modules/statistics/statistics.js

@@ -49,7 +49,7 @@ function formatJitsiTrackErrorForCallStats(error) {
 
     // Combine name from error's name plus (possibly) name of original GUM error
     err.name = (error.name || 'Unknown error') + (error.gum && error.gum.error
-        && error.gum.error.name ? ' - ' + error.gum.error.name : '');
+        && error.gum.error.name ? ` - ${error.gum.error.name}` : '');
 
     // Put all constraints into this field. For constraint failed errors we will
     // still know which exactly constraint failed as it will be a part of
@@ -118,7 +118,7 @@ Statistics.prototype.startRemoteStats = function(peerconnection) {
         this.rtpStats.start(Statistics.audioLevelsEnabled);
     } catch (e) {
         this.rtpStats = null;
-        logger.error('Failed to start collecting remote statistics: ' + e);
+        logger.error(`Failed to start collecting remote statistics: ${e}`);
     }
 };
 

modules/transcription/audioRecorder.js

@@ -215,8 +215,9 @@ audioRecorder.prototype.start = function() {
         startRecorder(trackRecorder);
     });
     // log that recording has started
-    console.log('Started the recording of the audio. There are currently '
-        + this.recorders.length + ' recorders active.');
+    console.log(
+        `Started the recording of the audio. There are currently ${
+            this.recorders.length} recorders active.`);
 };
 
 /**
@@ -226,9 +227,7 @@ audioRecorder.prototype.stop = function() {
     // set the boolean flag to false
     this.isRecording = false;
     // stop all recorders
-    this.recorders.forEach(function(trackRecorder) {
-        stopRecorder(trackRecorder);
-    });
+    this.recorders.forEach(trackRecorder => stopRecorder(trackRecorder));
     console.log('stopped recording');
 };
 
@@ -244,7 +243,7 @@ audioRecorder.prototype.download = function() {
         document.body.appendChild(a);
         a.style = 'display: none';
         a.href = url;
-        a.download = 'test.' + t.fileType.split('/')[1];
+        a.download = `test.${t.fileType.split('/')[1]}`;
         a.click();
         window.URL.revokeObjectURL(url);
     });
@@ -257,8 +256,8 @@ audioRecorder.prototype.download = function() {
  */
 audioRecorder.prototype.getRecordingResults = function() {
     if(this.isRecording) {
-        throw new Error('cannot get blobs because the AudioRecorder is still'
-            + 'recording!');
+        throw new Error(
+            'cannot get blobs because the AudioRecorder is still recording!');
     }
     // make sure the names are up to date before sending them off
     this.updateNames();

modules/transcription/transcriber.js

@@ -50,9 +50,9 @@ const transcriber = function() {
 transcriber.prototype.start = function start() {
     if(this.state !== BEFORE_STATE) {
         throw new Error(
-            'The transcription can only start when it\'s in the "'
-                + BEFORE_STATE + '" state. It\'s currently in the "'
-                + this.state + '" state');
+            `The transcription can only start when it's in the "${
+                 BEFORE_STATE}" state. It's currently in the "${
+                 this.state}" state`);
     }
     this.state = RECORDING_STATE;
     this.audioRecorder.start();
@@ -68,9 +68,9 @@ transcriber.prototype.start = function start() {
 transcriber.prototype.stop = function stop(callback) {
     if(this.state !== RECORDING_STATE) {
         throw new Error(
-            'The transcription can only stop when it\'s in the "'
-                + RECORDING_STATE + '" state. It\'s currently in the "'
-                + this.state + '" state');
+            `The transcription can only stop when it's in the "${
+                 RECORDING_STATE}" state. It's currently in the "${
+                 this.state}" state`);
     }
     // stop the recording
     console.log('stopping recording and sending audio files');
@@ -102,7 +102,7 @@ transcriber.prototype.stop = function stop(callback) {
 const blobCallBack = function(answer) {
     console.log(
         'retrieved an answer from the transcription service. The answer has an'
-            + ' array of length: ' + answer.wordArray.length);
+            + ` array of length: ${answer.wordArray.length}`);
     // first add the offset between the start of the transcription and
     // the start of the recording to all start and end times
     if(answer.wordArray.length > 0) {
@@ -117,7 +117,7 @@ const blobCallBack = function(answer) {
         answer.wordArray.forEach(function(wordObject) {
             wordObject.begin += offset;
             wordObject.end += offset;
-            array += wordObject.word + ',';
+            array += `${wordObject.word},`;
         });
         array += ']';
         console.log(array);
@@ -129,7 +129,7 @@ const blobCallBack = function(answer) {
     // then store the array and decrease the counter
     this.results.push(answer.wordArray);
     this.counter--;
-    console.log('current counter: ' + this.counter);
+    console.log(`current counter: ${this.counter}`);
     // and check if all results have been received.
     this.maybeMerge();
 };
@@ -152,8 +152,8 @@ transcriber.prototype.maybeMerge = function() {
  */
 transcriber.prototype.merge = function() {
     console.log(
-        'starting merge process!\n The length of the array: '
-            + this.results.length);
+        `starting merge process!\n The length of the array: ${
+             this.results.length}`);
     this.transcription = '';
     // the merging algorithm will look over all Word objects who are at pos 0 in
     // every array. It will then select the one closest in time to the
@@ -219,14 +219,14 @@ transcriber.prototype.merge = function() {
  */
 transcriber.prototype.updateTranscription = function(word, name) {
     if(name !== undefined && name !== null) {
-        this.transcription += '\n' + name + ':';
+        this.transcription += `\n${name}:`;
         this.lineLength = name.length + 1; // +1 for the semi-colon
     }
     if(this.lineLength + word.word.length > MAXIMUM_SENTENCE_LENGTH) {
         this.transcription += '\n    ';
         this.lineLength = 4; // because of the 4 spaces after the new line
     }
-    this.transcription += ' ' + word.word;
+    this.transcription += ` ${word.word}`;
     this.lineLength += word.word.length + 1; // +1 for the space
 };
 
@@ -239,8 +239,7 @@ transcriber.prototype.updateTranscription = function(word, name) {
  * @returns {boolean} true if any non-zero arrays inside, otherwise false
  */
 const hasPopulatedArrays = function(twoDimensionalArray) {
-    let i;
-    for(i = 0; i < twoDimensionalArray.length; i++) {
+    for(let i = 0; i < twoDimensionalArray.length; i++) {
         if(twoDimensionalArray[i].length === 0) {
             twoDimensionalArray.splice(i, 1);
         }
@@ -301,9 +300,9 @@ transcriber.prototype.removeTrack = function(track) {
 transcriber.prototype.getTranscription = function() {
     if(this.state !== FINISHED_STATE) {
         throw new Error(
-            'The transcription can only be retrieved when it\'s in the "'
-                + FINISHED_STATE + '" state. It\'s currently in the "'
-                + this.state + '" state');
+            `The transcription can only be retrieved when it's in the "${
+                 FINISHED_STATE}" state. It's currently in the "${
+                 this.state}" state`);
     }
     return this.transcription;
 };

modules/transcription/transcriptionServices/SphinxTranscriptionService.js

@@ -30,16 +30,17 @@ SphinxService.constructor = SphinxService;
  * @param callback the callback function retrieving the server response
  */
 SphinxService.prototype.sendRequest = function(audioFileBlob, callback) {
-    console.log('sending an audio file  to ' + this.url);
-    console.log('the audio file being sent: ' + audioFileBlob);
+    console.log(`sending an audio file  to ${this.url}`);
+    console.log(`the audio file being sent: ${audioFileBlob}`);
     const request = new XMLHttpRequest();
     request.onreadystatechange = function() {
         if(request.readyState === XMLHttpRequest.DONE
             && request.status === 200) {
             callback(request.responseText);
         } else if (request.readyState === XMLHttpRequest.DONE) {
-            throw new Error('unable to accept response from sphinx server.'
-                + 'status: ' + request.status);
+            throw new Error(
+                `unable to accept response from sphinx server. status: ${
+                    request.status}`);
         }
         // if not ready no point to throw an error
     };
@@ -47,7 +48,7 @@ SphinxService.prototype.sendRequest = function(audioFileBlob, callback) {
     request.setRequestHeader('Content-Type',
         audioRecorder.determineCorrectFileType());
     request.send(audioFileBlob);
-    console.log('send ' + audioFileBlob);
+    console.log(`send ${audioFileBlob}`);
 };
 
 /**
@@ -62,11 +63,10 @@ SphinxService.prototype.formatResponse = function(response) {
     // the first value in the JSON array
     result.shift();
     const array = [];
-    result.forEach(function(word) {
-        if(!word.filler) {
-            array.push(new Word(word.word, word.start, word.end));
-        }
-    });
+    result.forEach(
+        word =>
+            word.filler
+                || array.push(new Word(word.word, word.start, word.end)));
     return array;
 };
 
@@ -76,7 +76,7 @@ SphinxService.prototype.formatResponse = function(response) {
  * @return {boolean} whether the response is valid
  */
 SphinxService.prototype.verify = function(response) {
-    console.log('response from server:' + response.toString());
+    console.log(`response from server:${response.toString()}`);
     // test if server responded with a string object
     if(typeof response !== 'string') {
         return false;
@@ -109,8 +109,7 @@ SphinxService.prototype.verify = function(response) {
  * @returns {string} the URL to the sphinx4 server
  */
 function getURL() {
-    const message = 'config does not contain an url to a '
-    + 'Sphinx4 https server';
+    const message = 'config does not contain an url to a Sphinx4 https server';
     if(config.sphinxURL === undefined) {
         console.log(message);
     } else {

modules/util/UsernameGenerator.js

@@ -433,7 +433,7 @@ function generateUsername() {
     const name = RandomUtil.randomElement(names);
     const suffix = RandomUtil.randomAlphanumStr(3);
 
-    return name + '-' + suffix;
+    return `${name}-${suffix}`;
 }
 
 module.exports = {

modules/version/ComponentsVersions.js

@@ -36,7 +36,6 @@ function ComponentsVersions(conference) {
 
 ComponentsVersions.prototype.processPresence
     = function(node, mucResource, mucJid) {
-
         if (node.attributes.xmlns !== 'http://jitsi.org/jitmeet') {
             logger.warn('Ignored presence versions node - invalid xmlns', node);
             return;
@@ -44,7 +43,8 @@ ComponentsVersions.prototype.processPresence
 
         if (!this.conference._isFocus(mucJid)) {
             logger.warn(
-            'Received versions not from the focus user: ' + node, mucJid);
+                `Received versions not from the focus user: ${node}`,
+                mucJid);
             return;
         }
 
@@ -56,24 +56,25 @@ ComponentsVersions.prototype.processPresence
             && componentName !== ComponentsVersions.XMPP_SERVER_COMPONENT
             && componentName !== ComponentsVersions.VIDEOBRIDGE_COMPONENT) {
                 logger.warn(
-                'Received version for not supported component name: '
-                    + componentName);
+                    `Received version for not supported component name: ${
+                        componentName}`);
                 return;
             }
 
             const version = item.value;
             if (this.versions[componentName] !== version) {
                 this.versions[componentName] = version;
-                logger.info('Got ' + componentName + ' version: ' + version);
+                logger.info(`Got ${componentName} version: ${version}`);
 
                 log.push({
                     id: 'component_version',
                     component: componentName,
-                    version});
+                    version
+                });
             }
         }.bind(this));
 
-    // logs versions to stats
+        // logs versions to stats
         if (log.length > 0) {
             Statistics.sendLog(JSON.stringify(log));
         }

modules/xmpp/Caps.js

@@ -105,7 +105,7 @@ export default class Caps extends Listenable {
         const user
             = jid in this.jidToVersion ? this.jidToVersion[jid] : null;
         if(!user || !(user.version in this.versionToCapabilities)) {
-            const node = user ? user.node + '#' + user.version : null;
+            const node = user ? `${user.node}#${user.version}` : null;
             return new Promise((resolve, reject) =>
                 this.disco.info(jid, node, response => {
                     const features = new Set();
@@ -178,15 +178,15 @@ export default class Caps extends Listenable {
         this.version = b64_sha1(
             identities.reduce(
                     (accumulatedValue, identity) =>
-                        IDENTITY_PROPERTIES.reduce(
+                        `${IDENTITY_PROPERTIES.reduce(
                                 (tmp, key, idx) =>
                                     tmp
                                         + (idx === 0 ? '' : '/')
                                         + identity[key],
                                 '')
-                            + '<',
+                             }<`,
                     '')
-                + features.reduce((tmp, feature) => tmp + feature + '<', ''));
+                + features.reduce((tmp, feature) => `${tmp + feature}<`, ''));
         this._notifyVersionChanged();
     }
 

modules/xmpp/ChatRoom.js

@@ -73,7 +73,7 @@ export default class ChatRoom extends Listenable {
         this.roomjid = Strophe.getBareJidFromJid(jid);
         this.myroomjid = jid;
         this.password = password;
-        logger.info('Joined MUC as ' + this.myroomjid);
+        logger.info(`Joined MUC as ${this.myroomjid}`);
         this.members = {};
         this.presMap = {};
         this.presHandlers = {};
@@ -266,7 +266,7 @@ export default class ChatRoom extends Listenable {
         const jid = mucUserItem.attr('jid');
         member.jid = jid;
         member.isFocus
-            = jid && jid.indexOf(this.moderator.getFocusUserJid() + '/') === 0;
+            = jid && jid.indexOf(`${this.moderator.getFocusUserJid()}/`) === 0;
         member.isHiddenDomain
             = jid && jid.indexOf('@') > 0
                 && this.options.hiddenDomain
@@ -421,7 +421,7 @@ export default class ChatRoom extends Listenable {
                 this.recording.handleJibriPresence(this.lastJibri);
             }
         }
-        logger.info('Ignore focus: ' + from + ', real JID: ' + mucJid);
+        logger.info(`Ignore focus: ${from}, real JID: ${mucJid}`);
     }
 
     /**
@@ -446,7 +446,7 @@ export default class ChatRoom extends Listenable {
             }
         } catch (e) {
             GlobalOnErrorHandler.callErrorHandler(e);
-            logger.error('Error processing:' + node.tagName + ' node.', e);
+            logger.error(`Error processing:${node.tagName} node.`, e);
         }
     }
 
@@ -558,7 +558,7 @@ export default class ChatRoom extends Listenable {
             const subjectText = subject.text();
             if (subjectText || subjectText === '') {
                 this.eventEmitter.emit(XMPPEvents.SUBJECT_CHANGED, subjectText);
-                logger.log('Subject is changed to ' + subjectText);
+                logger.log(`Subject is changed to ${subjectText}`);
             }
         }
 
@@ -572,7 +572,7 @@ export default class ChatRoom extends Listenable {
             if (stamp) {
                 // the format is CCYYMMDDThh:mm:ss
                 const dateParts = stamp.match(/(\d{4})(\d{2})(\d{2}T\d{2}:\d{2}:\d{2})/);
-                stamp = dateParts[1] + '-' + dateParts[2] + '-' + dateParts[3] + 'Z';
+                stamp = `${dateParts[1]}-${dateParts[2]}-${dateParts[3]}Z`;
             }
         }
 
@@ -760,7 +760,7 @@ export default class ChatRoom extends Listenable {
      */
     getMediaPresenceInfo(endpointId, mediaType) {
         // Will figure out current muted status by looking up owner's presence
-        const pres = this.lastPresences[this.roomjid + '/' + endpointId];
+        const pres = this.lastPresences[`${this.roomjid}/${endpointId}`];
         if (!pres) {
             // No presence available
             return null;
@@ -781,7 +781,7 @@ export default class ChatRoom extends Listenable {
                 data.videoType = videoTypeNode[0].value;
             }
         } else {
-            logger.error('Unsupported media type: ' + mediaType);
+            logger.error(`Unsupported media type: ${mediaType}`);
             return null;
         }
 

modules/xmpp/JingleSessionPC.js

@@ -173,12 +173,15 @@ export default class JingleSessionPC extends JingleSession {
                 return;
             }
             const now = window.performance.now();
-            this.room.connectionTimes['ice.state.'
-            + this.peerconnection.iceConnectionState] = now;
-            logger.log('(TIME) ICE ' + this.peerconnection.iceConnectionState
-                + ':\t', now);
+            this.room.connectionTimes[
+                    `ice.state.${this.peerconnection.iceConnectionState}`]
+                = now;
+            logger.log(
+                `(TIME) ICE ${this.peerconnection.iceConnectionState}:\t`,
+                now);
             Statistics.analytics.sendEvent(
-                'ice.' + this.peerconnection.iceConnectionState, {value: now});
+                `ice.${this.peerconnection.iceConnectionState}`,
+                {value: now});
             this.room.eventEmitter.emit(
                 XMPPEvents.ICE_CONNECTION_STATE_CHANGED,
                 this.peerconnection.iceConnectionState);
@@ -314,7 +317,7 @@ export default class JingleSessionPC extends JingleSession {
         this.connection.sendIQ(
             cand, null, this.newJingleErrorHandler(cand, function(error) {
                 GlobalOnErrorHandler.callErrorHandler(
-                    new Error('Jingle error: ' + JSON.stringify(error)));
+                    new Error(`Jingle error: ${JSON.stringify(error)}`));
             }), IQ_TIMEOUT);
     }
 
@@ -323,7 +326,7 @@ export default class JingleSessionPC extends JingleSession {
             const ssrcs
                 = $(content).find(
                     'description>'
-                    + 'source[xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"]');
+                        + 'source[xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"]');
             ssrcs.each((idx, ssrcElement) => {
                 const ssrc = ssrcElement.getAttribute('ssrc');
                 $(ssrcElement)
@@ -396,8 +399,8 @@ export default class JingleSessionPC extends JingleSession {
                     finishedCallback();
                 }, error => {
                     logger.error(
-                        'Error renegotiating after setting new remote offer: '
-                            + error);
+                        `Error renegotiating after setting new remote offer: ${
+                             error}`);
                     JingleSessionPC.onJingleFatalError(this, error);
                     finishedCallback(error);
                 });
@@ -405,13 +408,8 @@ export default class JingleSessionPC extends JingleSession {
         this.modificationQueue.push(
             workFunction,
             error => {
-                if (!error) {
-                    success();
-                } else {
-                    failure(error);
-                }
-            }
-        );
+                error ? failure(error) : success();
+            });
     }
 
     /**
@@ -537,7 +535,10 @@ export default class JingleSessionPC extends JingleSession {
             const mline = SDPUtil.parse_mline(medialines.split('\r\n')[0]);
             transportAccept.c('content',
                 {
-                    creator: this.initiator == this.localJid ? 'initiator' : 'responder',
+                    creator:
+                        this.initiator == this.localJid
+                            ? 'initiator'
+                            : 'responder',
                     name: mline.media
                 }
             );
@@ -651,8 +652,9 @@ export default class JingleSessionPC extends JingleSession {
                     }).get();
 
                     if (ssrcs.length) {
-                        lines += 'a=ssrc-group:' + semantics
-                            + ' ' + ssrcs.join(' ') + '\r\n';
+                        lines
+                            += `a=ssrc-group:${semantics} ${ssrcs.join(' ')
+                                }\r\n`;
                     }
                 });
             // handles both >source and >description>source
@@ -663,19 +665,19 @@ export default class JingleSessionPC extends JingleSession {
                 const ssrc = $(this).attr('ssrc');
                 if (currentRemoteSdp.containsSSRC(ssrc)) {
                     logger.warn(
-                        'Source-add request for existing SSRC: ' + ssrc);
+                        `Source-add request for existing SSRC: ${ssrc}`);
                     return;
                 }
                 $(this).find('>parameter').each(function() {
-                    lines += 'a=ssrc:' + ssrc + ' ' + $(this).attr('name');
+                    lines += `a=ssrc:${ssrc} ${$(this).attr('name')}`;
                     if ($(this).attr('value') && $(this).attr('value').length) {
-                        lines += ':' + $(this).attr('value');
+                        lines += `:${$(this).attr('value')}`;
                     }
                     lines += '\r\n';
                 });
             });
             currentRemoteSdp.media.forEach(function(media, idx) {
-                if (!SDPUtil.find_line(media, 'a=mid:' + name)) {
+                if (!SDPUtil.find_line(media, `a=mid:${name}`)) {
                     return;
                 }
                 if (!addSsrcInfo[idx]) {
@@ -720,8 +722,7 @@ export default class JingleSessionPC extends JingleSession {
                     finishedCallback();
                 }, error => {
                     logger.error(
-                        `Error renegotiating after processing remote source-add:
-                        ${error}`);
+                        `Error renegotiating after processing remote source-add: ${error}`);
                     finishedCallback(error);
                 });
         };
@@ -761,8 +762,7 @@ export default class JingleSessionPC extends JingleSession {
                     finishedCallback();
                 }, error => {
                     logger.error(
-                        'Error renegotiating after processing'
-                            + ' remote source-remove: ' + error);
+                        `Error renegotiating after processing remote source-remove: ${error}`);
                     finishedCallback(error);
                 });
         };
@@ -823,7 +823,7 @@ export default class JingleSessionPC extends JingleSession {
             lines.pop(); // remove empty last element;
             lines.forEach(function(line) {
                 remoteSdp.media[idx]
-                    = remoteSdp.media[idx].replace(line + '\r\n', '');
+                    = remoteSdp.media[idx].replace(`${line}\r\n`, '');
             });
         });
         remoteSdp.raw = remoteSdp.session + remoteSdp.media.join('');
@@ -893,13 +893,16 @@ export default class JingleSessionPC extends JingleSession {
                     logger.debug('Renegotiate: creating answer');
                     this.peerconnection.createAnswer(
                         answer => {
-                            const localUfrag = JingleSessionPC.getUfrag(answer.sdp);
+                            const localUfrag
+                                = JingleSessionPC.getUfrag(answer.sdp);
                             if (localUfrag != this.localUfrag) {
                                 this.localUfrag = localUfrag;
                                 this.room.eventEmitter.emit(
-                                        XMPPEvents.LOCAL_UFRAG_CHANGED, localUfrag);
+                                        XMPPEvents.LOCAL_UFRAG_CHANGED,
+                                        localUfrag);
                             }
-                            logger.debug('Renegotiate: setting local description');
+                            logger.debug(
+                                'Renegotiate: setting local description');
                             this.peerconnection.setLocalDescription(
                                 answer,
                                 () => {
@@ -907,18 +910,16 @@ export default class JingleSessionPC extends JingleSession {
                                 },
                                 error => {
                                     reject(
-                                        'setLocalDescription failed: ' + error);
+                                        `setLocalDescription failed: ${error}`);
                                 }
                             );
                         },
-                        error => {
-                            reject('createAnswer failed: ' + error);
-                        },
+                        error => reject(`createAnswer failed: ${error}`),
                         media_constraints
                     );
                 },
                 error => {
-                    reject('setRemoteDescription failed: ' + error);
+                    reject(`setRemoteDescription failed: ${error}`);
                 }
             );
         });
@@ -969,7 +970,7 @@ export default class JingleSessionPC extends JingleSession {
                         finishedCallback();
                     }, error => {
                         logger.error(
-                            'replaceTrack renegotiation failed: ' + error);
+                            `replaceTrack renegotiation failed: ${error}`);
                         finishedCallback(error);
                     });
             };
@@ -1026,8 +1027,9 @@ export default class JingleSessionPC extends JingleSession {
                     }).get();
 
                     if (ssrcs.length) {
-                        lines += 'a=ssrc-group:' + semantics
-                            + ' ' + ssrcs.join(' ') + '\r\n';
+                        lines
+                            += `a=ssrc-group:${semantics} ${ssrcs.join(' ')
+                                }\r\n`;
                     }
                 });
             const ssrcs = [];
@@ -1040,7 +1042,7 @@ export default class JingleSessionPC extends JingleSession {
                 ssrcs.push(ssrc);
             });
             currentRemoteSdp.media.forEach(function(media, idx) {
-                if (!SDPUtil.find_line(media, 'a=mid:' + name)) {
+                if (!SDPUtil.find_line(media, `a=mid:${name}`)) {
                     return;
                 }
                 if (!removeSsrcInfo[idx]) {
@@ -1048,9 +1050,9 @@ export default class JingleSessionPC extends JingleSession {
                 }
                 ssrcs.forEach(function(ssrc) {
                     const ssrcLines
-                        = SDPUtil.find_lines(media, 'a=ssrc:' + ssrc);
+                        = SDPUtil.find_lines(media, `a=ssrc:${ssrc}`);
                     if (ssrcLines.length) {
-                        removeSsrcInfo[idx] += ssrcLines.join('\r\n') + '\r\n';
+                        removeSsrcInfo[idx] += `${ssrcLines.join('\r\n')}\r\n`;
                     }
                 });
                 removeSsrcInfo[idx] += lines;
@@ -1082,8 +1084,7 @@ export default class JingleSessionPC extends JingleSession {
         const workFunction = finishedCallback => {
             if (!this.peerconnection) {
                 finishedCallback(
-                    'Error: '
-                        + 'tried adding stream with no active peer connection');
+                    'Error: tried adding stream with no active peer connection');
                 return;
             }
             this.addStreamToPeerConnection(stream, ssrcInfo);
@@ -1252,8 +1253,7 @@ export default class JingleSessionPC extends JingleSession {
     notifyMySSRCUpdate(old_sdp, new_sdp) {
 
         if (this.state !== JingleSessionState.ACTIVE) {
-            logger.warn(
-                'Skipping SSRC update in \'' + this.state + ' \' state.');
+            logger.warn(`Skipping SSRC update in '${this.state} ' state.`);
             return;
         }
 
@@ -1276,7 +1276,7 @@ export default class JingleSessionPC extends JingleSession {
                 remove, null,
                 this.newJingleErrorHandler(remove, function(error) {
                     GlobalOnErrorHandler.callErrorHandler(
-                        new Error('Jingle error: ' + JSON.stringify(error)));
+                        new Error(`Jingle error: ${JSON.stringify(error)}`));
                 }), IQ_TIMEOUT);
         } else {
             logger.log('removal not necessary');
@@ -1301,7 +1301,7 @@ export default class JingleSessionPC extends JingleSession {
             this.connection.sendIQ(
                 add, null, this.newJingleErrorHandler(add, function(error) {
                     GlobalOnErrorHandler.callErrorHandler(
-                        new Error('Jingle error: ' + JSON.stringify(error)));
+                        new Error(`Jingle error: ${JSON.stringify(error)}`));
                 }), IQ_TIMEOUT);
         } else {
             logger.log('addition not necessary');
@@ -1448,20 +1448,20 @@ export default class JingleSessionPC extends JingleSession {
         this.modifiedSSRCs.unmute = [];
         if (ssrcs && ssrcs.length) {
             ssrcs.forEach(function(ssrcObj) {
-                const desc = $(jingle.tree()).find('>jingle>content[name="'
-                    + ssrcObj.mtype + '"]>description');
+                const desc
+                    = $(jingle.tree()).find(
+                        `>jingle>content[name="${ssrcObj.mtype}"]>description`);
                 if (!desc || !desc.length) {
                     return;
                 }
                 ssrcObj.ssrcs.forEach(function(ssrc) {
-                    const sourceNode = desc.find('>source[ssrc="'
-                        + ssrc + '"]');
+                    const sourceNode = desc.find(`>source[ssrc="${ssrc}"]`);
                     sourceNode.remove();
                 });
                 ssrcObj.groups.forEach(function(group) {
-                    const groupNode = desc.find('>ssrc-group[semantics="'
-                        + group.semantics + '"]:has(source[ssrc="'
-                        + group.ssrcs[0] + '"])');
+                    const groupNode = desc.find(`>ssrc-group[semantics="${
+                         group.semantics}"]:has(source[ssrc="${
+                         group.ssrcs[0]}"])`);
                     groupNode.remove();
                 });
             });
@@ -1477,31 +1477,29 @@ export default class JingleSessionPC extends JingleSession {
                 const cname = Math.random().toString(36).substring(2);
                 ssrcObj.ssrcs.forEach(function(ssrc) {
                     const sourceNode
-                        = desc.find('>source[ssrc="' + ssrc + '"]');
+                        = desc.find(`>source[ssrc="${ssrc}"]`);
                     sourceNode.remove();
-                    const sourceXML = '<source '
-                        + 'xmlns="urn:xmpp:jingle:apps:rtp:ssma:0" ssrc="'
-                        + ssrc + '">'
+                    const sourceXML
+                        = '<source xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"'
+                        + ` ssrc="${ssrc}">`
                         + '<parameter xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"'
-                        + ' value="' + ssrcObj.msid + '" name="msid"/>'
+                        + ` value="${ssrcObj.msid}" name="msid"/>`
                         + '<parameter xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"'
-                        + ' value="' + cname + '" name="cname" />'
+                        + ` value="${cname}" name="cname" />`
                         + '</source>';
                     desc.append(sourceXML);
                 });
                 ssrcObj.groups.forEach(function(group) {
                     const groupNode
-                        = desc.find('>ssrc-group[semantics="'
-                            + group.semantics + '"]:has(source[ssrc="'
-                            + group.ssrcs[0] + '"])');
+                        = desc.find(
+                            `>ssrc-group[semantics="${group.semantics
+                                }"]:has(source[ssrc="${group.ssrcs[0]}"])`);
                     groupNode.remove();
                     desc.append(
-                        '<ssrc-group semantics="' + group.semantics
-                        + '" xmlns="urn:xmpp:jingle:apps:rtp:ssma:0">'
-                        + '<source ssrc="'
-                            + group.ssrcs.join('"/>' + '<source ssrc="')
-                            + '"/>'
-                        + '</ssrc-group>');
+                        `<ssrc-group semantics="${group.semantics
+                            }" xmlns="urn:xmpp:jingle:apps:rtp:ssma:0">`
+                        + `<source ssrc="${group.ssrcs.join('"/><source ssrc="')
+                            }"/></ssrc-group>`);
                 });
             });
         }
@@ -1520,18 +1518,18 @@ export default class JingleSessionPC extends JingleSession {
             ssrcs.forEach(function(ssrcObj) {
                 ssrcObj.ssrcs.forEach(function(ssrc) {
                     const sourceNode
-                        = $(jingle.tree()).find('>jingle>content[name="'
-                            + ssrcObj.mtype + '"]>description>source[ssrc="'
-                            + ssrc + '"]');
+                        = $(jingle.tree()).find(
+                            `>jingle>content[name="${ssrcObj.mtype
+                                }"]>description>source[ssrc="${ssrc}"]`);
                     sourceNode.remove();
                 });
                 ssrcObj.groups.forEach(function(group) {
                     const groupNode
                         = $(jingle.tree()).find(
-                            '>jingle>content[name="' + ssrcObj.mtype
-                            + '"]>description>ssrc-group[semantics="'
-                            + group.semantics + '"]:has(source[ssrc="'
-                            + group.ssrcs[0] + '"])');
+                            `>jingle>content[name="${ssrcObj.mtype
+                                }"]>description>ssrc-group[semantics="${
+                                group.semantics}"]:has(source[ssrc="${
+                                group.ssrcs[0]}"])`);
                     groupNode.remove();
                 });
             });
@@ -1546,27 +1544,25 @@ export default class JingleSessionPC extends JingleSession {
                         jingle, ssrcObj.mtype);
                 ssrcObj.ssrcs.forEach(function(ssrc) {
                     const sourceNode
-                        = desc.find('>source[ssrc="' + ssrc + '"]');
+                        = desc.find(`>source[ssrc="${ssrc}"]`);
                     if (!sourceNode || !sourceNode.length) {
                         // Maybe we have to include cname, msid, etc here?
                         desc.append(
-                            '<source '
-                            + 'xmlns="urn:xmpp:jingle:apps:rtp:ssma:0" '
-                            + 'ssrc="' + ssrc + '"></source>');
+                            '<source xmlns="urn:xmpp:jingle:apps:rtp:ssma:0" '
+                                + `ssrc="${ssrc}"></source>`);
                     }
                 });
                 ssrcObj.groups.forEach(function(group) {
                     const groupNode
-                        = desc.find('>ssrc-group[semantics="'
-                            + group.semantics + '"]:has(source[ssrc="'
-                            + group.ssrcs[0] + '"])');
+                        = desc.find(`>ssrc-group[semantics="${
+                             group.semantics}"]:has(source[ssrc="${
+                             group.ssrcs[0]}"])`);
                     if (!groupNode || !groupNode.length) {
-                        desc.append('<ssrc-group semantics="'
-                            + group.semantics
-                            + '" xmlns="urn:xmpp:jingle:apps:rtp:ssma:0">'
-                            + '<source ssrc="'
-                                + group.ssrcs.join('"/><source ssrc="')
-                                + '"/>'
+                        desc.append(
+                            `<ssrc-group semantics="${group.semantics
+                                }" xmlns="urn:xmpp:jingle:apps:rtp:ssma:0">`
+                            + `<source ssrc="${
+                                group.ssrcs.join('"/><source ssrc="')}"/>`
                             + '</ssrc-group>');
                     }
                 });
@@ -1581,21 +1577,19 @@ export default class JingleSessionPC extends JingleSession {
      * @param mtype - the content type(audio, video, etc.)
      */
     static createDescriptionNode(jingle, mtype) {
-        let content = $(jingle.tree()).find('>jingle>content[name="'
-            + mtype + '"]');
+        let content = $(jingle.tree()).find(`>jingle>content[name="${mtype}"]`);
 
         if (!content || !content.length) {
             $(jingle.tree()).find('>jingle').append(
-                '<content name="' + mtype + '"></content>');
-            content = $(jingle.tree()).find('>jingle>content[name="'
-                + mtype + '"]');
+                `<content name="${mtype}"></content>`);
+            content = $(jingle.tree()).find(`>jingle>content[name="${mtype}"]`);
         }
 
         let desc = content.find('>description');
         if (!desc || !desc.length) {
-            content.append('<description '
-                + 'xmlns="urn:xmpp:jingle:apps:rtp:1" media="'
-                + mtype + '"></description>');
+            content.append(
+                `<description xmlns="urn:xmpp:jingle:apps:rtp:1" media="${
+                    mtype}"></description>`);
             desc = content.find('>description');
         }
         return desc;
@@ -1605,12 +1599,10 @@ export default class JingleSessionPC extends JingleSession {
      * Extracts the ice username fragment from an SDP string.
      */
     static getUfrag(sdp) {
-        const ufragLines = sdp.split('\n').filter(function(line) {
-            return line.startsWith('a=ice-ufrag:');
-        });
+        const ufragLines
+            = sdp.split('\n').filter(line => line.startsWith('a=ice-ufrag:'));
         if (ufragLines.length > 0) {
             return ufragLines[0].substr('a=ice-ufrag:'.length);
         }
     }
-
 }

modules/xmpp/RtxModifier.js

@@ -58,7 +58,7 @@ function updateAssociatedRtxStream(mLine, primarySsrcInfo, rtxSsrc) {
     });
     mLine.addSSRCGroup({
         semantics: 'FID',
-        ssrcs: primarySsrc + ' ' + rtxSsrc
+        ssrcs: `${primarySsrc} ${rtxSsrc}`
     });
 }
 /**

modules/xmpp/SDP.js

@@ -6,13 +6,13 @@ const SDPUtil = require('./SDPUtil');
 function SDP(sdp) {
     const media = sdp.split('\r\nm=');
     for (let i = 1, length = media.length; i < length; i++) {
-        let media_i = 'm=' + media[i];
+        let media_i = `m=${media[i]}`;
         if (i != length - 1) {
             media_i += '\r\n';
         }
         media[i] = media_i;
     }
-    const session = media.shift() + '\r\n';
+    const session = `${media.shift()}\r\n`;
 
     this.media = media;
     this.raw = session + media.join('');
@@ -122,9 +122,9 @@ SDP.prototype.mangle = function() {
                 }
                 mline.fmt.push(rtpmap.id);
             }
-            newdesc += lines[j] + '\r\n';
+            newdesc += `${lines[j]}\r\n`;
         }
-        this.media[i] = SDPUtil.build_mline(mline) + '\r\n' + newdesc;
+        this.media[i] = `${SDPUtil.build_mline(mline)}\r\n${newdesc}`;
     }
     this.raw = this.session + this.media.join('');
 };
@@ -134,7 +134,7 @@ SDP.prototype.removeSessionLines = function(prefix) {
     const self = this;
     const lines = SDPUtil.find_lines(this.session, prefix);
     lines.forEach(function(line) {
-        self.session = self.session.replace(line + '\r\n', '');
+        self.session = self.session.replace(`${line}\r\n`, '');
     });
     this.raw = this.session + this.media.join('');
     return lines;
@@ -145,7 +145,7 @@ SDP.prototype.removeMediaLines = function(mediaindex, prefix) {
     const self = this;
     const lines = SDPUtil.find_lines(this.media[mediaindex], prefix);
     lines.forEach(function(line) {
-        self.media[mediaindex] = self.media[mediaindex].replace(line + '\r\n', '');
+        self.media[mediaindex] = self.media[mediaindex].replace(`${line}\r\n`, '');
     });
     this.raw = this.session + this.media.join('');
     return lines;
@@ -197,10 +197,10 @@ SDP.prototype.toJingle = function(elem, thecreator) {
                 elem.attrs({ssrc});
             }
             for (j = 0; j < mline.fmt.length; j++) {
-                rtpmap = SDPUtil.find_line(this.media[i], 'a=rtpmap:' + mline.fmt[j]);
+                rtpmap = SDPUtil.find_line(this.media[i], `a=rtpmap:${mline.fmt[j]}`);
                 elem.c('payload-type', SDPUtil.parse_rtpmap(rtpmap));
                 // put any 'a=fmtp:' + mline.fmt[j] lines into <param name=foo value=bar/>
-                const afmtpline = SDPUtil.find_line(this.media[i], 'a=fmtp:' + mline.fmt[j]);
+                const afmtpline = SDPUtil.find_line(this.media[i], `a=fmtp:${mline.fmt[j]}`);
                 if (afmtpline) {
                     tmp = SDPUtil.parse_fmtp(afmtpline);
                     for (k = 0; k < tmp.length; k++) {
@@ -419,7 +419,7 @@ SDP.prototype.transportToJingle = function(mediaindex, elem) {
 };
 
 SDP.prototype.rtcpFbToJingle = function(mediaindex, elem, payloadtype) { // XEP-0293
-    const lines = SDPUtil.find_lines(this.media[mediaindex], 'a=rtcp-fb:' + payloadtype);
+    const lines = SDPUtil.find_lines(this.media[mediaindex], `a=rtcp-fb:${payloadtype}`);
     lines.forEach(function(line) {
         const tmp = SDPUtil.parse_rtcpfb(line);
         if (tmp.type == 'trr-int') {
@@ -449,9 +449,9 @@ SDP.prototype.rtcpFbFromJingle = function(elem, payloadtype) { // XEP-0293
     }
     tmp = elem.find('>rtcp-fb[xmlns="urn:xmpp:jingle:apps:rtp:rtcp-fb:0"]');
     tmp.each(function() {
-        media += 'a=rtcp-fb:' + payloadtype + ' ' + $(this).attr('type');
+        media += `a=rtcp-fb:${payloadtype} ${$(this).attr('type')}`;
         if ($(this).attr('subtype')) {
-            media += ' ' + $(this).attr('subtype');
+            media += ` ${$(this).attr('subtype')}`;
         }
         media += '\r\n';
     });
@@ -472,7 +472,7 @@ SDP.prototype.fromJingle = function(jingle) {
                 return content.getAttribute('name');
             }).get();
             if (contents.length > 0) {
-                self.raw += 'a=group:' + (group.getAttribute('semantics') || group.getAttribute('type')) + ' ' + contents.join(' ') + '\r\n';
+                self.raw += `a=group:${group.getAttribute('semantics') || group.getAttribute('type')} ${contents.join(' ')}\r\n`;
             }
         });
     }
@@ -519,15 +519,15 @@ SDP.prototype.jingle2media = function(content) {
             function() {
                 return this.getAttribute('id');
             }).get();
-        media += SDPUtil.build_mline(tmp) + '\r\n';
+        media += `${SDPUtil.build_mline(tmp)}\r\n`;
     } else {
-        media += 'm=application 1 DTLS/SCTP ' + sctp.attr('number') + '\r\n';
-        media += 'a=sctpmap:' + sctp.attr('number')
-            + ' ' + sctp.attr('protocol');
+        media += `m=application 1 DTLS/SCTP ${sctp.attr('number')}\r\n`;
+        media += `a=sctpmap:${sctp.attr('number')
+             } ${sctp.attr('protocol')}`;
 
         const streamCount = sctp.attr('streams');
         if (streamCount) {
-            media += ' ' + streamCount + '\r\n';
+            media += ` ${streamCount}\r\n`;
         } else {
             media += '\r\n';
         }
@@ -540,18 +540,18 @@ SDP.prototype.jingle2media = function(content) {
     tmp = content.find('>transport[xmlns="urn:xmpp:jingle:transports:ice-udp:1"]');
     if (tmp.length) {
         if (tmp.attr('ufrag')) {
-            media += SDPUtil.build_iceufrag(tmp.attr('ufrag')) + '\r\n';
+            media += `${SDPUtil.build_iceufrag(tmp.attr('ufrag'))}\r\n`;
         }
         if (tmp.attr('pwd')) {
-            media += SDPUtil.build_icepwd(tmp.attr('pwd')) + '\r\n';
+            media += `${SDPUtil.build_icepwd(tmp.attr('pwd'))}\r\n`;
         }
         tmp.find('>fingerprint').each(function() {
             // FIXME: check namespace at some point
-            media += 'a=fingerprint:' + this.getAttribute('hash');
-            media += ' ' + $(this).text();
+            media += `a=fingerprint:${this.getAttribute('hash')}`;
+            media += ` ${$(this).text()}`;
             media += '\r\n';
             if (this.getAttribute('setup')) {
-                media += 'a=setup:' + this.getAttribute('setup') + '\r\n';
+                media += `a=setup:${this.getAttribute('setup')}\r\n`;
             }
         });
     }
@@ -569,7 +569,7 @@ SDP.prototype.jingle2media = function(content) {
         media += 'a=sendrecv\r\n';
         break;
     }
-    media += 'a=mid:' + content.attr('name') + '\r\n';
+    media += `a=mid:${content.attr('name')}\r\n`;
 
     // <description><rtcp-mux/></description>
     // see http://code.google.com/p/libjingle/issues/detail?id=309 -- no spec though
@@ -580,22 +580,22 @@ SDP.prototype.jingle2media = function(content) {
 
     if (desc.find('encryption').length) {
         desc.find('encryption>crypto').each(function() {
-            media += 'a=crypto:' + this.getAttribute('tag');
-            media += ' ' + this.getAttribute('crypto-suite');
-            media += ' ' + this.getAttribute('key-params');
+            media += `a=crypto:${this.getAttribute('tag')}`;
+            media += ` ${this.getAttribute('crypto-suite')}`;
+            media += ` ${this.getAttribute('key-params')}`;
             if (this.getAttribute('session-params')) {
-                media += ' ' + this.getAttribute('session-params');
+                media += ` ${this.getAttribute('session-params')}`;
             }
             media += '\r\n';
         });
     }
     desc.find('payload-type').each(function() {
-        media += SDPUtil.build_rtpmap(this) + '\r\n';
+        media += `${SDPUtil.build_rtpmap(this)}\r\n`;
         if ($(this).find('>parameter').length) {
-            media += 'a=fmtp:' + this.getAttribute('id') + ' ';
+            media += `a=fmtp:${this.getAttribute('id')} `;
             media += $(this).find('parameter').map(function() {
                 return (this.getAttribute('name')
-                        ? this.getAttribute('name') + '=' : '')
+                        ? `${this.getAttribute('name')}=` : '')
                     + this.getAttribute('value');
             }).get().join('; ');
             media += '\r\n';
@@ -610,7 +610,7 @@ SDP.prototype.jingle2media = function(content) {
     // xep-0294
     tmp = desc.find('>rtp-hdrext[xmlns="urn:xmpp:jingle:apps:rtp:rtp-hdrext:0"]');
     tmp.each(function() {
-        media += 'a=extmap:' + this.getAttribute('id') + ' ' + this.getAttribute('uri') + '\r\n';
+        media += `a=extmap:${this.getAttribute('id')} ${this.getAttribute('uri')}\r\n`;
     });
 
     content.find('>transport[xmlns="urn:xmpp:jingle:transports:ice-udp:1"]>candidate').each(function() {
@@ -636,7 +636,7 @@ SDP.prototype.jingle2media = function(content) {
         }).get();
 
         if (ssrcs.length) {
-            media += 'a=ssrc-group:' + semantics + ' ' + ssrcs.join(' ') + '\r\n';
+            media += `a=ssrc-group:${semantics} ${ssrcs.join(' ')}\r\n`;
         }
     });
 
@@ -647,9 +647,9 @@ SDP.prototype.jingle2media = function(content) {
             const name = this.getAttribute('name');
             let value = this.getAttribute('value');
             value = SDPUtil.filter_special_chars(value);
-            media += 'a=ssrc:' + ssrc + ' ' + name;
+            media += `a=ssrc:${ssrc} ${name}`;
             if (value && value.length) {
-                media += ':' + value;
+                media += `:${value}`;
             }
             media += '\r\n';
         });

modules/xmpp/SDPUtil.js

@@ -25,13 +25,13 @@ const SDPUtil = {
         return line.substring(12);
     },
     build_iceufrag(frag) {
-        return 'a=ice-ufrag:' + frag;
+        return `a=ice-ufrag:${frag}`;
     },
     parse_icepwd(line) {
         return line.substring(10);
     },
     build_icepwd(pwd) {
-        return 'a=ice-pwd:' + pwd;
+        return `a=ice-pwd:${pwd}`;
     },
     parse_mid(line) {
         return line.substring(6);
@@ -50,7 +50,7 @@ const SDPUtil = {
         return data;
     },
     build_mline(mline) {
-        return 'm=' + mline.media + ' ' + mline.port + ' ' + mline.proto + ' ' + mline.fmt.join(' ');
+        return `m=${mline.media} ${mline.port} ${mline.proto} ${mline.fmt.join(' ')}`;
     },
     parse_rtpmap(line) {
         const data = {};
@@ -77,9 +77,9 @@ const SDPUtil = {
         return [sctpPort, protocol, streamCount];// SCTP port
     },
     build_rtpmap(el) {
-        let line = 'a=rtpmap:' + el.getAttribute('id') + ' ' + el.getAttribute('name') + '/' + el.getAttribute('clockrate');
+        let line = `a=rtpmap:${el.getAttribute('id')} ${el.getAttribute('name')}/${el.getAttribute('clockrate')}`;
         if (el.getAttribute('channels') && el.getAttribute('channels') != '1') {
-            line += '/' + el.getAttribute('channels');
+            line += `/${el.getAttribute('channels')}`;
         }
         return line;
     },
@@ -153,7 +153,7 @@ const SDPUtil = {
                 candidate.tcptype = elems[i + 1];
                 break;
             default: // TODO
-                logger.log('parse_icecandidate not translating "' + elems[i] + '" = "' + elems[i + 1] + '"');
+                logger.log(`parse_icecandidate not translating "${elems[i]}" = "${elems[i + 1]}"`);
             }
         }
         candidate.network = '1';
@@ -161,7 +161,7 @@ const SDPUtil = {
         return candidate;
     },
     build_icecandidate(cand) {
-        let line = ['a=candidate:' + cand.foundation, cand.component, cand.protocol, cand.priority, cand.ip, cand.port, 'typ', cand.type].join(' ');
+        let line = [`a=candidate:${cand.foundation}`, cand.component, cand.protocol, cand.priority, cand.ip, cand.port, 'typ', cand.type].join(' ');
         line += ' ';
         switch (cand.type) {
         case 'srflx':
@@ -271,7 +271,7 @@ const SDPUtil = {
         // a=candidate:2979166662 1 udp 2113937151 192.168.2.100 57698 typ host generation 0
         //      <candidate component=... foundation=... generation=... id=... ip=... network=... port=... priority=... protocol=... type=.../>
         if (line.indexOf('candidate:') === 0) {
-            line = 'a=' + line;
+            line = `a=${line}`;
         } else if (line.substring(0, 12) != 'a=candidate:') {
             logger.log('parseCandidate called with a line that is not a candidate line');
             logger.log(line);
@@ -313,7 +313,7 @@ const SDPUtil = {
                 candidate.tcptype = elems[i + 1];
                 break;
             default: // TODO
-                logger.log('not translating "' + elems[i] + '" = "' + elems[i + 1] + '"');
+                logger.log(`not translating "${elems[i]}" = "${elems[i + 1]}"`);
             }
         }
         candidate.network = '1';
@@ -342,7 +342,7 @@ const SDPUtil = {
         line += cand.getAttribute('port');
         line += ' ';
         line += 'typ';
-        line += ' ' + cand.getAttribute('type');
+        line += ` ${cand.getAttribute('type')}`;
         line += ' ';
         switch (cand.getAttribute('type')) {
         case 'srflx':
@@ -369,7 +369,7 @@ const SDPUtil = {
         line += 'generation';
         line += ' ';
         line += cand.getAttribute('generation') || '0';
-        return line + '\r\n';
+        return `${line}\r\n`;
     },
 
     /**

modules/xmpp/SdpConsistency.js

@@ -1,9 +1,11 @@
 /* global __filename */
 
 import { getLogger } from 'jitsi-meet-logger';
-import { parsePrimarySSRC,
-         parseSecondarySSRC,
-         SdpTransformWrap } from './SdpTransformUtil';
+import {
+    parsePrimarySSRC,
+    parseSecondarySSRC,
+    SdpTransformWrap
+} from './SdpTransformUtil';
 
 const logger = getLogger(__filename);
 
@@ -89,12 +91,12 @@ export default class SdpConsistency {
             if (!this.cachedPrimarySsrc) {
                 this.cachedPrimarySsrc = newPrimarySsrc;
                 logger.info(
-                    'Sdp-consistency caching primary ssrc '
-                    + this.cachedPrimarySsrc);
+                    `Sdp-consistency caching primary ssrc ${
+                        this.cachedPrimarySsrc}`);
             } else {
                 logger.info(
-                    `Sdp-consistency replacing new ssrc ${newPrimarySsrc} with`
-                        + ` cached ${this.cachedPrimarySsrc}`);
+                    `Sdp-consistency replacing new ssrc ${newPrimarySsrc
+                        } with cached ${this.cachedPrimarySsrc}`);
                 videoMLine.replaceSSRC(
                     newPrimarySsrc, this.cachedPrimarySsrc);
                 for (const group of videoMLine.ssrcGroups) {
@@ -103,8 +105,7 @@ export default class SdpConsistency {
                         const rtxSsrc = parseSecondarySSRC(group);
                         if (primarySsrc === newPrimarySsrc) {
                             group.ssrcs
-                                = this.cachedPrimarySsrc + ' '
-                                    + rtxSsrc;
+                                = `${this.cachedPrimarySsrc} ${rtxSsrc}`;
                         }
                     }
                 }

modules/xmpp/SdpTransformUtil.js

@@ -354,7 +354,7 @@ class MLineWrap {
         }
 
         this.mLine.ssrcGroups = this.mLine.ssrcGroups
-            .filter(groupInfo => groupInfo.ssrcs.indexOf(ssrc + '') === -1);
+            .filter(groupInfo => groupInfo.ssrcs.indexOf(`${ssrc}`) === -1);
     }
 
     /**

modules/xmpp/moderator.js

@@ -46,8 +46,9 @@ function Moderator(roomName, xmpp, emitter, options) {
     function listener(event) {
         if (event.data && event.data.sessionId) {
             if (event.origin !== window.location.origin) {
-                logger.warn('Ignoring sessionId from different origin: '
-                    + event.origin);
+                logger.warn(
+                    `Ignoring sessionId from different origin: ${
+                        event.origin}`);
                 return;
             }
             Settings.setSessionId(event.data.sessionId);
@@ -70,9 +71,8 @@ Moderator.prototype.isSipGatewayEnabled = function() {
     return this.sipGatewayEnabled;
 };
 
-
 Moderator.prototype.onMucMemberLeft = function(jid) {
-    logger.info('Someone left is it focus ? ' + jid);
+    logger.info(`Someone left is it focus ? ${jid}`);
     const resource = Strophe.getResourceFromJid(jid);
     if (resource === 'focus') {
         logger.info(
@@ -81,15 +81,13 @@ Moderator.prototype.onMucMemberLeft = function(jid) {
     }
 };
 
-
 Moderator.prototype.setFocusUserJid = function(focusJid) {
     if (!this.focusUserJid) {
         this.focusUserJid = focusJid;
-        logger.info('Focus jid set to:  ' + this.focusUserJid);
+        logger.info(`Focus jid set to:  ${this.focusUserJid}`);
     }
 };
 
-
 Moderator.prototype.getFocusUserJid = function() {
     return this.focusUserJid;
 };
@@ -99,7 +97,7 @@ Moderator.prototype.getFocusComponent = function() {
     let focusComponent = this.options.connection.hosts.focus;
     // If not specified use default:  'focus.domain'
     if (!focusComponent) {
-        focusComponent = 'focus.' + this.options.connection.hosts.domain;
+        focusComponent = `focus.${this.options.connection.hosts.domain}`;
     }
     return focusComponent;
 };
@@ -112,8 +110,7 @@ Moderator.prototype.createConferenceIq = function() {
     const sessionId = Settings.getSessionId();
     const machineUID = Settings.getMachineId();
 
-    logger.info(
-            'Session ID: ' + sessionId + ' machine UID: ' + machineUID);
+    logger.info(`Session ID: ${sessionId} machine UID: ${machineUID}`);
 
     elem.c('conference', {
         xmlns: 'http://jitsi.org/protocol/focus',
@@ -221,7 +218,7 @@ Moderator.prototype.createConferenceIq = function() {
 Moderator.prototype.parseSessionId = function(resultIq) {
     const sessionId = $(resultIq).find('conference').attr('session-id');
     if (sessionId) {
-        logger.info('Received sessionId:  ' + sessionId);
+        logger.info(`Received sessionId:  ${sessionId}`);
         Settings.setSessionId(sessionId);
     }
 };
@@ -236,14 +233,14 @@ Moderator.prototype.parseConfigOptions = function(resultIq) {
             '>conference>property'
             + '[name=\'authentication\'][value=\'true\']').length > 0;
 
-    logger.info('Authentication enabled: ' + authenticationEnabled);
+    logger.info(`Authentication enabled: ${authenticationEnabled}`);
 
     this.externalAuthEnabled = $(resultIq).find(
             '>conference>property'
             + '[name=\'externalAuth\'][value=\'true\']').length > 0;
 
     logger.info(
-        'External authentication enabled: ' + this.externalAuthEnabled);
+        `External authentication enabled: ${this.externalAuthEnabled}`);
 
     if (!this.externalAuthEnabled) {
         // We expect to receive sessionId in 'internal' authentication mode
@@ -263,7 +260,7 @@ Moderator.prototype.parseConfigOptions = function(resultIq) {
         this.sipGatewayEnabled = true;
     }
 
-    logger.info('Sip gateway enabled:  ' + this.sipGatewayEnabled);
+    logger.info(`Sip gateway enabled:  ${this.sipGatewayEnabled}`);
 };
 
 // FIXME We need to show the fact that we're waiting for the focus to the user
@@ -337,7 +334,7 @@ Moderator.prototype._allocateConferenceFocusError = function(error, callback) {
         return;
     }
     const waitMs = this.getNextErrorTimeout();
-    const errmsg = 'Focus error, retry after ' + waitMs;
+    const errmsg = `Focus error, retry after ${waitMs}`;
     GlobalOnErrorHandler.callErrorHandler(new Error(errmsg));
     logger.error(errmsg, error);
     // Show message
@@ -378,7 +375,7 @@ Moderator.prototype._allocateConferenceFocusSuccess = function(
         callback();
     } else {
         const waitMs = this.getNextTimeout();
-        logger.info('Waiting for the focus... ' + waitMs);
+        logger.info(`Waiting for the focus... ${waitMs}`);
         window.setTimeout(() => this.allocateConferenceFocus(callback),
             waitMs);
     }
@@ -420,7 +417,7 @@ Moderator.prototype._getLoginUrl = function(popup, urlCb, failureCb) {
     let str = 'auth url'; // for logger
     if (popup) {
         attrs.popup = true;
-        str = 'POPUP ' + str;
+        str = `POPUP ${str}`;
     }
     iq.c('login-url', attrs);
     /**
@@ -441,13 +438,13 @@ Moderator.prototype._getLoginUrl = function(popup, urlCb, failureCb) {
             let url = $(result).find('login-url').attr('url');
             url = decodeURIComponent(url);
             if (url) {
-                logger.info('Got ' + str + ': ' + url);
+                logger.info(`Got ${str}: ${url}`);
                 urlCb(url);
             } else {
-                reportError('Failed to get ' + str + ' from the focus', result);
+                reportError(`Failed to get ${str} from the focus`, result);
             }
         },
-        reportError.bind(undefined, 'Get ' + str + ' error')
+        reportError.bind(undefined, `Get ${str} error`)
     );
 };
 
@@ -473,7 +470,7 @@ Moderator.prototype.logout = function(callback) {
             if (logoutUrl) {
                 logoutUrl = decodeURIComponent(logoutUrl);
             }
-            logger.info('Log out OK, url: ' + logoutUrl, result);
+            logger.info(`Log out OK, url: ${logoutUrl}`, result);
             Settings.clearSessionId();
             callback(logoutUrl);
         },

modules/xmpp/recording.js

@@ -102,7 +102,7 @@ Recording.prototype.setRecordingJibri
             'streamid': options.streamId,
         }).up();
 
-        logger.log('Set jibri recording: ' + state, iq.nodeTree);
+        logger.log(`Set jibri recording: ${state}`, iq.nodeTree);
         logger.log(iq.nodeTree);
         this.connection.sendIQ(
         iq,
@@ -142,9 +142,10 @@ Recording.prototype.setRecordingJirecon
             // TODO wait for an IQ with the real status, since this is
             // provisional?
             self.jireconRid = $(result).find('recording').attr('rid');
-            logger.log('Recording '
-                + (state === Recording.status.ON ? 'started' : 'stopped')
-                + '(jirecon)' + result);
+            logger.log(
+                `Recording ${
+                    state === Recording.status.ON ? 'started' : 'stopped'
+                    }(jirecon)${result}`);
             self.state = state;
             if (state === Recording.status.OFF) {
                 self.jireconRid = null;

modules/xmpp/strophe.jingle.js

@@ -39,7 +39,7 @@ class JingleConnectionPlugin extends ConnectionPlugin {
             to: fromJid,
             id: iq.getAttribute('id')
         });
-        logger.log('on jingle ' + action + ' from ' + fromJid, iq);
+        logger.log(`on jingle ${action} from ${fromJid}`, iq);
         let sess = this.sessions[sid];
         if ('session-initiate' != action) {
             if (!sess) {
@@ -178,7 +178,7 @@ class JingleConnectionPlugin extends ConnectionPlugin {
         this.connection.sendIQ(
             $iq({type: 'get', to: this.connection.domain})
                 .c('services', {xmlns: 'urn:xmpp:extdisco:1'})
-                .c('service', {host: 'turn.' + this.connection.domain}),
+                .c('service', {host: `turn.${this.connection.domain}`}),
             res => {
                 const iceservers = [];
                 $(res).find('>services>service').each((idx, el) => {
@@ -187,15 +187,15 @@ class JingleConnectionPlugin extends ConnectionPlugin {
                     const type = el.attr('type');
                     switch (type) {
                     case 'stun':
-                        dict.url = 'stun:' + el.attr('host');
+                        dict.url = `stun:${el.attr('host')}`;
                         if (el.attr('port')) {
-                            dict.url += ':' + el.attr('port');
+                            dict.url += `:${el.attr('port')}`;
                         }
                         iceservers.push(dict);
                         break;
                     case 'turn':
                     case 'turns': {
-                        dict.url = type + ':';
+                        dict.url = `${type}:`;
                         const username = el.attr('username');
                             // https://code.google.com/p/webrtc/issues/detail?id=1508
                         if (username) {
@@ -205,7 +205,7 @@ class JingleConnectionPlugin extends ConnectionPlugin {
                                         navigator.userAgent.match(
                                             /Chrom(e|ium)\/([0-9]+)\./)[2],
                                             10) < 28) {
-                                dict.url += username + '@';
+                                dict.url += `${username}@`;
                             } else {
                                     // only works in M28
                                 dict.username = username;
@@ -214,11 +214,11 @@ class JingleConnectionPlugin extends ConnectionPlugin {
                         dict.url += el.attr('host');
                         const port = el.attr('port');
                         if (port && port != '3478') {
-                            dict.url += ':' + el.attr('port');
+                            dict.url += `:${el.attr('port')}`;
                         }
                         const transport = el.attr('transport');
                         if (transport && transport != 'udp') {
-                            dict.url += '?transport=' + transport;
+                            dict.url += `?transport=${transport}`;
                         }
 
                         dict.credential = el.attr('password')
@@ -246,7 +246,7 @@ class JingleConnectionPlugin extends ConnectionPlugin {
             const pc = session.peerconnection;
             if (pc && pc.updateLog) {
                 // FIXME: should probably be a .dump call
-                data['jingle_' + sid] = {
+                data[`jingle_${sid}`] = {
                     updateLog: pc.updateLog,
                     stats: pc.stats,
                     url: window.location.href

modules/xmpp/strophe.ping.js

@@ -71,8 +71,8 @@ class PingConnectionPlugin extends ConnectionPlugin {
         this.xmpp.caps.getFeatures(jid).then(features =>
             callback(features.has('urn:xmpp:ping')), error => {
             const errmsg = 'Ping feature discovery error';
-            GlobalOnErrorHandler.callErrorHandler(new Error(
-                errmsg + ': ' + error));
+            GlobalOnErrorHandler.callErrorHandler(
+                new Error(`${errmsg}: ${error}`));
             logger.error(errmsg, error);
             callback(false);
         });
@@ -97,7 +97,7 @@ class PingConnectionPlugin extends ConnectionPlugin {
                 this.failedPings = 0;
             }, error => {
                 this.failedPings += 1;
-                const errmsg = 'Ping ' + (error ? 'error' : 'timeout');
+                const errmsg = `Ping ${error ? 'error' : 'timeout'}`;
                 if (this.failedPings >= PING_THRESHOLD) {
                     GlobalOnErrorHandler.callErrorHandler(new Error(errmsg));
                     logger.error(errmsg, error);
@@ -112,7 +112,7 @@ class PingConnectionPlugin extends ConnectionPlugin {
                 }
             }, PING_TIMEOUT);
         }, interval);
-        logger.info('XMPP pings will be sent every ' + interval + ' ms');
+        logger.info(`XMPP pings will be sent every ${interval} ms`);
     }
 
     /**

modules/xmpp/strophe.rayo.js

@@ -51,7 +51,7 @@ class RayoConnectionPlugin extends ConnectionPlugin {
                 const resource = $(result).find('ref').attr('uri');
                 this.call_resource
                     = resource.substr('xmpp:'.length);
-                logger.info('Received call resource: ' + this.call_resource);
+                logger.info(`Received call resource: ${this.call_resource}`);
                 resolve();
             }, error => {
                 logger.info('Dial error ', error);

modules/xmpp/strophe.util.js

@@ -66,17 +66,17 @@ export default function() {
             }
             break;
         case Strophe.LogLevel.WARN:
-            logger.warn('Strophe: ' + msg);
+            logger.warn(`Strophe: ${msg}`);
             const errStatusCapture = lastErrorStatusRegExpr.exec(msg);
             if (errStatusCapture && errStatusCapture.length === 2) {
                 lastErrorStatus = parseInt(errStatusCapture[1]);
                 logger.debug(
-                        'lastErrorStatus set to: ' + lastErrorStatus);
+                        `lastErrorStatus set to: ${lastErrorStatus}`);
             }
             break;
         case Strophe.LogLevel.ERROR:
         case Strophe.LogLevel.FATAL:
-            msg = 'Strophe: ' + msg;
+            msg = `Strophe: ${msg}`;
             GlobalOnErrorHandler.callErrorHandler(new Error(msg));
             logger.error(msg);
             break;

modules/xmpp/xmpp.js

@@ -18,7 +18,7 @@ import Caps from './Caps';
 function createConnection(token, bosh = '/http-bind') {
     // Append token as URL param
     if (token) {
-        bosh += (bosh.indexOf('?') == -1 ? '?' : '&') + 'token=' + token;
+        bosh += `${bosh.indexOf('?') == -1 ? '?' : '&'}token=${token}`;
     }
 
     return new Strophe.Connection(bosh);
@@ -106,15 +106,16 @@ export default class XMPP extends Listenable {
         const now = window.performance.now();
         const statusStr = Strophe.getStatusString(status).toLowerCase();
         this.connectionTimes[statusStr] = now;
-        logger.log('(TIME) Strophe ' + statusStr
-            + (msg ? '[' + msg + ']' : '') + ':\t', now);
+        logger.log(
+            `(TIME) Strophe ${statusStr}${msg ? `[${msg}]` : ''}:\t`,
+            now);
         if (status === Strophe.Status.CONNECTED
             || status === Strophe.Status.ATTACHED) {
             if (this.options.useStunTurn) {
                 this.connection.jingle.getStunAndTurnCredentials();
             }
 
-            logger.info('My Jabber ID: ' + this.connection.jid);
+            logger.info(`My Jabber ID: ${this.connection.jid}`);
 
             // Schedule ping ?
             const pingJid = this.connection.domain;
@@ -124,7 +125,7 @@ export default class XMPP extends Listenable {
                     if (hasPing) {
                         this.connection.ping.startInterval(pingJid);
                     } else {
-                        logger.warn('Ping NOT supported by ' + pingJid);
+                        logger.warn(`Ping NOT supported by ${pingJid}`);
                     }
                 }.bind(this));
 
@@ -238,7 +239,7 @@ export default class XMPP extends Listenable {
      */
     attach(options) {
         const now = this.connectionTimes.attaching = window.performance.now();
-        logger.log('(TIME) Strophe Attaching\t:' + now);
+        logger.log(`(TIME) Strophe Attaching\t:${now}`);
         this.connection.attach(options.jid, options.sid,
             parseInt(options.rid,10) + 1,
             this.connectionHandler.bind(this, options.password));
@@ -268,7 +269,7 @@ export default class XMPP extends Listenable {
     createRoom(roomName, options) {
         // By default MUC nickname is the resource part of the JID
         let mucNickname = Strophe.getNodeFromJid(this.connection.jid);
-        let roomjid = roomName + '@' + this.options.hosts.muc + '/';
+        let roomjid = `${roomName}@${this.options.hosts.muc}/`;
         const cfgNickname
             = options.useNicks && options.nick ? options.nick : null;
 
@@ -282,7 +283,7 @@ export default class XMPP extends Listenable {
         // Constant JIDs need some random part to be appended in order to be
         // able to join the MUC more than once.
         if (this.authenticatedUser || cfgNickname !== null) {
-            mucNickname += '-' + RandomUtil.randomHexString(6);
+            mucNickname += `-${RandomUtil.randomHexString(6)}`;
         }
 
         roomjid += mucNickname;

webpack.config.js

@@ -42,7 +42,7 @@ module.exports = {
                 flags: 'g',
                 replace:
                     child_process.execSync( // eslint-disable-line camelcase
-                            __dirname + '/get-version.sh')
+                            `${__dirname}/get-version.sh`)
 
                         // The type of the return value of
                         // child_process.execSync is either Buffer or String.
@@ -53,13 +53,13 @@ module.exports = {
                             .trim(),
                 search: '{#COMMIT_HASH#}'
             },
-            test: __dirname + '/JitsiMeetJS.js'
+            test: `${__dirname}/JitsiMeetJS.js`
         }, {
             // Transpile ES2015 (aka ES6) to ES5.
 
             exclude: [
-                __dirname + '/modules/RTC/adapter.screenshare.js',
-                __dirname + '/node_modules/'
+                `${__dirname}/modules/RTC/adapter.screenshare.js`,
+                `${__dirname}/node_modules/`
             ],
             loader: 'babel-loader',
             query: {
@@ -77,10 +77,10 @@ module.exports = {
         __filename: true
     },
     output: {
-        filename: '[name]' + (minimize ? '.min' : '') + '.js',
+        filename: `[name]${minimize ? '.min' : ''}.js`,
         library: 'JitsiMeetJS',
         libraryTarget: 'umd',
-        sourceMapFilename: '[name].' + (minimize ? 'min' : 'js') + '.map'
+        sourceMapFilename: `[name].${minimize ? 'min' : 'js'}.map`
     },
     plugins
 };