From 45ccbba9a3153966c4a2bbc92e59c3293768883a Mon Sep 17 00:00:00 2001
From: Nick Farina <nfarina@gmail.com>
Date: Sat, 6 Jun 2015 06:40:12 -0700
Subject: [PATCH] Don't crash on missing config items

Fixes #15
---
 app.js | 85 ++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 47 insertions(+), 38 deletions(-)

diff --git a/app.js b/app.js
index c39de45..15828ab 100644
--- a/app.js
+++ b/app.js
@@ -20,45 +20,16 @@ storage.initSync();
 // Load up the configuration file
 var config = JSON.parse(fs.readFileSync(configPath));
 
+// Just to prevent them getting garbage collected
+var accessories = [];
+
+function startup() {
+    if (config.platforms) loadPlatforms();
+    if (config.accessories) loadAccessories();
+}
+
 function loadAccessories() {
 
-    var accessories = [];
-
-    console.log("Loading " + config.platforms.length + " platforms...");
-    for (var i=0; i<config.platforms.length; i++) {
-
-        var platformConfig = config.platforms[i];
-
-        // Load up the class for this accessory
-        var platformName = platformConfig["platform"]; // like "Wink"
-        var platformModule = require('./platforms/' + platformName + ".js"); // like "./platforms/Wink.js"
-        var platformConstructor = platformModule.platform; // like "WinkPlatform", a JavaScript constructor
-
-        // Create a custom logging function that prepends the platform display name for debugging
-        var name = platformConfig["name"];
-        var log = function(name) { return function(s) { console.log("[" + name + "] " + s); }; }(name);
-
-        log("Initializing " + platformName + " platform...");
-
-        var platform = new platformConstructor(log, platformConfig);
-
-        // query for devices
-        platform.accessories(function(foundAccessories){
-          // loop through accessories adding them to the list and registering them
-          for (var i = 0; i < foundAccessories.length; i++) {
-            accessory = foundAccessories[i]
-            accessories.push(accessory);
-            log("Initializing device with name " + accessory.name + "...")
-            // Extract the raw "services" for this accessory which is a big array of objects describing the various
-            // hooks in and out of HomeKit for the HAP-NodeJS server.
-            var services = accessory.getServices();
-            // Create the HAP server for this accessory
-            createHAPServer(accessory.name, services);
-          }
-          accessories.push.apply(accessories, foundAccessories);
-        })
-    }
-
     // Instantiate all accessories in the config
     console.log("Loading " + config.accessories.length + " accessories...");
     for (var i=0; i<config.accessories.length; i++) {
@@ -87,6 +58,44 @@ function loadAccessories() {
     }
 }
 
+function loadPlatforms() {
+
+    console.log("Loading " + config.platforms.length + " platforms...");
+    for (var i=0; i<config.platforms.length; i++) {
+
+        var platformConfig = config.platforms[i];
+
+        // Load up the class for this accessory
+        var platformName = platformConfig["platform"]; // like "Wink"
+        var platformModule = require('./platforms/' + platformName + ".js"); // like "./platforms/Wink.js"
+        var platformConstructor = platformModule.platform; // like "WinkPlatform", a JavaScript constructor
+
+        // Create a custom logging function that prepends the platform display name for debugging
+        var name = platformConfig["name"];
+        var log = function(name) { return function(s) { console.log("[" + name + "] " + s); }; }(name);
+
+        log("Initializing " + platformName + " platform...");
+
+        var platform = new platformConstructor(log, platformConfig);
+
+        // query for devices
+        platform.accessories(function(foundAccessories){
+            // loop through accessories adding them to the list and registering them
+            for (var i = 0; i < foundAccessories.length; i++) {
+                accessory = foundAccessories[i]
+                accessories.push(accessory);
+                log("Initializing device with name " + accessory.name + "...")
+                // Extract the raw "services" for this accessory which is a big array of objects describing the various
+                // hooks in and out of HomeKit for the HAP-NodeJS server.
+                var services = accessory.getServices();
+                // Create the HAP server for this accessory
+                createHAPServer(accessory.name, services);
+            }
+            accessories.push.apply(accessories, foundAccessories);
+        })
+    }
+}
+
 //
 // Creates the actual HAP servers which listen on different sockets
 //
@@ -175,4 +184,4 @@ function createUsername(str) {
            hash[10] + hash[11];
 }
 
-loadAccessories();
+startup();