Merge pull request #34 from evs-broadcast/bugfix/fix_race_after_disconnect

Fix unhandled error

Author: thosil

device.js

@@ -278,7 +278,11 @@ DeviceTree.prototype.finishRequest = function () {
     self.callback = undefined;
     self.clearTimeout();
     self.activeRequest = null;
-    self.makeRequest();
+    try {
+        self.makeRequest();
+    } catch(e) {
+        console.log("warn:" + e.message)
+    }
 };
 
 DeviceTree.prototype.timeoutRequest = function (id) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "emberplus",
-  "version": "1.7.22",
+  "version": "1.7.23",
   "description": "Javascript implementation of the Ember+ automation protocol",
   "main": "index.js",
   "scripts": {
@@ -29,6 +29,7 @@
   },
   "devDependencies": {
     "eslint": "^5.5.0",
-    "jest": "^23.5.0"
+    "jest": "^23.5.0",
+    "sinon": "^7.4.1"
   }
 }

test/DeviceTree.test.js

@@ -1,4 +1,5 @@
 const fs = require("fs");
+const sinon = require("sinon");
 const Decoder = require('../').Decoder;
 const DeviceTree = require("../").DeviceTree;
 const TreeServer = require("../").TreeServer;
@@ -9,6 +10,7 @@ const PORT = 9008;
 
 describe("DeviceTree", () => {
     describe("With server", () => {
+        /** @type {TreeServer} */
         let server;
         beforeAll(() => {
             return Promise.resolve()
@@ -42,6 +44,26 @@ describe("DeviceTree", () => {
                 })
         });
 
+        it("should gracefully connect and getDirectory", () => {
+            let tree = new DeviceTree(LOCALHOST, PORT);
+            let stub = sinon.stub(tree.client, "sendBER");
+            stub.onFirstCall().returns();
+            stub.onSecondCall().throws(new Error("blah"));
+            stub.callThrough();
+            return Promise.resolve()
+                .then(() => tree.connect())
+                .then(() => {tree.getDirectory().catch(() => {})})
+                .then(() => tree.getDirectory())
+                .then(() => {
+                    stub.restore();
+                    tree.disconnect();
+                }, error => {
+                    stub.restore();
+                    tree.disconnect();
+                    throw error;
+                })
+
+        }, 10000);
         it("should not disconnect after 5 seconds of inactivity", () => {
             return Promise.resolve()
                 .then(() => {