@eiannone/tesla-api 1.8.0 → 1.10.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,19 @@ 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);
         return new Promise((resolve, reject) => {
+            const postData = JSON.stringify(params);
             const req = request(BASE_URL + '/oauth/token', {
                 headers: { 
                     'user-agent': "TeslaEma",
                     'Content-Type': 'application/json',
-                    'Content-Length': post_data.length
+                    'Content-Length': postData.length
                 },
                 timeout: 30000,
                 method: 'POST'
@@ -157,7 +165,7 @@ class TeslaApi {
                 // - ENOTFOUND
                 reject(new ApiError(e.message + " ("+e.code+")", ApiError.NETWORK));
             });
-            req.write(post_data);
+            req.write(postData);
             req.end();
         });s
     }

package/TeslaStream.js

@@ -104,12 +104,12 @@ export default class TeslaStream extends EventEmitter {
         clearTimeout(this.checkTimeout);
         if (this.disconnects % 10 == 0) {
             this.log("Too many disconnects!", "warn");
-            this.emit('too-many-diconnects');
+            this.emit('too-many-disconnects');
         }
         else {
             const ms = (this.lastShiftState != null && this.lastShiftState != "")?
                 this.#expBackOffMs(this.disconnects, 0, 8, 1.3) :
-                this.#expBackOffMs(this.disconnects, minDelay, 60); // Teslamate uses min 15, max 30
+                this.#expBackOffMs(this.disconnects, minDelay, 120); // Teslamate uses min 15, max 30
             this.log("Waiting for " + Math.round(ms / 1000) + " sec...");                            
             this.checkTimeout = setTimeout(_ => { this.#subscribe(tag, token); }, ms);
         }        
@@ -138,15 +138,10 @@ export default class TeslaStream extends EventEmitter {
             this.log("Websocket open.");
             this.#subscribe(this.tag, token);
         });
-        this.ws.on('message', (data, isBinary) => {
-            if (isBinary) {
-                this.log("Binary data received. Ignored.");
-                return;
-            }
+        this.ws.on('message', (message) => {
             if (this.checkTimeout != null) clearTimeout(this.checkTimeout);
             this.checkTimeout = setTimeout(this.#timeout.bind(this), 15000);
-
-            const message = data.toString();
+            
             let d = JSON.parse(message);
             if (d.msg_type == 'control:hello') {
                 this.log("Hello response received.");
@@ -163,12 +158,13 @@ export default class TeslaStream extends EventEmitter {
                         this.#disconnectResubscribe(tag, token, "Vehicle disconnected", resubscribeDelay);
                         break;
                     case "vehicle_error":
+                        if (d.value == 'Vehicle is offline') this.emit('offline');
                         this.#disconnectResubscribe(tag, token, "Vehicle error: " + d.value, resubscribeDelay);
                         break;
                     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");
@@ -184,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.toString() : '') + ").");
+            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/package.json

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