eufy-security-client 2.4.4 → 2.5.0

package/README.md

@@ -80,6 +80,12 @@ Please use GitHub issues for this.
 
 ## Changelog
 
+### 2.5.0 (2023-05-07)
+
+* (bropat) **Breaking Change** `picture_url` property is now hidden and was replaced by `picture` property for supported devices
+* (bropat) Implemented new push notification picture gathering and decryption
+* (bropat) Fixed sdcard info gathering for devices without sdcard inserted
+
 ### 2.4.4 (2023-04-21)
 
 * (bropat) Implemented feature request #313

package/build/eufysecurity.d.ts

@@ -46,6 +46,7 @@ export declare class EufySecurity extends TypedEmitter<EufySecurityEvents> {
     private removeDevice;
     private updateDevice;
     getDevices(): Promise<Array<Device>>;
+    getDevicesFromStation(stationSN: string): Promise<Array<Device>>;
     getDevice(deviceSN: string): Promise<Device>;
     getStationDevice(stationSN: string, channel: number): Promise<Device>;
     getStations(): Promise<Array<Station>>;
@@ -159,4 +160,5 @@ export declare class EufySecurity extends TypedEmitter<EufySecurityEvents> {
     updateUserSchedule(deviceSN: string, username: string, schedule: Schedule): Promise<void>;
     private onStationDevicePinVerified;
     private onStationSdInfoEx;
+    private onStationImageDownload;
 }

package/build/eufysecurity.js

@@ -32,6 +32,7 @@ const ts_log_1 = require("ts-log");
 const fse = __importStar(require("fs-extra"));
 const path = __importStar(require("path"));
 const events_1 = __importDefault(require("events"));
+const image_type_1 = __importDefault(require("image-type"));
 const api_1 = require("./http/api");
 const station_1 = require("./http/station");
 const types_1 = require("./http/types");
@@ -292,7 +293,15 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
         }
     }
     async getStorageInfo(stationSerial) {
-        await this.stations[stationSerial].getStorageInfoEx();
+        try {
+            const station = await this.getStation(stationSerial);
+            if (station.isStation() || (station.hasProperty(types_1.PropertyName.StationSdStatus) && station.getPropertyValue(types_1.PropertyName.StationSdStatus) !== undefined && station.getPropertyValue(types_1.PropertyName.StationSdStatus) !== types_2.TFCardStatus.REMOVE)) {
+                await station.getStorageInfoEx();
+            }
+        }
+        catch (error) {
+            this.log.error("getStorageInfo Error", error);
+        }
     }
     addDevice(device) {
         const serial = device.getSerial();
@@ -334,6 +343,16 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
         });
         return arr;
     }
