@eiannone/tesla-api 1.9.0 → 1.12.0

package/TeslaApi.js

@@ -47,10 +47,17 @@ class TeslaApi {
         }
     }
 
-    async #apiCall(path, method = 'GET') {
-        return new Promise((resolve, reject) => {       
+    async #apiCall(path, method = 'GET', params = undefined) {
+        return new Promise((resolve, reject) => {
+            const postData = (typeof params != 'undefined')? JSON.stringify(params) : '';
+            let headers = { 'user-agent': "TeslaEma", 'Authorization': "Bearer " + this.token };
+            if (postData.length > 0) {
+                headers['Content-Type'] = 'application/json';
+                headers['Content-Length'] = postData.length;
+            }
+
             const req = request(BASE_URL + "/api/1/vehicles/" + path, {
-                headers: { 'user-agent': "TeslaEma", 'Authorization': "Bearer " + this.token },
+                headers: headers,
                 timeout: this.timeout,
                 method: method
             }, res => {
@@ -89,6 +96,7 @@ class TeslaApi {
                 // - ENOTFOUND
                 reject(new ApiError(e.message + " ("+e.code+")", ApiError.NETWORK));
             });
+            if (postData.length > 0) req.write(postData);
             req.end();
         });
     }
@@ -116,19 +124,61 @@ class TeslaApi {
         return this.#apiCall(vid + "/wake_up", "POST");
     }
 
-    async command(command, vehicle_id = null) {
+    async command(command, params = undefined, vehicle_id = null) {
         const vid = (vehicle_id == null)? this.vid : vehicle_id;
-        return this.#apiCall(vid + "/command/" + command, "POST");
+        return this.#apiCall(vid + "/command/" + command, "POST", params);
     }
 
-    async #oauthCall(params) {
-        const post_data = JSON.stringify(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) {
+        return new Promise((resolve, reject) => {
+            const postData = JSON.stringify(params);
+            const req = request('https://auth.tesla.com/oauth2/v3/token', {
                 headers: { 
                     'user-agent': "TeslaEma",
                     'Content-Type': 'application/json',
-                    'Content-Length': post_data.length
+                    'Content-Length': postData.length
                 },
                 timeout: 30000,
                 method: 'POST'
@@ -157,9 +207,9 @@ class TeslaApi {
                 // - ENOTFOUND
                 reject(new ApiError(e.message + " ("+e.code+")", ApiError.NETWORK));
             });
-            req.write(post_data);
+            req.write(postData);
             req.end();
-        });s
+        });
     }
 
     onTokenRefreh(callback) {
@@ -167,29 +217,30 @@ class TeslaApi {
     }
 
     async refreshToken(refresh_token) {
-        return this.#oauthCall({'grant_type': "refresh_token", 'refresh_token': refresh_token})
-            .then(async (resp) => {
-                this.token = resp.access_token;
-                this.refresh_token = resp.refresh_token;
-                if (typeof this.cb_refreshToken == 'function') {
-                    this.cb_refreshToken(this.token, this.refresh_token);
-                }
-                return resp;
-            })
-            .catch(error => {
-                if (error instanceof Error) error.message += " - Unable to refresh Token";
-                throw error;
-            });
-    }
-
-    async getTokens(email, password) {
-        return this.#oauthCall({
-            'grant_type': "password",
-            'email': email,
-            'password': password,
-            'client_id': "81527cff06843c8634fdc09e8ac0abefb46ac849f38fe1e431c2ef2106796384",
-            'client_secret': "c7257eb71a564034f9419ee651c7d0e5f7aa6bfbd18bafb5c5c033b093bb2fa3"
-        });
+        const payLoad = {
+            grant_type: 'refresh_token',
+            client_id: 'ownerapi',
+            refresh_token,
+            scope: 'openid email offline_access'
+        };
+        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);
+            this.token = oauth.access_token;
+            if (typeof this.cb_refreshToken == 'function') {
+                this.cb_refreshToken(this.token, this.refresh_token);
+            }
+            return oauth;   
+        }
+        catch(error) {
+            if (error instanceof Error) error.message += " - Unable to refresh Token";
+            throw error;            
+        }
     }
 }
 

package/TeslaStream.js

@@ -164,7 +164,7 @@ export default class TeslaStream extends EventEmitter {
                     case "client_error":
                         this.log("Client error: " + d.value, "error");
                         this.emit('error', d.value);
-                        this.#reconnect();
+                        if (d.value != "Can't validate token. ") this.#reconnect();
                         break;
                     default:
                         this.log("Stream API error ["+d.error_type+"]: " + data, "error");
@@ -180,7 +180,7 @@ export default class TeslaStream extends EventEmitter {
             this.log("Websocket error: " + errMsg, "error");
         });
         this.ws.on('close', (code, reason) => {
-            this.log("Websocket closed ("+ code + (reason? ': ' + reason : '') + ").");
+            this.log("Websocket closed ("+ code + ((reason != '')? `: ${reason}` : '') + ").");
             if (code == 1006 && this.state != CLOSING) this.reconnect = true; // Abnormal close
             if (this.checkTimeout != null) clearTimeout(this.checkTimeout);
             this.ws = null;

package/examples/refresh-token.js

@@ -0,0 +1,11 @@
+import {TeslaApi, ApiError} from '../TeslaApi.js';
+
+const api = new TeslaApi();
+api.refreshToken('1234')
+    .then(result => console.log(JSON.stringify(result)))
+    .catch(err => {
+        let reason = (err instanceof ApiError)? err.reason : ApiError.UNKNOWN;
+        const errMsg = (err instanceof Error)? err.message : err;
+        console.error("ApiError " + reason + ": " + errMsg);
+        process.exit(-1);
+    });

package/package.json

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