From 66ea6e640da9da38ac11216b24309ea713d4f5cc Mon Sep 17 00:00:00 2001 From: Khaos Tian Date: Mon, 26 Sep 2016 14:15:12 -0700 Subject: [PATCH] Minor Tweak --- lib/platformAccessory.js | 5 +++++ lib/server.js | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/platformAccessory.js b/lib/platformAccessory.js index 0084c69..382ef0d 100644 --- a/lib/platformAccessory.js +++ b/lib/platformAccessory.js @@ -140,6 +140,11 @@ PlatformAccessory.prototype.configureCameraSource = function(cameraSource) { PlatformAccessory.prototype._prepareAssociatedHAPAccessory = function () { this._associatedHAPAccessory = new Accessory(this.displayName, this.UUID); + + if (this.cameraSource) { + this._associatedHAPAccessory.configureCameraSource(this.cameraSource); + } + this._associatedHAPAccessory._sideloadServices(this.services); this._associatedHAPAccessory.category = this.category; this._associatedHAPAccessory.reachable = this.reachable; diff --git a/lib/server.js b/lib/server.js index 5a0b612..5e98e3c 100644 --- a/lib/server.js +++ b/lib/server.js @@ -462,12 +462,14 @@ Server.prototype._handleUnregisterPlatformAccessories = function(accessories) { } Server.prototype._handlePublishCameraAccessories = function(accessories) { + var accessoryPin = (this._config.bridge || {}).pin || "031-45-154"; + for (var index in accessories) { var accessory = accessories[index]; accessory._prepareAssociatedHAPAccessory(); var hapAccessory = accessory._associatedHAPAccessory; - var advertiseAddress = mac.generate(accessory.uuid); + var advertiseAddress = mac.generate(accessory.UUID); if (this._publishedCameras[advertiseAddress]) { throw new Error("Camera accessory %s experienced an address collision.", accessory.displayName); @@ -475,9 +477,13 @@ Server.prototype._handlePublishCameraAccessories = function(accessories) { this._publishedCameras[advertiseAddress] = accessory; } + hapAccessory.on('listening', function(port) { + log.info("%s is running on port %s.", accessory.displayName, port); + }); + hapAccessory.publish({ username: advertiseAddress, - pincode: bridgeConfig.pin || "031-45-154", + pincode: accessoryPin, category: accessory.category }, this._allowInsecureAccess); }