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

query browserDetails once and pass them #1070

Merged
merged 1 commit into from
Feb 14, 2021
Merged

query browserDetails once and pass them #1070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 48 additions & 48 deletions src/js/adapter_factory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@ export function adapterFactory({window} = {}, options = {
// Must be called before shimPeerConnection.
commonShim.shimAddIceCandidateNullOrEmpty(window, browserDetails);

chromeShim.shimGetUserMedia(window);
chromeShim.shimMediaStream(window);
chromeShim.shimPeerConnection(window);
chromeShim.shimOnTrack(window);
chromeShim.shimAddTrackRemoveTrack(window);
chromeShim.shimGetSendersWithDtmf(window);
chromeShim.shimGetStats(window);
chromeShim.shimSenderReceiverGetStats(window);
chromeShim.fixNegotiationNeeded(window);

commonShim.shimRTCIceCandidate(window);
commonShim.shimConnectionState(window);
commonShim.shimMaxMessageSize(window);
commonShim.shimSendThrowTypeError(window);
chromeShim.shimGetUserMedia(window, browserDetails);
chromeShim.shimMediaStream(window, browserDetails);
chromeShim.shimPeerConnection(window, browserDetails);
chromeShim.shimOnTrack(window, browserDetails);
chromeShim.shimAddTrackRemoveTrack(window, browserDetails);
chromeShim.shimGetSendersWithDtmf(window, browserDetails);
chromeShim.shimGetStats(window, browserDetails);
chromeShim.shimSenderReceiverGetStats(window, browserDetails);
chromeShim.fixNegotiationNeeded(window, browserDetails);

