node-opcua-server 2.126.0 → 2.127.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-server",
-    "version": "2.126.0",
+    "version": "2.127.0",
     "description": "pure nodejs OPCUA SDK - module server",
     "scripts": {
         "build": "tsc -b",
@@ -17,14 +17,14 @@
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
         "lodash": "4.17.21",
-        "node-opcua-address-space": "2.126.0",
+        "node-opcua-address-space": "2.127.0",
         "node-opcua-address-space-base": "2.126.0",
         "node-opcua-assert": "2.120.0",
         "node-opcua-basic-types": "2.126.0",
         "node-opcua-binary-stream": "2.125.0",
         "node-opcua-certificate-manager": "2.125.0",
-        "node-opcua-client": "2.126.0",
-        "node-opcua-client-dynamic-extension-object": "2.126.0",
+        "node-opcua-client": "2.127.0",
+        "node-opcua-client-dynamic-extension-object": "2.127.0",
         "node-opcua-common": "2.126.0",
         "node-opcua-constants": "2.125.0",
         "node-opcua-crypto": "4.8.0",
@@ -85,7 +85,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "81b467f284c41813ab8caf17f6d20322d4734fdc",
+    "gitHead": "29da2933b3dbe51c9ca124a26655e346e6e9dcdc",
     "files": [
         "dist",
         "source"

package/source/server_capabilities.ts

@@ -2,13 +2,13 @@
  * @module node-opcua-server
  */
 // tslint:disable:max-classes-per-file
-import { UInt32 } from "node-opcua-basic-types";
+import { Double, UInt32 } from "node-opcua-basic-types";
 import { BinaryStream } from "node-opcua-binary-stream";
 import { QualifiedName } from "node-opcua-data-model";
 import { make_warningLog } from "node-opcua-debug";
 import { SignedSoftwareCertificate } from "node-opcua-types";
 
-const warningLog =make_warningLog(__filename);
+const warningLog = make_warningLog(__filename);
 
 /**
  */
@@ -64,7 +64,7 @@ export interface IServerCapabilities {
     maxArrayLength: number;
     maxByteStringLength: number;
     maxQueryContinuationPoints: number;
-    minSupportedSampleRate: number;
+    minSupportedSampleRate: Double;
     operationLimits: OperationLimitsOptions;
 
     serverProfileArray: string[];
@@ -232,14 +232,14 @@ export class ServerCapabilities implements IServerCapabilities {
         this.softwareCertificates = options.softwareCertificates || [];
 
         this.maxArrayLength = options.maxArrayLength || defaultServerCapabilities.maxArrayLength;
-        
+
         this.maxStringLength = options.maxStringLength || defaultServerCapabilities.maxStringLength;
         this.maxByteStringLength = options.maxByteStringLength || defaultServerCapabilities.maxByteStringLength;
 
         if (BinaryStream.maxStringLength < this.maxStringLength) {
             warningLog(`ServerCapabilities.maxStringLength ${this.maxStringLength} is greater that the allowed limite BinaryStream.maxStringLength = ${BinaryStream.maxStringLength}\nPlease adjust the value.`);
         }
-        
+
         if (BinaryStream.maxByteStringLength < this.maxByteStringLength) {
             warningLog(`ServerCapabilities.maxByteStringLength ${this.maxByteStringLength} is greater that the allowed limite BinaryStream.maxByteStringLength = ${BinaryStream.maxByteStringLength}\nPlease adjust the value.`);
         }

package/source/server_engine.ts

@@ -443,7 +443,7 @@ export class ServerEngine extends EventEmitter implements IAddressSpaceAccessor
 
         // make sure minSupportedSampleRate matches MonitoredItem.minimumSamplingInterval
         (this.serverCapabilities as any).__defineGetter__("minSupportedSampleRate", () => {
-            return options!.serverCapabilities?.minSupportedSampleRate  || MonitoredItem.minimumSamplingInterval;
+            return options!.serverCapabilities?.minSupportedSampleRate || MonitoredItem.minimumSamplingInterval;
         });
 
         this.serverConfiguration = options.serverConfiguration;
@@ -1020,7 +1020,7 @@ export class ServerEngine extends EventEmitter implements IAddressSpaceAccessor
                 });
 
                 bindStandardScalar(VariableIds.Server_ServerCapabilities_MinSupportedSampleRate, DataType.Double, () => {
-                    return this.serverCapabilities.minSupportedSampleRate;
+                    return Math.max(this.serverCapabilities.minSupportedSampleRate, defaultServerCapabilities.minSupportedSampleRate);
                 });
 
                 bindStandardScalar(VariableIds.Server_ServerCapabilities_MaxBrowseContinuationPoints, DataType.UInt16, () => {
@@ -1089,11 +1089,7 @@ export class ServerEngine extends EventEmitter implements IAddressSpaceAccessor
                 });
 
                 bindStandardScalar(VariableIds.Server_ServerCapabilities_MaxMonitoredItemsQueueSize, DataType.UInt32, () => {
-                    return Math.max(1,this.serverCapabilities.maxMonitoredItemsQueueSize);
-                });
-                
-                bindStandardScalar(VariableIds.Server_ServerCapabilities_MinSupportedSampleRate, DataType.UInt32, () => {
-                    return Math.max(this.serverCapabilities.minSupportedSampleRate, defaultServerCapabilities.minSupportedSampleRate);
+                    return Math.max(1, this.serverCapabilities.maxMonitoredItemsQueueSize);
                 });
 
                 const bindOperationLimits = (operationLimits: ServerOperationLimits) => {
@@ -1881,8 +1877,8 @@ export class ServerEngine extends EventEmitter implements IAddressSpaceAccessor
         } else {
             warningLog(
                 chalk.yellow("WARNING:  cannot bind a method with id ") +
-                    chalk.cyan(nodeId.toString()) +
-                    chalk.yellow(". please check your nodeset.xml file or add this node programmatically")
+                chalk.cyan(nodeId.toString()) +
+                chalk.yellow(". please check your nodeset.xml file or add this node programmatically")
             );
             warningLog(traceFromThisProjectOnly());
         }