Merge pull request #105 from Shaquu/dev

Remove modified handleUnpair due to reasons in #22
NRCHKB · Apr 25, 2019 · 82db873 · 82db873
2 parents ae45875 + 88508b2
commit 82db873
Show file tree

Hide file tree

Showing 5 changed files with 623 additions and 2,224 deletions.
diff --git a/lib/HAPBridgeNode.js b/lib/HAPBridgeNode.js
@@ -8,7 +8,6 @@ module.exports = function(RED) {
     const uuid = HapNodeJS.uuid;
 
     const MdnsUtils = require("./utils/MdnsUtils.js")();
-    const ServerUtils = require("./utils/ServerUtils.js")();
 
     const init = function (config) {
         RED.nodes.createNode(this, config);
@@ -95,9 +94,6 @@ module.exports = function(RED) {
                 self.allowInsecureRequest
             );
 
-            bridge._server.removeAllListeners("unpair");
-            bridge._server.on("unpair", ServerUtils.handleUnpair.bind(bridge));
-
             self.published = true;
         };
 

diff --git a/lib/utils/ServerUtils.js b/lib/utils/ServerUtils.js
diff --git a/lib/utils/index.js b/lib/utils/index.js
@@ -4,14 +4,12 @@ module.exports = function (node) {
     const AccessoryUtils = require("./AccessoryUtils.js")(node);
     const CharacteristicUtils = require("./CharacteristicUtils.js")(node);
     const MdnsUtils = require("./MdnsUtils.js")();
-    const ServerUtils = require("./ServerUtils.js")();
 
     return {
         ServiceUtils: ServiceUtils,
         BridgeUtils: BridgeUtils,
         AccessoryUtils: AccessoryUtils,
         CharacteristicUtils: CharacteristicUtils,
-        MdnsUtils: MdnsUtils,
-        ServerUtils: ServerUtils
+        MdnsUtils: MdnsUtils
     };
 };