Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix race condition when new transports are getting created #47

Closed
wants to merge 2 commits into from
Closed

fix race condition when new transports are getting created #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
315f91a
fix race condition when a new transports are getting created
james-maloney Oct 24, 2018
0b1302d
keep track of transport state with a promise
james-maloney Oct 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 23 additions & 17 deletions lib/handlers/Chrome55.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,8 @@ class SendHandler extends Handler
{
super('send', rtpParametersByKind, settings);

// Got transport local and remote parameters.
// @type {Boolean}
this._transportReady = false;
// @type {Promise}
this._pTransport = null;

// Local stream.
// @type {MediaStream}
Expand Down Expand Up @@ -131,8 +130,7 @@ class SendHandler extends Handler
})
.then(() =>
{
if (!this._transportReady)
return this._setupTransport();
return this._setupTransport();
})
.then(() =>
{
Expand Down Expand Up @@ -344,9 +342,14 @@ class SendHandler extends Handler

_setupTransport()
{
logger.debug('_setupTransport()');
if (this._pTransport !== null)
{
return this._pTransport;
}

return Promise.resolve()
logger.debug('_setupTransport()');

this._pTransport = Promise.resolve()
.then(() =>
{
// Get our local DTLS parameters.
Expand All @@ -371,9 +374,9 @@ class SendHandler extends Handler
{
// Provide the remote SDP handler with transport remote parameters.
this._remoteSdp.setTransportRemoteParameters(transportRemoteParameters);

this._transportReady = true;
});

return this._pTransport;
}
}

Expand All @@ -383,9 +386,8 @@ class RecvHandler extends Handler
{
super('recv', rtpParametersByKind, settings);

// Got transport remote parameters.
// @type {Boolean}
this._transportCreated = false;
// @type {Promise}
this._pTransport = null;

// Got transport local parameters.
// @type {Boolean}
Expand Down Expand Up @@ -433,8 +435,7 @@ class RecvHandler extends Handler
return Promise.resolve()
.then(() =>
{
if (!this._transportCreated)
return this._setupTransport();
return this._setupTransport();
})
.then(() =>
{
Expand Down Expand Up @@ -551,9 +552,14 @@ class RecvHandler extends Handler

_setupTransport()
{
if (this._pTransport !== null)
{
return this._pTransport;
}

logger.debug('_setupTransport()');

return Promise.resolve()
this._pTransport = Promise.resolve()
.then(() =>
{
// We need transport remote parameters.
Expand All @@ -563,9 +569,9 @@ class RecvHandler extends Handler
{
// Provide the remote SDP handler with transport remote parameters.
this._remoteSdp.setTransportRemoteParameters(transportRemoteParameters);

this._transportCreated = true;
});

return this._pTransport;
}

_updateTransport()
Expand Down
37 changes: 22 additions & 15 deletions lib/handlers/Chrome67.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,8 @@ class SendHandler extends Handler
{
super('send', rtpParametersByKind, settings);

// Got transport local and remote parameters.
// @type {Boolean}
this._transportReady = false;
// @type {Promise}
this._pTransport = null;

// Local stream.
// @type {MediaStream}
Expand Down Expand Up @@ -132,8 +131,7 @@ class SendHandler extends Handler
})
.then(() =>
{
if (!this._transportReady)
return this._setupTransport();
return this._setupTransport();
})
.then(() =>
{
Expand Down Expand Up @@ -294,9 +292,14 @@ class SendHandler extends Handler

_setupTransport()
{
if (this._pTransport !== null)
{
return this._pTransport;
}

logger.debug('_setupTransport()');

return Promise.resolve()
this._pTransport = Promise.resolve()
.then(() =>
{
// Get our local DTLS parameters.
Expand All @@ -322,8 +325,9 @@ class SendHandler extends Handler
// Provide the remote SDP handler with transport remote parameters.
this._remoteSdp.setTransportRemoteParameters(transportRemoteParameters);

this._transportReady = true;
});

return this._pTransport;
}
}

Expand All @@ -333,9 +337,8 @@ class RecvHandler extends Handler
{
super('recv', rtpParametersByKind, settings);

// Got transport remote parameters.
// @type {Boolean}
this._transportCreated = false;
// @type {Promise}
this._pTransport = null;

// Got transport local parameters.
// @type {Boolean}
Expand Down Expand Up @@ -383,8 +386,7 @@ class RecvHandler extends Handler
return Promise.resolve()
.then(() =>
{
if (!this._transportCreated)
return this._setupTransport();
return this._setupTransport();
})
.then(() =>
{
Expand Down Expand Up @@ -501,9 +503,14 @@ class RecvHandler extends Handler

_setupTransport()
{
if (this._pTransport !== null)
{
return this._pTransport;
}

logger.debug('_setupTransport()');

return Promise.resolve()
this._pTransport = Promise.resolve()
.then(() =>
{
// We need transport remote parameters.
Expand All @@ -513,9 +520,9 @@ class RecvHandler extends Handler
{
// Provide the remote SDP handler with transport remote parameters.
this._remoteSdp.setTransportRemoteParameters(transportRemoteParameters);

this._transportCreated = true;
});

return this._pTransport;
}

_updateTransport()
Expand Down
37 changes: 23 additions & 14 deletions lib/handlers/Chrome69.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,8 @@ class SendHandler extends Handler
{
super('send', rtpParametersByKind, settings);

// Got transport local and remote parameters.
// @type {Boolean}
this._transportReady = false;
// @type {Promise}
this._pTransport = null;

// Local stream.
// @type {MediaStream}
Expand Down Expand Up @@ -133,8 +132,7 @@ class SendHandler extends Handler
})
.then(() =>
{
if (!this._transportReady)
return this._setupTransport();
return this._setupTransport();
})
.then(() =>
{
Expand Down Expand Up @@ -304,9 +302,14 @@ class SendHandler extends Handler

_setupTransport()
{
if (this._pTransport !== null)
{
return this._pTransport;
}

logger.debug('_setupTransport()');

return Promise.resolve()
this._pTransport = Promise.resolve()
.then(() =>
{
// Get our local DTLS parameters.
Expand All @@ -331,9 +334,9 @@ class SendHandler extends Handler
{
// Provide the remote SDP handler with transport remote parameters.
this._remoteSdp.setTransportRemoteParameters(transportRemoteParameters);

this._transportReady = true;
});

return this._pTransport;
}
}

Expand All @@ -343,9 +346,8 @@ class RecvHandler extends Handler
{
super('recv', rtpParametersByKind, settings);

// Got transport remote parameters.
// @type {Boolean}
this._transportCreated = false;
// @type {Promise}
this._pTransport = null;

// Got transport local parameters.
// @type {Boolean}
Expand Down Expand Up @@ -393,8 +395,7 @@ class RecvHandler extends Handler
return Promise.resolve()
.then(() =>
{
if (!this._transportCreated)
return this._setupTransport();
return this._setupTransport();
})
.then(() =>
{
Expand Down Expand Up @@ -518,9 +519,14 @@ class RecvHandler extends Handler

_setupTransport()
{
if (this._pTransport !== null)
{
return this._pTransport;
}

logger.debug('_setupTransport()');

return Promise.resolve()
this._pTransport = Promise.resolve()
.then(() =>
{
// We need transport remote parameters.
Expand All @@ -532,7 +538,10 @@ class RecvHandler extends Handler
this._remoteSdp.setTransportRemoteParameters(transportRemoteParameters);

this._transportCreated = true;
this._transportCreating = false;
});

return this._pTransport;
}

_updateTransport()
Expand Down
21 changes: 13 additions & 8 deletions lib/handlers/Edge11.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@ export default class Edge11 extends EnhancedEventEmitter
video : ortc.getSendingRtpParameters('video', extendedRtpCapabilities)
};

// Got transport local and remote parameters.
// @type {Boolean}
this._transportReady = false;
// @type {Promise}
this._pTransport = null;

// ICE gatherer.
this._iceGatherer = null;
Expand Down Expand Up @@ -117,8 +116,7 @@ export default class Edge11 extends EnhancedEventEmitter
return Promise.resolve()
.then(() =>
{
if (!this._transportReady)
return this._setupTransport();
return this._setupTransport();
})
.then(() =>
{
Expand Down Expand Up @@ -230,8 +228,7 @@ export default class Edge11 extends EnhancedEventEmitter
return Promise.resolve()
.then(() =>
{
if (!this._transportReady)
return this._setupTransport();
return this._setupTransport();
})
.then(() =>
{
Expand Down Expand Up @@ -434,9 +431,14 @@ export default class Edge11 extends EnhancedEventEmitter

_setupTransport()
{
if (this._pTransport !== null)
{
return this._pTransport;
}

logger.debug('_setupTransport()');

return Promise.resolve()
this._pTransport = Promise.resolve()
.then(() =>
{
// Get our local DTLS parameters.
Expand Down Expand Up @@ -491,6 +493,9 @@ export default class Edge11 extends EnhancedEventEmitter
this._dtlsTransport.start(remoteDtlsParameters);

this._transportReady = true;
this._transportCreating = false;
});

return this._pTransport;
}
}