codetheweb · codetheweb · Jun 1, 2019 · Feb 26, 2019 · Feb 26, 2019 · Feb 27, 2019
diff --git a/docs/index.html b/docs/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset='utf-8' />
-  <title>tuyapi 4.0.4 | Documentation</title>
+  <title>tuyapi 4.0.3 | Documentation</title>
   <meta name='description' content='An easy-to-use API for devices that use Tuya&#39;s cloud services'>
   <meta name='viewport' content='width=device-width,initial-scale=1'>
   <link href='assets/bass.css' rel='stylesheet' />
@@ -15,7 +15,7 @@
       <div id='split-left' class='overflow-auto fs0 height-viewport-100'>
         <div class='py1 px2'>
           <h3 class='mb0 no-anchor'>tuyapi</h3>
-          <div class='mb1'><code>4.0.4</code></div>
+          <div class='mb1'><code>4.0.3</code></div>
           <input
             placeholder='Filter'
             id='filter-input'
@@ -125,6 +125,16 @@ <h3 class='mb0 no-anchor'>tuyapi</h3>
                 </li>
 
 
+                <li><a
+                  href='#eventtuyadevicedata'
+                  class="">
+                  TuyaDevice#data
+
+                </a>
+
+                </li>
+
+
                 <li><a
                   href='#eventtuyadevicedisconnected'
                   class="">
@@ -1180,6 +1190,81 @@ <h3 class='fl m0' id='eventtuyadevicedata'>
 
 
 
+</section>
+
+
+
+
+          <section class='p2 mb2 clearfix bg-white minishadow'>
+
+
+  <div class='clearfix'>
+
+    <h3 class='fl m0' id='eventtuyadevicedata'>
+      TuyaDevice#data
+    </h3>
+
+
+  </div>
+
+
+  <p>Emitted when data is returned from device.</p>
+
+    <div class='pre p1 fill-light mt0'>TuyaDevice#data</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <div class='py1 quiet mt1 prose-big'>Properties</div>
+    <div>
+
+        <div class='space-bottom0'>
+          <span class='code bold'>data</span> <code class='quiet'>(<a href="https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object">Object</a>)</code>
+          : received data
+
+
+        </div>
+
+        <div class='space-bottom0'>
+          <span class='code bold'>commandByte</span> <code class='quiet'>(<a href="https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number">Number</a>)</code>
+          : commandByte of result
+(e.g. 7=requested response, 8=proactive update from device)
+
+
+        </div>
+
+        <div class='space-bottom0'>
+          <span class='code bold'>sequenceN</span> <code class='quiet'>(<a href="https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number">Number</a>)</code>
+          : the packet sequence number
+
+
+        </div>
+
+    </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 </section>
 
 

diff --git a/index.js b/index.js
@@ -61,6 +61,11 @@ class TuyaDevice extends EventEmitter {
     this._responseTimeout = 5; // Seconds
     this._connectTimeout = 5; // Seconds
     this._pingPongPeriod = 10; // Seconds
+
+    this._currentSequenceN = 0;
+    this._resolvers = {};
+
+    this._waitingForSetToResolve = false;
   }
 
   /**
@@ -209,22 +214,13 @@ class TuyaDevice extends EventEmitter {
     });
 
     // Send request and wait for response
+    this._waitingForSetToResolve = true;
     return new Promise((resolve, reject) => {
       try {
         // Send request
-        this._send(buffer).then(() => {
-          // Runs when data event is emitted
-          const resolveSet = _ => {
-            // Remove self listener
-            this.removeListener('data', resolveSet);
+        this._send(buffer);
 
-            // Return true
-            resolve(true);
-          };
-
-          // Add listener to data event
-          this.on('data', resolveSet);
-        });
+        this._setResolver = resolve;
       } catch (error) {
         reject(error);
       }
@@ -264,7 +260,8 @@ class TuyaDevice extends EventEmitter {
     // Create byte buffer
     const buffer = Parser.encode({
       data: Buffer.allocUnsafe(0),
-      commandByte: 9 // 0x09
+      commandByte: CommandType.HEART_BEAT,
+      sequenceN: ++this._currentSequenceN
     });
 
     // Send ping
@@ -427,6 +424,49 @@ class TuyaDevice extends EventEmitter {
     return Promise.resolve(true);
   }
 
+  _packetHandler(packet) {
+    // Response was received, so stop waiting
+    clearTimeout(this._sendTimeout);
+
+    if (packet.commandByte === CommandType.HEART_BEAT) {
+      debug(`Pong from ${this.device.ip}`);
+
+      // Remove resolver
+      delete this._resolvers[packet.sequenceN];
+      return;
+    }
+
+    /**
+     * Emitted when data is returned from device.
+     * @event TuyaDevice#data
+     * @property {Object} data received data
+     * @property {Number} commandByte
+     * commandByte of result
+     * (e.g. 7=requested response, 8=proactive update from device)
+     * @property {Number} sequenceN the packet sequence number
+     */
+    this.emit('data', packet.payload, packet.commandByte, packet.sequenceN);
+
+    // Status response to SET command
+    if (packet.sequenceN === 0 &&
+        packet.commandByte === CommandType.STATUS &&
+        this._waitingForSetToResolve) {
+      this._setResolver(packet.payload);
+
+      // Remove resolver
+      this._setResolver = undefined;
+      return;
+    }
+
+    // Call data resolver for sequence number
+    if (packet.sequenceN in this._resolvers) {
+      this._resolvers[packet.sequenceN](packet.payload);
+
+      // Remove resolver
+      delete this._resolvers[packet.sequenceN];
+    }
+  }
+
   /**
    * Disconnects from the device, use to
    * close the socket and exit gracefully.

diff --git a/lib/message-parser.js b/lib/message-parser.js
@@ -136,7 +136,7 @@ function encode(options) {
 
   // Add payload, crc, and suffix
   payload.copy(buffer, 16);
-  buffer.writeInt32BE(crc(payload), payload.length + 16);
+  buffer.writeInt32BE(crc(buffer.slice(0, payload.length + 16)), payload.length + 16);
   buffer.writeUInt32BE(0x0000AA55, payload.length + 20);
 
   return buffer;