speaker-calibration 2.2.71 → 2.2.72

package/dist/main.js

@@ -774,7 +774,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var peer
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _audioPeer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./audioPeer */ \"./src/peer-connection/audioPeer.js\");\n/* harmony import */ var _peerErrors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./peerErrors */ \"./src/peer-connection/peerErrors.js\");\n/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! axios */ \"./node_modules/axios/index.js\");\n/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_2__);\n\n\n\n\n/**\n * @class Handles the listener's side of the connection. Responsible for getting access to user's microphone,\n * and initiating a call to the Speaker.\n * @augments AudioPeer\n */\nclass Listener extends _audioPeer__WEBPACK_IMPORTED_MODULE_0__[\"default\"] {\n  /**\n   * Takes a target element where html elements will be appended.\n   *\n   * @param params - See type definition for initParameters.\n   * @example\n   */\n  constructor(params) {\n    super(params);\n    this.deviceInfoFromUser = params.deviceInfoFromUser\n      ? params.deviceInfoFromUser\n      : {modelNumber: '', modelName: ''};\n    this.startTime = Date.now();\n    this.receiverPeerId = null;\n\n    const urlParameters = this.parseURLSearchParams();\n    this.calibrateSoundHz =\n      urlParameters.calibrateSoundHz !== null && urlParameters.calibrateSoundHz !== undefined\n        ? urlParameters.calibrateSoundHz\n        : 48000;\n    this.calibrateSoundSamplingDesiredBits =\n      urlParameters.calibrateSoundSamplingDesiredBits !== null &&\n      urlParameters.calibrateSoundSamplingDesiredBits !== undefined\n        ? urlParameters.calibrateSoundSamplingDesiredBits\n        : 24;\n    this.speakerPeerId = urlParameters.speakerPeerId;\n\n    this.peer.on('open', this.onPeerOpen);\n    this.peer.on('connection', this.onPeerConnection);\n    this.peer.on('disconnected', this.onPeerDisconnected);\n    this.peer.on('close', this.onPeerClose);\n    this.peer.on('error', this.onPeerError);\n  }\n\n  onPeerOpen = id => {\n    this.displayUpdate('Listener - onPeerOpen');\n    // Workaround for peer.reconnect deleting previous id\n\n    if (id === null) {\n      this.displayUpdate('Received null id from peer open');\n      this.peer.id = this.lastPeerId;\n    } else {\n      this.lastPeerId = this.peer.id;\n    }\n\n    this.join();\n  };\n\n  onPeerConnection = connection => {\n    this.displayUpdate('Listener - onPeerConnection');\n    // Disallow incoming connections\n    connection.on('open', () => {\n      connection.send('Sender does not accept incoming connections');\n      setTimeout(() => {\n        connection.close();\n      }, 500);\n    });\n  };\n\n  onConnData = data => {\n    this.displayUpdate('Listener - onConnData');\n    const hasSpeakerID = Object.prototype.hasOwnProperty.call(data, 'speakerPeerId');\n    if (!hasSpeakerID) {\n      this.displayUpdate('Error in parsing data received! Must set \"speakerPeerId\" property');\n      throw new _peerErrors__WEBPACK_IMPORTED_MODULE_1__.MissingSpeakerIdError('Must set \"speakerPeerId\" property');\n    } else {\n      // this.conn.close();\n      this.displayUpdate(this.speakerPeerId);\n      this.speakerPeerId = data.speakerPeerId;\n      const newParams = {\n        speakerPeerId: this.speakerPeerId,\n      };\n      /*\n      FUTURE does this limit usable environments?\n      ie does this work if internet is lost after initial page load?\n      */\n      window.location.search = this.queryStringFromObject(newParams); // Redirect to correctly constructed keypad page\n    }\n  };\n\n  join = async () => {\n    this.displayUpdate('Listener - join');\n    /**\n     * Create the connection between the two Peers.\n     *\n     * Sets up callbacks that handle any events related to the\n     * connection and data received on it.\n     */\n    // Close old connection\n    if (this.conn) {\n      this.displayUpdate('Closing old connection');\n      this.conn.close();\n    }\n\n    // Create connection to destination peer specified by the query param\n    this.displayUpdate(`Creating connection to: ${this.speakerPeerId}`);\n    this.conn = this.peer.connect(this.speakerPeerId, {\n      reliable: true,\n    });\n\n    this.displayUpdate('Created connection');\n    this.conn.on('open', async () => {\n      this.displayUpdate('Listener - conn open');\n      await this.getDeviceInfo();\n      // this.sendSamplingRate();\n      await this.openAudioStream();\n    });\n\n    // Handle incoming data (messages only since this is the signal sender)\n    this.conn.on('data', this.onConnData);\n    this.conn.on('close', () => {\n      console.log('Connection closed');\n    });\n  };\n\n  getMobileOS = () => {\n    const ua = navigator.userAgent;\n    if (/android/i.test(ua)) {\n      return 'Android';\n    }\n    if (\n      /iPad|iPhone|iPod/.test(ua) ||\n      ((navigator?.userAgentData?.platform || navigator?.platform) === 'MacIntel' &&\n        navigator.maxTouchPoints > 1)\n    ) {\n      return 'iOS';\n    }\n    return 'Other';\n  };\n\n  sendSamplingRate = sampleRate => {\n    this.displayUpdate('Listener - sendSamplingRate');\n    this.conn.send({\n      name: 'samplingRate',\n      payload: sampleRate,\n    });\n  };\n\n  sendSampleSize = sampleSize => {\n    this.displayUpdate('Listener - sendSampleSize');\n    this.conn.send({\n      name: 'sampleSize',\n      payload: sampleSize,\n    });\n  };\n\n  getDeviceInfo = async () => {\n    try {\n      const deviceInfo = {};\n      fod.complete(function (data) {\n        deviceInfo['IsMobile'] = data.device['ismobile'];\n        deviceInfo['HardwareName'] = data.device['hardwarename'];\n        deviceInfo['HardwareFamily'] = data.device['hardwarefamily'];\n        deviceInfo['HardwareModel'] = data.device['hardwaremodel'];\n        deviceInfo['OEM'] = data.device['oem'];\n        deviceInfo['HardwareModelVariants'] = data.device['hardwaremodelvariants'];\n        deviceInfo['DeviceId'] = data.device['deviceid'];\n        deviceInfo['PlatformName'] = data.device['platformname'];\n        deviceInfo['PlatformVersion'] = data.device['platformversion'];\n        deviceInfo['DeviceType'] = data.device['devicetype'];\n        // deviceInfo['deviceInfoFromUser'] = this.deviceInfoFromUser;\n      });\n      deviceInfo['deviceInfoFromUser'] = this.deviceInfoFromUser;\n      this.conn.send({\n        name: 'deviceInfo',\n        payload: deviceInfo,\n      });\n      return deviceInfo;\n    } catch (error) {\n      console.error('Error fetching or executing script:', error.message);\n      return null;\n    }\n  };\n\n  applyHQTrackConstraints = async stream => {\n    // Contraint the incoming audio to the sampling rate we want\n\n    const track = stream.getAudioTracks()[0];\n    const capabilities = track.getCapabilities();\n\n    this.displayUpdate(\n      `Listener Track Capabilities - ${JSON.stringify(capabilities, undefined, 2)}`\n    );\n\n    const constraints = track.getConstraints();\n\n    if (capabilities.echoCancellation) {\n      constraints.echoCancellation = false;\n    }\n\n    if (capabilities.sampleRate) {\n      constraints.sampleRate = this.calibrateSoundHz;\n    }\n\n    if (capabilities.sampleSize) {\n      constraints.sampleSize = this.calibrateSoundSamplingDesiredBits;\n    }\n\n    if (capabilities.channelCount) {\n      constraints.channelCount = 1;\n    }\n\n    this.displayUpdate(`Listener Track Constraints - ${JSON.stringify(constraints, undefined, 2)}`);\n\n    // await the promise\n    try {\n      await track.applyConstraints(constraints);\n    } catch (err) {\n      console.error(err);\n      this.displayUpdate(`Error applying constraints to track: ${err}`);\n    }\n\n    const settings = track.getSettings();\n    this.displayUpdate(`Listener Track Settings - ${JSON.stringify(settings, undefined, 2)}`);\n    return settings;\n  };\n\n  getMediaDevicesAudioContraints = () => {\n    const availableConstraints = navigator.mediaDevices.getSupportedConstraints();\n\n    this.displayUpdate(\n      `Listener MediaDevices Available Contraints  - ${JSON.stringify(\n        availableConstraints,\n        undefined,\n        2\n      )}`\n    );\n\n    const contraints = {\n      // ...(availableConstraints.echoCancellation && availableConstraints.echoCancellation == true\n      //   ? {echoCancellation: {exact: false}}\n      //   : {}),\n      ...(availableConstraints.sampleRate && availableConstraints.sampleRate == true\n        ? {sampleRate: {ideal: this.calibrateSoundHz}}\n        : {}),\n      ...(availableConstraints.sampleSize && availableConstraints.sampleSize == true\n        ? {sampleSize: {ideal: this.calibrateSoundSamplingDesiredBits}}\n        : {}),\n      ...(availableConstraints.channelCount && availableConstraints.channelCount == true\n        ? {channelCount: {exact: 1}}\n        : {}),\n      echoCancellation: false,\n      noiseSuppression: false,\n      autoGainControl: false,\n    };\n\n    console.log(contraints);\n\n    this.displayUpdate(\n      `Listener MediaDevices Contraints - ${JSON.stringify(contraints, undefined, 2)}`\n    );\n\n    return contraints;\n  };\n\n  openAudioStream = async () => {\n    this.displayUpdate('Listener - openAudioStream');\n    const mobileOS = this.getMobileOS();\n    if (false) {}\n\n    navigator.mediaDevices\n      .getUserMedia({\n        audio: this.getMediaDevicesAudioContraints(),\n        video: false,\n      })\n      .then(stream => {\n        this.applyHQTrackConstraints(stream)\n          .then(settings => {\n            this.sendSamplingRate(settings.sampleRate);\n            this.sendSampleSize(settings.sampleSize);\n            this.peer.call(this.speakerPeerId, stream); // one-way call\n            this.displayUpdate('Listener - openAudioStream');\n          })\n          .catch(err => {\n            console.log(err);\n            this.displayUpdate(\n              `Listener - Error in applyHQTrackConstraints - ${JSON.stringify(err, undefined, 2)}`\n            );\n          });\n      })\n      .catch(err => {\n        console.error(err);\n        this.displayUpdate(\n          `Listener - Error in getUserMedia - ${JSON.stringify(err, undefined, 2)}`\n        );\n      });\n  };\n}\n\n/* harmony default export */ __webpack_exports__[\"default\"] = (Listener);\n\n\n//# sourceURL=webpack://speakerCalibrator/./src/peer-connection/listener.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _audioPeer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./audioPeer */ \"./src/peer-connection/audioPeer.js\");\n/* harmony import */ var _peerErrors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./peerErrors */ \"./src/peer-connection/peerErrors.js\");\n/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! axios */ \"./node_modules/axios/index.js\");\n/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_2__);\n\n\n\n\n/**\n * @class Handles the listener's side of the connection. Responsible for getting access to user's microphone,\n * and initiating a call to the Speaker.\n * @augments AudioPeer\n */\nclass Listener extends _audioPeer__WEBPACK_IMPORTED_MODULE_0__[\"default\"] {\n  /**\n   * Takes a target element where html elements will be appended.\n   *\n   * @param params - See type definition for initParameters.\n   * @example\n   */\n  constructor(params) {\n    super(params);\n    this.deviceInfoFromUser = params.deviceInfoFromUser\n      ? params.deviceInfoFromUser\n      : {modelNumber: '', modelName: ''};\n    this.startTime = Date.now();\n    this.receiverPeerId = null;\n\n    const urlParameters = this.parseURLSearchParams();\n    this.calibrateSoundHz =\n      urlParameters.calibrateSoundHz !== null && urlParameters.calibrateSoundHz !== undefined\n        ? urlParameters.calibrateSoundHz\n        : 48000;\n    this.calibrateSoundSamplingDesiredBits =\n      urlParameters.calibrateSoundSamplingDesiredBits !== null &&\n      urlParameters.calibrateSoundSamplingDesiredBits !== undefined\n        ? urlParameters.calibrateSoundSamplingDesiredBits\n        : 24;\n    this.speakerPeerId = urlParameters.speakerPeerId;\n\n    this.peer.on('open', this.onPeerOpen);\n    this.peer.on('connection', this.onPeerConnection);\n    this.peer.on('disconnected', this.onPeerDisconnected);\n    this.peer.on('close', this.onPeerClose);\n    this.peer.on('error', this.onPeerError);\n  }\n\n  onPeerOpen = id => {\n    this.displayUpdate('Listener - onPeerOpen');\n    // Workaround for peer.reconnect deleting previous id\n\n    if (id === null) {\n      this.displayUpdate('Received null id from peer open');\n      this.peer.id = this.lastPeerId;\n    } else {\n      this.lastPeerId = this.peer.id;\n    }\n\n    this.join();\n  };\n\n  onPeerConnection = connection => {\n    this.displayUpdate('Listener - onPeerConnection');\n    // Disallow incoming connections\n    connection.on('open', () => {\n      connection.send('Sender does not accept incoming connections');\n      setTimeout(() => {\n        connection.close();\n      }, 500);\n    });\n  };\n\n  onConnData = data => {\n    this.displayUpdate('Listener - onConnData');\n    const hasSpeakerID = Object.prototype.hasOwnProperty.call(data, 'speakerPeerId');\n    if (!hasSpeakerID) {\n      this.displayUpdate('Error in parsing data received! Must set \"speakerPeerId\" property');\n      throw new _peerErrors__WEBPACK_IMPORTED_MODULE_1__.MissingSpeakerIdError('Must set \"speakerPeerId\" property');\n    } else {\n      // this.conn.close();\n      this.displayUpdate(this.speakerPeerId);\n      this.speakerPeerId = data.speakerPeerId;\n      const newParams = {\n        speakerPeerId: this.speakerPeerId,\n      };\n      /*\n      FUTURE does this limit usable environments?\n      ie does this work if internet is lost after initial page load?\n      */\n      window.location.search = this.queryStringFromObject(newParams); // Redirect to correctly constructed keypad page\n    }\n  };\n\n  join = async () => {\n    this.displayUpdate('Listener - join');\n    /**\n     * Create the connection between the two Peers.\n     *\n     * Sets up callbacks that handle any events related to the\n     * connection and data received on it.\n     */\n    // Close old connection\n    if (this.conn) {\n      this.displayUpdate('Closing old connection');\n      this.conn.close();\n    }\n\n    // Create connection to destination peer specified by the query param\n    this.displayUpdate(`Creating connection to: ${this.speakerPeerId}`);\n    this.conn = this.peer.connect(this.speakerPeerId, {\n      reliable: true,\n    });\n\n    this.displayUpdate('Created connection');\n    this.conn.on('open', async () => {\n      this.displayUpdate('Listener - conn open');\n      await this.getDeviceInfo();\n      // this.sendSamplingRate();\n      await this.openAudioStream();\n    });\n\n    // Handle incoming data (messages only since this is the signal sender)\n    this.conn.on('data', this.onConnData);\n    this.conn.on('close', () => {\n      console.log('Connection closed');\n    });\n  };\n\n  getMobileOS = () => {\n    const ua = navigator.userAgent;\n    if (/android/i.test(ua)) {\n      return 'Android';\n    }\n    if (\n      /iPad|iPhone|iPod/.test(ua) ||\n      ((navigator?.userAgentData?.platform || navigator?.platform) === 'MacIntel' &&\n        navigator.maxTouchPoints > 1)\n    ) {\n      return 'iOS';\n    }\n    return 'Other';\n  };\n\n  sendSamplingRate = sampleRate => {\n    this.displayUpdate('Listener - sendSamplingRate');\n    this.conn.send({\n      name: 'samplingRate',\n      payload: sampleRate,\n    });\n  };\n\n  sendSampleSize = sampleSize => {\n    this.displayUpdate('Listener - sendSampleSize');\n    this.conn.send({\n      name: 'sampleSize',\n      payload: sampleSize,\n    });\n  };\n\n  getDeviceInfo = async () => {\n    try {\n      const deviceInfo = {};\n      fod.complete(function (data) {\n        deviceInfo['IsMobile'] = data.device['ismobile'];\n        deviceInfo['HardwareName'] = data.device['hardwarename'];\n        deviceInfo['HardwareFamily'] = data.device['hardwarefamily'];\n        deviceInfo['HardwareModel'] = data.device['hardwaremodel'];\n        deviceInfo['OEM'] = data.device['oem'];\n        deviceInfo['HardwareModelVariants'] = data.device['hardwaremodelvariants'];\n        deviceInfo['DeviceId'] = data.device['deviceid'];\n        deviceInfo['PlatformName'] = data.device['platformname'];\n        deviceInfo['PlatformVersion'] = data.device['platformversion'];\n        deviceInfo['DeviceType'] = data.device['devicetype'];\n        // deviceInfo['deviceInfoFromUser'] = this.deviceInfoFromUser;\n      });\n      deviceInfo['deviceInfoFromUser'] = this.deviceInfoFromUser;\n      this.conn.send({\n        name: 'deviceInfo',\n        payload: deviceInfo,\n      });\n      return deviceInfo;\n    } catch (error) {\n      console.error('Error fetching or executing script:', error.message);\n      return null;\n    }\n  };\n\n  applyHQTrackConstraints = async stream => {\n    // Contraint the incoming audio to the sampling rate we want\n\n    const track = stream.getAudioTracks()[0];\n    const capabilities = track.getCapabilities();\n\n    this.displayUpdate(\n      `Listener Track Capabilities - ${JSON.stringify(capabilities, undefined, 2)}`\n    );\n\n    const constraints = track.getConstraints();\n\n    if (capabilities.echoCancellation) {\n      constraints.echoCancellation = false;\n    }\n\n    if (capabilities.sampleRate) {\n      constraints.sampleRate = this.calibrateSoundHz;\n    }\n\n    if (capabilities.sampleSize) {\n      constraints.sampleSize = this.calibrateSoundSamplingDesiredBits;\n    }\n\n    if (capabilities.channelCount) {\n      constraints.channelCount = 1;\n    }\n\n    this.displayUpdate(`Listener Track Constraints - ${JSON.stringify(constraints, undefined, 2)}`);\n\n    // await the promise\n    try {\n      await track.applyConstraints(constraints);\n    } catch (err) {\n      console.error(err);\n      this.displayUpdate(`Error applying constraints to track: ${err}`);\n    }\n\n    const settings = track.getSettings();\n    this.displayUpdate(`Listener Track Settings - ${JSON.stringify(settings, undefined, 2)}`);\n    return settings;\n  };\n\n  getMediaDevicesAudioContraints = () => {\n    const availableConstraints = navigator.mediaDevices.getSupportedConstraints();\n\n    this.displayUpdate(\n      `Listener MediaDevices Available Contraints  - ${JSON.stringify(\n        availableConstraints,\n        undefined,\n        2\n      )}`\n    );\n\n    const contraints = {\n      // ...(availableConstraints.echoCancellation && availableConstraints.echoCancellation == true\n      //   ? {echoCancellation: {exact: false}}\n      //   : {}),\n      ...(availableConstraints.sampleRate && availableConstraints.sampleRate == true\n        ? {sampleRate: {ideal: this.calibrateSoundHz}}\n        : {}),\n      ...(availableConstraints.sampleSize && availableConstraints.sampleSize == true\n        ? {sampleSize: {ideal: this.calibrateSoundSamplingDesiredBits}}\n        : {}),\n      ...(availableConstraints.channelCount && availableConstraints.channelCount == true\n        ? {channelCount: {exact: 1}}\n        : {}),\n      echoCancellation: false,\n      noiseSuppression: false,\n      autoGainControl: false,\n    };\n\n    console.log(contraints);\n\n    this.displayUpdate(\n      `Listener MediaDevices Contraints - ${JSON.stringify(contraints, undefined, 2)}`\n    );\n\n    return contraints;\n  };\n\n  openAudioStream = async () => {\n    this.displayUpdate('Listener - openAudioStream');\n    const mobileOS = this.getMobileOS();\n    if (false) {}\n\n    navigator.mediaDevices\n      .getUserMedia({\n        audio: this.getMediaDevicesAudioContraints(),\n        video: false,\n      })\n      .then(stream => {\n        this.applyHQTrackConstraints(stream)\n          .then(settings => {\n            this.sendSamplingRate(settings.sampleRate);\n            let sampleSize = settings.sampleSize;\n            if (!sampleSize){\n              sampleSize = this.calibrateSoundSamplingDesiredBits;\n            }\n            this.sendSampleSize(sampleSize);\n            this.peer.call(this.speakerPeerId, stream); // one-way call\n            this.displayUpdate('Listener - openAudioStream');\n          })\n          .catch(err => {\n            console.log(err);\n            this.displayUpdate(\n              `Listener - Error in applyHQTrackConstraints - ${JSON.stringify(err, undefined, 2)}`\n            );\n          });\n      })\n      .catch(err => {\n        console.error(err);\n        this.displayUpdate(\n          `Listener - Error in getUserMedia - ${JSON.stringify(err, undefined, 2)}`\n        );\n      });\n  };\n}\n\n/* harmony default export */ __webpack_exports__[\"default\"] = (Listener);\n\n\n//# sourceURL=webpack://speakerCalibrator/./src/peer-connection/listener.js?");
 
 /***/ }),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "speaker-calibration",
-  "version": "2.2.71",
+  "version": "2.2.72",
   "description": "Speaker calibration library for auditory testing",
   "main": "dist/main.js",
   "directories": {

package/src/peer-connection/listener.js

@@ -283,7 +283,11 @@ class Listener extends AudioPeer {
         this.applyHQTrackConstraints(stream)
           .then(settings => {
             this.sendSamplingRate(settings.sampleRate);
-            this.sendSampleSize(settings.sampleSize);
+            let sampleSize = settings.sampleSize;
+            if (!sampleSize){
+              sampleSize = this.calibrateSoundSamplingDesiredBits;
+            }
+            this.sendSampleSize(sampleSize);
             this.peer.call(this.speakerPeerId, stream); // one-way call
             this.displayUpdate('Listener - openAudioStream');
           })