codetheweb
diff --git a/‎index.js‎
Lines changed: 20 additions & 62 deletions b/‎index.js‎
Lines changed: 20 additions & 62 deletions
diff --git a/‎lib/cipher.js‎
Lines changed: 22 additions & 22 deletions b/‎lib/cipher.js‎
Lines changed: 22 additions & 22 deletions
diff --git a/‎lib/crc.js‎
Lines changed: 86 additions & 0 deletions b/‎lib/crc.js‎
Lines changed: 86 additions & 0 deletions
@@ -2,7 +2,7 @@
 const dgram = require('dgram');
 const net = require('net');
 const {EventEmitter} = require('events');
-const timeout = require('p-timeout');
+const pTimeout = require('p-timeout');
 const pRetry = require('p-retry');
 const debug = require('debug')('TuyAPI');
 
@@ -31,41 +31,24 @@ const Parser = require('./lib/message-parser');
  *                              key: 'xxxxxxxxxxxxxxxx'})
  */
 class TuyaDevice extends EventEmitter {
-  constructor(options) {
+  constructor({ip, port = 6668, id, gwID = id, key, productKey, version = 3.1} = {}) {
     super();
 
     // Set device to user-passed options
-    this.device = options;
-
-    // Default version (necessary for later checks)
-    if (this.device.version === undefined) {
-      this.device.version = 3.1;
-    }
+    this.device = {ip, port, id, gwID, key, productKey, version};
 
     // Check arguments
-    if (!(this.checkIfValidString(this.device.id) ||
-          this.checkIfValidString(this.device.ip))) {
+    if (!(this.checkIfValidString(id) ||
+          this.checkIfValidString(ip))) {
       throw new TypeError('ID and IP are missing from device.');
     }
 
-    if (this.checkIfValidString(this.device.key) && this.device.key.length === 16) {
-      // Create cipher from key
-      this.device.cipher = new Cipher({
-        key: this.device.key,
-        version: this.device.version
-      });
-    } else {
+    if (!this.checkIfValidString(key) || key.length !== 16) {
       throw new TypeError('Key is missing or incorrect.');
     }
 
-    // Defaults
-    if (this.device.port === undefined) {
-      this.device.port = 6668;
-    }
-
-    if (this.device.gwID === undefined) {
-      this.device.gwID = this.device.id;
-    }
+    // Create cipher from key
+    this.device.cipher = new Cipher({key, version});
 
     // Contains array of found devices when calling .find()
     this.foundDevices = [];
@@ -100,10 +83,7 @@ class TuyaDevice extends EventEmitter {
    * @returns {Promise<Boolean|Object>}
    * returns boolean if single property is requested, otherwise returns object of results
    */
-  get(options) {
-    // Set empty object as default
-    options = options ? options : {};
-
+  get(options = {}) {
     const payload = {
       gwId: this.device.gwID,
       devId: this.device.id
@@ -195,8 +175,7 @@ class TuyaDevice extends EventEmitter {
     }
 
     // Get time
-    const now = new Date();
-    const timeStamp = (parseInt(now.getTime() / 1000, 10)).toString();
+    const timeStamp = parseInt(new Date() / 1000, 10);
 
     // Construct payload
     const payload = {
@@ -266,11 +245,6 @@ class TuyaDevice extends EventEmitter {
       throw new Error('No connection has been made to the device.');
     }
 
-    // Check for IP
-    if (typeof this.device.ip === 'undefined') {
-      throw new TypeError('Device missing IP address.');
-    }
-
     // Retry up to 5 times
     return pRetry(async () => {
       // Send data
@@ -492,11 +466,7 @@ class TuyaDevice extends EventEmitter {
    * `true` if is string and length != 0, `false` otherwise.
    */
   checkIfValidString(input) {
-    if (input === undefined || typeof input !== typeof 'string' || input.length === 0) {
-      return false;
-    }
-
-    return true;
+    return typeof input === 'string' && input.length > 0;
   }
 
   /**
@@ -523,15 +493,7 @@ class TuyaDevice extends EventEmitter {
    * @returns {Promise<Boolean|Array>}
    * true if ID/IP was found and device is ready to be used
    */
-  find(options) {
-    // Set default options
-    options = options ? options : {};
-
-    // Default timeout of 10 seconds
-    if (options.timeout === undefined) {
-      options.timeout = 10;
-    }
-
+  find({timeout = 10, all = false} = {}) {
     if (this.checkIfValidString(this.device.id) &&
         this.checkIfValidString(this.device.ip)) {
       // Don't need to do anything
@@ -546,7 +508,7 @@ class TuyaDevice extends EventEmitter {
     debug(`Finding missing IP ${this.device.ip} or ID ${this.device.id}`);
 
     // Find IP for device
-    return timeout(new Promise((resolve, reject) => { // Timeout
+    return pTimeout(new Promise((resolve, reject) => { // Timeout
       listener.on('message', message => {
         debug('Received UDP message.');
 
@@ -569,19 +531,15 @@ class TuyaDevice extends EventEmitter {
           this.foundDevices.push({id: thisID, ip: thisIP});
         }
 
-        if (!options.all &&
+        if (!all &&
             (this.device.id === thisID || this.device.ip === thisIP) &&
             dataRes.data) {
           // Add IP
           this.device.ip = dataRes.data.ip;
 
-          // Add ID
+          // Add ID and gwID
           this.device.id = dataRes.data.gwId;
-
-          // Update gwID if required
-          if (this.device.gwID === undefined) {
-            this.device.gwID = dataRes.data.gwId;
-          }
+          this.device.gwID = dataRes.data.gwId;
 
           // Change product key if neccessary
           this.device.productKey = dataRes.data.productKey;
@@ -599,13 +557,13 @@ class TuyaDevice extends EventEmitter {
       listener.on('error', err => {
         reject(err);
       });
-    }), options.timeout * 1000, () => {
+    }), timeout * 1000, () => {
       // Have to do this so we exit cleanly
       listener.close();
       listener.removeAllListeners();
 
       // Return all devices
-      if (options.all) {
+      if (all) {
         return this.foundDevices;
       }
 
@@ -620,8 +578,8 @@ class TuyaDevice extends EventEmitter {
    * @param {Number} [property=1] property to toggle
    * @returns {Promise<Boolean>} the resulting state
    */
-  async toggle(property) {
-    property = property === undefined ? '1' : property.toString();
+  async toggle(property = '1') {
+    property = property.toString();
 
     try {
       // Get status
 
@@ -1,4 +1,4 @@
-const forge = require('node-forge');
+const crypto = require('crypto');
 
 /**
 * Class for encrypting and decrypting payloads.
@@ -12,8 +12,7 @@ const forge = require('node-forge');
 */
 class TuyaCipher {
   constructor(options) {
-    this.cipher = forge.cipher.createCipher('AES-ECB', options.key);
-    this.decipher = forge.cipher.createDecipher('AES-ECB', options.key);
+    this.key = options.key;
     this.version = options.version;
   }
 
@@ -27,15 +26,17 @@ class TuyaCipher {
   * @returns {Buffer|String} returns Buffer unless options.base64 is true
   */
   encrypt(options) {
-    this.cipher.start({iv: ''});
-    this.cipher.update(forge.util.createBuffer(options.data, 'utf8'));
-    this.cipher.finish();
+    const cipher = crypto.createCipheriv('aes-128-ecb', this.key, '');
 
-    if (options.base64 !== false) {
-      return forge.util.encode64(this.cipher.output.data);
+    let encrypted = cipher.update(options.data, 'utf8', 'base64');
+    encrypted += cipher.final('base64');
+
+    // Default base64 enable
+    if (options.base64 === false) {
+      return Buffer.from(encrypted, 'base64');
     }
 
-    return this.cipher.output.data;
+    return encrypted;
   }
 
   /**
@@ -45,24 +46,23 @@ class TuyaCipher {
   * returns object if data is JSON, else returns string
   */
   decrypt(data) {
+    // Incoming data format
+    let format = 'buffer';
+
     if (data.indexOf(this.version.toString()) !== -1) {
       // Data has version number and is encoded in base64
 
       // Remove prefix of version number and MD5 hash
       data = data.slice(19);
 
-      // Decode data
-      data = forge.util.decode64(data);
+      // Decode incoming data as base64
+      format = 'base64';
     }
 
-    // Turn data into Buffer
-    data = forge.util.createBuffer(data);
-
-    this.decipher.start({iv: ''});
-    this.decipher.update(data);
-    this.decipher.finish();
-
-    const result = this.decipher.output.data;
+    // Decrypt data
+    const decipher = crypto.createDecipheriv('aes-128-ecb', this.key, '');
+    let result = decipher.update(data, format, 'utf8');
+    result += decipher.final('utf8');
 
     // Try to parse data as JSON,
     // otherwise return as string.
@@ -76,11 +76,11 @@ class TuyaCipher {
   /**
   * Calculates a MD5 hash.
   * @param {String} data to hash
-  * @returns {String} last 8 characters of hash of data
+  * @returns {String} characters 8 through 16 of hash of data
   */
   md5(data) {
-    const md5hash = forge.md.md5.create().update(data).digest().toHex();
-    return md5hash.toString().toLowerCase().substr(8, 16);
+    const md5hash = crypto.createHash('md5').update(data, 'utf8').digest('hex');
+    return md5hash.substr(8, 16);
   }
 }
 module.exports = TuyaCipher;
@@ -0,0 +1,86 @@
+/* Reverse engineered by kueblc */
+
+/* eslint-disable array-element-newline */
+const crc32Table = [
+  0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
+  0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
+  0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
+  0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
+  0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
+  0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+  0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
+  0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
+  0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
+  0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
+  0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
+  0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+  0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
+  0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
+  0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
+  0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
+  0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
+  0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+  0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
+  0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
+  0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
+  0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
+  0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
+  0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+  0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
+  0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
+  0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
+  0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
+  0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
+  0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+  0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
+  0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
+  0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
+  0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
+  0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
+  0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+  0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
+  0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
+  0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
+  0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
+  0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
+  0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+  0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
+  0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
+  0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+  0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
+  0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
+  0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+  0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
+  0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
+  0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
+  0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
+  0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
+  0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+  0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
+  0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
+  0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
+  0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
+  0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
+  0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+  0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
+  0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
+  0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+  0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
+];
+
+/**
+* Computes a Tuya flavored CRC32
+* @param {Iterable} data
+* @returns {Number} Tuya CRC32
+*/
+function crc32(bytes) {
+  let crc = 0xFFFFFFFF;
+
+  for (const b of bytes) {
+    crc = (crc >>> 8) ^ crc32Table[(crc ^ b) & 255];
+  }
+
+  return crc ^ 0xFFFFFFFF;
+}
+
+module.exports = crc32;