1.2.0

Author: ChriD

lib/lib.device.base.upnp.js

@@ -17,7 +17,7 @@ module.exports = class UPNPDevice extends Device
 
     close()
     {
-        this.upnpClient.releaseEventingServer();
+        this.upnpClient.releaseEventingServer(true);
     }
 
     name()

lib/lib.discoverHostDevice.js

@@ -0,0 +1,131 @@
+'use strict'; 
+var Logger = require('./lib.logger');
+var BaseManager = require('./lib.base.manager');
+var ManagerDisposer = require('./lib.managerDisposer');
+
+var SsdpClient = require("node-ssdp").Client;
+
+
+module.exports = class DiscoverHostDevice extends BaseManager
+{
+    constructor()
+    {
+        super();        
+        this.bonjourClient = null
+        this.bonjourBrowser = null
+        this.ssdpClient = null;
+    }
+
+
+    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.createBonjourClient()
+        //self.createSSDPClient();
+                     
+    }
+
+    createBonjourClient()
+    {        
+        if(this.bonjourClient)
+        {
+            this.bonjourClient.destroy()
+            this.bonjourClient = null
+        }
+        this.bonjourClient = require('bonjour')()
+        this.createBonjourBrowser()        
+    }
+
+    createBonjourBrowser()
+    {
+        var self = this
+
+        if(this.bonjourBrowser)
+            this.bonjourBrowser.stop()
+        this.bonjourBrowser = this.bonjourClient.find({})
+        
+        this.bonjourBrowser.on("up", function (_service) {
+            if(_service.fqdn.startsWith("RaumfeldControl"))
+            {
+                self.deviceFound(_service.referer.address, _service.fqdn, _service)       
+            }            
+        })
+        
+        this.bonjourBrowser.on("down", function (_service) {  
+            if(_service.fqdn.startsWith("RaumfeldControl"))
+            { 
+                self.deviceLost(_service.referer.address, _service.fqdn, _service)
+            }
+        })
+    }
+
+
+    createSSDPClient()
+    {
+        var self = this
+
+        if(this.ssdpClient)
+            this.ssdpClient.stop()        
+        this.ssdpClient = new SsdpClient({explicitSocketBind : true})
+
+        this.ssdpClient.on('response', function (_headers, _statusCode, _rinfo) {
+            self.deviceFound(_headers.LOCATION, "", _headers)           
+        });
+        
+        this.ssdpClient.on('advertise-alive', function (_headers) {
+            self.deviceFound(_headers.LOCATION, "", _headers)           
+        });
+        
+        this.ssdpClient.on('advertise-bye', function (_headers) {
+            self.deviceLost(_headers.LOCATION, "", _headers)
+        });
+                
+        self.ssdpClient.search('urn:schemas-raumfeld-com:device:ConfigDevice:1'); 
+    }
+
+
+    deviceFound(_address, _name, _service)
+    {
+        this.emit("deviceFound", { "address" : _address, "name" : _name, origService: _service })
+    }
+
+    deviceLost(_service)
+    {    
+        this.emit("deviceLost", { "address" : _address, "name" : _name, origService: _service })
+    }
+
+
+    startDiscover()
+    {            
+        if(this.bonjourBrowser)
+            this.bonjourBrowser.start()
+        if(this.ssdpClient)
+            this.ssdpClient.start()
+    }
+
+
+    stopDiscover()
+    {
+        if(this.bonjourBrowser)
+            this.bonjourBrowser.stop()  
+        if(this.ssdpClient)
+            this.ssdpClient.stop();  
+    }
+
+
+    updateDiscover()
+    {       
+        this.createBonjourBrowser()
+        this.bonjourBrowser.start()
+        //this.createSSDPClient()
+        //this.ssdpClient.start()     
+    }    
+
+}

lib/lib.external.upnp-device-client.js

@@ -323,6 +323,10 @@ DeviceClient.prototype.unsubscribe = function(serviceId, listener) {
 
     req.on('error', function(err) {
       self.emit('error', err);
+      // well this may occur if the client was removed and can not answer anymore, so we have to remove the subscription!
+      clearTimeout(self.subscriptions[serviceId].timer);
+      delete self.subscriptions[serviceId];
+      self.releaseEventingServer();
     });
 
     req.end(); 
@@ -369,6 +373,10 @@ DeviceClient.prototype.unsubscribeAll = function(serviceId) {
 
     req.on('error', function(err) {
       self.emit('error', err);
+      // well this may occur if the client was removed and can not answer anymore, so we have to remove the subscription!
+      clearTimeout(self.subscriptions[serviceId].timer);
+      delete self.subscriptions[serviceId];
+      self.releaseEventingServer();
     });
 
     req.end(); 
@@ -447,8 +455,8 @@ DeviceClient.prototype.ensureEventingServer = function(callback) {
 };
 
 
-DeviceClient.prototype.releaseEventingServer = function() {
-  if(Object.keys(this.subscriptions).length === 0) {
+DeviceClient.prototype.releaseEventingServer = function(_force = false) {
+  if(Object.keys(this.subscriptions).length === 0 || _force) {
     debug('shutdown eventing server');
     if(this.server)
     {