Fix Luxure server issue

Add clearer status text during searching
Add timeout to server SSDP response

Author: brbeaird

src/edgeDriver/src/commands.lua

@@ -90,6 +90,7 @@ function command_handler.refresh(driver, callingDevice, skipScan, firstAuth)
 
 --Handle blank auth info
   if myQController.preferences.email == '' or myQController.preferences.password == '' then
+    log.info('No credentials yet. Waiting.')
     local defaultAuthStatus = 'Awaiting credentials'
     local currentStatus = myQController:get_latest_state('main', "towertalent27877.myqstatus", "statusText", "unknown")
     if currentStatus ~= defaultAuthStatus then
@@ -327,6 +328,12 @@ function command_handler.refresh(driver, callingDevice, skipScan, firstAuth)
 end
 
 function doBroadcast(driver, device, myQController)
+  local defaultLookingStatus = 'Searching for bridge server'
+  local currentStatus = myQController:get_latest_state('main', "towertalent27877.myqstatus", "statusText", "unknown")
+  if currentStatus ~= defaultLookingStatus then
+    myQController:emit_event(myqStatusCap.statusText(defaultLookingStatus))
+  end
+
   if driver.server.ip == nil then
     log.info('Refresh: waiting for driver http startup')
     return

src/edgeDriver/src/init.lua

@@ -4,7 +4,7 @@ local log = require('log')
 local socket = require('socket')
 local config = require('config')
 local httpUtil = require('httpUtil')
-local cosock = require('cosock').socket
+local cosock = require('cosock')
 local commands = require('commands')
 local lux = require('luxure')
 local json = require('dkjson')
@@ -157,13 +157,16 @@ local driver =
 local hub_server = {}
 
 function hub_server.start(driver)
-  local server = lux.Server.new_with(cosock.tcp(), {env='debug'})
+  local server = lux.Server.new_with(cosock.socket.tcp(), { env = 'debug' })
 
-  -- Register server
-  driver:register_channel_handler(server.sock, function ()
-    server:tick()
-  end)
+  server:listen()
+  log.trace('Server listening on ' ..server.ip ..':' ..server.port)
 
+  cosock.spawn(function()
+    while true do
+      server:tick(log.error)
+    end
+  end, "server run loop")
 
   --Handles incoming ping from MyQ server when responding to ssdp broadcast
   server:post('/ping', function (req, res)
@@ -182,8 +185,6 @@ function hub_server.start(driver)
     assert (myQController:try_update_metadata({model = 'http://' ..myqServerUrl}), 'failed to update device.')
   end)
 
-  server:listen()
-  log.trace('Server listening on ' ..server.ip ..':' ..server.port)
   driver.server = server
 end
 

src/server/package.json

@@ -2,7 +2,7 @@
   "name": "myqnode",
   "author": "Brian Beaird",
   "repository": "https://github.com/brbeaird/SmartThings-MyQ-Edge.git",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Node agent for MyQ and SmartThings Edge",
   "main": "server.js",
   "scripts": {

src/server/server.js

@@ -134,11 +134,13 @@ function startSsdp() {
       }
       let hubAddress = `http://${headers.SERVER_IP}:${headers.SERVER_PORT}/ping`
       log(`Detected SSDP broadcast. Posting details back to server at ${hubAddress}`)
-      await axios.post(hubAddress,
+      let response = await axios.post(hubAddress,
         {
           myqServerPort: port,
           deviceId: headers.DEVICE_ID
-        })
+        },
+        {timeout: 5000})
+      log(`Got status ${response.status} from hub.`);
     } catch (error) {
         let msg = error.message;
         if (error.response){