homebridge-nest-accfactory 0.3.1 → 0.3.2

package/dist/webrtc.js

@@ -4,13 +4,14 @@
 // Handles connection and data from Google WebRTC systems
 // Currently a "work in progress"
 //
-// Code version 2025.06.15
+// Code version 2025.07.23
 // Mark Hulskamp
 'use strict';
 
 // Define external library requirements
 import protobuf from 'protobufjs';
 import * as werift from 'werift';
+import { Decoder } from '@evan/opus';
 
 // Define nodejs module requirements
 import EventEmitter from 'node:events';
@@ -20,38 +21,28 @@ import { setInterval, clearInterval, setTimeout, clearTimeout } from 'node:timer
 import fs from 'node:fs';
 import path from 'node:path';
 import crypto from 'node:crypto';
-import { fileURLToPath } from 'node:url';
 
 // Define our modules
 import Streamer from './streamer.js';
 
 // Define constants
-const EXTEND_INTERVAL = 120000; // Send extend command to Google Home Foyer every this period for active streams
+import { USER_AGENT, __dirname } from './consts.js';
+
+const EXTEND_INTERVAL = 30000; // Send extend command to Google Home Foyer every this period for active streams
 const RTP_PACKET_HEADER_SIZE = 12;
 const RTP_VIDEO_PAYLOAD_TYPE = 102;
 const RTP_AUDIO_PAYLOAD_TYPE = 111;
 //const RTP_TALKBACK_PAYLOAD_TYPE = 110;
-const USER_AGENT = 'Nest/5.78.0 (iOScom.nestlabs.jasper.release) os=18.0'; // User Agent string
 const GOOGLE_HOME_FOYER_PREFIX = 'google.internal.home.foyer.v1.';
-const __dirname = path.dirname(fileURLToPath(import.meta.url)); // Make a defined for JS __dirname
-
-// Blank audio in AAC format, mono channel @48000
-const AAC_MONO_48000_BLANK = Buffer.from([
-  0xff, 0xf1, 0x4c, 0x40, 0x03, 0x9f, 0xfc, 0xde, 0x02, 0x00, 0x4c, 0x61, 0x76, 0x63, 0x35, 0x39, 0x2e, 0x31, 0x38, 0x2e, 0x31, 0x30, 0x30,
-  0x00, 0x02, 0x30, 0x40, 0x0e,
-]);
 
