@webex/internal-plugin-device 3.6.0-next.1 → 3.6.0-next.3

package/dist/device.js

@@ -765,7 +765,7 @@ var Device = _webexCore.WebexPlugin.extend((_dec = (0, _webexCore.waitForValue)(
       _this9.resetLogoutTimer();
     });
   } /* eslint-enable require-jsdoc */,
-  version: "3.6.0-next.1"
+  version: "3.6.0-next.3"
 }, ((0, _applyDecoratedDescriptor2.default)(_obj, "refresh", [_common.oneFlight, _dec], (0, _getOwnPropertyDescriptor.default)(_obj, "refresh"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "register", [_common.oneFlight, _dec2], (0, _getOwnPropertyDescriptor.default)(_obj, "register"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "unregister", [_common.oneFlight, _dec3], (0, _getOwnPropertyDescriptor.default)(_obj, "unregister"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "markUrlFailedAndGetNew", [_dec4], (0, _getOwnPropertyDescriptor.default)(_obj, "markUrlFailedAndGetNew"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "initialize", [_dec5], (0, _getOwnPropertyDescriptor.default)(_obj, "initialize"), _obj)), _obj)));
 var _default = exports.default = Device;
 //# sourceMappingURL=device.js.map

package/dist/ipNetworkDetector.js

@@ -14,6 +14,12 @@ var _webexCore = require("@webex/webex-core");
  * Copyright (c) 2015-2023 Cisco Systems, Inc. See LICENSE file.
  */
 
+var STATE = {
+  INITIAL: 'initial',
+  IN_PROGRESS: 'in-progress',
+  IDLE: 'idle'
+};
+
 /**
  * @class
  */
@@ -27,9 +33,11 @@ var IpNetworkDetector = _webexCore.WebexPlugin.extend({
     // time [ms] it took to receive first IPv6 candidate
     firstMdns: ['number', true, -1],
     // time [ms] it took to receive first mDNS candidate
-    totalTime: ['number', true, -1] // total time [ms] it took to do the last IP network detection
+    totalTime: ['number', true, -1],
+    // total time [ms] it took to do the last IP network detection
+    state: ['string', true, STATE.INITIAL],
+    pendingDetection: ['object', false, undefined]
   },
-
   derived: {
     /**
      * True if we know we're on an IPv4 network,
@@ -165,35 +173,59 @@ var IpNetworkDetector = _webexCore.WebexPlugin.extend({
    * Detects if we are on IPv4 and/or IPv6 network. Once it resolves, read the
    * supportsIpV4 and supportsIpV6 props to find out the result.
    *
-   * @returns {Promise<Object>}
+   * @param {boolean} force - if false, the detection will only be done if we haven't managed to get any meaningful results yet
+   * @returns {Promise<void>}
    */
   detect: function detect() {
-    var _this2 = this;
+    var _arguments = arguments,
+      _this2 = this;
     return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-      var results, pc;
+      var force, results, pc, forceParam;
       return _regenerator.default.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.prev = 0;
+            force = _arguments.length > 0 && _arguments[0] !== undefined ? _arguments[0] : false;
+            if (!(_this2.state === STATE.IN_PROGRESS)) {
+              _context2.next = 4;
+              break;
+            }
+            _this2.pendingDetection = {
+              force: force
+            };
+            return _context2.abrupt("return");
+          case 4:
+            if (!(!force && _this2.state !== STATE.INITIAL && !_this2.receivedOnlyMDnsCandidates())) {
+              _context2.next = 6;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 6:
+            _context2.prev = 6;
+            _this2.state = STATE.IN_PROGRESS;
             pc = new RTCPeerConnection();
-            _context2.next = 4;
+            _context2.next = 11;
             return _this2.gatherLocalCandidates(pc);
-          case 4:
+          case 11:
             results = _context2.sent;
-          case 5:
-            _context2.prev = 5;
+          case 12:
+            _context2.prev = 12;
             pc.close();
-            return _context2.finish(5);
-          case 8:
-            return _context2.abrupt("return", results);
-          case 9:
+            _this2.state = STATE.IDLE;
+            return _context2.finish(12);
+          case 16:
+            if (_this2.pendingDetection) {
+              forceParam = _this2.pendingDetection.force;
+              _this2.pendingDetection = undefined;
+              _this2.detect(forceParam);
+            }
+          case 17:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0,, 5, 8]]);
+      }, _callee2, null, [[6,, 12, 16]]);
     }))();
   },
