feat: new option to to get some delay on server close

feat: new tab limits in server
BiancoRoyal · Oct 16, 2018 · 0f89d73 · 0f89d73
1 parent 5905d0d
commit 0f89d73
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 33 deletions.
diff --git a/src/locales/en-US/opcua-iiot-server.json b/src/locales/en-US/opcua-iiot-server.json
@@ -34,7 +34,8 @@
       "users": "Users & Sets",
       "settings": "Settings",
       "security": "Security",
-      "discovery": "Discovery"
+      "discovery": "Discovery",
+      "limits": "Limits"
     }
   }
 }
diff --git a/src/opcua-iiot-server.html b/src/opcua-iiot-server.html
@@ -35,7 +35,7 @@
       capabilitiesForMDNS: {value: ''},
       maxNodesPerRead: {value: 1000, validate:function(v) { return ((v === '') || (RED.validators.number(v) && (v > 0) && (v <= 100000))) }},
       maxNodesPerBrowse: {value: 2000, validate:function(v) { return ((v === '') || (RED.validators.number(v) && (v > 0) && (v <= 200000))) }},
-      delayToClose: {value: 500, validate:function(v) { return ((v === '') || (RED.validators.number(v) && (v >= 100) && (v <= 15000))) }}
+      delayToClose: {value: 100, validate:function(v) { return ((v === '') || (RED.validators.number(v) && (v >= 100) && (v <= 15000))) }}
     },
     inputs: 1,
     outputs: 1,
@@ -66,6 +66,11 @@
         label: this._("opcua-iiot-contrib.tabs-label.settings")
       })
 
+      tabs.addTab({
+        id: "opcuaiiot-server-tab-limits",
+        label: this._("opcua-iiot-contrib.tabs-label.limits")
+      })
+
       tabs.addTab({
         id: "opcuaiiot-server-tab-security",
         label: this._("opcua-iiot-contrib.tabs-label.security")
@@ -327,10 +332,6 @@
         })
       })
 
-      if (node.asoDemo === null || typeof node.asoDemo === 'undefined') {
-        asoDemo = true
-      }
-
       // console.log('well done editsave ...')
     }
   })
@@ -352,33 +353,13 @@
                 <input type="text" id="node-input-endpoint" placeholder="UA/NodeREDIIoTServer">
             </div>
             <div class="form-row">
-                <label for="node-input-maxAllowedSessionNumber"><i class="icon-list"></i> <span data-i18n="opcua-iiot-contrib.label.maxAllowedSessionNumber"></span></label>
-                <input type="text" id="node-input-maxAllowedSessionNumber" placeholder="10" style="width:80px">
-            </div>
-            <div class="form-row">
-                <label for="node-input-maxConnectionsPerEndpoint"><i class="icon-list"></i> <span data-i18n="opcua-iiot-contrib.label.maxConnectionsPerEndpoint"></span></label>
-                <input type="text" id="node-input-maxConnectionsPerEndpoint" placeholder="10" style="width:80px">
-            </div>
-            <div class="form-row">
-                <label for="node-input-maxAllowedSubscriptionNumber"><i class="icon-list"></i> <span data-i18n="opcua-iiot-contrib.label.maxAllowedSubscriptionNumber"></span></label>
-                <input type="text" id="node-input-maxAllowedSubscriptionNumber" placeholder="50" style="width:80px">
-            </div>
-            <div class="form-row">
-                <label for="node-input-maxNodesPerRead"><i class="icon-list"></i> <span data-i18n="opcua-iiot-contrib.label.maxNodesPerRead"></span></label>
-                <input type="text" id="node-input-maxNodesPerRead" placeholder="10" style="width:80px">
-            </div>
-            <div class="form-row">
-                <label for="node-input-maxNodesPerBrowse"><i class="icon-list"></i> <span data-i18n="opcua-iiot-contrib.label.maxNodesPerBrowse"></span></label>
-                <input type="text" id="node-input-maxNodesPerBrowse" placeholder="10" style="width:80px">
-            </div>
-            <div class="form-row">
-                <label for="node-input-delayToClose"><i class="icon-time"></i> <span data-i18n="opcua-iiot-contrib.label.delayToClose"></span></label>
-                <input type="text" id="node-input-delayToClose" placeholder="500" style="width:80px">
+                <label for="node-input-alternateHostname"><i class="fa fa-server"></i> <span data-i18n="opcua-iiot-contrib.label.alternateHostname"></span></label>
+                <input type="text" id="node-input-alternateHostname" placeholder="">
             </div>
             <hr>
             <div class="form-row">
