node-opcua-service-filter 2.74.0 → 2.75.0

package/dist/on_address_space/extract_event_fields.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractEventFields = void 0;
+//
+const extract_event_field_1 = require("../extract_event_field");
+const filter_context_on_address_space_1 = require("./filter_context_on_address_space");
+/**
+ * @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)
+ */
+function extractEventFields(sessionContext, selectClauses, eventData) {
+    const context = new filter_context_on_address_space_1.FilterContextOnAddressSpace(sessionContext, eventData);
+    return (0, extract_event_field_1.extractEventFieldsBase)(context, selectClauses);
+}
+exports.extractEventFields = extractEventFields;
+//# sourceMappingURL=extract_event_fields.js.map

package/dist/on_address_space/extract_event_fields.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"extract_event_fields.js","sourceRoot":"","sources":["../../source/on_address_space/extract_event_fields.ts"],"names":[],"mappings":";;;AAKA,EAAE;AACF,gEAAgE;AAChE,uFAAgF;AAGhF;;;;;GAKG;AACH,SAAgB,kBAAkB,CAC9B,cAA+B,EAC/B,aAAuC,EACvC,SAAqB;IAErB,MAAM,OAAO,GAAG,IAAI,6DAA2B,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IAC3E,OAAO,IAAA,4CAAsB,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AAC1D,CAAC;AAPD,gDAOC"}

package/dist/on_address_space/filter_context_on_address_space.d.ts

@@ -0,0 +1,19 @@
+import { BaseNode, IEventData, ISessionContext } from "node-opcua-address-space-base";
+import { NodeClass } from "node-opcua-data-model";
+import { NodeId, NodeIdLike } from "node-opcua-nodeid";
+import { BrowsePath } from "node-opcua-types";
+import { Variant } from "node-opcua-variant";
+import { FilterContext } from "../filter_context";
+export declare class FilterContextOnAddressSpace implements FilterContext {
+    private sessionContext;
+    private eventData;
+    eventSource: NodeId;
+    constructor(sessionContext: ISessionContext, eventData: IEventData);
+    getNodeClass(nodeId: NodeId): NodeClass;
+    isSubtypeOf(nodeId: NodeId, baseType: NodeId): boolean;
+    getTypeDefinition(nodeId: NodeId): NodeId | null;
+    readNodeValue(nodeId: NodeIdLike): Variant;
+    private getAddressSpace;
+    browsePath(browsePath: BrowsePath): NodeId | null;
+    setEventSource(eventSource: BaseNode | null): void;
+}

package/dist/on_address_space/filter_context_on_address_space.js

