homebridge-nest-accfactory 0.2.11 → 0.3.1

package/dist/webrtc.js

@@ -4,7 +4,7 @@
 // Handles connection and data from Google WebRTC systems
 // Currently a "work in progress"
 //
-// Code version 2025/03/16
+// Code version 2025.06.15
 // Mark Hulskamp
 'use strict';
 
@@ -26,17 +26,17 @@ import { fileURLToPath } from 'node:url';
 import Streamer from './streamer.js';
 
 // Define constants
-const EXTENDINTERVAL = 120000; // Send extend command to Google Home Foyer every this period for active streams
+const EXTEND_INTERVAL = 120000; // 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 USERAGENT = 'Nest/5.78.0 (iOScom.nestlabs.jasper.release) os=18.0'; // User Agent string
-const GOOGLEHOMEFOYERPREFIX = 'google.internal.home.foyer.v1.';
+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 AACMONO48000BLANK = Buffer.from([
+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,
 ]);
@@ -51,13 +51,14 @@ export default class WebRTC extends Streamer {
   extendTimer = undefined; // Stream extend timer
   stalledTimer = undefined; // Timer object for no received data
   pingTimer = undefined; // Google Hopme Foyer periodic ping
-  blankAudio = AACMONO48000BLANK;
+  blankAudio = AAC_MONO_48000_BLANK;
   video = {}; // Video stream details once connected
   audio = {}; // Audio stream details once connected
 
   // Internal data only for this class
   #protobufFoyer = undefined; // Protobuf for Google Home Foyer
   #googleHomeFoyer = undefined; // HTTP/2 connection to Google Home Foyer APIs
+  #googleHomeFoyerAPIHost = 'https://googlehomefoyer-pa.googleapis.com'; // Default API endpoint for Google Home Foyer
   #id = undefined; // Session ID
   #googleHomeDeviceUUID = undefined; // Normal Nest/Google protobuf device ID translated to a Google Foyer device ID
   #peerConnection = undefined;
@@ -78,6 +79,11 @@ export default class WebRTC extends Streamer {
     this.token = deviceData?.apiAccess?.oauth2;
     this.localAccess = deviceData?.localAccess === true;
 
+    // Update Google Home Foyer api host if using field test
+    if (deviceData?.apiAccess?.fieldTest === true) {
+      this.#googleHomeFoyerAPIHost = 'https://preprod-googlehomefoyer-pa.sandbox.googleapis.com';
+    }
+
     // Set our streamer codec types
     this.codecs = {
       video: 'h264',
@@ -139,7 +145,7 @@ export default class WebRTC extends Streamer {
 
         if (homeFoyerResponse.status !== 0) {
           this.connected = undefined;
-          this?.log?.debug && 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.uuid);
         }
 
         if (homeFoyerResponse.status === 0) {
@@ -194,7 +200,7 @@ export default class WebRTC extends Streamer {
           let webRTCOffer = await this.#peerConnection.createOffer();
           await this.#peerConnection.setLocalDescription(webRTCOffer);
 
-          this?.log?.debug && this.log.debug('Sending WebRTC offer for uuid "%s"', this.uuid);
+          this?.log?.debug?.('Sending WebRTC offer for uuid "%s"', this.uuid);
 
           homeFoyerResponse = await this.#googleHomeFoyerCommand('CameraService', 'JoinStream', {
             command: 'offer',
@@ -207,7 +213,7 @@ export default class WebRTC extends Streamer {
 
           if (homeFoyerResponse.status !== 0) {
             this.connected = undefined;
-            this?.log?.debug && 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.uuid);
           }
 
           if (
@@ -215,7 +221,7 @@ export default class WebRTC extends Streamer {
             homeFoyerResponse.data?.[0]?.responseType === 'answer' &&
             homeFoyerResponse.data?.[0]?.streamId !== undefined
           ) {
-            this?.log?.debug && 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.uuid);
 
             this.#audioTransceiver?.onTrack &&
               this.#audioTransceiver.onTrack.subscribe((track) => {
@@ -249,7 +255,7 @@ export default class WebRTC extends Streamer {
                 sdp: homeFoyerResponse.data[0].sdp,
               }));
 
-            this?.log?.debug && this.log.debug('Playback started from WebRTC for uuid "%s" with session ID "%s"', this.uuid, this.#id);
+            this?.log?.debug?.('Playback started from WebRTC for uuid "%s" with session ID "%s"', this.uuid, this.#id);
             this.connected = true;
 
             // Monitor connection status. If closed and there are still output streams, re-connect
@@ -257,7 +263,7 @@ export default class WebRTC extends Streamer {
             this.#peerConnection &&
               this.#peerConnection.connectionStateChange.subscribe((state) => {
                 if (state !== 'connected' && state !== 'connecting') {
-                  this?.log?.debug && this.log.debug('Connection closed to WebRTC for uuid "%s"', this.uuid);
+                  this?.log?.debug?.('Connection closed to WebRTC for uuid "%s"', this.uuid);
                   this.connected = undefined;
                   if (this.haveOutputs() === true) {
                     this.connect();
@@ -280,14 +286,14 @@ export default class WebRTC extends Streamer {
                 });
 
                 if (homeFoyerResponse?.data?.[0]?.streamExtensionStatus !== 'STATUS_STREAM_EXTENDED') {
-                  this?.log?.debug && 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.uuid);
 
                   if (typeof this.#peerConnection?.close === 'function') {
                     await this.#peerConnection.close();
                   }
                 }
               }
-            }, EXTENDINTERVAL);
+            }, EXTEND_INTERVAL);
           }
         }
       }
