speaker-calibration 2.2.218 → 2.2.220

package/src/peer-connection/listener.js

@@ -1,6 +1,7 @@
 import AudioPeer from './audioPeer';
 import {UnsupportedDeviceError, MissingSpeakerIdError} from './peerErrors';
 import axios from 'axios';
+import Peer from 'peerjs';
 
 /**
  * @class Handles the listener's side of the connection. Responsible for getting access to user's microphone,
@@ -16,6 +17,7 @@ class Listener extends AudioPeer {
    */
   constructor(params) {
     super(params);
+    console.log('Listener constructor', this.peer);
     this.microphoneFromAPI = params.microphoneFromAPI ? params.microphoneFromAPI : '';
     this.microphoneDeviceId = params.microphoneDeviceId ? params.microphoneDeviceId : '';
     // this.deviceInfoFromUser = params.deviceInfoFromUser
@@ -32,16 +34,92 @@ class Listener extends AudioPeer {
       // previous calibrateSoundSamplingDesiredBits
       urlParameters.bits !== null && urlParameters.bits !== undefined ? urlParameters.bits : 24;
     this.speakerPeerId = urlParameters.speakerPeerId;
-
-    this.peer.on('open', this.onPeerOpen);
-    this.peer.on('connection', this.onPeerConnection);
-    this.peer.on('disconnected', this.onPeerDisconnected);
-    this.peer.on('close', this.onPeerClose);
-    this.peer.on('error', this.onPeerError);
+    this.lastPeerId = this.speakerPeerId;
+    this.connOpen = false;
   }
+  generateTimeBasedPeerID = async () => {
+    const now = new Date().getTime();
+    const randomBuffer = new Uint8Array(10);
+    crypto.getRandomValues(randomBuffer);
+    const randomPart = Array.from(randomBuffer)
+      .map(b => b.toString(36))
+      .join('');
+    const toHash = `${now}-${randomPart}`;
+    const encoder = new TextEncoder();
+    const data = encoder.encode(toHash);
+    const hash = await crypto.subtle.digest('SHA-256', data);
+    const hashArray = Array.from(new Uint8Array(hash));
+    const hashString = hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
+    const shortHash = hashString.substring(0, 12);
+    return this.encodeBase62(parseInt(shortHash, 16));
+  };
+
+  encodeBase62 = num => {
+    const base = 26;
+    const characters = 'abcdefghijklmnopqrstuvwxyz';
+    let result = '';
+    while (num > 0) {
+      result = characters[num % base] + result;
+      num = Math.floor(num / base);
+    }
+    return result || 'a';
+  };
+
+  initializePeer = async () => {
+    console.log('Initializing PeerJS connection...');
+    const id = await this.generateTimeBasedPeerID();
+    console.log('Generated Peer ID:', id);
+
+    try {
+      this.peer = new Peer(id, {
+        debug: 2,
+        host: 'easyeyes-peer-server.herokuapp.com',
+        port: 443,
+        secure: true,
+        config: {
+          iceServers: [
+            {
+              urls: 'stun:stun.relay.metered.ca:80',
+            },
+            {
+              urls: 'turn:global.relay.metered.ca:80',
+              username: 'de884cfc34189cdf1a5dd616',
+              credential: 'IcOpouU9/TYBmpHU',
+            },
+            {
+              urls: 'turn:global.relay.metered.ca:80?transport=tcp',
+              username: 'de884cfc34189cdf1a5dd616',
+              credential: 'IcOpouU9/TYBmpHU',
+            },
+            {
+              urls: 'turn:global.relay.metered.ca:443',
+              username: 'de884cfc34189cdf1a5dd616',
+              credential: 'IcOpouU9/TYBmpHU',
+            },
+            {
+              urls: 'turns:global.relay.metered.ca:443?transport=tcp',
+              username: 'de884cfc34189cdf1a5dd616',
+              credential: 'IcOpouU9/TYBmpHU',
+            },
+          ],
+        },
+      });
+
+      this.peer.on('open', this.onPeerOpen);
+      this.peer.on('connection', this.onPeerConnection);
+      this.peer.on('disconnected', this.onPeerDisconnected);
+      this.peer.on('close', this.onPeerClose);
+      this.peer.on('error', this.onPeerError);
+
+      console.log('Peer object created:', this.peer);
+    } catch (error) {
+      console.error('Failed to initialize PeerJS:', error);
+    }
+  };
 
   onPeerOpen = id => {
     this.displayUpdate('Listener - onPeerOpen');
+    console.log('onPeerOpen: ', id);
     // Workaround for peer.reconnect deleting previous id
     try {
       if (id === null) {
@@ -53,12 +131,12 @@ class Listener extends AudioPeer {
     } catch (error) {
       console.error('Error in onPeerOpen: ', error);
     }
-
     this.join();
   };
 
   onPeerConnection = connection => {
     this.displayUpdate('Listener - onPeerConnection');
+    console.log('onPeerConnection: ', connection);
     // Disallow incoming connections
     connection.on('open', () => {
       connection.send('Sender does not accept incoming connections');
@@ -71,26 +149,27 @@ class Listener extends AudioPeer {
   onConnData = data => {
     this.displayUpdate('Listener - onConnData');
     const hasSpeakerID = Object.prototype.hasOwnProperty.call(data, 'speakerPeerId');
-    if (!hasSpeakerID) {
-      this.displayUpdate('Error in parsing data received! Must set "speakerPeerId" property');
-      throw new MissingSpeakerIdError('Must set "speakerPeerId" property');
-    } else {
-      // this.conn.close();
-      this.displayUpdate(this.speakerPeerId);
-      this.speakerPeerId = data.speakerPeerId;
-      const newParams = {
-        speakerPeerId: this.speakerPeerId,
-      };
-      /*
-      FUTURE does this limit usable environments?
-      ie does this work if internet is lost after initial page load?
-      */
-      window.location.search = this.queryStringFromObject(newParams); // Redirect to correctly constructed keypad page
-    }
+    // if (!hasSpeakerID) {
+    //   this.displayUpdate('Error in parsing data received! Must set "speakerPeerId" property');
+    //   throw new MissingSpeakerIdError('Must set "speakerPeerId" property');
+    // } else {
+    //   // this.conn.close();
+    //   this.displayUpdate(this.speakerPeerId);
+    //   this.speakerPeerId = data.speakerPeerId;
+    //   const newParams = {
+    //     speakerPeerId: this.speakerPeerId,
+    //   };
+    //   /*
+    //   FUTURE does this limit usable environments?
+    //   ie does this work if internet is lost after initial page load?
+    //   */
+    //   window.location.search = this.queryStringFromObject(newParams); // Redirect to correctly constructed keypad page
+    // }
   };
 
   join = async () => {
     this.displayUpdate('Listener - join');
+    console.log(' Creating connection to: ', this.speakerPeerId);
     /**
      * Create the connection between the two Peers.
      *
@@ -112,18 +191,23 @@ class Listener extends AudioPeer {
     this.displayUpdate('Created connection');
     this.conn.on('open', async () => {
       this.displayUpdate('Listener - conn open');
-      await this.getDeviceInfo();
+      this.connOpen = true;
       // this.sendSamplingRate();
-      await this.openAudioStream();
     });
 
     // Handle incoming data (messages only since this is the signal sender)
     this.conn.on('data', this.onConnData);
     this.conn.on('close', () => {
       console.log('Connection closed');
+      this.connOpen = false;
     });
   };
 
+  startCalibration = async () => {
+    await this.getDeviceInfo();
+    await this.openAudioStream();
+  };
+
   getMobileOS = () => {
     const ua = navigator.userAgent;
     if (/android/i.test(ua)) {
@@ -163,6 +247,14 @@ class Listener extends AudioPeer {
     });
   };
 
+  sendPermissionStatus = status => {
+    // this.displayUpdate('Listener - sendPermissionStatus');
+    this.conn.send({
+      name: 'permissionStatus',
+      payload: status,
+    });
+  };
+
   getDeviceInfo = async () => {
     const deviceInfo = {};
     try {
@@ -271,6 +363,12 @@ class Listener extends AudioPeer {
 
     return contraints;
   };
+  setMicrophoneFromAPI = microphoneFromAPI => {
+    this.microphoneFromAPI = microphoneFromAPI;
+  };
+  setMicrophoneDeviceId = microphoneDeviceId => {
+    this.microphoneDeviceId = microphoneDeviceId;
+  };
   getDeviceIdByLabel = async targetLabel => {
     try {
       //get permission to use audio first. (Returns empty labels on some computers if not done first)

package/src/peer-connection/speaker.js

@@ -45,6 +45,7 @@ class Speaker extends AudioPeer {
     this.deviceId = params?.micrpohoneIdFromWebAudioApi ?? '';
     this.buttonsContainer = params?.buttonsContainer ?? document.createElement('div');
     this.phrases = params?.phrases ?? {};
+    this.permissionStatus = 'pending';
 
     /* Set up callbacks that handle any events related to our peer object. */
   }
@@ -138,10 +139,19 @@ class Speaker extends AudioPeer {
     await speaker.initPeer();
     // wrap the calibration process in a promise so we can await it
     return new Promise((resolve, reject) => {
+      // Add a permission check handler
+      const permissionCheckInterval = setInterval(() => {
+        if (speaker.permissionStatus === 'error' || speaker.permissionStatus === 'denied') {
+          clearInterval(permissionCheckInterval);
+          speaker.#removeUIElems();
+          resolve('permission denied');
+        }
+      }, 100);
+
       // when a call is received
       speaker.peer.on('call', async call => {
-        // Answer the call (one way)
-
+        clearInterval(permissionCheckInterval); // Clear interval when call is received
+        // Rest of the existing call handling code...
         call.answer();
         speaker.#removeUIElems();
         speaker.#showSpinner();
@@ -218,6 +228,7 @@ class Speaker extends AudioPeer {
         });
         // if we do not receive a result within the timeout, reject
         setTimeout(() => {
+          clearInterval(permissionCheckInterval);
           reject(
             new CalibrationTimedOutError(
               `Calibration failed to produce a result after ${
@@ -657,6 +668,20 @@ class Speaker extends AudioPeer {
         this.ac.setDeviceInfo(data.payload);
         console.log('Received device info from listener: ', data.payload);
         break;
+      case 'permissionStatus':
+        console.log('Received permission status from listener: ', data.payload);
+        if (data.payload.type === 'error') {
+          this.permissionStatus = 'error';
+          this.ac.setPermissionStatus('error');
+        } else if (data.payload.type === 'denied') {
+          this.permissionStatus = 'denied';
+          this.ac.setPermissionStatus('denied');
+        } else if (data.payload.type === 'granted') {
+          this.permissionStatus = 'granted';
+          this.ac.setPermissionStatus('granted');
+          console.log('Permission granted');
+        }
+        break;
       case UnsupportedDeviceError.name:
       case MissingSpeakerIdError.name:
         throw data.payload;
@@ -700,59 +725,77 @@ class Speaker extends AudioPeer {
 
     console.log('This is a repeat');
     // wrap the calibration process in a promise so we can await it
-    return new Promise(async (resolve, reject) => {
-      const result = await this.ac.startCalibration(
-        stream,
-        params.gainValues,
-        params.ICalib,
-        params.knownIR,
-        params.microphoneName,
-        params.calibrateSoundCheck,
-        params.isSmartPhone,
-        params.calibrateSoundBurstDb,
-        params.calibrateSoundBurstFilteredExtraDb,
-        params.calibrateSoundBurstLevelReTBool,
-        params.calibrateSoundBurstUses1000HzGainBool,
-        params.calibrateSoundBurstRepeats,
-        params.calibrateSoundBurstSec,
-        params._calibrateSoundBurstPreSec,
-        params._calibrateSoundBurstPostSec,
-        params.calibrateSoundHz,
-        params.calibrateSoundIRSec,
-        params.calibrateSoundIIRSec,
-        params.calibrateSoundIIRPhase,
-        params.calibrateSound1000HzPreSec,
-        params.calibrateSound1000HzSec,
-        params.calibrateSound1000HzPostSec,
-        params.calibrateSoundBackgroundSecs,
-        params.calibrateSoundSmoothOctaves,
-        params.calibrateSoundSmoothMinBandwidthHz,
-        params.calibrateSoundPowerBinDesiredSec,
-        params.calibrateSoundPowerDbSDToleratedDb,
-        params.calibrateSoundTaperSec,
-        params.micManufacturer,
-        params.micSerialNumber,
-        params.micModelNumber,
-        params.micModelName,
-        params.calibrateMicrophonesBool,
-        params.authorEmails,
-        params.webAudioDeviceNames,
-        params.IDsToSaveInSoundProfileLibrary,
-        params.restartButton,
-        params.reminder,
-        params.calibrateSoundLimit,
-        params.calibrateSoundBurstNormalizeBy1000HzGainBool,
-        params.calibrateSoundBurstScalarDB,
-        params.calibrateSound1000HzMaxSD_dB,
-        params._calibrateSoundBurstMaxSD_dB,
-        params.calibrateSoundSamplingDesiredBits,
-        params.language,
-        params.loudspeakerModelName,
-        params.phrases,
-        params.soundSubtitleId
-      );
-      this.#removeUIElems();
-      resolve(result);
+    return new Promise((resolve, reject) => {
+      // Add a permission check handler
+      const permissionCheckInterval = setInterval(() => {
+        if (this.permissionStatus === 'error' || this.permissionStatus === 'denied') {
+          clearInterval(permissionCheckInterval);
+          this.#removeUIElems();
+          resolve('permission denied');
+        }
+      }, 100);
+
+      // Start calibration process
+      (async () => {
+        try {
+          const result = await this.ac.startCalibration(
+            stream,
+            params.gainValues,
+            params.ICalib,
+            params.knownIR,
+            params.microphoneName,
+            params.calibrateSoundCheck,
+            params.isSmartPhone,
+            params.calibrateSoundBurstDb,
+            params.calibrateSoundBurstFilteredExtraDb,
+            params.calibrateSoundBurstLevelReTBool,
+            params.calibrateSoundBurstUses1000HzGainBool,
+            params.calibrateSoundBurstRepeats,
+            params.calibrateSoundBurstSec,
+            params._calibrateSoundBurstPreSec,
+            params._calibrateSoundBurstPostSec,
+            params.calibrateSoundHz,
+            params.calibrateSoundIRSec,
+            params.calibrateSoundIIRSec,
+            params.calibrateSoundIIRPhase,
+            params.calibrateSound1000HzPreSec,
+            params.calibrateSound1000HzSec,
+            params.calibrateSound1000HzPostSec,
+            params.calibrateSoundBackgroundSecs,
+            params.calibrateSoundSmoothOctaves,
+            params.calibrateSoundSmoothMinBandwidthHz,
+            params.calibrateSoundPowerBinDesiredSec,
+            params.calibrateSoundPowerDbSDToleratedDb,
+            params.calibrateSoundTaperSec,
+            params.micManufacturer,
+            params.micSerialNumber,
+            params.micModelNumber,
+            params.micModelName,
+            params.calibrateMicrophonesBool,
+            params.authorEmails,
+            params.webAudioDeviceNames,
+            params.IDsToSaveInSoundProfileLibrary,
+            params.restartButton,
+            params.reminder,
+            params.calibrateSoundLimit,
+            params.calibrateSoundBurstNormalizeBy1000HzGainBool,
+            params.calibrateSoundBurstScalarDB,
+            params.calibrateSound1000HzMaxSD_dB,
+            params._calibrateSoundBurstMaxSD_dB,
+            params.calibrateSoundSamplingDesiredBits,
+            params.language,
+            params.loudspeakerModelName,
+            params.phrases,
+            params.soundSubtitleId
+          );
+          clearInterval(permissionCheckInterval);
+          this.#removeUIElems();
+          resolve(result);
+        } catch (error) {
+          clearInterval(permissionCheckInterval);
+          reject(error);
+        }
+      })();
     });
   };
 }

package/src/tasks/combination/combination.js

@@ -296,6 +296,8 @@ class Combination extends AudioCalibrator {
   fs2;
   icapture = 0;
 
+  permissionStatus = null;
+
   /**generate string template that gets reevaluated as variable increases */
   generateTemplate = status => {
     if (this.isCalibrating) {
@@ -362,6 +364,10 @@ class Combination extends AudioCalibrator {
     this.deviceInfo = deviceInfo;
   };
 
+  setPermissionStatus = permissionStatus => {
+    this.permissionStatus = permissionStatus;
+  };
+
   /** .
    * .
    * .
@@ -3147,6 +3153,7 @@ class Combination extends AudioCalibrator {
       total_results['system']['phase'] = this.systemIRPhase;
       total_results['qualityMetrics'] = this.SDofFilteredRange;
       total_results['flags'] = this.flags;
+      total_results['permissionStatus'] = this.permissionStatus;
       console.log('total results');
       console.log(total_results);
       console.log('Time Stamps');