speaker-calibration 2.2.78 → 2.2.80

package/package.json

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

package/src/config/firebase.js

@@ -1,7 +1,7 @@
 // Import the functions you need from the SDKs you need
 import {initializeApp} from 'firebase/app';
 import {getDatabase} from 'firebase/database';
-
+import {getFirestore} from 'firebase/firestore';
 // TODO: Add SDKs for Firebase products that you want to use
 // https://firebase.google.com/docs/web/setup#available-libraries
 
@@ -20,6 +20,7 @@ const firebaseConfig = {
 
 // Initialize Firebase
 const app = initializeApp(firebaseConfig);
-const database = getDatabase();
+// const database = getDatabase();
+const database = getFirestore(app);
 
 export default database;

package/src/peer-connection/speaker.js

@@ -7,8 +7,6 @@ import {
   CalibrationTimedOutError,
 } from './peerErrors';
 
-import database from '../config/firebase';
-import {ref, set, get, child} from 'firebase/database';
 import {phrases} from '../../dist/example/i18n';
 
 /**
@@ -48,25 +46,6 @@ class Speaker extends AudioPeer {
     this.peer.on('disconnected', this.#onPeerDisconnected);
     this.peer.on('error', this.#onPeerError);
   }
-
-  static getMicrophoneNamesFromDatabase = async () => {
-    const dbRef = ref(database);
-    const snapshot = await get(child(dbRef, 'Microphone'));
-    if (snapshot.exists()) {
-      return Object.keys(snapshot.val());
-    }
-    return null;
-  };
-
-  static doesMicrophoneExist = async (speakerID, OEM) => {
-    const dbRef = ref(database);
-    const snapshot = await get(child(dbRef, `Microphone2/${OEM}/${speakerID}`));
-    if (snapshot.exists()) {
-      return true;
-    }
-    return false;
-  };
-
   /**
    * Async factory method that creates the Speaker object, and returns a promise that resolves to the result of the calibration.
    *

package/src/tasks/combination/combination.js

@@ -3,6 +3,7 @@ import AudioCalibrator from '../audioCalibrator';
 import {sleep, csvToArray, saveToCSV, saveToJSON, findMinValue, findMaxValue} from '../../utils';
 import database from '../../config/firebase';
 import {ref, set, get, child} from 'firebase/database';
+import {doc, getDoc, collection, addDoc, updateDoc, setDoc} from 'firebase/firestore';
 
 /**
  *
@@ -163,6 +164,8 @@ class Combination extends AudioCalibrator {
 
   componentInvertedImpulseResponseNoBandpass = [];
 
+  componentIRInTimeDomain = [];
+
   systemInvertedImpulseResponseNoBandpass = [];
 
   _calibrateSoundBackgroundSecs;
@@ -325,6 +328,7 @@ class Combination extends AudioCalibrator {
         this.componentIR['Freq'] = res['frequencies'];
         this.componentConvolution = res['convolution'];
         this.componentInvertedImpulseResponseNoBandpass = res['iirNoBandpass'];
+        this.componentIRInTimeDomain = res['irTime'];
       })
       .catch(err => {
         // this.emit('InvertedImpulseResponse', {res: false});
@@ -926,6 +930,7 @@ class Combination extends AudioCalibrator {
       component: {
         iir: this.componentInvertedImpulseResponse,
         ir: this.componentIR,
+        ir_in_time_domain: this.componentIRInTimeDomain,
         iir_psd: {
           y: component_iir_psd['y_conv'],
           x: component_iir_psd['x_conv'],
@@ -1127,6 +1132,7 @@ class Combination extends AudioCalibrator {
         component: {
           iir: this.componentInvertedImpulseResponse,
           ir: this.componentIR,
+          ir_in_time_domain: this.componentIRInTimeDomain,
           iir_psd: {
             y: component_iir_psd['y_conv'],
             x: component_iir_psd['x_conv'],
@@ -1289,6 +1295,7 @@ class Combination extends AudioCalibrator {
         component: {
           iir: this.componentInvertedImpulseResponse,
           ir: this.componentIR,
+          ir_in_time_domain: this.componentIRInTimeDomain,
           iir_psd: {
             y: component_iir_psd['y_conv'],
             x: component_iir_psd['x_conv'],
@@ -1499,6 +1506,7 @@ class Combination extends AudioCalibrator {
         component: {
           iir: this.componentInvertedImpulseResponse,
           ir: this.componentIR,
+          ir_in_time_domain: this.componentIRInTimeDomain,
           iir_psd: {
             y: component_iir_psd['y_conv'],
             x: component_iir_psd['x_conv'],
@@ -1801,6 +1809,23 @@ class Combination extends AudioCalibrator {
     return result;
   };
 
+  writeFrqGainToFirestore = async (speakerID, frq, gain, OEM, documentID) => {
+    // freq and gain are too large to take samples 1 in every 100 samples
+
+    const sampledFrq = [];
+    const sampledGain = [];
+    for (let i = 0; i < frq.length; i += 100) {
+      sampledFrq.push(frq[i]);
+      sampledGain.push(gain[i]);
+    }
+
+    const data = {Freq: sampledFrq, Gain: sampledGain};
+    // update Microphone/OEM/speakerID/default/linear
+    const docRef = doc(database, 'Microphone', OEM, speakerID, documentID);
+    await updateDoc(docRef, {
+      linear: data,
+    });
+  };
   // function to write frq and gain to firebase database given speakerID
   writeFrqGain = async (speakerID, frq, gain, OEM) => {
     // freq and gain are too large to take samples 1 in every 100 samples
@@ -1819,7 +1844,16 @@ class Combination extends AudioCalibrator {
 
   // Function to Read frq and gain from firebase database given speakerID
   // returns an array of frq and gain if speakerID exists, returns null otherwise
+  readFrqGainFromFirestore = async (speakerID, OEM, documentID) => {
+    const docRef = doc(database, 'Microphone', OEM, speakerID, documentID);
+    const docSnap = await getDoc(docRef);
 
+    if (docSnap.exists()) {
+      return docSnap.data().linear;
+    } else {
+      return null;
+    }
+  };
   readFrqGain = async (speakerID, OEM) => {
     const dbRef = ref(database);
     const snapshot = await get(child(dbRef, `Microphone2/${OEM}/${speakerID}/linear`));
@@ -1828,6 +1862,16 @@ class Combination extends AudioCalibrator {
     }
     return null;
   };
+  readGainat1000HzFromFirestore = async (speakerID, OEM, documentID) => {
+    const docRef = doc(database, 'Microphone', OEM, speakerID, documentID);
+    const docSnap = await getDoc(docRef);
+
+    if (docSnap.exists()) {
+      return docSnap.data().Gain1000;
+    } else {
+      return null;
+    }
+  };
 
   readGainat1000Hz = async (speakerID, OEM) => {
     const dbRef = ref(database);
@@ -1838,16 +1882,58 @@ class Combination extends AudioCalibrator {
     return null;
   };
 
+  writeGainat1000HzToFirestore = async (speakerID, gain, OEM, documentID) => {
+    const docRef = doc(database, 'Microphone', OEM, speakerID, documentID);
+
+    await updateDoc(docRef, {
+      Gain1000: gain,
+    });
+  };
+
   writeGainat1000Hz = async (speakerID, gain, OEM) => {
-    const data = {Gain: gain};
     await set(ref(database, `Microphone2/${OEM}/${speakerID}/Gain1000`), gain);
   };
 
+  writeIsSmartPhoneToFirestore = async (speakerID, isSmartPhone, OEM) => {
+    // if Microphone/OEM/speakerID/default exists, leave it alone and create a new document at Microphone/OEM/speakerID and return the id of the new document
+
+    const docRef = doc(database, 'Microphone', OEM, speakerID, 'default');
+    const docSnap = await getDoc(docRef);
+
+    if (docSnap.exists()) {
+      // add new document
+      const collectionRef = collection(database, 'Microphone', OEM, speakerID);
+      // add the new document and return the id
+      const docRef = await addDoc(collectionRef, {isSmartPhone: isSmartPhone});
+      return docRef.id;
+    } else {
+      // create document at Microphone/OEM/speakerID/default
+      await setDoc(docRef, {isSmartPhone: isSmartPhone});
+      return 'default';
+    }
+  };
+
   writeIsSmartPhone = async (speakerID, isSmartPhone, OEM) => {
     const data = {isSmartPhone: isSmartPhone};
     await set(ref(database, `Microphone2/${OEM}/${speakerID}/isSmartPhone`), isSmartPhone);
   };
 
+  writeMicrophoneInfoToFirestore = async (speakerID, micInfo, OEM, documentID) => {
+    const docRef = doc(database, 'Microphone', OEM, speakerID, documentID);
+    await updateDoc(docRef, {
+      info: micInfo,
+    });
+  };
+
+  doesMicrophoneExistInFirestore = async (speakerID, OEM, documentID) => {
+    const docRef = doc(database, 'Microphone', OEM, speakerID, documentID);
+    const docSnap = await getDoc(docRef);
+    if (docSnap.exists()) {
+      return true;
+    }
+    return false;
+  };
+
   doesMicrophoneExist = async (speakerID, OEM) => {
     const dbRef = ref(database);
     const snapshot = await get(child(dbRef, `Microphone2/${OEM}/${speakerID}`));
@@ -1990,15 +2076,20 @@ class Combination extends AudioCalibrator {
       }
     }
 
-    this.addMicrophoneInfo(ID, OEM, micInfo);
+    // this.writeMicrophoneInfoToFirestore(ID, micInfo, OEM, 'default');
+    // this.addMicrophoneInfo(ID, OEM, micInfo);
     if (componentIR == null) {
       //mode 'ir'
       //global variable this.componentIR must be set
-      this.componentIR = await this.readFrqGain(ID, OEM).then(data => {
+      this.componentIR = await this.readFrqGainFromFirestore(ID, OEM, 'default').then(data => {
         return data;
       });
+      // await this.readFrqGain(ID, OEM).then(data => {
+      //   return data;
+      // });
 
-      lCalib = await this.readGainat1000Hz(ID, OEM);
+      // lCalib = await this.readGainat1000Hz(ID, OEM);
+      lCalib = await this.readGainat1000HzFromFirestore(ID, OEM, 'default');
       micInfo['gainDBSPL'] = lCalib;
       // this.componentGainDBSPL = this.convertToDB(lCalib);
       this.componentGainDBSPL = lCalib;
@@ -2014,7 +2105,7 @@ class Combination extends AudioCalibrator {
       lCalib = this.findGainatFrequency(this.componentIR.Freq, this.componentIR.Gain, 1000);
       // this.componentGainDBSPL = this.convertToDB(lCalib);
       this.componentGainDBSPL = lCalib;
-      await this.writeIsSmartPhone(ID, isSmartPhone, OEM);
+      // await this.writeIsSmartPhone(ID, isSmartPhone, OEM);
     }
 
     this.oldComponentIR = this.componentIR;
@@ -2036,10 +2127,19 @@ class Combination extends AudioCalibrator {
       //   impulseResponseResults.component.ir.Gain,
       //   OEM
       // );
+      const id = await this.writeIsSmartPhoneToFirestore(ID, isSmartPhone, OEM);
+      await this.writeMicrophoneInfoToFirestore(ID, micInfo, OEM, id);
+      await this.writeFrqGainToFirestore(
+        ID,
+        impulseResponseResults.component.ir.Freq,
+        impulseResponseResults.component.ir.Gain,
+        OEM,
+        id
+      );
+      await this.writeGainat1000HzToFirestore(ID, micInfo['gainDBSPL'], OEM, id);
       micInfo['gainDBSPL'] = impulseResponseResults.component.gainDBSPL;
       // await this.writeGainat1000Hz(ID, micInfo['gainDBSPL'], OEM);
     }
-
     const total_results = {...volumeResults, ...impulseResponseResults};
     total_results['filteredMLSRange'] = this.filteredMLSRange;
     total_results['micInfo'] = micInfo;