@eiannone/tesla-api 1.14.1 → 1.15.2

package/TeslaApi.js

@@ -79,7 +79,7 @@ class TeslaApi {
                     if (res.statusCode == 401 && this.refresh_token != null) {
                         // Tries to refresh the tokens
                         this.refreshToken(this.refresh_token)
-                            .then(_ => this.#apiCall(path, method))
+                            .then(_ => this.#apiCall(path, method, params))
                             .then(response => resolve(response))
                             .catch(error => { reject(error); });
                         return;
@@ -129,49 +129,7 @@ class TeslaApi {
         return this.#apiCall(vid + "/command/" + command, "POST", params);
     }
 
-    async #oauthCall(params, bearer_token) {
-        return new Promise((resolve, reject) => {
-            const postData = JSON.stringify(params);
-            const req = request(BASE_URL + '/oauth/token', {
-                headers: { 
-                    'user-agent': "TeslaEma",
-                    'Authorization': "Bearer " + bearer_token,
-                    'Content-Type': 'application/json',
-                    'Content-Length': postData.length
-                },
-                timeout: 30000,
-                method: 'POST'
-            }, res => {
-                if (res.statusCode > 199 && res.statusCode < 300) {
-                    res.setEncoding('utf8');
-                    let rawData = '';
-                    res.on('data', chunk => { rawData += chunk; });
-                    res.on('end', () => {
-                        try {
-                            resolve(JSON.parse(rawData));
-                        } catch(err) {
-                            reject(new ApiError(err));
-                        }
-                    });
-                } else {
-                    let errMsg = res.statusMessage + " ("+res.statusCode+")";
-                    reject(new ApiError(errMsg, this.#decodeStatus(res.statusCode)));
-                }
-            });
-            req.on('error', e => {
-                // Error code examples:
-                // - EAI_AGAIN (DNS lookup timeout)
-                // - ECONNRESET
-                // - ECONNREFUSED
-                // - ENOTFOUND
-                reject(new ApiError(e.message + " ("+e.code+")", ApiError.NETWORK));
-            });
-            req.write(postData);
-            req.end();
-        });
-    }
-
-    async #oauthCall2(params) {
+    async #oauthCall(params) {
         return new Promise((resolve, reject) => {
             const postData = JSON.stringify(params);
             const req = request('https://auth.tesla.com/oauth2/v3/token', {
@@ -216,21 +174,16 @@ class TeslaApi {
         this.cb_refreshToken = callback;
     }
 
-    async refreshToken(refresh_token) {
-        const payLoad = {
-            grant_type: 'refresh_token',
-            client_id: 'ownerapi',
-            refresh_token,
-            scope: 'openid email offline_access'
-        };
+    // https://tesla-api.timdorr.com/api-basics/authentication
+    async refreshToken(refresh_token, retry = 1) {
         try {
-            let resp = await this.#oauthCall2(payLoad);
-            this.refresh_token = resp.refresh_token;
-            let oauth = await this.#oauthCall({
-                grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-                client_id: '81527cff06843c8634fdc09e8ac0abefb46ac849f38fe1e431c2ef2106796384',
-                client_secret: 'c7257eb71a564034f9419ee651c7d0e5f7aa6bfbd18bafb5c5c033b093bb2fa3'
-            }, resp.access_token);
+            const oauth = await this.#oauthCall({
+                grant_type: 'refresh_token',
+                client_id: 'ownerapi',
+                refresh_token,
+                scope: 'openid email offline_access'
+            });
+            this.refresh_token = oauth.refresh_token;
             this.token = oauth.access_token;
             if (typeof this.cb_refreshToken == 'function') {
                 this.cb_refreshToken(this.token, this.refresh_token);
@@ -238,6 +191,10 @@ class TeslaApi {
             return oauth;   
         }
         catch(error) {
+            if (retry < 3) {
+                await new Promise(resolve => setTimeout(resolve, 500));
+                return this.refreshToken(refresh_token. retry + 1);
+            }
             if (error instanceof Error) error.message += " - Unable to refresh Token";
             throw error;            
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eiannone/tesla-api",
-    "version": "1.14.1",
+    "version": "1.15.2",
     "description": "Nodejs Tesla API",
     "type": "module",
     "main": "index.js",