fix(RTC): Use a enum for media direction.

modules/RTC/TPCUtils.js

@@ -1,6 +1,7 @@
 import { getLogger } from 'jitsi-meet-logger';
 import transform from 'sdp-transform';
 
+import MediaDirection from '../../service/RTC/MediaDirection';
 import * as MediaType from '../../service/RTC/MediaType';
 import browser from '../browser';
 
@@ -9,13 +10,6 @@ const SIM_LAYER_1_RID = '1';
 const SIM_LAYER_2_RID = '2';
 const SIM_LAYER_3_RID = '3';
 
-const TransceiverDirection = {
-    INACTIVE: 'inactive',
-    RECVONLY: 'recvonly',
-    SENDONLY: 'sendonly',
-    SENDRECV: 'sendrecv'
-};
-
 export const SIM_LAYER_RIDS = [ SIM_LAYER_1_RID, SIM_LAYER_2_RID, SIM_LAYER_3_RID ];
 
 /**
@@ -234,7 +228,7 @@ export class TPCUtils {
             // Use pc.addTransceiver() for the initiator case when local tracks are getting added
             // to the peerconnection before a session-initiate is sent over to the peer.
             const transceiverInit = {
-                direction: TransceiverDirection.SENDRECV,
+                direction: MediaDirection.SENDRECV,
                 streams: [ localTrack.getOriginalStream() ],
                 sendEncodings: []
             };
@@ -264,7 +258,7 @@ export class TPCUtils {
         if (!transceiver) {
             return Promise.reject(new Error(`RTCRtpTransceiver for ${mediaType} not found`));
         }
-        logger.debug(`Adding ${localTrack} on ${this.pc}`);
+        logger.debug(`${this.pc} Adding ${localTrack}`);
 
         return transceiver.sender.replaceTrack(track);
     }
@@ -308,7 +302,7 @@ export class TPCUtils {
             return Promise.reject(new Error(`RTCRtpTransceiver for ${mediaType} not found`));
         }
 
-        logger.debug(`Removing ${localTrack} on ${this.pc}`);
+        logger.debug(`${this.pc} Removing ${localTrack}`);
 
         return transceiver.sender.replaceTrack(null);
     }
@@ -341,7 +335,7 @@ export class TPCUtils {
             if (!transceiver) {
                 return Promise.reject(new Error('replace track failed'));
             }
-            logger.debug(`Replacing ${oldTrack} with ${newTrack} on ${this.pc}`);
+            logger.debug(`${this.pc} Replacing ${oldTrack} with ${newTrack}`);
 
             return transceiver.sender.replaceTrack(track)
                 .then(() => {
@@ -364,7 +358,7 @@ export class TPCUtils {
                     // Change the direction on the transceiver to 'recvonly' so that a 'removetrack'
                     // is fired on the associated media stream on the remote peer.
                     if (transceiver) {
-                        transceiver.direction = TransceiverDirection.RECVONLY;
+                        transceiver.direction = MediaDirection.RECVONLY;
                     }
 
                     // Remove the old track from the list of local tracks.
@@ -380,7 +374,7 @@ export class TPCUtils {
                     // Change the direction on the transceiver back to 'sendrecv' so that a 'track'
                     // event is fired on the remote peer.
                     if (transceiver) {
-                        transceiver.direction = TransceiverDirection.SENDRECV;
+                        transceiver.direction = MediaDirection.SENDRECV;
                     }
 
                     // Avoid configuring the encodings on Chromium/Safari until simulcast is configured
@@ -397,7 +391,7 @@ export class TPCUtils {
                 });
         }
 
-        logger.info('TPCUtils.replaceTrack called with no new track and no old track');
+        logger.info(`${this.pc} TPCUtils.replaceTrack called with no new track and no old track`);
 
         return Promise.resolve();
     }
@@ -450,17 +444,17 @@ export class TPCUtils {
             .filter(t => t.receiver && t.receiver.track && t.receiver.track.kind === mediaType);
         const localTracks = this.pc.getLocalTracks(mediaType);
 
-        logger.info(`${active ? 'Enabling' : 'Suspending'} ${mediaType} media transfer on ${this.pc}`);
+        logger.info(`${this.pc} ${active ? 'Enabling' : 'Suspending'} ${mediaType} media transfer.`);
         transceivers.forEach((transceiver, idx) => {
             if (active) {
                 // The first transceiver is for the local track and only this one can be set to 'sendrecv'
                 if (idx === 0 && localTracks.length) {
-                    transceiver.direction = TransceiverDirection.SENDRECV;
+                    transceiver.direction = MediaDirection.SENDRECV;
                 } else {
-                    transceiver.direction = TransceiverDirection.RECVONLY;
+                    transceiver.direction = MediaDirection.RECVONLY;
                 }
             } else {
-                transceiver.direction = TransceiverDirection.INACTIVE;
+                transceiver.direction = MediaDirection.INACTIVE;
             }
         });
     }

modules/sdp/LocalSdpMunger.js

@@ -2,6 +2,7 @@
 
 import { getLogger } from 'jitsi-meet-logger';
 
+import MediaDirection from '../../service/RTC/MediaDirection';
 import * as MediaType from '../../service/RTC/MediaType';
 
 import { SdpTransformWrap } from './SdpTransformUtil';
@@ -101,7 +102,7 @@ export default class LocalSdpMunger {
             // NOTE the SDP produced here goes only to Jicofo and is never set
             // as localDescription. That's why
             // TraceablePeerConnection.mediaTransferActive is ignored here.
-            videoMLine.direction = 'sendrecv';
+            videoMLine.direction = MediaDirection.SENDRECV;
 
             // Check if the recvonly has MSID
             const primarySSRC = requiredSSRCs[0];
@@ -224,14 +225,14 @@ export default class LocalSdpMunger {
 
         if (!this.tpc.isP2P
             && (!msid
-                || mediaSection.mLine?.direction === 'recvonly'
-                || mediaSection.mLine?.direction === 'inactive')) {
+                || mediaSection.mLine?.direction === MediaDirection.RECVONLY
+                || mediaSection.mLine?.direction === MediaDirection.INACTIVE)) {
             mediaSection.ssrcs = undefined;
             mediaSection.ssrcGroups = undefined;
 
         // Add the msid attribute if it is missing for p2p sources. Firefox doesn't produce a a=ssrc line
         // with msid attribute.
-        } else if (this.tpc.isP2P && mediaSection.mLine?.direction === 'sendrecv') {
+        } else if (this.tpc.isP2P && mediaSection.mLine?.direction === MediaDirection.SENDRECV) {
             const msidLine = mediaSection.mLine?.msid;
             const trackId = msidLine && msidLine.split(' ')[1];
             const sources = [ ...new Set(mediaSection.mLine?.ssrcs?.map(s => s.id)) ];

modules/sdp/SDP.js

@@ -1,5 +1,6 @@
 /* global $ */
 