-  version: "3.6.0-next.1"
+  version: "3.6.0-next.3"
 });
 var _default = exports.default = IpNetworkDetector;
 //# sourceMappingURL=ipNetworkDetector.js.map

package/dist/ipNetworkDetector.js.map

@@ -1 +1 @@
-{"version":3,"names":["_webexCore","require","IpNetworkDetector","WebexPlugin","extend","idAttribute","namespace","props","firstIpV4","firstIpV6","firstMdns","totalTime","derived","supportsIpV4","deps","fn","undefined","receivedOnlyMDnsCandidates","supportsIpV6","gatherLocalCandidates","pc","_this","_asyncToGenerator2","default","_regenerator","mark","_callee","wrap","_callee$","_context","prev","next","abrupt","_promise","resolve","reject","done","startTime","performance","now","doneGatheringIceCandidates","onicecandidate","event","_event$candidate","candidate","address","endsWith","includes","onicegatheringstatechange","iceGatheringState","createDataChannel","createOffer","then","offer","setLocalDescription","catch","e","webex","logger","error","stop","detect","_this2","_callee2","results","_callee2$","_context2","RTCPeerConnection","sent","close","finish","version","_default","exports"],"sources":["ipNetworkDetector.ts"],"sourcesContent":["/*!\n * Copyright (c) 2015-2023 Cisco Systems, Inc. See LICENSE file.\n */\n\nimport {WebexPlugin} from '@webex/webex-core';\n\n/**\n * @class\n */\nconst IpNetworkDetector = WebexPlugin.extend({\n  idAttribute: 'IpNetworkDetectorId',\n\n  namespace: 'Device',\n\n  props: {\n    firstIpV4: ['number', true, -1], // time [ms] it took to receive first IPv4 candidate\n    firstIpV6: ['number', true, -1], // time [ms] it took to receive first IPv6 candidate\n    firstMdns: ['number', true, -1], // time [ms] it took to receive first mDNS candidate\n    totalTime: ['number', true, -1], // total time [ms] it took to do the last IP network detection\n  },\n\n  derived: {\n    /**\n     * True if we know we're on an IPv4 network,\n     * False if we know that we are not on an IPv4 network,\n     * undefined if we are not sure\n     */\n    supportsIpV4: {\n      deps: ['firstIpV4', 'firstIpV6', 'firstMdns', 'totalTime'],\n      /**\n       * Function for calculating the value of supportsIpV4 prop\n       * @returns {boolean | undefined}\n       */\n      fn() {\n        if (this.firstIpV4 >= 0) {\n          return true;\n        }\n        if (this.totalTime < 0) {\n          // we haven't completed the detection, yet\n          return undefined;\n        }\n        if (this.receivedOnlyMDnsCandidates()) {\n          return undefined;\n        }\n\n        return false;\n      },\n    },\n    /**\n     * True if we know we're on an IPv6 network,\n     * False if we know that we are not on an IPv6 network,\n     * undefined if we are not sure\n     */\n    supportsIpV6: {\n      deps: ['firstIpV4', 'firstIpV6', 'firstMdns', 'totalTime'],\n      /**\n       * Function for calculating the value of supportsIpV6 prop\n       * @returns {boolean | undefined}\n       */ fn() {\n        if (this.firstIpV6 >= 0) {\n          return true;\n        }\n        if (this.totalTime < 0) {\n          // we haven't completed the detection, yet\n          return undefined;\n        }\n        if (this.receivedOnlyMDnsCandidates()) {\n          return undefined;\n        }\n\n        return false;\n      },\n    },\n  },\n\n  /**\n   * Returns true if we have received only mDNS candidates - browsers usually do that if we don't have any user media permissions\n   *\n   * @private\n   * @returns {boolean}\n   */\n  receivedOnlyMDnsCandidates() {\n    return this.totalTime >= 0 && this.firstMdns >= 0 && this.firstIpV4 < 0 && this.firstIpV6 < 0;\n  },\n\n  /**\n   *\n   * @param {RTCPeerConnection} pc Peer connection to use\n   * @private\n   * @returns {Promise<void>}\n   */\n  async gatherLocalCandidates(pc: RTCPeerConnection): Promise<void> {\n    return new Promise((resolve, reject) => {\n      let done = false;\n\n      this.firstIpV4 = -1;\n      this.firstIpV6 = -1;\n      this.firstMdns = -1;\n      this.totalTime = -1;\n      const startTime = performance.now();\n\n      const doneGatheringIceCandidates = () => {\n        if (done) {\n          return;\n        }\n        done = true;\n\n        this.totalTime = performance.now() - startTime;\n\n        resolve();\n      };\n\n      pc.onicecandidate = (event) => {\n        if (event.candidate?.address) {\n          if (event.candidate.address.endsWith('.local')) {\n            // if we don't have camera/mic permissions, browser just gives us mDNS candidates\n            if (this.firstMdns === -1) {\n              this.firstMdns = performance.now() - startTime;\n            }\n          } else if (event.candidate.address.includes(':')) {\n            if (this.firstIpV6 === -1) {\n              this.firstIpV6 = performance.now() - startTime;\n            }\n          } else if (this.firstIpV4 === -1) {\n            this.firstIpV4 = performance.now() - startTime;\n          }\n\n          if (this.firstIpV4 >= 0 && this.firstIpV6 >= 0) {\n            // if we've got both ipv4 and ipv6 candidates, there is no need to wait for any more candidates, we can resolve now\n            resolve();\n          }\n        } else if (event.candidate === null) {\n          doneGatheringIceCandidates();\n        }\n      };\n\n      pc.onicegatheringstatechange = () => {\n        if (pc.iceGatheringState === 'complete') {\n          doneGatheringIceCandidates();\n        }\n      };\n\n      pc.createDataChannel('data');\n\n      pc.createOffer()\n        .then((offer) => pc.setLocalDescription(offer))\n        .catch((e) => {\n          this.webex.logger.error('Failed to detect ip network version:', e);\n          reject(e);\n        });\n    });\n  },\n\n  /**\n   * Detects if we are on IPv4 and/or IPv6 network. Once it resolves, read the\n   * supportsIpV4 and supportsIpV6 props to find out the result.\n   *\n   * @returns {Promise<Object>}\n   */\n  async detect() {\n    let results;\n    let pc;\n\n    try {\n      pc = new RTCPeerConnection();\n\n      results = await this.gatherLocalCandidates(pc);\n    } finally {\n      pc.close();\n    }\n\n    return results;\n  },\n});\n\nexport default IpNetworkDetector;\n"],"mappings":"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"}
+{"version":3,"names":["_webexCore","require","STATE","INITIAL","IN_PROGRESS","IDLE","IpNetworkDetector","WebexPlugin","extend","idAttribute","namespace","props","firstIpV4","firstIpV6","firstMdns","totalTime","state","pendingDetection","undefined","derived","supportsIpV4","deps","fn","receivedOnlyMDnsCandidates","supportsIpV6","gatherLocalCandidates","pc","_this","_asyncToGenerator2","default","_regenerator","mark","_callee","wrap","_callee$","_context","prev","next","abrupt","_promise","resolve","reject","done","startTime","performance","now","doneGatheringIceCandidates","onicecandidate","event","_event$candidate","candidate","address","endsWith","includes","onicegatheringstatechange","iceGatheringState","createDataChannel","createOffer","then","offer","setLocalDescription","catch","e","webex","logger","error","stop","detect","_arguments","arguments","_this2","_callee2","force","results","forceParam","_callee2$","_context2","length","RTCPeerConnection","sent","close","finish","version","_default","exports"],"sources":["ipNetworkDetector.ts"],"sourcesContent":["/*!\n * Copyright (c) 2015-2023 Cisco Systems, Inc. See LICENSE file.\n */\n\nimport {WebexPlugin} from '@webex/webex-core';\n\nconst STATE = {\n  INITIAL: 'initial',\n  IN_PROGRESS: 'in-progress',\n  IDLE: 'idle',\n};\n\n/**\n * @class\n */\nconst IpNetworkDetector = WebexPlugin.extend({\n  idAttribute: 'IpNetworkDetectorId',\n\n  namespace: 'Device',\n\n  props: {\n    firstIpV4: ['number', true, -1], // time [ms] it took to receive first IPv4 candidate\n    firstIpV6: ['number', true, -1], // time [ms] it took to receive first IPv6 candidate\n    firstMdns: ['number', true, -1], // time [ms] it took to receive first mDNS candidate\n    totalTime: ['number', true, -1], // total time [ms] it took to do the last IP network detection\n    state: ['string', true, STATE.INITIAL],\n    pendingDetection: ['object', false, undefined],\n  },\n\n  derived: {\n    /**\n     * True if we know we're on an IPv4 network,\n     * False if we know that we are not on an IPv4 network,\n     * undefined if we are not sure\n     */\n    supportsIpV4: {\n      deps: ['firstIpV4', 'firstIpV6', 'firstMdns', 'totalTime'],\n      /**\n       * Function for calculating the value of supportsIpV4 prop\n       * @returns {boolean | undefined}\n       */\n      fn() {\n        if (this.firstIpV4 >= 0) {\n          return true;\n        }\n        if (this.totalTime < 0) {\n          // we haven't completed the detection, yet\n          return undefined;\n        }\n        if (this.receivedOnlyMDnsCandidates()) {\n          return undefined;\n        }\n\n        return false;\n      },\n    },\n    /**\n     * True if we know we're on an IPv6 network,\n     * False if we know that we are not on an IPv6 network,\n     * undefined if we are not sure\n     */\n    supportsIpV6: {\n      deps: ['firstIpV4', 'firstIpV6', 'firstMdns', 'totalTime'],\n      /**\n       * Function for calculating the value of supportsIpV6 prop\n       * @returns {boolean | undefined}\n       */ fn() {\n        if (this.firstIpV6 >= 0) {\n          return true;\n        }\n        if (this.totalTime < 0) {\n          // we haven't completed the detection, yet\n          return undefined;\n        }\n        if (this.receivedOnlyMDnsCandidates()) {\n          return undefined;\n        }\n\n        return false;\n      },\n    },\n  },\n\n  /**\n   * Returns true if we have received only mDNS candidates - browsers usually do that if we don't have any user media permissions\n   *\n   * @private\n   * @returns {boolean}\n   */\n  receivedOnlyMDnsCandidates() {\n    return this.totalTime >= 0 && this.firstMdns >= 0 && this.firstIpV4 < 0 && this.firstIpV6 < 0;\n  },\n\n  /**\n   *\n   * @param {RTCPeerConnection} pc Peer connection to use\n   * @private\n   * @returns {Promise<void>}\n   */\n  async gatherLocalCandidates(pc: RTCPeerConnection): Promise<void> {\n    return new Promise((resolve, reject) => {\n      let done = false;\n\n      this.firstIpV4 = -1;\n      this.firstIpV6 = -1;\n      this.firstMdns = -1;\n      this.totalTime = -1;\n      const startTime = performance.now();\n\n      const doneGatheringIceCandidates = () => {\n        if (done) {\n          return;\n        }\n        done = true;\n\n        this.totalTime = performance.now() - startTime;\n\n        resolve();\n      };\n\n      pc.onicecandidate = (event) => {\n        if (event.candidate?.address) {\n          if (event.candidate.address.endsWith('.local')) {\n            // if we don't have camera/mic permissions, browser just gives us mDNS candidates\n            if (this.firstMdns === -1) {\n              this.firstMdns = performance.now() - startTime;\n            }\n          } else if (event.candidate.address.includes(':')) {\n            if (this.firstIpV6 === -1) {\n              this.firstIpV6 = performance.now() - startTime;\n            }\n          } else if (this.firstIpV4 === -1) {\n            this.firstIpV4 = performance.now() - startTime;\n          }\n\n          if (this.firstIpV4 >= 0 && this.firstIpV6 >= 0) {\n            // if we've got both ipv4 and ipv6 candidates, there is no need to wait for any more candidates, we can resolve now\n            resolve();\n          }\n        } else if (event.candidate === null) {\n          doneGatheringIceCandidates();\n        }\n      };\n\n      pc.onicegatheringstatechange = () => {\n        if (pc.iceGatheringState === 'complete') {\n          doneGatheringIceCandidates();\n        }\n      };\n\n      pc.createDataChannel('data');\n\n      pc.createOffer()\n        .then((offer) => pc.setLocalDescription(offer))\n        .catch((e) => {\n          this.webex.logger.error('Failed to detect ip network version:', e);\n          reject(e);\n        });\n    });\n  },\n\n  /**\n   * Detects if we are on IPv4 and/or IPv6 network. Once it resolves, read the\n   * supportsIpV4 and supportsIpV6 props to find out the result.\n   *\n   * @param {boolean} force - if false, the detection will only be done if we haven't managed to get any meaningful results yet\n   * @returns {Promise<void>}\n   */\n  async detect(force = false) {\n    let results;\n    let pc;\n\n    if (this.state === STATE.IN_PROGRESS) {\n      this.pendingDetection = {force};\n\n      return;\n    }\n\n    if (!force && this.state !== STATE.INITIAL && !this.receivedOnlyMDnsCandidates()) {\n      // we already have the results, no need to do the detection again\n      return;\n    }\n\n    try {\n      this.state = STATE.IN_PROGRESS;\n\n      pc = new RTCPeerConnection();\n\n      results = await this.gatherLocalCandidates(pc);\n    } finally {\n      pc.close();\n      this.state = STATE.IDLE;\n    }\n\n    if (this.pendingDetection) {\n      const {force: forceParam} = this.pendingDetection;\n\n      this.pendingDetection = undefined;\n      this.detect(forceParam);\n    }\n  },\n});\n\nexport default IpNetworkDetector;\n"],"mappings":"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"}

