speaker-calibration 2.2.244 → 2.2.246

package/package.json

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

package/src/peer-connection/speaker.js

@@ -172,9 +172,7 @@ class Speaker extends AudioPeer {
     speaker.connectionManager.send({
       name: 'SoundCalibration',
       message: 'phrases',
-      payload: {
-        phrases: speaker.phrases,
-      },
+      payload: speaker.phrases,
     });
 
     // Send connection parameters to the listener

package/src/server/PythonServerAPI.js

@@ -843,7 +843,12 @@ class PythonServerAPI {
     })
       .then(response => {
         res = response;
-        console.log(res.data[task]);
+        if (typeof res.data === 'string') {
+          //if there is NaN in the string, replace it with 0
+          res.data = res.data.replace('NaN', '0');
+          res.data = JSON.parse(res.data);
+        }
+        console.log('res', res);
       })
       .catch(error => {
         throw error;

package/src/tasks/combination/combination.js

@@ -746,6 +746,9 @@ class Combination extends AudioCalibrator {
     const burst = this._calibrateSoundBurstSec;
     const post = this._calibrateSoundBurstPostSec;
     const total_dur = pre + repeats * burst + post;
+    const simulationEnabled =
+      this.calibrateSoundSimulateMicrophone !== null &&
+      this.calibrateSoundSimulateLoudspeaker !== null;
     await this.pyServerAPI
       .allHzPowerCheck({
         payload: payload_downsampled,
@@ -758,7 +761,11 @@ class Combination extends AudioCalibrator {
       })
       .then(async result => {
         if (result) {
-          if (result['sd'] > this._calibrateSoundBurstMaxSD_dB && this.numSuccessfulCaptured == 0) {
+          if (
+            result['sd'] > this._calibrateSoundBurstMaxSD_dB &&
+            this.numSuccessfulCaptured == 0 &&
+            !simulationEnabled
+          ) {
             console.log(
               'SD: ' +
                 result['sd'] +
@@ -827,14 +834,13 @@ class Combination extends AudioCalibrator {
               payload_skipped_warmUp,
               this._calibrateSoundBurstDownsample
             );
+            const factor = simulationEnabled ? this._calibrateSoundBurstDownsample : 1;
             await this.pyServerAPI
               .getAutocorrelation({
                 mls: mls,
                 payload: payload_skipped_warmUp_downsampled,
                 sampleRate: fMLS,
-                numPeriods:
-                  (this.numMLSPerCapture - this.num_mls_to_skip) /
-                  this._calibrateSoundBurstDownsample,
+                numPeriods: (this.numMLSPerCapture - this.num_mls_to_skip) / factor,
                 downsample: this._calibrateSoundBurstDownsample,
               })
               .then(async res => {
@@ -847,9 +853,7 @@ class Combination extends AudioCalibrator {
                     .getImpulseResponse({
                       mls,
                       sampleRate: fMLS,
-                      numPeriods:
-                        (this.numMLSPerCapture - this.num_mls_to_skip) /
-                        this._calibrateSoundBurstDownsample,
+                      numPeriods: (this.numMLSPerCapture - this.num_mls_to_skip) / factor,
                       sig: payload_skipped_warmUp_downsampled,
                       fs2: this.fs2,
                       L_new_n: this.L_new_n,
@@ -1188,12 +1192,11 @@ class Combination extends AudioCalibrator {
 
     // Save the simulated recording
     await this.saveFilteredRecording(simulatedRecording);
+    this.numSuccessfulCaptured = 2; // Mark as successfully captured to avoid retries
 
     // Process the recording
     await this.checkPowerVariation();
 
-    this.numSuccessfulCaptured = 2; // Mark as successfully captured to avoid retries
-
     this.stepNum += 1;
     this.incrementStatusBar();
     this.status = this.generateTemplate(