Merge pull request webrtc#1534 from fippo/restart-fix

ice-restart: fix functionality
Contndr-Inc · Apr 6, 2022 · d7114f1 · d7114f1
2 parents 61fa9fa + b83125d
commit d7114f1
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,6 +14,7 @@ jobs:
   test:
     needs: lint
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     strategy:
       matrix:
         browser: [chrome]

diff --git a/package.json b/package.json
@@ -22,15 +22,15 @@
     "start": "http-server . -c-1",
     "test": "npm run eslint && npm run stylelint",
     "eslint": "eslint 'src/content/**/*.js'",
-    "mocha": "mocha 'src/content/**/test.js'",
+    "mocha": "mocha --timeout 5000 'src/content/**/test.js'",
     "stylelint": "stylelint 'src/**/*.css'"
   },
   "eslintIgnore": [
     "'**/third_party/*.js'"
   ],
   "devDependencies": {
     "chai": "^4.3.6",
-    "chromedriver": "^98.0.1",
+    "chromedriver": ">98.0.1",
     "eslint": "^8.9.0",
     "eslint-config-google": "^0.14.0",
     "geckodriver": "^3.0.1",

diff --git a/src/content/datachannel/filetransfer/js/test.js b/src/content/datachannel/filetransfer/js/test.js
@@ -15,7 +15,7 @@ let driver;
 const path = '/src/content/datachannel/filetransfer/index.html';
 const url = `${process.env.BASEURL ? process.env.BASEURL : ('file://' + process.cwd())}${path}`;
 
-describe('datachannel basic', () => {
+describe('datachannel filetransfer', () => {
   before(() => {
     driver = seleniumHelpers.buildDriver();
   });

diff --git a/src/content/peerconnection/restart-ice/js/main.js b/src/content/peerconnection/restart-ice/js/main.js
@@ -32,6 +32,8 @@ remoteVideo.addEventListener('loadedmetadata', function() {
   console.log(`Remote video videoWidth: ${this.videoWidth}px,  videoHeight: ${this.videoHeight}px`);
 });
 
+const useSelectedCandidatePairChange = window.RTCIceTransport && 'onselectedcandidatepairchange' in RTCIceTransport.prototype;
+
 remoteVideo.onresize = () => {
   console.log(`Remote video size changed to ${remoteVideo.videoWidth}x${remoteVideo.videoHeight}`);
   // We'll use the first onsize callback as an indication that video has started
@@ -170,6 +172,18 @@ function onCreateAnswerSuccess(desc) {
   pc2.setLocalDescription(desc).then(() => onSetLocalSuccess(pc2), onSetSessionDescriptionError);
   console.log('pc1 setRemoteDescription start');
   pc1.setRemoteDescription(desc).then(() => onSetRemoteSuccess(pc1), onSetSessionDescriptionError);
+
+  if (useSelectedCandidatePairChange) {
+    pc1.getSenders()[0].transport.iceTransport.onselectedcandidatepairchange = () => {
+      checkStats(pc1);
+      if (pc1.iceConnectionState === 'connected') {
+        restartButton.disabled = false;
+      }
+    };
+    pc2.getSenders()[0].transport.iceTransport.onselectedcandidatepairchange = () => {
+      checkStats(pc2);
+    };
+  }
 }
 
 function onIceCandidate(pc, event) {
@@ -191,10 +205,11 @@ function onIceStateChange(pc, event) {
   if (pc) {
     console.log(`${getName(pc)} ICE state: ${pc.iceConnectionState}`);
     console.log('ICE state change event: ', event);
-    // TODO: get rid of this in favor of http://w3c.github.io/webrtc-pc/#widl-RTCIceTransport-onselectedcandidatepairchange
-    if (pc.iceConnectionState === 'connected' ||
-      pc.iceConnectionState === 'completed') {
-      checkStats(pc);
+    if (!useSelectedCandidatePairChange) {
+      if (pc.iceConnectionState === 'connected' ||
+        pc.iceConnectionState === 'completed') {
+        checkStats(pc);
+      }
     }
   }
 }

diff --git a/src/content/peerconnection/restart-ice/js/test.js b/src/content/peerconnection/restart-ice/js/test.js
@@ -16,7 +16,7 @@ let driver;
 const path = '/src/content/peerconnection/restart-ice/index.html';
 const url = `${process.env.BASEURL ? process.env.BASEURL : ('file://' + process.cwd())}${path}`;
 
-describe.skip('peerconnection ice restart', () => {
+describe('peerconnection ice restart', () => {
   before(() => {
     driver = seleniumHelpers.buildDriver();
   });
@@ -58,7 +58,6 @@ describe.skip('peerconnection ice restart', () => {
     await driver.wait(() => driver.findElement(webdriver.By.id('restartButton')).isEnabled());
     await driver.findElement(webdriver.By.id('restartButton')).click();
 
-    await driver.wait(() => !driver.findElement(webdriver.By.id('restartButton')).isEnabled());
     await driver.wait(() => driver.findElement(webdriver.By.id('restartButton')).isEnabled());
 
     const secondCandidateIds = await Promise.all([