homebridge-nest-accfactory 0.0.5 → 0.2.0

package/dist/doorbell.js

@@ -1,7 +1,7 @@
 // Nest Doorbell(s)
 // Part of homebridge-nest-accfactory
 //
-// Code version 12/9/2024
+// Code version 27/9/2024
 // Mark Hulskamp
 'use strict';
 
@@ -41,7 +41,7 @@ export default class NestDoorbell extends NestCamera {
       this.switchService.getCharacteristic(this.hap.Characteristic.On).onSet((value) => {
         if (value !== this.deviceData.indoor_chime_enabled) {
           // only change indoor chime status value if different than on-device
-          this.set({ indoor_chime_enabled: value });
+          this.set({ uuid: this.deviceData.nest_google_uuid, indoor_chime_enabled: value });
 
           this?.log?.info && this.log.info('Indoor chime on "%s" was turned', this.deviceData.description, value === true ? 'on' : 'off');
         }
@@ -66,7 +66,9 @@ export default class NestDoorbell extends NestCamera {
   removeServices() {
     super.removeServices();
 
-    this.doorbellTimer = clearTimeout(this.doorbellTimer);
+    clearTimeout(this.doorbellTimer);
+    this.doorbellTimer = undefined;
+
     if (this.switchService !== undefined) {
       this.accessory.removeService(this.switchService);
     }

package/dist/floodlight.js

@@ -1,7 +1,7 @@
 // Nest Cam with Floodlight
 // Part of homebridge-nest-accfactory
 //
-// Code version 12/9/2024
+// Code version 27/9/2024
 // Mark Hulskamp
 'use strict';
 
@@ -38,7 +38,7 @@ export default class NestFloodlight extends NestCamera {
       // Setup set callback for this light service
       this.lightService.getCharacteristic(this.hap.Characteristic.On).onSet((value) => {
         if (value !== this.deviceData.light_enabled) {
-          this.set({ light_enabled: value });
+          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');
         }
@@ -46,9 +46,9 @@ export default class NestFloodlight extends NestCamera {
 
       this.lightService.getCharacteristic(this.hap.Characteristic.Brightness).onSet((value) => {
         if (value !== this.deviceData.light_brightness) {
-          this.set({ light_brightness: value });
+          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);
+          this?.log?.info && this.log.info('Floodlight brightness on "%s" was set to "%s %"', this.deviceData.description, value);
         }
       });
 

package/dist/nexustalk.js

@@ -5,7 +5,7 @@
 //
 // Credit to https://github.com/Brandawg93/homebridge-nest-cam for the work on the Nest Camera comms code on which this is based
 //
-// Code version 11/9/2024
+// Code version 29/9/2024
 // Mark Hulskamp
 'use strict';
 
@@ -55,15 +55,22 @@ const PacketType = {
   AUTHORIZE_REQUEST: 212,
 };
 
+// Blank audio in AAC format, mono channel @48000
+const AACMONO48000BLANK = 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,
+]);
+
 // nexusTalk object
 export default class NexusTalk extends Streamer {
   token = undefined;
   tokenType = undefined;
-  id = undefined; // Session ID
   pingTimer = undefined; // Timer object for ping interval
   stalledTimer = undefined; // Timer object for no received data
-  video = {}; // Video stream details
-  audio = {}; // Audio stream details
+  host = ''; // Host to connect to or connected too
+  blankAudio = AACMONO48000BLANK;
+  video = {}; // Video stream details once connected
+  audio = {}; // Audio stream details once connected
 
   // Internal data only for this class
   #protobufNexusTalk = undefined; // Protobuf for NexusTalk
@@ -71,6 +78,7 @@ export default class NexusTalk extends Streamer {
   #packets = []; // Incoming packets
   #messages = []; // Incoming messages
   #authorised = false; // Have we been authorised
+  #id = undefined; // Session ID
 
   constructor(deviceData, options) {
     super(deviceData, options);
@@ -86,8 +94,15 @@ export default class NexusTalk extends Streamer {
     this.tokenType = deviceData?.apiAccess?.oauth2 !== undefined ? 'google' : 'nest';
     this.host = deviceData?.streaming_host; // Host we'll connect to
 
+    // Set our streamer codec types
+    this.codecs = {
+      video: 'h264',
+      audio: 'aac',
+      talk: 'speex',
+    };
+
     // If specified option to start buffering, kick off
-    if (typeof options?.buffer === 'boolean' && options.buffer === true) {
+    if (options?.buffer === true) {
       this.startBuffering();
     }
   }
@@ -95,10 +110,11 @@ export default class NexusTalk extends Streamer {
   // Class functions
   connect(host) {
     // Clear any timers we have running
-    this.pingTimer = clearInterval(this.pingTimer);
-    this.stalledTimer = clearInterval(this.stalledTimer);
-
-    this.id = undefined; // No session ID yet
+    clearInterval(this.pingTimer);
+    clearTimeout(this.stalledTimer);
+    this.pingTimer = undefined;
+    this.stalledTimer = undefined;
+    this.#id = undefined; // No session ID yet
 
     if (this.online === true && this.videoEnabled === true) {
       if (typeof host === 'undefined' || host === null) {
@@ -106,7 +122,8 @@ export default class NexusTalk extends Streamer {
         host = this.host;
       }
 
-      this?.log?.debug && this.log.debug('Starting connection to "%s"', host);
+      this.connected = false; // Starting connection
+      this?.log?.debug && this.log.debug('Connection started to "%s"', host);
 
       this.#socket = tls.connect({ host: host, port: 1443 }, () => {
         // Opened connection to Nexus server, so now need to authenticate ourselves
@@ -129,12 +146,14 @@ export default class NexusTalk extends Streamer {
       this.#socket.on('close', (hadError) => {
         this?.log?.debug && this.log.debug('Connection closed to "%s"', host);
 
-        this.stalledTimer = clearTimeout(this.stalledTimer); // Clear stalled timer
-        this.pingTimer = clearInterval(this.pingTimer); // Clear ping timer
+        clearInterval(this.pingTimer);
+        clearTimeout(this.stalledTimer);
+        this.pingTimer = undefined;
+        this.stalledTimer = undefined;
         this.#authorised = false; // Since connection close, we can't be authorised anymore
         this.#socket = undefined; // Clear socket object
-        this.connected = false;
-        this.id = undefined; // Not an active session anymore
+        this.connected = undefined;
+        this.#id = undefined; // Not an active session anymore
 
         if (hadError === true && this.haveOutputs() === true) {
           // We still have either active buffering occuring or output streams running
@@ -147,7 +166,7 @@ export default class NexusTalk extends Streamer {
 
   close(stopStreamFirst) {
     // Close an authenicated socket stream gracefully
-    if (this.#socket !== null) {
+    if (this.#socket !== undefined) {
       if (stopStreamFirst === true) {
         // Send a notifcation to nexus we're finished playback
         this.#stopNexusData();
@@ -155,11 +174,13 @@ export default class NexusTalk extends Streamer {
       this.#socket.destroy();
     }
 
-    this.connected = false;
+    this.connected = undefined;
     this.#socket = undefined;
-    this.id = undefined; // Not an active session anymore
+    this.#id = undefined; // Not an active session anymore
     this.#packets = [];
     this.#messages = [];
+    this.video = {};
+    this.audio = {};
   }
 
   update(deviceData) {
@@ -171,11 +192,16 @@ export default class NexusTalk extends Streamer {
       // access token has changed so re-authorise
       this.token = deviceData.apiAccess.token;
 
-      if (this.#socket !== null) {
+      if (this.#socket !== undefined) {
         this.#Authenticate(true); // Update authorisation only if connected
       }
     }
 
+    if (this.host !== deviceData.streaming_host) {
+      this.host = deviceData.streaming_host;
+      this?.log?.debug && this.log.debug('New host has been requested for connection. Host requested is "%s"', this.host);
+    }
+
     // Let our parent handle the remaining updates
     super.update(deviceData);
   }
@@ -183,13 +209,13 @@ export default class NexusTalk extends Streamer {
   talkingAudio(talkingData) {
     // Encode audio packet for sending to camera
     if (typeof talkingData === 'object' && this.#protobufNexusTalk !== undefined) {
-      let TraitMap = this.#protobufNexusTalk.lookup('nest.nexustalk.v1.StartPlayback');
+      let TraitMap = this.#protobufNexusTalk.lookup('nest.nexustalk.v1.AudioPayload');
       if (TraitMap !== null) {
         let encodedData = TraitMap.encode(
           TraitMap.fromObject({
             payload: talkingData,
-            sessionId: this.id,
-            codec: 'SPEEX',
+            sessionId: this.#id,
+            codec: this.codecs.talk.toUpperCase(),
             sampleRate: 16000,
           }),
         ).finish();
@@ -227,12 +253,12 @@ export default class NexusTalk extends Streamer {
   }
 
   #stopNexusData() {
-    if (this.id !== undefined && this.#protobufNexusTalk !== undefined) {
+    if (this.#id !== undefined && this.#protobufNexusTalk !== undefined) {
       let TraitMap = this.#protobufNexusTalk.lookup('nest.nexustalk.v1.StopPlayback');
       if (TraitMap !== null) {
         let encodedData = TraitMap.encode(
           TraitMap.fromObject({
-            sessionId: this.id,
+            sessionId: this.#id,
           }),
         ).finish();
         this.#sendMessage(PacketType.STOP_PLAYBACK, encodedData);
@@ -241,7 +267,7 @@ export default class NexusTalk extends Streamer {
   }
 
   #sendMessage(type, data) {
-    if (this.#socket === null || this.#socket.readyState !== 'open' || (type !== PacketType.HELLO && this.#authorised === false)) {
+    if (this.#socket?.readyState !== 'open' || (type !== PacketType.HELLO && this.#authorised === false)) {
       // We're not connect and/or authorised yet, so 'cache' message for processing once this occurs
       this.#messages.push({ type: type, data: data });
       return;
@@ -339,30 +365,31 @@ export default class NexusTalk extends Streamer {
       let decodedMessage = this.#protobufNexusTalk.lookup('nest.nexustalk.v1.PlaybackBegin').decode(payload).toJSON();
       decodedMessage.channels.forEach((stream) => {
         // Find which channels match our video and audio streams
-        if (stream.codecType === 'H264') {
+        if (stream.codecType === this.codecs.video.toUpperCase()) {
           this.video = {
-            channel_id: stream.channelId,
-            start_time: Date.now() + stream.startTime,
-            sample_rate: stream.sampleRate,
-            timestamp_delta: 0,
+            id: stream.channelId,
+            startTime: Date.now() + stream.startTime,
+            sampleRate: stream.sampleRate,
+            timeStamp: 0,
           };
         }
-        if (stream.codecType === 'AAC' || stream.codecType === 'OPUS' || stream.codecType === 'SPEEX') {
+        if (stream.codecType === this.codecs.audio.toUpperCase()) {
           this.audio = {
-            channel_id: stream.channelId,
-            start_time: Date.now() + stream.startTime,
-            sample_rate: stream.sampleRate,
-            timestamp_delta: 0,
+            id: stream.channelId,
+            startTime: Date.now() + stream.startTime,
+            sampleRate: stream.sampleRate,
+            timeStamp: 0,
+            talking: false,
           };
         }
       });
 
       // Since this is the beginning of playback, clear any active buffers contents
-      this.id = decodedMessage.sessionId;
+      this.#id = decodedMessage.sessionId;
       this.#packets = [];
       this.#messages = [];
 
-      this?.log?.debug && this.log.debug('Playback started from "%s" with session ID "%s"', this.host, this.id);
+      this?.log?.debug && this.log.debug('Playback started from "%s" with session ID "%s"', this.host, this.#id);
     }
   }
 
@@ -374,28 +401,31 @@ export default class NexusTalk extends Streamer {
       // 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
       // <-- testing to see how often this occurs first
-      this.stalledTimer = clearTimeout(this.stalledTimer);
+      clearTimeout(this.stalledTimer);
       this.stalledTimer = setTimeout(() => {
-        this?.log?.debug && this.log.debug('We have not received any data from nexus in the past "%s" seconds. Attempting restart', 8);
+        this?.log?.debug &&
+          this.log.debug(
+            'We have not received any data from nexus in the past "%s" seconds for uuid "%s". Attempting restart',
+            10,
+            this.uuid,
+          );
 
         // Setup listener for socket close event. Once socket is closed, we'll perform the re-connection
         this.#socket &&
           this.#socket.on('close', () => {
-            this.connect(this.host); // try reconnection
+            this.connect(); // try reconnection
           });
         this.close(false); // Close existing socket
       }, 8000);
 
       // Handle video packet
-      if (decodedMessage.channelId === this.video.channel_id) {
-        this.video.timestamp_delta += decodedMessage.timestampDelta;
-        this.addToOutput('video', this.video.start_time + this.video.timestamp_delta, Buffer.from(decodedMessage.payload, 'base64'));
+      if (decodedMessage?.channelId !== undefined && decodedMessage.channelId === this.video?.id) {
+        this.addToOutput('video', Buffer.from(decodedMessage.payload, 'base64'));
       }
 
       // Handle audio packet
-      if (decodedMessage.channelId === this.audio.channel_id) {
-        this.audio.timestamp_delta += decodedMessage.timestampDelta;
-        this.addToOutput('audio', this.audio.start_time + this.audio.timestamp_delta, Buffer.from(decodedMessage.payload, 'base64'));
+      if (decodedMessage?.channelId !== undefined && decodedMessage.channelId === this.audio?.id) {
+        this.addToOutput('audio', Buffer.from(decodedMessage.payload, 'base64'));
       }
     }
   }
@@ -405,7 +435,7 @@ export default class NexusTalk extends Streamer {
     if (typeof payload === 'object' && this.#protobufNexusTalk !== undefined) {
       let decodedMessage = this.#protobufNexusTalk.lookup('nest.nexustalk.v1.PlaybackEnd').decode(payload).toJSON();
 
-      if (this.id !== null && decodedMessage.reason === 'USER_ENDED_SESSION') {
+      if (this.#id !== undefined && decodedMessage.reason === 'USER_ENDED_SESSION') {
         // Normal playback ended ie: when we stopped playback
         this?.log?.debug && this.log.debug('Playback ended on "%s"', this.host);
       }
@@ -418,7 +448,7 @@ export default class NexusTalk extends Streamer {
         // Setup listener for socket close event. Once socket is closed, we'll perform the re-connection
         this.#socket &&
           this.#socket.on('close', () => {
-            this.connect(this.host); // try reconnection to existing host
+            this.connect(); // try reconnection to existing host
           });
         this.close(false); // Close existing socket
       }
@@ -442,16 +472,18 @@ export default class NexusTalk extends Streamer {
   #handleTalkbackBegin(payload) {
     // Decode talk begin packet
     if (typeof payload === 'object' && this.#protobufNexusTalk !== undefined) {
-      let decodedMessage = this.#protobufNexusTalk.lookup('nest.nexustalk.v1.TalkbackBegin').decode(payload).toJSON();
-      this?.log?.debug && this.log.debug('Talkback started on "%s"', decodedMessage.deviceId);
+      //let decodedMessage = this.#protobufNexusTalk.lookup('nest.nexustalk.v1.TalkbackBegin').decode(payload).toJSON();
+      this.audio.talking = true;
+      this?.log?.debug && this.log.debug(Streamer.TALKINGSTART, this.uuid);
     }
   }
 
   #handleTalkbackEnd(payload) {
     // Decode talk end packet
     if (typeof payload === 'object' && this.#protobufNexusTalk !== undefined) {
-      let decodedMessage = this.#protobufNexusTalk.lookup('nest.nexustalk.v1.TalkbackEnd').decode(payload).toJSON();
-      this?.log?.debug && this.log.debug('Talkback ended on "%s"', decodedMessage.device_id);
+      //let decodedMessage = this.#protobufNexusTalk.lookup('nest.nexustalk.v1.TalkbackEnd').decode(payload).toJSON();
+      this.audio.talking = false;
+      this?.log?.debug && this.log.debug('Talking ended on uuid "%s"', this.uuid);
     }
   }
 
@@ -491,7 +523,7 @@ export default class NexusTalk extends Streamer {
           }
 
           // Periodically send PING message to keep stream alive
-          this.pingTimer = clearInterval(this.pingTimer);
+          clearInterval(this.pingTimer);
           this.pingTimer = setInterval(() => {
             this.#sendMessage(PacketType.PING, Buffer.alloc(0));
           }, PINGINTERVAL);

package/dist/protect.js

@@ -1,7 +1,7 @@
 // Nest Protect
 // Part of homebridge-nest-accfactory
 //
-// Code version 12/9/2024
+// Code version 27/9/2024
 // Mark Hulskamp
 'use strict';
 
@@ -233,7 +233,7 @@ export default class NestProtect extends HomeKitDevice {
       //this.log.info('Eve Smoke Alarm test', (EveHomeSetData.alarmtest === true ? 'start' : 'stop'));
     }
     if (typeof EveHomeSetData?.statusled === 'boolean') {
-      this.set({ ntp_green_led_enable: EveHomeSetData.statusled });
+      this.set({ uuid: this.deviceData.nest_google_uuid, ntp_green_led_enable: EveHomeSetData.statusled });
     }
   }
 }