+import MediaDirection from '../../service/RTC/MediaDirection';
 import browser from '../browser';
 
 import SDPUtil from './SDPUtil';
@@ -304,16 +305,16 @@ SDP.prototype.toJingle = function(elem, thecreator) {
 
                     // eslint-disable-next-line max-depth
                     switch (extmap.direction) {
-                    case 'sendonly':
+                    case MediaDirection.SENDONLY:
                         elem.attrs({ senders: 'responder' });
                         break;
-                    case 'recvonly':
+                    case MediaDirection.RECVONLY:
                         elem.attrs({ senders: 'initiator' });
                         break;
-                    case 'sendrecv':
+                    case MediaDirection.SENDRECV:
                         elem.attrs({ senders: 'both' });
                         break;
-                    case 'inactive':
+                    case MediaDirection.INACTIVE:
                         elem.attrs({ senders: 'none' });
                         break;
                     }
@@ -330,13 +331,13 @@ SDP.prototype.toJingle = function(elem, thecreator) {
 
         const m = this.media[i];
 
-        if (SDPUtil.findLine(m, 'a=sendrecv', this.session)) {
+        if (SDPUtil.findLine(m, `a=${MediaDirection.SENDRECV}`, this.session)) {
             elem.attrs({ senders: 'both' });
-        } else if (SDPUtil.findLine(m, 'a=sendonly', this.session)) {
+        } else if (SDPUtil.findLine(m, `a=${MediaDirection.SENDONLY}`, this.session)) {
             elem.attrs({ senders: 'initiator' });
-        } else if (SDPUtil.findLine(m, 'a=recvonly', this.session)) {
+        } else if (SDPUtil.findLine(m, `a=${MediaDirection.RECVONLY}`, this.session)) {
             elem.attrs({ senders: 'responder' });
-        } else if (SDPUtil.findLine(m, 'a=inactive', this.session)) {
+        } else if (SDPUtil.findLine(m, `a=${MediaDirection.INACTIVE}`, this.session)) {
             elem.attrs({ senders: 'none' });
         }
 
@@ -631,16 +632,16 @@ SDP.prototype.jingle2media = function(content) {
 
     switch (content.attr('senders')) {
     case 'initiator':
-        sdp += 'a=sendonly\r\n';
+        sdp += `a=${MediaDirection.SENDONLY}\r\n`;
         break;
     case 'responder':
-        sdp += 'a=recvonly\r\n';
+        sdp += `a=${MediaDirection.RECVONLY}\r\n`;
         break;
     case 'none':
-        sdp += 'a=inactive\r\n';
+        sdp += `a=${MediaDirection.INACTIVE}\r\n`;
         break;
     case 'both':
-        sdp += 'a=sendrecv\r\n';
+        sdp += `a=${MediaDirection.SENDRECV}\r\n`;
         break;
     }
     sdp += `a=mid:${content.attr('name')}\r\n`;

modules/sdp/SDPUtil.js

@@ -2,6 +2,7 @@ import { getLogger } from 'jitsi-meet-logger';
 const logger = getLogger(__filename);
 
 import CodecMimeType from '../../service/RTC/CodecMimeType';
+import MediaDirection from '../../service/RTC/MediaDirection';
 import browser from '../browser';
 import RandomUtil from '../util/RandomUtil';
 
@@ -657,7 +658,7 @@ const SDPUtil = {
             if (keepPts.length === 0) {
                 // There are no other codecs, disable the stream.
                 mLine.port = 0;
-                mLine.direction = 'inactive';
+                mLine.direction = MediaDirection.INACTIVE;
                 mLine.payloads = '*';
             } else {
                 mLine.payloads = keepPts.join(' ');

service/RTC/MediaDirection.js

@@ -0,0 +1,28 @@
+/* global module */
+/**
+ * Enumeration of the media direction types.
+ * @type {{INACTIVE: string, RECVONLY: string, SENDONLY: string, SENDRECV: string}}
+ */
+const MediaDirection = {
+    /**
+     * Media is send and receive is suspended.
+     */
+    INACTIVE: 'inactive',
+
+    /**
+     * Media is only received from remote peer.
+     */
+    RECVONLY: 'recvonly',
+
+    /**
+     * Media is only sent to the remote peer.
+     */
+    SENDONLY: 'sendonly',
+
+    /**
+     * Media is sent and received.
+     */
+    SENDRECV: 'sendrecv'
+};
+
+module.exports = MediaDirection;