Fix set() resolver

index.js

@@ -66,6 +66,8 @@ class TuyaDevice extends EventEmitter {
 
     this._currentSequenceN = 0;
     this._resolvers = {};
+
+    this._waitingForSetToResolve = false;
   }
 
   /**
@@ -195,12 +197,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(data => {
-          resolve(data);
-        });
+        this._send(buffer);
+
+        this._setResolver = resolve;
       } catch (error) {
         reject(error);
       }
@@ -405,6 +408,17 @@ class TuyaDevice extends EventEmitter {
      */
     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);

package.json

@@ -42,10 +42,11 @@
     "p-timeout": "3.1.0"
   },
   "devDependencies": {
-    "@tuyapi/stub": "0.1.2",
+    "@tuyapi/stub": "0.1.3",
     "ava": "1.4.1",
     "clone": "2.1.2",
     "coveralls": "3.0.3",
+    "delay": "4.2.0",
     "documentation": "9.3.1",
     "nyc": "13.3.0",
     "xo": "0.24.0"

test/find.js

@@ -1,13 +1,21 @@
 import test from 'ava';
 import TuyaStub from '@tuyapi/stub';
 import clone from 'clone';
+import delay from 'delay';
 
 const TuyAPI = require('..');
 
 const stub = new TuyaStub({id: '22325186db4a2217dc8e',
                            key: '4226aa407d5c1e2b',
                            state: {1: false, 2: true}});
 
+// You may notice that at the end of each test
+// there's a delay() before the function exits.
+// This is to prevent race conditions that can
+// occur in which a UDP broadcast lags after the
+// server is torn down and is captured by the
+// following test, skewing the results.
+
 test.serial('find device on network using deprecated resolveId', async t => {
   const stubDevice = new TuyAPI({id: '22325186db4a2217dc8e',
                                  key: '4226aa407d5c1e2b'});
@@ -21,6 +29,8 @@ test.serial('find device on network using deprecated resolveId', async t => {
   stubDevice.disconnect();
   thisStub.shutdown();
 
+  await delay(100);
+
   t.not(stubDevice.device.ip, undefined);
 });
 
@@ -37,6 +47,8 @@ test.serial('find device on network by ID', async t => {
   stubDevice.disconnect();
   thisStub.shutdown();
 
+  await delay(100);
+
   t.not(stubDevice.device.ip, undefined);
 });
 
@@ -53,6 +65,8 @@ test.serial('find device on network by IP', async t => {
   stubDevice.disconnect();
   thisStub.shutdown();
 
+  await delay(100);
+
   t.not(stubDevice.device.id, undefined);
 });
 
@@ -70,6 +84,8 @@ test.serial('find returns if both ID and IP are already set', async t => {
   stubDevice.disconnect();
   thisStub.shutdown();
 
+  await delay(100);
+
   t.is(true, result);
 });
 
@@ -81,10 +97,12 @@ test.serial('find throws timeout error', async t => {
   thisStub.startServer();
 
   await t.throwsAsync(() => {
-    return stubDevice.find({timeout: 1}).catch(error => {
+    return stubDevice.find({timeout: 1}).catch(async error => {
       stubDevice.disconnect();
       thisStub.shutdown();
 
+      await delay(100);
+
       throw error;
     });
   });
@@ -103,5 +121,7 @@ test.serial('find with option all', async t => {
   stubDevice.disconnect();
   thisStub.shutdown();
 
+  await delay(100);
+
   t.truthy(foundDevices.length);
 });