eufy-security-client 2.1.0 → 2.2.0-rc.1

package/README.md

@@ -80,6 +80,33 @@ Please use GitHub issues for this.
 
 ## Changelog
 
+### 2.2.0-rc.1 (2022-08-19)
+
+* (bropat) **Breaking Change** Renamed all lock settings parameters according to standard
+* (bropat) Renewed p2p device address discovery (now also includes local discovery via broadcast; cloud discovery optimised)
+* (bropat) Added support for Doorbell Dual notification types (package delivered, package taken, package stranded, someone loitering, radar motion detected)
+* (bropat) Added Smart Safe support (tested only T7401; #182 **WIP**)
+* (thieren) Added station event for connection timeout (#202)
+* (bropat) Fixed issue #196
+* (bropat) Fixed issue #201
+* (bropat) Fixed emitting of event "locked" for lock devices
+* (bropat) Small bugfixes and optimizations
+
+### 2.1.2 (2022-07-30)
+
+* (Palmke) Dual Doorbell family detection (#177)
+* (Palmke) Fixed issue #187
+* (bropat) Fixed issue #186
+
+### 2.1.1 (2022-07-16)
+
+* (Palmke) Add alarm arm delay event (#180)
+* (thieren) Fix: stream command for T8420 (#171)
+* (Palmke) Don't send the alarm armed p2p events as alarm events (#169)
+* (bropat) Fixed issue #167
+* (bropat) Fixed issue #161
+* (bropat) Updated versions of the package dependencies
+
 ### 2.1.0 (2022-06-12)
 
 * (bropat) Added toggle for Spotlight for Outdoor Cam Pro (T8441; #123)

package/build/error.d.ts

@@ -7,15 +7,9 @@ export declare class InvalidLanguageCodeError extends Error {
 export declare class StationNotFoundError extends Error {
     constructor(message?: string);
 }
-export declare class DuplicateStationError extends Error {
-    constructor(message?: string);
-}
 export declare class DeviceNotFoundError extends Error {
     constructor(message?: string);
 }
-export declare class DuplicateDeviceError extends Error {
-    constructor(message?: string);
-}
 export declare class NotSupportedError extends Error {
     constructor(message?: string);
 }
@@ -40,3 +34,6 @@ export declare class LivestreamError extends Error {
 export declare class TalkbackError extends Error {
     constructor(message?: string);
 }
+export declare class StationConnectTimeoutError extends Error {
+    constructor(message?: string);
+}

package/build/error.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TalkbackError = exports.LivestreamError = exports.ReadOnlyPropertyError = exports.InvalidCommandValueError = exports.InvalidPropertyValueError = exports.RTSPPropertyNotEnabled = exports.WrongStationError = exports.NotSupportedError = exports.DuplicateDeviceError = exports.DeviceNotFoundError = exports.DuplicateStationError = exports.StationNotFoundError = exports.InvalidLanguageCodeError = exports.InvalidCountryCodeError = void 0;
+exports.StationConnectTimeoutError = exports.TalkbackError = exports.LivestreamError = exports.ReadOnlyPropertyError = exports.InvalidCommandValueError = exports.InvalidPropertyValueError = exports.RTSPPropertyNotEnabled = exports.WrongStationError = exports.NotSupportedError = exports.DeviceNotFoundError = exports.StationNotFoundError = exports.InvalidLanguageCodeError = exports.InvalidCountryCodeError = void 0;
 class InvalidCountryCodeError extends Error {
     constructor(message) {
         super(message);
@@ -25,14 +25,6 @@ class StationNotFoundError extends Error {
     }
 }
 exports.StationNotFoundError = StationNotFoundError;
-class DuplicateStationError extends Error {
-    constructor(message) {
-        super(message);
-        Object.setPrototypeOf(this, new.target.prototype);
-        this.name = DuplicateStationError.name;
-    }
-}
-exports.DuplicateStationError = DuplicateStationError;
 class DeviceNotFoundError extends Error {
     constructor(message) {
         super(message);
@@ -41,14 +33,6 @@ class DeviceNotFoundError extends Error {
     }
 }
 exports.DeviceNotFoundError = DeviceNotFoundError;
-class DuplicateDeviceError extends Error {
-    constructor(message) {
-        super(message);
-        Object.setPrototypeOf(this, new.target.prototype);
-        this.name = DuplicateDeviceError.name;
-    }
-}
-exports.DuplicateDeviceError = DuplicateDeviceError;
 class NotSupportedError extends Error {
     constructor(message) {
         super(message);
@@ -113,4 +97,12 @@ class TalkbackError extends Error {
     }
 }
 exports.TalkbackError = TalkbackError;
+class StationConnectTimeoutError extends Error {
+    constructor(message) {
+        super(message);
+        Object.setPrototypeOf(this, new.target.prototype);
+        this.name = StationConnectTimeoutError.name;
+    }
+}
+exports.StationConnectTimeoutError = StationConnectTimeoutError;
 //# sourceMappingURL=error.js.map

package/build/error.js.map

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

package/build/eufysecurity.d.ts

@@ -53,6 +53,7 @@ export declare class EufySecurity extends TypedEmitter<EufySecurityEvents> {
     private handleHouses;
     private handleHubs;
     private onStationConnect;
+    private onStationConnectionError;
     private onStationClose;
     private handleDevices;
     refreshCloudData(): Promise<void>;
@@ -92,6 +93,7 @@ export declare class EufySecurity extends TypedEmitter<EufySecurityEvents> {
     private onStationStartDownload;
     private onStationFinishDownload;
     private onStationCommandResult;
+    private onStationSecondaryCommandResult;
     private onStationRtspUrl;
     private onStationGuardMode;
     private onStationCurrentMode;
@@ -99,6 +101,7 @@ export declare class EufySecurity extends TypedEmitter<EufySecurityEvents> {
     private onStationRawPropertyChanged;
     private onStationAlarmEvent;
     private onStationAlarmDelayEvent;
+    private onStationArmDelayEvent;
     private onStationAlarmArmedEvent;
     private onDevicePropertyChanged;
     private onDeviceRawPropertyChanged;
@@ -110,6 +113,17 @@ export declare class EufySecurity extends TypedEmitter<EufySecurityEvents> {
     private onDeviceRings;
     private onDeviceLocked;
     private onDeviceOpen;
+    private onDevicePackageDelivered;
+    private onDevicePackageStranded;
+    private onDevicePackageTaken;
+    private onDeviceSomeoneLoitering;
+    private onDeviceRadarMotionDetected;
+    private onDevice911Alarm;
+    private onDeviceShakeAlarm;
+    private onDeviceWrongTryProtectAlarm;
+    private onDeviceLongTimeNotClose;
+    private onDeviceLowBattery;
+    private onDeviceJammed;
     private onDeviceReady;
     private onStationRuntimeState;
     private onStationChargingState;
@@ -123,4 +137,9 @@ export declare class EufySecurity extends TypedEmitter<EufySecurityEvents> {
     private onStationTalkbackError;
     startStationTalkback(deviceSN: string): Promise<void>;
     stopStationTalkback(deviceSN: string): Promise<void>;
+    private onStationDeviceShakeAlarm;
+    private onStationDevice911Alarm;
+    private onStationDeviceJammed;
+    private onStationDeviceLowBattery;
+    private onStationDeviceWrongTryProtectAlarm;
 }

package/build/eufysecurity.js

@@ -190,7 +190,7 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
         });
         this.mqttService.on("lock message", (message) => {
             this.getDevice(message.data.data.deviceSn).then((device) => {
-                device.processMQTTNotification(message.data.data);
+                device.processMQTTNotification(message.data.data, this.config.eventDurationSeconds);
             }).catch((error) => {
                 if (error instanceof error_1.DeviceNotFoundError) {
                 }
@@ -212,7 +212,7 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
             this.emit("station added", station);
         }
         else {
-            throw new error_1.DuplicateStationError(`Station with this serial ${station.getSerial()} exists already and couldn't be added again!`);
+            this.log.debug(`Station with this serial ${station.getSerial()} exists already and couldn't be added again!`);
         }
     }
     removeStation(station) {
@@ -225,7 +225,7 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
             this.emit("station removed", station);
         }
         else {
-            throw new error_1.StationNotFoundError(`Station with this serial ${station.getSerial()} doesn't exists and couldn't be removed!`);
+            this.log.debug(`Station with this serial ${station.getSerial()} doesn't exists and couldn't be removed!`);
         }
     }
     updateStation(hub) {
@@ -237,7 +237,7 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
             }
         }
         else {
-            throw new error_1.StationNotFoundError(`Station with this serial ${hub.station_sn} doesn't exists and couldn't be updated!`);
+            this.log.debug(`Station with this serial ${hub.station_sn} doesn't exists and couldn't be updated!`);
         }
     }
     addDevice(device) {
@@ -249,7 +249,7 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
                 this.mqttService.subscribeLock(device.getSerial());
         }
         else {
-            throw new error_1.DuplicateDeviceError(`Device with this serial ${device.getSerial()} exists already and couldn't be added again!`);
+            this.log.debug(`Device with this serial ${device.getSerial()} exists already and couldn't be added again!`);
         }
     }
     removeDevice(device) {
@@ -260,7 +260,7 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
             this.emit("device removed", device);
         }
         else {
-            throw new error_1.DuplicateDeviceError(`Device with this serial ${device.getSerial()} doesn't exists and couldn't be removed!`);
+            this.log.debug(`Device with this serial ${device.getSerial()} doesn't exists and couldn't be removed!`);
         }
     }
     async updateDevice(device) {
@@ -269,7 +269,7 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
         if (Object.keys(this.devices).includes(device.device_sn))
             this.devices[device.device_sn].update(device, this.stations[device.station_sn] !== undefined && !this.stations[device.station_sn].isIntegratedDevice() && this.stations[device.station_sn].isConnected());
         else
-            throw new error_1.DeviceNotFoundError(`Device with this serial ${device.device_sn} doesn't exists and couldn't be updated!`);
+            this.log.debug(`Device with this serial ${device.device_sn} doesn't exists and couldn't be updated!`);
     }
     async getDevices() {
         if (this.loadingDevices !== undefined)
@@ -313,22 +313,17 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
         return this.api;
     }
     async connectToStation(stationSN, p2pConnectionType = types_2.P2PConnectionType.QUICKEST) {
-        if (Object.keys(this.stations).includes(stationSN)) {
-            this.stations[stationSN].setConnectionType(p2pConnectionType);
-            this.stations[stationSN].connect();
-        }
-        else
-            throw new error_1.StationNotFoundError(`No station with this serial number: ${stationSN}!`);
+        const station = this.getStation(stationSN);
+        station.setConnectionType(p2pConnectionType);
+        station.connect();
     }
     isStationConnected(stationSN) {
-        if (Object.keys(this.stations).includes(stationSN))
-            return this.stations[stationSN].isConnected();
-        throw new error_1.StationNotFoundError(`No station with this serial number: ${stationSN}!`);
+        const station = this.getStation(stationSN);
+        return station.isConnected();
     }
     isStationEnergySavingDevice(stationSN) {
-        if (Object.keys(this.stations).includes(stationSN))
-            return this.stations[stationSN].isEnergySavingDevice();
-        throw new error_1.StationNotFoundError(`No station with this serial number: ${stationSN}!`);
+        const station = this.getStation(stationSN);
+        return station.isEnergySavingDevice();
     }
     handleHouses(houses) {
         this.log.debug("Got houses:", houses);
@@ -346,6 +341,7 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
             else {
                 const station = new station_1.Station(this.api, hub);
                 station.on("connect", (station) => this.onStationConnect(station));
+                station.on("connection error", (station, error) => this.onStationConnectionError(station, error));
                 station.on("close", (station) => this.onStationClose(station));
                 station.on("raw device property changed", (deviceSN, params) => this.updateDeviceProperties(deviceSN, params));
                 station.on("livestream start", (station, channel, metadata, videostream, audiostream) => this.onStartStationLivestream(station, channel, metadata, videostream, audiostream));
@@ -371,6 +367,13 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
                 station.on("talkback stopped", (station, channel) => this.onStationTalkbackStop(station, channel));
                 station.on("talkback error", (station, channel, error) => this.onStationTalkbackError(station, channel, error));
                 station.on("alarm armed event", (station) => this.onStationAlarmArmedEvent(station));
+                station.on("alarm arm delay event", (station, armDelay) => this.onStationArmDelayEvent(station, armDelay));
+                station.on("secondary command result", (station, result) => this.onStationSecondaryCommandResult(station, result));
+                station.on("device shake alarm", (deviceSN, event) => this.onStationDeviceShakeAlarm(deviceSN, event));
+                station.on("device 911 alarm", (deviceSN, event) => this.onStationDevice911Alarm(deviceSN, event));
+                station.on("device jammed", (deviceSN) => this.onStationDeviceJammed(deviceSN));
+                station.on("device low battery", (deviceSN) => this.onStationDeviceLowBattery(deviceSN));
+                station.on("device wrong try-protect alarm", (deviceSN) => this.onStationDeviceWrongTryProtectAlarm(deviceSN));
                 this.addStation(station);
             }
         }
@@ -382,19 +385,24 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
     }
     onStationConnect(station) {
         this.emit("station connect", station);
-        if (device_1.Device.isCamera(station.getDeviceType()) && !device_1.Device.isWiredDoorbell(station.getDeviceType())) {
+        if ((device_1.Device.isCamera(station.getDeviceType()) && !device_1.Device.isWiredDoorbell(station.getDeviceType()) || device_1.Device.isSmartSafe(station.getDeviceType()))) {
             station.getCameraInfo().catch(error => {
                 this.log.error(`Error during station ${station.getSerial()} p2p data refreshing`, error);
             });
             if (this.refreshEufySecurityP2PTimeout[station.getSerial()] !== undefined)
                 clearTimeout(this.refreshEufySecurityP2PTimeout[station.getSerial()]);
-            this.refreshEufySecurityP2PTimeout[station.getSerial()] = setTimeout(() => {
-                station.getCameraInfo().catch(error => {
-                    this.log.error(`Error during station ${station.getSerial()} p2p data refreshing`, error);
-                });
-            }, this.P2P_REFRESH_INTERVAL_MIN * 60 * 1000);
+            if (!station.isEnergySavingDevice()) {
+                this.refreshEufySecurityP2PTimeout[station.getSerial()] = setTimeout(() => {
+                    station.getCameraInfo().catch(error => {
+                        this.log.error(`Error during station ${station.getSerial()} p2p data refreshing`, error);
+                    });
+                }, this.P2P_REFRESH_INTERVAL_MIN * 60 * 1000);
+            }
         }
     }
+    onStationConnectionError(station, error) {
+        this.emit("station connection error", station, error);
+    }
     onStationClose(station) {
         this.emit("station close", station);
         for (const device_sn of this.cameraStationLivestreamTimeout.keys()) {
@@ -449,25 +457,41 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
                 else if (device_1.Device.isKeyPad(device.device_type)) {
                     new_device = device_1.Keypad.initialize(this.api, device);
                 }
+                else if (device_1.Device.isSmartSafe(device.device_type)) {
+                    new_device = device_1.SmartSafe.initialize(this.api, device);
+                }
                 else {
                     new_device = device_1.UnknownDevice.initialize(this.api, device);
                 }
                 promises.push(new_device.then((device) => {
-                    device.on("property changed", (device, name, value) => this.onDevicePropertyChanged(device, name, value));
-                    device.on("raw property changed", (device, type, value) => this.onDeviceRawPropertyChanged(device, type, value));
-                    device.on("crying detected", (device, state) => this.onDeviceCryingDetected(device, state));
-                    device.on("sound detected", (device, state) => this.onDeviceSoundDetected(device, state));
-                    device.on("pet detected", (device, state) => this.onDevicePetDetected(device, state));
-                    device.on("motion detected", (device, state) => this.onDeviceMotionDetected(device, state));
-                    device.on("person detected", (device, state, person) => this.onDevicePersonDetected(device, state, person));
-                    device.on("rings", (device, state) => this.onDeviceRings(device, state));
-                    device.on("locked", (device, state) => this.onDeviceLocked(device, state));
-                    device.on("open", (device, state) => this.onDeviceOpen(device, state));
-                    device.on("ready", (device) => this.onDeviceReady(device));
-                    this.addDevice(device);
-                    return device;
-                }).catch((device) => {
-                    this.log.error("Error", device);
+                    try {
+                        device.on("property changed", (device, name, value) => this.onDevicePropertyChanged(device, name, value));
+                        device.on("raw property changed", (device, type, value) => this.onDeviceRawPropertyChanged(device, type, value));
+                        device.on("crying detected", (device, state) => this.onDeviceCryingDetected(device, state));
+                        device.on("sound detected", (device, state) => this.onDeviceSoundDetected(device, state));
+                        device.on("pet detected", (device, state) => this.onDevicePetDetected(device, state));
+                        device.on("motion detected", (device, state) => this.onDeviceMotionDetected(device, state));
+                        device.on("person detected", (device, state, person) => this.onDevicePersonDetected(device, state, person));
+                        device.on("rings", (device, state) => this.onDeviceRings(device, state));
+                        device.on("locked", (device, state) => this.onDeviceLocked(device, state));
+                        device.on("open", (device, state) => this.onDeviceOpen(device, state));
+                        device.on("ready", (device) => this.onDeviceReady(device));
+                        device.on("package delivered", (device, state) => this.onDevicePackageDelivered(device, state));
+                        device.on("package stranded", (device, state) => this.onDevicePackageStranded(device, state));
+                        device.on("package taken", (device, state) => this.onDevicePackageTaken(device, state));
+                        device.on("someone loitering", (device, state) => this.onDeviceSomeoneLoitering(device, state));
+                        device.on("radar motion detected", (device, state) => this.onDeviceRadarMotionDetected(device, state));
+                        device.on("911 alarm", (device, state, detail) => this.onDevice911Alarm(device, state, detail));
+                        device.on("shake alarm", (device, state, detail) => this.onDeviceShakeAlarm(device, state, detail));
+                        device.on("wrong try-protect alarm", (device, state) => this.onDeviceWrongTryProtectAlarm(device, state));
+                        device.on("long time not close", (device, state) => this.onDeviceLongTimeNotClose(device, state));
+                        device.on("low battery", (device, state) => this.onDeviceLowBattery(device, state));
+                        device.on("jammed", (device, state) => this.onDeviceJammed(device, state));
+                        this.addDevice(device);
+                    }
+                    catch (error) {
+                        this.log.error("Error", error);
+                    }
                     return device;
                 }));
             }
@@ -588,9 +612,9 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
     async onAPIConnect() {
         this.connected = true;
         this.retries = 0;
-        this.emit("connect");
         this.saveCloudToken();
         await this.refreshCloudData();
+        this.emit("connect");
         this.registerPushNotifications(this.persistentData.push_credentials, this.persistentData.push_persistentIds);
         const loginData = this.api.getPersistentData();
         if (loginData) {
@@ -1059,47 +1083,35 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
             case types_1.PropertyName.DeviceAutoCalibration:
                 await station.setAutoCalibration(device, value);
                 break;
-            case types_1.PropertyName.DeviceLockSettingsAutoLock:
-                await station.setAdvancedLockParams(device, types_1.PropertyName.DeviceLockSettingsAutoLock, value);
-                break;
-            case types_1.PropertyName.DeviceLockSettingsAutoLockSchedule:
-                await station.setAdvancedLockParams(device, types_1.PropertyName.DeviceLockSettingsAutoLockSchedule, value);
+            case types_1.PropertyName.DeviceAutoLock:
+            case types_1.PropertyName.DeviceAutoLockSchedule:
+            case types_1.PropertyName.DeviceAutoLockScheduleStartTime:
+            case types_1.PropertyName.DeviceAutoLockScheduleEndTime:
+            case types_1.PropertyName.DeviceAutoLockTimer:
+            case types_1.PropertyName.DeviceOneTouchLocking:
+            case types_1.PropertyName.DeviceSound:
+                await station.setAdvancedLockParams(device, name, value);
                 break;
-            case types_1.PropertyName.DeviceLockSettingsAutoLockScheduleStartTime:
-                await station.setAdvancedLockParams(device, types_1.PropertyName.DeviceLockSettingsAutoLockScheduleStartTime, value);
+            case types_1.PropertyName.DeviceNotification:
+                await station.setAdvancedLockParams(device, types_1.PropertyName.DeviceNotification, value);
                 break;
-            case types_1.PropertyName.DeviceLockSettingsAutoLockScheduleEndTime:
-                await station.setAdvancedLockParams(device, types_1.PropertyName.DeviceLockSettingsAutoLockScheduleEndTime, value);
+            case types_1.PropertyName.DeviceNotificationLocked:
+                await station.setAdvancedLockParams(device, types_1.PropertyName.DeviceNotificationLocked, value);
                 break;
-            case types_1.PropertyName.DeviceLockSettingsAutoLockTimer:
-                await station.setAdvancedLockParams(device, types_1.PropertyName.DeviceLockSettingsAutoLockTimer, value);
+            case types_1.PropertyName.DeviceNotificationUnlocked:
+                await station.setAdvancedLockParams(device, types_1.PropertyName.DeviceNotificationUnlocked, value);
                 break;
-            case types_1.PropertyName.DeviceLockSettingsNotification:
-                await station.setAdvancedLockParams(device, types_1.PropertyName.DeviceLockSettingsNotification, value);
+            case types_1.PropertyName.DeviceScramblePasscode:
+                await station.setScramblePasscode(device, value);
                 break;
-            case types_1.PropertyName.DeviceLockSettingsNotificationLocked:
-                await station.setAdvancedLockParams(device, types_1.PropertyName.DeviceLockSettingsNotificationLocked, value);
+            case types_1.PropertyName.DeviceWrongTryProtection:
+                await station.setWrongTryProtection(device, value);
                 break;
-            case types_1.PropertyName.DeviceLockSettingsNotificationUnlocked:
-                await station.setAdvancedLockParams(device, types_1.PropertyName.DeviceLockSettingsNotificationUnlocked, value);
+            case types_1.PropertyName.DeviceWrongTryAttempts:
+                await station.setWrongTryAttempts(device, value);
                 break;
-            case types_1.PropertyName.DeviceLockSettingsOneTouchLocking:
-                await station.setAdvancedLockParams(device, types_1.PropertyName.DeviceLockSettingsOneTouchLocking, value);
-                break;
-            case types_1.PropertyName.DeviceLockSettingsScramblePasscode:
-                await station.setAdvancedLockParams(device, types_1.PropertyName.DeviceLockSettingsScramblePasscode, value);
-                break;
-            case types_1.PropertyName.DeviceLockSettingsSound:
-                await station.setAdvancedLockParams(device, types_1.PropertyName.DeviceLockSettingsSound, value);
-                break;
-            case types_1.PropertyName.DeviceLockSettingsWrongTryProtection:
-                await station.setAdvancedLockParams(device, types_1.PropertyName.DeviceLockSettingsWrongTryProtection, value);
-                break;
-            case types_1.PropertyName.DeviceLockSettingsWrongTryAttempts:
-                await station.setAdvancedLockParams(device, types_1.PropertyName.DeviceLockSettingsWrongTryAttempts, value);
-                break;
-            case types_1.PropertyName.DeviceLockSettingsWrongTryLockdownTime:
-                await station.setAdvancedLockParams(device, types_1.PropertyName.DeviceLockSettingsWrongTryLockdownTime, value);
+            case types_1.PropertyName.DeviceWrongTryLockdownTime:
+                await station.setWrongTryLockdownTime(device, value);
                 break;
             case types_1.PropertyName.DeviceLoiteringDetection:
                 await station.setLoiteringDetection(device, value);
@@ -1224,6 +1236,27 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
             case types_1.PropertyName.DeviceDeliveryGuardUncollectedPackageAlertTimeToCheck:
                 await station.setDeliveryGuardUncollectedPackageAlertTimeToCheck(device, value);
                 break;
+            case types_1.PropertyName.DeviceLeftOpenAlarm:
+            case types_1.PropertyName.DeviceLeftOpenAlarmDuration:
+            case types_1.PropertyName.DeviceDualUnlock:
+            case types_1.PropertyName.DevicePowerSave:
+            case types_1.PropertyName.DeviceInteriorBrightness:
+            case types_1.PropertyName.DeviceInteriorBrightnessDuration:
+            case types_1.PropertyName.DeviceTamperAlarm:
+            case types_1.PropertyName.DeviceRemoteUnlock:
+            case types_1.PropertyName.DeviceRemoteUnlockMasterPIN:
+            case types_1.PropertyName.DeviceAlarmVolume:
+            case types_1.PropertyName.DevicePromptVolume:
+            case types_1.PropertyName.DeviceNotificationUnlockByKey:
+            case types_1.PropertyName.DeviceNotificationUnlockByPIN:
+            case types_1.PropertyName.DeviceNotificationUnlockByFingerprint:
+            case types_1.PropertyName.DeviceNotificationUnlockByApp:
+            case types_1.PropertyName.DeviceNotificationDualUnlock:
+            case types_1.PropertyName.DeviceNotificationDualLock:
+            case types_1.PropertyName.DeviceNotificationWrongTryProtect:
+            case types_1.PropertyName.DeviceNotificationJammed:
+                await station.setSmartSafeParams(device, name, value);
+                break;
             default:
                 if (!Object.values(types_1.PropertyName).includes(name))
                     throw new error_1.ReadOnlyPropertyError(`Property ${name} is read only`);
@@ -1333,7 +1366,8 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
         this.emit("station command result", station, result);
         if (result.return_code === 0) {
             this.getStationDevice(station.getSerial(), result.channel).then((device) => {
-                if (result.property !== undefined) {
+                //TODO: Finish SmartSafe implementation - check better the if below
+                if (result.property !== undefined && (device.isSmartSafe() && result.command_type !== types_2.CommandType.CMD_SMARTSAFE_SETTINGS) && !device.isLock()) {
                     if (device.hasProperty(result.property.name))
                         device.updateProperty(result.property.name, result.property.value);
                     else if (station.hasProperty(result.property.name)) {
@@ -1350,6 +1384,31 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
                     this.log.error(`Station command result error (station: ${station.getSerial()})`, error);
                 }
             });
+            if (station.isIntegratedDevice() && result.command_type === types_2.CommandType.CMD_SET_ARMING && station.isConnected() && station.getDeviceType() !== types_1.DeviceType.DOORBELL) {
+                station.getCameraInfo();
+            }
+        }
+    }
+    onStationSecondaryCommandResult(station, result) {
+        if (result.return_code === 0) {
+            this.getStationDevice(station.getSerial(), result.channel).then((device) => {
+                if (result.property !== undefined) {
+                    if (device.hasProperty(result.property.name))
+                        device.updateProperty(result.property.name, result.property.value);
+                    else if (station.hasProperty(result.property.name)) {
+                        station.updateProperty(result.property.name, result.property.value);
+                    }
+                }
+            }).catch((error) => {
+                if (error instanceof error_1.DeviceNotFoundError) {
+                    if (result.property !== undefined) {
+                        station.updateProperty(result.property.name, result.property.value);
+                    }
+                }
+                else {
+                    this.log.error(`Station secondary command result error (station: ${station.getSerial()})`, error);
+                }
+            });
         }
     }
     onStationRtspUrl(station, channel, value) {
@@ -1378,6 +1437,9 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
     onStationAlarmDelayEvent(station, alarmDelayEvent, alarmDelay) {
         this.emit("station alarm delay event", station, alarmDelayEvent, alarmDelay);
     }
+    onStationArmDelayEvent(station, armDelay) {
+        this.emit("station alarm arm delay event", station, armDelay);
+    }
     onStationAlarmArmedEvent(station) {
         this.emit("station alarm armed", station);
     }
@@ -1422,6 +1484,39 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
     onDeviceOpen(device, state) {
         this.emit("device open", device, state);
     }
+    onDevicePackageDelivered(device, state) {
+        this.emit("device package delivered", device, state);
+    }
+    onDevicePackageStranded(device, state) {
+        this.emit("device package stranded", device, state);
+    }
+    onDevicePackageTaken(device, state) {
+        this.emit("device package taken", device, state);
+    }
+    onDeviceSomeoneLoitering(device, state) {
+        this.emit("device someone loitering", device, state);
+    }
+    onDeviceRadarMotionDetected(device, state) {
+        this.emit("device radar motion detected", device, state);
+    }
+    onDevice911Alarm(device, state, detail) {
+        this.emit("device 911 alarm", device, state, detail);
+    }
+    onDeviceShakeAlarm(device, state, detail) {
+        this.emit("device shake alarm", device, state, detail);
+    }
+    onDeviceWrongTryProtectAlarm(device, state) {
+        this.emit("device wrong try-protect alarm", device, state);
+    }
+    onDeviceLongTimeNotClose(device, state) {
+        this.emit("device long time not close", device, state);
+    }
+    onDeviceLowBattery(device, state) {
+        this.emit("device low battery", device, state);
+    }
+    onDeviceJammed(device, state) {
+        this.emit("device jammed", device, state);
+    }
     onDeviceReady(device) {
         try {
             if (device.getPropertyValue(types_1.PropertyName.DeviceRTSPStream) !== undefined && device.getPropertyValue(types_1.PropertyName.DeviceRTSPStream) === true) {
@@ -1547,6 +1642,46 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
             this.log.warn(`The station talkback for the device ${deviceSN} cannot be stopped, because it isn't live streaming!`);
         }
     }
+    onStationDeviceShakeAlarm(deviceSN, event) {
+        this.getDevice(deviceSN).then((device) => {
+            if (device.isSmartSafe())
+                device.shakeEvent(event, this.config.eventDurationSeconds);
+        }).catch((error) => {
+            this.log.error(`onStationShakeAlarm device ${deviceSN} error`, error);
+        });
+    }
+    onStationDevice911Alarm(deviceSN, event) {
+        this.getDevice(deviceSN).then((device) => {
+            if (device.isSmartSafe())
+                device.alarm911Event(event, this.config.eventDurationSeconds);
+        }).catch((error) => {
+            this.log.error(`onStation911Alarm device ${deviceSN} error`, error);
+        });
+    }
+    onStationDeviceJammed(deviceSN) {
+        this.getDevice(deviceSN).then((device) => {
+            if (device.isSmartSafe())
+                device.jammedEvent(this.config.eventDurationSeconds);
+        }).catch((error) => {
+            this.log.error(`onStationDeviceJammed device ${deviceSN} error`, error);
+        });
+    }
+    onStationDeviceLowBattery(deviceSN) {
+        this.getDevice(deviceSN).then((device) => {
+            if (device.isSmartSafe())
+                device.lowBatteryEvent(this.config.eventDurationSeconds);
+        }).catch((error) => {
+            this.log.error(`onStationDeviceLowBattery device ${deviceSN} error`, error);
+        });
+    }
+    onStationDeviceWrongTryProtectAlarm(deviceSN) {
+        this.getDevice(deviceSN).then((device) => {
+            if (device.isSmartSafe())
+                device.wrongTryProtectAlarmEvent(this.config.eventDurationSeconds);
+        }).catch((error) => {
+            this.log.error(`onStationDeviceWrongTryProtectAlarm device ${deviceSN} error`, error);
+        });
+    }
 }
 exports.EufySecurity = EufySecurity;
 //# sourceMappingURL=eufysecurity.js.map