speaker-calibration 2.2.211 → 2.2.213

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "speaker-calibration",
-  "version": "2.2.211",
+  "version": "2.2.213",
   "description": "Speaker calibration library for auditory testing",
   "main": "dist/main.js",
   "directories": {
@@ -31,6 +31,7 @@
   "license": "MIT",
   "repository": "git://github.com/EasyEyes/speaker-calibration.git",
   "dependencies": {
+    "@babel/runtime": "^7.26.0",
     "axios": "^1.6.7",
     "fftw-js": "^0.1.4",
     "firebase": "^9.23.0",
@@ -38,7 +39,7 @@
     "np": "^7.7.0",
     "nvm": "^0.0.4",
     "path-browserify": "^1.0.1",
-    "peerjs": "^1.3.2",
+    "peerjs": "1.4.7",
     "qrcode": "^1.4.4",
     "socket.io-client": "^4.4.1",
     "sweetalert2": "^11.14.0",
@@ -46,9 +47,13 @@
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@babel/core": "^7.17.9",
-    "@babel/preset-env": "^7.16.11",
+    "@babel/core": "^7.26.0",
+    "@babel/plugin-transform-async-to-generator": "^7.25.9",
+    "@babel/plugin-transform-runtime": "^7.25.9",
+    "@babel/preset-env": "^7.26.0",
+    "babel-loader": "^9.2.1",
     "babel-jest": "^27.5.1",
+    "core-js": "^3.40.0",
     "css-loader": "^5.2.6",
     "eslint": "^8.10.0",
     "eslint-config-airbnb-base": "^15.0.0",

package/{dist/example → src/listener-app}/listener.js

@@ -1,5 +1,6 @@
 // get element with id message
-import {phrases} from './i18n.js';
+import {phrases} from '../../dist/example/i18n.js';
+import {Listener} from '../main.js';
 // get url query parameters
 const urlParams = new URLSearchParams(window.location.search);
 
@@ -107,8 +108,8 @@ switch (isSmartPhone) {
       }
       console.log(lock);
       console.log('Starting Calibration');
-      console.log('Device id in example listenr:',listenerParameters.microphoneDeviceId);
-      window.listener = new speakerCalibrator.Listener(listenerParameters);
+      console.log('Device id in example listenr:', listenerParameters.microphoneDeviceId);
+      window.listener = new Listener(listenerParameters);
       console.log(window.listener);
       if (lock) {
         lock.release();
@@ -121,7 +122,7 @@ switch (isSmartPhone) {
     calibrationBeginButton2.remove();
     container.style.display = 'block';
     // event listener for when the page is loaded
-    
+
     window.addEventListener('load', () => {
       // set the text of the html elements
       recordingInProgressElement.innerHTML = recordingInProgress;
@@ -145,7 +146,7 @@ switch (isSmartPhone) {
       p.innerHTML = backToExperimentWindow;
       message.appendChild(p);
       listenerParameters.microphoneDeviceId = urlParams.get('deviceId');
-      window.listener = new speakerCalibrator.Listener(listenerParameters);
+      window.listener = new Listener(listenerParameters);
       console.log(window.listener);
     });
     break;

package/src/peer-connection/listener.js

@@ -161,8 +161,8 @@ class Listener extends AudioPeer {
   };
 
   getDeviceInfo = async () => {
+    const deviceInfo = {};
     try {
-      const deviceInfo = {};
       fod.complete(function (data) {
         deviceInfo['IsMobile'] = data.device['ismobile'];
         deviceInfo['HardwareName'] = data.device['hardwarename'];
@@ -176,21 +176,20 @@ class Listener extends AudioPeer {
         deviceInfo['DeviceType'] = data.device['devicetype'];
         // deviceInfo['deviceInfoFromUser'] = this.deviceInfoFromUser;
       });
-      // deviceInfo['deviceInfoFromUser'] = this.deviceInfoFromUser;
-      deviceInfo['microphoneFromAPI'] = this.microphoneFromAPI;
-      deviceInfo['microphoneDeviceId'] = this.microphoneDeviceId;
-      deviceInfo['screenWidth'] = window.screen.width;
-      deviceInfo['screenHeight'] = window.screen.height;
-      console.log('deviceInfo Inside getDeviceInfo: ', deviceInfo);
-      this.conn.send({
-        name: 'deviceInfo',
-        payload: deviceInfo,
-      });
-      return deviceInfo;
     } catch (error) {
       console.error('Error fetching or executing script:', error.message);
-      return null;
     }
+    // deviceInfo['deviceInfoFromUser'] = this.deviceInfoFromUser;
+    deviceInfo['microphoneFromAPI'] = this.microphoneFromAPI;
+    deviceInfo['microphoneDeviceId'] = this.microphoneDeviceId;
+    deviceInfo['screenWidth'] = window.screen.width;
+    deviceInfo['screenHeight'] = window.screen.height;
+    console.log('deviceInfo Inside getDeviceInfo: ', deviceInfo);
+    this.conn.send({
+      name: 'deviceInfo',
+      payload: deviceInfo,
+    });
+    return deviceInfo;
   };
 
   applyHQTrackConstraints = async stream => {
@@ -323,10 +322,13 @@ class Listener extends AudioPeer {
           .then(settings => {
             console.log(settings);
             this.sendSamplingRate(settings.sampleRate);
-            let sampleSize = settings.sampleSize;
+            //let sampleSize = settings.sampleSize;
+            let sampleSize = this.calibrateSoundSamplingDesiredBits;
+            /*
             if (!sampleSize) {
               sampleSize = this.calibrateSoundSamplingDesiredBits;
             }
+            */
             this.sendSampleSize(sampleSize);
             this.sendFlags({
               autoGainControl: settings.autoGainControl,

package/src/peer-connection/speaker.js

@@ -6,6 +6,7 @@ import {
   MissingSpeakerIdError,
   CalibrationTimedOutError,
 } from './peerErrors';
+import Peer from 'peerjs';
 
 //import {phrases} from '../../dist/example/i18n';
 
@@ -43,7 +44,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 ?? {};
+    this.phrases = params?.phrases ?? {};
 
     /* Set up callbacks that handle any events related to our peer object. */
   }
@@ -210,7 +211,7 @@ class Speaker extends AudioPeer {
             params.language,
             params.loudspeakerModelName,
             params.phrases,
-            params.soundSubtitleId,
+            params.soundSubtitleId
           );
           speaker.#removeUIElems();
           resolve(speaker.result);
@@ -288,7 +289,7 @@ class Speaker extends AudioPeer {
       hz: this.calibrateSoundHz,
       bits: this.calibrateSoundSamplingDesiredBits,
       lang: this.language,
-      deviceId: this.deviceId
+      deviceId: this.deviceId,
     };
     const queryString = this.queryStringFromObject(queryStringParameters);
     this.uri = this.siteUrl + queryString;
@@ -720,7 +721,7 @@ class Speaker extends AudioPeer {
         params.language,
         params.loudspeakerModelName,
         params.phrases,
-        params.soundSubtitleId,
+        params.soundSubtitleId
       );
       this.#removeUIElems();
       resolve(result);