fix stream callback

Brandawg93 · Mar 3, 2021 · ad99d29 · ad99d29
1 parent 3b41483
commit ad99d29
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/accessory.ts b/src/accessory.ts
@@ -109,19 +109,19 @@ export class NestAccessory {
     name: string,
     serviceType: ServiceType,
     _key: keyof Properties,
-    cb: (value: CharacteristicValue) => void,
+    cb: (value: CharacteristicValue) => Promise<void>,
   ): void {
     const service = this.createService(serviceType, name);
     this.log.debug(`Creating switch for ${this.accessory.displayName} ${name}.`);
     service
       .setCharacteristic(this.hap.Characteristic.On, this.camera.info.properties[_key])
       .getCharacteristic(this.hap.Characteristic.On)
-      .on(CharacteristicEventTypes.SET, async (value: CharacteristicValue, callback: CharacteristicSetCallback) => {
+      .on(CharacteristicEventTypes.SET, (value: CharacteristicValue, callback: CharacteristicSetCallback) => {
         cb(value);
         this.log.info(`Setting ${this.accessory.displayName} ${name} to ${value ? 'on' : 'off'}`);
         callback();
       })
-      .on(CharacteristicEventTypes.GET, async (callback: CharacteristicGetCallback) => {
+      .on(CharacteristicEventTypes.GET, (callback: CharacteristicGetCallback) => {
         callback(undefined, this.camera.info.properties[_key]);
       });
   }

diff --git a/src/ffmpeg.ts b/src/ffmpeg.ts
@@ -1,5 +1,5 @@
 import execa from 'execa';
-import { Logging, StreamRequestCallback } from 'homebridge';
+import { Logging } from 'homebridge';
 import { StreamingDelegate } from './streaming-delegate';
 import { Readable, Writable } from 'stream';
 import pathToFfmpeg from 'ffmpeg-for-homebridge';
@@ -47,11 +47,11 @@ export class FfmpegProcess {
     title: string,
     command: Array<string>,
     log: Logging,
-    callback: StreamRequestCallback | undefined,
     delegate: StreamingDelegate,
     sessionId: string,
     ffmpegDebugOutput: boolean,
     customFfmpeg?: string,
+    callback?: (error?: Error | undefined) => void,
   ) {
     let started = false;
     const controller = delegate.controller;

diff --git a/src/streaming-delegate.ts b/src/streaming-delegate.ts
@@ -367,11 +367,13 @@ export class StreamingDelegate implements CameraStreamingDelegate {
           'VIDEO',
           videoffmpegCommand,
           this.log,
-          callback,
           this,
           sessionId,
           false,
           this.customFfmpeg,
+          (error) => {
+            callback(error);
+          },
         );
 
         let ffmpegAudio: FfmpegProcess | undefined;
@@ -384,7 +386,6 @@ export class StreamingDelegate implements CameraStreamingDelegate {
                 'AUDIO',
                 audioffmpegCommand,
                 this.log,
-                undefined,
                 this,
                 sessionId,
                 false,
@@ -399,7 +400,6 @@ export class StreamingDelegate implements CameraStreamingDelegate {
                   'RETURN AUDIO',
                   returnAudioffmpegCommand,
                   this.log,
-                  undefined,
                   this,
                   sessionId,
                   false,