speaker-calibration 2.2.238 → 2.2.240

package/package.json

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

package/src/listener-app/PhonePeer.js

@@ -26,6 +26,10 @@ export class PhonePeer {
         console.log('connectionParams', data.payload);
         this.handleConnectionParams(data.payload);
         break;
+      case 'phrases':
+        console.log('phrases', data.payload);
+        this.handlePhrases(data.payload);
+        break;
     }
   };
 
@@ -42,6 +46,10 @@ export class PhonePeer {
     this.handleStartCalibration();
   };
 
+  handlePhrases = payload => {
+    this.phrases = payload;
+  };
+
   createUI = () => {
     const container = document.createElement('div');
     container.id = 'listenerContainer';

package/src/peer-connection/speaker.js

@@ -164,6 +164,18 @@ class Speaker extends AudioPeer {
     await speaker.connectionManager.waitForPeerConnection();
     await speaker.connectionManager.resolveWhenHandshakeReceived();
     speaker.connectionManager.sendPageTitle('EasyEyes Microphone');
+    speaker.connectionManager.send({
+      name: 'CompatibilityPeer',
+      message: 'Text',
+      text: 'Loading...',
+    });
+    speaker.connectionManager.send({
+      name: 'SoundCalibration',
+      message: 'phrases',
+      payload: {
+        phrases: speaker.phrases,
+      },
+    });
 
     // Send connection parameters to the listener
     speaker.connectionManager.send(speaker.prepareConnectionParams());

package/src/tasks/combination/combination.js

@@ -581,6 +581,16 @@ class Combination extends AudioCalibrator {
   upsampleSignal = (signal, N) => {
     if (N <= 1) return signal;
 
+    //if signal is an array of arrays, upsample each array individually
+    try {
+      if (Array.isArray(signal[0])) {
+        return signal.map(arr => this.upsampleSignal(arr, N));
+      }
+    } catch (err) {
+      console.error(err);
+      return signal;
+    }
+
     const result = [];
     for (let sample of signal) {
       // Repeat each sample N times
@@ -600,6 +610,16 @@ class Combination extends AudioCalibrator {
   downsampleSignal = (signal, N) => {
     if (N <= 1) return signal;
 
+    //if signal is an array of arrays, downsample each array individually
+    try {
+      if (Array.isArray(signal[0])) {
+        return signal.map(arr => this.downsampleSignal(arr, N));
+      }
+    } catch (err) {
+      console.error(err);
+      return signal;
+    }
+
     const result = [];
     for (let i = 0; i < signal.length; i += N) {
       const chunk = signal.slice(i, Math.min(i + N, signal.length));