actual package lock file

BiancoRoyal · Jun 17, 2018 · 3a6dcc4 · 3a6dcc4
1 parent 1cb4760
commit 3a6dcc4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 64 deletions.
diff --git a/src/opcua-iiot-flex-server.js b/src/opcua-iiot-flex-server.js
@@ -136,6 +136,7 @@ module.exports = function (RED) {
 
       let serverOptions = {
         port: node.port,
+        // registerServerMethod: coreServer.core.nodeOPCUA.RegisterServerMethod.LDS, // TODO: Hidden, MDNS or LDS
         nodeset_filename: xmlFiles,
         resourcePath: node.endpoint || 'UA/NodeREDFlexIIoTServer',
         buildInfo: {
@@ -195,7 +196,6 @@ module.exports = function (RED) {
         coreServer.constructAddressSpaceFromScript(node.opcuaServer, node.constructAddressSpaceScript, node.eventObjects).then(function () {
           coreServer.start(node.opcuaServer, node)
           node.setNodeStatusTo('active')
-          node.registerDiscovery()
         }).catch(function (err) {
           coreServer.internalDebugLog(err)
           if (node.showErrors) {
@@ -211,35 +211,6 @@ module.exports = function (RED) {
       }
     }
 
-    node.registerDiscovery = function () {
-      let hostname = os.hostname()
-      let discoveryEndpointUrl
-
-      if (hostname) {
-        discoveryEndpointUrl = 'opc.tcp://' + hostname + ':4840/UAFlexDiscovery'
-        coreServer.internalDebugLog('Registering Server To ' + discoveryEndpointUrl)
-
-        node.opcuaServer.registerServer(discoveryEndpointUrl, function (err) {
-          if (err) {
-            coreServer.internalDebugLog('Register Server Discovery Error'.red + err)
-          } else {
-            coreServer.internalDebugLog('Discovery Setup Discovery Done'.green)
-          }
-        })
-      }
-
-      discoveryEndpointUrl = 'opc.tcp://localhost:4840/UAFlexDiscovery'
-      coreServer.internalDebugLog('Registering Server To ' + discoveryEndpointUrl)
-
-      node.opcuaServer.registerServer(discoveryEndpointUrl, function (err) {
-        if (err) {
-          coreServer.internalDebugLog('Register Server Discovery Error'.red + err)
-        } else {
-          coreServer.internalDebugLog('Discovery Setup Discovery Done'.green)
-        }
-      })
-    }
-
     node.initNewServer()
 
     node.on('input', function (msg) {

diff --git a/src/opcua-iiot-server.js b/src/opcua-iiot-server.js
@@ -124,6 +124,7 @@ module.exports = function (RED) {
 
       let serverOptions = {
         port: node.port,
+        // registerServerMethod: coreServer.core.nodeOPCUA.RegisterServerMethod.LDS, // TODO: Hidden, MDNS or LDS
         nodeset_filename: xmlFiles,
         resourcePath: node.endpoint || 'UA/NodeREDIIoTServer',
         buildInfo: {
@@ -182,7 +183,6 @@ module.exports = function (RED) {
         } else {
           coreServer.start(node.opcuaServer, node)
           node.setNodeStatusTo('active')
-          node.registerDiscovery()
         }
       }).catch(function (err) {
         coreServer.internalDebugLog(err)
@@ -192,36 +192,6 @@ module.exports = function (RED) {
       })
     }
 
-    // TODO: check if that is correct for multiple servers with different IP's and endpoints
-    node.registerDiscovery = function () {
-      let hostname = os.hostname()
-      let discoveryEndpointUrl
-
-      if (hostname) {
-        discoveryEndpointUrl = 'opc.tcp://' + hostname + ':4840/UADiscovery'
-        coreServer.internalDebugLog('Registering Server To ' + discoveryEndpointUrl)
-
-        node.opcuaServer.registerServer(discoveryEndpointUrl, function (err) {
-          if (err) {
-            coreServer.internalDebugLog('Register Server Discovery Error'.red + err)
-          } else {
-            coreServer.internalDebugLog('Discovery Setup Discovery Done'.green)
-          }
-        })
-      }
-
-      discoveryEndpointUrl = 'opc.tcp://localhost:4840/UADiscovery'
-      coreServer.internalDebugLog('Registering Server To ' + discoveryEndpointUrl)
-
-      node.opcuaServer.registerServer(discoveryEndpointUrl, function (err) {
-        if (err) {
-          coreServer.internalDebugLog('Register Server Discovery Error'.red + err)
-        } else {
-          coreServer.internalDebugLog('Discovery Setup Discovery Done'.green)
-        }
-      })
-    }
-
     node.initNewServer()
 
     node.on('input', function (msg) {

diff --git a/test/opcua-iiot-connector_test.js b/test/opcua-iiot-connector_test.js
@@ -1013,7 +1013,7 @@ describe('OPC UA Connector node Testing', function () {
         n2.on("input", function(msg) {
           msg.should.have.property('payload', 1000)
           msg.should.have.property('topic', "TestTopicMethod")
-          done()
+          setTimeout(done, 5000)
         })
       })
     })

diff --git a/test/opcua-iiot-flex-server_test.js b/test/opcua-iiot-flex-server_test.js
@@ -138,7 +138,7 @@ describe('OPC UA Flex Server node Testing', function () {
           nodeUnderTest.should.have.property('maxAllowedSessionNumber', 10)
           nodeUnderTest.should.have.property('maxNodesPerRead', 1000)
           nodeUnderTest.should.have.property('maxNodesPerBrowse', 2000)
-          done()
+          setTimeout(done, 5000)
         })
     })
   })

diff --git a/test/opcua-iiot-server_test.js b/test/opcua-iiot-server_test.js
@@ -74,7 +74,7 @@ describe('OPC UA Server node Testing', function () {
           nodeUnderTest.should.have.property('maxAllowedSessionNumber', 10)
           nodeUnderTest.should.have.property('maxNodesPerRead', 1000)
           nodeUnderTest.should.have.property('maxNodesPerBrowse', 2000)
-          done()
+          setTimeout(done, 5000)
         })
     })
   })