mtan93/homebridge
1
0
Fork 0
mirror of https://github.com/mtan93/homebridge.git synced 2026-03-08 05:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into plugin-2

Browse Source
This commit is contained in:
Khaos Tian
2016-02-17 10:41:32 -08:00
parent 8e360491cf 287aa6d034
commit d3c77a4cda
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/cli.js
View File

@@ -10,15 +10,18 @@ var log = require("./logger")._system;
module.exports = function() { module.exports = function() {
var insecureAccess = false;
program program
.version(version) .version(version)
.option('-P, --plugin-path [path]', 'look for plugins installed at [path] as well as the default locations ([path] can also point to a single plugin)', function(p) { Plugin.addPluginPath(p); }) .option('-P, --plugin-path [path]', 'look for plugins installed at [path] as well as the default locations ([path] can also point to a single plugin)', function(p) { Plugin.addPluginPath(p); })
.option('-U, --user-storage-path [path]', 'look for homebridge user files at [path] instead of the default location (~/.homebridge)', function(p) { User.setStoragePath(p); }) .option('-U, --user-storage-path [path]', 'look for homebridge user files at [path] instead of the default location (~/.homebridge)', function(p) { User.setStoragePath(p); })
.option('-D, --debug', 'turn on debug level logging', function() { require('./logger').setDebugEnabled(true) }) .option('-D, --debug', 'turn on debug level logging', function() { require('./logger').setDebugEnabled(true) })
.option('-I, --insecure', 'allow insecure access to homebridge', function() { insecureAccess = true; })
.parse(process.argv); .parse(process.argv);
// Initialize HAP-NodeJS with a custom persist directory // Initialize HAP-NodeJS with a custom persist directory
hap.init(User.persistPath()); hap.init(User.persistPath());
new Server().run(); new Server(insecureAccess).run();
} }

6
lib/server.js
View File

@@ -22,7 +22,7 @@ module.exports = {
Server: Server Server: Server
} }
function Server() { function Server(insecureAccess) {
// Setup Accessory Cache Storage // Setup Accessory Cache Storage
accessoryStorage.initSync({ dir: User.cachedAccessoryPath() }); accessoryStorage.initSync({ dir: User.cachedAccessoryPath() });
@@ -49,6 +49,8 @@ function Server() {
this._setupManager.on('requestCurrentConfig', function(callback) { this._setupManager.on('requestCurrentConfig', function(callback) {
callback(this._config); callback(this._config);
}.bind(this)); }.bind(this));
this._allowInsecureAccess = insecureAccess || false;
} }
Server.prototype.run = function() { Server.prototype.run = function() {
@@ -83,7 +85,7 @@ Server.prototype._publish = function() {
port: bridgeConfig.port || 51826, port: bridgeConfig.port || 51826,
pincode: bridgeConfig.pin || "031-45-154", pincode: bridgeConfig.pin || "031-45-154",
category: Accessory.Categories.BRIDGE category: Accessory.Categories.BRIDGE
}); }, this._allowInsecureAccess);
log.info("Homebridge is running on port %s.", bridgeConfig.port || 51826); log.info("Homebridge is running on port %s.", bridgeConfig.port || 51826);
} }

2
package.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "homebridge", "name": "homebridge",
"description": "HomeKit support for the impatient", "description": "HomeKit support for the impatient",
"version": "0.2.16", "version": "0.2.18",
"scripts": { "scripts": {
"dev": "DEBUG=* ./bin/homebridge -D -P example-plugins/ || true" "dev": "DEBUG=* ./bin/homebridge -D -P example-plugins/ || true"
}, },