package/package.json

@@ -25,10 +25,10 @@
     "@webex/eslint-config-legacy": "0.0.0",
     "@webex/jest-config-legacy": "0.0.0",
     "@webex/legacy-tools": "0.0.0",
-    "@webex/test-helper-chai": "3.6.0-next.1",
-    "@webex/test-helper-mocha": "3.6.0-next.1",
-    "@webex/test-helper-mock-webex": "3.6.0-next.1",
-    "@webex/test-helper-test-users": "3.6.0-next.1",
+    "@webex/test-helper-chai": "3.6.0-next.3",
+    "@webex/test-helper-mocha": "3.6.0-next.3",
+    "@webex/test-helper-mock-webex": "3.6.0-next.3",
+    "@webex/test-helper-test-users": "3.6.0-next.3",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.24.0",
@@ -36,11 +36,11 @@
     "sinon": "^9.2.4"
   },
   "dependencies": {
-    "@webex/common": "3.6.0-next.1",
-    "@webex/common-timers": "3.6.0-next.1",
-    "@webex/http-core": "3.6.0-next.1",
-    "@webex/internal-plugin-metrics": "3.6.0-next.1",
-    "@webex/webex-core": "3.6.0-next.1",
+    "@webex/common": "3.6.0-next.3",
+    "@webex/common-timers": "3.6.0-next.3",
+    "@webex/http-core": "3.6.0-next.3",
+    "@webex/internal-plugin-metrics": "3.6.0-next.3",
+    "@webex/webex-core": "3.6.0-next.3",
     "ampersand-collection": "^2.0.2",
     "ampersand-state": "^5.0.3",
     "lodash": "^4.17.21"
@@ -54,5 +54,5 @@
     "test:style": "eslint ./src/**/*.*",
     "test:unit": "webex-legacy-tools test --unit --runner jest"
   },
