speaker-calibration 2.2.225 → 2.2.227

package/src/peer-connection/listener.js

@@ -17,7 +17,6 @@ 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
@@ -26,179 +25,14 @@ class Listener extends AudioPeer {
     this.startTime = Date.now();
     this.receiverPeerId = null;
 
-    const urlParameters = this.parseURLSearchParams();
-    this.calibrateSoundHz =
-      // previous calibrateSoundHz
-      urlParameters.hz !== null && urlParameters.hz !== undefined ? urlParameters.hz : 48000;
-    this.calibrateSoundSamplingDesiredBits =
-      // previous calibrateSoundSamplingDesiredBits
-      urlParameters.bits !== null && urlParameters.bits !== undefined ? urlParameters.bits : 24;
-    this.speakerPeerId = urlParameters.speakerPeerId;
+    this.calibrateSoundHz = params.hz;
+    this.calibrateSoundSamplingDesiredBits = params.bits;
+    this.speakerPeerId = params.speakerPeerId;
     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: '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) {
-        this.displayUpdate('Received null id from peer open');
-        this.peer.id = this.lastPeerId;
-      } else {
-        this.lastPeerId = this.peer.id;
-      }
-    } 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');
-      setTimeout(() => {
-        connection.close();
-      }, 500);
-    });
-  };
-
-  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
-    // }
-  };
-
-  join = async () => {
-    this.displayUpdate('Listener - join');
-    console.log(' Creating connection to: ', this.speakerPeerId);
-    /**
-     * Create the connection between the two Peers.
-     *
-     * Sets up callbacks that handle any events related to the
-     * connection and data received on it.
-     */
-    // Close old connection
-    if (this.conn) {
-      this.displayUpdate('Closing old connection');
-      this.conn.close();
-    }
-
-    // Create connection to destination peer specified by the query param
-    this.displayUpdate(`Creating connection to: ${this.speakerPeerId}`);
-    this.conn = this.peer.connect(this.speakerPeerId, {
-      reliable: true,
-    });
-
-    this.displayUpdate('Created connection');
-    this.conn.on('open', async () => {
-      this.displayUpdate('Listener - conn open');
-      this.connOpen = true;
-      // this.sendSamplingRate();
-    });
-
-    // 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;
-    });
-  };
+    this.connectionManager = null;
+  }
 
   startCalibration = async () => {
     await this.getDeviceInfo();
@@ -222,33 +56,45 @@ class Listener extends AudioPeer {
 
   sendSamplingRate = sampleRate => {
     this.displayUpdate('Listener - sendSamplingRate');
-    this.conn.send({
-      name: 'samplingRate',
-      payload: sampleRate,
+    this.connectionManager.send({
+      name: 'SoundCalibration',
+      payload: {
+        name: 'samplingRate',
+        payload: sampleRate,
+      },
     });
   };
 
   sendSampleSize = sampleSize => {
     this.displayUpdate('Listener - sendSampleSize');
-    this.conn.send({
-      name: 'sampleSize',
-      payload: sampleSize,
+    this.connectionManager.send({
+      name: 'SoundCalibration',
+      payload: {
+        name: 'sampleSize',
+        payload: sampleSize,
+      },
     });
   };
 
   sendFlags = flags => {
     this.displayUpdate('Listener - sendFlags');
-    this.conn.send({
-      name: 'flags',
-      payload: flags,
+    this.connectionManager.send({
+      name: 'SoundCalibration',
+      payload: {
+        name: 'flags',
+        payload: flags,
+      },
     });
   };
 
   sendPermissionStatus = status => {
     // this.displayUpdate('Listener - sendPermissionStatus');
-    this.conn.send({
-      name: 'permissionStatus',
-      payload: status,
+    this.connectionManager.send({
+      name: 'SoundCalibration',
+      payload: {
+        name: 'permissionStatus',
+        payload: status,
+      },
     });
   };
 
@@ -277,9 +123,12 @@ class Listener extends AudioPeer {
     deviceInfo['screenWidth'] = window.screen.width;
     deviceInfo['screenHeight'] = window.screen.height;
     console.log('deviceInfo Inside getDeviceInfo: ', deviceInfo);
-    this.conn.send({
-      name: 'deviceInfo',
-      payload: deviceInfo,
+    this.connectionManager.send({
+      name: 'SoundCalibration',
+      payload: {
+        name: 'deviceInfo',
+        payload: deviceInfo,
+      },
     });
     return deviceInfo;
   };
@@ -394,9 +243,12 @@ class Listener extends AudioPeer {
     const mobileOS = this.getMobileOS();
     if (process.env.NODE_ENV !== 'development' && mobileOS !== 'iOS') {
       const err = new UnsupportedDeviceError(`${mobileOS} is not supported`);
-      this.conn.send({
-        name: err.name,
-        payload: err,
+      this.connectionManager.send({
+        name: 'SoundCalibration',
+        payload: {
+          name: err.name,
+          payload: err,
+        },
       });
       return;
     }
@@ -433,7 +285,7 @@ class Listener extends AudioPeer {
               noiseSuppression: settings.noiseSuppression,
               echoCancellation: settings.echoCancellation,
             });
-            this.peer.call(this.speakerPeerId, stream); // one-way call
+            this.connectionManager.peer.call(this.speakerPeerId, stream); // one-way call
             this.displayUpdate('Listener - openAudioStream');
           })
           .catch(err => {