eufy-security-client 2.2.1 → 2.2.3

package/build/http/interfaces.d.ts

@@ -125,6 +125,7 @@ export interface HTTPApiEvents {
     "houses": (houses: Houses) => void;
     "connect": () => void;
     "close": () => void;
+    "connection error": (error: Error) => void;
     "tfa request": () => void;
     "captcha request": (id: string, captcha: string) => void;
     "auth token invalidated": () => void;
@@ -175,6 +176,7 @@ export interface DeviceEvents {
     "pet detected": (device: Device, state: boolean) => void;
     "sound detected": (device: Device, state: boolean) => void;
     "crying detected": (device: Device, state: boolean) => void;
+    "vehicle detected": (device: Device, state: boolean) => void;
     "rings": (device: Device, state: boolean) => void;
     "locked": (device: Device, state: boolean) => void;
     "open": (device: Device, state: boolean) => void;

package/build/http/parameter.js

@@ -18,7 +18,12 @@ class ParameterHelper {
                 type === types_1.CommandType.ARM_DELAY_CUS3 ||
                 type === types_1.CommandType.ARM_DELAY_OFF) {
                 try {
-                    return JSON.parse((0, utils_1.decodeBase64)(value).toString("utf8"));
+                    if (typeof value === "string") {
+                        return JSON.parse((0, utils_1.decodeBase64)(value).toString("utf8"));
+                    }
+                    else {
+                        return value; //return object
+                    }
                 }
                 catch (error) {
                     log.error(`Error readValue param ${type} `, error, type, value);

package/build/http/parameter.js.map

@@ -1 +1 @@
-{"version":3,"file":"parameter.js","sourceRoot":"","sources":["../../src/http/parameter.ts"],"names":[],"mappings":";;;AAEA,wCAA2C;AAC3C,wCAA4C;AAC5C,mCAAoC;AAEpC,MAAa,eAAe;IAEjB,MAAM,CAAC,SAAS,CAAC,IAAY,EAAE,KAAa,EAAE,GAAW;QAC5D,IAAI,KAAK,EAAE;YACP,IAAI,IAAI,KAAK,iBAAS,CAAC,WAAW;gBAC9B,IAAI,KAAK,iBAAS,CAAC,mBAAmB;gBACtC,IAAI,KAAK,mBAAW,CAAC,oCAAoC;gBACzD,IAAI,KAAK,mBAAW,CAAC,8BAA8B;gBACnD,IAAI,KAAK,mBAAW,CAAC,cAAc;gBACnC,IAAI,KAAK,mBAAW,CAAC,cAAc;gBACnC,IAAI,KAAK,mBAAW,CAAC,cAAc;gBACnC,IAAI,KAAK,mBAAW,CAAC,cAAc;gBACnC,IAAI,KAAK,mBAAW,CAAC,cAAc;gBACnC,IAAI,KAAK,mBAAW,CAAC,aAAa,EAAE;gBACpC,IAAI;oBACA,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;iBAC3D;gBAAC,OAAM,KAAK,EAAE;oBACX,GAAG,CAAC,KAAK,CAAC,yBAAyB,IAAI,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;iBACnE;gBACD,OAAO,EAAE,CAAC;aACb;iBAAM,IAAI,IAAI,KAAK,mBAAW,CAAC,sCAAsC;gBAClE,IAAI,KAAK,mBAAW,CAAC,gDAAgD;gBACrE,IAAI,KAAK,mBAAW,CAAC,wCAAwC;gBAC7D,IAAI,KAAK,mBAAW,CAAC,qCAAqC;gBAC1D,IAAI,KAAK,mBAAW,CAAC,oCAAoC;gBACzD,IAAI,KAAK,mBAAW,CAAC,oCAAoC;gBACzD,IAAI,KAAK,mBAAW,CAAC,mCAAmC;gBACxD,IAAI,KAAK,mBAAW,CAAC,+BAA+B;gBACpD,IAAI,KAAK,mBAAW,CAAC,uCAAuC;gBAC5D,IAAI,KAAK,mBAAW,CAAC,qCAAqC,EAAE;gBAC5D,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC3B,IAAI;wBACA,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe;qBAC5C;oBAAC,OAAM,KAAK,EAAE;wBACX,GAAG,CAAC,KAAK,CAAC,yBAAyB,IAAI,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;qBACnE;oBACD,OAAO,EAAE,CAAC;iBACb;qBAAM;oBACH,OAAO,KAAK,CAAC,CAAC,eAAe;iBAChC;aACJ;SACJ;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,IAAY,EAAE,KAAa;QAChD,IAAI,KAAK,EAAE;YACP,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACrC,IAAI,IAAI,KAAK,iBAAS,CAAC,WAAW;gBAC9B,IAAI,KAAK,iBAAS,CAAC,mBAAmB;gBACtC,IAAI,KAAK,mBAAW,CAAC,oCAAoC;gBACzD,IAAI,KAAK,mBAAW,CAAC,8BAA8B,EAAE;gBACrD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;aACjD;YACD,OAAO,MAAM,CAAC;SACjB;QACD,OAAO,EAAE,CAAC;IACd,CAAC;CAEJ;AA3DD,0CA2DC"}
+{"version":3,"file":"parameter.js","sourceRoot":"","sources":["../../src/http/parameter.ts"],"names":[],"mappings":";;;AAEA,wCAA2C;AAC3C,wCAA4C;AAC5C,mCAAoC;AAEpC,MAAa,eAAe;IAEjB,MAAM,CAAC,SAAS,CAAC,IAAY,EAAE,KAAa,EAAE,GAAW;QAC5D,IAAI,KAAK,EAAE;YACP,IAAI,IAAI,KAAK,iBAAS,CAAC,WAAW;gBAC9B,IAAI,KAAK,iBAAS,CAAC,mBAAmB;gBACtC,IAAI,KAAK,mBAAW,CAAC,oCAAoC;gBACzD,IAAI,KAAK,mBAAW,CAAC,8BAA8B;gBACnD,IAAI,KAAK,mBAAW,CAAC,cAAc;gBACnC,IAAI,KAAK,mBAAW,CAAC,cAAc;gBACnC,IAAI,KAAK,mBAAW,CAAC,cAAc;gBACnC,IAAI,KAAK,mBAAW,CAAC,cAAc;gBACnC,IAAI,KAAK,mBAAW,CAAC,cAAc;gBACnC,IAAI,KAAK,mBAAW,CAAC,aAAa,EAAE;gBACpC,IAAI;oBACA,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;wBAC3B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;qBAC3D;yBAAM;wBACH,OAAO,KAAK,CAAC,CAAC,eAAe;qBAChC;iBACJ;gBAAC,OAAM,KAAK,EAAE;oBACX,GAAG,CAAC,KAAK,CAAC,yBAAyB,IAAI,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;iBACnE;gBACD,OAAO,EAAE,CAAC;aACb;iBAAM,IAAI,IAAI,KAAK,mBAAW,CAAC,sCAAsC;gBAClE,IAAI,KAAK,mBAAW,CAAC,gDAAgD;gBACrE,IAAI,KAAK,mBAAW,CAAC,wCAAwC;gBAC7D,IAAI,KAAK,mBAAW,CAAC,qCAAqC;gBAC1D,IAAI,KAAK,mBAAW,CAAC,oCAAoC;gBACzD,IAAI,KAAK,mBAAW,CAAC,oCAAoC;gBACzD,IAAI,KAAK,mBAAW,CAAC,mCAAmC;gBACxD,IAAI,KAAK,mBAAW,CAAC,+BAA+B;gBACpD,IAAI,KAAK,mBAAW,CAAC,uCAAuC;gBAC5D,IAAI,KAAK,mBAAW,CAAC,qCAAqC,EAAE;gBAC5D,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC3B,IAAI;wBACA,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe;qBAC5C;oBAAC,OAAM,KAAK,EAAE;wBACX,GAAG,CAAC,KAAK,CAAC,yBAAyB,IAAI,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;qBACnE;oBACD,OAAO,EAAE,CAAC;iBACb;qBAAM;oBACH,OAAO,KAAK,CAAC,CAAC,eAAe;iBAChC;aACJ;SACJ;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,IAAY,EAAE,KAAa;QAChD,IAAI,KAAK,EAAE;YACP,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACrC,IAAI,IAAI,KAAK,iBAAS,CAAC,WAAW;gBAC9B,IAAI,KAAK,iBAAS,CAAC,mBAAmB;gBACtC,IAAI,KAAK,mBAAW,CAAC,oCAAoC;gBACzD,IAAI,KAAK,mBAAW,CAAC,8BAA8B,EAAE;gBACrD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;aACjD;YACD,OAAO,MAAM,CAAC;SACjB;QACD,OAAO,EAAE,CAAC;IACd,CAAC;CAEJ;AA/DD,0CA+DC"}

package/build/http/station.d.ts

@@ -30,6 +30,7 @@ export declare class Station extends TypedEmitter<StationEvents> {
     update(station: StationListResponse, cloudOnlyProperties?: boolean): void;
     updateProperty(name: string, value: PropertyValue): boolean;
     updateRawProperties(values: RawValues): void;
+    protected handlePropertyChange(metadata: PropertyMetadataAny, oldValue: PropertyValue, newValue: PropertyValue): void;
     updateRawProperty(type: number, value: string): boolean;
     protected convertRawPropertyValue(property: PropertyMetadataAny, value: string): PropertyValue;
     getPropertyMetadata(name: string): PropertyMetadataAny;

package/build/http/station.js

@@ -113,9 +113,21 @@ class Station extends tiny_typed_emitter_1.TypedEmitter {
     updateProperty(name, value) {
         if ((this.properties[name] !== undefined && this.properties[name] !== value)
             || this.properties[name] === undefined) {
+            const oldValue = this.properties[name];
             this.properties[name] = value;
             if (this.ready)
                 this.emit("property changed", this, name, value);
+            try {
+                this.handlePropertyChange(this.getPropertyMetadata(name), oldValue, this.properties[name]);
+            }
+            catch (error) {
+                if (error instanceof error_2.InvalidPropertyError) {
+                    this.log.error(`Invalid Property ${name} error`, error);
+                }
+                else {
+                    this.log.error(`Property ${name} error`, error);
+                }
+            }
             return true;
         }
         return false;
@@ -126,6 +138,31 @@ class Station extends tiny_typed_emitter_1.TypedEmitter {
             this.updateRawProperty(param_type, values[param_type]);
         });
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    handlePropertyChange(metadata, oldValue, newValue) {
+        if (metadata.name === types_1.PropertyName.StationCurrentMode) {
+            //TODO: Finish implementation!
+            if (newValue === types_1.AlarmMode.DISARMED) {
+                if (this.hasProperty(types_1.PropertyName.StationAlarmArmed)) {
+                    this.updateProperty(types_1.PropertyName.StationAlarmArmed, false);
+                }
+                if (this.hasProperty(types_1.PropertyName.StationAlarmDelay)) {
+                    this.updateProperty(types_1.PropertyName.StationAlarmDelay, 0);
+                }
+                if (this.hasProperty(types_1.PropertyName.StationAlarmDelayType)) {
+                    this.updateProperty(types_1.PropertyName.StationAlarmDelayType, 0);
+                }
+                if (this.hasProperty(types_1.PropertyName.StationAlarm)) {
+                    this.updateProperty(types_1.PropertyName.StationAlarm, false);
+                }
+                if (this.hasProperty(types_1.PropertyName.StationAlarmType)) {
+                    this.updateProperty(types_1.PropertyName.StationAlarmType, 0);
+                }
+            } /*else if (this.hasProperty(PropertyName.StationAlarmArmed)) { //TODO: Type !== HB3 or STATION
+                this.updateProperty(PropertyName.StationAlarmArmed, this.isAlarmArmable(newValue as AlarmMode));
+            }*/
+        }
+    }
     updateRawProperty(type, value) {
         const parsedValue = parameter_1.ParameterHelper.readValue(type, value, this.log);
         if ((this.rawProperties[type] !== undefined && this.rawProperties[type] !== parsedValue)
@@ -452,12 +489,67 @@ class Station extends tiny_typed_emitter_1.TypedEmitter {
     }
     onAlarmDelay(alarmDelayEvent, alarmDelay) {
         this.emit("alarm delay event", this, alarmDelayEvent, alarmDelay);
+        if (this.hasProperty(types_1.PropertyName.StationAlarmDelay)) {
+            this.updateProperty(types_1.PropertyName.StationAlarmDelay, alarmDelay);
+        }
+        if (this.hasProperty(types_1.PropertyName.StationAlarmDelayType)) {
+            this.updateProperty(types_1.PropertyName.StationAlarmDelayType, alarmDelayEvent);
+        }
     }
     onAlarmArmed() {
         this.emit("alarm armed event", this);
+        if (this.hasProperty(types_1.PropertyName.StationAlarmArmDelay)) {
+            this.updateProperty(types_1.PropertyName.StationAlarmArmDelay, 0);
+        }
+        /*if (this.hasProperty(PropertyName.StationAlarmArmed) && this.hasProperty(PropertyName.StationCurrentMode)) {
+            this.updateProperty(PropertyName.StationAlarmArmed, this.isAlarmArmable(this.getPropertyValue(PropertyName.StationCurrentMode) as AlarmMode));
+        }*/
+        if (this.hasProperty(types_1.PropertyName.StationAlarmArmed)) {
+            this.updateProperty(types_1.PropertyName.StationAlarmArmed, true);
+        }
+        if (this.hasProperty(types_1.PropertyName.StationAlarmDelay)) {
+            this.updateProperty(types_1.PropertyName.StationAlarmDelay, 0);
+        }
+        if (this.hasProperty(types_1.PropertyName.StationAlarmDelayType)) {
+            this.updateProperty(types_1.PropertyName.StationAlarmDelayType, 0);
+        }
+        if (this.hasProperty(types_1.PropertyName.StationAlarm)) {
+            this.updateProperty(types_1.PropertyName.StationAlarm, false);
+        }
+        if (this.hasProperty(types_1.PropertyName.StationAlarmType)) {
+            this.updateProperty(types_1.PropertyName.StationAlarmType, 0);
+        }
     }
     onAlarmEvent(alarmEvent) {
         this.emit("alarm event", this, alarmEvent);
+        if (this.hasProperty(types_1.PropertyName.StationAlarmDelay)) {
+            this.updateProperty(types_1.PropertyName.StationAlarmDelay, 0);
+        }
+        if (this.hasProperty(types_1.PropertyName.StationAlarmDelayType)) {
+            this.updateProperty(types_1.PropertyName.StationAlarmDelayType, 0);
+        }
+        switch (alarmEvent) {
+            case types_2.AlarmEvent.DEV_STOP:
+            case types_2.AlarmEvent.HUB_STOP:
+            case types_2.AlarmEvent.HUB_STOP_BY_APP:
+            case types_2.AlarmEvent.HUB_STOP_BY_HAND:
+            case types_2.AlarmEvent.HUB_STOP_BY_KEYPAD:
+                if (this.hasProperty(types_1.PropertyName.StationAlarm)) {
+                    this.updateProperty(types_1.PropertyName.StationAlarm, false);
+                }
+                if (this.hasProperty(types_1.PropertyName.StationAlarmType)) {
+                    this.updateProperty(types_1.PropertyName.StationAlarmType, 0);
+                }
+                break;
+            default:
+                if (this.hasProperty(types_1.PropertyName.StationAlarm)) {
+                    this.updateProperty(types_1.PropertyName.StationAlarm, true);
+                }
+                if (this.hasProperty(types_1.PropertyName.StationAlarmType)) {
+                    this.updateProperty(types_1.PropertyName.StationAlarmType, alarmEvent);
+                }
+                break;
+        }
     }
     async setGuardMode(mode) {
         const propertyData = {
@@ -524,11 +616,35 @@ class Station extends tiny_typed_emitter_1.TypedEmitter {
         const armDelay = this.getArmDelay(mode);
         if (armDelay > 0) {
             this.emit("alarm arm delay event", this, armDelay);
+            if (this.hasProperty(types_1.PropertyName.StationAlarmArmDelay)) {
+                this.updateProperty(types_1.PropertyName.StationAlarmArmDelay, armDelay);
+            }
+        }
+        if (mode === types_1.AlarmMode.DISARMED) {
+            if (this.hasProperty(types_1.PropertyName.StationAlarmArmDelay)) {
+                this.updateProperty(types_1.PropertyName.StationAlarmArmDelay, 0);
+            }
+            if (this.hasProperty(types_1.PropertyName.StationAlarmArmed)) {
+                this.updateProperty(types_1.PropertyName.StationAlarmArmed, false);
+            }
+            if (this.hasProperty(types_1.PropertyName.StationAlarmDelay)) {
+                this.updateProperty(types_1.PropertyName.StationAlarmDelay, 0);
+            }
+            if (this.hasProperty(types_1.PropertyName.StationAlarmDelayType)) {
+                this.updateProperty(types_1.PropertyName.StationAlarmDelayType, 0);
+            }
+            if (this.hasProperty(types_1.PropertyName.StationAlarm)) {
+                this.updateProperty(types_1.PropertyName.StationAlarm, false);
+            }
+            if (this.hasProperty(types_1.PropertyName.StationAlarmType)) {
+                this.updateProperty(types_1.PropertyName.StationAlarmType, 0);
+            }
         }
         // Trigger refresh Guard Mode
         await this.getCameraInfo();
     }
     getArmDelay(mode) {
+        var _a, _b, _c;
         let propertyName;
         switch (mode) {
             case types_1.AlarmMode.HOME:
@@ -549,12 +665,53 @@ class Station extends tiny_typed_emitter_1.TypedEmitter {
         }
         if (propertyName !== undefined && this.hasPropertyValue(propertyName) && this.getPropertyValue(propertyName) !== "") {
             const settings = this.getPropertyValue(propertyName);
-            if (settings.count_down_arm.channel_list.length > 0 && settings.count_down_arm.delay_time > 0) {
-                return settings.count_down_arm.delay_time;
+            try {
+                if (((_b = (_a = settings.count_down_arm) === null || _a === void 0 ? void 0 : _a.channel_list) === null || _b === void 0 ? void 0 : _b.length) > 0 && ((_c = settings.count_down_arm) === null || _c === void 0 ? void 0 : _c.delay_time) > 0) {
+                    return settings.count_down_arm.delay_time;
+                }
+            }
+            catch (error) {
+                this.log.debug(`Station ${this.getSerial()} - getArmDelay - Error`, { error: error, mode: mode, propertyName: propertyName, settings: settings });
             }
         }
         return 0;
     }
+    /*private getGuardModeActionSetting(mode: AlarmMode): number {
+        //TODO: This settings are only available on the device properties...
+        let value = 0;
+        try {
+            switch (mode) {
+                case AlarmMode.HOME:
+                    value = Number.parseInt(this.getRawProperty(CommandType.CMD_GET_HOME_ACTION));
+                    break;
+                case AlarmMode.AWAY:
+                    value = Number.parseInt(this.getRawProperty(CommandType.CMD_GET_AWAY_ACTION));
+                    break;
+                case AlarmMode.CUSTOM1:
+                    value = Number.parseInt(this.getRawProperty(CommandType.CMD_GET_CUSTOM1_ACTION));
+                    break;
+                case AlarmMode.CUSTOM2:
+                    value = Number.parseInt(this.getRawProperty(CommandType.CMD_GET_CUSTOM2_ACTION));
+                    break;
+                case AlarmMode.CUSTOM3:
+                    value = Number.parseInt(this.getRawProperty(CommandType.CMD_GET_CUSTOM3_ACTION));
+                    break;
+            }
+        } catch (error) {
+            this.log.debug(`Station ${this.getSerial()} - getGuardModeActionSetting - Error`, { error: error, mode: mode });
+        }
+        return value;
+    }
+
+    private isAlarmArmable(mode: AlarmMode): boolean {
+        const action = this.getGuardModeActionSetting(mode);
+        if ((action & GuardModeSecuritySettingsAction.CAMERA_ALARM) == GuardModeSecuritySettingsAction.CAMERA_ALARM ||
+            (action & GuardModeSecuritySettingsAction.HOMEBASE_ALARM) == GuardModeSecuritySettingsAction.HOMEBASE_ALARM ||
+            (action & GuardModeSecuritySettingsAction.LIGHT_ALARM) == GuardModeSecuritySettingsAction.LIGHT_ALARM) {
+            return true;
+        }
+        return false;
+    }*/
     _getDeviceSerial(channel) {
         if (this.rawStation.devices)
             for (const device of this.rawStation.devices) {