Merge pull request #408 from martijnpoppen/feature/T8600-E330

NEW: Add T8600 (E330)
bropat · Jan 2, 2024 · 5bc9445 · 5bc9445
2 parents 03a48bb + c4a76c8
commit 5bc9445
Show file tree

Hide file tree

Showing 10 changed files with 511 additions and 27 deletions.
diff --git a/docs/_media/eufycame330_large.jpg b/docs/_media/eufycame330_large.jpg
diff --git a/docs/_media/eufycame330_small.jpg b/docs/_media/eufycame330_small.jpg
diff --git a/docs/supported_devices.md b/docs/supported_devices.md
@@ -15,6 +15,7 @@
 | ![T8141 image](_media/eufycam2cpro_small.jpg) | eufyCam 2C Pro (T8141) | :heavy_check_mark: |  |
 | ![T8160 image](_media/eufycam3_small.jpg) | S330 eufyCam (T8160; eufyCam 3) | :heavy_check_mark: | Firmware: 3.1.8.6 (20221101) |
 | ![T8161 image](_media/eufycam3c_small.jpg) | S300 eufyCam (T8161; eufyCam 3C) | :heavy_check_mark: | Firmware: 3.1.8.6 (20221101) |
+| ![T8600 image](_media/eufycame330_small.jpg) | eufyCam E330 (Professional; T8600) | :heavy_check_mark: | Firmware: 0.5.9.5 (20231218) |
 | ![T8130 image](_media/solocame20_small.jpg) | SoloCam E20 (T8130) | :heavy_check_mark: |  |
 | ![T8131 image](_media/solocame40_small.jpg) | SoloCam E40 (T8131) | :heavy_check_mark: |  |
 | ![T8122 image](_media/solocaml20_small.jpg) | SoloCam L20 (T8122) | :heavy_check_mark: | Firmware: 1.0.8.1 |

diff --git a/src/eufysecurity.ts b/src/eufysecurity.ts
@@ -15,7 +15,7 @@ import { PushNotificationService } from "./push/service";
 import { Credentials, PushMessage } from "./push/models";
 import { BatteryDoorbellCamera, Camera, Device, EntrySensor, FloodlightCamera, GarageCamera, IndoorCamera, Keypad, Lock, MotionSensor, SmartSafe, SoloCamera, UnknownDevice, WallLightCam, WiredDoorbellCamera, Tracker } from "./http/device";
 import { AlarmEvent, ChargingType, CommandType, DatabaseReturnCode, P2PConnectionType, SmartSafeAlarm911Event, SmartSafeShakeAlarmEvent, TFCardStatus } from "./p2p/types";
-import { DatabaseCountByDate, DatabaseQueryLatestInfo, DatabaseQueryLocal, StreamMetadata, DatabaseQueryLatestInfoLocal, DatabaseQueryLatestInfoCloud, RGBColor, DynamicLighting, MotionZone } from "./p2p/interfaces";
+import { DatabaseCountByDate, DatabaseQueryLatestInfo, DatabaseQueryLocal, StreamMetadata, DatabaseQueryLatestInfoLocal, DatabaseQueryLatestInfoCloud, RGBColor, DynamicLighting, MotionZone, CrossTrackingGroupEntry } from "./p2p/interfaces";
 import { CommandResult, StorageInfoBodyHB3 } from "./p2p/models";
 import { generateSerialnumber, generateUDID, getError, handleUpdate, md5, parseValue, removeLastChar, waitForEvent } from "./utils";
 import { DeviceNotFoundError, StationNotFoundError, ReadOnlyPropertyError, NotSupportedError, AddUserError, DeleteUserError, UpdateUserUsernameError, UpdateUserPasscodeError, UpdateUserScheduleError, ensureError } from "./error";
@@ -1574,6 +1574,12 @@ export class EufySecurity extends TypedEmitter<EufySecurityEvents> {
                 }
                 break;
             }
+            case PropertyName.DeviceImageMirrored:
+                station.setMirrorMode(device, value as boolean);
+                break;
+            case PropertyName.DeviceFlickerAdjustment:
+                station.setFlickerAdjustment(device, value as number);
+                break;
             default:
                 if (!Object.values(PropertyName).includes(name as PropertyName))
                     throw new ReadOnlyPropertyError("Property is read only", { context: { device: deviceSN, propertyName: name, propertyValue: value } });
