diff --git a/index.js b/index.js index 5618d73..4c43072 100644 --- a/index.js +++ b/index.js @@ -469,6 +469,7 @@ class TuyaDevice extends EventEmitter { * @private * @param {Buffer} buffer buffer of data * @returns {Promise} returned data for request + * (`undefined` if no matching response arrived in time) */ _send(buffer) { const sequenceNo = this._currentSequenceN; @@ -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); } diff --git a/test/stub.js b/test/stub.js index dab6312..ddac325 100644 --- a/test/stub.js +++ b/test/stub.js @@ -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); +});