@@ -307,7 +313,7 @@ export default class WebRTC extends Streamer {
         });
       }
 
-      this?.log?.debug && 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.uuid);
       await this.#googleHomeFoyerCommand('CameraService', 'JoinStream', {
         command: 'end',
         deviceId: this.uuid,
@@ -375,11 +381,11 @@ export default class WebRTC extends Streamer {
 
         if (homeFoyerResponse?.status !== 0) {
           this.audio.talking = undefined;
-          this?.log?.debug && 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.uuid);
         }
         if (homeFoyerResponse?.status === 0) {
           this.audio.talking = true;
-          this?.log?.debug && this.log.debug('Talking start on uuid "%s"', this.uuid);
+          this?.log?.debug?.('Talking start on uuid "%s"', this.uuid);
         }
       }
 
@@ -407,10 +413,10 @@ export default class WebRTC extends Streamer {
         command: 'COMMAND_STOP',
       });
       if (homeFoyerResponse?.status !== 0) {
-        this?.log?.debug && 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.uuid);
       }
       if (homeFoyerResponse?.status === 0) {
-        this?.log?.debug && this.log.debug('Talking ended on uuid "%s"', this.uuid);
+        this?.log?.debug?.('Talking ended on uuid "%s"', this.uuid);
       }
       this.audio.talking = undefined;
     }
