node-opcua-server 2.64.0 → 2.64.1

package/dist/sessions_compatible_for_transfer.d.ts

@@ -1,2 +1,2 @@
-import { ServerSession } from "./server_session";
-export declare function sessionsCompatibleForTransfer(sessionSrc: ServerSession, sessionDest: ServerSession): boolean;
+import { ServerSession } from "./server_session";
+export declare function sessionsCompatibleForTransfer(sessionSrc: ServerSession, sessionDest: ServerSession): boolean;

package/dist/sessions_compatible_for_transfer.js

@@ -1,37 +1,37 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sessionsCompatibleForTransfer = void 0;
-const node_opcua_assert_1 = require("node-opcua-assert");
-const node_opcua_types_1 = require("node-opcua-types");
-function sessionsCompatibleForTransfer(sessionSrc, sessionDest) {
-    (0, node_opcua_assert_1.assert)(sessionDest);
-    (0, node_opcua_assert_1.assert)(sessionSrc);
-    if (!sessionSrc.userIdentityToken && !sessionDest.userIdentityToken) {
-        return true;
-    }
-    if (sessionSrc.userIdentityToken instanceof node_opcua_types_1.AnonymousIdentityToken) {
-        if (!(sessionDest.userIdentityToken instanceof node_opcua_types_1.AnonymousIdentityToken)) {
-            return false;
-        }
-        return true;
-    }
-    else if (sessionSrc.userIdentityToken instanceof node_opcua_types_1.UserNameIdentityToken) {
-        if (!(sessionDest.userIdentityToken instanceof node_opcua_types_1.UserNameIdentityToken)) {
-            return false;
-        }
-        return sessionSrc.userIdentityToken.userName === sessionDest.userIdentityToken.userName;
-    }
-    // istanbul ignore else
-    else if (sessionSrc.userIdentityToken instanceof node_opcua_types_1.X509IdentityToken) {
-        if (!(sessionDest.userIdentityToken instanceof node_opcua_types_1.X509IdentityToken)) {
-            return false;
-        }
-        return (sessionSrc.userIdentityToken.certificateData.toString("hex") ===
-            sessionDest.userIdentityToken.certificateData.toString("hex"));
-    }
-    else {
-        throw new Error("Unsupported Identity token");
-    }
-}
-exports.sessionsCompatibleForTransfer = sessionsCompatibleForTransfer;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sessionsCompatibleForTransfer = void 0;
+const node_opcua_assert_1 = require("node-opcua-assert");
+const node_opcua_types_1 = require("node-opcua-types");
+function sessionsCompatibleForTransfer(sessionSrc, sessionDest) {
+    (0, node_opcua_assert_1.assert)(sessionDest);
+    (0, node_opcua_assert_1.assert)(sessionSrc);
+    if (!sessionSrc.userIdentityToken && !sessionDest.userIdentityToken) {
+        return true;
+    }
+    if (sessionSrc.userIdentityToken instanceof node_opcua_types_1.AnonymousIdentityToken) {
+        if (!(sessionDest.userIdentityToken instanceof node_opcua_types_1.AnonymousIdentityToken)) {
+            return false;
+        }
+        return true;
+    }
+    else if (sessionSrc.userIdentityToken instanceof node_opcua_types_1.UserNameIdentityToken) {
+        if (!(sessionDest.userIdentityToken instanceof node_opcua_types_1.UserNameIdentityToken)) {
+            return false;
+        }
+        return sessionSrc.userIdentityToken.userName === sessionDest.userIdentityToken.userName;
+    }
+    // istanbul ignore else
+    else if (sessionSrc.userIdentityToken instanceof node_opcua_types_1.X509IdentityToken) {
+        if (!(sessionDest.userIdentityToken instanceof node_opcua_types_1.X509IdentityToken)) {
+            return false;
+        }
+        return (sessionSrc.userIdentityToken.certificateData.toString("hex") ===
+            sessionDest.userIdentityToken.certificateData.toString("hex"));
+    }
+    else {
+        throw new Error("Unsupported Identity token");
+    }
+}
+exports.sessionsCompatibleForTransfer = sessionsCompatibleForTransfer;
 //# sourceMappingURL=sessions_compatible_for_transfer.js.map

package/dist/validate_filter.d.ts