@@ -0,0 +1,109 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FilterContextOnAddressSpace = void 0;
+const node_opcua_data_model_1 = require("node-opcua-data-model");
+const node_opcua_debug_1 = require("node-opcua-debug");
+const node_opcua_nodeid_1 = require("node-opcua-nodeid");
+const node_opcua_status_code_1 = require("node-opcua-status-code");
+const node_opcua_variant_1 = require("node-opcua-variant");
+const warningLog = (0, node_opcua_debug_1.make_warningLog)("Filter");
+class FilterContextOnAddressSpace {
+    constructor(sessionContext, eventData) {
+        var _a;
+        this.sessionContext = sessionContext;
+        this.eventData = eventData;
+        this.eventSource = ((_a = this.eventData.$eventDataSource) === null || _a === void 0 ? void 0 : _a.nodeId) || node_opcua_nodeid_1.NodeId.nullNodeId;
+    }
+    getNodeClass(nodeId) {
+        const addressSpace = this.getAddressSpace();
+        const node = addressSpace.findNode(nodeId);
+        return node ? node.nodeClass : node_opcua_data_model_1.NodeClass.Unspecified;
+    }
+    isSubtypeOf(nodeId, baseType) {
+        const addressSpace = this.getAddressSpace();
+        const node = addressSpace.findNode(nodeId);
+        const baseTypeNode = addressSpace.findNode(baseType);
+        if (!node || !baseTypeNode) {
+            warningLog("invalid node - must be specifed ");
+            return false;
+        }
+        if (node.nodeClass === node_opcua_data_model_1.NodeClass.ObjectType && baseTypeNode.nodeClass === node_opcua_data_model_1.NodeClass.ObjectType) {
+            return node.isSupertypeOf(baseTypeNode);
+        }
+        if (node.nodeClass === node_opcua_data_model_1.NodeClass.VariableType && baseTypeNode.nodeClass === node_opcua_data_model_1.NodeClass.VariableType) {
+            return node.isSupertypeOf(baseTypeNode);
+        }
+        if (node.nodeClass === node_opcua_data_model_1.NodeClass.ReferenceType && baseTypeNode.nodeClass === node_opcua_data_model_1.NodeClass.ReferenceType) {
+            return node.isSupertypeOf(baseTypeNode);
+        }
+        if (node.nodeClass === node_opcua_data_model_1.NodeClass.DataType && baseTypeNode.nodeClass === node_opcua_data_model_1.NodeClass.DataType) {
+            return node.isSupertypeOf(baseTypeNode);
+        }
+        if (node.nodeClass === node_opcua_data_model_1.NodeClass.Object && baseTypeNode.nodeClass === node_opcua_data_model_1.NodeClass.ObjectType) {
+            const obj = node;
+            return obj.typeDefinitionObj.isSupertypeOf(baseTypeNode);
+        }
+        if (node.nodeClass === node_opcua_data_model_1.NodeClass.Variable && baseTypeNode.nodeClass !== node_opcua_data_model_1.NodeClass.VariableType) {
+            const obj = node;
+            return obj.typeDefinitionObj.isSupertypeOf(baseTypeNode);
+        }
+        return false;
+    }
+    getTypeDefinition(nodeId) {
+        const addressSpace = this.getAddressSpace();
+        const node = addressSpace.findNode(nodeId);
+        if (!node)
+            return null;
+        if (node.nodeClass === node_opcua_data_model_1.NodeClass.Object || node.nodeClass === node_opcua_data_model_1.NodeClass.Variable) {
+            return node.typeDefinition;
+        }
+        return null;
+    }
+    readNodeValue(nodeId) {
+        nodeId = (0, node_opcua_nodeid_1.coerceNodeId)(nodeId);
+        // use  cache/snapshot if available
+        const value = this.eventData._readValue(nodeId);
+        if (value) {
+            return value;
+        }
+        const addressSpace = this.getAddressSpace();
+        const node = addressSpace.findNode(nodeId);
+        if (!node || node.nodeClass !== node_opcua_data_model_1.NodeClass.Variable) {
+            return new node_opcua_variant_1.Variant();
+        }
+        return prepare(node.readValue(this.sessionContext));
+    }
+    getAddressSpace() {
+        return this.eventData.$eventDataSource.addressSpace;
+    }
+    browsePath(browsePath) {
+        // delegate to eventData if appropriate
+        if ((0, node_opcua_nodeid_1.sameNodeId)(browsePath.startingNode, this.eventSource)) {
+            const browseResult = this.eventData._browse(browsePath);
+            if (browseResult &&
+                browseResult.statusCode === node_opcua_status_code_1.StatusCodes.Good &&
+                browseResult.targets &&
+                browseResult.targets.length === 1) {
+                return browseResult.targets[0].targetId;
+            }
+        }
+        // fallback to addressSpace otherwise
+        const addressSpace = this.getAddressSpace();
+        const browseResult = addressSpace.browsePath(browsePath);
+        if (browseResult.statusCode !== node_opcua_status_code_1.StatusCodes.Good || !browseResult.targets || browseResult.targets.length !== 1) {
+            return null;
+        }
+        return browseResult.targets[0].targetId;
+    }
+    setEventSource(eventSource) {
+        this.eventSource = eventSource ? eventSource.nodeId : node_opcua_nodeid_1.NodeId.nullNodeId;
+    }
+}
+exports.FilterContextOnAddressSpace = FilterContextOnAddressSpace;
+function prepare(dataValue) {
+    if (dataValue.statusCode === node_opcua_status_code_1.StatusCodes.Good) {
+        return dataValue.value;
+    }
+    return new node_opcua_variant_1.Variant({ dataType: node_opcua_variant_1.DataType.StatusCode, value: dataValue.statusCode });
+}
+//# sourceMappingURL=filter_context_on_address_space.js.map