@@ -453,12 +459,11 @@ export default class WebRTC extends Streamer {
     // If its trigger, we'll attempt to restart the stream and/or connection
     clearTimeout(this.stalledTimer);
     this.stalledTimer = setTimeout(async () => {
-      this?.log?.debug &&
-        this.log.debug(
-          'We have not received any data from webrtc in the past "%s" seconds for uuid "%s". Attempting restart',
-          10,
-          this.uuid,
-        );
+      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();
@@ -481,7 +486,7 @@ export default class WebRTC extends Streamer {
       this.audio.opus = werift.OpusRtpPayload.deSerialize(weriftRtpPacket.payload);
       if (this.audio.opus?.payload !== undefined) {
         // Until work out audio, send blank aac
-        this.addToOutput('audio', AACMONO48000BLANK);
+        this.addToOutput('audio', AAC_MONO_48000_BLANK);
 
         // Decode payload to opus??
         //this.addToOutput('audio', this.audio.opus.payload);
@@ -498,8 +503,8 @@ export default class WebRTC extends Streamer {
     }
 
     // Attempt to retrieve both 'Request' and 'Reponse' traits for the associated service and command
-    let TraitMapRequest = this.#protobufFoyer.lookup(GOOGLEHOMEFOYERPREFIX + command + 'Request');
-    let TraitMapResponse = this.#protobufFoyer.lookup(GOOGLEHOMEFOYERPREFIX + command + 'Response');
+    let TraitMapRequest = this.#protobufFoyer.lookup(GOOGLE_HOME_FOYER_PREFIX + command + 'Request');
+    let TraitMapResponse = this.#protobufFoyer.lookup(GOOGLE_HOME_FOYER_PREFIX + command + 'Response');
     let buffer = Buffer.alloc(0);
     let commandResponse = {
       status: undefined,
@@ -510,11 +515,11 @@ 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 && this.log.debug('Connection started to Google Home Foyer');
-        this.#googleHomeFoyer = http2.connect('https://googlehomefoyer-pa.googleapis.com');
+        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 && this.log.debug('Connection established to Google Home Foyer');
+          this?.log?.debug?.('Connection established to Google Home Foyer "%s"', this.#googleHomeFoyerAPIHost);
 
           clearInterval(this.pingTimer);
           this.pingTimer = setInterval(() => {
@@ -542,16 +547,16 @@ export default class WebRTC extends Streamer {
           clearInterval(this.pingTimer);
           this.pingTimer = undefined;
           this.#googleHomeFoyer = undefined;
-          this?.log?.debug && this.log.debug('Connection closed to Google Home Foyer');
+          this?.log?.debug?.('Connection closed to Google Home Foyer "%s"', this.#googleHomeFoyerAPIHost);
         });
       }
 
       let request = this.#googleHomeFoyer.request({
         ':method': 'post',
-        ':path': '/' + GOOGLEHOMEFOYERPREFIX + service + '/' + command,
+        ':path': '/' + GOOGLE_HOME_FOYER_PREFIX + service + '/' + command,
         authorization: 'Bearer ' + this.token,
         'content-type': 'application/grpc',
-        'user-agent': USERAGENT,
+        'user-agent': USER_AGENT,
         te: 'trailers',
         'request-id': crypto.randomUUID(),
         'grpc-timeout': '10S',

package/package.json

@@ -2,7 +2,7 @@
     "name": "homebridge-nest-accfactory",
     "displayName": "Nest Accfactory",
     "type": "module",
-    "version": "0.2.11",
+    "version": "0.3.1",
     "description": "Homebridge support for Nest/Google devices including HomeKit Secure Video (HKSV) support for doorbells and cameras",
     "author": "n0rt0nthec4t",
     "license": "Apache-2.0",
@@ -46,25 +46,25 @@
     "scripts": {
         "clean": "rimraf ./dist*",
         "format": "prettier --write src/*.js src/**/*.js src/**/*.mjs",
-        "lint": "eslint src/*.js src/**/*.js src/**/*.mjs --max-warnings=20",
-        "build": "npm run clean && copyfiles -u 1 src/*.js dist && copyfiles -u 2 src/HomeKitDevice/*.js dist && copyfiles -u 2 src/HomeKitHistory/*.js dist && copyfiles -u 1 src/res/*.h264 dist && copyfiles -u 1 src/res/*.jpg dist && copyfiles -u 1 'src/protobuf/**/*.proto' dist",
+        "lint": "eslint src/*.js src/**/*.js src/**/*.mjs --fix --max-warnings=20",
+        "build": "npm run clean && copyfiles -u 1 src/*.js dist && copyfiles -u 2 src/HomeKitDevice/*.js dist && copyfiles -u 2 src/HomeKitHistory/*.js dist && copyfiles -u 1 src/res/*.h264 dist && copyfiles -u 1 src/res/*.jpg dist && copyfiles -u 1 'src/protobuf/**/*.proto' dist && copyfiles -u 1 src/plugins/*.js dist",
         "prepublishOnly": "npm run lint && npm run build"
     },
     "devDependencies": {
-        "@eslint/js": "^9.24.0",
-        "@stylistic/eslint-plugin": "^4.2.0",
-        "@types/node": "^22.14.1",
-        "@typescript-eslint/parser": "^8.30.1",
+        "@eslint/js": "^9.29.0",
+        "@stylistic/eslint-plugin": "^4.4.1",
+        "@types/node": "^24.0.1",
+        "@typescript-eslint/parser": "^8.34.0",
         "copyfiles": "^2.4.1",
-        "eslint": "^9.24.0",
+        "eslint": "^9.29.0",
         "homebridge": "^2.0.0-beta.0",
         "prettier": "^3.5.3",
-        "prettier-eslint": "^16.3.2",
+        "prettier-eslint": "^16.4.2",
         "rimraf": "^6.0.1"
     },
     "dependencies": {
-        "protobufjs": "^7.5.0",
+        "protobufjs": "^7.5.3",
         "werift": "^0.22.1",
-        "ws": "^8.18.1"
+        "ws": "^8.18.2"
     }
 }

package/dist/floodlight.js

@@ -1,97 +0,0 @@
-// Nest Cam with Floodlight
-// Part of homebridge-nest-accfactory
-//
-// Code version 27/9/2024
-// Mark Hulskamp
-'use strict';
-
-// Define external module requirements
-import NestCamera from './camera.js';
-
-export default class NestFloodlight extends NestCamera {
-  lightService = undefined; // HomeKit light
-
-  constructor(accessory, api, log, eventEmitter, deviceData) {
-    super(accessory, api, log, eventEmitter, deviceData);
-  }
-
-  // Class functions
-  addServices() {
-    // Call parent to setup the common camera things. Once we return, we can add in the specifics for our floodlight
-    let postSetupDetails = super.addServices();
-
-    this.lightService = this.accessory.getService(this.hap.Service.Switch);
-    if (this.deviceData.has_light === true) {
-      // Add service to for a light, including brightness control
-      if (this.lightService === undefined) {
-        this.lightService = this.accessory.addService(this.hap.Service.Lightbulb, '', 1);
-      }
-
-      if (this.lightService.testCharacteristic(this.hap.Characteristic.Brightness) === false) {
-        this.lightService.addCharacteristic(this.hap.Characteristic.Brightness);
-      }
-
-      this.lightService.getCharacteristic(this.hap.Characteristic.Brightness).setProps({
-        minStep: 10, // Light only goes in 10% increments
-      });
-
-      // Setup set callback for this light service
-      this.lightService.getCharacteristic(this.hap.Characteristic.On).onSet((value) => {
-        if (value !== this.deviceData.light_enabled) {
-          this.set({ uuid: this.deviceData.nest_google_uuid, light_enabled: value });
-
-          this?.log?.info && this.log.info('Floodlight on "%s" was turned', this.deviceData.description, value === true ? 'on' : 'off');
-        }
-      });
-
-      this.lightService.getCharacteristic(this.hap.Characteristic.Brightness).onSet((value) => {
-        if (value !== this.deviceData.light_brightness) {
-          this.set({ uuid: this.deviceData.nest_google_uuid, light_brightness: value });
-
-          this?.log?.info && this.log.info('Floodlight brightness on "%s" was set to "%s %"', this.deviceData.description, value);
-        }
-      });
-
-      this.lightService.getCharacteristic(this.hap.Characteristic.On).onGet(() => {
-        return this.deviceData.light_enabled === true;
-      });
-
-      this.lightService.getCharacteristic(this.hap.Characteristic.Brightness).onGet(() => {
-        return this.deviceData.light_brightness;
-      });
-    }
-    if (this.lightService !== undefined && this.deviceData.has_light !== true) {
-      // No longer required to have the light service
-      this.accessory.removeService(this.lightService);
-      this.lightService === undefined;
-    }
-
-    // Create extra details for output
-    this.lightService !== undefined && postSetupDetails.push('Light support');
-    return postSetupDetails;
-  }
-
-  removeServices() {
-    super.removeServices();
-
-    if (this.lightService !== undefined) {
-      this.accessory.removeService(this.lightService);
-    }
-    this.lightService = undefined;
-  }
-
-  updateServices(deviceData) {
-    if (typeof deviceData !== 'object' || this.controller === undefined) {
-      return;
-    }
-
-    // Get the camera class todo all its updates first, then we'll handle the doorbell specific stuff
-    super.updateServices(deviceData);
-
-    if (this.lightService !== undefined) {
-      // Update status of light, including brightness
-      this.lightService.updateCharacteristic(this.hap.Characteristic.On, deviceData.light_enabled);
-      this.lightService.updateCharacteristic(this.hap.Characteristic.Brightness, deviceData.light_brightness);
-    }
-  }
-}