@@ -1,5 +1,5 @@
-import { BaseNode } from "node-opcua-address-space";
-import { ExtensionObject } from "node-opcua-extension-object";
-import { StatusCode } from "node-opcua-status-code";
-import { ReadValueIdOptions } from "node-opcua-types";
-export declare function validateFilter(filter: ExtensionObject | null, itemToMonitor: ReadValueIdOptions, node: BaseNode): StatusCode;
+import { BaseNode } from "node-opcua-address-space";
+import { ExtensionObject } from "node-opcua-extension-object";
+import { StatusCode } from "node-opcua-status-code";
+import { ReadValueIdOptions } from "node-opcua-types";
+export declare function validateFilter(filter: ExtensionObject | null, itemToMonitor: ReadValueIdOptions, node: BaseNode): StatusCode;

package/dist/validate_filter.js

@@ -1,61 +1,61 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateFilter = void 0;
-/**
- * @module node-opcua-server
- */
-const node_opcua_assert_1 = require("node-opcua-assert");
-const node_opcua_data_model_1 = require("node-opcua-data-model");
-const node_opcua_data_model_2 = require("node-opcua-data-model");
-const node_opcua_nodeid_1 = require("node-opcua-nodeid");
-const node_opcua_service_filter_1 = require("node-opcua-service-filter");
-const node_opcua_service_subscription_1 = require("node-opcua-service-subscription");
-const node_opcua_status_code_1 = require("node-opcua-status-code");
-function __validateDataChangeFilter(filter, itemToMonitor, node) {
-    (0, node_opcua_assert_1.assert)(itemToMonitor.attributeId === node_opcua_data_model_1.AttributeIds.Value);
-    if (node.nodeClass !== node_opcua_data_model_2.NodeClass.Variable) {
-        return node_opcua_status_code_1.StatusCodes.BadNodeIdInvalid;
-    }
-    (0, node_opcua_assert_1.assert)(node.nodeClass === node_opcua_data_model_2.NodeClass.Variable);
-    // if node is not Numerical=> DataChangeFilter
-    (0, node_opcua_assert_1.assert)(node.dataType instanceof node_opcua_nodeid_1.NodeId);
-    const dataType = node.addressSpace.findDataType(node.dataType);
-    const dataTypeNumber = node.addressSpace.findDataType("Number");
-    if (filter.deadbandType !== node_opcua_service_subscription_1.DeadbandType.None) {
-        if (!dataType.isSupertypeOf(dataTypeNumber)) {
-            return node_opcua_status_code_1.StatusCodes.BadFilterNotAllowed;
-        }
-    }
-    if (filter.deadbandType === node_opcua_service_subscription_1.DeadbandType.Percent) {
-        if (filter.deadbandValue < 0 || filter.deadbandValue > 100) {
-            return node_opcua_status_code_1.StatusCodes.BadDeadbandFilterInvalid;
-        }
-        // node must also have a valid euRange
-        if (!node.euRange) {
-            // tslint:disable:no-console
-            console.log(" node has no euRange ! Dead band Percent cannot be used on node " + node.nodeId.toString());
-            return node_opcua_status_code_1.StatusCodes.BadMonitoredItemFilterUnsupported;
-        }
-    }
-    return node_opcua_status_code_1.StatusCodes.Good;
-}
-function validateFilter(filter, itemToMonitor, node) {
-    // handle filter information
-    if (filter && filter instanceof node_opcua_service_filter_1.EventFilter && itemToMonitor.attributeId !== node_opcua_data_model_1.AttributeIds.EventNotifier) {
-        // invalid filter on Event
-        return node_opcua_status_code_1.StatusCodes.BadFilterNotAllowed;
-    }
-    if (filter && filter instanceof node_opcua_service_filter_1.DataChangeFilter && itemToMonitor.attributeId !== node_opcua_data_model_1.AttributeIds.Value) {
-        // invalid DataChange filter on non Value Attribute
-        return node_opcua_status_code_1.StatusCodes.BadFilterNotAllowed;
-    }
-    if (filter && itemToMonitor.attributeId !== node_opcua_data_model_1.AttributeIds.EventNotifier && itemToMonitor.attributeId !== node_opcua_data_model_1.AttributeIds.Value) {
-        return node_opcua_status_code_1.StatusCodes.BadFilterNotAllowed;
-    }
-    if (filter instanceof node_opcua_service_filter_1.DataChangeFilter) {
-        return __validateDataChangeFilter(filter, itemToMonitor, node);
-    }
-    return node_opcua_status_code_1.StatusCodes.Good;
-}
-exports.validateFilter = validateFilter;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateFilter = void 0;
+/**
+ * @module node-opcua-server
+ */
+const node_opcua_assert_1 = require("node-opcua-assert");
+const node_opcua_data_model_1 = require("node-opcua-data-model");
+const node_opcua_data_model_2 = require("node-opcua-data-model");
+const node_opcua_nodeid_1 = require("node-opcua-nodeid");
+const node_opcua_service_filter_1 = require("node-opcua-service-filter");
+const node_opcua_service_subscription_1 = require("node-opcua-service-subscription");
+const node_opcua_status_code_1 = require("node-opcua-status-code");
+function __validateDataChangeFilter(filter, itemToMonitor, node) {
+    (0, node_opcua_assert_1.assert)(itemToMonitor.attributeId === node_opcua_data_model_1.AttributeIds.Value);
+    if (node.nodeClass !== node_opcua_data_model_2.NodeClass.Variable) {
+        return node_opcua_status_code_1.StatusCodes.BadNodeIdInvalid;
+    }
+    (0, node_opcua_assert_1.assert)(node.nodeClass === node_opcua_data_model_2.NodeClass.Variable);
+    // if node is not Numerical=> DataChangeFilter
+    (0, node_opcua_assert_1.assert)(node.dataType instanceof node_opcua_nodeid_1.NodeId);
+    const dataType = node.addressSpace.findDataType(node.dataType);
+    const dataTypeNumber = node.addressSpace.findDataType("Number");
+    if (filter.deadbandType !== node_opcua_service_subscription_1.DeadbandType.None) {
+        if (!dataType.isSupertypeOf(dataTypeNumber)) {
+            return node_opcua_status_code_1.StatusCodes.BadFilterNotAllowed;
+        }
+    }
+    if (filter.deadbandType === node_opcua_service_subscription_1.DeadbandType.Percent) {
+        if (filter.deadbandValue < 0 || filter.deadbandValue > 100) {
+            return node_opcua_status_code_1.StatusCodes.BadDeadbandFilterInvalid;
+        }
+        // node must also have a valid euRange
+        if (!node.euRange) {
+            // tslint:disable:no-console
+            console.log(" node has no euRange ! Dead band Percent cannot be used on node " + node.nodeId.toString());
+            return node_opcua_status_code_1.StatusCodes.BadMonitoredItemFilterUnsupported;
+        }
+    }
+    return node_opcua_status_code_1.StatusCodes.Good;
+}
+function validateFilter(filter, itemToMonitor, node) {
+    // handle filter information
+    if (filter && filter instanceof node_opcua_service_filter_1.EventFilter && itemToMonitor.attributeId !== node_opcua_data_model_1.AttributeIds.EventNotifier) {
+        // invalid filter on Event
+        return node_opcua_status_code_1.StatusCodes.BadFilterNotAllowed;
+    }
+    if (filter && filter instanceof node_opcua_service_filter_1.DataChangeFilter && itemToMonitor.attributeId !== node_opcua_data_model_1.AttributeIds.Value) {
+        // invalid DataChange filter on non Value Attribute
+        return node_opcua_status_code_1.StatusCodes.BadFilterNotAllowed;
+    }
+    if (filter && itemToMonitor.attributeId !== node_opcua_data_model_1.AttributeIds.EventNotifier && itemToMonitor.attributeId !== node_opcua_data_model_1.AttributeIds.Value) {
+        return node_opcua_status_code_1.StatusCodes.BadFilterNotAllowed;
+    }
+    if (filter instanceof node_opcua_service_filter_1.DataChangeFilter) {
+        return __validateDataChangeFilter(filter, itemToMonitor, node);
+    }
+    return node_opcua_status_code_1.StatusCodes.Good;
+}
+exports.validateFilter = validateFilter;
 //# sourceMappingURL=validate_filter.js.map

