@tier0/opcua-client 0.1.0 → 0.2.0

package/nodes/connection.html

@@ -2,24 +2,34 @@
   .opcua-advanced { margin: 8px 0 12px; }
   .opcua-advanced summary { cursor: pointer; font-weight: 600; padding: 6px 0; }
   .opcua-standard-note { margin: 0 0 10px 105px; color: var(--red-ui-form-text-color, #666); font-size: 0.9em; }
+  .opcua-discovery-result { margin: 6px 0 8px 105px; max-width: 70%; }
+  .opcua-discovery-result select { width: 100%; }
 </style>
 <script type="text/html" data-template-name="tier0-opcua-connection">
   <div class="form-row"><label for="node-config-input-endpoint">Endpoint</label><input type="text" id="node-config-input-endpoint" placeholder="opc.tcp://127.0.0.1:4840"></div>
+  <div class="form-row"><label></label><button type="button" class="red-ui-button" id="node-config-input-discoverEndpoints">Discover endpoints</button> <button type="button" class="red-ui-button" id="node-config-input-testConnection">Test connection</button></div>
+  <div class="opcua-discovery-result" id="node-config-input-discoveryResult" style="display:none"><select id="node-config-input-discoveredEndpoint"></select></div>
+  <div class="opcua-standard-note" id="node-config-input-testResult"></div>
   <div class="form-row"><label for="node-config-input-securityMode">Security</label><select id="node-config-input-securityMode"><option value="None">None</option><option value="Sign">Sign</option><option value="SignAndEncrypt">SignAndEncrypt</option></select></div>
-  <div class="opcua-standard-note">Standard defaults include automatic reconnect, connectivity checks, and a bounded NodeId cache.</div>
+  <div class="opcua-standard-note">Standard defaults include automatic reconnect, connectivity checks, and bounded command/NodeId queues.</div>
   <details class="opcua-advanced">
     <summary>Security and advanced connection settings</summary>
-    <div class="form-row"><label for="node-config-input-securityPolicy">Policy</label><select id="node-config-input-securityPolicy"><option value="None">None</option><option value="Basic256Sha256">Basic256Sha256</option><option value="Aes128Sha256RsaOaep">Aes128Sha256RsaOaep</option><option value="Aes256Sha256RsaPss">Aes256Sha256RsaPss</option></select></div>
+    <div class="form-row"><label for="node-config-input-securityPolicy">Policy</label><select id="node-config-input-securityPolicy"><option value="None">None</option><option value="Basic256Sha256">Basic256Sha256</option></select></div>
     <div class="form-row"><label for="node-config-input-user">User</label><input type="text" id="node-config-input-user"></div>
     <div class="form-row"><label for="node-config-input-password">Password</label><input type="password" id="node-config-input-password"></div>
-    <div class="form-row"><label for="node-config-input-certificate">Certificate</label><input type="text" id="node-config-input-certificate"></div>
-    <div class="form-row"><label for="node-config-input-privateKey">Private key</label><input type="text" id="node-config-input-privateKey"></div>
+    <div class="form-row opcua-secure-field"><label for="node-config-input-certificate">Client certificate</label><input type="text" id="node-config-input-certificate" placeholder="/path/to/client.der"></div>
+    <div class="form-row opcua-secure-field"><label for="node-config-input-privateKey">Client private key</label><input type="text" id="node-config-input-privateKey" placeholder="/path/to/client-key.pem"></div>
+    <div class="form-row opcua-secure-field"><label for="node-config-input-privateKeyPassword">Key password</label><input type="password" id="node-config-input-privateKeyPassword"></div>
+    <div class="form-row opcua-secure-field"><label for="node-config-input-applicationUri">Application URI</label><input type="text" id="node-config-input-applicationUri" placeholder="Must match the client certificate"></div>
+    <div class="form-row opcua-secure-field"><label for="node-config-input-trustedCertificates">Trusted certificates</label><textarea id="node-config-input-trustedCertificates" rows="3" placeholder="One Server or CA certificate path per line"></textarea></div>
+    <div class="form-row opcua-secure-field"><label for="node-config-input-revocationList">Revocation list</label><textarea id="node-config-input-revocationList" rows="2" placeholder="Optional CRL path, one per line"></textarea></div>
     <div class="form-row"><label for="node-config-input-requestedSessionTimeout">Session timeout</label><input type="number" id="node-config-input-requestedSessionTimeout"></div>
     <div class="form-row"><label for="node-config-input-requestTimeout">Request timeout</label><input type="number" id="node-config-input-requestTimeout"></div>
     <div class="form-row"><label for="node-config-input-connectivityCheckInterval">Connectivity check</label><input type="number" id="node-config-input-connectivityCheckInterval"></div>
     <div class="form-row"><label for="node-config-input-reconnectInterval">Reconnect interval</label><input type="number" id="node-config-input-reconnectInterval"></div>
     <div class="form-row"><label for="node-config-input-maxReconnectInterval">Max reconnect</label><input type="number" id="node-config-input-maxReconnectInterval"></div>
     <div class="form-row"><label for="node-config-input-nodeIdCacheSize">NodeId cache</label><input type="number" id="node-config-input-nodeIdCacheSize"></div>
+    <div class="form-row"><label for="node-config-input-commandQueueSize">Command queue</label><input type="number" id="node-config-input-commandQueueSize"></div>
   </details>
   <div class="form-row"><label for="node-config-input-name">Name</label><input type="text" id="node-config-input-name"></div>
 </script>
@@ -30,15 +40,164 @@
       endpoint: { value: '', required: true },
       securityMode: { value: 'None' }, securityPolicy: { value: 'None' },
       user: { value: '' }, certificate: { value: '' }, privateKey: { value: '' },
+      applicationUri: { value: '' }, trustedCertificates: { value: '' }, revocationList: { value: '' },
       requestedSessionTimeout: { value: 60000, validate: RED.validators.number() },
       requestTimeout: { value: 10000, validate: RED.validators.number() },
       connectivityCheckInterval: { value: 5000, validate: RED.validators.number() },
       reconnectInterval: { value: 5000, validate: RED.validators.number() },
       maxReconnectInterval: { value: 30000, validate: RED.validators.number() },
       nodeIdCacheSize: { value: 100000, validate: RED.validators.number() },
+      commandQueueSize: { value: 256, validate: RED.validators.number() },
       name: { value: '' }
     },
-    credentials: { password: { type: 'password' } },
-    label: function () { return this.name || this.endpoint || 'tier0-opcua-connection'; }
+    credentials: {
+      password: { type: 'password' },
+      privateKeyPassword: { type: 'password' }
+    },
+    label: function () { return this.name || this.endpoint || 'tier0-opcua-connection'; },
+    oneditprepare: function () {
+      const connectionId = this.id;
+      const mode = $('#node-config-input-securityMode');
+      const policy = $('#node-config-input-securityPolicy');
+      const result = $('#node-config-input-discoveryResult');
+      const discovered = $('#node-config-input-discoveredEndpoint');
+      const policyName = function (uri) {
+        return String(uri || '').split('#').pop() || 'None';
+      };
+      const updateSecurityFields = function () {
+        const secure = mode.val() !== 'None';
+        $('.opcua-secure-field').toggle(secure);
+        if (!secure) policy.val('None');
+        else if (policy.val() === 'None') policy.val('Basic256Sha256');
+      };
+      mode.on('change', updateSecurityFields);
+      updateSecurityFields();
+
+      const connectionSettings = function () {
+        return {
+          connectionId,
+          endpoint: String($('#node-config-input-endpoint').val() || '').trim(),
+          securityMode: mode.val(),
+          securityPolicy: policy.val(),
+          user: $('#node-config-input-user').val(),
+          password: $('#node-config-input-password').val(),
+          certificate: $('#node-config-input-certificate').val(),
+          privateKey: $('#node-config-input-privateKey').val(),
+          privateKeyPassword: $('#node-config-input-privateKeyPassword').val(),
+          applicationUri: $('#node-config-input-applicationUri').val(),
+          trustedCertificates: $('#node-config-input-trustedCertificates').val(),
+          revocationList: $('#node-config-input-revocationList').val(),
+          requestedSessionTimeout: $('#node-config-input-requestedSessionTimeout').val(),
+          requestTimeout: $('#node-config-input-requestTimeout').val(),
+          connectivityCheckInterval: $('#node-config-input-connectivityCheckInterval').val(),
+          reconnectInterval: $('#node-config-input-reconnectInterval').val(),
+          maxReconnectInterval: $('#node-config-input-maxReconnectInterval').val(),
+          nodeIdCacheSize: $('#node-config-input-nodeIdCacheSize').val(),
+          commandQueueSize: $('#node-config-input-commandQueueSize').val()
+        };
+      };
+
+      $('#node-config-input-discoverEndpoints').on('click', function () {
+        const button = $(this);
+        const endpoint = String($('#node-config-input-endpoint').val() || '').trim();
+        if (!endpoint) {
+          RED.notify('Enter an OPC UA endpoint first', 'warning');
+          return;
+        }
+        button.prop('disabled', true).text('Discovering...');
+        $.ajax({
+          url: 'opcua-client/endpoints',
+          method: 'POST',
+          contentType: 'application/json',
+          data: JSON.stringify({
+            endpoint,
+            requestTimeout: Number($('#node-config-input-requestTimeout').val()) || 10000
+          })
+        }).done(function (response) {
+          const allEndpoints = Array.isArray(response.endpoints) ? response.endpoints : [];
+          const identityType = String($('#node-config-input-user').val() || '').trim()
+            ? 'Username' : 'Anonymous';
+          const supported = allEndpoints.filter(function (item) {
+            const itemPolicy = policyName(item.securityPolicyUri);
+            return itemPolicy === 'None' || itemPolicy === 'Basic256Sha256';
+          });
+          const matchingIdentity = supported.filter(function (item) {
+            return (item.userIdentityTokens || []).some(function (token) {
+              return token.tokenType === identityType;
+            });
+          });
+          const endpoints = matchingIdentity.length ? matchingIdentity : supported;
+          discovered.empty();
+          endpoints.sort(function (left, right) {
+            return Number(right.securityLevel || 0) - Number(left.securityLevel || 0);
+          }).forEach(function (item, index) {
+            const identities = (item.userIdentityTokens || []).map(function (token) {
+              return token.tokenType;
+            }).filter(function (value, tokenIndex, values) {
+              return values.indexOf(value) === tokenIndex;
+            }).join(', ');
+            $('<option></option>')
+              .val(String(index))
+              .text(`${item.securityMode} / ${policyName(item.securityPolicyUri)} / ${identities || 'No identity token'}`)
+              .data('endpoint', item)
+              .appendTo(discovered);
+          });
+          if (!endpoints.length) {
+            RED.notify('The server returned no supported None or Basic256Sha256 endpoint', 'warning');
+            result.hide();
+            return;
+          }
+          if (!matchingIdentity.length) {
+            RED.notify(`No endpoint advertises ${identityType}; showing other supported endpoints`, 'warning');
+          }
+          result.show();
+          discovered.trigger('change');
+        }).fail(function (xhr) {
+          RED.notify(xhr.responseJSON?.error || 'Endpoint discovery failed', 'error');
+          result.hide();
+        }).always(function () {
+          button.prop('disabled', false).text('Discover endpoints');
+        });
+      });
+
+      discovered.on('change', function () {
+        const selected = discovered.find(':selected').data('endpoint');
+        if (!selected) return;
+        const selectedPolicy = policyName(selected.securityPolicyUri);
+        mode.val(selected.securityMode);
+        if (selectedPolicy === 'None' || selectedPolicy === 'Basic256Sha256') {
+          policy.val(selectedPolicy);
+        }
+        updateSecurityFields();
+      });
+
+      $('#node-config-input-testConnection').on('click', function () {
+        const button = $(this);
+        const testResult = $('#node-config-input-testResult');
+        const settings = connectionSettings();
+        if (!settings.endpoint) {
+          RED.notify('Enter an OPC UA endpoint first', 'warning');
+          return;
+        }
+        button.prop('disabled', true).text('Testing...');
+        testResult.text('');
+        $.ajax({
+          url: 'opcua-client/test-connection',
+          method: 'POST',
+          contentType: 'application/json',
+          data: JSON.stringify(settings)
+        }).done(function (response) {
+          const connection = response.connection || {};
+          testResult.text(`Connected: ${connection.securityMode || settings.securityMode} / ${policyName(connection.securityPolicyUri)}`);
+          RED.notify('OPC UA connection test succeeded', 'success');
+        }).fail(function (xhr) {
+          const message = xhr.responseJSON?.error || 'OPC UA connection test failed';
+          testResult.text(message);
+          RED.notify(message, 'error');
+        }).always(function () {
+          button.prop('disabled', false).text('Test connection');
+        });
+      });
+    }
   });
 </script>

