Fix Jingle session direction translation

legastero · Jan 2, 2019 · be6962c · be6962c
1 parent 20b61b7
commit be6962c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/src/jingle/FileTransferSession.js b/src/jingle/FileTransferSession.js
@@ -241,7 +241,7 @@ export default class FileTransferSession extends ICESession {
         this.role = 'responder';
         this.state = 'pending';
 
-        const json = convertRequestToIntermediate(changes, this.role);
+        const json = convertRequestToIntermediate(changes, this.peerRole);
         const sdp = exportToSDP(json);
         const desc = changes.contents[0].application;
 

diff --git a/src/jingle/ICESession.js b/src/jingle/ICESession.js
@@ -130,7 +130,7 @@ export default class ICESession extends BaseSession {
     onSessionAccept(changes, cb) {
         this.state = 'active';
 
-        const json = convertRequestToIntermediate(changes, this.role);
+        const json = convertRequestToIntermediate(changes, this.peerRole);
         const sdp = exportToSDP(json);
         this.pc.setRemoteDescription({ type: 'answer', sdp }).then(
             () => {
@@ -299,7 +299,7 @@ export default class ICESession extends BaseSession {
      */
     maybeRestartIce() {
         // only initiators do an ice-restart to avoid conflicts.
-        if (this.role !== 'initiator') {
+        if (!this.isInitiator) {
             return;
         }
         if (this._maybeRestartingIce !== undefined) {
@@ -316,7 +316,7 @@ export default class ICESession extends BaseSession {
     /* actually do an ice restart */
     restartIce() {
         // only initiators do an ice-restart to avoid conflicts.
-        if (this.role !== 'initiator') {
+        if (!this.isInitiator) {
             return;
         }
         if (this._maybeRestartingIce !== undefined) {

diff --git a/src/jingle/MediaSession.js b/src/jingle/MediaSession.js
@@ -45,7 +45,6 @@ export default class MediaSession extends ICESession {
         }
 
         this._ringing = false;
-        this.role = 'responder';
     }
 
     // ----------------------------------------------------------------
@@ -94,6 +93,8 @@ export default class MediaSession extends ICESession {
 
         this.state = 'active';
 
+        this.role = 'resonder';
+
         this.pc
             .createAnswer(opts)
             .then(answer => {
@@ -202,9 +203,9 @@ export default class MediaSession extends ICESession {
         this._log('info', 'Initiating incoming session');
 
         this.state = 'pending';
-
         this.role = 'responder';
-        const json = convertRequestToIntermediate(changes, this.role);
+
+        const json = convertRequestToIntermediate(changes, this.peerRole);
         json.media.forEach(media => {
             if (!media.streams) {
                 media.streams = [{ stream: 'legacy', track: media.kind }];

diff --git a/src/jingle/Session.js b/src/jingle/Session.js
@@ -27,7 +27,7 @@ export default class JingleSession extends WildEmitter {
 
         this.sid = opts.sid || uuid.v4();
         this.peerID = opts.peerID;
-        this.isInitiator = opts.initiator || false;
+        this.role = opts.initiator ? 'initiator' : 'responder';
         this.parent = opts.parent;
         this.state = 'starting';
         this.connectionState = 'starting';
@@ -58,6 +58,14 @@ export default class JingleSession extends WildEmitter {
         });
     }
 
+    get isInitiator() {
+        return this.role === 'initiator';
+    }
+
+    get peerRole() {
+        return this.isInitiator ? 'responder' : 'initiator';
+    }
+
     get state() {
         return this._sessionState;
     }