speaker-calibration 2.2.216 → 2.2.218

package/package.json

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

package/src/peer-connection/speaker.js

@@ -317,7 +317,7 @@ class Speaker extends AudioPeer {
       this.qrImage = qrImage;
 
       // Get shortened URL
-      let shortURL = '';
+      let shortURL = this.uri;
       try {
         const response = await fetch('https://api.short.io/links/public', {
           method: 'POST',
@@ -370,13 +370,15 @@ class Speaker extends AudioPeer {
         this.phrases.RC_checkInternetConnection[this.language]
       );
 
+      const language = this.language;
+      const phrases = this.phrases;
       const checkConnection = document.createElement('a');
       checkConnection.id = 'check-connection';
       checkConnection.href = '#';
       checkConnection.innerHTML = "check the phone's internet connection";
       checkConnection.addEventListener('click', function (event) {
         event.preventDefault();
-        createAndShowPopup(this.language, this.phrases);
+        createAndShowPopup(language, phrases);
       });
       explanation.querySelector('a#check-connection').replaceWith(checkConnection);
       textColumn.appendChild(explanation);

package/src/tasks/audioCalibrator.js

@@ -70,23 +70,22 @@ class AudioCalibrator extends AudioRecorder {
     targetElement.appendChild(this.localAudio);
   };
 
-  addTimeStamp = taskName => {
-    const currentTime = new Date().getTime(); // Current time in milliseconds
-    const elapsedTime = (currentTime - this.startTime) / 1000; // Total time since start in seconds
-    const stepDuration = elapsedTime - this.currentTime; // Time taken for the current step
+  addTimeStamp = (taskName) => {
+    const currentTime = new Date().getTime(); // Current time in ms
+    const elapsedTime = (currentTime - this.startTime) / 1000; // Convert to seconds
+    const stepDuration = elapsedTime - this.currentTime;
   
-    this.currentTime = elapsedTime; // Update for the next step
+    this.currentTime = elapsedTime; // Update for next step
   
-    // Round to 1 decimal place for consistent formatting
- 
-;
+    // Format numbers to 1 decimal place without padding
+    const elapsedStr = elapsedTime.toFixed(1);
+    const stepStr = stepDuration.toFixed(1);
   
-    // Log the timestamp with aligned bars
-    this.timeStamp.push(
-      `SOUND Total: ${elapsedTime.toFixed(1)} s  Step: ${stepDuration.toFixed(1)} s  ${taskName}`
-    );
+    // Push timestamp string (without padding)
+    this.timeStamp.push(`${elapsedStr} s. ∆ ${stepStr} s.  ${taskName}`);
   };
   
+  
 
   recordBackground = async (
     stream,
@@ -229,16 +228,26 @@ class AudioCalibrator extends AudioRecorder {
       // after recording
       await afterRecord(lCalib);
       const sd = await checkSD();
+      let sdMessage;
       if (sd <= maxSD) {
         console.log(`SD =${sd}, less than calibrateSound1000HzMaxSD_dB=${maxSD}`);
         this.numCalibratingRoundsCompleted += 2;
+        sdMessage =  `. SD = ${sd} dB`;
+
       } else {
         // if exist the maxSD do it one more time and only one more time
         console.log(`SD =${sd}, greater than calibrateSound1000HzMaxSD_dB=${maxSD}`);
         this.numCalibratingRoundsCompleted += 1;
+        sdMessage = `. SD = ${sd} > ${this.calibrateSound1000HzMaxSD_dB} dB.`;
       }
+      this.addTimeStamp(
+        `${this.calibrateSound1000HzPreSec.toFixed(1)}` +
+          `+${this.calibrateSound1000HzSec.toFixed(1)}` +
+          `+${this.calibrateSound1000HzPostSec.toFixed(1)} s. ` +
+          `1000 Hz at ${this.inDB} dB${sdMessage}`
+      );
       this.calibrationNodes = [];
-
+      
       // eslint-disable-next-line no-await-in-loop
       await sleep(2);
     }

package/src/tasks/combination/combination.js

@@ -2402,26 +2402,26 @@ class Combination extends AudioCalibrator {
     this.recordingChecks['volume'][this.inDB] = res;
     console.log('Recording checks in sendToServer', this.recordingChecks['volume']);
     const getSD = () => this.recordingChecks['volume'][this.inDB]['sd'];
-    const getSDMessage = () => {
-      //SOUND 6.7 s. 2.5+2.5+0.5 s. 1000 Hz at -60 dB. SD = 1.3 dB
-      // And reporting each rejected recording as
-      // SOUND 6.7 s. 2.5+2.5+0.5 s. 1000 Hz at -60 dB, SD = 19.7  > 4 dB.
-
-      if (this.numCalibratingRoundsCompleted == 1)
-        return `, SD = ${getSD()} > ${this.calibrateSound1000HzMaxSD_dB} dB.`;
-      return `. SD = ${getSD()} dB`;
-    };
-    const total_dur =
-      this.calibrateSound1000HzPreSec +
-      this.calibrateSound1000HzSec +
-      this.calibrateSound1000HzPostSec;
-
-    this.addTimeStamp(
-      `${this.calibrateSound1000HzPreSec.toFixed(1)}` +
-        `+ ${this.calibrateSound1000HzSec.toFixed(1)}` +
-        `+ ${this.calibrateSound1000HzPostSec.toFixed(1)} s.` +
-        `1000 Hz at ${this.inDB} dB${getSDMessage()}`
-    );
+    // const getSDMessage = () => {
+    //   //SOUND 6.7 s. 2.5+2.5+0.5 s. 1000 Hz at -60 dB. SD = 1.3 dB
+    //   // And reporting each rejected recording as
+    //   // SOUND 6.7 s. 2.5+2.5+0.5 s. 1000 Hz at -60 dB, SD = 19.7  > 4 dB.
+
+    //   if (this.numCalibratingRoundsCompleted == 1)
+    //     return `. SD = ${getSD()} > ${this.calibrateSound1000HzMaxSD_dB} dB.`;
+    //   return `. SD = ${getSD()} dB`;
+    // };
+    // const total_dur =
+    //   this.calibrateSound1000HzPreSec +
+    //   this.calibrateSound1000HzSec +
+    //   this.calibrateSound1000HzPostSec;
+
+    // this.addTimeStamp(
+    //   `${this.calibrateSound1000HzPreSec.toFixed(1)}` +
+    //     `+${this.calibrateSound1000HzSec.toFixed(1)}` +
+    //     `+${this.calibrateSound1000HzPostSec.toFixed(1)} s.` +
+    //     `1000 Hz at ${this.inDB} dB${getSDMessage()}`
+    // );
   };
 
   startCalibrationVolume = async (stream, gainValues, lCalib, componentGainDBSPL) => {