-                <label for="node-input-alternateHostname"><i class="fa fa-server"></i> <span data-i18n="opcua-iiot-contrib.label.alternateHostname"></span></label>
-                <input type="text" id="node-input-alternateHostname" placeholder="">
+                <label for="node-input-delayToClose"><i class="icon-time"></i> <span data-i18n="opcua-iiot-contrib.label.delayToClose"></span></label>
+                <input type="text" id="node-input-delayToClose" placeholder="100" style="width:80px">
             </div>
             <div class="form-row">
                 <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
@@ -407,6 +388,28 @@
                 <input type="checkbox" id="node-input-showErrors" style="max-width:30px">
             </div>
         </div>
+        <div id="opcuaiiot-server-tab-limits" style="display:none">
+            <div class="form-row">
+                <label for="node-input-maxAllowedSessionNumber"><i class="icon-list"></i> <span data-i18n="opcua-iiot-contrib.label.maxAllowedSessionNumber"></span></label>
+                <input type="text" id="node-input-maxAllowedSessionNumber" placeholder="10" style="width:80px">
+            </div>
+            <div class="form-row">
+                <label for="node-input-maxConnectionsPerEndpoint"><i class="icon-list"></i> <span data-i18n="opcua-iiot-contrib.label.maxConnectionsPerEndpoint"></span></label>
+                <input type="text" id="node-input-maxConnectionsPerEndpoint" placeholder="10" style="width:80px">
+            </div>
+            <div class="form-row">
+                <label for="node-input-maxAllowedSubscriptionNumber"><i class="icon-list"></i> <span data-i18n="opcua-iiot-contrib.label.maxAllowedSubscriptionNumber"></span></label>
+                <input type="text" id="node-input-maxAllowedSubscriptionNumber" placeholder="50" style="width:80px">
+            </div>
+            <div class="form-row">
+                <label for="node-input-maxNodesPerRead"><i class="icon-list"></i> <span data-i18n="opcua-iiot-contrib.label.maxNodesPerRead"></span></label>
+                <input type="text" id="node-input-maxNodesPerRead" placeholder="1000" style="width:80px">
+            </div>
+            <div class="form-row">
+                <label for="node-input-maxNodesPerBrowse"><i class="icon-list"></i> <span data-i18n="opcua-iiot-contrib.label.maxNodesPerBrowse"></span></label>
+                <input type="text" id="node-input-maxNodesPerBrowse" placeholder="2000" style="width:80px">
+            </div>
+        </div>
         <div id="opcuaiiot-server-tab-security" style="display:none">
             <div class="form-row">
                 <!-- SecurityPolicy enum via REST -->

diff --git a/src/opcua-iiot-server.js b/src/opcua-iiot-server.js
@@ -51,7 +51,7 @@ module.exports = function (RED) {
     // limits
     this.maxNodesPerRead = config.maxNodesPerRead || 1000
     this.maxNodesPerBrowse = config.maxNodesPerBrowse || 2000
-    this.delayToClose = config.delayToClose || 500
+    this.delayToClose = config.delayToClose || 100
 
     let node = this
     node.initialized = false

diff --git a/test/e2e/opcua-iiot-connector-e2e.test.js b/test/e2e/opcua-iiot-connector-e2e.test.js
@@ -900,7 +900,7 @@ describe('OPC UA Connector node e2e Testing', function () {
         n2.on('input', function (msg) {
           expect(msg.payload).toBe(1000)
           expect(msg.topic).toBe('TestTopicWrite')
-          done()
+          setTimeout(done, 3000)
         })
       })
     })

diff --git a/test/e2e/opcua-iiot-listener-e2e.test.js b/test/e2e/opcua-iiot-listener-e2e.test.js
@@ -689,7 +689,7 @@ describe('OPC UA Listener monitoring node e2e Testing', function () {
             expect(msg.topic).toBe('TestTopicSubscribe')
             expect(msg.payload.value.dataType).toBe('Int32')
             expect(msg.payload.statusCode).toBeDefined()
-            setTimeout(done, 2000)
+            setTimeout(done, 3000)
           }
         })
       })