homebridge-unifi-protect 5.5.2 → 6.0.0

package/dist/protect-ffmpeg-stream.js

@@ -1,15 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FfmpegStreamingProcess = void 0;
-/* Copyright(C) 2017-2022, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2023, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-ffmpeg-stream.ts: Provide FFmpeg process control to support HomeKit livestreaming.
  *
  */
-const protect_ffmpeg_1 = require("./protect-ffmpeg");
-const dgram_1 = require("dgram");
+import { FfmpegProcess } from "./protect-ffmpeg.js";
+import { createSocket } from "node:dgram";
 // FFmpeg streaming process management.
-class FfmpegStreamingProcess extends protect_ffmpeg_1.FfmpegProcess {
+export class FfmpegStreamingProcess extends FfmpegProcess {
     // Create a new FFmpeg process instance.
     constructor(delegate, sessionId, commandLineArgs, returnPort, callback) {
         // Initialize our parent.
@@ -21,6 +18,7 @@ class FfmpegStreamingProcess extends protect_ffmpeg_1.FfmpegProcess {
         if (returnPort) {
             this.createSocket(returnPort);
         }
+        // Start it up, with appropriate error handling.
         this.start(commandLineArgs, callback, async (errorMessage) => {
             // Stop the stream.
             await this.delegate.stopStream(this.sessionId);
@@ -39,7 +37,7 @@ class FfmpegStreamingProcess extends protect_ffmpeg_1.FfmpegProcess {
     createSocket(portInfo) {
         let errorListener;
         let messageListener;
-        const socket = (0, dgram_1.createSocket)(portInfo.addressVersion === "ipv6" ? "udp6" : "udp4");
+        const socket = createSocket(portInfo.addressVersion === "ipv6" ? "udp6" : "udp4");
         // Cleanup after ourselves when the socket closes.
         socket.once("close", () => {
             if (this.streamTimeout) {
@@ -50,7 +48,7 @@ class FfmpegStreamingProcess extends protect_ffmpeg_1.FfmpegProcess {
         });
         // Handle potential network errors.
         socket.on("error", errorListener = (error) => {
-            this.log.error("%s: Socket error: %s.", this.name(), error.name);
+            this.log.error("Socket error: %s.", error.name);
             void this.delegate.stopStream(this.sessionId);
         });
         // Manage our video streams in case we haven't received a stop request, but we're in fact dead zombies.
@@ -61,18 +59,30 @@ class FfmpegStreamingProcess extends protect_ffmpeg_1.FfmpegProcess {
             }
             // Set our new canary.
             this.streamTimeout = setTimeout(() => {
-                this.debug("%s: video stream appears to be inactive for 5 seconds. Stopping stream.", this.name());
+                this.log.debug("Video stream appears to be inactive for 5 seconds. Stopping stream.", this.protectCamera.name);
                 this.delegate.controller.forceStopStreamingSession(this.sessionId);
                 void this.delegate.stopStream(this.sessionId);
             }, 5000);
         });
         // Bind to the port we're opening.
-        socket.bind(portInfo.port);
+        socket.bind(portInfo.port, (portInfo.addressVersion === "ipv6") ? "::1" : "127.0.0.1");
     }
     // Return the actual FFmpeg process.
     get ffmpegProcess() {
         return this.process;
     }
+    // Log errors.
+    logFfmpegError(exitCode, signal) {
+        // Known streaming-related errors due to the performance and latency tweaks we've made to the FFmpeg command line.
+        const ffmpegKnownStreamingError = new RegExp("not enough frames to estimate rate; consider increasing probesize");
+        // See if we know about this error.
+        if (this.stderrLog.some(x => ffmpegKnownStreamingError.test(x))) {
+            // Let the streaming delegate know to adjust it's parameters for the next run and inform the user.
+            this.delegate.adjustProbeSize();
+            return;
+        }
+        // Otherwise, revert to our default logging in our parent.
+        super.logFfmpegError(exitCode, signal);
+    }
 }
-exports.FfmpegStreamingProcess = FfmpegStreamingProcess;
 //# sourceMappingURL=protect-ffmpeg-stream.js.map

package/dist/protect-ffmpeg-stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"protect-ffmpeg-stream.js","sourceRoot":"","sources":["../src/protect-ffmpeg-stream.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"protect-ffmpeg-stream.js","sourceRoot":"","sources":["../src/protect-ffmpeg-stream.ts"],"names":[],"mappings":"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"}

package/dist/protect-ffmpeg.d.ts

@@ -0,0 +1,42 @@
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+import { ChildProcessWithoutNullStreams } from "node:child_process";
+import { ProtectCamera, ProtectPackageCamera } from "./protect-camera.js";
+import { Readable, Writable } from "node:stream";
+import { EventEmitter } from "node:events";
+import { ProtectLogging } from "./protect-types.js";
+import { ProtectNvr } from "./protect-nvr.js";
+import { StreamRequestCallback } from "homebridge";
+export interface PortInterface {
+    addressVersion: string;
+    port: number;
+}
+export declare class FfmpegProcess extends EventEmitter {
+    protected callback: StreamRequestCallback | null;
+    protected commandLineArgs: string[];
+    hasError: boolean;
+    isEnded: boolean;
+    private isLogging;
+    private isPrepared;
+    isStarted: boolean;
+    protected isVerbose: boolean;
+    private ffmpegTimeout?;
+    protected readonly log: ProtectLogging;
+    protected readonly nvr: ProtectNvr;
+    protected process: ChildProcessWithoutNullStreams | null;
+    protected protectCamera: ProtectCamera | ProtectPackageCamera;
+    protected stderrLog: string[];
+    constructor(protectCamera: ProtectCamera | ProtectPackageCamera, commandLineArgs?: string[], callback?: StreamRequestCallback);
+    protected prepareProcess(commandLineArgs?: string[], callback?: StreamRequestCallback): void;
+    protected start(commandLineArgs?: string[], callback?: StreamRequestCallback, errorHandler?: (errorMessage: string) => Promise<void>): void;
+    protected configureProcess(errorHandler?: (errorMessage: string) => Promise<void>): void;
+    protected stopProcess(): void;
+    stop(): void;
+    protected logFfmpegError(exitCode: number, signal: NodeJS.Signals): void;
+    get stdin(): Writable | null;
+    get stdout(): Readable | null;
+    get stderr(): Readable | null;
+    static codecEnabled(videoProcessor: string, codec: string, log: ProtectLogging): Promise<boolean>;
+}

package/dist/protect-ffmpeg.js

@@ -1,38 +1,30 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FfmpegProcess = void 0;
-/* Copyright(C) 2017-2022, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2023, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-ffmpeg.ts: Base class to provide FFmpeg process control and capability introspection.
  *
- * This module is heavily inspired by the homebridge and homebridge-camera-ffmpeg source code and
- * borrows heavily from both. Thank you for your contributions to the HomeKit world.
+ * This module is heavily inspired by the homebridge and homebridge-camera-ffmpeg source code. Thank you for your contributions to the HomeKit world.
  */
-const child_process_1 = require("child_process");
-const events_1 = require("events");
-const util_1 = __importDefault(require("util"));
+import { execFile, spawn } from "node:child_process";
+import { EventEmitter } from "node:events";
+import util from "node:util";
 // Base class for all FFmpeg process management.
-class FfmpegProcess extends events_1.EventEmitter {
+export class FfmpegProcess extends EventEmitter {
     // Create a new FFmpeg process instance.
     constructor(protectCamera, commandLineArgs, callback) {
         // Initialize our parent.
         super();
         this.callback = null;
         this.commandLineArgs = [];
-        this.debug = protectCamera.platform.debug.bind(protectCamera.platform);
-        this.stderrLog = [];
+        this.hasError = false;
         this.isLogging = false;
         this.isPrepared = false;
         this.isEnded = false;
         this.isStarted = false;
-        this.log = protectCamera.platform.log;
-        this.name = protectCamera.name.bind(protectCamera);
+        this.log = protectCamera.log;
         this.nvr = protectCamera.nvr;
         this.process = null;
         this.protectCamera = protectCamera;
+        this.stderrLog = [];
         // Toggle FFmpeg logging, if configured.
         this.isVerbose = protectCamera.platform.verboseFfmpeg || protectCamera.stream.verboseFfmpeg;
         // If we've specified a command line or a callback, let's save them.
@@ -51,7 +43,7 @@ class FfmpegProcess extends events_1.EventEmitter {
         }
         // No command line arguments - we're done.
         if (!this.commandLineArgs) {
-            this.log.error("%s: No FFmpeg command line specified.", this.name());
+            this.log.error("No FFmpeg command line specified.");
             return;
         }
         // Save the callback, if we have one.
@@ -69,10 +61,10 @@ class FfmpegProcess extends events_1.EventEmitter {
         }
         // Inform the user, if we've been asked to do so.
         if (this.isLogging || this.isVerbose || this.protectCamera.platform.config.debugAll) {
-            this.log.info("%s: ffmpeg command: %s %s", this.name(), this.protectCamera.stream.videoProcessor, this.commandLineArgs.join(" "));
+            this.log.info("FFmpeg command: %s %s", this.protectCamera.stream.videoProcessor, this.commandLineArgs.join(" "));
         }
         else {
-            this.debug("%s: ffmpeg command: %s %s", this.name(), this.protectCamera.stream.videoProcessor, this.commandLineArgs.join(" "));
+            this.log.debug("FFmpeg command: %s %s", this.protectCamera.stream.videoProcessor, this.commandLineArgs.join(" "));
         }
         this.isPrepared = true;
     }
@@ -82,43 +74,42 @@ class FfmpegProcess extends events_1.EventEmitter {
         if (!this.isPrepared) {
             this.prepareProcess(commandLineArgs, callback);
             if (!this.isPrepared) {
-                this.log.error("%s: Error preparing to run FFmpeg.", this.name());
+                this.log.error("Error preparing to run FFmpeg.");
                 return;
             }
         }
         // Execute the command line based on what we've prepared.
-        this.process = (0, child_process_1.spawn)(this.protectCamera.stream.videoProcessor, this.commandLineArgs);
+        this.process = spawn(this.protectCamera.stream.videoProcessor, this.commandLineArgs);
         // Configure any post-spawn listeners and other plumbing.
         this.configureProcess(errorHandler);
     }
     // Configure our FFmpeg process, once started.
     configureProcess(errorHandler) {
-        var _a, _b, _c, _d, _e, _f;
         let dataListener;
         let errorListener;
         // Handle errors emitted during process creation, such as an invalid command line.
-        (_a = this.process) === null || _a === void 0 ? void 0 : _a.once("error", (error) => {
-            this.log.error("%s: FFmpeg failed to start: %s", this.name(), error.message);
+        this.process?.once("error", (error) => {
+            this.log.error("FFmpeg failed to start: %s.", error.message);
             // Execute our error handler, if one is provided.
             if (errorHandler) {
                 void errorHandler(error.name + ": " + error.message);
             }
         });
         // Handle errors on stdin.
-        (_c = (_b = this.process) === null || _b === void 0 ? void 0 : _b.stdin) === null || _c === void 0 ? void 0 : _c.on("error", errorListener = (error) => {
+        this.process?.stdin?.on("error", errorListener = (error) => {
             if (!error.message.includes("EPIPE")) {
-                this.log.error("%s: FFmpeg error: %s.", this.name(), error.message);
+                this.log.error("FFmpeg error: %s.", error.message);
             }
         });
         // Handle logging output that gets sent to stderr.
-        (_e = (_d = this.process) === null || _d === void 0 ? void 0 : _d.stderr) === null || _e === void 0 ? void 0 : _e.on("data", dataListener = (data) => {
+        this.process?.stderr?.on("data", dataListener = (data) => {
             // Inform us when we start receiving data back from FFmpeg. We do this here because it's the only
             // truly reliable place we can check on FFmpeg. stdin and stdout may not be used at all, depending
             // on the way FFmpeg is called, but stderr will always be there.
             if (!this.isStarted) {
                 this.isStarted = true;
                 this.isEnded = false;
-                this.debug("%s: Received the first frame.", this.name());
+                this.log.debug("Received the first frame.");
                 this.emit("ffmpegStarted");
                 // Always remember to execute the callback once we're setup to let homebridge know we're streaming.
                 if (this.callback) {
@@ -135,14 +126,13 @@ class FfmpegProcess extends events_1.EventEmitter {
                     this.stderrLog.push(cleanLine + "\n");
                     // Show it to the user if it's been requested.
                     if (this.isLogging || this.isVerbose || this.protectCamera.platform.config.debugAll) {
-                        this.log.info("%s: %s", this.name(), cleanLine);
+                        this.log.info(cleanLine);
                     }
                 }
             }
         });
         // Handle our process termination.
-        (_f = this.process) === null || _f === void 0 ? void 0 : _f.once("exit", (exitCode, signal) => {
-            var _a, _b, _c, _d, _e;
+        this.process?.once("exit", (exitCode, signal) => {
             // Clear out our canary.
             if (this.ffmpegTimeout) {
                 clearTimeout(this.ffmpegTimeout);
@@ -150,74 +140,76 @@ class FfmpegProcess extends events_1.EventEmitter {
             this.isStarted = false;
             this.isEnded = true;
             // Some utilities to streamline things.
-            const logPrefix = this.name() + ": FFmpeg process ended ";
+            const logPrefix = "FFmpeg process ended ";
             // FFmpeg ended normally and our canary didn't need to enforce FFmpeg's extinction.
             if (this.ffmpegTimeout && exitCode === 0) {
-                this.debug(logPrefix + "(Normal).");
+                this.log.debug(logPrefix + "(Normal).");
             }
-            else if (((exitCode === null) || (exitCode === 255)) && ((_a = this.process) === null || _a === void 0 ? void 0 : _a.killed)) {
+            else if (((exitCode === null) || (exitCode === 255)) && this.process?.killed) {
                 // FFmpeg has ended. Let's figure out if it's because we killed it or whether it died of natural causes.
-                this.debug(logPrefix + (signal === "SIGKILL" ? "(Killed)." : "(Expected)."));
+                this.log.debug(logPrefix + (signal === "SIGKILL" ? "(Killed)." : "(Expected)."));
             }
             else {
-                // Something else has occurred. Inform the user, and stop everything.
-                this.log.error(logPrefix + "unexpectedly with %s%s%s.", (exitCode !== null) ? "an exit code of " + exitCode.toString() : "", ((exitCode !== null) && signal) ? " and " : "", signal ? "a signal received of " + signal : "");
-                this.log.error("%s: FFmpeg command line that errored out was: %s %s", this.name(), this.protectCamera.stream.videoProcessor, this.commandLineArgs.join(" "));
-                this.stderrLog.map(x => this.log.error(x));
+                // Flag that we've run into an FFmpeg error.
+                this.hasError = true;
+                // Inform the user.
+                this.logFfmpegError(exitCode, signal);
                 // Execute our error handler, if one is provided.
                 if (errorHandler) {
-                    void errorHandler(util_1.default.format(logPrefix + " unexpectedly with exit code %s and signal %s.", exitCode, signal));
+                    void errorHandler(util.format(this.protectCamera.name + ": " + logPrefix + " unexpectedly with exit code %s and signal %s.", exitCode, signal));
                 }
             }
             // Cleanup after ourselves.
-            (_c = (_b = this.process) === null || _b === void 0 ? void 0 : _b.stdin) === null || _c === void 0 ? void 0 : _c.removeListener("error", errorListener);
-            (_e = (_d = this.process) === null || _d === void 0 ? void 0 : _d.stderr) === null || _e === void 0 ? void 0 : _e.removeListener("data", dataListener);
+            this.process?.stdin?.removeListener("error", errorListener);
+            this.process?.stderr?.removeListener("data", dataListener);
             this.process = null;
             this.stderrLog = [];
         });
     }
     // Stop the FFmpeg process and complete any cleanup activities.
     stopProcess() {
-        var _a, _b, _c, _d;
         // Check to make sure we aren't using stdin for data before telling FFmpeg we're done.
         if (!this.commandLineArgs.includes("pipe:0")) {
-            (_a = this.process) === null || _a === void 0 ? void 0 : _a.stdin.end("q");
+            this.process?.stdin.end("q");
         }
         // Close our input and output.
-        (_b = this.process) === null || _b === void 0 ? void 0 : _b.stdin.destroy();
-        (_c = this.process) === null || _c === void 0 ? void 0 : _c.stdout.destroy();
+        this.process?.stdin.destroy();
+        this.process?.stdout.destroy();
         // In case we need to kill it again, just to be sure it's really dead.
         this.ffmpegTimeout = setTimeout(() => {
-            var _a;
-            (_a = this.process) === null || _a === void 0 ? void 0 : _a.kill("SIGKILL");
+            this.process?.kill("SIGKILL");
         }, 5000);
         // Send the kill shot.
-        (_d = this.process) === null || _d === void 0 ? void 0 : _d.kill();
+        this.process?.kill();
     }
     // Cleanup after we're done.
     stop() {
         this.stopProcess();
     }
+    // Inform the user if an FFmpeg error occurs.
+    logFfmpegError(exitCode, signal) {
+        // Something else has occurred. Inform the user, and stop everything.
+        this.log.error("FFmpeg process ended unexpectedly with %s%s%s.", (exitCode !== null) ? "an exit code of " + exitCode.toString() : "", ((exitCode !== null) && signal) ? " and " : "", signal ? "a signal received of " + signal : "");
+        this.log.error("FFmpeg command line that errored out was: %s %s", this.protectCamera.stream.videoProcessor, this.commandLineArgs.join(" "));
+        this.stderrLog.map(x => this.log.error(x));
+    }
     // Return the standard input for this process.
     get stdin() {
-        var _a, _b;
-        return (_b = (_a = this.process) === null || _a === void 0 ? void 0 : _a.stdin) !== null && _b !== void 0 ? _b : null;
+        return this.process?.stdin ?? null;
     }
     // Return the standard output for this process.
     get stdout() {
-        var _a, _b;
-        return (_b = (_a = this.process) === null || _a === void 0 ? void 0 : _a.stdout) !== null && _b !== void 0 ? _b : null;
+        return this.process?.stdout ?? null;
     }
     // Return the standard error for this process.
     get stderr() {
-        var _a, _b;
-        return (_b = (_a = this.process) === null || _a === void 0 ? void 0 : _a.stderr) !== null && _b !== void 0 ? _b : null;
+        return this.process?.stderr ?? null;
     }
     // Validate whether or not we have a specific codec available to us in FFmpeg.
     static async codecEnabled(videoProcessor, codec, log) {
         try {
             // Promisify exec to allow us to wait for it asynchronously.
-            const execAsync = util_1.default.promisify(child_process_1.execFile);
+            const execAsync = util.promisify(execFile);
             // Check for the codecs in FFmpeg.
             const { stdout } = await execAsync(videoProcessor, ["-codecs"]);
             // See if we can find the codec.
@@ -238,5 +230,4 @@ class FfmpegProcess extends events_1.EventEmitter {
         return false;
     }
 }
-exports.FfmpegProcess = FfmpegProcess;
 //# sourceMappingURL=protect-ffmpeg.js.map

package/dist/protect-ffmpeg.js.map

@@ -1 +1 @@
-{"version":3,"file":"protect-ffmpeg.js","sourceRoot":"","sources":["../src/protect-ffmpeg.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"protect-ffmpeg.js","sourceRoot":"","sources":["../src/protect-ffmpeg.ts"],"names":[],"mappings":"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"}

package/dist/protect-light.d.ts

@@ -0,0 +1,13 @@
+import { PlatformAccessory } from "homebridge";
+import { ProtectLightConfig } from "unifi-protect";
+import { ProtectDevice } from "./protect-device.js";
+import { ProtectNvr } from "./protect-nvr.js";
+export declare class ProtectLight extends ProtectDevice {
+    private lightState;
+    ufp: ProtectLightConfig;
+    constructor(nvr: ProtectNvr, device: ProtectLightConfig, accessory: PlatformAccessory);
+    private configureDevice;
+    private configureLightbulb;
+    private configureMqtt;
+    private eventHandler;
+}

package/dist/protect-light.js

@@ -1,18 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProtectLight = void 0;
-const protect_accessory_1 = require("./protect-accessory");
-class ProtectLight extends protect_accessory_1.ProtectAccessory {
+import { ProtectDevice } from "./protect-device.js";
+export class ProtectLight extends ProtectDevice {
+    // Create an instance.
+    constructor(nvr, device, accessory) {
+        super(nvr, accessory);
+        this.lightState = false;
+        this.ufp = device;
+        this.configureHints();
+        this.configureDevice();
+    }
     // Initialize and configure the light accessory for HomeKit.
-    async configureDevice() {
-        var _a;
+    configureDevice() {
         this.lightState = false;
-        // Save the device object before we wipeout the context.
-        const device = this.accessory.context.device;
         // Clean out the context object in case it's been polluted somehow.
         this.accessory.context = {};
-        this.accessory.context.device = device;
-        this.accessory.context.nvr = (_a = this.nvr.nvrApi.bootstrap) === null || _a === void 0 ? void 0 : _a.nvr.mac;
+        this.accessory.context.mac = this.ufp.mac;
+        this.accessory.context.nvr = this.nvr.ufp.mac;
         // Configure accessory information.
         this.configureInfo();
         // Configure the light.
@@ -21,91 +23,112 @@ class ProtectLight extends protect_accessory_1.ProtectAccessory {
         this.configureMotionSensor();
         // Configure MQTT services.
         this.configureMqtt();
-        return Promise.resolve(true);
+        // Listen for events.
+        this.nvr.events.on("updateEvent." + this.ufp.id, this.listeners["updateEvent." + this.ufp.id] = this.eventHandler.bind(this));
+        return true;
     }
     // Configure the light for HomeKit.
     configureLightbulb() {
-        var _a, _b;
         // Find the service, if it exists.
         let lightService = this.accessory.getService(this.hap.Service.Lightbulb);
         // Add the service to the accessory, if needed.
         if (!lightService) {
             lightService = new this.hap.Service.Lightbulb(this.accessory.displayName);
             if (!lightService) {
-                this.log.error("%s: Unable to add light.", this.name());
+                this.log.error("Unable to add light.");
                 return false;
             }
             this.accessory.addService(lightService);
         }
         // Turn the light on or off.
-        (_a = lightService.getCharacteristic(this.hap.Characteristic.On)) === null || _a === void 0 ? void 0 : _a.onGet(() => {
-            return this.accessory.context.device.isLightOn === true;
-        }).onSet(async (value) => {
+        lightService.getCharacteristic(this.hap.Characteristic.On)
+            ?.onGet(() => {
+            return this.ufp.isLightOn === true;
+        })
+            .onSet(async (value) => {
             const lightState = value === true;
-            const newDevice = await this.nvr.nvrApi.updateLight(this.accessory.context.device, { lightOnSettings: { isLedForceOn: lightState } });
+            const newDevice = await this.nvr.ufpApi.updateDevice(this.ufp, { lightOnSettings: { isLedForceOn: lightState } });
             if (!newDevice) {
-                this.log.error("%s: Unable to turn the light %s. Please ensure this username has the Administrator role in UniFi Protect.", this.name(), lightState ? "on" : "off");
+                this.log.error("Unable to turn the light %s. Please ensure this username has the Administrator role in UniFi Protect.", lightState ? "on" : "off");
                 return;
             }
             // Set the context to our updated device configuration.
-            this.accessory.context.device = newDevice;
+            this.ufp = newDevice;
         });
         // Adjust the brightness of the light.
-        (_b = lightService.getCharacteristic(this.hap.Characteristic.Brightness)) === null || _b === void 0 ? void 0 : _b.onGet(() => {
+        lightService.getCharacteristic(this.hap.Characteristic.Brightness)
+            ?.onGet(() => {
             // The Protect ledLevel settings goes from 1 - 6. HomeKit expects percentages, so we convert it like so.
-            return (this.accessory.context.device.lightDeviceSettings.ledLevel - 1) * 20;
-        }).onSet(async (value) => {
+            return (this.ufp.lightDeviceSettings.ledLevel - 1) * 20;
+        })
+            .onSet(async (value) => {
             const brightness = Math.round((value / 20) + 1);
-            const newDevice = await this.nvr.nvrApi.updateLight(this.accessory.context.device, { lightDeviceSettings: { ledLevel: brightness } });
+            const newDevice = await this.nvr.ufpApi.updateDevice(this.ufp, { lightDeviceSettings: { ledLevel: brightness } });
             if (!newDevice) {
-                this.log.error("%s: Unable to adjust the brightness to %s%. Please ensure this username has the Administrator role in UniFi Protect.", this.name(), value);
+                this.log.error("Unable to adjust the brightness to %s%. Please ensure this username has the Administrator role in UniFi Protect.", value);
                 return;
             }
             // Set the context to our updated device configuration.
-            this.accessory.context.device = newDevice;
+            this.ufp = newDevice;
             // Make sure we properly reflect what brightness we're actually at.
             setTimeout(() => {
-                lightService === null || lightService === void 0 ? void 0 : lightService.updateCharacteristic(this.hap.Characteristic.Brightness, (brightness - 1) * 20);
+                lightService?.updateCharacteristic(this.hap.Characteristic.Brightness, (brightness - 1) * 20);
             }, 50);
         });
         // Initialize the light.
-        lightService.updateCharacteristic(this.hap.Characteristic.On, this.accessory.context.device.isLightOn);
-        lightService.updateCharacteristic(this.hap.Characteristic.Brightness, (this.accessory.context.device.lightDeviceSettings.ledLevel - 1) * 20);
+        lightService.updateCharacteristic(this.hap.Characteristic.On, this.ufp.isLightOn);
+        lightService.updateCharacteristic(this.hap.Characteristic.Brightness, (this.ufp.lightDeviceSettings.ledLevel - 1) * 20);
         return true;
     }
     // Configure MQTT capabilities of this light.
     configureMqtt() {
-        var _a;
         const lightService = this.accessory.getService(this.hap.Service.Lightbulb);
         if (!lightService) {
             return false;
         }
         // Trigger a motion event in MQTT, if requested to do so.
-        (_a = this.nvr.mqtt) === null || _a === void 0 ? void 0 : _a.subscribe(this.accessory, "light", (message) => {
-            var _a, _b, _c;
+        this.nvr.mqtt?.subscribe(this.accessory, "light", (message) => {
             const value = message.toString();
             const brightness = parseInt(value);
-            switch (value === null || value === void 0 ? void 0 : value.toLowerCase()) {
+            switch (value?.toLowerCase()) {
                 case "off":
-                    (_a = lightService.getCharacteristic(this.hap.Characteristic.On)) === null || _a === void 0 ? void 0 : _a.setValue(false);
-                    this.log.info("%s: Light turned off via MQTT.", this.name());
+                    lightService.getCharacteristic(this.hap.Characteristic.On)?.setValue(false);
+                    this.log.info("Light turned off via MQTT.");
                     break;
                 case "on":
-                    (_b = lightService.getCharacteristic(this.hap.Characteristic.On)) === null || _b === void 0 ? void 0 : _b.setValue(true);
-                    this.log.info("%s: Light turned on via MQTT.", this.name());
+                    lightService.getCharacteristic(this.hap.Characteristic.On)?.setValue(true);
+                    this.log.info("Light turned on via MQTT.");
                     break;
                 default:
                     // Unknown message - ignore it.
                     if (isNaN(brightness) || (brightness < 0) || (brightness > 100)) {
                         return;
                     }
-                    (_c = lightService.getCharacteristic(this.hap.Characteristic.Brightness)) === null || _c === void 0 ? void 0 : _c.setValue(brightness);
-                    this.log.info("%s: Light set to %s% via MQTT.", this.name(), brightness);
+                    lightService.getCharacteristic(this.hap.Characteristic.Brightness)?.setValue(brightness);
+                    this.log.info("Light set to %s% via MQTT.", brightness);
                     break;
             }
         });
         return true;
     }
+    // Handle light-related events.
+    eventHandler(packet) {
+        const payload = packet.payload;
+        // It's a motion event - process it accordingly.
+        if (payload.isPirMotionDetected && payload.lastMotion) {
+            this.nvr.events.motionEventHandler(this, payload.lastMotion);
+        }
+        // It's a light power event - process it accordingly.
+        if ("isLightOn" in payload) {
+            // Update our power state.
+            this.accessory.getService(this.hap.Service.Lightbulb)?.updateCharacteristic(this.hap.Characteristic.On, payload.isLightOn);
+        }
+        // It's light brightness event - process it accordingly.
+        if (payload.lightDeviceSettings && ("ledLevel" in payload.lightDeviceSettings)) {
+            // Update our brightness.
+            this.accessory.getService(this.hap.Service.Lightbulb)?.
+                updateCharacteristic(this.hap.Characteristic.Brightness, (payload.lightDeviceSettings.ledLevel - 1) * 20);
+        }
+    }
 }
-exports.ProtectLight = ProtectLight;
 //# sourceMappingURL=protect-light.js.map