package/dist/on_address_space/filter_context_on_address_space.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"filter_context_on_address_space.js","sourceRoot":"","sources":["../../source/on_address_space/filter_context_on_address_space.ts"],"names":[],"mappings":"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"}

package/dist/on_address_space/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./filter_context_on_address_space";
+export * from "./extract_event_fields";

package/dist/on_address_space/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./filter_context_on_address_space"), exports);
+__exportStar(require("./extract_event_fields"), exports);
+//# sourceMappingURL=index.js.map

package/dist/on_address_space/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../source/on_address_space/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,oEAAkD;AAClD,yDAAuC"}

package/dist/resolve_operand.d.ts

@@ -0,0 +1,4 @@
+import { SimpleAttributeOperand, AttributeOperand } from "node-opcua-types";
+import { Variant } from "node-opcua-variant";
+import { FilterContext } from "./filter_context";
+export declare function resolveOperand(context: FilterContext, operand: SimpleAttributeOperand | AttributeOperand): Variant;

package/dist/resolve_operand.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveOperand = void 0;
+const node_opcua_data_model_1 = require("node-opcua-data-model");
+const node_opcua_debug_1 = require("node-opcua-debug");
+const node_opcua_service_translate_browse_path_1 = require("node-opcua-service-translate-browse-path");
+const node_opcua_status_code_1 = require("node-opcua-status-code");
+const node_opcua_types_1 = require("node-opcua-types");
+const node_opcua_variant_1 = require("node-opcua-variant");
+const warningLog = (0, node_opcua_debug_1.make_warningLog)("FILTER");
+// export function readOperand(context: FilterContext, operand: SimpleAttributeOperand): Variant {
+//     // navigate to the innerNode specified by the browsePath [ QualifiedName]
+//     const browsePath = constructBrowsePathFromQualifiedName({ nodeId: context.eventSource }, operand.browsePath);
+//     const targetNode = context.browsePath(browsePath);
+//     if (!targetNode) {
+//         return new Variant({ dataType: DataType.Null });
+//     }
+//     return context.readNodeValue(targetNode);
+// }
+function resolveOperand(context, operand) {
+    if (operand instanceof node_opcua_types_1.SimpleAttributeOperand) {
+        const browsePath = (0, node_opcua_service_translate_browse_path_1.constructBrowsePathFromQualifiedName)({ nodeId: context.eventSource }, operand.browsePath);
+        const target = context.browsePath(browsePath);
+        if (!target) {
+            return new node_opcua_variant_1.Variant({ dataType: node_opcua_variant_1.DataType.Null });
+            // return new Variant({ dataType: DataType.StatusCode, value: StatusCodes.BadNodeIdUnknown });
+        }
+        const nodeClass = context.getNodeClass(target);
+        if (nodeClass !== node_opcua_data_model_1.NodeClass.Variable) {
+            warningLog("resolveOperand: cannot find variable here but got nodeClass", node_opcua_data_model_1.NodeClass[nodeClass], browsePath.toString());
+            return new node_opcua_variant_1.Variant({ dataType: node_opcua_variant_1.DataType.StatusCode, value: node_opcua_status_code_1.StatusCodes.BadNodeClassInvalid });
+        }
+        const value = context.readNodeValue(target);
+        return value;
+    }
+    else {
+        if (!(operand instanceof node_opcua_types_1.AttributeOperand)) {
+            throw new Error("expecting an AttributeOperand");
+        }
+        warningLog("AttributeOperand is not yet implemented");
+        return new node_opcua_variant_1.Variant({ dataType: node_opcua_variant_1.DataType.Null });
+    }
+}
+exports.resolveOperand = resolveOperand;
+//# sourceMappingURL=resolve_operand.js.map

