speaker-calibration 2.2.17 → 2.2.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/main.js +1 -1
  2. package/package.json +1 -1
  3. package/src/server/PythonServerAPI.js +2 -2
package/dist/main.js CHANGED
@@ -807,7 +807,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var qrco
807
807
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
808
808
 
809
809
  "use strict";
810
- eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! axios */ \"./node_modules/axios/index.js\");\n/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_0__);\n\n/**\n *\n */\nclass PythonServerAPI {\n //static PYTHON_SERVER_URL = 'https://easyeyes-python-flask-server.herokuapp.com';\n\n static TEST_SERVER_URL = 'http://127.0.0.1:5000';\n static PYTHON_SERVER_URL ='http://127.0.0.1:5000';\n\n /** @private */\n MAX_RETRY_COUNT = 3;\n /** @private */\n RETRY_DELAY_MS = 1000;\n /**\n * @param data- -\n * g = inverted impulse response, when convolved with the impulse\n * reponse, they cancel out.\n * @param data.payload\n * @param data.sampleRate\n * @param data.P\n * @param data-.payload\n * @param data-.sampleRate\n * @param data-.P\n * @returns\n * @example\n */\n getImpulseResponse = async ({mls, payload, sampleRate, P, numPeriods}) => {\n const task = 'impulse-response';\n let res = null;\n\n console.log({payload});\n\n const data = JSON.stringify({\n task,\n payload,\n 'sample-rate': sampleRate,\n mls,\n P,\n numPeriods,\n });\n\n await axios__WEBPACK_IMPORTED_MODULE_0___default()({\n method: 'post',\n baseURL: PythonServerAPI.PYTHON_SERVER_URL,\n url: `/task/${task}`,\n headers: {\n 'Content-Type': 'application/json',\n },\n data,\n })\n .then(response => {\n res = response;\n })\n .catch(error => {\n throw error;\n });\n return res.data[task];\n };\n\n getMLS = async(length) => {\n const task = 'mls';\n let res = null\n\n const data = JSON.stringify({\n task,\n 'length':length,\n })\n\n await axios__WEBPACK_IMPORTED_MODULE_0___default()({\n method:'post',\n baseURL: PythonServerAPI.PYTHON_SERVER_URL,\n url: `/task/${task}`,\n headers: {\n 'Content-Type':'application/json',\n },\n data,\n })\n .then(response => {\n res = response;\n })\n .catch(error => {\n throw error;\n })\n\n return res.data[task];\n }\n getMLSWithRetry = async (length) => {\n let retryCount = 0;\n let response = null;\n\n while (retryCount < this.MAX_RETRY_COUNT) {\n try {\n response = await this.getMLS(length);\n // If the request is successful, break out of the loop\n break;\n } catch (error) {\n console.error(`Error occurred. Retrying... (${retryCount + 1}/${this.MAX_RETRY_COUNT})`);\n retryCount++;\n await new Promise(resolve => setTimeout(resolve, this.RETRY_DELAY_MS));\n }\n }\n\n if (response) {\n return response;\n } else {\n throw new Error(`Failed to get MLS after ${this.MAX_RETRY_COUNT} attempts.`);\n }\n };\n\n getPSD = async ({unconv_rec, conv_rec, sampleRate}) => {\n const task = 'psd';\n let res = null;\n\n const data = JSON.stringify({\n task,\n unconv_rec,\n conv_rec,\n sampleRate,\n });\n\n await axios__WEBPACK_IMPORTED_MODULE_0___default()({\n method: 'post',\n baseURL: PythonServerAPI.PYTHON_SERVER_URL,\n url: `/task/${task}`,\n headers: {\n 'Content-Type': 'application/json',\n },\n data,\n })\n .then(response => {\n res = response;\n })\n .catch(error => {\n throw error;\n });\n return res.data[task];\n };\n\n getSubtractedPSD = async (rec, knownGains, knownFrequencies,sampleRate) => {\n const task = 'subtracted-psd';\n let res = null;\n\n const data = JSON.stringify({\n task,\n rec,\n knownGains,\n knownFrequencies,\n sampleRate,\n });\n\n await axios__WEBPACK_IMPORTED_MODULE_0___default()({\n method: 'post',\n baseURL: PythonServerAPI.PYTHON_SERVER_URL,\n url: `/task/${task}`,\n headers: {\n 'Content-Type': 'application/json',\n },\n data,\n })\n .then(response => {\n res = response;\n })\n .catch(error => {\n throw error;\n });\n return res.data[task];\n };\n\n getSubtractedPSDWithRetry = async ( rec, knownGains, knownFrequencies,sampleRate) => {\n let retryCount = 0;\n let response = null;\n\n while (retryCount < this.MAX_RETRY_COUNT) {\n try {\n response = await this.getSubtractedPSD( rec, knownGains, knownFrequencies,sampleRate );\n // If the request is successful, break out of the loop\n break;\n } catch (error) {\n console.error(`Error occurred. Retrying... (${retryCount + 1}/${this.MAX_RETRY_COUNT})`);\n retryCount++;\n await new Promise(resolve => setTimeout(resolve, this.RETRY_DELAY_MS));\n }\n }\n\n if (response) {\n return response;\n } else {\n throw new Error(`Failed to get PSD after ${this.MAX_RETRY_COUNT} attempts.`);\n }\n };\n \n getPSDWithRetry = async ({ unconv_rec, conv_rec,sampleRate }) => {\n let retryCount = 0;\n let response = null;\n \n while (retryCount < this.MAX_RETRY_COUNT) {\n try {\n response = await this.getPSD({ unconv_rec, conv_rec,sampleRate });\n // If the request is successful, break out of the loop\n break;\n } catch (error) {\n console.error(`Error occurred. Retrying... (${retryCount + 1}/${this.MAX_RETRY_COUNT})`);\n retryCount++;\n await new Promise(resolve => setTimeout(resolve, this.RETRY_DELAY_MS));\n }\n }\n \n if (response) {\n return response;\n } else {\n throw new Error(`Failed to get PSD after ${this.MAX_RETRY_COUNT} attempts.`);\n }\n };\n \n\n getComponentInverseImpulseResponse = async ({payload,mls,lowHz,highHz,componentIRGains,iirLength,componentIRFreqs,num_periods,sampleRate}) => {\n const task = 'component-inverse-impulse-response';\n let res = null;\n\n console.log({payload});\n\n const data = JSON.stringify({\n task,\n payload,\n mls,\n lowHz,\n highHz,\n iirLength,\n componentIRGains,\n componentIRFreqs,\n num_periods,\n sampleRate,\n });\n\n await axios__WEBPACK_IMPORTED_MODULE_0___default()({\n method: 'post',\n baseURL: PythonServerAPI.PYTHON_SERVER_URL,\n url: `/task/${task}`,\n headers: {\n 'Content-Type': 'application/json',\n },\n data,\n })\n .then(response => {\n res = response;\n })\n .catch(error => {\n throw error;\n });\n\n return res.data[task];\n };\n getSystemInverseImpulseResponse = async ({payload,mls,lowHz,highHz,iirLength,num_periods,sampleRate}) => {\n const task = 'system-inverse-impulse-response';\n let res = null;\n\n console.log({payload});\n\n const data = JSON.stringify({\n task,\n payload,\n mls,\n lowHz,\n iirLength,\n highHz,\n num_periods,\n sampleRate,\n });\n\n await axios__WEBPACK_IMPORTED_MODULE_0___default()({\n method: 'post',\n baseURL: PythonServerAPI.PYTHON_SERVER_URL,\n url: `/task/${task}`,\n headers: {\n 'Content-Type': 'application/json',\n },\n data,\n })\n .then(response => {\n res = response;\n })\n .catch(error => {\n throw error;\n });\n\n return res.data[task];\n };\n\ngetComponentInverseImpulseResponseWithRetry = async ({ payload, mls, lowHz, highHz,componentIRGains,iirLength,componentIRFreqs, num_periods,sampleRate}) => {\n let retryCount = 0;\n let response = null;\n\n while (retryCount < this.MAX_RETRY_COUNT) {\n try {\n response = await this.getComponentInverseImpulseResponse({ payload, mls, lowHz, highHz,componentIRGains,iirLength,componentIRFreqs,num_periods,sampleRate});\n // If the request is successful, break out of the loop\n break;\n } catch (error) {\n console.error(`Error occurred. Retrying... (${retryCount + 1}/${this.MAX_RETRY_COUNT})`);\n retryCount++;\n await new Promise(resolve => setTimeout(resolve, this.RETRY_DELAY_MS));\n }\n }\n\n if (response) {\n return response;\n } else {\n throw new Error(`Failed to get inverse impulse response after ${this.MAX_RETRY_COUNT} attempts.`);\n }\n};\n\ngetSystemInverseImpulseResponseWithRetry = async ({ payload, mls, lowHz, highHz,iirLength, num_periods,sampleRate}) => {\n let retryCount = 0;\n let response = null;\n\n while (retryCount < this.MAX_RETRY_COUNT) {\n try {\n response = await this.getSystemInverseImpulseResponse({ payload, mls, lowHz, highHz,iirLength,num_periods,sampleRate});\n // If the request is successful, break out of the loop\n break;\n } catch (error) {\n console.error(`Error occurred. Retrying... (${retryCount + 1}/${this.MAX_RETRY_COUNT})`);\n retryCount++;\n await new Promise(resolve => setTimeout(resolve, this.RETRY_DELAY_MS));\n }\n }\n\n if (response) {\n return response;\n } else {\n throw new Error(`Failed to get inverse impulse response after ${this.MAX_RETRY_COUNT} attempts.`);\n }\n};\n\n\n\n getVolumeCalibration = async ({payload, sampleRate, lCalib}) => {\n const task = 'volume';\n let res = null;\n\n console.log({payload});\n\n const data = JSON.stringify({\n task,\n payload,\n 'sample-rate': sampleRate,\n lCalib,\n });\n\n await axios__WEBPACK_IMPORTED_MODULE_0___default()({\n method: 'post',\n baseURL: PythonServerAPI.PYTHON_SERVER_URL,\n url: `/task/${task}`,\n headers: {\n 'Content-Type': 'application/json',\n },\n data,\n })\n .then(response => {\n res = response;\n })\n .catch(error => {\n throw error;\n });\n\n return res.data[task];\n };\n\n getVolumeCalibrationParameters = async ({inDBValues, outDBSPLValues, lCalib, componentGainDBSPL}) => {\n const task = 'volume-parameters';\n let res = null;\n\n const data = JSON.stringify({\n task,\n inDBValues,\n outDBSPLValues,\n lCalib,\n componentGainDBSPL,\n });\n\n await axios__WEBPACK_IMPORTED_MODULE_0___default()({\n method: 'post',\n baseURL: PythonServerAPI.PYTHON_SERVER_URL, //server\n url: `/task/${task}`,\n headers: {\n 'Content-Type': 'application/json',\n },\n data,\n })\n .then(response => {\n res = response;\n console.log(res.data[task]);\n })\n .catch(error => {\n throw error;\n });\n\n\n\n // console.log(res.data[task]);\n //below is an example of res.data[task]\n //{\n // R: 16.56981076554259,\n // RMSError: 1.9289162528535229\n // T: -47.79799120884434,\n // W: 61.0485247483732,\n // backgroundDBSPL: 43.88233142069752,\n // gainDBSPL: -128.24742161208985\n //}\n return res.data[task];\n };\n}\n\n/* harmony default export */ __webpack_exports__[\"default\"] = (PythonServerAPI);\n\n\n//# sourceURL=webpack://speakerCalibrator/./src/server/PythonServerAPI.js?");
810
+ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! axios */ \"./node_modules/axios/index.js\");\n/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_0__);\n\n/**\n *\n */\nclass PythonServerAPI {\n static PYTHON_SERVER_URL = 'https://easyeyes-python-flask-server.herokuapp.com';\n\n static TEST_SERVER_URL = 'http://127.0.0.1:5000';\n //static PYTHON_SERVER_URL ='http://127.0.0.1:5000';\n\n /** @private */\n MAX_RETRY_COUNT = 3;\n /** @private */\n RETRY_DELAY_MS = 1000;\n /**\n * @param data- -\n * g = inverted impulse response, when convolved with the impulse\n * reponse, they cancel out.\n * @param data.payload\n * @param data.sampleRate\n * @param data.P\n * @param data-.payload\n * @param data-.sampleRate\n * @param data-.P\n * @returns\n * @example\n */\n getImpulseResponse = async ({mls, payload, sampleRate, P, numPeriods}) => {\n const task = 'impulse-response';\n let res = null;\n\n console.log({payload});\n\n const data = JSON.stringify({\n task,\n payload,\n 'sample-rate': sampleRate,\n mls,\n P,\n numPeriods,\n });\n\n await axios__WEBPACK_IMPORTED_MODULE_0___default()({\n method: 'post',\n baseURL: PythonServerAPI.PYTHON_SERVER_URL,\n url: `/task/${task}`,\n headers: {\n 'Content-Type': 'application/json',\n },\n data,\n })\n .then(response => {\n res = response;\n })\n .catch(error => {\n throw error;\n });\n return res.data[task];\n };\n\n getMLS = async(length) => {\n const task = 'mls';\n let res = null\n\n const data = JSON.stringify({\n task,\n 'length':length,\n })\n\n await axios__WEBPACK_IMPORTED_MODULE_0___default()({\n method:'post',\n baseURL: PythonServerAPI.PYTHON_SERVER_URL,\n url: `/task/${task}`,\n headers: {\n 'Content-Type':'application/json',\n },\n data,\n })\n .then(response => {\n res = response;\n })\n .catch(error => {\n throw error;\n })\n\n return res.data[task];\n }\n getMLSWithRetry = async (length) => {\n let retryCount = 0;\n let response = null;\n\n while (retryCount < this.MAX_RETRY_COUNT) {\n try {\n response = await this.getMLS(length);\n // If the request is successful, break out of the loop\n break;\n } catch (error) {\n console.error(`Error occurred. Retrying... (${retryCount + 1}/${this.MAX_RETRY_COUNT})`);\n retryCount++;\n await new Promise(resolve => setTimeout(resolve, this.RETRY_DELAY_MS));\n }\n }\n\n if (response) {\n return response;\n } else {\n throw new Error(`Failed to get MLS after ${this.MAX_RETRY_COUNT} attempts.`);\n }\n };\n\n getPSD = async ({unconv_rec, conv_rec, sampleRate}) => {\n const task = 'psd';\n let res = null;\n\n const data = JSON.stringify({\n task,\n unconv_rec,\n conv_rec,\n sampleRate,\n });\n\n await axios__WEBPACK_IMPORTED_MODULE_0___default()({\n method: 'post',\n baseURL: PythonServerAPI.PYTHON_SERVER_URL,\n url: `/task/${task}`,\n headers: {\n 'Content-Type': 'application/json',\n },\n data,\n })\n .then(response => {\n res = response;\n })\n .catch(error => {\n throw error;\n });\n return res.data[task];\n };\n\n getSubtractedPSD = async (rec, knownGains, knownFrequencies,sampleRate) => {\n const task = 'subtracted-psd';\n let res = null;\n\n const data = JSON.stringify({\n task,\n rec,\n knownGains,\n knownFrequencies,\n sampleRate,\n });\n\n await axios__WEBPACK_IMPORTED_MODULE_0___default()({\n method: 'post',\n baseURL: PythonServerAPI.PYTHON_SERVER_URL,\n url: `/task/${task}`,\n headers: {\n 'Content-Type': 'application/json',\n },\n data,\n })\n .then(response => {\n res = response;\n })\n .catch(error => {\n throw error;\n });\n return res.data[task];\n };\n\n getSubtractedPSDWithRetry = async ( rec, knownGains, knownFrequencies,sampleRate) => {\n let retryCount = 0;\n let response = null;\n\n while (retryCount < this.MAX_RETRY_COUNT) {\n try {\n response = await this.getSubtractedPSD( rec, knownGains, knownFrequencies,sampleRate );\n // If the request is successful, break out of the loop\n break;\n } catch (error) {\n console.error(`Error occurred. Retrying... (${retryCount + 1}/${this.MAX_RETRY_COUNT})`);\n retryCount++;\n await new Promise(resolve => setTimeout(resolve, this.RETRY_DELAY_MS));\n }\n }\n\n if (response) {\n return response;\n } else {\n throw new Error(`Failed to get PSD after ${this.MAX_RETRY_COUNT} attempts.`);\n }\n };\n \n getPSDWithRetry = async ({ unconv_rec, conv_rec,sampleRate }) => {\n let retryCount = 0;\n let response = null;\n \n while (retryCount < this.MAX_RETRY_COUNT) {\n try {\n response = await this.getPSD({ unconv_rec, conv_rec,sampleRate });\n // If the request is successful, break out of the loop\n break;\n } catch (error) {\n console.error(`Error occurred. Retrying... (${retryCount + 1}/${this.MAX_RETRY_COUNT})`);\n retryCount++;\n await new Promise(resolve => setTimeout(resolve, this.RETRY_DELAY_MS));\n }\n }\n \n if (response) {\n return response;\n } else {\n throw new Error(`Failed to get PSD after ${this.MAX_RETRY_COUNT} attempts.`);\n }\n };\n \n\n getComponentInverseImpulseResponse = async ({payload,mls,lowHz,highHz,componentIRGains,iirLength,componentIRFreqs,num_periods,sampleRate}) => {\n const task = 'component-inverse-impulse-response';\n let res = null;\n\n console.log({payload});\n\n const data = JSON.stringify({\n task,\n payload,\n mls,\n lowHz,\n highHz,\n iirLength,\n componentIRGains,\n componentIRFreqs,\n num_periods,\n sampleRate,\n });\n\n await axios__WEBPACK_IMPORTED_MODULE_0___default()({\n method: 'post',\n baseURL: PythonServerAPI.PYTHON_SERVER_URL,\n url: `/task/${task}`,\n headers: {\n 'Content-Type': 'application/json',\n },\n data,\n })\n .then(response => {\n res = response;\n })\n .catch(error => {\n throw error;\n });\n\n return res.data[task];\n };\n getSystemInverseImpulseResponse = async ({payload,mls,lowHz,highHz,iirLength,num_periods,sampleRate}) => {\n const task = 'system-inverse-impulse-response';\n let res = null;\n\n console.log({payload});\n\n const data = JSON.stringify({\n task,\n payload,\n mls,\n lowHz,\n iirLength,\n highHz,\n num_periods,\n sampleRate,\n });\n\n await axios__WEBPACK_IMPORTED_MODULE_0___default()({\n method: 'post',\n baseURL: PythonServerAPI.PYTHON_SERVER_URL,\n url: `/task/${task}`,\n headers: {\n 'Content-Type': 'application/json',\n },\n data,\n })\n .then(response => {\n res = response;\n })\n .catch(error => {\n throw error;\n });\n\n return res.data[task];\n };\n\ngetComponentInverseImpulseResponseWithRetry = async ({ payload, mls, lowHz, highHz,componentIRGains,iirLength,componentIRFreqs, num_periods,sampleRate}) => {\n let retryCount = 0;\n let response = null;\n\n while (retryCount < this.MAX_RETRY_COUNT) {\n try {\n response = await this.getComponentInverseImpulseResponse({ payload, mls, lowHz, highHz,componentIRGains,iirLength,componentIRFreqs,num_periods,sampleRate});\n // If the request is successful, break out of the loop\n break;\n } catch (error) {\n console.error(`Error occurred. Retrying... (${retryCount + 1}/${this.MAX_RETRY_COUNT})`);\n retryCount++;\n await new Promise(resolve => setTimeout(resolve, this.RETRY_DELAY_MS));\n }\n }\n\n if (response) {\n return response;\n } else {\n throw new Error(`Failed to get inverse impulse response after ${this.MAX_RETRY_COUNT} attempts.`);\n }\n};\n\ngetSystemInverseImpulseResponseWithRetry = async ({ payload, mls, lowHz, highHz,iirLength, num_periods,sampleRate}) => {\n let retryCount = 0;\n let response = null;\n\n while (retryCount < this.MAX_RETRY_COUNT) {\n try {\n response = await this.getSystemInverseImpulseResponse({ payload, mls, lowHz, highHz,iirLength,num_periods,sampleRate});\n // If the request is successful, break out of the loop\n break;\n } catch (error) {\n console.error(`Error occurred. Retrying... (${retryCount + 1}/${this.MAX_RETRY_COUNT})`);\n retryCount++;\n await new Promise(resolve => setTimeout(resolve, this.RETRY_DELAY_MS));\n }\n }\n\n if (response) {\n return response;\n } else {\n throw new Error(`Failed to get inverse impulse response after ${this.MAX_RETRY_COUNT} attempts.`);\n }\n};\n\n\n\n getVolumeCalibration = async ({payload, sampleRate, lCalib}) => {\n const task = 'volume';\n let res = null;\n\n console.log({payload});\n\n const data = JSON.stringify({\n task,\n payload,\n 'sample-rate': sampleRate,\n lCalib,\n });\n\n await axios__WEBPACK_IMPORTED_MODULE_0___default()({\n method: 'post',\n baseURL: PythonServerAPI.PYTHON_SERVER_URL,\n url: `/task/${task}`,\n headers: {\n 'Content-Type': 'application/json',\n },\n data,\n })\n .then(response => {\n res = response;\n })\n .catch(error => {\n throw error;\n });\n\n return res.data[task];\n };\n\n getVolumeCalibrationParameters = async ({inDBValues, outDBSPLValues, lCalib, componentGainDBSPL}) => {\n const task = 'volume-parameters';\n let res = null;\n\n const data = JSON.stringify({\n task,\n inDBValues,\n outDBSPLValues,\n lCalib,\n componentGainDBSPL,\n });\n\n await axios__WEBPACK_IMPORTED_MODULE_0___default()({\n method: 'post',\n baseURL: PythonServerAPI.PYTHON_SERVER_URL, //server\n url: `/task/${task}`,\n headers: {\n 'Content-Type': 'application/json',\n },\n data,\n })\n .then(response => {\n res = response;\n console.log(res.data[task]);\n })\n .catch(error => {\n throw error;\n });\n\n\n\n // console.log(res.data[task]);\n //below is an example of res.data[task]\n //{\n // R: 16.56981076554259,\n // RMSError: 1.9289162528535229\n // T: -47.79799120884434,\n // W: 61.0485247483732,\n // backgroundDBSPL: 43.88233142069752,\n // gainDBSPL: -128.24742161208985\n //}\n return res.data[task];\n };\n}\n\n/* harmony default export */ __webpack_exports__[\"default\"] = (PythonServerAPI);\n\n\n//# sourceURL=webpack://speakerCalibrator/./src/server/PythonServerAPI.js?");
811
811
 
812
812
  /***/ }),
813
813
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "speaker-calibration",
3
- "version": "2.2.17",
3
+ "version": "2.2.19",
4
4
  "description": "Speaker calibration library for auditory testing",
5
5
  "main": "dist/main.js",
6
6
  "directories": {
package/src/server/PythonServerAPI.js CHANGED
@@ -3,10 +3,10 @@ import axios from 'axios';
3
3
  *
4
4
  */
5
5
  class PythonServerAPI {
6
- //static PYTHON_SERVER_URL = 'https://easyeyes-python-flask-server.herokuapp.com';
6
+ static PYTHON_SERVER_URL = 'https://easyeyes-python-flask-server.herokuapp.com';
7
7
 
8
8
  static TEST_SERVER_URL = 'http://127.0.0.1:5000';
9
- static PYTHON_SERVER_URL ='http://127.0.0.1:5000';
9
+ //static PYTHON_SERVER_URL ='http://127.0.0.1:5000';
10
10
 
11
11
  /** @private */
12
12
  MAX_RETRY_COUNT = 3;