@eiannone/tesla-api 1.7.0 → 1.8.1

package/TeslaStream.js

@@ -10,6 +10,7 @@ export default class TeslaStream extends EventEmitter {
     static DEFAULT_COLUMNS = ['elevation', 'est_heading', 'est_lat', 'est_lng', 'odometer', 'power', 'shift_state', 'speed', 'soc'];
 
     constructor(logger = null) {
+        super();
         this.log = logger || this.#internalLog;
         this.ws = null;
         this.state = CLOSED;
@@ -30,6 +31,10 @@ export default class TeslaStream extends EventEmitter {
         return this.state == CLOSED;
     }
 
+    isClosing() {
+        return this.state == CLOSING;
+    }    
+
     #internalLog(msg, level = 'debug') {
         console.log("[%s] %s", level, msg);
     }
@@ -115,12 +120,16 @@ export default class TeslaStream extends EventEmitter {
         if (columns != null) this.columns = columns;        
         let shiftStatePos = this.columns.indexOf('shift_state');
 
-        if (this.ws != null && this.ws.readyState != WebSocket.CLOSED) return;
+        if (this.ws != null) {
+            if (this.state == CLOSING) this.reconnect = true;
+            if (this.ws.readyState != WebSocket.CLOSED) return;
+        }
         this.state = CONNECTING;
         this.log("Connecting to websocket...");
         this.ws = new WebSocket("wss://streaming.vn.teslamotors.com/streaming/", {
             perMessageDeflate: false,
-            handshakeTimeout: 6000
+            handshakeTimeout: 6000,
+            skipUTF8Validation: true
         });
         if (this.checkTimeout != null) clearTimeout(this.checkTimeout);
         this.checkTimeout = setTimeout(this.#timeout.bind(this), this.#expBackOffMs(this.timeouts, 10, 30));
@@ -129,11 +138,11 @@ export default class TeslaStream extends EventEmitter {
             this.log("Websocket open.");
             this.#subscribe(this.tag, token);
         });
-        this.ws.on('message', (data) => {
+        this.ws.on('message', (message) => {
             if (this.checkTimeout != null) clearTimeout(this.checkTimeout);
             this.checkTimeout = setTimeout(this.#timeout.bind(this), 15000);
-
-            let d = JSON.parse(data);
+            
+            let d = JSON.parse(message);
             if (d.msg_type == 'control:hello') {
                 this.log("Hello response received.");
                 this.state = CONNECTED;
@@ -161,16 +170,16 @@ export default class TeslaStream extends EventEmitter {
                         break;
                 }                
             } else {
-                this.log("Unknown message: " + data, "error");
-                this.emit('error', data);
+                this.log("Unknown message: " + message, "error");
+                this.emit('error', message);
             }
         });
-        this.ws.on('error', (error) => {
+        this.ws.on('error', error => {
             const errMsg = (error instanceof Error)? error.message : error;
             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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eiannone/tesla-api",
-    "version": "1.7.0",
+    "version": "1.8.1",
     "description": "Nodejs Tesla API",
     "type": "module",
     "main": "index.js",
@@ -8,6 +8,6 @@
     "license": "MIT",
     "repository": "eiannone/tesla-api",
     "dependencies": {
-        "ws": "^7.4.2"
+        "ws": "^8.2.3"
     }
 }