package/dist/resolve_operand.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve_operand.js","sourceRoot":"","sources":["../source/resolve_operand.ts"],"names":[],"mappings":";;;AAAA,iEAAkD;AAClD,uDAAmD;AAEnD,uGAAgH;AAChH,mEAAqD;AACrD,uDAAgG;AAChG,2DAAuD;AAGvD,MAAM,UAAU,GAAG,IAAA,kCAAe,EAAC,QAAQ,CAAC,CAAC;AAE7C,kGAAkG;AAClG,gFAAgF;AAChF,oHAAoH;AACpH,yDAAyD;AACzD,yBAAyB;AACzB,2DAA2D;AAC3D,QAAQ;AACR,gDAAgD;AAChD,IAAI;AAEJ,SAAgB,cAAc,CAAC,OAAsB,EAAE,OAAkD;IACrG,IAAI,OAAO,YAAY,yCAAsB,EAAE;QAC3C,MAAM,UAAU,GAAG,IAAA,+EAAoC,EAAC,EAAE,MAAM,EAAE,OAAO,CAAC,WAAW,EAAE,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QAE7G,MAAM,MAAM,GAAkB,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAC7D,IAAI,CAAC,MAAM,EAAE;YACT,OAAO,IAAI,4BAAO,CAAC,EAAE,QAAQ,EAAE,6BAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;YAChD,8FAA8F;SACjG;QACD,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC/C,IAAI,SAAS,KAAK,iCAAS,CAAC,QAAQ,EAAE;YAClC,UAAU,CAAC,6DAA6D,EAAE,iCAAS,CAAC,SAAS,CAAC,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;YACvH,OAAO,IAAI,4BAAO,CAAC,EAAE,QAAQ,EAAE,6BAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,oCAAW,CAAC,mBAAmB,EAAE,CAAC,CAAC;SACjG;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC5C,OAAO,KAAK,CAAC;KAChB;SAAM;QACH,IAAI,CAAC,CAAC,OAAO,YAAY,mCAAgB,CAAC,EAAE;YACxC,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;SACpD;QACD,UAAU,CAAC,yCAAyC,CAAC,CAAC;QACtD,OAAO,IAAI,4BAAO,CAAC,EAAE,QAAQ,EAAE,6BAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;KACnD;AACL,CAAC;AAvBD,wCAuBC"}

package/dist/tools_event_filter.d.ts

@@ -1,12 +1,10 @@
-/**
- * @module node-opcua-service-filter
- */
-import { NodeId } from "node-opcua-nodeid";
-import { EventFilter, SimpleAttributeOperand } from "./imports";
+import { ContentFilterElement, ContentFilterOptions, EventFilter, SimpleAttributeOperand } from "./imports";
+export declare function constructSelectClause(arrayOfNames: string | string[]): SimpleAttributeOperand[];
 /**
  * helper to construct event filters:
  * construct a simple event filter
  *
+ *  "ConditionId" in the arrayOfNames has a special meaning
  *
  * @example
  *
@@ -19,14 +17,4 @@ import { EventFilter, SimpleAttributeOperand } from "./imports";
  *     constructEventFilter(["SourceName" ,"EnabledState.EffectiveDisplayName" ]);
  *
  */
-export declare function constructEventFilter(arrayOfNames: string[] | string, conditionTypes?: NodeId[] | NodeId): EventFilter;
-/**
- * @class SimpleAttributeOperand
- * @method toShortString
- * @return {String}
- *
- * @example:
- *
- *
- */
-export declare function simpleAttributeOperandToShortString(self: SimpleAttributeOperand, addressSpace: any): string;
+export declare function constructEventFilter(arrayOfNames: string[] | string, whereClause?: ContentFilterOptions | ContentFilterElement): EventFilter;

package/dist/tools_event_filter.js

@@ -1,158 +1,90 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.constructEventFilter = exports.constructSelectClause = void 0;
 /**
  * @module node-opcua-service-filter
  */
