speaker-calibration 2.2.68 → 2.2.70

package/package.json

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

package/src/tasks/combination/combination.js

@@ -198,8 +198,9 @@ class Combination extends AudioCalibrator {
     if (this.percent_complete > 100) {
       this.percent_complete = 100;
     }
+    const reportParameters = `<br> Sampling: Loudspeaker ${this.sourceSamplingRate} Hz, Microphone ${this.sinkSamplingRate} Hz, ${this.sampleSize} bits`;
     const template = `<div style="display: flex; justify-content: center; margin-top:12px;"><div style="width: 800px; height: 20px; border: 2px solid #000; border-radius: 10px;"><div style="width: ${this.percent_complete}%; height: 100%; background-color: #00aaff; border-radius: 8px;"></div></div></div>`;
-    return template;
+    return reportParameters + template;
   };
 
   /** increment numerator and percent for status bar */
@@ -229,7 +230,7 @@ class Combination extends AudioCalibrator {
    * @example
    */
   sendSystemImpulseResponsesToServerForProcessing = async () => {
-    this.addTimeStamp("Get system iir");
+    this.addTimeStamp('Get system iir');
     const computedIRs = await Promise.all(this.impulseResponses);
     const filteredComputedIRs = computedIRs.filter(element => {
       return element != undefined;
@@ -283,7 +284,7 @@ class Combination extends AudioCalibrator {
    * @example
    */
   sendComponentImpulseResponsesToServerForProcessing = async () => {
-    this.addTimeStamp("Get component iir");
+    this.addTimeStamp('Get component iir');
     const computedIRs = await Promise.all(this.impulseResponses);
     const filteredComputedIRs = computedIRs.filter(element => {
       return element != undefined;
@@ -345,7 +346,7 @@ class Combination extends AudioCalibrator {
     // Slice the array from the calculated start index to the end of the array
     const background_rec = background_rec_whole.slice(startIndex);
     console.log('Sending background recording to server for processing');
-    this.addTimeStamp("Get background PSD");
+    this.addTimeStamp('Get background PSD');
     this.pyServerAPI
       .getBackgroundNoisePSDWithRetry({
         background_rec,
@@ -703,7 +704,7 @@ class Combination extends AudioCalibrator {
     this.#currentConvolution = this.componentConvolution;
     this.filteredMLSRange.component.Min = findMinValue(this.#currentConvolution);
     this.filteredMLSRange.component.Max = findMaxValue(this.#currentConvolution);
-    this.addTimeStamp("Play MLS with component IIR");
+    this.addTimeStamp('Play MLS with component IIR');
     await this.playMLSwithIIR(stream, this.#currentConvolution);
     this.#stopCalibrationAudio();
     let component_conv_recs = this.getAllFilteredRecordedSignals();
@@ -711,7 +712,7 @@ class Combination extends AudioCalibrator {
     this.clearAllFilteredRecordedSignals();
 
     this.#currentConvolution = this.testConvolution;
-    this.addTimeStamp("Play MLS with test IIR");
+    this.addTimeStamp('Play MLS with test IIR');
     await this.playMLSwithIIR(stream, this.#currentConvolution);
     this.#stopCalibrationAudio();
     let test_conv_recs = this.getAllFilteredRecordedSignals();
@@ -721,7 +722,7 @@ class Combination extends AudioCalibrator {
     this.#currentConvolution = this.systemConvolution;
     this.filteredMLSRange.system.Min = findMinValue(this.#currentConvolution);
     this.filteredMLSRange.system.Max = findMaxValue(this.#currentConvolution);
-    this.addTimeStamp("Play MLS with system IIR");
+    this.addTimeStamp('Play MLS with system IIR');
     await this.playMLSwithIIR(stream, this.#currentConvolution);
     this.#stopCalibrationAudio();
     let system_conv_recs = this.getAllFilteredRecordedSignals();
@@ -739,7 +740,7 @@ class Combination extends AudioCalibrator {
     let knownGain = this.oldComponentIR.Gain;
     let knownFreq = this.oldComponentIR.Freq;
     let sampleRate = this.sourceSamplingRate || 96000;
-    this.addTimeStamp("Get PSD of mls recording");
+    this.addTimeStamp('Get PSD of mls recording');
     let component_unconv_rec_psd = await this.pyServerAPI
       .getSubtractedPSDWithRetry(unconv_rec, knownGain, knownFreq, sampleRate)
       .then(res => {
@@ -754,7 +755,7 @@ class Combination extends AudioCalibrator {
         console.error(err);
       });
 
-    this.addTimeStamp("Get PSD of filtered recording (component)");
+    this.addTimeStamp('Get PSD of filtered recording (component)');
     let component_conv_rec_psd = await this.pyServerAPI
       .getSubtractedPSDWithRetry(conv_rec, knownGain, knownFreq, sampleRate)
       .then(res => {
@@ -768,8 +769,8 @@ class Combination extends AudioCalibrator {
       .catch(err => {
         console.error(err);
       });
-    
-    this.addTimeStamp("Get PSD of filtered recording (test component)");
+
+    this.addTimeStamp('Get PSD of filtered recording (test component)');
     let test_conv_rec_psd = await this.pyServerAPI
       .getSubtractedPSDWithRetry(return_test_conv_rec, knownGain, knownFreq, sampleRate)
       .then(res => {
@@ -786,7 +787,7 @@ class Combination extends AudioCalibrator {
 
     conv_rec = system_conv_recs[0];
     //psd of system
-    this.addTimeStamp("Get PSD of filtered recording (system) and unfiltered recording");
+    this.addTimeStamp('Get PSD of filtered recording (system) and unfiltered recording');
     let system_recs_psd = await this.pyServerAPI
       .getPSDWithRetry({
         unconv_rec,
@@ -808,7 +809,7 @@ class Combination extends AudioCalibrator {
     //iir w/ and without bandpass psd. done
     unconv_rec = this.componentInvertedImpulseResponseNoBandpass;
     conv_rec = this.componentInvertedImpulseResponse;
-    this.addTimeStamp("Get PSD of component iir and component iir no band pass");
+    this.addTimeStamp('Get PSD of component iir and component iir no band pass');
     let component_iir_psd = await this.pyServerAPI
       .getPSDWithRetry({
         unconv_rec,
@@ -828,7 +829,7 @@ class Combination extends AudioCalibrator {
       });
     unconv_rec = this.systemInvertedImpulseResponseNoBandpass;
     conv_rec = this.systemInvertedImpulseResponse;
-    this.addTimeStamp("Get PSD of system iir and system iir no band pass");
+    this.addTimeStamp('Get PSD of system iir and system iir no band pass');
     let system_iir_psd = await this.pyServerAPI
       .getPSDWithRetry({
         unconv_rec,
@@ -846,8 +847,8 @@ class Combination extends AudioCalibrator {
       .catch(err => {
         console.error(err);
       });
-    
-    this.addTimeStamp("Get PSD of mls sequence");
+
+    this.addTimeStamp('Get PSD of mls sequence');
     let mls_psd = await this.pyServerAPI
       .getMLSPSDWithRetry({mls: this.#mlsBufferView, sampleRate: this.sourceSamplingRate || 96000})
       .then(res => {
@@ -862,8 +863,7 @@ class Combination extends AudioCalibrator {
         console.error(err);
       });
 
-
-    this.addTimeStamp("Get PSD of filered mls (system)");
+    this.addTimeStamp('Get PSD of filered mls (system)');
     let system_filtered_mls_psd = await this.pyServerAPI
       .getMLSPSDWithRetry({
         mls: this.systemConvolution,
@@ -881,8 +881,7 @@ class Combination extends AudioCalibrator {
         console.error(err);
       });
 
-
-    this.addTimeStamp("Get PSD of filered mls (component)");
+    this.addTimeStamp('Get PSD of filered mls (component)');
     let component_filtered_mls_psd = await this.pyServerAPI
       .getMLSPSDWithRetry({
         mls: this.componentConvolution,
@@ -978,12 +977,12 @@ class Combination extends AudioCalibrator {
       this.#currentConvolution = this.componentConvolution;
       this.filteredMLSRange.component.Min = findMinValue(this.#currentConvolution);
       this.filteredMLSRange.component.Max = findMaxValue(this.#currentConvolution);
-      this.addTimeStamp("Play MLS with component IIR");
+      this.addTimeStamp('Play MLS with component IIR');
     } else {
       this.#currentConvolution = this.systemConvolution;
       this.filteredMLSRange.system.Min = findMinValue(this.#currentConvolution);
       this.filteredMLSRange.system.Max = findMaxValue(this.#currentConvolution);
-      this.addTimeStamp("Play MLS with system IIR");
+      this.addTimeStamp('Play MLS with system IIR');
     }
     await this.playMLSwithIIR(stream, this.#currentConvolution);
     this.#stopCalibrationAudio();
@@ -997,7 +996,7 @@ class Combination extends AudioCalibrator {
     let conv_rec = conv_recs[0];
     let return_conv_rec = conv_rec;
     if (this._calibrateSoundCheck != 'system') {
-      this.addTimeStamp("Play MLS with test IIR");
+      this.addTimeStamp('Play MLS with test IIR');
       this.#currentConvolution = this.testConvolution;
       await this.playMLSwithIIR(stream, this.#currentConvolution);
       this.#stopCalibrationAudio();
@@ -1009,7 +1008,7 @@ class Combination extends AudioCalibrator {
       let knownGain = this.oldComponentIR.Gain;
       let knownFreq = this.oldComponentIR.Freq;
       let sampleRate = this.sourceSamplingRate || 96000;
-      this.addTimeStamp("Get PSD of mls recording");
+      this.addTimeStamp('Get PSD of mls recording');
       let unconv_results = await this.pyServerAPI
         .getSubtractedPSDWithRetry(unconv_rec, knownGain, knownFreq, sampleRate)
         .then(res => {
@@ -1024,7 +1023,7 @@ class Combination extends AudioCalibrator {
           console.error(err);
         });
 
-      this.addTimeStamp("Get PSD recording of filtered recording (component)");
+      this.addTimeStamp('Get PSD recording of filtered recording (component)');
       let conv_results = await this.pyServerAPI
         .getSubtractedPSDWithRetry(conv_rec, knownGain, knownFreq, sampleRate)
         .then(res => {
@@ -1038,8 +1037,8 @@ class Combination extends AudioCalibrator {
         .catch(err => {
           console.error(err);
         });
-      
-      this.addTimeStamp("Get PSD of filtered recording (test component)");
+
+      this.addTimeStamp('Get PSD of filtered recording (test component)');
       let test_conv_results = await this.pyServerAPI
         .getSubtractedPSDWithRetry(return_test_conv_rec, knownGain, knownFreq, sampleRate)
         .then(res => {
@@ -1056,7 +1055,7 @@ class Combination extends AudioCalibrator {
 
       unconv_rec = this.componentInvertedImpulseResponseNoBandpass;
       conv_rec = this.componentInvertedImpulseResponse;
-      this.addTimeStamp("Get PSD of component iir and component iir no bandpass");
+      this.addTimeStamp('Get PSD of component iir and component iir no bandpass');
       let component_iir_psd = await this.pyServerAPI
         .getPSDWithRetry({
           unconv_rec,
@@ -1076,7 +1075,7 @@ class Combination extends AudioCalibrator {
         });
       unconv_rec = this.systemInvertedImpulseResponseNoBandpass;
       conv_rec = this.systemInvertedImpulseResponse;
-      this.addTimeStamp("Get PSD of system iir and system iir no bandpass");
+      this.addTimeStamp('Get PSD of system iir and system iir no bandpass');
       let system_iir_psd = await this.pyServerAPI
         .getPSDWithRetry({
           unconv_rec,
@@ -1094,8 +1093,8 @@ class Combination extends AudioCalibrator {
         .catch(err => {
           console.error(err);
         });
-      
-      this.addTimeStamp("Get PSD of mls sequence");
+
+      this.addTimeStamp('Get PSD of mls sequence');
       let mls_psd = await this.pyServerAPI
         .getMLSPSDWithRetry({
           mls: this.#mlsBufferView,
@@ -1113,7 +1112,7 @@ class Combination extends AudioCalibrator {
           console.error(err);
         });
 
-      this.addTimeStamp("Get PSD of filtered mls (component)");
+      this.addTimeStamp('Get PSD of filtered mls (component)');
       let filtered_mls_psd = await this.pyServerAPI
         .getMLSPSDWithRetry({
           mls: this.componentConvolution,
@@ -1195,7 +1194,7 @@ class Combination extends AudioCalibrator {
         impulseResponses: [],
       };
     } else {
-      this.addTimeStamp("Get PSD of filtered recording (system) and unfiltered recording");
+      this.addTimeStamp('Get PSD of filtered recording (system) and unfiltered recording');
       let results = await this.pyServerAPI
         .getPSDWithRetry({
           unconv_rec,
@@ -1217,7 +1216,7 @@ class Combination extends AudioCalibrator {
       //iir w/ and without bandpass psd
       unconv_rec = this.componentInvertedImpulseResponseNoBandpass;
       conv_rec = this.componentInvertedImpulseResponse;
-      this.addTimeStamp("Get PSD of component iir and component iir no band pass");
+      this.addTimeStamp('Get PSD of component iir and component iir no band pass');
       let component_iir_psd = await this.pyServerAPI
         .getPSDWithRetry({
           unconv_rec,
@@ -1237,7 +1236,7 @@ class Combination extends AudioCalibrator {
         });
       unconv_rec = this.systemInvertedImpulseResponseNoBandpass;
       conv_rec = this.systemInvertedImpulseResponse;
-      this.addTimeStamp("Get PSD of system iir and system iir no band pass");
+      this.addTimeStamp('Get PSD of system iir and system iir no band pass');
       let system_iir_psd = await this.pyServerAPI
         .getPSDWithRetry({
           unconv_rec,
@@ -1256,7 +1255,7 @@ class Combination extends AudioCalibrator {
           console.error(err);
         });
 
-      this.addTimeStamp("Get PSD of mls sequence");
+      this.addTimeStamp('Get PSD of mls sequence');
       let mls_psd = await this.pyServerAPI
         .getMLSPSDWithRetry({
           mls: this.#mlsBufferView,
@@ -1274,8 +1273,7 @@ class Combination extends AudioCalibrator {
           console.error(err);
         });
 
-
-      this.addTimeStamp("Get PSD of filtered mls (system)");
+      this.addTimeStamp('Get PSD of filtered mls (system)');
       let filtered_mls_psd = await this.pyServerAPI
         .getMLSPSDWithRetry({
           mls: this.systemConvolution,
@@ -1398,8 +1396,6 @@ class Combination extends AudioCalibrator {
    * @example
    */
   startCalibrationImpulseResponse = async stream => {
-
-
     let desired_time = this.desired_time_per_mls;
     let checkRec = 'allhz';
 
@@ -1408,7 +1404,7 @@ class Combination extends AudioCalibrator {
     length = this.sourceSamplingRate * desired_time;
     //get mls here
     const calibrateSoundBurstDb = this._calibrateSoundBurstDb;
-    this.addTimeStamp("Get MLS sequence");
+    this.addTimeStamp('Get MLS sequence');
     await this.pyServerAPI
       .getMLSWithRetry({length, calibrateSoundBurstDb})
       .then(res => {
@@ -1717,7 +1713,7 @@ class Combination extends AudioCalibrator {
 
   #sendToServerForProcessing = lCalib => {
     console.log('Sending data to server');
-    this.addTimeStamp("Send volume data to server");
+    this.addTimeStamp('Send volume data to server');
     let left = this.calibrateSound1000HzPreSec;
     let right = this.calibrateSound1000HzPreSec + this.calibrateSound1000HzSec;
     this.pyServerAPI
@@ -1758,7 +1754,7 @@ class Combination extends AudioCalibrator {
     //this.emit('update', {message: `1000 Hz Calibration: Sound Level ${soundLevelToDiscard} dB`});
     this.emit('update', {message: this.status});
     this.startTime = new Date().getTime();
-    
+
     do {
       // eslint-disable-next-line no-await-in-loop
       await this.volumeCalibrationSteps(
@@ -1816,7 +1812,7 @@ class Combination extends AudioCalibrator {
     }
 
     // get the volume calibration parameters from the server
-    this.addTimeStamp("Get Volume Calibration Parameters");
+    this.addTimeStamp('Get Volume Calibration Parameters');
 
     const parameters = await this.pyServerAPI
       .getVolumeCalibrationParameters({
@@ -1937,10 +1933,10 @@ class Combination extends AudioCalibrator {
   };
 
   // add time stamp
-  addTimeStamp = (taskName) => {
-    let startTaskTime = (new Date().getTime() - this.startTime)/1000;
+  addTimeStamp = taskName => {
+    let startTaskTime = (new Date().getTime() - this.startTime) / 1000;
     this.timeStamp.push(`SOUND ${Number(startTaskTime.toFixed(1))} s. ${taskName}`);
-  }
+  };
 
   // Example of how to use the writeFrqGain and readFrqGain functions
   // writeFrqGain('speaker1', [1, 2, 3], [4, 5, 6]);
@@ -2005,7 +2001,7 @@ class Combination extends AudioCalibrator {
     // const OEM = "minidsp";
     const micInfo = {
       micModelName: isSmartPhone ? micModelName : microphoneName,
-      OEM: OEM,
+      OEM: isSmartPhone ? this.deviceInfo.OEM : micManufacturer,
       ID: ID,
       HardwareName: isSmartPhone ? this.deviceInfo.hardwarename : microphoneName,
       hardwareFamily: isSmartPhone ? this.deviceInfo.hardwarefamily : microphoneName,
@@ -2079,7 +2075,7 @@ class Combination extends AudioCalibrator {
     total_results['audioInfo']['sourceSampleRate'] = this.sourceSamplingRate;
     total_results['audioInfo']['bitsPerSample'] = this.sampleSize;
     const timeStampresult = [...this.timeStamp].join('\n');
-    total_results["timeStamps"] = timeStampresult;
+    total_results['timeStamps'] = timeStampresult;
     console.log('total results');
     console.log(total_results);
     console.log('Time Stamps');