hoffmation-base 3.2.3-alpha.2 → 3.2.3-alpha.4

package/lib/devices/unifi/own-unifi-door.js

@@ -1,8 +1,42 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OwnUnifiDoor = void 0;
 const DoorDevice_1 = require("../DoorDevice");
 const enums_1 = require("../../enums");
+const Util = __importStar(require("node:util"));
 class OwnUnifiDoor extends DoorDevice_1.DoorDevice {
     constructor(name, roomName, unifiDeviceName) {
         super(name, roomName);
@@ -22,10 +56,19 @@ class OwnUnifiDoor extends DoorDevice_1.DoorDevice {
         // Nothing
     }
     checkForDingUpdate(packet) {
+        var _a;
         switch (packet.event) {
             case 'access.data.device.remote_unlock':
                 this.log(enums_1.LogLevel.Debug, `Device ${this.unifiDeviceName} was unlocked`);
                 return;
+            case 'access.logs.add':
+                const event = packet.data;
+                if (((_a = event._source.authentication) === null || _a === void 0 ? void 0 : _a.credential_provider) === 'BUTTON_DOOR_BELL' &&
+                    event._source.event.type === 'access.door.unlock') {
+                    this.log(enums_1.LogLevel.Debug, `Ding Event details: ${Util.inspect(event, false, 5)}`);
+                    this.onNewDingActiveValue(true);
+                }
+                return;
             case 'access.remote_view':
                 const ringEvent = packet.data;
                 this._lastDoorbellRingRequestId = ringEvent.request_id;

package/lib/devices/unifi/unifi-access.js

@@ -19,7 +19,10 @@ class UnifiAccess {
                 // We had an update within the last 3 minutes --> no need to reconnect
                 return;
             }
-            this.reconnect(settings);
+            this._api.logout();
+            utils_1.Utils.guardedTimeout(() => {
+                this.reconnect(settings);
+            }, 5000, this);
         }, 5 * 60 * 1000);
     }
     static addDevice(door) {
@@ -53,6 +56,7 @@ class UnifiAccess {
         for (const device of this._api.devices) {
             this.initializeDevice(device);
         }
+        this._api.off('message', this.onMessage.bind(this));
         this._api.on('message', this.onMessage.bind(this));
     }
     onMessage(packet) {
@@ -62,9 +66,9 @@ class UnifiAccess {
             case 'nvr':
                 break;
             default:
+                // this.unifiLogger.debug(`onMessage: ${JSON.stringify(packet)}`);
                 // Lookup the device.
-                const id = packet.event_object_id;
-                const ownName = this._idMap.get(id);
+                const ownName = this._idMap.get(packet.event_object_id);
                 if (!ownName) {
                     break;
                 }
@@ -87,7 +91,7 @@ class UnifiAccess {
         }
         const door = UnifiAccess.ownDoors.get(data.alias);
         door.initialize(data);
-        logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, `Unifi-Access: ${data.name} (re)initialized`);
+        logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, `Unifi-Access: ${data.name} (re)initialized with unique_id: ${data.unique_id}`);
         this._idMap.set(data.unique_id, data.alias);
     }
 }