commonShim.shimRTCIceCandidate(window, browserDetails);
commonShim.shimConnectionState(window, browserDetails);
commonShim.shimMaxMessageSize(window, browserDetails);
commonShim.shimSendThrowTypeError(window, browserDetails);
commonShim.removeExtmapAllowMixed(window, browserDetails);
break;
case 'firefox':
Expand All @@ -81,22 +81,22 @@ export function adapterFactory({window} = {}, options = {
// Must be called before shimPeerConnection.
commonShim.shimAddIceCandidateNullOrEmpty(window, browserDetails);

firefoxShim.shimGetUserMedia(window);
firefoxShim.shimPeerConnection(window);
firefoxShim.shimOnTrack(window);
firefoxShim.shimRemoveStream(window);
firefoxShim.shimSenderGetStats(window);
firefoxShim.shimReceiverGetStats(window);
firefoxShim.shimRTCDataChannel(window);
firefoxShim.shimAddTransceiver(window);
firefoxShim.shimGetParameters(window);
firefoxShim.shimCreateOffer(window);
firefoxShim.shimCreateAnswer(window);

commonShim.shimRTCIceCandidate(window);
commonShim.shimConnectionState(window);
commonShim.shimMaxMessageSize(window);
commonShim.shimSendThrowTypeError(window);
firefoxShim.shimGetUserMedia(window, browserDetails);
firefoxShim.shimPeerConnection(window, browserDetails);
firefoxShim.shimOnTrack(window, browserDetails);
firefoxShim.shimRemoveStream(window, browserDetails);
firefoxShim.shimSenderGetStats(window, browserDetails);
firefoxShim.shimReceiverGetStats(window, browserDetails);
firefoxShim.shimRTCDataChannel(window, browserDetails);
firefoxShim.shimAddTransceiver(window, browserDetails);
firefoxShim.shimGetParameters(window, browserDetails);
firefoxShim.shimCreateOffer(window, browserDetails);
firefoxShim.shimCreateAnswer(window, browserDetails);

commonShim.shimRTCIceCandidate(window, browserDetails);
commonShim.shimConnectionState(window, browserDetails);
commonShim.shimMaxMessageSize(window, browserDetails);
commonShim.shimSendThrowTypeError(window, browserDetails);
break;
case 'edge':
if (!edgeShim || !edgeShim.shimPeerConnection || !options.shimEdge) {
Expand All @@ -107,15 +107,15 @@ export function adapterFactory({window} = {}, options = {
// Export to the adapter global object visible in the browser.
adapter.browserShim = edgeShim;

edgeShim.shimGetUserMedia(window);
edgeShim.shimGetDisplayMedia(window);
edgeShim.shimPeerConnection(window);
edgeShim.shimReplaceTrack(window);
edgeShim.shimGetUserMedia(window, browserDetails);
edgeShim.shimGetDisplayMedia(window, browserDetails);
edgeShim.shimPeerConnection(window, browserDetails);
edgeShim.shimReplaceTrack(window, browserDetails);

// the edge shim implements the full RTCIceCandidate object.

commonShim.shimMaxMessageSize(window);
commonShim.shimSendThrowTypeError(window);
commonShim.shimMaxMessageSize(window, browserDetails);
commonShim.shimSendThrowTypeError(window, browserDetails);
break;
case 'safari':
if (!safariShim || !options.shimSafari) {
Expand All @@ -129,18 +129,18 @@ export function adapterFactory({window} = {}, options = {
// Must be called before shimCallbackAPI.
commonShim.shimAddIceCandidateNullOrEmpty(window, browserDetails);

safariShim.shimRTCIceServerUrls(window);
safariShim.shimCreateOfferLegacy(window);
safariShim.shimCallbacksAPI(window);
safariShim.shimLocalStreamsAPI(window);
safariShim.shimRemoteStreamsAPI(window);
safariShim.shimTrackEventTransceiver(window);
safariShim.shimGetUserMedia(window);
safariShim.shimAudioContext(window);

commonShim.shimRTCIceCandidate(window);
commonShim.shimMaxMessageSize(window);
commonShim.shimSendThrowTypeError(window);
safariShim.shimRTCIceServerUrls(window, browserDetails);
safariShim.shimCreateOfferLegacy(window, browserDetails);
safariShim.shimCallbacksAPI(window, browserDetails);
safariShim.shimLocalStreamsAPI(window, browserDetails);
safariShim.shimRemoteStreamsAPI(window, browserDetails);
safariShim.shimTrackEventTransceiver(window, browserDetails);
safariShim.shimGetUserMedia(window, browserDetails);
safariShim.shimAudioContext(window, browserDetails);

commonShim.shimRTCIceCandidate(window, browserDetails);
commonShim.shimMaxMessageSize(window, browserDetails);
commonShim.shimSendThrowTypeError(window, browserDetails);
commonShim.removeExtmapAllowMixed(window, browserDetails);
break;
default:
Expand Down
10 changes: 3 additions & 7 deletions src/js/chrome/chrome_shim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,11 +436,10 @@ export function shimAddTrackRemoveTrackWithNative(window) {
};
}

export function shimAddTrackRemoveTrack(window) {
export function shimAddTrackRemoveTrack(window, browserDetails) {
if (!window.RTCPeerConnection) {
return;
}
const browserDetails = utils.detectBrowser(window);
// shim addTrack and removeTrack.
if (window.RTCPeerConnection.prototype.addTrack &&
browserDetails.version >= 65) {
Expand Down Expand Up @@ -663,9 +662,7 @@ export function shimAddTrackRemoveTrack(window) {
};
}

export function shimPeerConnection(window) {
const browserDetails = utils.detectBrowser(window);

export function shimPeerConnection(window, browserDetails) {
if (!window.RTCPeerConnection && window.webkitRTCPeerConnection) {
// very basic support for old versions.
window.RTCPeerConnection = window.webkitRTCPeerConnection;
Expand All @@ -691,8 +688,7 @@ export function shimPeerConnection(window) {
}

// Attempt to fix ONN in plan-b mode.
export function fixNegotiationNeeded(window) {
const browserDetails = utils.detectBrowser(window);
export function fixNegotiationNeeded(window, browserDetails) {
utils.wrapPeerConnectionEvent(window, 'negotiationneeded', e => {
const pc = e.target;
if (browserDetails.version < 72 || (pc.getConfiguration &&
Expand Down
4 changes: 1 addition & 3 deletions src/js/chrome/getusermedia.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@
import * as utils from '../utils.js';
const logging = utils.log;

export function shimGetUserMedia(window) {
export function shimGetUserMedia(window, browserDetails) {
const navigator = window && window.navigator;

if (!navigator.mediaDevices) {
return;
}

const browserDetails = utils.detectBrowser(window);

const constraintsToChrome_ = function(c) {
if (typeof c !== 'object' || c.mandatory || c.optional) {
return c;
Expand Down
3 changes: 1 addition & 2 deletions src/js/common_shim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,10 @@ export function shimRTCIceCandidate(window) {
});
}

export function shimMaxMessageSize(window) {
export function shimMaxMessageSize(window, browserDetails) {
if (!window.RTCPeerConnection) {
return;
}
const browserDetails = utils.detectBrowser(window);

if (!('sctp' in window.RTCPeerConnection.prototype)) {
Object.defineProperty(window.RTCPeerConnection.prototype, 'sctp', {
Expand Down
4 changes: 1 addition & 3 deletions src/js/edge/edge_shim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ import shimRTCPeerConnection from 'rtcpeerconnection-shim';
export {shimGetUserMedia} from './getusermedia';
export {shimGetDisplayMedia} from './getdisplaymedia';

export function shimPeerConnection(window) {
const browserDetails = utils.detectBrowser(window);

export function shimPeerConnection(window, browserDetails) {
if (window.RTCIceGatherer) {
if (!window.RTCIceCandidate) {
window.RTCIceCandidate = function RTCIceCandidate(args) {
Expand Down
4 changes: 1 addition & 3 deletions src/js/firefox/firefox_shim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ export function shimOnTrack(window) {
}
}

export function shimPeerConnection(window) {
const browserDetails = utils.detectBrowser(window);

export function shimPeerConnection(window, browserDetails) {
if (typeof window !== 'object' ||
!(window.RTCPeerConnection || window.mozRTCPeerConnection)) {
return; // probably media.peerconnection.enabled=false in about:config
Expand Down
3 changes: 1 addition & 2 deletions src/js/firefox/getusermedia.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@

import * as utils from '../utils';

export function shimGetUserMedia(window) {
const browserDetails = utils.detectBrowser(window);
export function shimGetUserMedia(window, browserDetails) {
const navigator = window && window.navigator;
const MediaStreamTrack = window && window.MediaStreamTrack;

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/maxMessageSize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ describe('maxMessageSize', () => {
fakeWindow.RTCPeerConnection = function() {};
fakeWindow.RTCPeerConnection.prototype.setRemoteDescription = () => {};
fakeWindow.RTCPeerConnection.prototype.getConfiguration = () => ({});
window.adapter.commonShim.shimMaxMessageSize(fakeWindow);
window.adapter.commonShim.shimMaxMessageSize(fakeWindow, browserDetails);

// Map specific browser versions to a test case.
// You can use the following version comparators: '<=', '>=' and '=='.
Expand Down
6 changes: 3 additions & 3 deletions test/unit/edge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ describe('Edge shim', () => {
getDisplayMedia: sinon.stub,
},
};
shim.shimPeerConnection(window);
shim.shimPeerConnection(window, {});
});

it('creates window.RTCPeerConnection', () => {
delete window.RTCPeerConnection;
shim.shimPeerConnection(window);
shim.shimPeerConnection(window, {});
expect(window.RTCPeerConnection).not.to.equal(undefined);
});

it('overrides window.RTCPeerConnection if it exists', () => {
window.RTCPeerConnection = true;
shim.shimPeerConnection(window);
shim.shimPeerConnection(window, {});
expect(window.RTCPeerConnection).not.to.equal(true);
});

Expand Down