Fixed issue #64

Fixed issue #65 Updated versions of the package dependencies
bropat · Nov 16, 2021 · 06aee3b · 06aee3b
1 parent 7d540d4
commit 06aee3b
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 55 deletions.
diff --git a/README.md b/README.md
@@ -77,8 +77,9 @@ One client instance will show all devices from one Eufy Cloud account and allows
 * eufyCam 2 Pro (T8140)
 * eufyCam 2C Pro (T8141)
 * SoloCam E40 (T8131)
-* Floodlight (T8420)
-* Floodlight (T8422)
+* Floodlight Camera (T8420)
+* Floodlight Cam (T8422)
+* Floodlight Cam 2 (T8424)
 * Wired Doorbell 2k (T8200)
 * Wired Doorbell 1080p (T8201)
 * Battery Doorbell 2K (T8210)
@@ -100,6 +101,12 @@ Please use GitHub issues for this.
 
 ## Changelog
 
+### 1.2.3 (2021-11-16)
+
+* (bropat) Fixed issue #64
+* (bropat) Fixed issue #65
+* (bropat) Updated versions of the package dependencies
+
 ### 1.2.2 (2021-11-06)
 
 * (bropat) Fixed issue of wrong channel value on event rtsp livestream stopped

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eufy-security-client",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Client to comunicate with Eufy-Security devices",
   "author": {
     "name": "bropat",
@@ -43,13 +43,13 @@
     "crypto-js": "^4.1.1",
     "ts-log": "^2.2.4",
     "tiny-typed-emitter": "^2.1.0",
-    "i18n-iso-countries": "^6.8.0",
+    "i18n-iso-countries": "^7.0.0",
     "@cospired/i18n-iso-languages": "^3.1.1",
     "fs-extra": "^10.0.0",
     "sweet-collections": "^1.1.0"
   },
   "devDependencies": {
-    "@types/node": "^16.11.6",
+    "@types/node": "^16.11.7",
     "@types/qs": "^6.9.7",
     "@types/node-rsa": "^1.1.1",
     "@types/crypto-js": "^4.0.2",

diff --git a/src/http/types.ts b/src/http/types.ts
@@ -2108,7 +2108,6 @@ export const DeviceProperties: Properties = {
         [PropertyName.DeviceRecordingEndClipMotionStops]: DeviceRecordingEndClipMotionStopsProperty,
         [PropertyName.DeviceVideoStreamingQuality]: DeviceVideoStreamingQualityProperty,
         [PropertyName.DeviceNotificationType]: DeviceNotificationTypeIndoorFloodlightProperty,
-        [PropertyName.DeviceVideoStreamingQuality]: DeviceVideoStreamingQualityProperty,
         [PropertyName.DeviceVideoRecordingQuality]: DeviceVideoRecordingQualityIndoorProperty,
     },
     [DeviceType.FLOODLIGHT_CAMERA_8423]: {
@@ -2138,6 +2137,7 @@ export const DeviceProperties: Properties = {
         [PropertyName.DeviceRecordingEndClipMotionStops]: DeviceRecordingEndClipMotionStopsProperty,
         [PropertyName.DeviceVideoStreamingQuality]: DeviceVideoStreamingQualityProperty,
         [PropertyName.DeviceNotificationType]: DeviceNotificationTypeIndoorFloodlightProperty,
+        [PropertyName.DeviceVideoRecordingQuality]: DeviceVideoRecordingQualityIndoorProperty,
     },
     [DeviceType.FLOODLIGHT_CAMERA_8424]: {
         ...GenericDeviceProperties,
@@ -2166,6 +2166,7 @@ export const DeviceProperties: Properties = {
         [PropertyName.DeviceRecordingEndClipMotionStops]: DeviceRecordingEndClipMotionStopsProperty,
         [PropertyName.DeviceVideoStreamingQuality]: DeviceVideoStreamingQualityProperty,
         [PropertyName.DeviceNotificationType]: DeviceNotificationTypeIndoorFloodlightProperty,
+        [PropertyName.DeviceVideoRecordingQuality]: DeviceVideoRecordingQualityIndoorProperty,
     },
     [DeviceType.INDOOR_CAMERA]: {
         ...GenericDeviceProperties,

diff --git a/src/p2p/session.ts b/src/p2p/session.ts
@@ -1543,7 +1543,7 @@ export class P2PClientProtocol extends TypedEmitter<P2PClientProtocolEvents> {
 
     public updateRawStation(value: HubResponse): void {
         this.rawStation = value;
-        if (this.rawStation.devices.length === 1) {
+        if (this.rawStation.devices?.length === 1) {
             if (!this.energySavingDevice) {
                 this.energySavingDevice = this.rawStation.station_sn === this.rawStation.devices[0].device_sn && Device.hasBattery(this.rawStation.devices[0].device_type);
                 if (this.energySavingDevice)

diff --git a/src/push/service.ts b/src/push/service.ts
@@ -138,42 +138,57 @@ export class PushNotificationService extends TypedEmitter<PushNotificationServic
 
     private async createPushCredentials(): Promise<Credentials> {
         const generatedFid = generateFid();
-
-        const registerFidResponse = await this.registerFid(generatedFid);
-        const checkinResponse = await this.executeCheckin();
-        //TODO: On exception handle it and maybe retry later
-        const registerGcmResponse = await this.registerGcm(registerFidResponse, checkinResponse);
-
-        return {
-            fidResponse: registerFidResponse,
-            checkinResponse: checkinResponse,
-            gcmResponse: registerGcmResponse,
-        };
+        return await this.registerFid(generatedFid)
+            .then(async (registerFidResponse) => {
+                const checkinResponse = await this.executeCheckin();
+                return {
+                    fidResponse: registerFidResponse,
+                    checkinResponse: checkinResponse
+                };
+            })
+            .then(async (result) => {
+                const registerGcmResponse = await this.registerGcm(result.fidResponse, result.checkinResponse);
+                return {
+                    ...result,
+                    gcmResponse: registerGcmResponse,
+                };
+            }).catch((error) => {
+                throw error;
+            });
     }
 
     private async renewPushCredentials(credentials: Credentials): Promise<Credentials> {
-        credentials.fidResponse.authToken = await this.renewFidToken(credentials.fidResponse.fid, credentials.fidResponse.refreshToken);
-        const checkinResponse = await this.executeCheckin();
-        //TODO: On exception handle it and maybe retry later
-        const registerGcmResponse = await this.registerGcm(credentials.fidResponse, checkinResponse);
-
-        return {
-            fidResponse: credentials.fidResponse,
-            checkinResponse: checkinResponse,
-            gcmResponse: registerGcmResponse,
-        };
+        return await this.renewFidToken(credentials.fidResponse.fid, credentials.fidResponse.refreshToken)
+            .then(async (response) => {
+                credentials.fidResponse.authToken = response;
+                return await this.executeCheckin();
+            })
+            .then(async (response) => {
+                const registerGcmResponse = await this.registerGcm(credentials.fidResponse, response);
+                return {
+                    fidResponse: credentials.fidResponse,
+                    checkinResponse: response,
+                    gcmResponse: registerGcmResponse,
+                } as Credentials;
+            })
+            .catch(() => {
+                return this.createPushCredentials();
+            });
     }
 
     private async loginPushCredentials(credentials: Credentials): Promise<Credentials> {
-        const checkinResponse = await this.executeCheckin();
-        //TODO: On exception handle it and maybe retry later
-        const registerGcmResponse = await this.registerGcm(credentials.fidResponse, checkinResponse);
-
-        return {
-            fidResponse: credentials.fidResponse,
-            checkinResponse: checkinResponse,
-            gcmResponse: registerGcmResponse,
-        };
+        return await this.executeCheckin()
+            .then(async (response) => {
+                const registerGcmResponse = await this.registerGcm(credentials.fidResponse, response);
+                return {
+                    fidResponse: credentials.fidResponse,
+                    checkinResponse: response,
+                    gcmResponse: registerGcmResponse,
+                } as Credentials;
+            })
+            .catch(() => {
+                return this.createPushCredentials();
+            });
     }
 
     private async executeCheckin(): Promise<CheckinResponse> {
@@ -542,7 +557,9 @@ export class PushNotificationService extends TypedEmitter<PushNotificationServic
     }
 
     public async open(): Promise<Credentials | undefined> {
-        await this._open();
+        await this._open().catch((error) => {
+            this.log.error(`Got exception trying to initialize push notifications`, error);
+        });
 
         if (!this.credentials) {
             this.clearRetryTimeout();