npm - hoffmation-base - Versions diffs - 3.2.3-alpha.8 → 3.2.3 - Mend

hoffmation-base 3.2.3-alpha.8 → 3.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/lib/devices/unifi/own-unifi-camera.d.ts +2 -2
package/lib/devices/unifi/own-unifi-camera.js +12 -9
package/lib/devices/unifi/unifi-protect.d.ts +2 -0
package/lib/devices/unifi/unifi-protect.js +21 -4
package/lib/tsconfig.tsbuildinfo +1 -1
package/package.json +1 -1

package/lib/devices/unifi/own-unifi-camera.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { CameraDevice } from '../index';
-import { ProtectCameraConfig, ProtectEventPacket } from 'unifi-protect';
+import { ProtectCameraConfig, ProtectEventAdd, ProtectEventPacket } from 'unifi-protect';
 export declare class OwnUnifiCamera extends CameraDevice {
     /**
      * The name of the camera in Unifi
@@ -18,7 +18,7 @@ export declare class OwnUnifiCamera extends CameraDevice {
     /**
      * @inheritDoc
      */
-    update(packet: ProtectEventPacket): void;
+    update(packet: ProtectEventPacket, baseEvent?: ProtectEventAdd): void;
     private checkForMotionUpdate;
     initialize(data: ProtectCameraConfig): void;
     protected resetPersonDetectedState(): void;

package/lib/devices/unifi/own-unifi-camera.js CHANGED Viewed

@@ -21,26 +21,29 @@ class OwnUnifiCamera extends index_1.CameraDevice {
     /**
      * @inheritDoc
      */
-    update(packet) {
-        this.checkForMotionUpdate(packet);
+    update(packet, baseEvent) {
+        this.checkForMotionUpdate(packet, baseEvent);
         this._lastUpdate = new Date();
     }
-    checkForMotionUpdate(packet) {
-        var _a;
+    checkForMotionUpdate(packet, baseEvent) {
+        var _a, _b, _c;
         const payload = packet.payload;
-        const eventAdd = payload;
+        const eventAddInfo = baseEvent !== null && baseEvent !== void 0 ? baseEvent : payload;
+        const payloadAsEventAdd = payload;
         if (packet.header.modelKey !== 'smartDetectObject' &&
             (packet.header.modelKey !== 'event' ||
-                !['smartDetectLine', 'smartDetectZone'].includes(payload.type) ||
-                !eventAdd.smartDetectTypes.length)) {
+                !['smartDetectLine', 'smartDetectZone'].includes(eventAddInfo.type) ||
+                ((_b = (_a = payloadAsEventAdd.smartDetectTypes) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0 === 0))) {
             return;
         }
         this.log(enums_1.LogLevel.Debug, `Update for "${packet.header.modelKey}" to value: ${JSON.stringify(payload)}`);
-        const detectedTypes = packet.header.modelKey === 'smartDetectObject' ? [eventAdd.type] : ((_a = eventAdd === null || eventAdd === void 0 ? void 0 : eventAdd.smartDetectTypes) !== null && _a !== void 0 ? _a : []);
+        const detectedTypes = packet.header.modelKey === 'smartDetectObject'
+            ? [payloadAsEventAdd.type]
+            : ((_c = payloadAsEventAdd === null || payloadAsEventAdd === void 0 ? void 0 : payloadAsEventAdd.smartDetectTypes) !== null && _c !== void 0 ? _c : []);
         for (const smartDetectType of detectedTypes) {
             switch (smartDetectType) {
                 case 'licensePlate':
-                    this.log(enums_1.LogLevel.Debug, `Detected "licensePlate": ${JSON.stringify(eventAdd.metadata.licensePlate)}`);
+                    this.log(enums_1.LogLevel.Debug, `Detected "licensePlate": ${JSON.stringify(payloadAsEventAdd.metadata.licensePlate)}`);
                     break;
                 case 'person':
                     this.onNewPersonDetectedValue(true);

package/lib/devices/unifi/unifi-protect.d.ts CHANGED Viewed

@@ -9,6 +9,7 @@ export declare class UnifiProtect implements iDisposable {
     static readonly ownCameras: Map<string, OwnUnifiCamera>;
     private _deviceStates;
     private _idMap;
+    private _eventMap;
     private _lastUpdate;
     constructor(settings: iUnifiProtectOptions);
     private reconnect;
@@ -16,5 +17,6 @@ export declare class UnifiProtect implements iDisposable {
     static addDevice(camera: OwnUnifiCamera): void;
     private initialize;
     private onMessage;
+    private rememberAddEvent;
     private initializeCamera;
 }

package/lib/devices/unifi/unifi-protect.js CHANGED Viewed

@@ -11,6 +11,7 @@ class UnifiProtect {
         this.unifiLogger = new unifi_logger_1.UnifiLogger(enums_1.LogSource.UnifiProtect);
         this._deviceStates = new Map();
         this._idMap = new Map();
+        this._eventMap = new Map();
         this._lastUpdate = new Date(0);
         this._api = new unifi_protect_1.ProtectApi(this.unifiLogger);
         this.reconnect(settings);
@@ -23,6 +24,7 @@ class UnifiProtect {
         }, 5 * 60 * 1000);
     }
     reconnect(settings) {
+        this._eventMap = new Map();
         this._api
             .login(settings.nvrAddress, settings.username, settings.password)
             .then((_loggedIn) => {
@@ -52,7 +54,7 @@ class UnifiProtect {
         this._api.on('message', this.onMessage.bind(this));
     }
     onMessage(packet) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         const payload = packet.payload;
         this._lastUpdate = new Date();
         switch (packet.header.modelKey) {
@@ -61,8 +63,15 @@ class UnifiProtect {
             default:
                 // Lookup the device.
                 let id = packet.header.id;
+                let baseEvent;
                 if (packet.header.action === 'add') {
-                    id = (_a = packet.payload.camera) !== null && _a !== void 0 ? _a : packet.payload.cameraId;
+                    const addEvent = packet.payload;
+                    id = (_a = addEvent.camera) !== null && _a !== void 0 ? _a : addEvent.cameraId;
+                    this.rememberAddEvent(packet, addEvent);
+                }
+                else if (packet.header.action === 'update' && this._eventMap.has(id)) {
+                    baseEvent = this._eventMap.get(packet.header.id);
+                    id = (_c = (_b = baseEvent === null || baseEvent === void 0 ? void 0 : baseEvent.camera) !== null && _b !== void 0 ? _b : baseEvent === null || baseEvent === void 0 ? void 0 : baseEvent.cameraId) !== null && _c !== void 0 ? _c : '';
                 }
                 const ownName = this._idMap.get(id);
                 if (!ownName) {
@@ -70,14 +79,22 @@ class UnifiProtect {
                 }
                 const ownCamera = UnifiProtect.ownCameras.get(ownName);
                 if (ownCamera !== undefined) {
-                    ownCamera.update(packet);
+                    ownCamera.update(packet, baseEvent);
                     break;
                 }
                 break;
         }
         // Update the internal list we maintain.
         if (packet.header.action === 'update') {
-            this._deviceStates.set(packet.header.id, Object.assign((_b = this._deviceStates.get(packet.header.id)) !== null && _b !== void 0 ? _b : {}, payload));
+            this._deviceStates.set(packet.header.id, Object.assign((_d = this._deviceStates.get(packet.header.id)) !== null && _d !== void 0 ? _d : {}, payload));
+        }
+    }
+    rememberAddEvent(packet, addEvent) {
+        if (packet.header.modelKey === 'event') {
+            this._eventMap.set(addEvent.id, addEvent);
+            utils_1.Utils.guardedTimeout(() => {
+                this._eventMap.delete(addEvent.id);
+            }, 5 * 60 * 1000, this);
         }
     }
     initializeCamera(data) {