Bonjour Fixed

mhabedinpour · Jul 13, 2017 · f3eec67 · f3eec67
1 parent 747e4a3
commit f3eec67
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -62,3 +62,6 @@ typings/
 
 # Samples JSON Configuration Files
 samples/*.json
+
+#HAP Specification
+HAP-Specification-Non-Commercial-Version.pdf
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "has-node",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Homekit Accessory Server",
   "main": "app.js",
   "scripts": {

diff --git a/samples/fan+temperatureSensor.js b/samples/fan+temperatureSensor.js
@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var HAS = require("../");
-var config = new HAS.Config('NodeJS Fan+TemperatureSensor', '83:E6:B6:63:BC:2C', HAS.categories.fan, __dirname + '/fan+temperatureSensor.json', 8091, '200-20-200');
+var config = new HAS.Config('NodeJS Fan+TemperatureSensor', '83:E6:B6:63:BC:2C', HAS.categories.fan, __dirname + '/fan+temperatureSensor.json', 8097, '200-20-200');
 var server = new HAS.Server(config);
 var fan = new HAS.Accessory(1);
 var fanIdentify = HAS.predefined.Identify(1, undefined, function (value, callback) {

diff --git a/samples/fan+temperatureSensor.ts b/samples/fan+temperatureSensor.ts
@@ -6,7 +6,7 @@
 
 import * as HAS from '../';
 
-let config = new HAS.Config('NodeJS Fan+TemperatureSensor', '83:E6:B6:63:BC:2C', HAS.categories.fan, __dirname + '/fan+temperatureSensor.json', 8091, '200-20-200');
+let config = new HAS.Config('NodeJS Fan+TemperatureSensor', '83:E6:B6:63:BC:2C', HAS.categories.fan, __dirname + '/fan+temperatureSensor.json', 8097, '200-20-200');
 
 let server = new HAS.Server(config);
 

diff --git a/src/HAS.js b/src/HAS.js
@@ -22,6 +22,7 @@ var HAS = (function () {
         var _this = this;
         if (Object.keys(this.accessories).length <= 0)
             throw new Error('Server must have at least one accessory.');
+        this.config.increaseCCN(false);
         this.updateBonjour();
         this.HTTPServer.timeout = 0;
         this.HTTPServer.listen(0);
@@ -33,7 +34,6 @@ var HAS = (function () {
             console.log("TCP Server Listening on " + _this.config.TCPPort);
         });
         this.isRunning = true;
-        this.config.increaseCCN(false);
     };
     HAS.prototype.stopServer = function () {
         if (this.bonjourService)
@@ -45,20 +45,22 @@ var HAS = (function () {
         this.isRunning = false;
     };
     HAS.prototype.updateBonjour = function () {
-        var _this = this;
-        setTimeout(function () {
-            if (_this.bonjourService)
-                _this.bonjourService.stop();
-            _this.bonjourService = _this.bonjour.publish({
-                name: _this.config.deviceName,
+        if (!this.bonjourService) {
+            this.bonjourService = this.bonjour.publish({
+                name: this.config.deviceName,
                 type: 'hap',
-                port: _this.config.TCPPort,
-                txt: _this.config.getTXTRecords(),
+                port: this.config.TCPPort,
+                txt: this.config.getTXTRecords(),
             });
-            _this.bonjourService.on('up', function () {
+            this.bonjourService.on('up', function () {
                 console.log('Bonjour is up');
             });
-        }, this.bonjourService ? 60000 : 0);
+        }
+        else {
+            this.bonjourService.txt = this.config.getTXTRecords();
+            this.bonjour._server.unregister(this.bonjourService._records());
+            this.bonjour._server.register(this.bonjourService._records());
+        }
     };
     HAS.prototype.addAccessory = function (accessory) {
         var accessoryID = accessory.getID();

diff --git a/src/HAS.ts b/src/HAS.ts
@@ -102,6 +102,8 @@ export default class HAS {
         if (Object.keys(this.accessories).length <= 0)
             throw new Error('Server must have at least one accessory.');
 
+        this.config.increaseCCN(false);
+
         this.updateBonjour();
 
         this.HTTPServer.timeout = 0; //TCP connection should stay open as lang as it wants to
@@ -116,8 +118,6 @@ export default class HAS {
         });
 
         this.isRunning = true;
-
-        this.config.increaseCCN(false);
     }
 
     /**
@@ -138,9 +138,8 @@ export default class HAS {
      * @method Publishes Bonjour service
      */
     public updateBonjour() {
-        setTimeout(() => {
-            if (this.bonjourService)
-                this.bonjourService.stop();
+        if (!this.bonjourService) {
+            //Publish new service
             this.bonjourService = this.bonjour.publish({
                 name: this.config.deviceName,
                 type: 'hap',
@@ -150,7 +149,12 @@ export default class HAS {
             this.bonjourService.on('up', () => {
                 console.log('Bonjour is up');
             });
-        }, this.bonjourService ? 60000 : 0);
+        } else {
+            //Update existing server TXT records
+            this.bonjourService.txt = this.config.getTXTRecords();
+            this.bonjour._server.unregister(this.bonjourService._records());
+            this.bonjour._server.register(this.bonjourService._records());
+        }
     }
 
     /**

diff --git a/src/TCP.ts b/src/TCP.ts
@@ -129,9 +129,9 @@ export default class TCP extends EventEmitter {
                     }
                 }
                 data = result;
-                //console.log(data.toString('ascii'));
             }
             let {firstLine, rest} = this.readAndDeleteFirstLineOfBuffer(data);
+            //console.log(data.toString('ascii'));
             this.write(Buffer.concat([firstLine, delimiter, Buffer.from(`X-Real-Socket-ID: ${socket.ID}`, 'ascii'), delimiter, rest]));
         });