bumping versions

bassrock · May 10, 2020 · 088914d · 088914d
1 parent a20077b
commit 088914d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "flair-api-ts",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "description": "A ts-node implementation of the Flair Smart Vent API",
   "author": "bassrock",
   "main": "lib/index.js",

diff --git a/src/client/client.ts b/src/client/client.ts
@@ -86,18 +86,21 @@ class Client {
     private async updateAccessToken(): Promise<Token> {
         if (this.currentToken === undefined) {
             return this.getRefreshToken();
-        } else if (this.currentToken.expires_at.isBefore(new Date())) {
+        } else if (this.currentToken.expires_at.isBefore(moment().subtract(20, 'seconds'))) {
             const requestURL = '/oauth/token?' + querystring.stringify({
                 ...this.refreshTokenConfig,
                 refresh_token: this.currentToken!.refresh_token
             });
-            const response = await axios.post(requestURL)
-            if (response.status !== 200) {
-                throw new Error("Refreshing access token failed.")
+            try {
+                const response = await axios.post(requestURL)
+                if (response.status !== 200) {
+                    return this.getRefreshToken();
+                }
+                response.data.expires_at = moment().add(response.data.expires_in, 'seconds')
+                this.currentToken = response.data
+            } catch (e) {
+                return this.getRefreshToken();
             }
-
-            response.data.expires_at = moment().add(response.data.expires_in, 'seconds')
-            this.currentToken = response.data
         }
 
         return this.currentToken!