+    async getDevicesFromStation(stationSN) {
+        if (!this.devicesLoaded)
+            await (0, utils_1.waitForEvent)(this.loadingEmitter, "devices loaded");
+        const arr = [];
+        Object.keys(this.devices).forEach((serialNumber) => {
+            if (this.devices[serialNumber].getStationSerial() === stationSN)
+                arr.push(this.devices[serialNumber]);
+        });
+        return arr;
+    }
     async getDevice(deviceSN) {
         if (!this.devicesLoaded)
             await (0, utils_1.waitForEvent)(this.loadingEmitter, "devices loaded");
@@ -398,11 +417,12 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
                 this.updateStation(hub);
             }
             else {
+                this.stationsLoaded = false;
                 let ipAddress;
                 if (this.config.stationIPAddresses !== undefined) {
                     ipAddress = this.config.stationIPAddresses[hub.station_sn];
                 }
-                const station = station_1.Station.initialize(this.api, hub, ipAddress);
+                const station = station_1.Station.getInstance(this.api, hub, ipAddress);
                 promises.push(station.then((station) => {
                     try {
                         station.on("connect", (station) => this.onStationConnect(station));
@@ -420,7 +440,7 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
                         station.on("rtsp livestream start", (station, channel) => this.onStartStationRTSPLivestream(station, channel));
                         station.on("rtsp livestream stop", (station, channel) => this.onStopStationRTSPLivestream(station, channel));
                         station.on("rtsp url", (station, channel, value) => this.onStationRtspUrl(station, channel, value));
-                        station.on("property changed", (station, name, value) => this.onStationPropertyChanged(station, name, value));
+                        station.on("property changed", (station, name, value, ready) => this.onStationPropertyChanged(station, name, value, ready));
                         station.on("raw property changed", (station, type, value) => this.onStationRawPropertyChanged(station, type, value));
                         station.on("alarm event", (station, alarmEvent) => this.onStationAlarmEvent(station, alarmEvent));
                         station.on("runtime state", (station, channel, batteryLevel, temperature) => this.onStationRuntimeState(station, channel, batteryLevel, temperature));
@@ -441,7 +461,9 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
                         station.on("device wrong try-protect alarm", (deviceSN) => this.onStationDeviceWrongTryProtectAlarm(deviceSN));
                         station.on("device pin verified", (deviceSN, successfull) => this.onStationDevicePinVerified(deviceSN, successfull));
                         station.on("sd info ex", (station, sdStatus, sdCapacity, sdCapacityAvailable) => this.onStationSdInfoEx(station, sdStatus, sdCapacity, sdCapacityAvailable));
+                        station.on("image download", (station, file, image) => this.onStationImageDownload(station, file, image));
                         this.addStation(station);
+                        station.initialize();
                     }
                     catch (error) {
                         this.log.error("Error", error);
@@ -509,46 +531,47 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
                 this.updateDevice(device);
             }
             else {
+                this.devicesLoaded = false;
                 let new_device;
                 if (device_1.Device.isIndoorCamera(device.device_type)) {
-                    new_device = device_1.IndoorCamera.initialize(this.api, device);
+                    new_device = device_1.IndoorCamera.getInstance(this.api, device);
                 }
                 else if (device_1.Device.isSoloCameras(device.device_type)) {
-                    new_device = device_1.SoloCamera.initialize(this.api, device);
+                    new_device = device_1.SoloCamera.getInstance(this.api, device);
                 }
                 else if (device_1.Device.isBatteryDoorbell(device.device_type)) {
-                    new_device = device_1.BatteryDoorbellCamera.initialize(this.api, device);
+                    new_device = device_1.BatteryDoorbellCamera.getInstance(this.api, device);
                 }
                 else if (device_1.Device.isWiredDoorbell(device.device_type) || device_1.Device.isWiredDoorbellDual(device.device_type)) {
-                    new_device = device_1.WiredDoorbellCamera.initialize(this.api, device);
+                    new_device = device_1.WiredDoorbellCamera.getInstance(this.api, device);
                 }
                 else if (device_1.Device.isFloodLight(device.device_type)) {
-                    new_device = device_1.FloodlightCamera.initialize(this.api, device);
+                    new_device = device_1.FloodlightCamera.getInstance(this.api, device);
                 }
                 else if (device_1.Device.isCamera(device.device_type)) {
-                    new_device = device_1.Camera.initialize(this.api, device);
+                    new_device = device_1.Camera.getInstance(this.api, device);
                 }
                 else if (device_1.Device.isLock(device.device_type)) {
-                    new_device = device_1.Lock.initialize(this.api, device);
+                    new_device = device_1.Lock.getInstance(this.api, device);
                 }
                 else if (device_1.Device.isMotionSensor(device.device_type)) {
-                    new_device = device_1.MotionSensor.initialize(this.api, device);
+                    new_device = device_1.MotionSensor.getInstance(this.api, device);
                 }
                 else if (device_1.Device.isEntrySensor(device.device_type)) {
-                    new_device = device_1.EntrySensor.initialize(this.api, device);
+                    new_device = device_1.EntrySensor.getInstance(this.api, device);
                 }
                 else if (device_1.Device.isKeyPad(device.device_type)) {
-                    new_device = device_1.Keypad.initialize(this.api, device);
+                    new_device = device_1.Keypad.getInstance(this.api, device);
                 }
                 else if (device_1.Device.isSmartSafe(device.device_type)) {
-                    new_device = device_1.SmartSafe.initialize(this.api, device);
+                    new_device = device_1.SmartSafe.getInstance(this.api, device);
                 }
                 else {
-                    new_device = device_1.UnknownDevice.initialize(this.api, device);
+                    new_device = device_1.UnknownDevice.getInstance(this.api, device);
                 }
                 promises.push(new_device.then((device) => {
                     try {
-                        device.on("property changed", (device, name, value) => this.onDevicePropertyChanged(device, name, value));
+                        device.on("property changed", (device, name, value, ready) => this.onDevicePropertyChanged(device, name, value, ready));
                         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));
@@ -576,6 +599,7 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
                         device.on("dog lick detected", (device, state) => this.onDeviceDogLickDetected(device, state));
                         device.on("dog poop detected", (device, state) => this.onDeviceDogPoopDetected(device, state));
                         this.addDevice(device);
+                        device.initialize();
                     }
                     catch (error) {
                         this.log.error("Error", error);
@@ -1664,8 +1688,10 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
     onStationCurrentMode(station, currentMode) {
         this.emit("station current mode", station, currentMode);
     }
-    onStationPropertyChanged(station, name, value) {
-        this.emit("station property changed", station, name, value);
+    onStationPropertyChanged(station, name, value, ready) {
+        if (ready && !name.startsWith("hidden-")) {
+            this.emit("station property changed", station, name, value);
+        }
     }
     onStationRawPropertyChanged(station, type, value) {
         this.emit("station raw property changed", station, type, value);
@@ -1682,9 +1708,12 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
     onStationAlarmArmedEvent(station) {
         this.emit("station alarm armed", station);
     }
-    onDevicePropertyChanged(device, name, value) {
+    onDevicePropertyChanged(device, name, value, ready) {
+        var _a;
         try {
-            this.emit("device property changed", device, name, value);
+            if (ready && !name.startsWith("hidden-")) {
+                this.emit("device property changed", device, name, value);
+            }
             if (name === types_1.PropertyName.DeviceRTSPStream && value === true && (device.getPropertyValue(types_1.PropertyName.DeviceRTSPStreamUrl) === undefined || (device.getPropertyValue(types_1.PropertyName.DeviceRTSPStreamUrl) !== undefined && device.getPropertyValue(types_1.PropertyName.DeviceRTSPStreamUrl) === ""))) {
                 this.getStation(device.getStationSerial()).then((station) => {
                     station.setRTSPStream(device, true);
@@ -1695,6 +1724,16 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
             else if (name === types_1.PropertyName.DeviceRTSPStream && value === false) {
                 device.setCustomPropertyValue(types_1.PropertyName.DeviceRTSPStreamUrl, "");
             }
+            else if (name === types_1.PropertyName.DevicePictureUrl) { // && device.hasProperty(PropertyName.DevicePicture)) {
+                const picture = device.getPropertyValue(types_1.PropertyName.DevicePicture);
+                if (picture === undefined || (picture && ((_a = picture.data) === null || _a === void 0 ? void 0 : _a.length) === 0)) {
+                    this.getStation(device.getStationSerial()).then((station) => {
+                        station.downloadImage(value);
+                    }).catch((error) => {
+                        this.log.error(`Device property changed error (device: ${device.getSerial()} name: ${name}) - station download image (station: ${device.getStationSerial()} image_path: ${value})`, error);
+                    });
+                }
+            }
         }
         catch (error) {
             this.log.error(`Device property changed error (device: ${device.getSerial()} name: ${name})`, error);
@@ -2100,6 +2139,25 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
             station.updateProperty(types_1.PropertyName.StationSdCapacityAvailable, sdCapacityAvailable);
         }
     }
+    onStationImageDownload(station, file, image) {
+        const type = (0, image_type_1.default)(image);
+        const picture = {
+            data: image,
+            type: type !== null ? type : { ext: "unknown", mime: "application/octet-stream" }
+        };
+        this.emit("station image download", station, file, picture);
+        this.getDevicesFromStation(station.getSerial()).then((devices) => {
+            for (const device of devices) {
+                if (device.getPropertyValue(types_1.PropertyName.DevicePictureUrl) === file && device.getPropertyValue(types_1.PropertyName.DevicePicture) === undefined) {
+                    this.log.debug(`onStationImageDownload - Set first picture for device ${device.getSerial()} file: ${file} picture_ext: ${picture.type.ext} picture_mime: ${picture.type.mime}`);
+                    device.updateProperty(types_1.PropertyName.DevicePicture, picture);
+                    break;
+                }
+            }
+        }).catch((error) => {
+            this.log.error(`onStationImageDownload - Set first picture error`, error);
+        });
+    }
 }
 exports.EufySecurity = EufySecurity;
 //# sourceMappingURL=eufysecurity.js.map