Fixed regression in authentication flow introduced when fixing issue #…

…116

Updated versions of the package dependencies

README.md

@@ -79,6 +79,11 @@ Please use GitHub issues for this.
 
 ## Changelog
 
+### 1.6.5 (2022-02-08)
+
+* (bropat) Fixed regression in authentication flow introduced when fixing issue #116
+* (bropat) Updated versions of the package dependencies
+
 ### 1.6.4 (2022-02-07)
 
 * (bropat) Fixed issue #116 (choosing the correct country as in the Eufy App is esentially)

docs/_coverpage.md

@@ -1,6 +1,6 @@
 ![logo](_media/eufy-security-client.png)
 
-# eufy-security-client <small>1.6.4</small>
+# eufy-security-client <small>1.6.5</small>
 
 > This shared library allows to control [Eufy security devices](https://us.eufylife.com/collections/security) by connecting to the Eufy cloud servers and local/remote stations over p2p
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eufy-security-client",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "description": "Client to comunicate with Eufy-Security devices",
   "author": {
     "name": "bropat",
@@ -47,7 +47,7 @@
     "@cospired/i18n-iso-languages": "^3.1.1",
     "fs-extra": "^10.0.0",
     "sweet-collections": "^1.1.0",
-    "mqtt": "^4.3.4"
+    "mqtt": "^4.3.5"
   },
   "devDependencies": {
     "@types/node": "^16.11.14",

src/eufysecurity.ts

@@ -550,6 +550,9 @@ export class EufySecurity extends TypedEmitter<EufySecurityEvents> {
 
     public async connect(verifyCodeOrCaptcha?: string | null, captchaId?: string | null): Promise<boolean> {
         let retries = 0;
+        await this.api.loadApiBase().catch((error) => {
+            this.log.error("Load Api base Error", error);
+        });
         while (true) {
             switch (await this.api.authenticate(verifyCodeOrCaptcha, captchaId)) {
                 case AuthResult.CAPTCHA_NEEDED:
@@ -570,7 +573,7 @@ export class EufySecurity extends TypedEmitter<EufySecurityEvents> {
                     }
                     return true;
             }
-            if (retries > 2) {
+            if (retries > 4) {
                 this.log.error("Max connect attempts reached, interrupt");
                 return false;
             } else  {

src/http/api.ts

@@ -72,6 +72,14 @@ export class HTTPApi extends TypedEmitter<HTTPApiEvents> {
         this.headers.timezone = getTimezoneGMTString();
     }
 
+    public async loadApiBase(): Promise<void> {
+        const apiBase = await this.getApiBaseFromCloud(this.getCountry());
+        if (apiBase !== this.apiBase) {
+            this.log.debug(`Detected correct API_BASE: ${apiBase} (before: ${this.apiBase})`);
+            this.apiBase = apiBase;
+        }
+    }
+
     private invalidateToken(): void {
         this.token = null;
         this.tokenExpiration = null;
@@ -140,12 +148,6 @@ export class HTTPApi extends TypedEmitter<HTTPApiEvents> {
     public async authenticate(verifyCodeOrCaptcha: string | null = null, captchaId: string | null = null): Promise<AuthResult> {
         //Authenticate and get an access token
         this.log.debug("Authenticate and get an access token", { token: this.token, tokenExpiration: this.tokenExpiration });
-        const apiBase = await this.getApiBaseFromCloud(this.getCountry());
-        if (apiBase !== this.apiBase) {
-            this.log.debug(`Found wrong API_BASE (${this.apiBase}), switching to correct one (${apiBase})`);
-            this.apiBase = apiBase;
-            this.invalidateToken();
-        }
         if (!this.token || (this.tokenExpiration && (new Date()).getTime() >= this.tokenExpiration.getTime()) || verifyCodeOrCaptcha) {
             try {
                 this.ecdh.generateKeys();
@@ -450,20 +452,7 @@ export class HTTPApi extends TypedEmitter<HTTPApiEvents> {
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     public async request(request: HTTPApiRequest): Promise<ApiResponse> {
 
-        if (!this.token && request.endpoint != "v2/passport/login") {
-            //No token get one
-            switch (await this.authenticate()) {
-                case AuthResult.RENEW:
-                    this.log.debug("Renew token", { method: request.method, endpoint: request.endpoint });
-                    await this.authenticate();
-                    break;
-                case AuthResult.ERROR:
-                    this.log.error("Token error", { method: request.method, endpoint: request.endpoint });
-                    break;
-                default: break;
-            }
-        }
-        if (this.tokenExpiration && (new Date()).getTime() >= this.tokenExpiration.getTime()) {
+        if (this.token && this.tokenExpiration && (new Date()).getTime() >= this.tokenExpiration.getTime()) {
             this.log.info("Access token expired; fetching a new one")
             this.invalidateToken();
             if (request.endpoint != "v2/passport/login")