speaker-calibration 2.2.220 → 2.2.222

package/package.json

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

package/src/listener-app/listener.js

@@ -307,14 +307,48 @@ switch (isSmartPhone) {
   case 'false':
     // Initialize listener immediately
     listenerParameters.microphoneDeviceId = urlParams.get('deviceId');
-    window.listener = new Listener(listenerParameters);
 
-    // remove the button
-    const calibrationBeginButton2 = document.getElementById('calibrationBeginButton');
-    calibrationBeginButton2.remove();
-    container.style.display = 'block';
+    // Wrap initialization in an IIFE
+    (async function initializeDesktopMode() {
+      window.listener = new Listener(listenerParameters);
+      await window.listener.initializePeer();
 
-    window.addEventListener('load', async () => {
+      const timeout = 30000; // 30 seconds timeout
+      const startTime = Date.now();
+
+      // Wait for peer connection setup with timeout
+      while (Date.now() - startTime < timeout) {
+        if (
+          window.listener.peer.id !== null &&
+          window.listener.conn !== null &&
+          window.listener.connOpen
+        ) {
+          console.log('Connection established successfully');
+          // Continue with desktop setup
+          setupDesktopUI();
+          return;
+        }
+        console.log('Waiting for connection setup...');
+        await new Promise(resolve => setTimeout(resolve, 100));
+      }
+
+      // If we get here, we've timed out
+      console.error('Connection setup timed out after 30 seconds');
+      // const message = document.getElementById('message');
+      // message.innerText = phrases.RC_microphonePermissionDenied['en-US'];
+    })().catch(console.error);
+
+    function setupDesktopUI() {
+      // remove the button
+      const calibrationBeginButton2 = document.getElementById('calibrationBeginButton');
+      calibrationBeginButton2.remove();
+      container.style.display = 'block';
+
+      //update the display to be
+      const display = document.getElementById('display');
+      if (display) {
+        display.style.textAlign = 'left';
+      }
       // set the text of the html elements
       recordingInProgressElement.innerText = recordingInProgress;
       allowMicrophoneElement.innerText = allowMicrophone;
@@ -337,8 +371,7 @@ switch (isSmartPhone) {
       p.innerText = backToExperimentWindow;
       message.appendChild(p);
 
-      await window.listener.startCalibration();
-      console.log(window.listener);
-    });
+      window.listener.startCalibration();
+    }
     break;
 }

package/src/peer-connection/speaker.js

@@ -46,6 +46,7 @@ class Speaker extends AudioPeer {
     this.buttonsContainer = params?.buttonsContainer ?? document.createElement('div');
     this.phrases = params?.phrases ?? {};
     this.permissionStatus = 'pending';
+    this.calibrateSoundHz = params?.calibrateSoundHz ?? 48000;
 
     /* Set up callbacks that handle any events related to our peer object. */
   }
@@ -216,6 +217,7 @@ class Speaker extends AudioPeer {
             params.calibrateSoundBurstNormalizeBy1000HzGainBool,
             params.calibrateSoundBurstScalarDB,
             params.calibrateSound1000HzMaxSD_dB,
+            params.calibrateSound1000HzMaxTries,
             params._calibrateSoundBurstMaxSD_dB,
             params.calibrateSoundSamplingDesiredBits,
             params.language,
@@ -647,7 +649,12 @@ class Speaker extends AudioPeer {
 
     switch (data.name) {
       case 'samplingRate':
-        this.ac.setSamplingRates(data.payload);
+        console.log('Received sampling rate from listener: ', data.payload);
+        if (!data.payload) {
+          this.ac.setSamplingRates(this.calibrateSoundHz);
+        } else {
+          this.ac.setSamplingRates(data.payload);
+        }
         break;
       case 'sampleSize':
         this.ac.setSampleSize(data.payload);
@@ -781,6 +788,7 @@ class Speaker extends AudioPeer {
             params.calibrateSoundBurstNormalizeBy1000HzGainBool,
             params.calibrateSoundBurstScalarDB,
             params.calibrateSound1000HzMaxSD_dB,
+            params.calibrateSound1000HzMaxTries,
             params._calibrateSoundBurstMaxSD_dB,
             params.calibrateSoundSamplingDesiredBits,
             params.language,

package/src/tasks/audioCalibrator.js

@@ -203,13 +203,13 @@ class AudioCalibrator extends AudioRecorder {
     lCalib = 104.92978421490648,
     checkRec,
     checkSD,
-    maxSD
+    maxSD,
+    maxRetry
   ) => {
     this.numCalibratingRoundsCompleted = 0;
-    this.numCalibratingRounds = 2;
     console.log("maxSD in VolumeCaibrationSteps: ", maxSD, '0' >= maxSD);
     // calibration loop
-    while (!this.isCalibrating && this.numCalibratingRoundsCompleted < this.numCalibratingRounds) {
+    while (!this.isCalibrating && this.numCalibratingRoundsCompleted < maxRetry) {
       if (this.isCalibrating) break;
       // before recording
       await beforeRecord(gainValue);
@@ -231,7 +231,7 @@ class AudioCalibrator extends AudioRecorder {
       let sdMessage;
       if (sd <= maxSD) {
         console.log(`SD =${sd}, less than calibrateSound1000HzMaxSD_dB=${maxSD}`);
-        this.numCalibratingRoundsCompleted += 2;
+        this.numCalibratingRoundsCompleted += maxRetry;
         sdMessage =  `. SD = ${sd} dB`;
 
       } else {

package/src/tasks/combination/combination.js

@@ -2469,7 +2469,8 @@ class Combination extends AudioCalibrator {
         () => {
           return this.recordingChecks['volume'][this.inDB]['sd'];
         },
-        this.calibrateSound1000HzMaxSD_dB
+        this.calibrateSound1000HzMaxSD_dB,
+        this.calibrateSound1000HzMaxTries
       );
     } while (this.outDBSPL === null);
     //reset the values
@@ -2513,7 +2514,8 @@ class Combination extends AudioCalibrator {
           () => {
             return this.recordingChecks?.['volume']?.[this.inDB]?.['sd'] || 0;
           },
-          this.calibrateSound1000HzMaxSD_dB
+          this.calibrateSound1000HzMaxSD_dB,
+          this.calibrateSound1000HzMaxTries
         );
       } while (this.outDBSPL === null);
       outDBSPL1000Values.push(this.outDBSPL1000);
@@ -2885,6 +2887,7 @@ class Combination extends AudioCalibrator {
     _calibrateSoundBurstNormalizeBy1000HzGainBool = false,
     _calibrateSoundBurstScalarDB = 71,
     calibrateSound1000HzMaxSD_dB = 4,
+    calibrateSound1000HzMaxTries = 4,
     _calibrateSoundBurstMaxSD_dB = 4,
     calibrateSoundSamplingDesiredBits = 24,
     language,
@@ -2945,6 +2948,7 @@ class Combination extends AudioCalibrator {
     //feed calibration goal here
     this._calibrateSoundCheck = _calibrateSoundCheck;
     this.calibrateSound1000HzMaxSD_dB = calibrateSound1000HzMaxSD_dB;
+    this.calibrateSound1000HzMaxTries = calibrateSound1000HzMaxTries;
     this._calibrateSoundBurstMaxSD_dB = _calibrateSoundBurstMaxSD_dB;
     //check if a componentIR was given to the system, if it isn't check for the microphone. using dummy data here bc we need to
     //check the db based on the microphone currently connected