homebridge-nest-accfactory 0.2.2 → 0.2.3

package/dist/camera.js

@@ -1,7 +1,7 @@
 // Nest Cameras
 // Part of homebridge-nest-accfactory
 //
-// Code version 30/9/2024
+// Code version 10/11/2024
 // Mark Hulskamp
 'use strict';
 
@@ -321,10 +321,11 @@ export default class NestCamera extends HomeKitDevice {
       return;
     }
 
-    // Build our ffmpeg command string for recording the video/audio stream
+    // Build our ffmpeg command string for the liveview video/audio stream
     let commandLine = [
       '-hide_banner',
       '-nostats',
+      '-use_wallclock_as_timestamps 1',
       '-fflags +discardcorrupt',
       '-max_delay 500000',
       '-flags low_delay',
@@ -337,10 +338,22 @@ export default class NestCamera extends HomeKitDevice {
       this.deviceData.audio_enabled === true &&
       this.controller.recordingManagement.recordingManagementService.getCharacteristic(this.hap.Characteristic.RecordingAudioActive)
         .value === this.hap.Characteristic.RecordingAudioActive.ENABLE &&
-      ((this.streamer?.codecs?.audio === 'aac' && this.deviceData?.ffmpeg?.libfdk_aac === true) ||
-        (this.streamer?.codecs?.audio === 'opus' && this.deviceData?.ffmpeg?.libopus === true))
+      this.streamer?.codecs?.audio === 'aac' &&
+      this.deviceData?.ffmpeg?.libfdk_aac === true
     ) {
-      // audio data only on extra pipe created in spawn command
+      // Audio data only on extra pipe created in spawn command
+      commandLine.push('-f aac -i pipe:3');
+      includeAudio = true;
+    }
+
+    if (
+      this.deviceData.audio_enabled === true &&
+      this.controller.recordingManagement.recordingManagementService.getCharacteristic(this.hap.Characteristic.RecordingAudioActive)
+        .value === this.hap.Characteristic.RecordingAudioActive.ENABLE &&
+      this.streamer?.codecs?.audio === 'opus' &&
+      this.deviceData?.ffmpeg?.libopus === true
+    ) {
+      // Audio data only on extra pipe created in spawn command
       commandLine.push('-i pipe:3');
       includeAudio = true;
     }
@@ -367,11 +380,11 @@ export default class NestCamera extends HomeKitDevice {
       '-filter:v fps=fps=' + this.#recordingConfig.videoCodec.resolution[2],
       '-g:v ' + (this.#recordingConfig.videoCodec.resolution[2] * this.#recordingConfig.videoCodec.parameters.iFrameInterval) / 1000,
       '-b:v ' + this.#recordingConfig.videoCodec.parameters.bitRate + 'k',
+      '-bufsize ' + 2 * this.#recordingConfig.videoCodec.parameters.bitRate + 'k',
       '-fps_mode passthrough',
-      '-movflags frag_keyframe+empty_moov+default_base_moof',
       '-reset_timestamps 1',
       '-video_track_timescale 90000',
-      '-bufsize ' + 2 * this.#recordingConfig.videoCodec.parameters.bitRate + 'k',
+      '-movflags frag_keyframe+empty_moov+default_base_moof',
     );
 
     // We have seperate video and audio streams that need to be muxed together if audio enabled
@@ -390,23 +403,26 @@ export default class NestCamera extends HomeKitDevice {
 
     commandLine.push('-f mp4 pipe:1'); // output to stdout in mp4
 
-    this.#hkSessions[sessionID] = {};
-    this.#hkSessions[sessionID].ffmpeg = child_process.spawn(this.deviceData.ffmpeg.binary, commandLine.join(' ').split(' '), {
+    // Start our ffmpeg recording process and stream from our streamer
+    // video is pipe #1
+    // audio is pipe #3 if including audio
+    this?.log?.debug &&
+      this.log.debug(
+        'ffmpeg process for recording stream from "%s" will be called using the following commandline',
+        this.deviceData.description,
+        commandLine.join(' ').toString(),
+      );
+    let ffmpegRecording = child_process.spawn(this.deviceData.ffmpeg.binary, commandLine.join(' ').split(' '), {
       env: process.env,
       stdio: ['pipe', 'pipe', 'pipe', includeAudio === true ? 'pipe' : ''],
-    }); // Extra pipe, #3 for audio data
-
-    this.#hkSessions[sessionID].video = this.#hkSessions[sessionID].ffmpeg.stdin; // Video data on stdio pipe for ffmpeg
-    this.#hkSessions[sessionID].audio = this.#hkSessions[sessionID]?.ffmpeg?.stdio?.[3]
-      ? this.#hkSessions[sessionID].ffmpeg.stdio[3]
-      : null; // Audio data on extra pipe for ffmpeg or null if audio recording disabled
+    });
 
     // Process FFmpeg output and parse out the fMP4 stream it's generating for HomeKit Secure Video.
     let mp4FragmentData = [];
-    this.#hkSessions[sessionID].mp4boxes = [];
-    this.#hkSessions[sessionID].eventEmitter = new EventEmitter();
+    let mp4boxes = [];
+    let eventEmitter = new EventEmitter();
 
-    this.#hkSessions[sessionID].ffmpeg.stdout.on('data', (data) => {
+    ffmpegRecording.stdout.on('data', (data) => {
       // Process the mp4 data from our socket connection and convert into mp4 fragment boxes we need
       mp4FragmentData = mp4FragmentData.length === 0 ? data : Buffer.concat([mp4FragmentData, data]);
       while (mp4FragmentData.length >= 8) {
@@ -419,13 +435,13 @@ export default class NestCamera extends HomeKitDevice {
         }
 
         // Add it to our queue to be pushed out through the generator function.
-        if (typeof this.#hkSessions?.[sessionID]?.mp4boxes === 'object' && this.#hkSessions?.[sessionID]?.eventEmitter !== undefined) {
-          this.#hkSessions[sessionID].mp4boxes.push({
+        if (Array.isArray(mp4boxes) === true && eventEmitter !== undefined) {
+          mp4boxes.push({
             header: mp4FragmentData.slice(0, 8),
             type: mp4FragmentData.slice(4, 8).toString(),
             data: mp4FragmentData.slice(8, boxSize),
           });
-          this.#hkSessions[sessionID].eventEmitter.emit(MP4BOX);
+          eventEmitter.emit(MP4BOX);
         }
 
         // Remove the section of data we've just processed from our buffer
@@ -433,38 +449,38 @@ export default class NestCamera extends HomeKitDevice {
       }
     });
 
-    this.#hkSessions[sessionID].ffmpeg.on('exit', (code, signal) => {
+    ffmpegRecording.on('exit', (code, signal) => {
       if (signal !== 'SIGKILL' || signal === null) {
         this?.log?.error &&
           this.log.error('ffmpeg recording process for "%s" stopped unexpectedly. Exit code was "%s"', this.deviceData.description, code);
       }
-      if (typeof this.#hkSessions[sessionID]?.audio?.end === 'function') {
-        // Tidy up our created extra pipe
-        this.#hkSessions[sessionID].audio.end();
+
+      if (this.#hkSessions?.[sessionID] !== undefined) {
+        delete this.#hkSessions[sessionID];
       }
     });
 
     // eslint-disable-next-line no-unused-vars
-    this.#hkSessions[sessionID].ffmpeg.on('error', (error) => {
+    ffmpegRecording.on('error', (error) => {
       // Empty
     });
 
-    // ffmpeg outputs to stderr
-    /*
-    this.#hkSessions[sessionID].ffmpeg.stderr.on('data', (data) => {
-      if (data.toString().includes('frame=') === false) {
-        // Monitor ffmpeg output while testing. Use 'ffmpeg as a debug option'
+    // ffmpeg console output is via stderr
+    ffmpegRecording.stderr.on('data', (data) => {
+      if (data.toString().includes('frame=') === false && this.deviceData?.ffmpeg?.debug === true) {
+        // Monitor ffmpeg output
         this?.log?.debug && this.log.debug(data.toString());
       }
     });
-    */
 
+    // Start the appropriate streamer
     this.streamer !== undefined &&
-      this.streamer.startRecordStream(
-        sessionID,
-        this.#hkSessions[sessionID].ffmpeg.stdin,
-        this.#hkSessions[sessionID]?.ffmpeg?.stdio?.[3] && includeAudio === true ? this.#hkSessions[sessionID].ffmpeg.stdio[3] : null,
-      );
+      this.streamer.startRecordStream(sessionID, ffmpegRecording.stdin, ffmpegRecording?.stdio?.[3] ? ffmpegRecording.stdio[3] : null);
+
+    // Store our ffmpeg sessions
+    this.#hkSessions[sessionID] = {};
+    this.#hkSessions[sessionID].eventEmitter = eventEmitter;
+    this.#hkSessions[sessionID].ffmpeg = ffmpegRecording; // Store ffmpeg process ID
 
     this?.log?.info &&
       this.log.info('Started recording from "%s" %s', this.deviceData.description, includeAudio === false ? 'without audio' : '');
@@ -473,26 +489,19 @@ export default class NestCamera extends HomeKitDevice {
     // HAP-NodeJS cancels this async generator function when recording completes also
     let segment = [];
     for (;;) {
-      if (
-        this.#hkSessions?.[sessionID] === undefined ||
-        this.#hkSessions?.[sessionID]?.ffmpeg === undefined ||
-        this.#hkSessions?.[sessionID]?.mp4boxes === undefined ||
-        this.#hkSessions?.[sessionID]?.eventEmitter === undefined
-      ) {
+      if (this.#hkSessions?.[sessionID] === undefined || this.#hkSessions?.[sessionID]?.ffmpeg === undefined) {
         // Our session object is not present
         // ffmpeg recorder process is not present
-        // the mp4box array is not present
-        // eventEmitter is not present
         // so finish up the loop
         break;
       }
 
-      if (this.#hkSessions?.[sessionID]?.mp4boxes?.length === 0 && this.#hkSessions?.[sessionID]?.eventEmitter !== undefined) {
+      if (mp4boxes?.length === 0 && eventEmitter !== undefined) {
         // since the ffmpeg recorder process hasn't notified us of any mp4 fragment boxes, wait until there are some
-        await EventEmitter.once(this.#hkSessions[sessionID].eventEmitter, MP4BOX);
+        await EventEmitter.once(eventEmitter, MP4BOX);
       }
 
-      let mp4box = this.#hkSessions?.[sessionID]?.mp4boxes.shift();
+      let mp4box = mp4boxes.shift();
       if (typeof mp4box !== 'object') {
         // Not an mp4 fragment box, so try again
         continue;
@@ -789,19 +798,17 @@ export default class NestCamera extends HomeKitDevice {
       // Start our ffmpeg streaming process and stream from our streamer
       // video is pipe #1
       // audio is pipe #3 if including audio
+      this?.log?.debug &&
+        this.log.debug(
+          'ffmpeg process for live streaming from "%s" will be called using the following commandline',
+          this.deviceData.description,
+          commandLine.join(' ').toString(),
+        );
       let ffmpegStreaming = child_process.spawn(this.deviceData.ffmpeg.binary, commandLine.join(' ').split(' '), {
         env: process.env,
         stdio: ['pipe', 'pipe', 'pipe', includeAudio === true ? 'pipe' : ''],
       });
 
-      // ffmpeg console output is via stderr
-      ffmpegStreaming.stderr.on('data', (data) => {
-        if (data.toString().includes('frame=') === false) {
-          // Monitor ffmpeg output while testing. Use 'ffmpeg as a debug option'
-          this?.log?.debug && this.log.debug(data.toString());
-        }
-      });
-
       ffmpegStreaming.on('exit', (code, signal) => {
         if (signal !== 'SIGKILL' || signal === null) {
           this?.log?.error &&
@@ -816,6 +823,14 @@ export default class NestCamera extends HomeKitDevice {
         }
       });
 
+      // ffmpeg console output is via stderr
+      ffmpegStreaming.stderr.on('data', (data) => {
+        if (data.toString().includes('frame=') === false && this.deviceData?.ffmpeg?.debug === true) {
+          // Monitor ffmpeg output
+          this?.log?.debug && this.log.debug(data.toString());
+        }
+      });
+
       // eslint-disable-next-line no-unused-vars
       ffmpegStreaming.on('error', (error) => {
         // Empty
@@ -875,6 +890,12 @@ export default class NestCamera extends HomeKitDevice {
 
         commandLine.push('-f data pipe:1');
 
+        this?.log?.debug &&
+          this.log.debug(
+            'ffmpeg process for talkback on "%s" will be called using the following commandline',
+            this.deviceData.description,
+            commandLine.join(' ').toString(),
+          );
         ffmpegAudioTalkback = child_process.spawn(this.deviceData.ffmpeg.binary, commandLine.join(' ').split(' '), {
           env: process.env,
         });
@@ -900,7 +921,10 @@ export default class NestCamera extends HomeKitDevice {
 
         // ffmpeg console output is via stderr
         ffmpegAudioTalkback.stderr.on('data', (data) => {
-          this?.log?.debug && this.log.debug(data.toString());
+          if (data.toString().includes('frame=') === false && this.deviceData?.ffmpeg?.debug === true) {
+            // Monitor ffmpeg output
+            this?.log?.debug && this.log.debug(data.toString());
+          }
         });
 
         // Write out SDP configuration

package/dist/doorbell.js

@@ -1,7 +1,7 @@
 // Nest Doorbell(s)
 // Part of homebridge-nest-accfactory
 //
-// Code version 27/9/2024
+// Code version 11/10/2024
 // Mark Hulskamp
 'use strict';
 
@@ -55,7 +55,7 @@ export default class NestDoorbell extends NestCamera {
       // No longer required to have the switch service
       // This is to handle Homebridge cached restored accessories and if configuration options have changed
       this.accessory.removeService(this.switchService);
-      this.switchService === undefined;
+      this.switchService = undefined;
     }
 
     // Create extra details for output

package/dist/index.js

@@ -16,7 +16,7 @@
 //
 // Supports both Nest REST and Protobuf APIs for communication
 //
-// Code version 12/9/2024
+// Code version 7/10/2024
 // Mark Hulskamp
 'use strict';
 

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 29/9/2024
+// Code version 20/11/2024
 // Mark Hulskamp
 'use strict';
 
@@ -325,7 +325,7 @@ export default class NexusTalk extends Streamer {
               requireConnectedCamera: false,
               userAgent: USERAGENT,
               deviceId: crypto.randomUUID(),
-              ClientType: 'IOS',
+              clientType: 'IOS',
               authoriseRequest: authoriseRequest,
             }),
           ).finish();
@@ -416,7 +416,7 @@ export default class NexusTalk extends Streamer {
             this.connect(); // try reconnection
           });
         this.close(false); // Close existing socket
-      }, 8000);
+      }, 10000);
 
       // Handle video packet
       if (decodedMessage?.channelId !== undefined && decodedMessage.channelId === this.video?.id) {
@@ -474,7 +474,7 @@ export default class NexusTalk extends Streamer {
     if (typeof payload === 'object' && this.#protobufNexusTalk !== undefined) {
       //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);
+      this?.log?.debug && this.log.debug('Talking started on uuid "%s"', this.uuid);
     }
   }
 

package/dist/protect.js

@@ -1,7 +1,7 @@
 // Nest Protect
 // Part of homebridge-nest-accfactory
 //
-// Code version 27/9/2024
+// Code version 5/10/2024
 // Mark Hulskamp
 'use strict';
 
@@ -43,12 +43,6 @@ export default class NestProtect extends HomeKitDevice {
     if (this.carbonMonoxideService === undefined) {
       this.carbonMonoxideService = this.accessory.addService(this.hap.Service.CarbonMonoxideSensor, '', 1);
     }
-    if (this.carbonMonoxideService.testCharacteristic(this.hap.Characteristic.StatusActive) === false) {
-      this.carbonMonoxideService.addCharacteristic(this.hap.Characteristic.StatusActive);
-    }
-    if (this.carbonMonoxideService.testCharacteristic(this.hap.Characteristic.StatusFault) === false) {
-      this.carbonMonoxideService.addCharacteristic(this.hap.Characteristic.StatusFault);
-    }
 
     // Setup battery service if not already present on the accessory
     this.batteryService = this.accessory.getService(this.hap.Service.Battery);
@@ -109,13 +103,12 @@ export default class NestProtect extends HomeKitDevice {
     );
 
     // Update smoke details
-    // If Nest isn't online or removed from base, report in HomeKit
+    // If protect isn't online, removed from base, replacement date past, report in HomeKit
     this.smokeService.updateCharacteristic(
       this.hap.Characteristic.StatusActive,
-      deviceData.online === true && deviceData.removed_from_base === false,
+      deviceData.online === true && deviceData.removed_from_base === false && Math.floor(Date.now() / 1000) <= deviceData.replacement_date,
     );
 
-    // General fault if replacement date past or Nest isn't online or removed from base
     this.smokeService.updateCharacteristic(
       this.hap.Characteristic.StatusFault,
       deviceData.online === true && deviceData.removed_from_base === false && Math.floor(Date.now() / 1000) <= deviceData.replacement_date
@@ -139,23 +132,9 @@ export default class NestProtect extends HomeKitDevice {
     }
 
     // Update carbon monoxide details
-    // If Nest isn't online or removed from base, report in HomeKit
-    this.carbonMonoxideService.updateCharacteristic(
-      this.hap.Characteristic.StatusActive,
-      deviceData.online === true && deviceData.removed_from_base === false,
-    );
-
-    // General fault if replacement date past or Nest isn't online or removed from base
-    this.carbonMonoxideService.updateCharacteristic(
-      this.hap.Characteristic.StatusFault,
-      deviceData.online === true && deviceData.removed_from_base === false && Math.floor(Date.now() / 1000) <= deviceData.replacement_date
-        ? this.hap.Characteristic.StatusFault.NO_FAULT
-        : this.hap.Characteristic.StatusFault.GENERAL_FAULT,
-    );
-
     this.carbonMonoxideService.updateCharacteristic(
       this.hap.Characteristic.CarbonMonoxideDetected,
-      deviceData.co_status === 2
+      deviceData.co_status !== 0
         ? this.hap.Characteristic.CarbonMonoxideDetected.CO_LEVELS_ABNORMAL
         : this.hap.Characteristic.CarbonMonoxideDetected.CO_LEVELS_NORMAL,
     );
@@ -170,22 +149,11 @@ export default class NestProtect extends HomeKitDevice {
 
     // Update motion service if present
     if (this.motionService !== undefined) {
-      // Motion detect if auto_away = false. Not supported on battery powered Nest Protects
-      // If Nest isn't online or removed from base, report in HomeKit
-      this.motionService.updateCharacteristic(
-        this.hap.Characteristic.StatusActive,
-        deviceData.online === true && deviceData.removed_from_base === false,
-      );
-
-      // General fault if replacement date past or Nest isn't online or removed from base
-      this.motionService.updateCharacteristic(
-        this.hap.Characteristic.StatusFault,
-        deviceData.online === true && deviceData.removed_from_base === false && Math.floor(Date.now() / 1000) <= deviceData.replacement_date
-          ? this.hap.Characteristic.StatusFault.NO_FAULT
-          : this.hap.Characteristic.StatusFault.GENERAL_FAULT,
-      );
-
-      this.motionService.updateCharacteristic(this.hap.Characteristic.MotionDetected, deviceData.detected_motion === false);
+      this.motionService.updateCharacteristic(this.hap.Characteristic.MotionDetected, deviceData.detected_motion === true);
+
+      if (deviceData.detected_motion === true && this.deviceData.detected_motion === false) {
+        this?.log?.info && this.log.info('Motion detected in "%s"', deviceData.description);
+      }
 
       // Log motion to history only if changed to previous recording
       if (deviceData.detected_motion !== this.deviceData.detected_motion && typeof this.historyService?.addHistory === 'function') {
@@ -197,7 +165,11 @@ export default class NestProtect extends HomeKitDevice {
     }
 
     // Notify Eve App of device status changes if linked
-    if (this.deviceData.eveHistory === true && typeof this.historyService?.updateEveHome === 'function') {
+    if (
+      this.deviceData.eveHistory === true &&
+      this.smokeService !== undefined &&
+      typeof this.historyService?.updateEveHome === 'function'
+    ) {
       // Update our internal data with properties Eve will need to process
       this.deviceData.latest_alarm_test = deviceData.latest_alarm_test;
       this.deviceData.self_test_in_progress = deviceData.self_test_in_progress;
@@ -210,7 +182,7 @@ export default class NestProtect extends HomeKitDevice {
   }
 
   #EveHomeGetcommand(EveHomeGetData) {
-    // Pass back extra data for Eve Smoke this.hap.CharacteristicEventTypes.GET process command
+    // Pass back extra data for Eve Smoke onGet() to process command
     // Data will already be an object, our only job is to add/modify to it
     if (typeof EveHomeGetData === 'object') {
       EveHomeGetData.lastalarmtest = this.deviceData.latest_alarm_test;

package/dist/streamer.js

@@ -17,7 +17,7 @@
 //
 // blankAudio - Buffer containing a blank audio segment for the type of audio being used
 //
-// Code version 29/9/2024
+// Code version 20/11/2024
 // Mark Hulskamp
 'use strict';
 
@@ -143,11 +143,7 @@ export default class Streamer {
         if (output.type === 'live' || output.type === 'record') {
           let packet = output.buffer.shift();
           if (packet?.type === 'video' && typeof output?.video?.write === 'function') {
-            // H264 NAL Units '0001' are required to be added to beginning of any video data we output
-            // If this is missing, add on beginning of data packet
-            if (packet.data.indexOf(H264NALSTARTCODE) !== 0) {
-              packet.data = Buffer.concat([H264NALSTARTCODE, packet.data]);
-            }
+            packet.data = Buffer.concat([H264NALSTARTCODE, packet.data]);
             output.video.write(packet.data);
           }
           if (packet?.type === 'audio' && typeof output?.audio?.write === 'function') {
@@ -361,9 +357,14 @@ export default class Streamer {
       return;
     }
 
+    if (data.indexOf(H264NALSTARTCODE) === 0) {
+      // Strip H264 start code from input buffer. We'll handle this later
+      data = data.subarray(H264NALSTARTCODE.length);
+    }
+
     Object.values(this.#outputs).forEach((output) => {
       output.buffer.push({
-        time: Date.now(), // Timestamp of when tgis was added to buffer
+        time: Date.now(), // Timestamp of when this was added to buffer
         type: type,
         data: data,
       });