package/nodes/connection.js

@@ -1,31 +1,109 @@
 'use strict';
 
-const { OpcUaClient } = require('../lib/client');
+const { OpcUaClient, discoverEndpoints } = require('../lib/client');
+
+function pathList(value) {
+  const source = Array.isArray(value) ? value : String(value || '').split(/\r?\n|;/);
+  return source.map((entry) => String(entry || '').trim()).filter(Boolean);
+}
+
+function clientOptions(config, credentials = {}) {
+  return {
+    endpoint: config.endpoint,
+    securityMode: config.securityMode || 'None',
+    securityPolicy: config.securityPolicy || 'None',
+    user: config.user || '',
+    password: credentials.password || '',
+    certificate: config.certificate || '',
+    privateKey: config.privateKey || '',
+    privateKeyPassword: credentials.privateKeyPassword || '',
+    applicationUri: config.applicationUri || '',
+    trustedCertificates: pathList(config.trustedCertificates),
+    revocationList: pathList(config.revocationList),
+    requestedSessionTimeout: Number(config.requestedSessionTimeout) || 60000,
+    requestTimeout: Number(config.requestTimeout) || 10000,
+    connectivityCheckInterval: Number.isFinite(Number(config.connectivityCheckInterval))
+      ? Math.max(0, Math.floor(Number(config.connectivityCheckInterval)))
+      : 5000,
+    reconnectInterval: Number(config.reconnectInterval) || 5000,
+    maxReconnectInterval: Number(config.maxReconnectInterval) || 30000,
+    nodeIdCacheSize: Number.isFinite(Number(config.nodeIdCacheSize))
+      ? Math.max(0, Math.floor(Number(config.nodeIdCacheSize)))
+      : 100000,
+    commandQueueSize: Number.isFinite(Number(config.commandQueueSize))
+      ? Math.max(1, Math.floor(Number(config.commandQueueSize)))
+      : 256,
+  };
+}
 
 module.exports = function registerConnectionNode(RED) {
+  RED.httpAdmin.post(
+    '/opcua-client/endpoints',
+    RED.auth.needsPermission('opcua-client.discovery'),
+    async (req, res) => {
+      try {
+        const endpoints = await discoverEndpoints({
+          endpoint: req.body?.endpoint,
+          requestTimeout: req.body?.requestTimeout,
+        });
+        res.send({ endpoints });
+      } catch (error) {
+        res.status(error?.code === 'OPCUA_RECONNECTING' ? 503 : 400).send({
+          error: error.message || String(error),
+          code: error.code || 'OPCUA_DISCOVERY_FAILED',
+        });
+      }
+    }
+  );
+
+  RED.httpAdmin.post(
+    '/opcua-client/test-connection',
+    RED.auth.needsPermission('opcua-client.test'),
+    async (req, res) => {
+      const body = req.body || {};
+      const deployed = body.connectionId ? RED.nodes.getNode(String(body.connectionId)) : null;
+      const deployedOptions = deployed?.client?.options || {};
+      const suppliedPassword = body.password && body.password !== '__PWRD__'
+        ? String(body.password) : deployedOptions.password;
+      const suppliedPrivateKeyPassword = body.privateKeyPassword &&
+        body.privateKeyPassword !== '__PWRD__'
+        ? String(body.privateKeyPassword) : deployedOptions.privateKeyPassword;
+      const options = {
+        ...deployedOptions,
+        ...clientOptions(body, {
+          password: suppliedPassword,
+          privateKeyPassword: suppliedPrivateKeyPassword,
+        }),
+      };
+      const client = new OpcUaClient(options);
+      client.on('fault', () => {});
+      try {
+        await client.connect();
+        const diagnostics = client.getDiagnostics();
+        const state = client.getState();
+        await client.disconnect();
+        res.send({
+          connected: true,
+          state,
+          connection: diagnostics.connection || {},
+          operationLimits: diagnostics.operationLimits || {},
+        });
+      } catch (error) {
+        try { await client.disconnect(); } catch {}
+        res.status(400).send({
+          connected: false,
+          error: error.message || String(error),
+          code: error.code || 'OPCUA_CONNECTION_TEST_FAILED',
+        });
+      }
+    }
+  );
+
   function OpcUaConnectionNode(config) {
     RED.nodes.createNode(this, config);
     const node = this;
 
-    node.client = new OpcUaClient({
-      endpoint: config.endpoint,
-      securityMode: config.securityMode || 'None',
-      securityPolicy: config.securityPolicy || 'None',
-      user: config.user || '',
-      password: node.credentials?.password || '',
-      certificate: config.certificate || '',
-      privateKey: config.privateKey || '',
-      requestedSessionTimeout: Number(config.requestedSessionTimeout) || 60000,
-      requestTimeout: Number(config.requestTimeout) || 10000,
-      connectivityCheckInterval: Number.isFinite(Number(config.connectivityCheckInterval))
-        ? Math.max(0, Math.floor(Number(config.connectivityCheckInterval)))
-        : 5000,
-      reconnectInterval: Number(config.reconnectInterval) || 5000,
-      maxReconnectInterval: Number(config.maxReconnectInterval) || 30000,
-      nodeIdCacheSize: Number.isFinite(Number(config.nodeIdCacheSize))
-        ? Math.max(0, Math.floor(Number(config.nodeIdCacheSize)))
-        : 100000,
-    });
+    node.client = new OpcUaClient(clientOptions(config, node.credentials));
 
     node.client.on('fault', (error) => node.warn(`OPC UA connection fault: ${error.message}`));
     node.client.on('state', (state) => {
@@ -44,6 +122,7 @@ module.exports = function registerConnectionNode(RED) {
   RED.nodes.registerType('tier0-opcua-connection', OpcUaConnectionNode, {
     credentials: {
       password: { type: 'password' },
+      privateKeyPassword: { type: 'password' },
     },
   });
 };

package/nodes/read.html

@@ -36,6 +36,7 @@
   </div>
   <details class="opcua-advanced">
     <summary>Advanced settings</summary>
+    <div class="form-row"><label for="node-input-indexRange">Index range</label><input type="text" id="node-input-indexRange" placeholder="For example 0:9 or 0:1,2:3"></div>
     <div class="form-row"><label for="node-input-batchSize">Batch size</label><input type="number" id="node-input-batchSize"></div>
     <div class="form-row"><label for="node-input-outputMode">Output</label><select id="node-input-outputMode"><option value="batch">Batch</option><option value="split">One message per point</option></select></div>
   </details>
@@ -44,6 +45,7 @@
 <script type="text/html" data-help-name="tier0-opcua-read">
   <p>Add NodeIds to the point list or import JSON/CSV. Imported points are parsed and shown in the same list.</p>
   <p>CSV requires a <code>nodeId</code> header. A JSON/CSV point list may also arrive dynamically in <code>msg.payload</code>.</p>
+  <p>Use <code>indexRange</code> (or legacy <code>range</code>) per point or in <code>msg.indexRange</code> to read part of an array or matrix.</p>
 </script>
 <script type="text/javascript">
   RED.nodes.registerType('tier0-opcua-read', {
@@ -51,6 +53,7 @@
     defaults: {
       connection: { value: '', type: 'tier0-opcua-connection', required: true },
       nodeId: { value: '' }, pointList: { value: '' }, pointListFileName: { value: '' },
+      indexRange: { value: '' },
       batchSize: { value: 500, validate: RED.validators.number() },
       outputMode: { value: 'batch' }, name: { value: '' }
     },

package/nodes/read.js

@@ -12,7 +12,9 @@ module.exports = function registerReadNode(RED) {
       if (!node.connection) return done(new Error('OPC UA connection not configured'));
 
       try {
-        const points = messagePoints(msg, config.nodeId, {}, {
+        const points = messagePoints(msg, config.nodeId, {
+          indexRange: config.indexRange,
+        }, {
           configuredPayload: config.pointList,
           format: 'auto',
         });

package/nodes/subscribe.html

@@ -7,7 +7,7 @@
   <div class="form-row"><label for="node-input-connection">Connection</label><input type="text" id="node-input-connection"></div>
   <div class="form-row"><label for="node-input-nodeId">NodeId</label><input type="text" id="node-input-nodeId" placeholder="Optional when input supplies points"></div>
   <div class="form-row"><label for="node-input-samplingInterval">Sampling (ms)</label><input type="number" id="node-input-samplingInterval"></div>
-  <div class="opcua-standard-note">Standard mode batches changes and automatically rebuilds the subscription after reconnect.</div>
+  <div class="opcua-standard-note">Standard mode shards large point sets across subscriptions, batches changes, and automatically restores them after reconnect.</div>
   <details class="opcua-advanced">
     <summary>Advanced subscription and queue settings</summary>
     <div class="form-row"><label for="node-input-publishingInterval">Publishing interval</label><input type="number" id="node-input-publishingInterval"></div>
@@ -15,16 +15,19 @@
     <div class="form-row"><label for="node-input-discardOldest">Discard oldest</label><input type="checkbox" id="node-input-discardOldest" style="width:auto"></div>
     <div class="form-row"><label for="node-input-deadbandType">Deadband</label><select id="node-input-deadbandType"><option value="none">None</option><option value="absolute">Absolute</option><option value="percent">Percent</option></select></div>
     <div class="form-row"><label for="node-input-deadbandValue">Deadband value</label><input type="number" id="node-input-deadbandValue"></div>
+    <div class="form-row"><label for="node-input-timestampMode">Timestamps</label><select id="node-input-timestampMode"><option value="source">Source</option><option value="both">Source and server</option><option value="server">Server</option><option value="neither">None</option></select></div>
     <div class="form-row"><label for="node-input-batchSize">Create batch size</label><input type="number" id="node-input-batchSize"></div>
+    <div class="form-row"><label for="node-input-maxItemsPerSubscription">Items / subscription</label><input type="number" id="node-input-maxItemsPerSubscription"></div>
     <div class="form-row"><label for="node-input-outputMode">Change output</label><select id="node-input-outputMode"><option value="batch">Native batch</option><option value="single">One message per change</option></select></div>
-    <div class="form-row"><label for="node-input-callbackBatchSize">Native batch size</label><input type="number" id="node-input-callbackBatchSize"></div>
+    <div class="form-row"><label for="node-input-callbackBatchSize">Output batch size</label><input type="number" id="node-input-callbackBatchSize"></div>
+    <div class="form-row"><label for="node-input-callbackFlushIntervalMs">Batch flush (ms)</label><input type="number" id="node-input-callbackFlushIntervalMs"></div>
     <div class="form-row"><label for="node-input-callbackQueueSize">Native queue capacity</label><input type="number" id="node-input-callbackQueueSize"></div>
     <div class="form-row"><label for="node-input-queueMode">Queue mode</label><select id="node-input-queueMode"><option value="all">All changes</option><option value="latest">Latest value per point</option></select></div>
     <div class="form-row"><label for="node-input-overflowPolicy">Overflow policy</label><select id="node-input-overflowPolicy"><option value="drop-oldest">Drop oldest</option><option value="drop-newest">Drop newest</option></select></div>
   </details>
   <div class="form-row"><label for="node-input-name">Name</label><input type="text" id="node-input-name"></div>
 </script>
-<script type="text/html" data-help-name="tier0-opcua-subscribe"><p>Creates one OPC UA subscription with many monitored items. Input may be an array, JSON, CSV, or Browse output. Commands are <code>replace</code>, <code>add</code>, <code>remove</code>, and <code>clear</code> in <code>msg.opcua.command</code>.</p><p>Standard mode preserves all changes in bounded native batches and reports queue diagnostics in <code>msg.opcua.queue</code>.</p></script>
+<script type="text/html" data-help-name="tier0-opcua-subscribe"><p>Creates one or more OPC UA subscriptions for many monitored items. Input may be an array, JSON, CSV, or Browse output. Commands are <code>replace</code>, <code>add</code>, <code>remove</code>, and <code>clear</code> in <code>msg.opcua.command</code>.</p><p>The node automatically honors the server subscription limit when available. Batch output flushes when its size threshold is reached or its time window expires. Queue diagnostics are reported in <code>msg.opcua.queue</code>.</p></script>
 <script type="text/javascript">
   RED.nodes.registerType('tier0-opcua-subscribe', {
     category: 'OPC UA', color: '#c7e9f1', inputs: 1, outputs: 1, icon: 'bridge.png',
@@ -33,8 +36,11 @@
       publishingInterval: { value: 1000, validate: RED.validators.number() }, samplingInterval: { value: 1000, validate: RED.validators.number() },
       queueSize: { value: 10, validate: RED.validators.number() }, discardOldest: { value: true },
       deadbandType: { value: 'none' }, deadbandValue: { value: 0, validate: RED.validators.number() },
+      timestampMode: { value: 'source' },
       batchSize: { value: 500, validate: RED.validators.number() }, outputMode: { value: 'batch' },
+      maxItemsPerSubscription: { value: 5000, validate: RED.validators.number() },
       callbackBatchSize: { value: 500, validate: RED.validators.number() }, callbackQueueSize: { value: 10000, validate: RED.validators.number() },
+      callbackFlushIntervalMs: { value: 50, validate: RED.validators.number() },
       queueMode: { value: 'all' }, overflowPolicy: { value: 'drop-oldest' },
       lifetimeCount: { value: 120 }, maxKeepAliveCount: { value: 10 }, maxNotificationsPerPublish: { value: 0 },
       reconnectInterval: { value: 5000 }, name: { value: '' }