speaker-calibration 2.2.205 → 2.2.206

package/package.json

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

package/src/peer-connection/speaker.js

@@ -7,7 +7,7 @@ import {
   CalibrationTimedOutError,
 } from './peerErrors';
 
-import {phrases} from '../../dist/example/i18n';
+//import {phrases} from '../../dist/example/i18n';
 
 /**
  * @class Handles the speaker's side of the connection. Responsible for initiating the connection,
@@ -43,6 +43,7 @@ class Speaker extends AudioPeer {
     this.isLoudspeakerCalibration = params?.isLoudspeakerCalibration ?? false;
     this.deviceId = params?.micrpohoneIdFromWebAudioApi ?? '';
     this.buttonsContainer = params?.buttonsContainer ?? document.createElement('div');
+    this.phrases = params?. phrases ?? {};
 
     /* Set up callbacks that handle any events related to our peer object. */
   }
@@ -208,6 +209,7 @@ class Speaker extends AudioPeer {
             params.calibrateSoundSamplingDesiredBits,
             params.language,
             params.loudspeakerModelName,
+            params.phrases,
           );
           speaker.#removeUIElems();
           resolve(speaker.result);
@@ -329,10 +331,10 @@ class Speaker extends AudioPeer {
         })
         .then(data => {
           explanation.innerHTML = formatLineBreak(
-            phrases.RC_skipQR_ExplanationWithoutPreferNot[this.language]
+            this.phrases.RC_skipQR_ExplanationWithoutPreferNot[this.language]
               .replace('xxx', `<b style="user-select: text">${data.shortURL}</b>`)
               .replace('XXX', `<b style="user-select: text">${data.shortURL}</b>`),
-            phrases.RC_checkInternetConnection[this.language]
+            this.phrases.RC_checkInternetConnection[this.language]
           );
           const checkConnection = document.createElement('a');
           checkConnection.id = 'check-connection';
@@ -342,7 +344,7 @@ class Speaker extends AudioPeer {
           checkConnection.addEventListener('click', function (event) {
             console.log('clicked');
             event.preventDefault(); // Prevent the default link action
-            createAndShowPopup(lang);
+            createAndShowPopup(lang, this.phrases);
           });
           explanation.querySelector('a#check-connection').replaceWith(checkConnection);
         })
@@ -388,7 +390,7 @@ class Speaker extends AudioPeer {
         const proceedButton = document.createElement('button');
         proceedButton.setAttribute('id', 'calibrationProceedButton');
         proceedButton.setAttribute('class', 'btn btn-success');
-        proceedButton.innerHTML = phrases.T_proceed[this.language];
+        proceedButton.innerHTML = this.phrases.T_proceed[this.language];
         proceedButton.onclick = () => {
           // open the link in a new tab
           window.open(this.uri, '_blank');
@@ -425,7 +427,7 @@ class Speaker extends AudioPeer {
       instructionDisplay.style.whiteSpace = 'nowrap';
       instructionDisplay.style.fontWeight = 'bold';
       instructionDisplay.style.width = 'fit-content';
-      instructionDisplay.innerHTML = phrases.RC_soundRecording[this.language];
+      instructionDisplay.innerHTML = this.phrases.RC_soundRecording[this.language];
       let fontSize = 100;
       instructionDisplay.style.fontSize = fontSize + 'px';
       while (instructionDisplay.scrollWidth > background.scrollWidth * 0.9 && fontSize > 10) {
@@ -444,7 +446,7 @@ class Speaker extends AudioPeer {
 
     const timeToCalibrateDisplay = document.getElementById(this.timeToCalibrateDisplay);
     if (timeToCalibrateDisplay) {
-      const timeToCalibrateText = phrases.RC_howLongToCalibrate[this.language];
+      const timeToCalibrateText = this.phrases.RC_howLongToCalibrate[this.language];
       timeToCalibrateDisplay.innerHTML = timeToCalibrateText.replace('111', this.timeToCalibrate);
       timeToCalibrateDisplay.style.fontWeight = 'normal';
       timeToCalibrateDisplay.style.fontSize = '1rem';
@@ -716,6 +718,7 @@ class Speaker extends AudioPeer {
         params.calibrateSoundSamplingDesiredBits,
         params.language,
         params.loudspeakerModelName,
+        params.phrases,
       );
       this.#removeUIElems();
       resolve(result);

package/src/tasks/combination/combination.js

@@ -32,7 +32,7 @@ import {
   where,
   Timestamp,
 } from 'firebase/firestore';
-import { phrases } from '../../../dist/example/i18n';
+//import { phrases } from '../../../dist/example/i18n';
 
 /**
  *
@@ -312,7 +312,7 @@ class Combination extends AudioCalibrator {
     let systemSD = '';
     let flags = '';
     const reportWebAudioNames = `<strong>${this.webAudioDeviceNames.loudspeakerText} </strong> <strong>${this.webAudioDeviceNames.microphoneText} </strong>`;
-    const samplingParamText =  phrases.RC_SamplingHzBits[this.language].replace('111', this.sourceSamplingRate).replace('222',this.sinkSamplingRate).replace('333', this.calibrateSoundSamplingDesiredBits);
+    const samplingParamText = this.phrases.RC_SamplingHzBits[this.language].replace('111', this.sourceSamplingRate).replace('222',this.sinkSamplingRate).replace('333', this.calibrateSoundSamplingDesiredBits);
     const reportParameters = `${samplingParamText}`;
     if (this.flags) {
       flags = `<br> autoGainControl: ${this.flags.autoGainControl}; 
@@ -2735,6 +2735,7 @@ class Combination extends AudioCalibrator {
     calibrateSoundSamplingDesiredBits = 24,
     language,
     loudspeakerModelName='',
+    phrases,
 
   ) => {
     this._calibrateSoundBurstPreSec = _calibrateSoundBurstPreSec;
@@ -2772,13 +2773,14 @@ class Combination extends AudioCalibrator {
     this._calibrateSoundBurstScalarDB = _calibrateSoundBurstScalarDB;
     this.webAudioDeviceNames = webAudioDeviceNames;
     this.calibrateSoundSamplingDesiredBits = calibrateSoundSamplingDesiredBits;
+    this.phrases = phrases;
     if (isSmartPhone) {
       const leftQuote = "\u201C"; // “
        const rightQuote = "\u201D"; // ”
       this.webAudioDeviceNames.microphone = this.deviceInfo.microphoneFromAPI;
       const quotedWebAudioMic = leftQuote + this.webAudioDeviceNames.microphone + rightQuote;
       const combinedMicText = this.micModelName + " " + quotedWebAudioMic;
-      webAudioDeviceNames.microphoneText = phrases.RC_nameMicrophone[this.language]
+      webAudioDeviceNames.microphoneText = this.phrases.RC_nameMicrophone[this.language]
       .replace("“xxx”", combinedMicText)
       .replace("“XXX”", combinedMicText);
     }

package/src/utils.js

@@ -1,5 +1,5 @@
 import Swal from "sweetalert2";
-import {phrases} from '../dist/example/i18n.js';
+//import {phrases} from '../dist/example/i18n.js';
 /** .
  * .
  * .
@@ -147,7 +147,7 @@ export const formatLineBreak =(inputStr,checkInternetConnection) => {
 
 
   
-export const createAndShowPopup = (lang) => {
+export const createAndShowPopup = (lang, phrases) => {
   console.log(`
     <div style="text-align: left;"> 
     ${convertAsterisksToList(phrases.RC_NeedInternetConnectedPhone[lang].replace(/\n/g, '<br>'))}