-  "version": "3.6.0-next.1"
+  "version": "3.6.0-next.3"
 }

package/src/ipNetworkDetector.ts

@@ -4,6 +4,12 @@
 
 import {WebexPlugin} from '@webex/webex-core';
 
+const STATE = {
+  INITIAL: 'initial',
+  IN_PROGRESS: 'in-progress',
+  IDLE: 'idle',
+};
+
 /**
  * @class
  */
@@ -17,6 +23,8 @@ const IpNetworkDetector = WebexPlugin.extend({
     firstIpV6: ['number', true, -1], // time [ms] it took to receive first IPv6 candidate
     firstMdns: ['number', true, -1], // time [ms] it took to receive first mDNS candidate
     totalTime: ['number', true, -1], // total time [ms] it took to do the last IP network detection
+    state: ['string', true, STATE.INITIAL],
+    pendingDetection: ['object', false, undefined],
   },
 
   derived: {
@@ -155,21 +163,41 @@ const IpNetworkDetector = WebexPlugin.extend({
    * Detects if we are on IPv4 and/or IPv6 network. Once it resolves, read the
    * supportsIpV4 and supportsIpV6 props to find out the result.
    *
-   * @returns {Promise<Object>}
+   * @param {boolean} force - if false, the detection will only be done if we haven't managed to get any meaningful results yet
+   * @returns {Promise<void>}
    */
-  async detect() {
+  async detect(force = false) {
     let results;
     let pc;
 
+    if (this.state === STATE.IN_PROGRESS) {
+      this.pendingDetection = {force};
+
+      return;
+    }
+
+    if (!force && this.state !== STATE.INITIAL && !this.receivedOnlyMDnsCandidates()) {
+      // we already have the results, no need to do the detection again
+      return;
+    }
+
     try {
+      this.state = STATE.IN_PROGRESS;
+
       pc = new RTCPeerConnection();
 
       results = await this.gatherLocalCandidates(pc);
     } finally {
       pc.close();
+      this.state = STATE.IDLE;
     }
 
-    return results;
+    if (this.pendingDetection) {
+      const {force: forceParam} = this.pendingDetection;
+
+      this.pendingDetection = undefined;
+      this.detect(forceParam);
+    }
   },
 });
 

package/test/unit/spec/ipNetworkDetector.js

@@ -3,6 +3,8 @@ import sinon from 'sinon';
 import IpNetworkDetector from '@webex/internal-plugin-device/src/ipNetworkDetector';
 import MockWebex from '@webex/test-helper-mock-webex';
 
+const flushPromises = () => new Promise(setImmediate);
+
 describe('plugin-device', () => {
   describe('IpNetworkDetector', () => {
     let webex;
@@ -326,7 +328,7 @@ describe('plugin-device', () => {
         });
 
         // now call detect() again
-        const promise2 = ipNetworkDetector.detect();
+        const promise2 = ipNetworkDetector.detect(true);
 
         // everything should have been reset
         assert.equal(ipNetworkDetector.supportsIpV4, undefined);
@@ -340,6 +342,87 @@ describe('plugin-device', () => {
         await promise2;
       });
 
+      it('queues another detect() call if one is already in progress', async () => {
+        const promise = ipNetworkDetector.detect();
+
+        simulateCandidate(50, '192.168.0.1');
+
+        await flushPromises();
+
+        assert.calledOnce(fakePeerConnection.createDataChannel);
+        assert.calledOnce(fakePeerConnection.createOffer);
+        assert.calledOnce(fakePeerConnection.setLocalDescription);
+
+        // now call detect() again
+        ipNetworkDetector.detect(true);
+
+        // simulate the end of the detection -> another one should be started
+        simulateEndOfCandidateGathering(10);
+
+        await promise;
+
+        assert.calledTwice(fakePeerConnection.createDataChannel);
+        assert.calledTwice(fakePeerConnection.createOffer);
+        assert.calledTwice(fakePeerConnection.setLocalDescription);
+
+        simulateCandidate(50, '2a02:c7c:a0d0:8a00:db9b:d4de:d1f7:4c49');
+        simulateEndOfCandidateGathering(10);
+
+        // results should reflect the last run detection
+        checkResults({
+          supportsIpV4: false,
+          supportsIpV6: true,
+          timings: {
+            totalTime: 60,
+            ipv4: -1,
+            ipv6: 50,
+            mdns: -1,
+          },
+        });
+
+        await flushPromises();
+
+        // no more detections should be started
+        assert.calledTwice(fakePeerConnection.createDataChannel);
+      });
+
+      it.each`
+        force    | state        | receivedOnlyMDnsCandidates | expectedToRunDetection
+        ${true}  | ${'initial'} | ${false}                   | ${true}
+        ${true}  | ${'idle'}    | ${false}                   | ${true}
+        ${true}  | ${'initial'} | ${true}                    | ${true}
+        ${true}  | ${'idle'}    | ${true}                    | ${true}
+        ${false} | ${'initial'} | ${false}                   | ${true}
+        ${false} | ${'initial'} | ${true}                    | ${true}
+        ${false} | ${'idle'}    | ${true}                    | ${true}
+        ${false} | ${'idle'}    | ${false}                   | ${false}
+      `(
+        'force=$force, state=$state, receivedOnlyMDnsCandidates=$receivedOnlyMDnsCandidates => expectedToRunDetection=$expectedToRunDetection',
+        async ({force, state, receivedOnlyMDnsCandidates, expectedToRunDetection}) => {
+          ipNetworkDetector.state = state;
+          sinon
+            .stub(ipNetworkDetector, 'receivedOnlyMDnsCandidates')
+            .returns(receivedOnlyMDnsCandidates);
+
+          const result = ipNetworkDetector.detect(force);
+
+          if (expectedToRunDetection) {
+            simulateEndOfCandidateGathering(10);
+          }
+          await result;
+
+          if (expectedToRunDetection) {
+            assert.calledOnce(fakePeerConnection.createDataChannel);
+            assert.calledOnce(fakePeerConnection.createOffer);
+            assert.calledOnce(fakePeerConnection.setLocalDescription);
+          } else {
+            assert.notCalled(fakePeerConnection.createDataChannel);
+            assert.notCalled(fakePeerConnection.createOffer);
+            assert.notCalled(fakePeerConnection.setLocalDescription);
+          }
+        }
+      );
+
       it('rejects if one of RTCPeerConnection operations fails', async () => {
         const fakeError = new Error('fake error');