@@ -1626,6 +1632,21 @@ export class EufySecurity extends TypedEmitter<EufySecurityEvents> {
             case PropertyName.StationTurnOffAlarmWithButton:
                 station.setStationTurnOffAlarmWithButton(value as boolean);
                 break;
+            case PropertyName.StationCrossCameraTracking:
+                station.setCrossCameraTracking(value as boolean);
+                break;
+            case PropertyName.StationContinuousTrackingTime:
+                station.setContinuousTrackingTime(value as number);
+                break;
+            case PropertyName.StationTrackingAssistance:
+                station.setTrackingAssistance(value as boolean);
+                break;
+            case PropertyName.StationCrossTrackingCameraList:
+                station.setCrossTrackingCameraList(value as Array<string>);
+                break;
+            case PropertyName.StationCrossTrackingGroupList:
+                station.setCrossTrackingGroupList(value as Array<CrossTrackingGroupEntry>);
+                break;
             default:
                 if (!Object.values(PropertyName).includes(name as PropertyName))
                     throw new ReadOnlyPropertyError("Property is read only", { context: { station: stationSN, propertyName: name, propertyValue: value } });

diff --git a/src/http/device.ts b/src/http/device.ts
@@ -616,6 +616,8 @@ export class Device extends TypedEmitter<DeviceEvents> {
                     this.log.error("Device convert raw property - CMD_BAT_DOORBELL_RECORD_QUALITY2 Error", { error: getError(error), deviceSN: this.getSerial(), property: property, value: value });
                     return numericProperty.default !== undefined ? numericProperty.default : (numericProperty.min !== undefined ? numericProperty.min : 0);
                 }
+            } else if (property.key === CommandType.CMD_DEV_RECORD_AUTOSTOP && this.getDeviceType() === DeviceType.PROFESSIONAL_247) {
+                return value !== undefined ? (value === "0" ? true : false) : false;
             } else if (property.type === "number") {
                 const numericProperty = property as PropertyMetadataNumeric;
                 try {
@@ -800,6 +802,7 @@ export class Device extends TypedEmitter<DeviceEvents> {
             type == DeviceType.CAMERA2_PRO ||
             type == DeviceType.CAMERA3 ||
             type == DeviceType.CAMERA3C ||
+            type == DeviceType.PROFESSIONAL_247 ||
             type == DeviceType.INDOOR_CAMERA_1080 ||
             type == DeviceType.INDOOR_PT_CAMERA_1080 ||
             type == DeviceType.OUTDOOR_PT_CAMERA ||
@@ -839,6 +842,7 @@ export class Device extends TypedEmitter<DeviceEvents> {
             type == DeviceType.CAMERA2_PRO ||
             type == DeviceType.CAMERA3 ||
             type == DeviceType.CAMERA3C ||
+            type == DeviceType.PROFESSIONAL_247 ||
             type == DeviceType.SOLO_CAMERA ||
             type == DeviceType.SOLO_CAMERA_PRO ||
             type == DeviceType.SOLO_CAMERA_SPOTLIGHT_1080 ||
@@ -1121,8 +1125,13 @@ export class Device extends TypedEmitter<DeviceEvents> {
         return DeviceType.CAMERA3C == type;
     }
 
+    static isCameraProfessional247(type: number): boolean {
+        // T8600 - E330
+        return DeviceType.PROFESSIONAL_247 == type;
+    }
+
     static isCamera3Product(type: number): boolean {
-        return Device.isCamera3(type) || Device.isCamera3C(type);
+        return Device.isCamera3(type) || Device.isCamera3C(type) || Device.isCameraProfessional247(type);
     }
 
     static isEntrySensor(type: number): boolean {
@@ -1373,6 +1382,10 @@ export class Device extends TypedEmitter<DeviceEvents> {
         return Device.isCamera3C(this.rawDevice.device_type);
     }
 
+    public isCameraProfessional247(): boolean {
+        return Device.isCameraProfessional247(this.rawDevice.device_type);
+    }
+
     public isCamera3Product(): boolean {
         return Device.isCamera3Product(this.rawDevice.device_type);
     }

diff --git a/src/http/parameter.ts b/src/http/parameter.ts
@@ -30,7 +30,9 @@ export class ParameterHelper {
                 type === CommandType.CMD_INDOOR_DET_SET_ACTIVE_ZONE ||
                 type === CommandType.CMD_SET_PRIVACYPARAM ||
                 type === CommandType.CMD_BAT_DOORBELL_VIDEO_QUALITY2 ||
-                type === CommandType.CMD_BAT_DOORBELL_RECORD_QUALITY2) {
+                type === CommandType.CMD_BAT_DOORBELL_RECORD_QUALITY2 ||
+                type === CommandType.CMD_SET_CROSS_TRACKING_CAMERA_LIST ||
+                type === CommandType.CMD_SET_CROSS_TRACKING_GROUP_LIST) {
                 if (typeof value === "string") {
                     const parsedValue = parseJSON(getNullTerminatedString(decodeBase64(value), "utf-8"), log);
                     if (parsedValue === undefined) {