node-opcua-server 2.73.1 → 2.76.0

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,6 +1,6 @@
 {
     "name": "node-opcua-server",
-    "version": "2.73.1",
+    "version": "2.76.0",
     "description": "pure nodejs OPCUA SDK - module -server",
     "scripts": {
         "build": "tsc -b",
@@ -13,62 +13,61 @@
     "types": "./dist/index.d.ts",
     "dependencies": {
         "@ster5/global-mutex": "^1.2.0",
-        "@types/underscore": "^1.11.4",
         "async": "^3.2.4",
+        "chalk": "4.1.2",
         "dequeue": "^1.0.5",
         "lodash": "4.17.21",
-        "node-opcua-address-space": "2.73.1",
-        "node-opcua-assert": "2.66.0",
-        "node-opcua-basic-types": "2.73.0",
-        "node-opcua-binary-stream": "2.73.0",
-        "node-opcua-certificate-manager": "2.73.0",
-        "node-opcua-client": "2.73.1",
-        "node-opcua-client-dynamic-extension-object": "2.73.1",
-        "node-opcua-common": "2.73.1",
-        "node-opcua-constants": "2.70.0",
+        "node-opcua-address-space": "2.76.0",
+        "node-opcua-address-space-base": "2.76.0",
+        "node-opcua-assert": "2.76.0",
+        "node-opcua-basic-types": "2.76.0",
+        "node-opcua-binary-stream": "2.76.0",
+        "node-opcua-certificate-manager": "2.76.0",
+        "node-opcua-client": "2.76.0",
+        "node-opcua-client-dynamic-extension-object": "2.76.0",
+        "node-opcua-common": "2.76.0",
+        "node-opcua-constants": "2.74.0",
         "node-opcua-crypto": "^1.11.0",
-        "node-opcua-data-access": "2.73.1",
-        "node-opcua-data-model": "2.73.1",
-        "node-opcua-data-value": "2.73.1",
-        "node-opcua-date-time": "2.73.0",
-        "node-opcua-debug": "2.71.0",
-        "node-opcua-enum": "2.71.0",
-        "node-opcua-extension-object": "2.73.1",
-        "node-opcua-factory": "2.73.1",
-        "node-opcua-hostname": "2.67.0",
-        "node-opcua-nodeid": "2.71.0",
-        "node-opcua-nodeset-ua": "2.73.1",
-        "node-opcua-nodesets": "2.73.0",
-        "node-opcua-numeric-range": "2.73.1",
-        "node-opcua-object-registry": "2.71.0",
-        "node-opcua-pki": "^2.17.0",
-        "node-opcua-secure-channel": "2.73.1",
-        "node-opcua-service-browse": "2.73.1",
-        "node-opcua-service-call": "2.73.1",
-        "node-opcua-service-discovery": "2.73.1",
-        "node-opcua-service-endpoints": "2.73.1",
-        "node-opcua-service-filter": "2.73.1",
-        "node-opcua-service-history": "2.73.1",
-        "node-opcua-service-node-management": "2.73.1",
-        "node-opcua-service-query": "2.73.1",
-        "node-opcua-service-read": "2.73.1",
-        "node-opcua-service-register-node": "2.73.1",
-        "node-opcua-service-secure-channel": "2.73.1",
-        "node-opcua-service-session": "2.73.1",
-        "node-opcua-service-subscription": "2.73.1",
-        "node-opcua-service-translate-browse-path": "2.73.1",
-        "node-opcua-service-write": "2.73.1",
-        "node-opcua-status-code": "2.73.0",
-        "node-opcua-transport": "2.73.1",
-        "node-opcua-types": "2.73.1",
-        "node-opcua-utils": "2.71.0",
-        "node-opcua-variant": "2.73.1"
+        "node-opcua-data-access": "2.76.0",
+        "node-opcua-data-model": "2.76.0",
+        "node-opcua-data-value": "2.76.0",
+        "node-opcua-date-time": "2.76.0",
+        "node-opcua-debug": "2.76.0",
+        "node-opcua-extension-object": "2.76.0",
+        "node-opcua-factory": "2.76.0",
+        "node-opcua-hostname": "2.76.0",
+        "node-opcua-nodeid": "2.76.0",
+        "node-opcua-nodesets": "2.74.0",
+        "node-opcua-numeric-range": "2.76.0",
+        "node-opcua-object-registry": "2.76.0",
+        "node-opcua-secure-channel": "2.76.0",
+        "node-opcua-service-browse": "2.76.0",
+        "node-opcua-service-call": "2.76.0",
+        "node-opcua-service-discovery": "2.76.0",
+        "node-opcua-service-endpoints": "2.76.0",
+        "node-opcua-service-filter": "2.76.0",
+        "node-opcua-service-history": "2.76.0",
+        "node-opcua-service-node-management": "2.76.0",
+        "node-opcua-service-query": "2.76.0",
+        "node-opcua-service-read": "2.76.0",
+        "node-opcua-service-register-node": "2.76.0",
+        "node-opcua-service-secure-channel": "2.76.0",
+        "node-opcua-service-session": "2.76.0",
+        "node-opcua-service-subscription": "2.76.0",
+        "node-opcua-service-translate-browse-path": "2.76.0",
+        "node-opcua-service-write": "2.76.0",
+        "node-opcua-status-code": "2.76.0",
+        "node-opcua-types": "2.76.0",
+        "node-opcua-utils": "2.76.0",
+        "node-opcua-variant": "2.76.0",
+        "thenify": "^3.3.1"
     },
     "devDependencies": {
-        "node-opcua-leak-detector": "2.71.0",
-        "node-opcua-test-helpers": "2.66.0",
+        "node-opcua-leak-detector": "2.76.0",
+        "node-opcua-test-helpers": "2.74.0",
         "should": "^13.2.3",
-        "sinon": "^14.0.0"
+        "sinon": "^14.0.0",
+        "underscore": "^1.13.4"
     },
     "author": "Etienne Rossignon",
     "license": "MIT",
@@ -85,5 +84,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "684a796e88e1732f418f2ada6aca2808e0115de8"
+    "gitHead": "75d9b8cf894c8fbadf77d2c4a48a730d055465e7"
 }

package/source/filter/check_where_clause_on_address_space.ts

@@ -0,0 +1,29 @@
+import { IAddressSpace, ISessionContext, IEventData } from "node-opcua-address-space-base";
+import { checkFilter } from "node-opcua-service-filter";
+import { FilterContextOnAddressSpace } from "node-opcua-service-filter";
+import { ContentFilter } from "node-opcua-types";
+
+export function checkWhereClauseOnAdressSpace(
+    addressSpace: IAddressSpace,
+    sessionContext: ISessionContext,
+    whereClause: ContentFilter,
+    eventData: IEventData
+): boolean {
+
+    
+    // const filterContext: FilterContext = {
+    //     addressSpace,
+    //     sessionContext,
+    //     rootNode: eventData.$eventDataSource!,
+    //     extractValue(operand: FilterOperand) {
+    //         if (operand instanceof SimpleAttributeOperand) {
+    //             return extractEventFields(filterContext.sessionContext, [operand], eventData)[0];
+    //         } else {
+    //             return new Variant({ dataType: DataType.Null });
+    //         }
+    //     }
+    // };
+    const filterContext = new FilterContextOnAddressSpace(sessionContext, eventData);
+    
+    return checkFilter(filterContext, whereClause);
+}

package/source/filter/extract_event_fields.ts

@@ -0,0 +1,21 @@
+import { IEventData, ISessionContext } from "node-opcua-address-space-base";
+import { extractEventFieldsBase } from "node-opcua-service-filter";
+import { FilterContextOnAddressSpace } from "node-opcua-service-filter";
+import { SimpleAttributeOperand } from "node-opcua-types";
+import { Variant } from "node-opcua-variant";
+//
+
+/**
+ * @method extractEventFields
+ * extract a array of eventFields from a event node, matching the selectClauses
+ * @param selectClauses
+ * @param eventData : a pseudo Node that provides a browse Method and a readValue(nodeId)
+ */
+export function extractEventFields(
+    sessionContext: ISessionContext,
+    selectClauses: SimpleAttributeOperand[],
+    eventData: IEventData
+): Variant[] {
+    const context = new FilterContextOnAddressSpace(sessionContext, eventData);
+    return extractEventFieldsBase(context, selectClauses);
+}

package/source/monitored_item.ts

@@ -4,16 +4,9 @@
 import { EventEmitter } from "events";
 import * as chalk from "chalk";
 import { assert } from "node-opcua-assert";
-import {
-    BaseNode,
-    IEventData,
-    extractEventFields,
-    makeAttributeEventName,
-    SessionContext,
-    UAVariable,
-    checkWhereClause,
-    AddressSpace
-} from "node-opcua-address-space";
+import { BaseNode, IEventData, makeAttributeEventName, SessionContext, UAVariable, AddressSpace } from "node-opcua-address-space";
+
+import { extractEventFields } from "node-opcua-service-filter";
 import { DateTime, UInt32 } from "node-opcua-basic-types";
 import { NodeClass, QualifiedNameOptions } from "node-opcua-data-model";
 import { AttributeIds } from "node-opcua-data-model";
@@ -61,6 +54,7 @@ import { sameVariant, Variant } from "node-opcua-variant";
 
 import { appendToTimer, removeFromTimer } from "./node_sampler";
 import { validateFilter } from "./validate_filter";
+import { checkWhereClauseOnAdressSpace } from "./filter/check_where_clause_on_address_space";
 
 export type QueueItem = MonitoredItemNotification | EventFieldList;
 
@@ -925,7 +919,7 @@ export class MonitoredItem extends EventEmitter {
 
         const addressSpace: AddressSpace = eventData.$eventDataSource?.addressSpace as AddressSpace;
 
-        if (!checkWhereClause(addressSpace, SessionContext.defaultContext, this.filter.whereClause, eventData)) {
+        if (!checkWhereClauseOnAdressSpace(addressSpace, SessionContext.defaultContext, this.filter.whereClause, eventData)) {
             return;
         }