ref(SDP) Convert to ES6 class. (#2572)

* ref(SDP) Convert to ES6 class.

* ref(SDP) Use enum for URNs associated with XMPP extensions.

* ref(XMPP) Replace more XEP URN constants with enum.

* fix(RTC) Fixes mediaType lookup based on source-name.

modules/sdp/SDPDiffer.js

@@ -1,4 +1,6 @@
 
+import { XEP } from '../../service/xmpp/XMPPExtensioProtocols';
+
 import SDPUtil from './SDPUtil';
 
 // this could be useful in Array.prototype.
@@ -159,9 +161,10 @@ SDPDiffer.prototype.toJingle = function(modify) {
 
         modify.c('content', { name: media.mid });
 
-        modify.c('description',
-            { xmlns: 'urn:xmpp:jingle:apps:rtp:1',
-                media: media.mid });
+        modify.c('description', {
+            xmlns: XEP.RTP_MEDIA,
+            media: media.mid
+        });
 
         // FIXME: not completely sure this operates on blocks and / or handles
         // different ssrcs correctly
@@ -172,7 +175,7 @@ SDPDiffer.prototype.toJingle = function(modify) {
             const sourceName = SDPUtil.parseSourceNameLine(ssrcLines);
             const videoType = SDPUtil.parseVideoTypeLine(ssrcLines);
 
-            modify.c('source', { xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0' });
+            modify.c('source', { xmlns: XEP.SOURCE_ATTRIBUTES });
             modify.attrs({
                 name: sourceName,
                 videoType,
@@ -198,7 +201,7 @@ SDPDiffer.prototype.toJingle = function(modify) {
 
                 modify.c('ssrc-group', {
                     semantics: ssrcGroup.semantics,
-                    xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0'
+                    xmlns: XEP.SOURCE_ATTRIBUTES
                 });
 
                 ssrcGroup.ssrcs.forEach(ssrc => {

modules/xmpp/JingleHelperFunctions.js

@@ -4,6 +4,7 @@ import $ from 'jquery';
 import { $build } from 'strophe.js';
 
 import { MediaType } from '../../service/RTC/MediaType';
+import { XEP } from '../../service/xmpp/XMPPExtensioProtocols';
 
 const logger = getLogger(__filename);
 
@@ -15,7 +16,7 @@ const logger = getLogger(__filename);
  */
 function _createSourceExtension(owner, sourceCompactJson) {
     const node = $build('source', {
-        xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0',
+        xmlns: XEP.SOURCE_ATTRIBUTES,
         ssrc: sourceCompactJson.s,
         name: sourceCompactJson.n
     });
@@ -41,13 +42,13 @@ function _createSourceExtension(owner, sourceCompactJson) {
  */
 function _createSsrcGroupExtension(ssrcGroupCompactJson) {
     const node = $build('ssrc-group', {
-        xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0',
+        xmlns: XEP.SOURCE_ATTRIBUTES,
         semantics: _getSemantics(ssrcGroupCompactJson[0])
     });
 
     for (let i = 1; i < ssrcGroupCompactJson.length; i++) {
         node.c('source', {
-            xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0',
+            xmlns: XEP.SOURCE_ATTRIBUTES,
             ssrc: ssrcGroupCompactJson[i]
         }).up();
     }
@@ -83,7 +84,7 @@ function _getOrCreateRtpDescription(iq, mediaType) {
         description = description[0];
     } else {
         description = $build('description', {
-            xmlns: 'urn:xmpp:jingle:apps:rtp:1',
+            xmlns: XEP.RTP_MEDIA,
             media: mediaType
         }).node;
         content.appendChild(description);

modules/xmpp/JingleSessionPC.js

@@ -13,6 +13,7 @@ import {
     VIDEO_CODEC_CHANGED
 } from '../../service/statistics/AnalyticsEvents';
 import { XMPPEvents } from '../../service/xmpp/XMPPEvents';
+import { XEP } from '../../service/xmpp/XMPPExtensioProtocols';
 import { SS_DEFAULT_FRAME_RATE } from '../RTC/ScreenObtainer';
 import FeatureFlags from '../flags/FeatureFlags';
 import SDP from '../sdp/SDP';
@@ -68,7 +69,7 @@ function getEndpointId(jidOrEndpointId) {
 function _addSourceElement(description, s, ssrc_, msid) {
 
     description.c('source', {
-        xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0',
+        xmlns: XEP.SOURCE_ATTRIBUTES,
         ssrc: ssrc_,
         name: s.source
     })
@@ -713,7 +714,7 @@ export default class JingleSessionPC extends JingleSession {
 
                 return;
             }
-            ice.xmlns = 'urn:xmpp:jingle:transports:ice-udp:1';
+            ice.xmlns = XEP.ICE_UDP_TRANSPORT;
 
             if (this.usedrip) {
                 if (this.dripContainer.length === 0) {
@@ -768,7 +769,7 @@ export default class JingleSessionPC extends JingleSession {
                 const ice
                     = SDPUtil.iceparams(localSDP.media[mid], localSDP.session);
 
-                ice.xmlns = 'urn:xmpp:jingle:transports:ice-udp:1';
+                ice.xmlns = XEP.ICE_UDP_TRANSPORT;
                 cand.c('content', {
                     creator: this.initiatorJid === this.localJid
                         ? 'initiator' : 'responder',
@@ -1834,7 +1835,7 @@ export default class JingleSessionPC extends JingleSession {
                 xmlns: 'urn:xmpp:jingle:1',
                 name: mediaType
             }).c('description', {
-                xmlns: 'urn:xmpp:jingle:apps:rtp:1',
+                xmlns: XEP.RTP_MEDIA,
                 media: mediaType
             });
 
@@ -1850,16 +1851,16 @@ export default class JingleSessionPC extends JingleSession {
                     if (rtx !== '-1') {
                         _addSourceElement(node, src, rtx, msid);
                         node.c('ssrc-group', {
-                            xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0',
+                            xmlns: XEP.SOURCE_ATTRIBUTES,
                             semantics: 'FID'
                         })
                             .c('source', {
-                                xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0',
+                                xmlns: XEP.SOURCE_ATTRIBUTES,
                                 ssrc
                             })
                             .up()
                             .c('source', {
-                                xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0',
+                                xmlns: XEP.SOURCE_ATTRIBUTES,
                                 ssrc: rtx
                             })
                             .up()

modules/xmpp/xmpp.js

@@ -7,6 +7,7 @@ import 'strophejs-plugin-disco';
 import * as JitsiConnectionErrors from '../../JitsiConnectionErrors';
 import * as JitsiConnectionEvents from '../../JitsiConnectionEvents';
 import { XMPPEvents } from '../../service/xmpp/XMPPEvents';
+import { XEP } from '../../service/xmpp/XMPPExtensioProtocols';
 import browser from '../browser';
 import { E2EEncryption } from '../e2ee/E2EEncryption';
 import FeatureFlags from '../flags/FeatureFlags';
@@ -218,13 +219,13 @@ export default class XMPP extends Listenable {
     initFeaturesList() {
         // http://xmpp.org/extensions/xep-0167.html#support
         // http://xmpp.org/extensions/xep-0176.html#support
-        this.caps.addFeature('urn:xmpp:jingle:1');
-        this.caps.addFeature('urn:xmpp:jingle:apps:rtp:1');
-        this.caps.addFeature('urn:xmpp:jingle:transports:ice-udp:1');
-        this.caps.addFeature('urn:xmpp:jingle:apps:dtls:0');
-        this.caps.addFeature('urn:xmpp:jingle:transports:dtls-sctp:1');
-        this.caps.addFeature('urn:xmpp:jingle:apps:rtp:audio');
-        this.caps.addFeature('urn:xmpp:jingle:apps:rtp:video');
+        this.caps.addFeature(XEP.JINGLE);
+        this.caps.addFeature(XEP.RTP_MEDIA);
+        this.caps.addFeature(XEP.ICE_UDP_TRANSPORT);
+        this.caps.addFeature(XEP.DTLS_SRTP);
+        this.caps.addFeature(XEP.SCTP_DATA_CHANNEL);
+        this.caps.addFeature(XEP.RTP_AUDIO);
+        this.caps.addFeature(XEP.RTP_VIDEO);
         this.caps.addFeature('http://jitsi.org/json-encoded-sources');
 
         if (!(this.options.disableRtx || !browser.supportsRTX())) {

service/RTC/MediaType.ts

@@ -7,5 +7,10 @@ export enum MediaType {
     /**
      * The video type.
      */
-    VIDEO = 'video'
+    VIDEO = 'video',
+
+    /**
+     * The application type (data over bridge channel).
+     */
+    APPLICATION = 'application'
 }

service/xmpp/XMPPExtensioProtocols.ts

@@ -0,0 +1,74 @@
+
+export enum XEP {
+    /**
+     * XEP-0338 - Signals the usage of bundled media, i.e., allows the use of a single set of ICE candidates for
+     * multiple media descriptions.
+     * https://xmpp.org/extensions/attic/xep-0338-1.0.0.html
+     */
+    BUNDLE_MEDIA = 'urn:xmpp:jingle:apps:grouping:0',
+
+    /**
+     * XEP-0320 - Signals the use of DTLS-SRTP in Jingle session.
+     * https://xmpp.org/extensions/xep-0320.html
+     */
+    DTLS_SRTP = 'urn:xmpp:jingle:apps:dtls:0',
+
+    /**
+     * XEP-0176 - Signaling ICE-UDP transport method.
+     * https://xmpp.org/extensions/xep-0176.html
+     */
+    ICE_UDP_TRANSPORT = 'urn:xmpp:jingle:transports:ice-udp:1',
+
+    /**
+     * XEP-0166 - Jingle.
+     * https://xmpp.org/extensions/xep-0166.html
+     */
+    JINGLE = 'urn:xmpp:jingle:1',
+
+    /**
+     * XEP-0327 - Rayo for allowing third-party control over media sessions.
+     */
+    RAYO = 'urn:xmpp:rayo:client:1',
+
+    /**
+     * XEP-0167 - Signals support for RTP audio.
+     * https://xmpp.org/extensions/xep-0167.html#support
+     */
+    RTP_AUDIO = 'urn:xmpp:jingle:apps:rtp:audio',
+
+    /**
+     * XEP-0293 - Signals the use of RTP Feedback Negotiation.
+     * https://xmpp.org/extensions/xep-0293.html
+     */
+    RTP_FEEDBACK = 'urn:xmpp:jingle:apps:rtp:rtcp-fb:0',
+
+    /**
+     * XEP-0167 - Signals support for RTP video.
+     * https://xmpp.org/extensions/xep-0167.html#support
+     */
+    RTP_VIDEO = 'urn:xmpp:jingle:apps:rtp:video',
+
+    /**
+     * XEP-0294 - Signals the use of RTP Header Extensions.
+     * https://xmpp.org/extensions/xep-0294.html
+     */
+    RTP_HEADER_EXTENSIONS = 'urn:xmpp:jingle:apps:rtp:rtp-hdrext:0',
+
+    /**
+     * XEP-0167 - Signals parameters necessary for media sessions using RTP.
+     * https://xmpp.org/extensions/xep-0167.html
+     */
+    RTP_MEDIA = 'urn:xmpp:jingle:apps:rtp:1',
+
+    /**
+     * XEP-0343 - Signaling WebRTC datachannels (bridge channel) in Jingle that uses DTLS/SCTP on top of ICE.
+     * https://xmpp.org/extensions/xep-0343.html
+     */
+    SCTP_DATA_CHANNEL = 'urn:xmpp:jingle:transports:dtls-sctp:1',
+
+    /**
+     * XEP-0339 - Signals Source-Specific Media Attributes in Jingle.
+     * https://xmpp.org/extensions/xep-0339.html
+     */
+    SOURCE_ATTRIBUTES = 'urn:xmpp:jingle:apps:rtp:ssma:0'
+}