-// Blank audio in opus format, stero channel @48000
-//const OPUSSTEREO48000BLANK = Buffer.from([]);
+// Blank audio in Opus format, mono channel @48000
+const PCM_S16LE_48000_STEREO_BLANK = Buffer.alloc(1920 * 2 * 2); // 20ms stereo silence at 48kHz
 
 // WebRTC object
 export default class WebRTC extends Streamer {
   token = undefined; // oauth2 token
   localAccess = false; // Do we try direct local access to the camera or via Google Home first
-  extendTimer = undefined; // Stream extend timer
-  stalledTimer = undefined; // Timer object for no received data
-  pingTimer = undefined; // Google Hopme Foyer periodic ping
-  blankAudio = AAC_MONO_48000_BLANK;
+  blankAudio = PCM_S16LE_48000_STEREO_BLANK;
   video = {}; // Video stream details once connected
   audio = {}; // Audio stream details once connected
 
@@ -64,9 +55,22 @@ export default class WebRTC extends Streamer {
   #peerConnection = undefined;
   #videoTransceiver = undefined;
   #audioTransceiver = undefined;
+  #opusDecoder = new Decoder({ channels: 2, sample_rate: 48000 });
+  #extendTimer = undefined; // Stream extend timer
+  #stalledTimer = undefined; // Timer object for no received data
+  #pingTimer = undefined; // Google Hopme Foyer periodic ping
+
+  // Codecs being used for video, audio and talking
+  get codecs() {
+    return {
+      video: Streamer.CODEC_TYPE.H264, // Video is H264
+      audio: Streamer.CODEC_TYPE.PCM, // Audio is PCM (we decode Opus to PCM output)
+      talkback: Streamer.CODEC_TYPE.OPUS, // Talking is also Opus
+    };
+  }
 
-  constructor(deviceData, options) {
-    super(deviceData, options);
+  constructor(uuid, deviceData, options) {
+    super(uuid, deviceData, options);
 
     // Load the protobuf for Google Home Foyer. Needed to communicate with camera devices using webrtc
     if (fs.existsSync(path.resolve(__dirname + '/protobuf/googlehome/foyer.proto')) === true) {
@@ -83,26 +87,14 @@ export default class WebRTC extends Streamer {
     if (deviceData?.apiAccess?.fieldTest === true) {
       this.#googleHomeFoyerAPIHost = 'https://preprod-googlehomefoyer-pa.sandbox.googleapis.com';
     }
-
-    // Set our streamer codec types
-    this.codecs = {
-      video: 'h264',
-      audio: 'opus',
-      talk: 'opus',
-    };
-
-    // If specified option to start buffering, kick off
-    if (options?.buffer === true) {
-      this.startBuffering();
-    }
   }
 
   // Class functions
   async connect() {
-    clearInterval(this.extendTimer);
-    clearTimeout(this.stalledTimer);
-    this.extendTimer = undefined;
-    this.stalledTimer = undefined;
+    clearInterval(this.#extendTimer);
+    clearTimeout(this.#stalledTimer);
+    this.#extendTimer = undefined;
+    this.#stalledTimer = undefined;
     this.#id = undefined;
 
     if (this.online === true && this.videoEnabled === true) {
@@ -121,7 +113,7 @@ export default class WebRTC extends Streamer {
                 // Test to see if our uuid matches here
                 let currentGoogleUuid = device?.id?.googleUuid;
                 Object.values(device.otherIds.otherThirdPartyId).forEach((other) => {
-                  if (other?.id === this.uuid) {
+                  if (other?.id === this.nest_google_uuid) {
                     this.#googleHomeDeviceUUID = currentGoogleUuid;
                   }
                 });
@@ -145,7 +137,7 @@ export default class WebRTC extends Streamer {
 
         if (homeFoyerResponse.status !== 0) {
           this.connected = undefined;
-          this?.log?.debug?.('Request to start camera viewing was not accepted for uuid "%s"', this.uuid);
+          this?.log?.debug?.('Request to start camera viewing was not accepted for uuid "%s"', this.nest_google_uuid);
         }
 
         if (homeFoyerResponse.status === 0) {
@@ -200,11 +192,11 @@ export default class WebRTC extends Streamer {
           let webRTCOffer = await this.#peerConnection.createOffer();
           await this.#peerConnection.setLocalDescription(webRTCOffer);
 
-          this?.log?.debug?.('Sending WebRTC offer for uuid "%s"', this.uuid);
+          this?.log?.debug?.('Sending WebRTC offer for uuid "%s"', this.nest_google_uuid);
 
           homeFoyerResponse = await this.#googleHomeFoyerCommand('CameraService', 'JoinStream', {
             command: 'offer',
-            deviceId: this.uuid,
+            deviceId: this.nest_google_uuid,
             local: this.localAccess,
             streamContext: 'STREAM_CONTEXT_DEFAULT',
             requestedVideoResolution: 'VIDEO_RESOLUTION_FULL_HIGH',
@@ -213,7 +205,7 @@ export default class WebRTC extends Streamer {
 
           if (homeFoyerResponse.status !== 0) {
             this.connected = undefined;
-            this?.log?.debug?.('WebRTC offer was not agreed with remote for uuid "%s"', this.uuid);
+            this?.log?.debug?.('WebRTC offer was not agreed with remote for uuid "%s"', this.nest_google_uuid);
           }
 
           if (
@@ -221,58 +213,53 @@ export default class WebRTC extends Streamer {
             homeFoyerResponse.data?.[0]?.responseType === 'answer' &&
             homeFoyerResponse.data?.[0]?.streamId !== undefined
           ) {
-            this?.log?.debug?.('WebRTC offer agreed with remote for uuid "%s"', this.uuid);
+            this?.log?.debug?.('WebRTC offer agreed with remote for uuid "%s"', this.nest_google_uuid);
 
-            this.#audioTransceiver?.onTrack &&
-              this.#audioTransceiver.onTrack.subscribe((track) => {
-                this.#handlePlaybackBegin(track);
+            this.#audioTransceiver?.onTrack?.subscribe?.((track) => {
+              this.#handlePlaybackBegin(track);
 
-                track.onReceiveRtp.subscribe((rtp) => {
-                  this.#handlePlaybackPacket(rtp);
-                });
+              track.onReceiveRtp.subscribe((rtp) => {
+                this.#handlePlaybackPacket(rtp);
               });
+            });
 
-            this.#videoTransceiver?.onTrack &&
-              this.#videoTransceiver.onTrack.subscribe((track) => {
-                this.#handlePlaybackBegin(track);
+            this.#videoTransceiver?.onTrack?.subscribe?.((track) => {
+              this.#handlePlaybackBegin(track);
 
-                track.onReceiveRtp.subscribe((rtp) => {
-                  this.#handlePlaybackPacket(rtp);
-                });
-                track.onReceiveRtcp.once(() => {
-                  setInterval(() => {
-                    if (this.#videoTransceiver?.receiver !== undefined) {
-                      this.#videoTransceiver.receiver.sendRtcpPLI(track.ssrc);
-                    }
-                  }, 2000);
-                });
+              track.onReceiveRtp.subscribe((rtp) => {
+                this.#handlePlaybackPacket(rtp);
+              });
+              track.onReceiveRtcp.once(() => {
+                setInterval(() => {
+                  this.#videoTransceiver?.receiver?.sendRtcpPLI?.(track.ssrc);
+                }, 2000);
               });
+            });
 
             this.#id = homeFoyerResponse.data[0].streamId;
-            this.#peerConnection &&
-              (await this.#peerConnection.setRemoteDescription({
-                type: 'answer',
-                sdp: homeFoyerResponse.data[0].sdp,
-              }));
 
-            this?.log?.debug?.('Playback started from WebRTC for uuid "%s" with session ID "%s"', this.uuid, this.#id);
+            await this.#peerConnection?.setRemoteDescription?.({
+              type: 'answer',
+              sdp: homeFoyerResponse.data[0].sdp,
+            });
+
+            this?.log?.debug?.('Playback started from WebRTC for uuid "%s" with session ID "%s"', this.nest_google_uuid, this.#id);
             this.connected = true;
 
             // Monitor connection status. If closed and there are still output streams, re-connect
             // Never seem to get a 'connected' status. Could use that for something?
-            this.#peerConnection &&
-              this.#peerConnection.connectionStateChange.subscribe((state) => {
-                if (state !== 'connected' && state !== 'connecting') {
-                  this?.log?.debug?.('Connection closed to WebRTC for uuid "%s"', this.uuid);
-                  this.connected = undefined;
-                  if (this.haveOutputs() === true) {
-                    this.connect();
-                  }
+            this.#peerConnection?.iceConnectionStateChange?.subscribe?.((state) => {
+              if (state !== 'connected' && state !== 'connecting') {
+                this?.log?.debug?.('Connection closed to WebRTC for uuid "%s"', this.nest_google_uuid);
+                this.connected = undefined;
+                if (this.isStreaming() === true || this.isBuffering() === true) {
+                  this.connect();
                 }
-              });
+              }
+            });
 
             // Create a timer to extend the active stream every period as defined
-            this.extendTimer = setInterval(async () => {
+            this.#extendTimer = setInterval(async () => {
               if (
                 this.#googleHomeFoyer !== undefined &&
                 this.connected === true &&
@@ -281,16 +268,14 @@ export default class WebRTC extends Streamer {
               ) {
                 let homeFoyerResponse = await this.#googleHomeFoyerCommand('CameraService', 'JoinStream', {
                   command: 'extend',
-                  deviceId: this.uuid,
+                  deviceId: this.nest_google_uuid,
                   streamId: this.#id,
                 });
 
                 if (homeFoyerResponse?.data?.[0]?.streamExtensionStatus !== 'STATUS_STREAM_EXTENDED') {
-                  this?.log?.debug?.('Error occurred while requested stream extension for uuid "%s"', this.uuid);
+                  this?.log?.debug?.('Error occurred while requested stream extension for uuid "%s"', this.nest_google_uuid);
 
-                  if (typeof this.#peerConnection?.close === 'function') {
-                    await this.#peerConnection.close();
-                  }
+                  await this.#peerConnection?.close?.();
                 }
               }
             }, EXTEND_INTERVAL);
@@ -313,27 +298,23 @@ export default class WebRTC extends Streamer {
         });
       }
 
-      this?.log?.debug?.('Notifying remote about closing connection for uuid "%s"', this.uuid);
+      this?.log?.debug?.('Notifying remote about closing connection for uuid "%s"', this.nest_google_uuid);
       await this.#googleHomeFoyerCommand('CameraService', 'JoinStream', {
         command: 'end',
-        deviceId: this.uuid,
+        deviceId: this.nest_google_uuid,
         streamId: this.#id,
         endStreamReason: 'REASON_USER_EXITED_SESSION',
       });
     }
 
-    if (this.#googleHomeFoyer !== undefined) {
-      this.#googleHomeFoyer.destroy();
-    }
+    this.#googleHomeFoyer?.destroy?.();
 
-    if (typeof this.#peerConnection?.close === 'function') {
-      await this.#peerConnection.close();
-    }
+    await this.#peerConnection?.close?.();
 
-    clearInterval(this.extendTimer);
-    clearInterval(this.stalledTimer);
-    this.extendTimer = undefined;
-    this.stalledTimer = undefined;
+    clearInterval(this.#extendTimer);
+    clearInterval(this.#stalledTimer);
+    this.#extendTimer = undefined;
+    this.#stalledTimer = undefined;
     this.#id = undefined;
     this.#googleHomeFoyer = undefined;
     this.#peerConnection = undefined;
@@ -344,23 +325,28 @@ export default class WebRTC extends Streamer {
     this.audio = {};
   }
 
-  update(deviceData) {
+  async onUpdate(deviceData) {
     if (typeof deviceData !== 'object') {
       return;
     }
 
-    if (deviceData.apiAccess.oauth2 !== this.token) {
+    if (
+      typeof deviceData?.apiAccess?.oauth2 === 'string' &&
+      deviceData.apiAccess.oauth2 !== '' &&
+      deviceData.apiAccess.oauth2 !== this.token
+    ) {
       // OAuth2 token has changed
       this.token = deviceData.apiAccess.oauth2;
+      if (this.isStreaming() === true || this.isBuffering() === true) {
+        this?.log?.debug?.('OAuth2 token has been updated for WebRTC on uuid "%s". Restarting connection.', this.nest_google_uuid);
+        await this.#peerConnection?.close?.();
+      }
     }
-
-    // Let our parent handle the remaining updates
-    super.update(deviceData);
   }
 
-  async talkingAudio(talkingData) {
+  async sendTalkback(talkingBuffer) {
     if (
-      Buffer.isBuffer(talkingData) === false ||
+      Buffer.isBuffer(talkingBuffer) === false ||
       this.#googleHomeDeviceUUID === undefined ||
       this.#id === undefined ||
       typeof this.#audioTransceiver?.sender?.sendRtp !== 'function'
@@ -368,7 +354,7 @@ export default class WebRTC extends Streamer {
       return;
     }
 
-    if (talkingData.length !== 0) {
+    if (talkingBuffer.length !== 0) {
       if (this.audio?.talking === undefined) {
         this.audio.talking = false;
         let homeFoyerResponse = await this.#googleHomeFoyerCommand('CameraService', 'SendTalkback', {
@@ -381,11 +367,11 @@ export default class WebRTC extends Streamer {
 
         if (homeFoyerResponse?.status !== 0) {
           this.audio.talking = undefined;
-          this?.log?.debug?.('Error occurred while requesting talkback to start for uuid "%s"', this.uuid);
+          this?.log?.debug?.('Error occurred while requesting talkback to start for uuid "%s"', this.nest_google_uuid);
         }
         if (homeFoyerResponse?.status === 0) {
           this.audio.talking = true;
-          this?.log?.debug?.('Talking start on uuid "%s"', this.uuid);
+          this?.log?.debug?.('Talking start on uuid "%s"', this.nest_google_uuid);
         }
       }
 
@@ -396,14 +382,14 @@ export default class WebRTC extends Streamer {
         rtpHeader.marker = true;
         rtpHeader.payloadOffset = RTP_PACKET_HEADER_SIZE;
         rtpHeader.payloadType = this.audio.id; // As the camera is send/recv, we use the same payload type id as the incoming audio
-        rtpHeader.timestamp = Date.now() & 0xffffffff; // Think the time stamp difference should be 960ms per audio packet?
+        rtpHeader.timestamp = Date.now() >>> 0; // Think the time stamp difference should be 960ms per audio packet?
         rtpHeader.sequenceNumber = this.audio.talkSquenceNumber++ & 0xffff;
-        let rtpPacket = new werift.RtpPacket(rtpHeader, talkingData);
+        let rtpPacket = new werift.RtpPacket(rtpHeader, talkingBuffer);
         this.#audioTransceiver.sender.sendRtp(rtpPacket.serialize());
       }
     }
 
-    if (talkingData.length === 0 && this.audio?.talking === true) {
+    if (talkingBuffer.length === 0 && this.audio?.talking === true) {
       // Buffer length of zero, ised to signal no more talking data for the moment
       let homeFoyerResponse = await this.#googleHomeFoyerCommand('CameraService', 'SendTalkback', {
         googleDeviceId: {
@@ -413,90 +399,206 @@ export default class WebRTC extends Streamer {
         command: 'COMMAND_STOP',
       });
       if (homeFoyerResponse?.status !== 0) {
-        this?.log?.debug?.('Error occurred while requesting talkback to stop for uuid "%s"', this.uuid);
+        this?.log?.debug?.('Error occurred while requesting talkback to stop for uuid "%s"', this.nest_google_uuid);
       }
       if (homeFoyerResponse?.status === 0) {
-        this?.log?.debug?.('Talking ended on uuid "%s"', this.uuid);
+        this?.log?.debug?.('Talking ended on uuid "%s"', this.nest_google_uuid);
       }
       this.audio.talking = undefined;
     }
   }
 
   #handlePlaybackBegin(weriftTrack) {
+    // Handle the beginning of RTP playback for an audio or video track
     if (weriftTrack === undefined || typeof weriftTrack !== 'object') {
       return;
     }
 
     if (weriftTrack?.kind === 'audio') {
-      // Store details about the audio track
       this.audio = {
-        id: weriftTrack.codec.payloadType, // Audio track payload type being used
-        startTime: Date.now(),
+        id: weriftTrack.codec.payloadType, // RTP payload type for audio
+        baseTimestamp: undefined,
+        baseTime: undefined,
         sampleRate: 48000,
-        opus: undefined, // Buffer for processing incoming Opus RTP packets
+        opus: undefined,
         talkSquenceNumber: weriftTrack?.sender?.sequenceNumber === undefined ? 0 : weriftTrack.sender.sequenceNumber,
-        talking: undefined, // undefined = not connected, false = connecting, true = connected and talking
+        talking: undefined,
       };
     }
 
     if (weriftTrack?.kind === 'video') {
-      // Store details about the video track
       this.video = {
-        id: weriftTrack.codec.payloadType, // Video track payload type being used
-        startTime: Date.now(),
+        id: weriftTrack.codec.payloadType, // RTP payload type for video
+        baseTimestamp: undefined,
+        baseTime: undefined,
         sampleRate: 90000,
-        h264: undefined, // Buffer for processing incoming fragmented H264 RTP packets
+        h264: {
+          fuBuffer: undefined,
+          fuTimer: undefined,
+          fuSeqStart: undefined,
+          fuType: undefined,
+          fuTimestamp: undefined,
+          lastSPS: undefined,
+          lastPPS: undefined,
+        },
       };
     }
   }
 
-  async #handlePlaybackPacket(weriftRtpPacket) {
-    if (weriftRtpPacket === undefined || typeof weriftRtpPacket !== 'object') {
+  #handlePlaybackPacket(rtpPacket) {
+    if (typeof rtpPacket !== 'object' || rtpPacket === undefined) {
       return;
     }
 
-    // Setup up a timeout to monitor for no packets recieved in a certain period
-    // If its trigger, we'll attempt to restart the stream and/or connection
-    clearTimeout(this.stalledTimer);
-    this.stalledTimer = setTimeout(async () => {
-      this?.log?.debug?.(
-        'We have not received any data from webrtc in the past "%s" seconds for uuid "%s". Attempting restart',
-        10,
-        this.uuid,
-      );
-
-      if (typeof this.#peerConnection?.close === 'function') {
-        await this.#peerConnection.close();
-      }
+    // Create timer for stalled  rtp output. Restart strem if so
+    clearTimeout(this.#stalledTimer);
+    this.#stalledTimer = setTimeout(async () => {
+      await this.#peerConnection?.close?.();
     }, 10000);
 
-    if (weriftRtpPacket.header.payloadType !== undefined && weriftRtpPacket.header.payloadType === this.video?.id) {
-      // Process video RTP packets. Need to re-assemble the H264 NALUs into a single H264 frame we can output
-      if (weriftRtpPacket.header.padding === false) {
-        this.video.h264 = werift.H264RtpPayload.deSerialize(weriftRtpPacket.payload, this.video.h264?.fragment);
-        if (this.video.h264?.payload !== undefined) {
-          this.addToOutput('video', this.video.h264.payload);
-          this.video.h264 = undefined;
+    const calculateTimestamp = (packet, stream) => {
+      if (typeof packet?.header?.timestamp !== 'number' || typeof stream?.sampleRate !== 'number') {
+        return Date.now();
+      }
+      if (stream.baseTimestamp === undefined) {
+        stream.baseTimestamp = packet.header.timestamp;
+        stream.baseTime = Date.now();
+      }
+      let deltaTicks = (packet.header.timestamp - stream.baseTimestamp + 0x100000000) % 0x100000000;
+      let deltaMs = (deltaTicks / stream.sampleRate) * 1000;
+      return stream.baseTime + deltaMs;
+    };
+
+    // Video packet processing
+    if (rtpPacket.header.payloadType === this.video?.id) {
+      let seq = rtpPacket.header.sequenceNumber;
+      if (this.video.h264.lastSeq !== undefined) {
+        let gap = (seq - this.video.h264.lastSeq + 0x10000) % 0x10000;
+        if (gap !== 1) {
+          // sequence gap (ignored silently)
         }
       }
+      this.video.h264.lastSeq = seq;
     }
 
-    if (weriftRtpPacket.header.payloadType !== undefined && weriftRtpPacket.header.payloadType === this.audio?.id) {
-      // Process audio RTP packet
-      this.audio.opus = werift.OpusRtpPayload.deSerialize(weriftRtpPacket.payload);
-      if (this.audio.opus?.payload !== undefined) {
-        // Until work out audio, send blank aac
-        this.addToOutput('audio', AAC_MONO_48000_BLANK);
+    if (rtpPacket.header.payloadType === this.video?.id) {
+      let payload = rtpPacket.payload;
+      if (!Buffer.isBuffer(payload) || payload.length < 1) {
+        return;
+      }
+
+      let nalType = payload[0] & 0x1f;
 
-        // Decode payload to opus??
-        //this.addToOutput('audio', this.audio.opus.payload);
+      // STAP-A
+      if (nalType === Streamer.H264NALUS.TYPES.STAP_A) {
+        let offset = 1;
+        while (offset + 2 <= payload.length) {
+          let size = payload.readUInt16BE(offset);
+          offset += 2;
+          if (size < 1 || offset + size > payload.length) {
+            break;
+          }
+          let nalu = payload.subarray(offset, offset + size);
+          let type = nalu[0] & 0x1f;
+          if (type === Streamer.H264NALUS.TYPES.SPS) {
+            this.video.h264.sps = nalu;
+          } else if (type === Streamer.H264NALUS.TYPES.PPS) {
+            this.video.h264.pps = nalu;
+          }
+          offset += size;
+        }
+        return;
+      }
+
+      // FU-A
+      if (nalType === Streamer.H264NALUS.TYPES.FU_A) {
+        let indicator = payload[0];
+        let header = payload[1];
+        let start = (header & 0x80) !== 0;
+        let end = (header & 0x40) !== 0;
+        let type = header & 0x1f;
+        let nalHeader = (indicator & 0xe0) | type;
+
+        if (this.video.h264.fragmentTime && Date.now() - this.video.h264.fragmentTime > 2000) {
+          delete this.video.h264.fragment;
+          delete this.video.h264.fragmentTime;
+        }
+
+        if (start) {
+          if (Array.isArray(this.video.h264.fragment)) {
+            delete this.video.h264.fragment;
+            delete this.video.h264.fragmentTime;
+          }
+          this.video.h264.fragment = [Buffer.from([nalHeader]), payload.subarray(2)];
+          this.video.h264.fragmentTime = Date.now();
+          return;
+        }
+
+        if (Array.isArray(this.video.h264.fragment)) {
+          this.video.h264.fragment.push(payload.subarray(2));
+          if (end) {
+            let buffer = Buffer.concat(this.video.h264.fragment);
+            delete this.video.h264.fragment;
+            delete this.video.h264.fragmentTime;
+
+            let ts = calculateTimestamp(rtpPacket, this.video);
+            if (type === Streamer.H264NALUS.TYPES.IDR) {
+              if (this.video.h264.sps) {
+                this.add(Streamer.PACKET_TYPE.VIDEO, this.video.h264.sps, ts);
+              }
+              if (this.video.h264.pps) {
+                this.add(Streamer.PACKET_TYPE.VIDEO, this.video.h264.pps, ts);
+              }
+            }
+
+            this.add(Streamer.PACKET_TYPE.VIDEO, buffer, ts);
+          }
+          return;
+        }
+
+        return;
+      }
+
+      // Raw NAL
+      let type = nalType;
+      if (type === 0) {
+        return;
+      }
+
+      let ts = calculateTimestamp(rtpPacket, this.video);
+      if (type === Streamer.H264NALUS.TYPES.IDR) {
+        if (this.video.h264.sps) {
+          this.add(Streamer.PACKET_TYPE.VIDEO, this.video.h264.sps, ts);
+        }
+        if (this.video.h264.pps) {
+          this.add(Streamer.PACKET_TYPE.VIDEO, this.video.h264.pps, ts);
+        }
+      }
+
+      this.add(Streamer.PACKET_TYPE.VIDEO, payload, ts);
+      return;
+    }
+
+    // Audio packet processing
+    if (rtpPacket.header.payloadType === this.audio?.id) {
+      let opus = werift.OpusRtpPayload.deSerialize(rtpPacket.payload);
+      if (opus?.payload?.[0] === 0xfc) {
+        return;
+      }
+
+      let ts = calculateTimestamp(rtpPacket, this.audio);
+      try {
+        let pcm = this.#opusDecoder.decode(opus.payload);
+        this.add(Streamer.PACKET_TYPE.AUDIO, Buffer.from(pcm), ts);
+      } catch {
+        this.add(Streamer.PACKET_TYPE.AUDIO, this.blankAudio, ts);
       }
     }
   }
 
   // Need more work in here*
-  // <--- error handling
-  // <--- timeout?
+  // < error handling
+  // < timeout?
   async #googleHomeFoyerCommand(service, command, values) {
     if (typeof service !== 'string' || service === '' || typeof command !== 'string' || command === '' || typeof values !== 'object') {
       return;
@@ -513,99 +615,126 @@ export default class WebRTC extends Streamer {
     };
 
     if (TraitMapRequest !== null && TraitMapResponse !== null && this.token !== undefined) {
-      if (this.#googleHomeFoyer === undefined || (this.#googleHomeFoyer?.connected === false && this.#googleHomeFoyer?.closed === true)) {
-        // No current HTTP/2 connection or current session is closed
-        this?.log?.debug?.('Connection started to Google Home Foyer "%s"', this.#googleHomeFoyerAPIHost);
-        this.#googleHomeFoyer = http2.connect(this.#googleHomeFoyerAPIHost);
-
-        this.#googleHomeFoyer.on('connect', () => {
-          this?.log?.debug?.('Connection established to Google Home Foyer "%s"', this.#googleHomeFoyerAPIHost);
-
-          clearInterval(this.pingTimer);
-          this.pingTimer = setInterval(() => {
-            if (this.#googleHomeFoyer !== undefined) {
-              // eslint-disable-next-line no-unused-vars
-              this.#googleHomeFoyer.ping((error, duration, payload) => {
-                // Do we log error to debug?
-              });
+      try {
+        if (this.#googleHomeFoyer === undefined || (this.#googleHomeFoyer?.connected === false && this.#googleHomeFoyer?.closed === true)) {
+          // No current HTTP/2 connection or current session is closed
+          this?.log?.debug?.('Connection started to Google Home Foyer "%s"', this.#googleHomeFoyerAPIHost);
+          this.#googleHomeFoyer = http2.connect(this.#googleHomeFoyerAPIHost);
+
+          this.#googleHomeFoyer.on('connect', () => {
+            this?.log?.debug?.('Connection established to Google Home Foyer "%s"', this.#googleHomeFoyerAPIHost);
+
+            clearInterval(this.#pingTimer);
+            this.#pingTimer = setInterval(() => {
+              if (this.#googleHomeFoyer !== undefined) {
+                // eslint-disable-next-line no-unused-vars
+                this.#googleHomeFoyer.ping((error, duration, payload) => {
+                  // Do we log error to debug?
+                });
+              }
+            }, 60000); // Every minute?
+          });
+
+          // eslint-disable-next-line no-unused-vars
+          this.#googleHomeFoyer.on('goaway', (errorCode, lastStreamID, opaqueData) => {
+            //console.log('http2 goaway', errorCode);
+          });
+
+          this.#googleHomeFoyer.on('error', (error) => {
+            this?.log?.debug?.('Google Home Foyer connection error: %s', String(error));
+            try {
+              this.#googleHomeFoyer.destroy();
+            } catch {
+              // Empty
             }
-          }, 60000); // Every minute?
-        });
+            this.#googleHomeFoyer = undefined;
+          });
 
-        // eslint-disable-next-line no-unused-vars
-        this.#googleHomeFoyer.on('goaway', (errorCode, lastStreamID, opaqueData) => {
-          //console.log('http2 goaway', errorCode);
-        });
+          this.#googleHomeFoyer.on('close', () => {
+            clearInterval(this.#pingTimer);
+            this.#pingTimer = undefined;
+            this.#googleHomeFoyer = undefined;
+            this?.log?.debug?.('Connection closed to Google Home Foyer "%s"', this.#googleHomeFoyerAPIHost);
+          });
+        }
 
-        // eslint-disable-next-line no-unused-vars
-        this.#googleHomeFoyer.on('error', (error) => {
-          //console.log('http2 error', error);
-          // Close??
+        let request = this.#googleHomeFoyer.request({
+          ':method': 'post',
+          ':path': '/' + GOOGLE_HOME_FOYER_PREFIX + service + '/' + command,
+          authorization: 'Bearer ' + this.token,
+          'content-type': 'application/grpc',
+          'user-agent': USER_AGENT,
+          te: 'trailers',
+          'request-id': crypto.randomUUID(),
+          'grpc-timeout': '10S',
         });
 
-        this.#googleHomeFoyer.on('close', () => {
-          clearInterval(this.pingTimer);
-          this.pingTimer = undefined;
-          this.#googleHomeFoyer = undefined;
-          this?.log?.debug?.('Connection closed to Google Home Foyer "%s"', this.#googleHomeFoyerAPIHost);
+        request.on('data', (data) => {
+          buffer = Buffer.concat([buffer, data]);
+          while (buffer.length >= 5) {
+            let headerSize = 5;
+            let dataSize = buffer.readUInt32BE(1);
+            if (buffer.length < headerSize + dataSize) {
+              // We don't have enough data in the buffer yet to process the data
+              // so, exit loop and await more data
+              break;
+            }
+
+            commandResponse.data.push(TraitMapResponse.decode(buffer.subarray(headerSize, headerSize + dataSize)).toJSON());
+            buffer = buffer.subarray(headerSize + dataSize);
+          }
         });
-      }
 
-      let request = this.#googleHomeFoyer.request({
-        ':method': 'post',
-        ':path': '/' + GOOGLE_HOME_FOYER_PREFIX + service + '/' + command,
-        authorization: 'Bearer ' + this.token,
-        'content-type': 'application/grpc',
-        'user-agent': USER_AGENT,
-        te: 'trailers',
-        'request-id': crypto.randomUUID(),
-        'grpc-timeout': '10S',
-      });
+        request.on('trailers', (headers) => {
+          if (isNaN(Number(headers?.['grpc-status'])) === false) {
+            commandResponse.status = Number(headers['grpc-status']);
+          }
+          if (headers?.['grpc-message'] !== undefined) {
+            commandResponse.message = headers['grpc-message'];
+          }
+        });
 
-      request.on('data', (data) => {
-        buffer = Buffer.concat([buffer, data]);
-        while (buffer.length >= 5) {
-          let headerSize = 5;
-          let dataSize = buffer.readUInt32BE(1);
-          if (buffer.length < headerSize + dataSize) {
-            // We don't have enough data in the buffer yet to process the data
-            // so, exit loop and await more data
-            break;
+        request.on('error', (error) => {
+          commandResponse.status = error.code;
+          commandResponse.message = error.message;
+          commandResponse.data = [];
+          try {
+            request.close();
+          } catch {
+            // Empty
           }
+        });
 
-          commandResponse.data.push(TraitMapResponse.decode(buffer.subarray(headerSize, headerSize + dataSize)).toJSON());
-          buffer = buffer.subarray(headerSize + dataSize);
-        }
-      });
+        if (request !== undefined && request?.closed === false && request?.destroyed === false) {
+          // Encode our request values, prefix with header (size of data), then send
+          let encodedData = TraitMapRequest.encode(TraitMapRequest.fromObject(values)).finish();
+          let header = Buffer.alloc(5);
+          header.writeUInt32BE(encodedData.length, 1);
+          request.write(Buffer.concat([header, encodedData]));
+          request.end();
 
-      request.on('trailers', (headers) => {
-        if (isNaN(Number(headers?.['grpc-status'])) === false) {
-          commandResponse.status = Number(headers['grpc-status']);
-        }
-        if (headers?.['grpc-message'] !== undefined) {
-          commandResponse.message = headers['grpc-message'];
+          await EventEmitter.once(request, 'close');
         }
-      });
 
-      request.on('error', (error) => {
+        try {
+          // No longer need this request
+          request.destroy();
+        } catch {
+          // Empty
+        }
+      } catch (error) {
         commandResponse.status = error.code;
-        commandResponse.message = error.message;
+        commandResponse.message = String(error.message || error);
         commandResponse.data = [];
-        request.close();
-      });
 
-      if (request !== undefined && request?.closed === false && request?.destroyed === false) {
-        // Encode our request values, prefix with header (size of data), then send
-        let encodedData = TraitMapRequest.encode(TraitMapRequest.fromObject(values)).finish();
-        let header = Buffer.alloc(5);
-        header.writeUInt32BE(encodedData.length, 1);
-        request.write(Buffer.concat([header, encodedData]));
-        request.end();
-
-        await EventEmitter.once(request, 'close');
+        this?.log?.debug?.('Google Home Foyer request failed: %s', commandResponse.message);
+        try {
+          this.#googleHomeFoyer?.destroy();
+        } catch {
+          // Empty
+        }
+        this.#googleHomeFoyer = undefined;
       }
-
-      request.destroy(); // No longer need this request
     }
 
     return commandResponse;