1.2.0

Author: ChriD

lib/lib.discoverHostDevice.js

@@ -13,22 +13,19 @@ module.exports = class DiscoverHostDevice extends BaseManager
         super();        
         this.bonjourClient = null
         this.bonjourBrowser = null
-        this.ssdpClient = null;
+        this.ssdpClient = null
+        this.deviceFoundSign = false
+        this.deviceLostSign = false
     }
 
 
     init()
     {    
         var self = this
 
-        self.stopDiscover()       
-        //self.tinkerhubMDSNBrowser = null        
-        //self.tinkerhubMDSNBrowser = new TinkerhubMDSN.browser({type: '', protocol: 'udp'})
-        //this.ssdpClient = new SsdpClient({customLogger : this.logUPNP(this), explicitSocketBind : true});
-        //this.ssdpClient = new SsdpClient({explicitSocketBind : true})
-        
+        self.stopDiscover()               
         self.createBonjourClient()
-        //self.createSSDPClient();
+        self.createSSDPClient();
 
     }
 
@@ -54,14 +51,14 @@ module.exports = class DiscoverHostDevice extends BaseManager
         this.bonjourBrowser.on("up", function (_service) {
             if(_service.fqdn.startsWith("RaumfeldControl"))
             {
-                self.deviceFound(_service.referer.address, _service.fqdn, _service)       
+                self.deviceFound(_service.referer.address, _service.fqdn, _service, "BONJOUR")       
             }            
         })
 
         this.bonjourBrowser.on("down", function (_service) {  
             if(_service.fqdn.startsWith("RaumfeldControl"))
             { 
-                self.deviceLost(_service.referer.address, _service.fqdn, _service)
+                self.deviceLost(_service.referer.address, _service.fqdn, _service, "BONJOUR")
             }
         })
     }
@@ -76,34 +73,44 @@ module.exports = class DiscoverHostDevice extends BaseManager
         this.ssdpClient = new SsdpClient({explicitSocketBind : true})
 
         this.ssdpClient.on('response', function (_headers, _statusCode, _rinfo) {
-            self.deviceFound(_headers.LOCATION, "", _headers)           
+            self.deviceFound(_headers.LOCATION, "", _headers, "SSDP")           
         });
 
         this.ssdpClient.on('advertise-alive', function (_headers) {
-            self.deviceFound(_headers.LOCATION, "", _headers)           
+            self.deviceFound(_headers.LOCATION, "", _headers, "SSDP")           
         });
 
         this.ssdpClient.on('advertise-bye', function (_headers) {
-            self.deviceLost(_headers.LOCATION, "", _headers)
+            self.deviceLost(_headers.LOCATION, "", _headers, "SSDP")
         });
 
         self.ssdpClient.search('urn:schemas-raumfeld-com:device:ConfigDevice:1'); 
     }
 
 
-    deviceFound(_address, _name, _service)
+    deviceFound(_address, _name, _service, _type)
     {
-        this.emit("deviceFound", { "address" : _address, "name" : _name, origService: _service })
+        if(!this.deviceFoundSign)
+        {
+            this.deviceFoundSign = true
+            this.emit("deviceFound", { "address" : _address, "name" : _name, "type" : _type, origService: _service })
+        }
     }
 
     deviceLost(_service)
     {    
-        this.emit("deviceLost", { "address" : _address, "name" : _name, origService: _service })
+        if(!this.devicLostSign)
+        {
+            this.deviceLostSign = true
+            this.emit("deviceLost", { "address" : _address, "name" : _name, "type" : _type, origService: _service })
+        }
     }
 
 
     startDiscover()
-    {            
+    {
+        // start discovering with both types of discover (bonjour and ssdp)
+        // the one who will find the device firts is the winner
         if(this.bonjourBrowser)
             this.bonjourBrowser.start()
         if(this.ssdpClient)
@@ -122,10 +129,15 @@ module.exports = class DiscoverHostDevice extends BaseManager
 
     updateDiscover()
     {       
+        // clear found devices list for the update to catch again
+        this.deviceFoundSign = false
+        this.deviceLostSign = false
+
+        // recreate bonjour and ssdp client to be sure it works well
         this.createBonjourBrowser()
         this.bonjourBrowser.start()
-        //this.createSSDPClient()
-        //this.ssdpClient.start()     
+        this.createSSDPClient()
+        this.ssdpClient.start()     
     }    
 
 }

lib/lib.manager.deviceManager.js

@@ -90,11 +90,11 @@ module.exports = class DeviceManager extends ManagerBase
             self.discoverHostDevice.parmLogger(self.parmLogger())
             self.discoverHostDevice.init()
             self.discoverHostDevice.on("deviceFound", function (_deviceData) {           
-                self.logVerbose("Found Service on: " + _deviceData.address)                   
+                self.logVerbose("Found Host-Service on: " + _deviceData.address + " via " + _deviceData.type)                   
                 self.systemHostDeviceFound(_deviceData.address)             
             });            
             self.discoverHostDevice.on("deviceLost", function (_deviceData) {
-                self.logVerbose("Removed Service on: " +_deviceData.address)               
+                self.logVerbose("Removed Host-Service on: " +_deviceData.address + " via " + _deviceData.type)               
                 self.systemHostDeviceLost(_deviceData.address)                
             });
             self.discoverHostDevice.startDiscover();