package/package.json

@@ -1,88 +1,88 @@
 {
-  "name": "node-opcua-server",
-  "version": "2.64.0",
-  "description": "pure nodejs OPCUA SDK - module -server",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "dependencies": {
-    "@ster5/global-mutex": "^1.2.0",
-    "@types/underscore": "^1.11.4",
-    "async": "^3.2.3",
-    "bonjour": "^3.5.0",
-    "dequeue": "^1.0.5",
-    "lodash": "4.17.21",
-    "node-opcua-address-space": "2.64.0",
-    "node-opcua-assert": "2.64.0",
-    "node-opcua-basic-types": "2.64.0",
-    "node-opcua-certificate-manager": "2.64.0",
-    "node-opcua-client": "2.64.0",
-    "node-opcua-client-dynamic-extension-object": "2.64.0",
-    "node-opcua-common": "2.64.0",
-    "node-opcua-constants": "2.64.0",
-    "node-opcua-crypto": "^1.7.5",
-    "node-opcua-data-model": "2.64.0",
-    "node-opcua-data-value": "2.64.0",
-    "node-opcua-date-time": "2.64.0",
-    "node-opcua-debug": "2.64.0",
-    "node-opcua-enum": "2.64.0",
-    "node-opcua-extension-object": "2.64.0",
-    "node-opcua-factory": "2.64.0",
-    "node-opcua-hostname": "2.64.0",
-    "node-opcua-nodeid": "2.64.0",
-    "node-opcua-nodesets": "2.64.0",
-    "node-opcua-numeric-range": "2.64.0",
-    "node-opcua-object-registry": "2.64.0",
-    "node-opcua-pki": "^2.13.0",
-    "node-opcua-secure-channel": "2.64.0",
-    "node-opcua-service-browse": "2.64.0",
-    "node-opcua-service-call": "2.64.0",
-    "node-opcua-service-discovery": "2.64.0",
-    "node-opcua-service-endpoints": "2.64.0",
-    "node-opcua-service-filter": "2.64.0",
-    "node-opcua-service-history": "2.64.0",
-    "node-opcua-service-node-management": "2.64.0",
-    "node-opcua-service-query": "2.64.0",
-    "node-opcua-service-read": "2.64.0",
-    "node-opcua-service-register-node": "2.64.0",
-    "node-opcua-service-secure-channel": "2.64.0",
-    "node-opcua-service-session": "2.64.0",
-    "node-opcua-service-subscription": "2.64.0",
-    "node-opcua-service-translate-browse-path": "2.64.0",
-    "node-opcua-service-write": "2.64.0",
-    "node-opcua-status-code": "2.64.0",
-    "node-opcua-types": "2.64.0",
-    "node-opcua-utils": "2.64.0",
-    "node-opcua-variant": "2.64.0"
-  },
-  "devDependencies": {
-    "node-opcua-data-access": "2.64.0",
-    "node-opcua-leak-detector": "2.64.0",
-    "node-opcua-test-helpers": "2.64.0",
-    "node-opcua-transport": "2.64.0",
-    "should": "^13.2.3",
-    "sinon": "^13.0.1"
-  },
-  "author": "Etienne Rossignon",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/node-opcua/node-opcua.git"
-  },
-  "keywords": [
-    "OPCUA",
-    "opcua",
-    "m2m",
-    "iot",
-    "opc ua",
-    "internet of things"
-  ],
-  "homepage": "http://node-opcua.github.io/",
-  "gitHead": "07dcdd8e8c7f2b55544c6e23023093e35674829c",
-  "scripts": {
-    "build": "tsc -b",
-    "lint": "eslint source test",
-    "format": "prettier --write source test",
-    "clean": "node -e \"require('rimraf').sync('certificates');\" && node -e \"require('rimraf').sync('dist');\"",
-    "test": "mocha"
-  }
-}
+    "name": "node-opcua-server",
+    "version": "2.64.1",
+    "description": "pure nodejs OPCUA SDK - module -server",
+    "scripts": {
+        "build": "tsc -b",
+        "lint": "eslint source test",
+        "format": "prettier --write source test",
+        "clean": "node -e \"require('rimraf').sync('certificates');\" && node -e \"require('rimraf').sync('dist');\"",
+        "test": "mocha"
+    },
+    "main": "./dist/index.js",
+    "types": "./dist/index.d.ts",
+    "dependencies": {
+        "@ster5/global-mutex": "^1.2.0",
+        "@types/underscore": "^1.11.4",
+        "async": "^3.2.3",
+        "bonjour": "^3.5.0",
+        "dequeue": "^1.0.5",
+        "lodash": "4.17.21",
+        "node-opcua-address-space": "2.64.1",
+        "node-opcua-assert": "2.64.1",
+        "node-opcua-basic-types": "2.64.1",
+        "node-opcua-certificate-manager": "2.64.1",
+        "node-opcua-client": "2.64.1",
+        "node-opcua-client-dynamic-extension-object": "2.64.1",
+        "node-opcua-common": "2.64.1",
+        "node-opcua-constants": "2.64.1",
+        "node-opcua-crypto": "^1.9.0",
+        "node-opcua-data-model": "2.64.1",
+        "node-opcua-data-value": "2.64.1",
+        "node-opcua-date-time": "2.64.1",
+        "node-opcua-debug": "2.64.1",
+        "node-opcua-enum": "2.64.1",
+        "node-opcua-extension-object": "2.64.1",
+        "node-opcua-factory": "2.64.1",
+        "node-opcua-hostname": "2.64.1",
+        "node-opcua-nodeid": "2.64.1",
+        "node-opcua-nodesets": "2.64.1",
+        "node-opcua-numeric-range": "2.64.1",
+        "node-opcua-object-registry": "2.64.1",
+        "node-opcua-pki": "^2.14.0",
+        "node-opcua-secure-channel": "2.64.1",
+        "node-opcua-service-browse": "2.64.1",
+        "node-opcua-service-call": "2.64.1",
+        "node-opcua-service-discovery": "2.64.1",
+        "node-opcua-service-endpoints": "2.64.1",
+        "node-opcua-service-filter": "2.64.1",
+        "node-opcua-service-history": "2.64.1",
+        "node-opcua-service-node-management": "2.64.1",
+        "node-opcua-service-query": "2.64.1",
+        "node-opcua-service-read": "2.64.1",
+        "node-opcua-service-register-node": "2.64.1",
+        "node-opcua-service-secure-channel": "2.64.1",
+        "node-opcua-service-session": "2.64.1",
+        "node-opcua-service-subscription": "2.64.1",
+        "node-opcua-service-translate-browse-path": "2.64.1",
+        "node-opcua-service-write": "2.64.1",
+        "node-opcua-status-code": "2.64.1",
+        "node-opcua-types": "2.64.1",
+        "node-opcua-utils": "2.64.1",
+        "node-opcua-variant": "2.64.1"
+    },
+    "devDependencies": {
+        "node-opcua-data-access": "2.64.1",
+        "node-opcua-leak-detector": "2.64.1",
+        "node-opcua-test-helpers": "2.64.1",
+        "node-opcua-transport": "2.64.1",
+        "should": "^13.2.3",
+        "sinon": "^13.0.1"
+    },
+    "author": "Etienne Rossignon",
+    "license": "MIT",
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/node-opcua/node-opcua.git"
+    },
+    "keywords": [
+        "OPCUA",
+        "opcua",
+        "m2m",
+        "iot",
+        "opc ua",
+        "internet of things"
+    ],
+    "homepage": "http://node-opcua.github.io/",
+    "gitHead": "b65b8738603cd475d7d99a2b20b0ae9d32b4110c"
+}

