diff --git a/.gitignore b/.gitignore index 4b235ea..7608131 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ npm-debug.log # Ignore any extra plugins in the example directory that aren't in Git already # (this is a sandbox for the user) example-plugins + +.idea \ No newline at end of file diff --git a/lib/logger.js b/lib/logger.js index baf7596..926c394 100644 --- a/lib/logger.js +++ b/lib/logger.js @@ -31,7 +31,7 @@ Logger.prototype.debug = function(msg) { if (DEBUG_ENABLED) this.log.apply(this, ['debug'].concat(Array.prototype.slice.call(arguments))); } - + Logger.prototype.info = function(msg) { this.log.apply(this, ['info'].concat(Array.prototype.slice.call(arguments))); } @@ -43,35 +43,35 @@ Logger.prototype.warn = function(msg) { Logger.prototype.error = function(msg) { this.log.apply(this, ['error'].concat(Array.prototype.slice.call(arguments))); } - + Logger.prototype.log = function(level, msg) { - + msg = util.format.apply(util, Array.prototype.slice.call(arguments, 1)); func = console.log; - + if (level == 'debug') { msg = chalk.gray(msg); } else if (level == 'warn') { msg = chalk.yellow(msg); - func = console.error; + func = console.error; } else if (level == 'error') { msg = chalk.bold.red(msg); func = console.error; } - + // prepend prefix if applicable if (this.prefix) msg = chalk.cyan("[" + this.prefix + "]") + " " + msg; - + // prepend timestamp var date = new Date(); - msg = "[" + date.toLocaleString() + "]" + " " + msg; + msg = chalk.white("[" + date.toLocaleString() + "]") + " " + msg; func(msg); } - + Logger.withPrefix = function(prefix) { if (!loggerCache[prefix]) { @@ -87,6 +87,6 @@ Logger.withPrefix = function(prefix) { log.prefix = logger.prefix; loggerCache[prefix] = log; } - + return loggerCache[prefix]; } diff --git a/lib/plugin.js b/lib/plugin.js index 3b3d1e5..4284be8 100644 --- a/lib/plugin.js +++ b/lib/plugin.js @@ -13,7 +13,7 @@ module.exports = { /** * Homebridge Plugin. - * + * * Allows for discovering and loading installed Homebridge plugins. */ @@ -28,39 +28,39 @@ Plugin.prototype.name = function() { Plugin.prototype.load = function(options) { options = options || {}; - + // does this plugin exist at all? if (!fs.existsSync(this.pluginPath)) { throw new Error("Plugin " + this.pluginPath + " was not found. Make sure the module '" + this.pluginPath + "' is installed."); } - + // attempt to load package.json var pjson = Plugin.loadPackageJSON(this.pluginPath); - + // very temporary fix for first wave of plugins if (pjson.peerDepdendencies && (!pjson.engines || !pjson.engines.homebridge)) { var engines = pjson.engines || {} engines.homebridge = pjson.peerDepdendencies.homebridge; pjson.engines = engines; } - + // pluck out the HomeBridge version requirement if (!pjson.engines || !pjson.engines.homebridge) { throw new Error("Plugin " + this.pluginPath + " does not contain the 'homebridge' package in 'engines'."); } - + var versionRequired = pjson.engines.homebridge; // make sure the version is satisfied by the currently running version of HomeBridge if (!semver.satisfies(version, versionRequired)) { throw new Error("Plugin " + this.pluginPath + " requires a HomeBridge version of " + versionRequired + " which does not satisfy the current HomeBridge version of " + version + ". You may need to upgrade your installation of HomeBridge."); } - + // figure out the main module - index.js unless otherwise specified var main = pjson.main || "./index.js"; var mainPath = path.join(this.pluginPath, main); - + // try to require() it and grab the exported initialization hook this.initializer = require(mainPath); } @@ -69,11 +69,11 @@ Plugin.loadPackageJSON = function(pluginPath) { // check for a package.json var pjsonPath = path.join(pluginPath, "package.json"); var pjson = null; - + if (!fs.existsSync(pjsonPath)) { throw new Error("Plugin " + pluginPath + " does not contain a package.json."); } - + try { // attempt to parse package.json pjson = JSON.parse(fs.readFileSync(pjsonPath)); @@ -81,7 +81,7 @@ Plugin.loadPackageJSON = function(pluginPath) { catch (err) { throw new Error("Plugin " + pluginPath + " contains an invalid package.json. Error: " + err); } - + // make sure the name is prefixed with 'homebridge-' if (!pjson.name || pjson.name.indexOf('homebridge-') != 0) { throw new Error("Plugin " + pluginPath + " does not have a package name that begins with 'homebridge-'."); @@ -91,7 +91,7 @@ Plugin.loadPackageJSON = function(pluginPath) { if (!pjson.keywords || pjson.keywords.indexOf("homebridge-plugin") == -1) { throw new Error("Plugin " + pluginPath + " package.json does not contain the keyword 'homebridge-plugin'."); } - + return pjson; } @@ -119,9 +119,10 @@ Plugin.getDefaultPaths = function() { } else { paths.push('/usr/local/lib/node_modules'); paths.push('/usr/lib/node_modules'); + const exec = require('child_process').execSync; + paths.push(exec('/bin/echo -n "$(npm -g prefix)/lib/node_modules"').toString('utf8')); } } - return paths; } @@ -138,17 +139,17 @@ Plugin.installed = function() { var plugins = []; var pluginsByName = {}; // don't add duplicate plugins var searchedPaths = {}; // don't search the same paths twice - + // search for plugins among all known paths, in order for (var index in Plugin.paths) { var requirePath = Plugin.paths[index]; - + // did we already search this path? if (searchedPaths[requirePath]) continue; - + searchedPaths[requirePath] = true; - + // just because this path is in require.main.paths doesn't mean it necessarily exists! if (!fs.existsSync(requirePath)) continue; @@ -158,21 +159,19 @@ Plugin.installed = function() { // does this path point inside a single plugin and not a directory containing plugins? if (fs.existsSync(path.join(requirePath, "package.json"))) names = [""]; - + // read through each directory in this node_modules folder for (var index2 in names) { var name = names[index2]; - + // reconstruct full path var pluginPath = path.join(requirePath, name); - try { // we only care about directories if (!fs.statSync(pluginPath).isDirectory()) continue; } catch (e) { continue; } - // does this module contain a package.json? var pjson; try { @@ -184,14 +183,14 @@ Plugin.installed = function() { if (!name || name.indexOf('homebridge-') == 0) { log.warn(err.message); } - + // skip this module continue; } - + // get actual name if this path points inside a single plugin if (!name) name = pjson.name; - + // add it to the return list if (!pluginsByName[name]) { pluginsByName[name] = pluginPath; @@ -202,6 +201,6 @@ Plugin.installed = function() { } } } - + return plugins; }