Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,7 @@ class TuyaDevice extends EventEmitter {
* @private
* @param {Buffer} buffer buffer of data
* @returns {Promise<any>} returned data for request
* (`undefined` if no matching response arrived in time)
*/
_send(buffer) {
const sequenceNo = this._currentSequenceN;
Expand All @@ -480,8 +481,26 @@ class TuyaDevice extends EventEmitter {
try {
this.client.write(buffer);

// Some devices (e.g. protocol 3.5) answer with a different
// sequence number, so the resolver would never be called or
// deleted and pending requests would pile up in memory.
// Remove it after a while; the data is still emitted as `data` event.
const timeout = setTimeout(() => {
if (this._resolvers[sequenceNo] === resolver) {
debug(`No response for sequence number ${sequenceNo}, removing resolver`);
delete this._resolvers[sequenceNo];
resolve();
}
}, this._responseTimeout * 5000);
timeout.unref();

// Add resolver function
this._resolvers[sequenceNo] = data => resolve(data);
const resolver = data => {
clearTimeout(timeout);
resolve(data);
};

this._resolvers[sequenceNo] = resolver;
} catch (error) {
reject(error);
}
Expand Down
38 changes: 38 additions & 0 deletions test/stub.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,41 @@ test('can reconnect if device goes offline', async t => {

t.pass();
});

test.serial('pending request is cleaned up if no matching response arrives', async t => {
const device = new TuyAPI({id: '22325186db4a2217dc8e',
key: '4226aa407d5c1e2b',
ip: 'localhost'});

// Simulate a device that answers with a different sequence number
device._responseTimeout = 0.01;
device.connect = () => Promise.resolve(true);
device.client = {write: () => {}};

// The cleanup timer is unref'd, keep the event loop busy meanwhile
const keepAlive = setTimeout(() => {}, 1000);
const result = await device._send(Buffer.from('test'));
clearTimeout(keepAlive);

t.is(result, undefined);
t.deepEqual(device._resolvers, {});
});

test.serial('pending request still resolves with matching response', async t => {
const device = new TuyAPI({id: '22325186db4a2217dc8e',
key: '4226aa407d5c1e2b',
ip: 'localhost'});

device._responseTimeout = 0.05;
device.connect = () => Promise.resolve(true);
device.client = {write: () => {}};

const request = device._send(Buffer.from('test'));
await delay(10);

const payload = {dps: {1: true}};
device._resolvers[device._currentSequenceN](payload);

t.is(await request, payload);
await delay(100);
});