-// tslint:disable:object-literal-shorthand
-// tslint:disable:only-arrow-functions
-// tslint:disable:max-line-length
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.simpleAttributeOperandToShortString = exports.constructEventFilter = void 0;
 const node_opcua_constants_1 = require("node-opcua-constants");
 const node_opcua_data_model_1 = require("node-opcua-data-model");
-const node_opcua_debug_1 = require("node-opcua-debug");
-const node_opcua_nodeid_1 = require("node-opcua-nodeid");
 const imports_1 = require("./imports");
-const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
-const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
-/**
- * helper to construct event filters:
- * construct a simple event filter
- *
- *
- * @example
- *
- *     constructEventFilter(["SourceName","Message","ReceiveTime"]);
- *
- *     constructEventFilter(["SourceName",{namespaceIndex:2 , "MyData"}]);
- *     constructEventFilter(["SourceName","2:MyData" ]);
- *
- *     constructEventFilter(["SourceName" ,["EnabledState","EffectiveDisplayName"] ]);
- *     constructEventFilter(["SourceName" ,"EnabledState.EffectiveDisplayName" ]);
- *
- */
-function constructEventFilter(arrayOfNames, conditionTypes) {
+function constructSelectClause(arrayOfNames) {
     if (!Array.isArray(arrayOfNames)) {
-        return constructEventFilter([arrayOfNames], conditionTypes);
-    }
-    if (conditionTypes && !Array.isArray(conditionTypes)) {
-        return constructEventFilter(arrayOfNames, [conditionTypes]);
-    }
-    // istanbul ignore next
-    if (!(arrayOfNames instanceof Array)) {
-        throw new Error("internal error");
+        return constructSelectClause([arrayOfNames]);
     }
     // replace "string" element in the form A.B.C into [ "A","B","C"]
-    const arrayOfNames2 = arrayOfNames.map((path) => {
-        if (typeof path !== "string") {
-            return path;
-        }
-        return path.split(".");
-    });
-    const arrayOfNames3 = arrayOfNames2.map((path) => {
-        if (Array.isArray(path)) {
-            return path.map(node_opcua_data_model_1.stringToQualifiedName);
-        }
-        return path;
-    });
+    const arrayOfNames2 = arrayOfNames.map((path) => (typeof path !== "string" ? path : path.split(".")));
+    const arrayOfNames3 = arrayOfNames2.map((path) => (Array.isArray(path) ? path.map(node_opcua_data_model_1.stringToQualifiedName) : path));
     // replace "string" elements in arrayOfName with QualifiedName in namespace 0
-    const arrayOfNames4 = arrayOfNames3.map((s) => {
-        return typeof s === "string" ? (0, node_opcua_data_model_1.stringToQualifiedName)(s) : s;
-    });
+    const arrayOfNames4 = arrayOfNames3.map((s) => (typeof s === "string" ? (0, node_opcua_data_model_1.stringToQualifiedName)(s) : s));
     // construct browse paths array
-    const browsePaths = arrayOfNames4.map((s) => {
-        return Array.isArray(s) ? s : [s];
-    });
+    const browsePaths = arrayOfNames4.map((s) => (Array.isArray(s) ? s : [s]));
     // Part 4 page 127:
     // In some cases the same BrowsePath will apply to multiple EventTypes. If the Client specifies the BaseEventType
     // in the SimpleAttributeOperand then the Server shall evaluate the BrowsePath without considering the Type.
+    const isBrowsePathForConditionId = (browsePath) => browsePath.length === 1 && browsePath[0].namespaceIndex === 0 && browsePath[0].name === "ConditionId";
     // [..]
     // The SimpleAttributeOperand structure allows the Client to specify any Attribute, however, the Server is only
     // required to support the Value Attribute for Variable Nodes and the NodeId Attribute for Object Nodes.
     // That said, profiles defined in Part 7 may make support for additional Attributes mandatory.
-    let selectClauses = browsePaths.map((browsePath) => {
-        return new imports_1.SimpleAttributeOperand({
-            attributeId: node_opcua_data_model_1.AttributeIds.Value,
-            browsePath,
-            indexRange: undefined,
-            typeDefinitionId: (0, node_opcua_nodeid_1.makeNodeId)(node_opcua_constants_1.ObjectTypeIds.BaseEventType) // i=2041
-        });
-    });
-    if (conditionTypes && conditionTypes instanceof Array) {
-        const extraSelectClauses = conditionTypes.map((nodeId) => {
+    const selectClauses = browsePaths.map((browsePath) => {
+        if (isBrowsePathForConditionId(browsePath)) {
+            // special case
+            //
+            // The NodeId of the Condition instance is used as ConditionId. It is not explicitly modelled as a
+            // component of the ConditionType. However, it can be requested with the following
+            // SimpleAttributeOperand (see Table 10) in the SelectClause of the EventFilter:
+            //
+            //  SimpleAttributeOperand
+            //  Name          Type          Description
+            //  typeId        NodeId        NodeId of the ConditionType Node
+            //  browsePath[]  QualifiedName empty
+            //  attributeId   IntegerId     Id of the NodeId Attribute
+            //
             return new imports_1.SimpleAttributeOperand({
                 attributeId: node_opcua_data_model_1.AttributeIds.NodeId,
-                browsePath: undefined,
+                browsePath: null,
                 indexRange: undefined,
-                typeDefinitionId: nodeId // conditionType for instance
+                typeDefinitionId: node_opcua_constants_1.ObjectTypeIds.ConditionType // i=2782
             });
-        });
-        selectClauses = selectClauses.concat(extraSelectClauses);
-    }
-    const filter = new imports_1.EventFilter({
-        selectClauses,
-        whereClause: {
-            // ContentFilter
-            elements: [
-            // ContentFilterElement
-            // {
-            //    filterOperator: FilterOperator.IsNull,
-            //    filterOperands: [ //
-            //        new ElementOperand({
-            //            index: 123
-            //        }),
-            //        new AttributeOperand({
-            //            nodeId: "i=10",
-            //            alias: "someText",
-            //            browsePath: { //RelativePath
-            //
-            //            },
-            //            attributeId: AttributeIds.Value
-            //        })
-            //    ]
-            // }
-            ]
         }
+        else
+            return new imports_1.SimpleAttributeOperand({
+                attributeId: node_opcua_data_model_1.AttributeIds.Value,
+                browsePath,
+                indexRange: undefined,
+                typeDefinitionId: node_opcua_constants_1.ObjectTypeIds.BaseEventType // i=2041
+            });
     });
-    return filter;
+    return selectClauses;
 }
-exports.constructEventFilter = constructEventFilter;
+exports.constructSelectClause = constructSelectClause;
 /**
- * @class SimpleAttributeOperand
- * @method toPath
- * @return {String}
+ * helper to construct event filters:
+ * construct a simple event filter
  *
- * @example:
+ *  "ConditionId" in the arrayOfNames has a special meaning
  *
+ * @example
  *
- */
-function simpleAttributeOperandToPath(self) {
-    if (!self.browsePath) {
-        return "";
-    }
-    return self.browsePath
-        .map((a) => {
-        return a.name;
-    })
-        .join("/");
-}
-/**
- * @class SimpleAttributeOperand
- * @method toShortString
- * @return {String}
+ *     constructEventFilter(["SourceName","Message","ReceiveTime"]);
  *
- * @example:
+ *     constructEventFilter(["SourceName",{namespaceIndex:2 , "MyData"}]);
+ *     constructEventFilter(["SourceName","2:MyData" ]);
  *
+ *     constructEventFilter(["SourceName" ,["EnabledState","EffectiveDisplayName"] ]);
+ *     constructEventFilter(["SourceName" ,"EnabledState.EffectiveDisplayName" ]);
  *
  */
-function simpleAttributeOperandToShortString(self, addressSpace // Address Space
-) {
-    let str = "";
-    if (addressSpace) {
-        const n = addressSpace.findNode(self.typeDefinitionId);
-        str += n.BrowseName.toString();
+function constructEventFilter(arrayOfNames, whereClause) {
+    const selectClauses = constructSelectClause(arrayOfNames);
+    if (whereClause instanceof imports_1.ContentFilterElement) {
+        whereClause = new imports_1.ContentFilter({ elements: [whereClause] });
     }
-    str += "[" + self.typeDefinitionId.toString() + "]" + simpleAttributeOperandToPath(self);
-    return str;
+    const filter = new imports_1.EventFilter({
+        selectClauses,
+        whereClause
+    });
+    return filter;
 }
-exports.simpleAttributeOperandToShortString = simpleAttributeOperandToShortString;
+exports.constructEventFilter = constructEventFilter;
 //# sourceMappingURL=tools_event_filter.js.map

package/dist/tools_event_filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"tools_event_filter.js","sourceRoot":"","sources":["../source/tools_event_filter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tools_event_filter.js","sourceRoot":"","sources":["../source/tools_event_filter.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,+DAAqD;AACrD,iEAA2F;AAG3F,uCAA2I;AAI3I,SAAgB,qBAAqB,CAAC,YAA+B;IACjE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QAC9B,OAAO,qBAAqB,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;KAChD;IAED,iEAAiE;IACjE,MAAM,aAAa,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEtG,MAAM,aAAa,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,6CAAqB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAElH,6EAA6E;IAC7E,MAAM,aAAa,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,6CAAqB,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEvG,+BAA+B;IAC/B,MAAM,WAAW,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE3E,mBAAmB;IACnB,iHAAiH;IACjH,4GAA4G;IAE5G,MAAM,0BAA0B,GAAG,CAAC,UAA2B,EAAE,EAAE,CAC/D,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,cAAc,KAAK,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,CAAC;IAE1G,OAAO;IACP,+GAA+G;IAC/G,wGAAwG;IACxG,8FAA8F;IAC9F,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAA2B,EAAE,EAAE;QAClE,IAAI,0BAA0B,CAAC,UAAU,CAAC,EAAE;YACxC,eAAe;YACf,EAAE;YACF,kGAAkG;YAClG,kFAAkF;YAClF,gFAAgF;YAChF,EAAE;YACF,0BAA0B;YAC1B,2CAA2C;YAC3C,gEAAgE;YAChE,qCAAqC;YACrC,0DAA0D;YAC1D,EAAE;YACF,OAAO,IAAI,gCAAsB,CAAC;gBAC9B,WAAW,EAAE,oCAAY,CAAC,MAAM;gBAChC,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,SAAS;gBACrB,gBAAgB,EAAE,oCAAa,CAAC,aAAa,CAAC,SAAS;aAC1D,CAAC,CAAC;SACN;;YACG,OAAO,IAAI,gCAAsB,CAAC;gBAC9B,WAAW,EAAE,oCAAY,CAAC,KAAK;gBAC/B,UAAU;gBACV,UAAU,EAAE,SAAS;gBACrB,gBAAgB,EAAE,oCAAa,CAAC,aAAa,CAAC,SAAS;aAC1D,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;IACH,OAAO,aAAa,CAAC;AACzB,CAAC;AAxDD,sDAwDC;AACD;;;;;;;;;;;;;;;;GAgBG;AACH,SAAgB,oBAAoB,CAChC,YAA+B,EAC/B,WAAyD;IAEzD,MAAM,aAAa,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAAC;IAE1D,IAAI,WAAW,YAAY,8BAAoB,EAAE;QAC7C,WAAW,GAAG,IAAI,uBAAa,CAAC,EAAE,QAAQ,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;KAChE;IACD,MAAM,MAAM,GAAG,IAAI,qBAAW,CAAC;QAC3B,aAAa;QACb,WAAW;KACd,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAClB,CAAC;AAdD,oDAcC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-service-filter",
-    "version": "2.74.0",
+    "version": "2.75.0",
     "description": "pure nodejs OPCUA SDK - module -service-filter",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -10,22 +10,26 @@
         "build": "tsc -b"
     },
     "dependencies": {
+        "node-opcua-address-space-base": "2.75.0",
         "node-opcua-assert": "2.74.0",
         "node-opcua-basic-types": "2.74.0",
         "node-opcua-binary-stream": "2.74.0",
         "node-opcua-constants": "2.74.0",
-        "node-opcua-data-model": "2.74.0",
+        "node-opcua-data-model": "2.75.0",
+        "node-opcua-data-value": "2.75.0",
         "node-opcua-debug": "2.74.0",
-        "node-opcua-factory": "2.74.0",
+        "node-opcua-extension-object": "2.75.0",
+        "node-opcua-factory": "2.75.0",
         "node-opcua-nodeid": "2.74.0",
-        "node-opcua-numeric-range": "2.74.0",
-        "node-opcua-service-translate-browse-path": "2.74.0",
+        "node-opcua-numeric-range": "2.75.0",
+        "node-opcua-packet-analyzer": "2.75.0",
+        "node-opcua-service-translate-browse-path": "2.75.0",
         "node-opcua-status-code": "2.74.0",
-        "node-opcua-types": "2.74.0",
-        "node-opcua-variant": "2.74.0"
+        "node-opcua-types": "2.75.0",
+        "node-opcua-variant": "2.75.0"
     },
     "devDependencies": {
-        "node-opcua-service-secure-channel": "2.74.0",
+        "node-opcua-service-secure-channel": "2.75.0",
         "should": "^13.2.3"
     },
     "author": "Etienne Rossignon",
@@ -43,5 +47,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "003ee041795f3b737afaaef5721045ee31ea9f77"
+    "gitHead": "5ccb835ca480c2a8a591ae61b5949a9d8bad4017"
 }

package/source/check_event_clause.ts

@@ -0,0 +1,54 @@
+/**
+ * @module node-opcua-address-space
+ */
+import { NodeClass } from "node-opcua-data-model";
+import { SimpleAttributeOperand } from "node-opcua-types";
+import { constructBrowsePathFromQualifiedName } from "node-opcua-service-translate-browse-path";
+import { StatusCode, StatusCodes } from "node-opcua-status-code";
+import { BaseNode, UAObjectType } from "node-opcua-address-space-base";
+
+/**
+ * @method checkSelectClause
+ * @param parentNode
+ * @param selectClause
+ * @return {Array<StatusCode>}
+ */
+export function checkSelectClause(parentNode: BaseNode, selectClause: SimpleAttributeOperand): StatusCode {
+    //
+    const addressSpace = parentNode.addressSpace;
+
+    // istanbul ignore next
+    if (selectClause.typeDefinitionId.isEmpty()) {
+        return StatusCodes.Good;
+    }
+    const eventTypeNode = addressSpace.findEventType(selectClause.typeDefinitionId)!;
+
+    if (!eventTypeNode || !(eventTypeNode.nodeClass === NodeClass.ObjectType)) {
+        // xx console.log("eventTypeNode = ",selectClause.typeDefinitionId.toString());
+        // xx console.log("eventTypeNode = ",eventTypeNode);
+        // istanbul ignore next
+        if (eventTypeNode) {
+            console.log(eventTypeNode.toString());
+        }
+    }
+
+    // istanbul ignore next
+    if (eventTypeNode.nodeClass !== NodeClass.ObjectType) {
+        return StatusCodes.BadTypeMismatch;
+    }
+
+    // navigate to the innerNode specified by the browsePath [ QualifiedName]
+    const browsePath = constructBrowsePathFromQualifiedName(eventTypeNode, selectClause.browsePath);
+    const browsePathResult = addressSpace.browsePath(browsePath);
+    return browsePathResult.statusCode;
+}
+
+/**
+ * @method checkSelectClauses
+ * @param eventTypeNode
+ * @param selectClauses
+ * @return an array of StatusCode
+ */
+export function checkSelectClauses(eventTypeNode: UAObjectType, selectClauses: SimpleAttributeOperand[]): StatusCode[] {
+    return selectClauses.map(checkSelectClause.bind(null, eventTypeNode));
+}