node-opcua-service-filter 2.184.0 → 2.184.2

package/dist/check_event_clause.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"check_event_clause.d.ts","sourceRoot":"","sources":["../source/check_event_clause.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAI5E,OAAO,EAAE,KAAK,UAAU,EAAe,MAAM,wBAAwB,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAK/D;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,sBAAsB,GAAG,UAAU,CAkCxG;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,sBAAsB,EAAE,GAAG,UAAU,EAAE,CAErH"}
+{"version":3,"file":"check_event_clause.d.ts","sourceRoot":"","sources":["../source/check_event_clause.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAI5E,OAAO,EAAE,KAAK,UAAU,EAAe,MAAM,wBAAwB,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAK/D;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,sBAAsB,GAAG,UAAU,CAkDxG;AA2BD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,sBAAsB,EAAE,GAAG,UAAU,EAAE,CAErH"}

package/dist/check_event_clause.js

@@ -42,8 +42,46 @@ export function checkSelectClause(parentNode, selectClause) {
     // navigate to the innerNode specified by the browsePath [ QualifiedName]
     const browsePath = constructBrowsePathFromQualifiedName(eventTypeNode, selectClause.browsePath);
     const browsePathResult = addressSpace.browsePath(browsePath);
+    if (browsePathResult.statusCode.isGood()) {
+        return browsePathResult.statusCode;
+    }
+    // OPC 10000-4 7.4.4.5: typeDefinitionId restricts the operand to instances of that type *or its
+    // subtypes*, so a browsePath that does not resolve on typeDefinitionId itself is still valid as soon
+    // as one subtype declares it. BaseEventType therefore acts as a wildcard: an Alarms and Conditions
+    // client asks for [BranchId] or [Retain] with typeDefinitionId = BaseEventType, and those fields are
+    // declared on ConditionType. Delivery already resolves per event instance (see extractEventField), so
+    // only the validation had to be relaxed - and only for the clauses that did not resolve directly, so
+    // the walk below never runs for a well-targeted filter.
+    if (findFieldInSubtypes(eventTypeNode, selectClause)) {
+        return StatusCodes.Good;
+    }
+    // the field is declared by no subtype of typeDefinitionId either: report the original diagnostic.
     return browsePathResult.statusCode;
 }
+/**
+ * depth-first search of the subtypes of eventTypeNode for one that declares the browsePath of selectClause.
+ *
+ * This is bounded by the *event type* hierarchy, not by the address space: event types are a few dozen
+ * ObjectTypes even in a large server, and the search only runs when the direct resolution failed, on a
+ * CreateMonitoredItems / filter validation path. It is not a per-notification cost.
+ */
+function findFieldInSubtypes(eventTypeNode, selectClause) {
+    const addressSpace = eventTypeNode.addressSpace;
+    const subtypes = eventTypeNode.findReferencesAsObject("HasSubtype", true);
+    for (const subtype of subtypes) {
+        if (subtype.nodeClass !== NodeClass.ObjectType) {
+            continue;
+        }
+        const browsePath = constructBrowsePathFromQualifiedName(subtype, selectClause.browsePath);
+        if (addressSpace.browsePath(browsePath).statusCode.isGood()) {
+            return true;
+        }
+        if (findFieldInSubtypes(subtype, selectClause)) {
+            return true;
+        }
+    }
+    return false;
+}
 /**
 
  * @param eventTypeNode

package/dist/check_event_clause.js.map

@@ -1 +1 @@
-{"version":3,"file":"check_event_clause.js","sourceRoot":"","sources":["../source/check_event_clause.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,oCAAoC,EAAE,MAAM,0CAA0C,CAAC;AAChG,OAAO,EAAmB,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGtE,MAAM,QAAQ,GAAG,aAAa,CAAC,oBAAoB,CAAC,CAAC;AACrD,MAAM,OAAO,GAAG,cAAc,CAAC,oBAAoB,CAAC,CAAC;AAErD;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,UAAoB,EAAE,YAAoC;IACxF,EAAE;IACF,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;IAE7C,oBAAoB;IACpB,IAAI,YAAY,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAE,CAAC;QAC1C,OAAO,WAAW,CAAC,IAAI,CAAC;IAC5B,CAAC;IACD,MAAM,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAEhF,2DAA2D;IAC3D,IAAI,CAAC,aAAa,EAAE,CAAC;QACjB,OAAO,WAAW,CAAC,gBAAgB,CAAC;IACxC,CAAC;IACD,yDAAyD;IACzD,IAAI,aAAa,CAAC,SAAS,KAAK,SAAS,CAAC,UAAU,EAAE,CAAC;QACnD,oBAAoB;QACpB,OAAO,IAAI,QAAQ,CAAC,oBAAoB,EAAE,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpE,OAAO,WAAW,CAAC,eAAe,CAAC;IACvC,CAAC;IAED,+FAA+F;IAC/F,gGAAgG;IAChG,8FAA8F;IAC9F,kGAAkG;IAClG,gDAAgD;IAChD,IAAI,CAAC,YAAY,CAAC,UAAU,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnE,OAAO,WAAW,CAAC,IAAI,CAAC;IAC5B,CAAC;IAED,yEAAyE;IACzE,MAAM,UAAU,GAAG,oCAAoC,CAAC,aAAa,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;IAChG,MAAM,gBAAgB,GAAG,YAAY,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAC7D,OAAO,gBAAgB,CAAC,UAAU,CAAC;AACvC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAAC,aAA2B,EAAE,aAAuC;IACnG,OAAO,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC;AAC1E,CAAC"}
+{"version":3,"file":"check_event_clause.js","sourceRoot":"","sources":["../source/check_event_clause.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "node-opcua-service-filter",
     "type": "module",
-    "version": "2.184.0",
+    "version": "2.184.2",
     "description": "pure nodejs OPCUA SDK - module service-filter",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -15,23 +15,23 @@
         "node": ">=22.13.0"
     },
     "dependencies": {
-        "node-opcua-address-space-base": "2.184.0",
+        "node-opcua-address-space-base": "2.184.2",
         "node-opcua-assert": "2.184.0",
-        "node-opcua-basic-types": "2.184.0",
+        "node-opcua-basic-types": "2.184.1",
         "node-opcua-constants": "2.184.0",
-        "node-opcua-data-model": "2.184.0",
-        "node-opcua-data-value": "2.184.0",
+        "node-opcua-data-model": "2.184.1",
+        "node-opcua-data-value": "2.184.1",
         "node-opcua-debug": "2.184.0",
-        "node-opcua-extension-object": "2.184.0",
-        "node-opcua-nodeid": "2.184.0",
-        "node-opcua-service-translate-browse-path": "2.184.0",
-        "node-opcua-status-code": "2.184.0",
-        "node-opcua-types": "2.184.0",
-        "node-opcua-variant": "2.184.0"
+        "node-opcua-extension-object": "2.184.1",
+        "node-opcua-nodeid": "2.184.1",
+        "node-opcua-service-translate-browse-path": "2.184.1",
+        "node-opcua-status-code": "2.184.1",
+        "node-opcua-types": "2.184.1",
+        "node-opcua-variant": "2.184.1"
     },
     "devDependencies": {
-        "node-opcua-numeric-range": "2.184.0",
-        "node-opcua-packet-analyzer": "2.184.0"
+        "node-opcua-numeric-range": "2.184.1",
+        "node-opcua-packet-analyzer": "2.184.1"
     },
     "author": "Etienne Rossignon",
     "license": "MIT",
@@ -48,7 +48,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "441a5c63e3a4202eb8de8597acac77a3a49248b7",
+    "gitHead": "cd22145fbd019c2b80faa1b3b493b497e07e28ed",
     "files": [
         "dist",
         "source"

package/source/check_event_clause.ts

@@ -51,9 +51,50 @@ export function checkSelectClause(parentNode: BaseNode, selectClause: SimpleAttr
     // navigate to the innerNode specified by the browsePath [ QualifiedName]
     const browsePath = constructBrowsePathFromQualifiedName(eventTypeNode, selectClause.browsePath);
     const browsePathResult = addressSpace.browsePath(browsePath);
+    if (browsePathResult.statusCode.isGood()) {
+        return browsePathResult.statusCode;
+    }
+
+    // OPC 10000-4 7.4.4.5: typeDefinitionId restricts the operand to instances of that type *or its
+    // subtypes*, so a browsePath that does not resolve on typeDefinitionId itself is still valid as soon
+    // as one subtype declares it. BaseEventType therefore acts as a wildcard: an Alarms and Conditions
+    // client asks for [BranchId] or [Retain] with typeDefinitionId = BaseEventType, and those fields are
+    // declared on ConditionType. Delivery already resolves per event instance (see extractEventField), so
+    // only the validation had to be relaxed - and only for the clauses that did not resolve directly, so
+    // the walk below never runs for a well-targeted filter.
+    if (findFieldInSubtypes(eventTypeNode as UAObjectType, selectClause)) {
+        return StatusCodes.Good;
+    }
+
+    // the field is declared by no subtype of typeDefinitionId either: report the original diagnostic.
     return browsePathResult.statusCode;
 }
 
+/**
+ * depth-first search of the subtypes of eventTypeNode for one that declares the browsePath of selectClause.
+ *
+ * This is bounded by the *event type* hierarchy, not by the address space: event types are a few dozen
+ * ObjectTypes even in a large server, and the search only runs when the direct resolution failed, on a
+ * CreateMonitoredItems / filter validation path. It is not a per-notification cost.
+ */
+function findFieldInSubtypes(eventTypeNode: UAObjectType, selectClause: SimpleAttributeOperand): boolean {
+    const addressSpace = eventTypeNode.addressSpace;
+    const subtypes = eventTypeNode.findReferencesAsObject("HasSubtype", true);
+    for (const subtype of subtypes) {
+        if (subtype.nodeClass !== NodeClass.ObjectType) {
+            continue;
+        }
+        const browsePath = constructBrowsePathFromQualifiedName(subtype, selectClause.browsePath);
+        if (addressSpace.browsePath(browsePath).statusCode.isGood()) {
+            return true;
+        }
+        if (findFieldInSubtypes(subtype as UAObjectType, selectClause)) {
+            return true;
+        }
+    }
+    return false;
+}
+
 /**
 
  * @param eventTypeNode