1 files changed, 8 insertions, 4 deletions
diff --git a/services/device-manager.js b/services/device-manager.js
index 3ed4a26..e4d18f3 100644
--- a/services/device-manager.js
+++ b/services/device-manager.js
@@ -3,14 +3,18 @@ const { Client } = require('tplink-smarthome-api');
 const client = new Client();
 var devices = [];
 
-client.startDiscovery({deviceTypes: ['plug']}).on('plug-new', plug => {
+client.startDiscovery({
+    deviceTypes: ['plug'],
+    discoveryTimeout: 20000
+  }).on('plug-new', plug => {
   console.log('Found device: ' + plug.alias + ' [' + plug.deviceId + ']');
   devices.push(plug);
-})
+});
 
 module.exports.getDevice = function(deviceId) {
-  // TODO - get by id
-  return devices[0];
+
+  return devices.find(d => d.deviceId == deviceId);
+
 }
 
 module.exports.getAllDevices = function() {