Improve behavior after connection drops, bump dependencies (TuyaAPI#32)

Improve behavior after connection drops, bump dependencies

Author: codetheweb

package-lock.json

@@ -33,13 +33,13 @@
   "license": "MIT",
   "devDependencies": {
     "@types/debug": "4.1.5",
-    "@typescript-eslint/eslint-plugin": "2.3.2",
-    "@typescript-eslint/parser": "2.3.2",
+    "@typescript-eslint/eslint-plugin": "2.12.0",
+    "@typescript-eslint/parser": "2.12.0",
     "babel-cli": "6.26.0",
     "babel-preset-env": "1.7.0",
-    "eslint-config-xo-typescript": "0.19.0",
-    "husky": "3.0.8",
-    "typescript": "3.6.3",
+    "eslint-config-xo-typescript": "0.23.0",
+    "husky": "3.1.0",
+    "typescript": "3.7.3",
     "xo": "0.25.3"
   },
   "xo": {

package.json

@@ -26,7 +26,7 @@ class Device extends EventEmitter implements Device {
   private _lastHeartbeat: Date;
 
   constructor({ip, id, gwId = id, key, version = 3.1, port = 6668}: {
-    ip: string; port: number; key: string; id: string; gwId: string; version: number;
+    ip: string; port?: number; key: string; id: string; gwId?: string; version?: number;
   }) {
     super();
 
@@ -69,6 +69,9 @@ class Device extends EventEmitter implements Device {
     // Connect to device
     this._log('Connecting...');
     this._socket.connect(this.port, this.ip);
+
+    // TODO: we should probably set a timeout on connect. Otherwise we just rely
+    // on TCP to retry sending SYN packets.
   }
 
   disconnect(): void {
@@ -144,6 +147,11 @@ class Device extends EventEmitter implements Device {
 
     this.emit('connect');
 
+    this._lastHeartbeat = new Date();
+
+    // Fetch default property
+    this.update();
+
     // Start heartbeat pings
     this._recursiveHeartbeat();
   }
@@ -152,6 +160,8 @@ class Device extends EventEmitter implements Device {
     this.connected = false;
 
     this._log('Disconnected.');
+
+    this.emit('disconnected');
   }
 
   private _handleSocketData(data: Buffer): void {

src/device.ts

@@ -0,0 +1,52 @@
+import {EventEmitter} from 'events';
+import * as dgram from 'dgram';
+import Messenger from './lib/messenger';
+
+class Find extends EventEmitter {
+  private readonly _messenger: Messenger;
+  private readonly _listener: dgram.Socket;
+  private readonly _listenerEncrypted: dgram.Socket;
+
+  constructor() {
+    super();
+
+    this._messenger = new Messenger({key: '', version: 0});
+
+    this._listener = dgram.createSocket({type: 'udp4', reuseAddr: true});
+    this._listenerEncrypted = dgram.createSocket({type: 'udp4', reuseAddr: true});
+
+    this._listener.on('message', this._broadcastHandler.bind(this));
+
+    this._listenerEncrypted.on('message', this._broadcastHandler.bind(this));
+  }
+
+  start(): void {
+    this._listener.bind(6666);
+    this._listenerEncrypted.bind(6667);
+  }
+
+  stop(): void {
+    this._listener.close();
+    this._listener.removeAllListeners();
+    this._listenerEncrypted.close();
+    this._listenerEncrypted.removeAllListeners();
+  }
+
+  private _broadcastHandler(message: Buffer): void {
+    try {
+      const frame = this._messenger.decode(message);
+
+      const payload = JSON.parse(frame.payload.toString('ascii'));
+
+      this.emit('broadcast', payload);
+    } catch (error) {
+      console.log(error);
+      // It's possible another application is
+      // using ports 6666 or 6667, so we shouldn't
+      // throw on failure.
+      this.emit('error', error);
+    }
+  }
+}
+
+export default Find;

src/find.ts

@@ -4,11 +4,12 @@ import 'core-js/stable';
 import 'regenerator-runtime/runtime';
 
 import Device from './device';
+import Find from './find';
 
 import * as Constants from './lib/constants';
 import crc from './lib/crc';
 import * as crypto from './lib/crypto';
 import Frame from './lib/frame';
 import Messenger from './lib/messenger';
 
-export {Device, Constants, crc, crypto, Frame, Messenger};
+export {Device, Find, Constants, crc, crypto, Frame, Messenger};

src/index.ts

@@ -59,8 +59,14 @@ class Messenger extends EventEmitter {
     // Absent in messages sent to device
     const returnCode = packet.readUInt32BE(16);
 
-    // Get the payload
-    let payload = packet.slice(HEADER_SIZE + 4, HEADER_SIZE + payloadSize - 8);
+    // Get the payloads
+    let offset = HEADER_SIZE;
+
+    if (returnCode === 0) {
+      offset = HEADER_SIZE + 4;
+    }
+
+    let payload = packet.slice(offset, offset + payloadSize - 8);
 
     // Check CRC
     const expectedCrc = packet.readInt32BE(HEADER_SIZE + payloadSize - 8);