From ddad33189de7065e43ceb1f31cd100cf4b6f904d Mon Sep 17 00:00:00 2001 From: hristoterezov Date: Wed, 4 Nov 2015 14:31:16 -0600 Subject: [PATCH] Updates versions in package json. --- lib-jitsi-meet.js | 1554 ++++++++++++++++++++++++++------------------- package.json | 2 +- 2 files changed, 904 insertions(+), 652 deletions(-) diff --git a/lib-jitsi-meet.js b/lib-jitsi-meet.js index 0224833cc..37978e011 100644 --- a/lib-jitsi-meet.js +++ b/lib-jitsi-meet.js @@ -43,7 +43,7 @@ function JitsiConference(options) { */ JitsiConference.prototype.join = function (password) { if(this.room) - this.room.join(password); + this.room.join(password, this.connection.tokenPassword); } /** @@ -316,7 +316,7 @@ function setupListeners(conference) { module.exports = JitsiConference; -},{"./JitsiConferenceEvents":3,"./JitsiParticipant":8,"./modules/RTC/RTC":13,"./modules/statistics/statistics":21,"./service/RTC/RTCEvents":77,"./service/RTC/StreamEventTypes":79,"./service/xmpp/XMPPEvents":83,"events":39}],2:[function(require,module,exports){ +},{"./JitsiConferenceEvents":3,"./JitsiParticipant":8,"./modules/RTC/RTC":13,"./modules/statistics/statistics":21,"./service/RTC/RTCEvents":73,"./service/RTC/StreamEventTypes":75,"./service/xmpp/XMPPEvents":79,"events":39}],2:[function(require,module,exports){ /** * Enumeration with the errors for the conference. * @type {{string: string}} @@ -422,19 +422,33 @@ module.exports = JitsiConferenceEvents; },{}],4:[function(require,module,exports){ var JitsiConference = require("./JitsiConference"); var XMPP = require("./modules/xmpp/xmpp"); +var RandomUtil = require("./modules/util/RandomUtil"); + +/** + * Utility method that generates user name based on random hex values. + * Eg. 12345678-1234-1234-12345678 + * @returns {string} + */ +function generateUserName() { + return RandomUtil.random8digitsHex() + "-" + RandomUtil.random4digitsHex() + "-" + + RandomUtil.random4digitsHex() + "-" + RandomUtil.random8digitsHex(); +} /** * Creates new connection object for the Jitsi Meet server side video conferencing service. Provides access to the * JitsiConference interface. * @param appID identification for the provider of Jitsi Meet video conferencing services. - * @param token secret generated by the provider of Jitsi Meet video conferencing services. + * @param tokenPassword secret generated by the provider of Jitsi Meet video conferencing services. * The token will be send to the provider from the Jitsi Meet server deployment for authorization of the current client. + * The format is: + * passwordToken = token + "_" + roomName + "_" + ts + * See doc/tokens.md for more info on how tokens are generated. * @param options Object with properties / settings related to connection with the server. * @constructor */ -function JitsiConnection(appID, token, options) { +function JitsiConnection(appID, tokenPassword, options) { this.appID = appID; - this.token = token; + this.tokenPassword = tokenPassword; this.options = options; this.xmpp = new XMPP(options); this.conferences = {}; @@ -447,6 +461,15 @@ function JitsiConnection(appID, token, options) { JitsiConnection.prototype.connect = function (options) { if(!options) options = {}; + + // If we have token provided use it as a password and generate random username + if (this.tokenPassword) { + options.password = this.tokenPassword; + if (!options.id) { + options.id = generateUserName() + "@" + this.options.hosts.domain; + } + } + this.xmpp.connect(options.id, options.password); } @@ -496,7 +519,7 @@ JitsiConnection.prototype.removeEventListener = function (event, listener) { module.exports = JitsiConnection; -},{"./JitsiConference":1,"./modules/xmpp/xmpp":37}],5:[function(require,module,exports){ +},{"./JitsiConference":1,"./modules/util/RandomUtil":22,"./modules/xmpp/xmpp":37}],5:[function(require,module,exports){ /** * Enumeration with the errors for the connection. * @type {{string: string}} @@ -902,7 +925,7 @@ DataChannels.prototype.handlePinnedEndpointEvent = function (userResource) { module.exports = DataChannels; -},{"../../service/RTC/RTCEvents":77}],10:[function(require,module,exports){ +},{"../../service/RTC/RTCEvents":73}],10:[function(require,module,exports){ var JitsiTrack = require("./JitsiTrack"); var StreamEventTypes = require("../../service/RTC/StreamEventTypes"); var RTC = require("./RTCUtils"); @@ -1057,7 +1080,7 @@ JitsiLocalTrack.prototype.isMuted = function () { module.exports = JitsiLocalTrack; -},{"../../service/RTC/StreamEventTypes":79,"./JitsiTrack":12,"./RTCBrowserType":14,"./RTCUtils":15}],11:[function(require,module,exports){ +},{"../../service/RTC/StreamEventTypes":75,"./JitsiTrack":12,"./RTCBrowserType":14,"./RTCUtils":15}],11:[function(require,module,exports){ var JitsiTrack = require("./JitsiTrack"); var StreamEventTypes = require("../../service/RTC/StreamEventTypes"); @@ -1126,7 +1149,7 @@ delete JitsiRemoteTrack.prototype.start; module.exports = JitsiRemoteTrack; -},{"../../service/RTC/StreamEventTypes":79,"./JitsiTrack":12}],12:[function(require,module,exports){ +},{"../../service/RTC/StreamEventTypes":75,"./JitsiTrack":12}],12:[function(require,module,exports){ var RTC = require("./RTCUtils"); var RTCBrowserType = require("./RTCBrowserType"); @@ -1635,12 +1658,14 @@ RTC.prototype.setDeviceAvailability = function (devices) { module.exports = RTC; -},{"../../service/RTC/MediaStreamTypes":76,"../../service/RTC/RTCEvents.js":77,"../../service/RTC/StreamEventTypes.js":79,"../../service/desktopsharing/DesktopSharingEventTypes":81,"../desktopsharing/desktopsharing":17,"./DataChannels":9,"./JitsiLocalTrack.js":10,"./JitsiRemoteTrack.js":11,"./JitsiTrack":12,"./RTCBrowserType":14,"./RTCUtils.js":15,"events":39}],14:[function(require,module,exports){ +},{"../../service/RTC/MediaStreamTypes":72,"../../service/RTC/RTCEvents.js":73,"../../service/RTC/StreamEventTypes.js":75,"../../service/desktopsharing/DesktopSharingEventTypes":77,"../desktopsharing/desktopsharing":17,"./DataChannels":9,"./JitsiLocalTrack.js":10,"./JitsiRemoteTrack.js":11,"./JitsiTrack":12,"./RTCBrowserType":14,"./RTCUtils.js":15,"events":39}],14:[function(require,module,exports){ var currentBrowser; var browserVersion; +var isAndroid; + var RTCBrowserType = { RTC_BROWSER_CHROME: "rtc_browser.chrome", @@ -1693,6 +1718,13 @@ var RTCBrowserType = { usesUnifiedPlan: function() { return RTCBrowserType.isFirefox(); + }, + + /** + * Whether the browser is running on an android device. + */ + isAndroid: function() { + return isAndroid; } // Add version getters for other browsers when needed @@ -1795,6 +1827,7 @@ function detectBrowser() { } browserVersion = detectBrowser(); +isAndroid = navigator.userAgent.indexOf('Android') != -1; module.exports = RTCBrowserType; },{}],15:[function(require,module,exports){ @@ -1829,7 +1862,8 @@ function getPreviousResolution(resolution) { return resName; } -function setResolutionConstraints(constraints, resolution, isAndroid) { +function setResolutionConstraints(constraints, resolution) { + var isAndroid = RTCBrowserType.isAndroid(); if (Resolutions[resolution]) { constraints.video.mandatory.minWidth = Resolutions[resolution].width; @@ -1851,8 +1885,7 @@ function setResolutionConstraints(constraints, resolution, isAndroid) { constraints.video.mandatory.minHeight; } -function getConstraints(um, resolution, bandwidth, fps, desktopStream, isAndroid) -{ +function getConstraints(um, resolution, bandwidth, fps, desktopStream) { var constraints = {audio: false, video: false}; if (um.indexOf('video') >= 0) { @@ -1861,7 +1894,7 @@ function getConstraints(um, resolution, bandwidth, fps, desktopStream, isAndroid constraints.video.optional.push({ googLeakyBucket: true }); - setResolutionConstraints(constraints, resolution, isAndroid); + setResolutionConstraints(constraints, resolution); } if (um.indexOf('audio') >= 0) { if (!RTCBrowserType.isFirefox()) { @@ -2022,7 +2055,7 @@ var RTCUtils = { // https://code.google.com/p/webrtc/issues/detail?id=2828 this.pc_constraints.optional.push({googIPv6: true}); } - if (navigator.userAgent.indexOf('Android') != -1) { + if (RTCBrowserType.isAndroid()) { this.pc_constraints = {}; // disable DTLS on Android } if (!webkitMediaStream.prototype.getVideoTracks) { @@ -2098,11 +2131,8 @@ var RTCUtils = { getUserMediaWithConstraints: function (RTC, um, success_callback, failure_callback, resolution, bandwidth, fps, desktopStream) { - // Check if we are running on Android device - var isAndroid = navigator.userAgent.indexOf('Android') != -1; - var constraints = getConstraints( - um, resolution, bandwidth, fps, desktopStream, isAndroid); + um, resolution, bandwidth, fps, desktopStream); console.info("Get media constraints", constraints); @@ -2393,7 +2423,7 @@ var RTCUtils = { module.exports = RTCUtils; -},{"../../service/RTC/Resolutions":78,"../xmpp/SDPUtil":29,"./RTCBrowserType":14,"./adapter.screenshare":16,"events":39}],16:[function(require,module,exports){ +},{"../../service/RTC/Resolutions":74,"../xmpp/SDPUtil":29,"./RTCBrowserType":14,"./adapter.screenshare":16,"events":39}],16:[function(require,module,exports){ /*! adapterjs - v0.12.0 - 2015-09-04 */ // Adapter's interface. @@ -3952,7 +3982,7 @@ module.exports = { }; -},{"../../service/RTC/RTCEvents":77,"../../service/desktopsharing/DesktopSharingEventTypes":81,"../RTC/RTCBrowserType":14,"../RTC/adapter.screenshare":16,"events":39}],18:[function(require,module,exports){ +},{"../../service/RTC/RTCEvents":73,"../../service/desktopsharing/DesktopSharingEventTypes":77,"../RTC/RTCBrowserType":14,"../RTC/adapter.screenshare":16,"events":39}],18:[function(require,module,exports){ function supportsLocalStorage() { try { return 'localStorage' in window && window.localStorage !== null; @@ -4163,7 +4193,7 @@ LocalStatsCollector.prototype.stop = function () { }; module.exports = LocalStatsCollector; -},{"../../service/statistics/constants":82,"../RTC/RTCBrowserType":14}],20:[function(require,module,exports){ +},{"../../service/statistics/constants":78,"../RTC/RTCBrowserType":14}],20:[function(require,module,exports){ /* global require, ssrc2jid */ /* jshint -W117 */ var RTCBrowserType = require("../RTC/RTCBrowserType"); @@ -5046,7 +5076,7 @@ Statistics.LOCAL_JID = require("../../service/statistics/constants").LOCAL_JID; module.exports = Statistics; -},{"../../service/statistics/constants":82,"./LocalStatsCollector.js":19,"./RTPStatsCollector.js":20,"events":39}],22:[function(require,module,exports){ +},{"../../service/statistics/constants":78,"./LocalStatsCollector.js":19,"./RTPStatsCollector.js":20,"events":39}],22:[function(require,module,exports){ /** * Generates random hex number within the range [min, max] @@ -5175,16 +5205,17 @@ ChatRoom.prototype.initPresenceMap = function () { }); }; -ChatRoom.prototype.join = function (password) { +ChatRoom.prototype.join = function (password, tokenPassword) { if(password) this.password = password; + var self = this; this.moderator.allocateConferenceFocus(function() { - this.sendPresence(); + self.sendPresence(tokenPassword); }.bind(this)); -} +}; -ChatRoom.prototype.sendPresence = function () { +ChatRoom.prototype.sendPresence = function (tokenPassword) { if (!this.presMap['to']) { // Too early to send presence - not initialized return; @@ -5204,6 +5235,11 @@ ChatRoom.prototype.sendPresence = function () { pres.c('c', this.connection.caps.generateCapsAttrs()).up(); } + if (tokenPassword) { + pres.c('token', { xmlns: 'http://jitsi.org/jitmeet/auth-token'}) + .t(tokenPassword).up(); + } + parser.JSON2packet(this.presMap.nodes, pres); this.connection.send(pres); }; @@ -5702,7 +5738,7 @@ ChatRoom.prototype.getJidBySSRC = function (ssrc) { }; module.exports = ChatRoom; -},{"../../service/xmpp/XMPPEvents":83,"./moderator":31,"events":39}],24:[function(require,module,exports){ +},{"../../service/xmpp/XMPPEvents":79,"./moderator":31,"events":39}],24:[function(require,module,exports){ /* * JingleSession provides an API to manage a single Jingle session. We will * have different implementations depending on the underlying interface used @@ -7327,7 +7363,7 @@ JingleSessionPC.prototype.remoteStreamAdded = function (data, times) { module.exports = JingleSessionPC; -},{"../../service/xmpp/XMPPEvents":83,"../RTC/RTC":13,"../RTC/RTCBrowserType":14,"./JingleSession":24,"./LocalSSRCReplacement":26,"./SDP":27,"./SDPDiffer":28,"./SDPUtil":29,"./TraceablePeerConnection":30,"async":38,"sdp-transform":73}],26:[function(require,module,exports){ +},{"../../service/xmpp/XMPPEvents":79,"../RTC/RTC":13,"../RTC/RTCBrowserType":14,"./JingleSession":24,"./LocalSSRCReplacement":26,"./SDP":27,"./SDPDiffer":28,"./SDPUtil":29,"./TraceablePeerConnection":30,"async":38,"sdp-transform":69}],26:[function(require,module,exports){ /* global $ */ /* @@ -9226,7 +9262,7 @@ TraceablePeerConnection.prototype.getStats = function(callback, errback) { module.exports = TraceablePeerConnection; -},{"../../service/xmpp/XMPPEvents":83,"../RTC/RTC":13,"../RTC/RTCBrowserType.js":14,"./LocalSSRCReplacement":26,"sdp-interop":59,"sdp-simulcast":66,"sdp-transform":73}],31:[function(require,module,exports){ +},{"../../service/xmpp/XMPPEvents":79,"../RTC/RTC":13,"../RTC/RTCBrowserType.js":14,"./LocalSSRCReplacement":26,"sdp-interop":59,"sdp-simulcast":62,"sdp-transform":69}],31:[function(require,module,exports){ /* global $, $iq, APP, config, messageHandler, roomName, sessionTerminated, Strophe, Util */ var XMPPEvents = require("../../service/xmpp/XMPPEvents"); @@ -9647,7 +9683,7 @@ module.exports = Moderator; -},{"../../service/authentication/AuthenticationEvents":80,"../../service/xmpp/XMPPEvents":83,"../settings/Settings":18}],32:[function(require,module,exports){ +},{"../../service/authentication/AuthenticationEvents":76,"../../service/xmpp/XMPPEvents":79,"../settings/Settings":18}],32:[function(require,module,exports){ /* jshint -W117 */ /* a simple MUC connection plugin * can only handle a single MUC room @@ -10031,7 +10067,7 @@ module.exports = function(XMPP, eventEmitter) { }; -},{"../../service/xmpp/XMPPEvents":83,"../RTC/RTCBrowserType":14,"./JingleSessionPC":25}],34:[function(require,module,exports){ +},{"../../service/xmpp/XMPPEvents":79,"../RTC/RTCBrowserType":14,"./JingleSessionPC":25}],34:[function(require,module,exports){ /* global Strophe */ module.exports = function () { @@ -10482,7 +10518,7 @@ XMPP.prototype.disconnect = function () { module.exports = XMPP; -},{"../../JitsiConnectionErrors":5,"../../JitsiConnectionEvents":6,"../../service/RTC/RTCEvents":77,"../../service/RTC/StreamEventTypes":79,"../../service/xmpp/XMPPEvents":83,"../RTC/RTC":13,"./strophe.emuc":32,"./strophe.jingle":33,"./strophe.logger":34,"./strophe.rayo":35,"./strophe.util":36,"events":39,"pako":42}],38:[function(require,module,exports){ +},{"../../JitsiConnectionErrors":5,"../../JitsiConnectionEvents":6,"../../service/RTC/RTCEvents":73,"../../service/RTC/StreamEventTypes":75,"../../service/xmpp/XMPPEvents":79,"../RTC/RTC":13,"./strophe.emuc":32,"./strophe.jingle":33,"./strophe.logger":34,"./strophe.rayo":35,"./strophe.util":36,"events":39,"pako":42}],38:[function(require,module,exports){ (function (process){ /*! * async @@ -19408,6 +19444,21 @@ function ZStream() { module.exports = ZStream; },{}],58:[function(require,module,exports){ +/* Copyright @ 2015 Atlassian Pty Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + module.exports = function arrayEquals(array) { // if the other array is a falsy value, return if (!array) @@ -19430,13 +19481,45 @@ module.exports = function arrayEquals(array) { } } return true; -} +}; },{}],59:[function(require,module,exports){ +/* Copyright @ 2015 Atlassian Pty Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + exports.Interop = require('./interop'); },{"./interop":60}],60:[function(require,module,exports){ +/* Copyright @ 2015 Atlassian Pty Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* global RTCSessionDescription */ +/* jshint -W097 */ "use strict"; var transform = require('./transform'); @@ -19456,6 +19539,33 @@ function Interop() { module.exports = Interop; +/** + * Returns the index of the first m-line with the given media type and with a + * direction which allows sending, in the last Unified Plan description with + * type "answer" converted to Plan B. Returns {null} if there is no saved + * answer, or if none of its m-lines with the given type allow sending. + * @param type the media type ("audio" or "video"). + * @returns {*} + */ +Interop.prototype.getFirstSendingIndexFromAnswer = function(type) { + if (!this.cache.answer) { + return null; + } + + var session = transform.parse(this.cache.answer); + if (session && session.media && Array.isArray(session.media)){ + for (var i = 0; i < session.media.length; i++) { + if (session.media[i].type == type && + (!session.media[i].direction /* default to sendrecv */ || + session.media[i].direction === 'sendrecv' || + session.media[i].direction === 'sendonly')){ + return i; + } + } + } + + return null; +}; /** * This method transforms a Unified Plan SDP to an equivalent Plan B SDP. A @@ -19466,7 +19576,7 @@ module.exports = Interop; * @returns {*} */ Interop.prototype.toPlanB = function(desc) { - + var self = this; //#region Preliminary input validation. if (typeof desc !== 'object' || desc === null || @@ -19496,9 +19606,27 @@ Interop.prototype.toPlanB = function(desc) { //#endregion + // HACK https://bugzilla.mozilla.org/show_bug.cgi?id=1113443 + var sdp = desc.sdp; + var rewrite = false; + for (var i = 0; i < session.media.length; i++) { + var uLine = session.media[i]; + uLine.rtp.forEach(function(rtp) { + if (rtp.codec === 'NULL') + { + rewrite = true; + var offer = transform.parse(self.cache['offer']); + rtp.codec = offer.media[i].rtp[0].codec; + } + }); + }; + if (rewrite) { + sdp = transform.write(session); + } + // Unified Plan SDP is our "precious". Cache it for later use in the Plan B // -> Unified Plan transformation. - this.cache[desc.type] = desc.sdp; + this.cache[desc.type] = sdp; //#region Convert from Unified Plan to Plan B. @@ -19516,44 +19644,47 @@ Interop.prototype.toPlanB = function(desc) { var types = []; // Implode the Unified Plan m-lines/tracks into Plan B channels. - media.forEach(function(unifiedLine) { + media.forEach(function(uLine) { // rtcp-mux is required in the Plan B SDP. - if ((typeof unifiedLine.rtcpMux !== 'string' || - unifiedLine.rtcpMux !== 'rtcp-mux') && - unifiedLine.direction !== 'inactive') { + if ((typeof uLine.rtcpMux !== 'string' || + uLine.rtcpMux !== 'rtcp-mux') && + uLine.direction !== 'inactive') { throw new Error('Cannot convert to Plan B because m-lines ' + 'without the rtcp-mux attribute were found.'); } - if (unifiedLine.type === 'application') { - session.media.push(unifiedLine); - types.push(unifiedLine.mid); + if (uLine.type === 'application') { + session.media.push(uLine); + types.push(uLine.mid); return; } - // If we don't have a channel for this unifiedLine.type, then use this unifiedLine - // as the channel basis. - if (typeof type2bl[unifiedLine.type] === 'undefined') { - type2bl[unifiedLine.type] = unifiedLine; + // If we don't have a channel for this uLine.type, then use this + // uLine as the channel basis. + if (typeof type2bl[uLine.type] === 'undefined') { + type2bl[uLine.type] = uLine; } // Add sources to the channel and handle a=msid. - if (typeof unifiedLine.sources === 'object') { - Object.keys(unifiedLine.sources).forEach(function(ssrc) { - if (typeof type2bl[unifiedLine.type].sources !== 'object') - type2bl[unifiedLine.type].sources = {}; + if (typeof uLine.sources === 'object') { + Object.keys(uLine.sources).forEach(function(ssrc) { + if (typeof type2bl[uLine.type].sources !== 'object') + type2bl[uLine.type].sources = {}; // Assign the sources to the channel. - type2bl[unifiedLine.type].sources[ssrc] = unifiedLine.sources[ssrc]; + type2bl[uLine.type].sources[ssrc] = + uLine.sources[ssrc]; - if (typeof unifiedLine.msid !== 'undefined') { + if (typeof uLine.msid !== 'undefined') { // In Plan B the msid is an SSRC attribute. Also, we don't // care about the obsolete label and mslabel attributes. // - // Note that it is not guaranteed that the unifiedLine will have - // an msid. recvonly channels in particular don't have one. - type2bl[unifiedLine.type].sources[ssrc].msid = unifiedLine.msid; + // Note that it is not guaranteed that the uLine will + // have an msid. recvonly channels in particular don't have + // one. + type2bl[uLine.type].sources[ssrc].msid = + uLine.msid; } // NOTE ssrcs in ssrc groups will share msids, as // draft-uberti-rtcweb-plan-00 mandates. @@ -19561,39 +19692,41 @@ Interop.prototype.toPlanB = function(desc) { } // Add ssrc groups to the channel. - if (typeof unifiedLine.ssrcGroups !== 'undefined' && - Array.isArray(unifiedLine.ssrcGroups)) { + if (typeof uLine.ssrcGroups !== 'undefined' && + Array.isArray(uLine.ssrcGroups)) { // Create the ssrcGroups array, if it's not defined. - if (typeof type2bl[unifiedLine.type].ssrcGroups === 'undefined' || - !Array.isArray(type2bl[unifiedLine.type].ssrcGroups)) { - type2bl[unifiedLine.type].ssrcGroups = []; + if (typeof type2bl[uLine.type].ssrcGroups === 'undefined' || + !Array.isArray(type2bl[uLine.type].ssrcGroups)) { + type2bl[uLine.type].ssrcGroups = []; } - type2bl[unifiedLine.type].ssrcGroups = type2bl[unifiedLine.type].ssrcGroups.concat(unifiedLine.ssrcGroups); + type2bl[uLine.type].ssrcGroups = + type2bl[uLine.type].ssrcGroups.concat( + uLine.ssrcGroups); } - if (type2bl[unifiedLine.type] === unifiedLine) { + if (type2bl[uLine.type] === uLine) { // Copy ICE related stuff from the principal media line. - unifiedLine.candidates = media[0].candidates; - unifiedLine.iceUfrag = media[0].iceUfrag; - unifiedLine.icePwd = media[0].icePwd; - unifiedLine.fingerprint = media[0].fingerprint; + uLine.candidates = media[0].candidates; + uLine.iceUfrag = media[0].iceUfrag; + uLine.icePwd = media[0].icePwd; + uLine.fingerprint = media[0].fingerprint; // Plan B mids are in ['audio', 'video', 'data'] - unifiedLine.mid = unifiedLine.type; + uLine.mid = uLine.type; // Plan B doesn't support/need the bundle-only attribute. - delete unifiedLine.bundleOnly; + delete uLine.bundleOnly; // In Plan B the msid is an SSRC attribute. - delete unifiedLine.msid; + delete uLine.msid; // Used to build the group:BUNDLE value after this loop. - types.push(unifiedLine.type); + types.push(uLine.type); // Add the channel to the new media array. - session.media.push(unifiedLine); + session.media.push(uLine); } }); @@ -19630,7 +19763,7 @@ Interop.prototype.toPlanB = function(desc) { * @returns {*} */ Interop.prototype.toUnifiedPlan = function(desc) { - + var self = this; //#region Preliminary input validation. if (typeof desc !== 'object' || desc === null || @@ -19707,6 +19840,11 @@ Interop.prototype.toUnifiedPlan = function(desc) { cached = transform.parse(this.cache[desc.type]); } + var recvonlySsrcs = { + audio: {}, + video: {} + }; + // A helper map that sends mids to m-line objects. We use it later to // rebuild the Unified Plan style session.media array. var mid2ul = {}; @@ -19755,6 +19893,8 @@ Interop.prototype.toUnifiedPlan = function(desc) { return; } + // XXX This might brake if an SSRC is in more than one group + // for some reason. if (typeof ssrcGroup.ssrcs !== 'undefined' && Array.isArray(ssrcGroup.ssrcs)) { ssrcGroup.ssrcs.forEach(function (ssrc) { @@ -19780,7 +19920,29 @@ Interop.prototype.toUnifiedPlan = function(desc) { // scratch or, if it's a grouped SSRC, we re-use a related // mline. In other words, if the source is grouped with another // source, put the two together in the same m-line. - var unifiedLine; + var uLine; + + // We assume here that we are the answerer in the O/A, so any + // offers which we translate come from the remote side, while + // answers are local. So the check below is to make that we + // handle receive-only SSRCs in a special way only if they come + // from the remote side. + if (desc.type==='offer') { + // We want to detect SSRCs which are used by a remote peer + // in an m-line with direction=recvonly (i.e. they are + // being used for RTCP only). + // This information would have gotten lost if the remote + // peer used Unified Plan and their local description was + // translated to Plan B. So we use the lack of an MSID + // attribute to deduce a "receive only" SSRC. + if (!sources[ssrc].msid) { + recvonlySsrcs[bLine.type][ssrc] = sources[ssrc]; + // Receive-only SSRCs must not create new m-lines. We + // will assign them to an existing m-line later. + return; + } + } + if (typeof ssrc2group[ssrc] !== 'undefined' && Array.isArray(ssrc2group[ssrc])) { ssrc2group[ssrc].some(function (ssrcGroup) { @@ -19788,21 +19950,21 @@ Interop.prototype.toUnifiedPlan = function(desc) { // again here. return ssrcGroup.ssrcs.some(function (related) { if (typeof ssrc2ml[related] === 'object') { - unifiedLine = ssrc2ml[related]; + uLine = ssrc2ml[related]; return true; } }); }); } - if (typeof unifiedLine === 'object') { + if (typeof uLine === 'object') { // the m-line already exists. Just add the source. - unifiedLine.sources[ssrc] = sources[ssrc]; + uLine.sources[ssrc] = sources[ssrc]; delete sources[ssrc].msid; } else { - // Use the "bLine" as a prototype for the "unifiedLine". - unifiedLine = Object.create(bLine); - ssrc2ml[ssrc] = unifiedLine; + // Use the "bLine" as a prototype for the "uLine". + uLine = Object.create(bLine); + ssrc2ml[ssrc] = uLine; if (typeof sources[ssrc].msid !== 'undefined') { // Assign the msid of the source to the m-line. Note @@ -19810,14 +19972,15 @@ Interop.prototype.toUnifiedPlan = function(desc) { // msid. In particular "recvonly" sources don't have an // msid. Note that "recvonly" is a term only defined // for m-lines. - unifiedLine.msid = sources[ssrc].msid; + uLine.msid = sources[ssrc].msid; + uLine.direction = 'sendrecv'; delete sources[ssrc].msid; } // We assign one SSRC per media line. - unifiedLine.sources = {}; - unifiedLine.sources[ssrc] = sources[ssrc]; - unifiedLine.ssrcGroups = ssrc2group[ssrc]; + uLine.sources = {}; + uLine.sources[ssrc] = sources[ssrc]; + uLine.ssrcGroups = ssrc2group[ssrc]; // Use the cached Unified Plan SDP (if it exists) to assign // SSRCs to mids. @@ -19829,14 +19992,14 @@ Interop.prototype.toUnifiedPlan = function(desc) { if (typeof m.sources === 'object') { Object.keys(m.sources).forEach(function (s) { if (s === ssrc) { - unifiedLine.mid = m.mid; + uLine.mid = m.mid; } }); } }); } - if (typeof unifiedLine.mid === 'undefined') { + if (typeof uLine.mid === 'undefined') { // If this is an SSRC that we see for the first time // assign it a new mid. This is typically the case when @@ -19855,17 +20018,17 @@ Interop.prototype.toUnifiedPlan = function(desc) { throw new Error("An unmapped SSRC was found."); } - unifiedLine.mid = [bLine.type, '-', ssrc].join(''); + uLine.mid = [bLine.type, '-', ssrc].join(''); } // Include the candidates in the 1st media line. - unifiedLine.candidates = candidates; - unifiedLine.iceUfrag = iceUfrag; - unifiedLine.icePwd = icePwd; - unifiedLine.fingerprint = fingerprint; - unifiedLine.port = port; + uLine.candidates = candidates; + uLine.iceUfrag = iceUfrag; + uLine.icePwd = icePwd; + uLine.fingerprint = fingerprint; + uLine.port = port; - mid2ul[unifiedLine.mid] = unifiedLine; + mid2ul[uLine.mid] = uLine; } }); } @@ -19879,21 +20042,21 @@ Interop.prototype.toUnifiedPlan = function(desc) { if (desc.type === 'answer') { // The media lines in the answer must match the media lines in the - // offer. The order is important too. Here we assume that Firefox is the - // answerer, so we merely have to use the reconstructed (unified) answer - // to update the cached (unified) answer accordingly. + // offer. The order is important too. Here we assume that Firefox is + // the answerer, so we merely have to use the reconstructed (unified) + // answer to update the cached (unified) answer accordingly. // - // In the general case, one would have to use the cached (unified) offer - // to find the m-lines that are missing from the reconstructed answer, - // potentially grabbing them from the cached (unified) answer. One has - // to be carefull with this approach because inactive m-lines do not - // always have an mid, making it tricky (impossible?) to find where + // In the general case, one would have to use the cached (unified) + // offer to find the m-lines that are missing from the reconstructed + // answer, potentially grabbing them from the cached (unified) answer. + // One has to be careful with this approach because inactive m-lines do + // not always have an mid, making it tricky (impossible?) to find where // exactly and which m-lines are missing from the reconstructed answer. for (var i = 0; i < cached.media.length; i++) { - var unifiedLine = cached.media[i]; + var uLine = cached.media[i]; - if (typeof mid2ul[unifiedLine.mid] === 'undefined') { + if (typeof mid2ul[uLine.mid] === 'undefined') { // The mid isn't in the reconstructed (unified) answer. // This is either a (unified) m-line containing a remote @@ -19906,15 +20069,14 @@ Interop.prototype.toUnifiedPlan = function(desc) { // the (unified) m-line and make sure it's 'recvonly' or // 'inactive'. - delete unifiedLine.msid; - delete unifiedLine.sources; - delete unifiedLine.ssrcGroups; - if (!unifiedLine.direction - || unifiedLine.direction === 'sendrecv') - unifiedLine.direction = 'recvonly'; - if (!unifiedLine.direction - || unifiedLine.direction === 'sendonly') - unifiedLine.direction = 'inactive'; + delete uLine.msid; + delete uLine.sources; + delete uLine.ssrcGroups; + if (!uLine.direction + || uLine.direction === 'sendrecv') + uLine.direction = 'recvonly'; + else if (uLine.direction === 'sendonly') + uLine.direction = 'inactive'; } else { // This is an (unified) m-line/channel that contains a local // track (sendrecv or sendonly channel) or it's a unified @@ -19923,11 +20085,11 @@ Interop.prototype.toUnifiedPlan = function(desc) { // exist in the cached answer. } - session.media.push(unifiedLine); + session.media.push(uLine); - if (typeof unifiedLine.mid === 'string') { + if (typeof uLine.mid === 'string') { // inactive lines don't/may not have an mid. - mids.push(unifiedLine.mid); + mids.push(uLine.mid); } } } else { @@ -19938,26 +20100,26 @@ Interop.prototype.toUnifiedPlan = function(desc) { // either a=recvonly (as the reofferer, we must use recvonly if the // other side was previously sending on the m-section, but we can also // leave the possibility open if it wasn't previously in use), or - // a=inacive. + // a=inactive. if (typeof cached !== 'undefined' && typeof cached.media !== 'undefined' && Array.isArray(cached.media)) { - cached.media.forEach(function(unifiedLine) { - mids.push(unifiedLine.mid); - if (typeof mid2ul[unifiedLine.mid] !== 'undefined') { - session.media.push(mid2ul[unifiedLine.mid]); + cached.media.forEach(function(uLine) { + mids.push(uLine.mid); + if (typeof mid2ul[uLine.mid] !== 'undefined') { + session.media.push(mid2ul[uLine.mid]); } else { - delete unifiedLine.msid; - delete unifiedLine.sources; - delete unifiedLine.ssrcGroups; - if (!unifiedLine.direction - || unifiedLine.direction === 'sendrecv') - unifiedLine.direction = 'recvonly'; - if (!unifiedLine.direction - || unifiedLine.direction === 'sendonly') - unifiedLine.direction = 'inactive'; - session.media.push(unifiedLine); + delete uLine.msid; + delete uLine.sources; + delete uLine.ssrcGroups; + if (!uLine.direction + || uLine.direction === 'sendrecv') + uLine.direction = 'recvonly'; + if (!uLine.direction + || uLine.direction === 'sendonly') + uLine.direction = 'inactive'; + session.media.push(uLine); } }); } @@ -19966,18 +20128,22 @@ Interop.prototype.toUnifiedPlan = function(desc) { Object.keys(mid2ul).forEach(function(mid) { if (mids.indexOf(mid) === -1) { mids.push(mid); - if (typeof mid2ul[mid].direction === 'recvonly') { + if (mid2ul[mid].direction === 'recvonly') { // This is a remote recvonly channel. Add its SSRC to the // appropriate sendrecv or sendonly channel. - // TODO(gp) what if we don't have sendrecv/sendonly channel? - session.media.some(function (unifiedLine) { - if ((unifiedLine.direction === 'sendrecv' || - unifiedLine.direction === 'sendonly') && - unifiedLine.type === mid2ul[mid].type) { + // TODO(gp) what if we don't have sendrecv/sendonly + // channel? + + session.media.some(function (uLine) { + if ((uLine.direction === 'sendrecv' || + uLine.direction === 'sendonly') && + uLine.type === mid2ul[mid].type) { // mid2ul[mid] shouldn't have any ssrc-groups - Object.keys(mid2ul[mid].sources).forEach(function (ssrc) { - unifiedLine.sources[ssrc] = mid2ul[mid].sources[ssrc]; + Object.keys(mid2ul[mid].sources).forEach( + function (ssrc) { + uLine.sources[ssrc] = + mid2ul[mid].sources[ssrc]; }); return true; @@ -19990,6 +20156,47 @@ Interop.prototype.toUnifiedPlan = function(desc) { }); } + // After we have constructed the Plan Unified m-lines we can figure out + // where (in which m-line) to place the 'recvonly SSRCs'. + // Note: we assume here that we are the answerer in the O/A, so any offers + // which we translate come from the remote side, while answers are local + // (and so our last local description is cached as an 'answer'). + ["audio", "video"].forEach(function (type) { + if (!session || !session.media || !Array.isArray(session.media)) + return; + + var idx = null; + if (Object.keys(recvonlySsrcs[type]).length > 0) { + idx = self.getFirstSendingIndexFromAnswer(type); + if (idx === null){ + // If this is the first offer we receive, we don't have a + // cached answer. Assume that we will be sending media using + // the first m-line for each media type. + + for (var i = 0; i < session.media.length; i++) { + if (session.media[i].type === type) { + idx = i; + break; + } + } + } + } + + if (idx && session.media.length > idx) { + var mLine = session.media[idx]; + Object.keys(recvonlySsrcs[type]).forEach(function(ssrc) { + if (mLine.sources && mLine.sources[ssrc]) { + console.warn("Replacing an existing SSRC."); + } + if (!mLine.sources) { + mLine.sources = {}; + } + + mLine.sources[ssrc] = recvonlySsrcs[type][ssrc]; + }); + } + }); + // We regenerate the BUNDLE group (since we regenerated the mids) session.groups.some(function(group) { if (group.type === 'BUNDLE') { @@ -20019,6 +20226,21 @@ Interop.prototype.toUnifiedPlan = function(desc) { }; },{"./array-equals":58,"./transform":61}],61:[function(require,module,exports){ +/* Copyright @ 2015 Atlassian Pty Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + var transform = require('sdp-transform'); exports.write = function(session, opts) { @@ -20117,477 +20339,7 @@ exports.parse = function(sdp) { }; -},{"sdp-transform":63}],62:[function(require,module,exports){ -var grammar = module.exports = { - v: [{ - name: 'version', - reg: /^(\d*)$/ - }], - o: [{ //o=- 20518 0 IN IP4 203.0.113.1 - // NB: sessionId will be a String in most cases because it is huge - name: 'origin', - reg: /^(\S*) (\d*) (\d*) (\S*) IP(\d) (\S*)/, - names: ['username', 'sessionId', 'sessionVersion', 'netType', 'ipVer', 'address'], - format: "%s %s %d %s IP%d %s" - }], - // default parsing of these only (though some of these feel outdated) - s: [{ name: 'name' }], - i: [{ name: 'description' }], - u: [{ name: 'uri' }], - e: [{ name: 'email' }], - p: [{ name: 'phone' }], - z: [{ name: 'timezones' }], // TODO: this one can actually be parsed properly.. - r: [{ name: 'repeats' }], // TODO: this one can also be parsed properly - //k: [{}], // outdated thing ignored - t: [{ //t=0 0 - name: 'timing', - reg: /^(\d*) (\d*)/, - names: ['start', 'stop'], - format: "%d %d" - }], - c: [{ //c=IN IP4 10.47.197.26 - name: 'connection', - reg: /^IN IP(\d) (\S*)/, - names: ['version', 'ip'], - format: "IN IP%d %s" - }], - b: [{ //b=AS:4000 - push: 'bandwidth', - reg: /^(TIAS|AS|CT|RR|RS):(\d*)/, - names: ['type', 'limit'], - format: "%s:%s" - }], - m: [{ //m=video 51744 RTP/AVP 126 97 98 34 31 - // NB: special - pushes to session - // TODO: rtp/fmtp should be filtered by the payloads found here? - reg: /^(\w*) (\d*) ([\w\/]*)(?: (.*))?/, - names: ['type', 'port', 'protocol', 'payloads'], - format: "%s %d %s %s" - }], - a: [ - { //a=rtpmap:110 opus/48000/2 - push: 'rtp', - reg: /^rtpmap:(\d*) ([\w\-]*)\/(\d*)(?:\s*\/(\S*))?/, - names: ['payload', 'codec', 'rate', 'encoding'], - format: function (o) { - return (o.encoding) ? - "rtpmap:%d %s/%s/%s": - "rtpmap:%d %s/%s"; - } - }, - { //a=fmtp:108 profile-level-id=24;object=23;bitrate=64000 - push: 'fmtp', - reg: /^fmtp:(\d*) (\S*)/, - names: ['payload', 'config'], - format: "fmtp:%d %s" - }, - { //a=control:streamid=0 - name: 'control', - reg: /^control:(.*)/, - format: "control:%s" - }, - { //a=rtcp:65179 IN IP4 193.84.77.194 - name: 'rtcp', - reg: /^rtcp:(\d*)(?: (\S*) IP(\d) (\S*))?/, - names: ['port', 'netType', 'ipVer', 'address'], - format: function (o) { - return (o.address != null) ? - "rtcp:%d %s IP%d %s": - "rtcp:%d"; - } - }, - { //a=rtcp-fb:98 trr-int 100 - push: 'rtcpFbTrrInt', - reg: /^rtcp-fb:(\*|\d*) trr-int (\d*)/, - names: ['payload', 'value'], - format: "rtcp-fb:%d trr-int %d" - }, - { //a=rtcp-fb:98 nack rpsi - push: 'rtcpFb', - reg: /^rtcp-fb:(\*|\d*) ([\w-_]*)(?: ([\w-_]*))?/, - names: ['payload', 'type', 'subtype'], - format: function (o) { - return (o.subtype != null) ? - "rtcp-fb:%s %s %s": - "rtcp-fb:%s %s"; - } - }, - { //a=extmap:2 urn:ietf:params:rtp-hdrext:toffset - //a=extmap:1/recvonly URI-gps-string - push: 'ext', - reg: /^extmap:([\w_\/]*) (\S*)(?: (\S*))?/, - names: ['value', 'uri', 'config'], // value may include "/direction" suffix - format: function (o) { - return (o.config != null) ? - "extmap:%s %s %s": - "extmap:%s %s"; - } - }, - { - //a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:PS1uQCVeeCFCanVmcjkpPywjNWhcYD0mXXtxaVBR|2^20|1:32 - push: 'crypto', - reg: /^crypto:(\d*) ([\w_]*) (\S*)(?: (\S*))?/, - names: ['id', 'suite', 'config', 'sessionConfig'], - format: function (o) { - return (o.sessionConfig != null) ? - "crypto:%d %s %s %s": - "crypto:%d %s %s"; - } - }, - { //a=setup:actpass - name: 'setup', - reg: /^setup:(\w*)/, - format: "setup:%s" - }, - { //a=mid:1 - name: 'mid', - reg: /^mid:([^\s]*)/, - format: "mid:%s" - }, - { //a=msid:0c8b064d-d807-43b4-b434-f92a889d8587 98178685-d409-46e0-8e16-7ef0db0db64a - name: 'msid', - reg: /^msid:(.*)/, - format: "msid:%s" - }, - { //a=ptime:20 - name: 'ptime', - reg: /^ptime:(\d*)/, - format: "ptime:%d" - }, - { //a=maxptime:60 - name: 'maxptime', - reg: /^maxptime:(\d*)/, - format: "maxptime:%d" - }, - { //a=sendrecv - name: 'direction', - reg: /^(sendrecv|recvonly|sendonly|inactive)/ - }, - { //a=ice-lite - name: 'icelite', - reg: /^(ice-lite)/ - }, - { //a=ice-ufrag:F7gI - name: 'iceUfrag', - reg: /^ice-ufrag:(\S*)/, - format: "ice-ufrag:%s" - }, - { //a=ice-pwd:x9cml/YzichV2+XlhiMu8g - name: 'icePwd', - reg: /^ice-pwd:(\S*)/, - format: "ice-pwd:%s" - }, - { //a=fingerprint:SHA-1 00:11:22:33:44:55:66:77:88:99:AA:BB:CC:DD:EE:FF:00:11:22:33 - name: 'fingerprint', - reg: /^fingerprint:(\S*) (\S*)/, - names: ['type', 'hash'], - format: "fingerprint:%s %s" - }, - { - //a=candidate:0 1 UDP 2113667327 203.0.113.1 54400 typ host - //a=candidate:1162875081 1 udp 2113937151 192.168.34.75 60017 typ host generation 0 - //a=candidate:3289912957 2 udp 1845501695 193.84.77.194 60017 typ srflx raddr 192.168.34.75 rport 60017 generation 0 - push:'candidates', - reg: /^candidate:(\S*) (\d*) (\S*) (\d*) (\S*) (\d*) typ (\S*)(?: raddr (\S*) rport (\d*))?(?: generation (\d*))?/, - names: ['foundation', 'component', 'transport', 'priority', 'ip', 'port', 'type', 'raddr', 'rport', 'generation'], - format: function (o) { - var str = "candidate:%s %d %s %d %s %d typ %s"; - // NB: candidate has two optional chunks, so %void middle one if it's missing - str += (o.raddr != null) ? " raddr %s rport %d" : "%v%v"; - if (o.generation != null) { - str += " generation %d"; - } - return str; - } - }, - { //a=end-of-candidates (keep after the candidates line for readability) - name: 'endOfCandidates', - reg: /^(end-of-candidates)/ - }, - { //a=remote-candidates:1 203.0.113.1 54400 2 203.0.113.1 54401 ... - name: 'remoteCandidates', - reg: /^remote-candidates:(.*)/, - format: "remote-candidates:%s" - }, - { //a=ice-options:google-ice - name: 'iceOptions', - reg: /^ice-options:(\S*)/, - format: "ice-options:%s" - }, - { //a=ssrc:2566107569 cname:t9YU8M1UxTF8Y1A1 - push: "ssrcs", - reg: /^ssrc:(\d*) ([\w_]*):(.*)/, - names: ['id', 'attribute', 'value'], - format: "ssrc:%d %s:%s" - }, - { //a=ssrc-group:FEC 1 2 - push: "ssrcGroups", - reg: /^ssrc-group:(\w*) (.*)/, - names: ['semantics', 'ssrcs'], - format: "ssrc-group:%s %s" - }, - { //a=msid-semantic: WMS Jvlam5X3SX1OP6pn20zWogvaKJz5Hjf9OnlV - name: "msidSemantic", - reg: /^msid-semantic:\s?(\w*) (\S*)/, - names: ['semantic', 'token'], - format: "msid-semantic: %s %s" // space after ":" is not accidental - }, - { //a=group:BUNDLE audio video - push: 'groups', - reg: /^group:(\w*) (.*)/, - names: ['type', 'mids'], - format: "group:%s %s" - }, - { //a=rtcp-mux - name: 'rtcpMux', - reg: /^(rtcp-mux)/ - }, - { //a=rtcp-rsize - name: 'rtcpRsize', - reg: /^(rtcp-rsize)/ - }, - { // any a= that we don't understand is kepts verbatim on media.invalid - push: 'invalid', - names: ["value"] - } - ] -}; - -// set sensible defaults to avoid polluting the grammar with boring details -Object.keys(grammar).forEach(function (key) { - var objs = grammar[key]; - objs.forEach(function (obj) { - if (!obj.reg) { - obj.reg = /(.*)/; - } - if (!obj.format) { - obj.format = "%s"; - } - }); -}); - -},{}],63:[function(require,module,exports){ -var parser = require('./parser'); -var writer = require('./writer'); - -exports.write = writer; -exports.parse = parser.parse; -exports.parseFmtpConfig = parser.parseFmtpConfig; -exports.parsePayloads = parser.parsePayloads; -exports.parseRemoteCandidates = parser.parseRemoteCandidates; - -},{"./parser":64,"./writer":65}],64:[function(require,module,exports){ -var toIntIfInt = function (v) { - return String(Number(v)) === v ? Number(v) : v; -}; - -var attachProperties = function (match, location, names, rawName) { - if (rawName && !names) { - location[rawName] = toIntIfInt(match[1]); - } - else { - for (var i = 0; i < names.length; i += 1) { - if (match[i+1] != null) { - location[names[i]] = toIntIfInt(match[i+1]); - } - } - } -}; - -var parseReg = function (obj, location, content) { - var needsBlank = obj.name && obj.names; - if (obj.push && !location[obj.push]) { - location[obj.push] = []; - } - else if (needsBlank && !location[obj.name]) { - location[obj.name] = {}; - } - var keyLocation = obj.push ? - {} : // blank object that will be pushed - needsBlank ? location[obj.name] : location; // otherwise, named location or root - - attachProperties(content.match(obj.reg), keyLocation, obj.names, obj.name); - - if (obj.push) { - location[obj.push].push(keyLocation); - } -}; - -var grammar = require('./grammar'); -var validLine = RegExp.prototype.test.bind(/^([a-z])=(.*)/); - -exports.parse = function (sdp) { - var session = {} - , media = [] - , location = session; // points at where properties go under (one of the above) - - // parse lines we understand - sdp.split(/(\r\n|\r|\n)/).filter(validLine).forEach(function (l) { - var type = l[0]; - var content = l.slice(2); - if (type === 'm') { - media.push({rtp: [], fmtp: []}); - location = media[media.length-1]; // point at latest media line - } - - for (var j = 0; j < (grammar[type] || []).length; j += 1) { - var obj = grammar[type][j]; - if (obj.reg.test(content)) { - return parseReg(obj, location, content); - } - } - }); - - session.media = media; // link it up - return session; -}; - -var fmtpReducer = function (acc, expr) { - var s = expr.split('='); - if (s.length === 2) { - acc[s[0]] = toIntIfInt(s[1]); - } - return acc; -}; - -exports.parseFmtpConfig = function (str) { - return str.split(';').reduce(fmtpReducer, {}); -}; - -exports.parsePayloads = function (str) { - return str.split(' ').map(Number); -}; - -exports.parseRemoteCandidates = function (str) { - var candidates = []; - var parts = str.split(' ').map(toIntIfInt); - for (var i = 0; i < parts.length; i += 3) { - candidates.push({ - component: parts[i], - ip: parts[i + 1], - port: parts[i + 2] - }); - } - return candidates; -}; - -},{"./grammar":62}],65:[function(require,module,exports){ -var grammar = require('./grammar'); - -// customized util.format - discards excess arguments and can void middle ones -var formatRegExp = /%[sdv%]/g; -var format = function (formatStr) { - var i = 1; - var args = arguments; - var len = args.length; - return formatStr.replace(formatRegExp, function (x) { - if (i >= len) { - return x; // missing argument - } - var arg = args[i]; - i += 1; - switch (x) { - case '%%': - return '%'; - case '%s': - return String(arg); - case '%d': - return Number(arg); - case '%v': - return ''; - } - }); - // NB: we discard excess arguments - they are typically undefined from makeLine -}; - -var makeLine = function (type, obj, location) { - var str = obj.format instanceof Function ? - (obj.format(obj.push ? location : location[obj.name])) : - obj.format; - - var args = [type + '=' + str]; - if (obj.names) { - for (var i = 0; i < obj.names.length; i += 1) { - var n = obj.names[i]; - if (obj.name) { - args.push(location[obj.name][n]); - } - else { // for mLine and push attributes - args.push(location[obj.names[i]]); - } - } - } - else { - args.push(location[obj.name]); - } - return format.apply(null, args); -}; - -// RFC specified order -// TODO: extend this with all the rest -var defaultOuterOrder = [ - 'v', 'o', 's', 'i', - 'u', 'e', 'p', 'c', - 'b', 't', 'r', 'z', 'a' -]; -var defaultInnerOrder = ['i', 'c', 'b', 'a']; - - -module.exports = function (session, opts) { - opts = opts || {}; - // ensure certain properties exist - if (session.version == null) { - session.version = 0; // "v=0" must be there (only defined version atm) - } - if (session.name == null) { - session.name = " "; // "s= " must be there if no meaningful name set - } - session.media.forEach(function (mLine) { - if (mLine.payloads == null) { - mLine.payloads = ""; - } - }); - - var outerOrder = opts.outerOrder || defaultOuterOrder; - var innerOrder = opts.innerOrder || defaultInnerOrder; - var sdp = []; - - // loop through outerOrder for matching properties on session - outerOrder.forEach(function (type) { - grammar[type].forEach(function (obj) { - if (obj.name in session && session[obj.name] != null) { - sdp.push(makeLine(type, obj, session)); - } - else if (obj.push in session && session[obj.push] != null) { - session[obj.push].forEach(function (el) { - sdp.push(makeLine(type, obj, el)); - }); - } - }); - }); - - // then for each media line, follow the innerOrder - session.media.forEach(function (mLine) { - sdp.push(makeLine('m', grammar.m[0], mLine)); - - innerOrder.forEach(function (type) { - grammar[type].forEach(function (obj) { - if (obj.name in mLine && mLine[obj.name] != null) { - sdp.push(makeLine(type, obj, mLine)); - } - else if (obj.push in mLine && mLine[obj.push] != null) { - mLine[obj.push].forEach(function (el) { - sdp.push(makeLine(type, obj, el)); - }); - } - }); - }); - }); - - return sdp.join('\r\n') + '\r\n'; -}; - -},{"./grammar":62}],66:[function(require,module,exports){ +},{"sdp-transform":69}],62:[function(require,module,exports){ var transform = require('sdp-transform'); var transformUtils = require('./transform-utils'); var parseSsrcs = transformUtils.parseSsrcs; @@ -20989,7 +20741,7 @@ Simulcast.prototype.mungeLocalDescription = function (desc) { module.exports = Simulcast; -},{"./transform-utils":67,"sdp-transform":69}],67:[function(require,module,exports){ +},{"./transform-utils":63,"sdp-transform":65}],63:[function(require,module,exports){ exports.writeSsrcs = function(sources, order) { var ssrcs = []; @@ -21040,15 +20792,477 @@ exports.parseSsrcs = function (mLine) { }; -},{}],68:[function(require,module,exports){ -arguments[4][62][0].apply(exports,arguments) -},{"dup":62}],69:[function(require,module,exports){ -arguments[4][63][0].apply(exports,arguments) -},{"./parser":70,"./writer":71,"dup":63}],70:[function(require,module,exports){ -arguments[4][64][0].apply(exports,arguments) -},{"./grammar":68,"dup":64}],71:[function(require,module,exports){ -arguments[4][65][0].apply(exports,arguments) -},{"./grammar":68,"dup":65}],72:[function(require,module,exports){ +},{}],64:[function(require,module,exports){ +var grammar = module.exports = { + v: [{ + name: 'version', + reg: /^(\d*)$/ + }], + o: [{ //o=- 20518 0 IN IP4 203.0.113.1 + // NB: sessionId will be a String in most cases because it is huge + name: 'origin', + reg: /^(\S*) (\d*) (\d*) (\S*) IP(\d) (\S*)/, + names: ['username', 'sessionId', 'sessionVersion', 'netType', 'ipVer', 'address'], + format: "%s %s %d %s IP%d %s" + }], + // default parsing of these only (though some of these feel outdated) + s: [{ name: 'name' }], + i: [{ name: 'description' }], + u: [{ name: 'uri' }], + e: [{ name: 'email' }], + p: [{ name: 'phone' }], + z: [{ name: 'timezones' }], // TODO: this one can actually be parsed properly.. + r: [{ name: 'repeats' }], // TODO: this one can also be parsed properly + //k: [{}], // outdated thing ignored + t: [{ //t=0 0 + name: 'timing', + reg: /^(\d*) (\d*)/, + names: ['start', 'stop'], + format: "%d %d" + }], + c: [{ //c=IN IP4 10.47.197.26 + name: 'connection', + reg: /^IN IP(\d) (\S*)/, + names: ['version', 'ip'], + format: "IN IP%d %s" + }], + b: [{ //b=AS:4000 + push: 'bandwidth', + reg: /^(TIAS|AS|CT|RR|RS):(\d*)/, + names: ['type', 'limit'], + format: "%s:%s" + }], + m: [{ //m=video 51744 RTP/AVP 126 97 98 34 31 + // NB: special - pushes to session + // TODO: rtp/fmtp should be filtered by the payloads found here? + reg: /^(\w*) (\d*) ([\w\/]*)(?: (.*))?/, + names: ['type', 'port', 'protocol', 'payloads'], + format: "%s %d %s %s" + }], + a: [ + { //a=rtpmap:110 opus/48000/2 + push: 'rtp', + reg: /^rtpmap:(\d*) ([\w\-]*)\/(\d*)(?:\s*\/(\S*))?/, + names: ['payload', 'codec', 'rate', 'encoding'], + format: function (o) { + return (o.encoding) ? + "rtpmap:%d %s/%s/%s": + "rtpmap:%d %s/%s"; + } + }, + { //a=fmtp:108 profile-level-id=24;object=23;bitrate=64000 + push: 'fmtp', + reg: /^fmtp:(\d*) (\S*)/, + names: ['payload', 'config'], + format: "fmtp:%d %s" + }, + { //a=control:streamid=0 + name: 'control', + reg: /^control:(.*)/, + format: "control:%s" + }, + { //a=rtcp:65179 IN IP4 193.84.77.194 + name: 'rtcp', + reg: /^rtcp:(\d*)(?: (\S*) IP(\d) (\S*))?/, + names: ['port', 'netType', 'ipVer', 'address'], + format: function (o) { + return (o.address != null) ? + "rtcp:%d %s IP%d %s": + "rtcp:%d"; + } + }, + { //a=rtcp-fb:98 trr-int 100 + push: 'rtcpFbTrrInt', + reg: /^rtcp-fb:(\*|\d*) trr-int (\d*)/, + names: ['payload', 'value'], + format: "rtcp-fb:%d trr-int %d" + }, + { //a=rtcp-fb:98 nack rpsi + push: 'rtcpFb', + reg: /^rtcp-fb:(\*|\d*) ([\w-_]*)(?: ([\w-_]*))?/, + names: ['payload', 'type', 'subtype'], + format: function (o) { + return (o.subtype != null) ? + "rtcp-fb:%s %s %s": + "rtcp-fb:%s %s"; + } + }, + { //a=extmap:2 urn:ietf:params:rtp-hdrext:toffset + //a=extmap:1/recvonly URI-gps-string + push: 'ext', + reg: /^extmap:([\w_\/]*) (\S*)(?: (\S*))?/, + names: ['value', 'uri', 'config'], // value may include "/direction" suffix + format: function (o) { + return (o.config != null) ? + "extmap:%s %s %s": + "extmap:%s %s"; + } + }, + { + //a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:PS1uQCVeeCFCanVmcjkpPywjNWhcYD0mXXtxaVBR|2^20|1:32 + push: 'crypto', + reg: /^crypto:(\d*) ([\w_]*) (\S*)(?: (\S*))?/, + names: ['id', 'suite', 'config', 'sessionConfig'], + format: function (o) { + return (o.sessionConfig != null) ? + "crypto:%d %s %s %s": + "crypto:%d %s %s"; + } + }, + { //a=setup:actpass + name: 'setup', + reg: /^setup:(\w*)/, + format: "setup:%s" + }, + { //a=mid:1 + name: 'mid', + reg: /^mid:([^\s]*)/, + format: "mid:%s" + }, + { //a=msid:0c8b064d-d807-43b4-b434-f92a889d8587 98178685-d409-46e0-8e16-7ef0db0db64a + name: 'msid', + reg: /^msid:(.*)/, + format: "msid:%s" + }, + { //a=ptime:20 + name: 'ptime', + reg: /^ptime:(\d*)/, + format: "ptime:%d" + }, + { //a=maxptime:60 + name: 'maxptime', + reg: /^maxptime:(\d*)/, + format: "maxptime:%d" + }, + { //a=sendrecv + name: 'direction', + reg: /^(sendrecv|recvonly|sendonly|inactive)/ + }, + { //a=ice-lite + name: 'icelite', + reg: /^(ice-lite)/ + }, + { //a=ice-ufrag:F7gI + name: 'iceUfrag', + reg: /^ice-ufrag:(\S*)/, + format: "ice-ufrag:%s" + }, + { //a=ice-pwd:x9cml/YzichV2+XlhiMu8g + name: 'icePwd', + reg: /^ice-pwd:(\S*)/, + format: "ice-pwd:%s" + }, + { //a=fingerprint:SHA-1 00:11:22:33:44:55:66:77:88:99:AA:BB:CC:DD:EE:FF:00:11:22:33 + name: 'fingerprint', + reg: /^fingerprint:(\S*) (\S*)/, + names: ['type', 'hash'], + format: "fingerprint:%s %s" + }, + { + //a=candidate:0 1 UDP 2113667327 203.0.113.1 54400 typ host + //a=candidate:1162875081 1 udp 2113937151 192.168.34.75 60017 typ host generation 0 + //a=candidate:3289912957 2 udp 1845501695 193.84.77.194 60017 typ srflx raddr 192.168.34.75 rport 60017 generation 0 + push:'candidates', + reg: /^candidate:(\S*) (\d*) (\S*) (\d*) (\S*) (\d*) typ (\S*)(?: raddr (\S*) rport (\d*))?(?: generation (\d*))?/, + names: ['foundation', 'component', 'transport', 'priority', 'ip', 'port', 'type', 'raddr', 'rport', 'generation'], + format: function (o) { + var str = "candidate:%s %d %s %d %s %d typ %s"; + // NB: candidate has two optional chunks, so %void middle one if it's missing + str += (o.raddr != null) ? " raddr %s rport %d" : "%v%v"; + if (o.generation != null) { + str += " generation %d"; + } + return str; + } + }, + { //a=end-of-candidates (keep after the candidates line for readability) + name: 'endOfCandidates', + reg: /^(end-of-candidates)/ + }, + { //a=remote-candidates:1 203.0.113.1 54400 2 203.0.113.1 54401 ... + name: 'remoteCandidates', + reg: /^remote-candidates:(.*)/, + format: "remote-candidates:%s" + }, + { //a=ice-options:google-ice + name: 'iceOptions', + reg: /^ice-options:(\S*)/, + format: "ice-options:%s" + }, + { //a=ssrc:2566107569 cname:t9YU8M1UxTF8Y1A1 + push: "ssrcs", + reg: /^ssrc:(\d*) ([\w_]*):(.*)/, + names: ['id', 'attribute', 'value'], + format: "ssrc:%d %s:%s" + }, + { //a=ssrc-group:FEC 1 2 + push: "ssrcGroups", + reg: /^ssrc-group:(\w*) (.*)/, + names: ['semantics', 'ssrcs'], + format: "ssrc-group:%s %s" + }, + { //a=msid-semantic: WMS Jvlam5X3SX1OP6pn20zWogvaKJz5Hjf9OnlV + name: "msidSemantic", + reg: /^msid-semantic:\s?(\w*) (\S*)/, + names: ['semantic', 'token'], + format: "msid-semantic: %s %s" // space after ":" is not accidental + }, + { //a=group:BUNDLE audio video + push: 'groups', + reg: /^group:(\w*) (.*)/, + names: ['type', 'mids'], + format: "group:%s %s" + }, + { //a=rtcp-mux + name: 'rtcpMux', + reg: /^(rtcp-mux)/ + }, + { //a=rtcp-rsize + name: 'rtcpRsize', + reg: /^(rtcp-rsize)/ + }, + { // any a= that we don't understand is kepts verbatim on media.invalid + push: 'invalid', + names: ["value"] + } + ] +}; + +// set sensible defaults to avoid polluting the grammar with boring details +Object.keys(grammar).forEach(function (key) { + var objs = grammar[key]; + objs.forEach(function (obj) { + if (!obj.reg) { + obj.reg = /(.*)/; + } + if (!obj.format) { + obj.format = "%s"; + } + }); +}); + +},{}],65:[function(require,module,exports){ +var parser = require('./parser'); +var writer = require('./writer'); + +exports.write = writer; +exports.parse = parser.parse; +exports.parseFmtpConfig = parser.parseFmtpConfig; +exports.parsePayloads = parser.parsePayloads; +exports.parseRemoteCandidates = parser.parseRemoteCandidates; + +},{"./parser":66,"./writer":67}],66:[function(require,module,exports){ +var toIntIfInt = function (v) { + return String(Number(v)) === v ? Number(v) : v; +}; + +var attachProperties = function (match, location, names, rawName) { + if (rawName && !names) { + location[rawName] = toIntIfInt(match[1]); + } + else { + for (var i = 0; i < names.length; i += 1) { + if (match[i+1] != null) { + location[names[i]] = toIntIfInt(match[i+1]); + } + } + } +}; + +var parseReg = function (obj, location, content) { + var needsBlank = obj.name && obj.names; + if (obj.push && !location[obj.push]) { + location[obj.push] = []; + } + else if (needsBlank && !location[obj.name]) { + location[obj.name] = {}; + } + var keyLocation = obj.push ? + {} : // blank object that will be pushed + needsBlank ? location[obj.name] : location; // otherwise, named location or root + + attachProperties(content.match(obj.reg), keyLocation, obj.names, obj.name); + + if (obj.push) { + location[obj.push].push(keyLocation); + } +}; + +var grammar = require('./grammar'); +var validLine = RegExp.prototype.test.bind(/^([a-z])=(.*)/); + +exports.parse = function (sdp) { + var session = {} + , media = [] + , location = session; // points at where properties go under (one of the above) + + // parse lines we understand + sdp.split(/(\r\n|\r|\n)/).filter(validLine).forEach(function (l) { + var type = l[0]; + var content = l.slice(2); + if (type === 'm') { + media.push({rtp: [], fmtp: []}); + location = media[media.length-1]; // point at latest media line + } + + for (var j = 0; j < (grammar[type] || []).length; j += 1) { + var obj = grammar[type][j]; + if (obj.reg.test(content)) { + return parseReg(obj, location, content); + } + } + }); + + session.media = media; // link it up + return session; +}; + +var fmtpReducer = function (acc, expr) { + var s = expr.split('='); + if (s.length === 2) { + acc[s[0]] = toIntIfInt(s[1]); + } + return acc; +}; + +exports.parseFmtpConfig = function (str) { + return str.split(';').reduce(fmtpReducer, {}); +}; + +exports.parsePayloads = function (str) { + return str.split(' ').map(Number); +}; + +exports.parseRemoteCandidates = function (str) { + var candidates = []; + var parts = str.split(' ').map(toIntIfInt); + for (var i = 0; i < parts.length; i += 3) { + candidates.push({ + component: parts[i], + ip: parts[i + 1], + port: parts[i + 2] + }); + } + return candidates; +}; + +},{"./grammar":64}],67:[function(require,module,exports){ +var grammar = require('./grammar'); + +// customized util.format - discards excess arguments and can void middle ones +var formatRegExp = /%[sdv%]/g; +var format = function (formatStr) { + var i = 1; + var args = arguments; + var len = args.length; + return formatStr.replace(formatRegExp, function (x) { + if (i >= len) { + return x; // missing argument + } + var arg = args[i]; + i += 1; + switch (x) { + case '%%': + return '%'; + case '%s': + return String(arg); + case '%d': + return Number(arg); + case '%v': + return ''; + } + }); + // NB: we discard excess arguments - they are typically undefined from makeLine +}; + +var makeLine = function (type, obj, location) { + var str = obj.format instanceof Function ? + (obj.format(obj.push ? location : location[obj.name])) : + obj.format; + + var args = [type + '=' + str]; + if (obj.names) { + for (var i = 0; i < obj.names.length; i += 1) { + var n = obj.names[i]; + if (obj.name) { + args.push(location[obj.name][n]); + } + else { // for mLine and push attributes + args.push(location[obj.names[i]]); + } + } + } + else { + args.push(location[obj.name]); + } + return format.apply(null, args); +}; + +// RFC specified order +// TODO: extend this with all the rest +var defaultOuterOrder = [ + 'v', 'o', 's', 'i', + 'u', 'e', 'p', 'c', + 'b', 't', 'r', 'z', 'a' +]; +var defaultInnerOrder = ['i', 'c', 'b', 'a']; + + +module.exports = function (session, opts) { + opts = opts || {}; + // ensure certain properties exist + if (session.version == null) { + session.version = 0; // "v=0" must be there (only defined version atm) + } + if (session.name == null) { + session.name = " "; // "s= " must be there if no meaningful name set + } + session.media.forEach(function (mLine) { + if (mLine.payloads == null) { + mLine.payloads = ""; + } + }); + + var outerOrder = opts.outerOrder || defaultOuterOrder; + var innerOrder = opts.innerOrder || defaultInnerOrder; + var sdp = []; + + // loop through outerOrder for matching properties on session + outerOrder.forEach(function (type) { + grammar[type].forEach(function (obj) { + if (obj.name in session && session[obj.name] != null) { + sdp.push(makeLine(type, obj, session)); + } + else if (obj.push in session && session[obj.push] != null) { + session[obj.push].forEach(function (el) { + sdp.push(makeLine(type, obj, el)); + }); + } + }); + }); + + // then for each media line, follow the innerOrder + session.media.forEach(function (mLine) { + sdp.push(makeLine('m', grammar.m[0], mLine)); + + innerOrder.forEach(function (type) { + grammar[type].forEach(function (obj) { + if (obj.name in mLine && mLine[obj.name] != null) { + sdp.push(makeLine(type, obj, mLine)); + } + else if (obj.push in mLine && mLine[obj.push] != null) { + mLine[obj.push].forEach(function (el) { + sdp.push(makeLine(type, obj, el)); + }); + } + }); + }); + }); + + return sdp.join('\r\n') + '\r\n'; +}; + +},{"./grammar":64}],68:[function(require,module,exports){ var grammar = module.exports = { v: [{ name: 'version', @@ -21299,9 +21513,9 @@ Object.keys(grammar).forEach(function (key) { }); }); -},{}],73:[function(require,module,exports){ -arguments[4][63][0].apply(exports,arguments) -},{"./parser":74,"./writer":75,"dup":63}],74:[function(require,module,exports){ +},{}],69:[function(require,module,exports){ +arguments[4][65][0].apply(exports,arguments) +},{"./parser":70,"./writer":71,"dup":65}],70:[function(require,module,exports){ var toIntIfInt = function (v) { return String(Number(v)) === v ? Number(v) : v; }; @@ -21396,16 +21610,16 @@ exports.parseRemoteCandidates = function (str) { return candidates; }; -},{"./grammar":72}],75:[function(require,module,exports){ -arguments[4][65][0].apply(exports,arguments) -},{"./grammar":72,"dup":65}],76:[function(require,module,exports){ +},{"./grammar":68}],71:[function(require,module,exports){ +arguments[4][67][0].apply(exports,arguments) +},{"./grammar":68,"dup":67}],72:[function(require,module,exports){ var MediaStreamType = { VIDEO_TYPE: "Video", AUDIO_TYPE: "Audio" }; module.exports = MediaStreamType; -},{}],77:[function(require,module,exports){ +},{}],73:[function(require,module,exports){ var RTCEvents = { RTC_READY: "rtc.ready", DATA_CHANNEL_OPEN: "rtc.data_channel_open", @@ -21416,7 +21630,7 @@ var RTCEvents = { }; module.exports = RTCEvents; -},{}],78:[function(require,module,exports){ +},{}],74:[function(require,module,exports){ var Resolutions = { "1080": { width: 1920, @@ -21470,7 +21684,7 @@ var Resolutions = { } }; module.exports = Resolutions; -},{}],79:[function(require,module,exports){ +},{}],75:[function(require,module,exports){ var StreamEventTypes = { EVENT_TYPE_LOCAL_CREATED: "stream.local_created", @@ -21485,7 +21699,7 @@ var StreamEventTypes = { }; module.exports = StreamEventTypes; -},{}],80:[function(require,module,exports){ +},{}],76:[function(require,module,exports){ var AuthenticationEvents = { /** * Event callback arguments: @@ -21499,7 +21713,7 @@ var AuthenticationEvents = { }; module.exports = AuthenticationEvents; -},{}],81:[function(require,module,exports){ +},{}],77:[function(require,module,exports){ var DesktopSharingEventTypes = { INIT: "ds.init", @@ -21509,56 +21723,94 @@ var DesktopSharingEventTypes = { }; module.exports = DesktopSharingEventTypes; -},{}],82:[function(require,module,exports){ +},{}],78:[function(require,module,exports){ var Constants = { LOCAL_JID: 'local' }; module.exports = Constants; -},{}],83:[function(require,module,exports){ +},{}],79:[function(require,module,exports){ var XMPPEvents = { + // Designates an event indicating that the connection to the XMPP server + // failed. CONNECTION_FAILED: "xmpp.connection.failed", - // Indicates an interrupted connection event. + // Designates an event indicating that the media (ICE) connection was + // interrupted. This should go to the RTC module. CONNECTION_INTERRUPTED: "xmpp.connection.interrupted", - // Indicates a restored connection event. + // Designates an event indicating that the media (ICE) connection was + // restored. This should go to the RTC module. CONNECTION_RESTORED: "xmpp.connection.restored", - CONFERENCE_CREATED: "xmpp.conferenceCreated.jingle", + // Designates an event indicating that an offer (e.g. Jingle + // session-initiate) was received. CALL_INCOMING: "xmpp.callincoming.jingle", - DISPOSE_CONFERENCE: "xmpp.dispose_conference", - GRACEFUL_SHUTDOWN: "xmpp.graceful_shutdown", + // Designates an event indicating that we were kicked from the XMPP MUC. KICKED: "xmpp.kicked", - BRIDGE_DOWN: "xmpp.bridge_down", + // Designates an event indicating that the userID for a specific JID has + // changed. USER_ID_CHANGED: "xmpp.user_id_changed", - // We joined the MUC + // Designates an event indicating that we have joined the XMPP MUC. MUC_JOINED: "xmpp.muc_joined", - // A member joined the MUC + // Designates an event indicating that a participant joined the XMPP MUC. MUC_MEMBER_JOINED: "xmpp.muc_member_joined", - // A member left the MUC + // Designates an event indicating that a participant left the XMPP MUC. MUC_MEMBER_LEFT: "xmpp.muc_member_left", + // Designates an event indicating that the MUC role of a participant has + // changed. MUC_ROLE_CHANGED: "xmpp.muc_role_changed", + // Designates an event indicating that the XMPP MUC was destroyed. MUC_DESTROYED: "xmpp.muc_destroyed", + // Designates an event indicating that the display name of a participant + // has changed. DISPLAY_NAME_CHANGED: "xmpp.display_name_changed", + // Designates an event indicating that we received statistics from a + // participant in the MUC. REMOTE_STATS: "xmpp.remote_stats", + // Designates an event indicating that our role in the XMPP MUC has changed. LOCAL_ROLE_CHANGED: "xmpp.localrole_changed", - PRESENCE_STATUS: "xmpp.presence_status", - RESERVATION_ERROR: "xmpp.room_reservation_error", + // Designates an event indicating that the subject of the XMPP MUC has + // changed. SUBJECT_CHANGED: "xmpp.subject_changed", + // Designates an event indicating that an XMPP message in the MUC was + // received. MESSAGE_RECEIVED: "xmpp.message_received", + // Designates an event indicating that we sent an XMPP message to the MUC. SENDING_CHAT_MESSAGE: "xmpp.sending_chat_message", + // Designates an event indicating that the video type (e.g. 'camera' or + // 'screen') for a participant has changed. + PARTICIPANT_VIDEO_TYPE_CHANGED: "xmpp.video_type", + // Designates an event indicating that a participant in the XMPP MUC has + // advertised that they have audio muted (or unmuted). + PARTICIPANT_AUDIO_MUTED: "xmpp.audio_muted", + // Designates an event indicating that a participant in the XMPP MUC has + // advertised that they have video muted (or unmuted). + PARTICIPANT_VIDEO_MUTED: "xmpp.video_muted", + // Designates an event indicating that the focus has asked us to mute our + // audio. + AUDIO_MUTED_BY_FOCUS: "xmpp.audio_muted_by_focus", + // Designates an event indicating that a moderator in the room changed the + // "start muted" settings for the conference. + START_MUTED_SETTING_CHANGED: "xmpp.start_muted_setting_changed", + // Designates an event indicating that we should join the conference with + // audio and/or video muted. + START_MUTED_FROM_FOCUS: "xmpp.start_muted_from_focus", + + + PEERCONNECTION_READY: "xmpp.peerconnection_ready", + CONFERENCE_SETUP_FAILED: "xmpp.conference_setup_failed", PASSWORD_REQUIRED: "xmpp.password_required", AUTHENTICATION_REQUIRED: "xmpp.authentication_required", CHAT_ERROR_RECEIVED: "xmpp.chat_error_received", ETHERPAD: "xmpp.etherpad", DEVICE_AVAILABLE: "xmpp.device_available", - VIDEO_TYPE: "xmpp.video_type", - PEERCONNECTION_READY: "xmpp.peerconnection_ready", - CONFERENCE_SETUP_FAILED: "xmpp.conference_setup_failed", - AUDIO_MUTED: "xmpp.audio_muted", - VIDEO_MUTED: "xmpp.video_muted", - AUDIO_MUTED_BY_FOCUS: "xmpp.audio_muted_by_focus", - START_MUTED_SETTING_CHANGED: "xmpp.start_muted_setting_changed", - START_MUTED_FROM_FOCUS: "xmpp.start_muted_from_focus", + BRIDGE_DOWN: "xmpp.bridge_down", + PRESENCE_STATUS: "xmpp.presence_status", + RESERVATION_ERROR: "xmpp.room_reservation_error", + DISPOSE_CONFERENCE: "xmpp.dispose_conference", + GRACEFUL_SHUTDOWN: "xmpp.graceful_shutdown", + // TODO: only used in a hack, should probably be removed. SET_LOCAL_DESCRIPTION_ERROR: 'xmpp.set_local_description_error', + // TODO: only used in a hack, should probably be removed. SET_REMOTE_DESCRIPTION_ERROR: 'xmpp.set_remote_description_error', + // TODO: only used in a hack, should probably be removed. CREATE_ANSWER_ERROR: 'xmpp.create_answer_error', JINGLE_FATAL_ERROR: 'xmpp.jingle_fatal_error', PROMPT_FOR_LOGIN: 'xmpp.prompt_for_login', diff --git a/package.json b/package.json index db458a0da..49cd673a8 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "events": "*", "pako": "*", "i18next-client": "1.7.7", - "sdp-interop": "0.1.4", + "sdp-interop": "0.1.10", "sdp-transform": "1.4.1", "sdp-simulcast": "0.1.0", "async": "0.9.0",