package/source/opcua_server.ts

@@ -43,7 +43,9 @@ import {
 import { getDefaultCertificateManager, OPCUACertificateManager } from "node-opcua-certificate-manager";
 import { ServerState } from "node-opcua-common";
 import { Certificate, exploreCertificate, makeSHA1Thumbprint, Nonce, toPem } from "node-opcua-crypto";
-import { AttributeIds, LocalizedText, NodeClass } from "node-opcua-data-model";
+import {
+    AttributeIds, DiagnosticInfo, filterDiagnosticInfoLevel, filterDiagnosticOperationLevel, filterDiagnosticServiceLevel, LocalizedText, NodeClass, RESPONSE_DIAGNOSTICS_MASK_ALL
+} from "node-opcua-data-model";
 import { DataValue } from "node-opcua-data-value";
 import { dump, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
 import { NodeId } from "node-opcua-nodeid";
@@ -677,6 +679,30 @@ function validate_security_endpoint(
     return { errCode: StatusCodes.Good, endpoint: endpoints_matching_security_policy[0] };
 }
 
+export function filterDiagnosticInfo(returnDiagnostics: number, response: CallResponse): void {
+    if (RESPONSE_DIAGNOSTICS_MASK_ALL & returnDiagnostics) {
+        response.responseHeader.serviceDiagnostics = filterDiagnosticServiceLevel(returnDiagnostics, response.responseHeader.serviceDiagnostics);
+
+        if (response.diagnosticInfos && response.diagnosticInfos.length > 0) {
+            response.diagnosticInfos = response.diagnosticInfos.map((d) => filterDiagnosticOperationLevel(returnDiagnostics, d));
+        } else {
+            response.diagnosticInfos = [];
+        }
+
+        if (response.results) {
+            for (const entry of response.results) {
+                if (entry.inputArgumentDiagnosticInfos && entry.inputArgumentDiagnosticInfos.length > 0) {
+                    entry.inputArgumentDiagnosticInfos = entry.inputArgumentDiagnosticInfos.map(
+                        (d) => filterDiagnosticOperationLevel(returnDiagnostics, d)
+                    );
+                } else {
+                    entry.inputArgumentDiagnosticInfos = [];
+                }
+            }
+        }
+    }
+}
+
 export enum RegisterServerMethod {
     HIDDEN = 1, // the server doesn't expose itself to the external world
     MDNS = 2, // the server publish itself to the mDNS Multicast network directly
@@ -3339,6 +3365,7 @@ export class OPCUAServer extends OPCUABaseServer {
                         response = new CallResponse({
                             results: results as CallMethodResultOptions[]
                         });
+                        filterDiagnosticInfo(request.requestHeader.returnDiagnostics, response);
                         sendResponse(response);
                     }
                 );