node-opcua-address-space 2.184.0 → 2.184.2

package/impl/address_space.ts

@@ -6,6 +6,7 @@ import chalk from "chalk";
 import type {
     AddReferenceOpts,
     BaseNode,
+    ConditionRefreshScope,
     IEventData,
     IHistoricalDataNodeOptions,
     ISessionContext,
@@ -226,6 +227,11 @@ export class AddressSpaceImpl implements AddressSpacePrivate {
     }
     public historizingNodes: Set<UAVariable> = new Set();
     public _condition_refresh_in_progress = false;
+    /**
+     * the Subscription (and, for ConditionRefresh2, the MonitoredItem) the refresh in progress
+     * was asked for; `null` outside a refresh. See ConditionRefreshScope.
+     */
+    public _condition_refresh_scope: ConditionRefreshScope | null = null;
 
     public readonly isNodeIdString = isNodeIdString;
     private readonly _private_namespaceIndex: number;

package/impl/address_space_private.ts

@@ -5,6 +5,7 @@
 import type {
     AddReferenceOpts,
     BaseNode,
+    ConditionRefreshScope,
     IAddressSpace,
     MethodCallInterceptor,
     UADataType,
@@ -36,6 +37,9 @@ export interface AddressSpacePrivate extends IAddressSpace {
 
     _condition_refresh_in_progress: boolean;
 
+    /** what the refresh in progress was asked for; `null` outside a refresh */
+    _condition_refresh_scope: ConditionRefreshScope | null;
+
     $$extraDataTypeManager?: ExtraDataTypeManager;
 
     _coerceNode(node: string | BaseNode | NodeIdLike): BaseNode | null;

package/impl/alarms_and_conditions/ua_condition_impl.ts

@@ -4,6 +4,7 @@
 import chalk from "chalk";
 import {
     type BaseNode,
+    type ConditionRefreshScope,
     fullPath2,
     type INamespace,
     type ISessionContext,
@@ -1122,7 +1123,27 @@ function _condition_refresh_method(
     });
 }
 
-function _perform_condition_refresh(addressSpace: AddressSpacePrivate, _inputArguments: VariantLike[], context: ISessionContext) {
+/**
+ * OPC 10000-9 4.5: the RefreshStart/RefreshEnd bracket "ignore[s] the Event content filtering
+ * associated with a Subscription and will always be delivered to the Client". The address space
+ * cannot apply that itself - it does not evaluate where clauses, the MonitoredItem does - so it
+ * says which Subscription the refresh is for and the server side bypasses the where clause for
+ * those two EventTypes, for that Subscription only.
+ *
+ * `null` when there is no Session behind the call (a PseudoSession, an in-process caller, a unit
+ * test): nothing is named, so nothing is bypassed.
+ */
+function _refresh_scope(inputArguments: VariantLike[], context: ISessionContext): ConditionRefreshScope | null {
+    const subscription = context.session?.getSubscription?.(inputArguments[0]?.value);
+    if (!subscription) {
+        return null;
+    }
+    // ConditionRefresh2 names one MonitoredItem (5.5.8); ConditionRefresh names none (5.5.7)
+    const monitoredItemId = inputArguments.length > 1 ? (inputArguments[1]?.value as number) : undefined;
+    return { subscription, monitoredItemId };
+}
+
+function _perform_condition_refresh(addressSpace: AddressSpacePrivate, inputArguments: VariantLike[], context: ISessionContext) {
     // --- possible StatusCodes:
     //
     // Bad_SubscriptionIdInvalid  See Part 4 for the description of this result code
@@ -1149,6 +1170,7 @@ function _perform_condition_refresh(addressSpace: AddressSpacePrivate, _inputArg
     }
 
     addressSpace._condition_refresh_in_progress = true;
+    addressSpace._condition_refresh_scope = _refresh_scope(inputArguments, context);
     try {
         server?.raiseEvent(refreshStartEventType, {});
 
@@ -1160,8 +1182,10 @@ function _perform_condition_refresh(addressSpace: AddressSpacePrivate, _inputArg
         server?.raiseEvent(refreshEndEventType, {});
     } finally {
         // whatever a condition's event handler throws, the next refresh must not be
-        // answered Bad_RefreshInProgress for ever
+        // answered Bad_RefreshInProgress for ever, and no later event must be taken
+        // for part of a refresh
         addressSpace._condition_refresh_in_progress = false;
+        addressSpace._condition_refresh_scope = null;
     }
 
     return StatusCodes.Good;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "node-opcua-address-space",
     "type": "module",
-    "version": "2.184.0",
+    "version": "2.184.2",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/api/index.js",
     "types": "./dist/api/index.d.ts",
@@ -23,48 +23,48 @@
         "@types/semver": "7.8.0",
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
-        "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-binary-stream": "2.184.0",
-        "node-opcua-client-dynamic-extension-object": "2.184.0",
+        "node-opcua-basic-types": "2.184.1",
+        "node-opcua-binary-stream": "2.184.1",
+        "node-opcua-client-dynamic-extension-object": "2.184.1",
         "node-opcua-constants": "2.184.0",
         "node-opcua-crypto": "5.10.1",
-        "node-opcua-data-access": "2.184.0",
-        "node-opcua-data-model": "2.184.0",
-        "node-opcua-data-value": "2.184.0",
-        "node-opcua-date-time": "2.184.0",
+        "node-opcua-data-access": "2.184.1",
+        "node-opcua-data-model": "2.184.1",
+        "node-opcua-data-value": "2.184.1",
+        "node-opcua-date-time": "2.184.1",
         "node-opcua-debug": "2.184.0",
-        "node-opcua-enum": "2.184.0",
-        "node-opcua-extension-object": "2.184.0",
-        "node-opcua-factory": "2.184.0",
-        "node-opcua-nodeid": "2.184.0",
-        "node-opcua-nodeset-ua": "2.184.0",
-        "node-opcua-numeric-range": "2.184.0",
+        "node-opcua-enum": "2.184.1",
+        "node-opcua-extension-object": "2.184.1",
+        "node-opcua-factory": "2.184.1",
+        "node-opcua-nodeid": "2.184.1",
+        "node-opcua-nodeset-ua": "2.184.2",
+        "node-opcua-numeric-range": "2.184.1",
         "node-opcua-object-registry": "2.184.0",
-        "node-opcua-pseudo-session": "2.184.0",
-        "node-opcua-service-browse": "2.184.0",
-        "node-opcua-service-call": "2.184.0",
-        "node-opcua-service-history": "2.184.0",
-        "node-opcua-service-translate-browse-path": "2.184.0",
-        "node-opcua-service-write": "2.184.0",
-        "node-opcua-status-code": "2.184.0",
-        "node-opcua-types": "2.184.0",
-        "node-opcua-utils": "2.184.0",
-        "node-opcua-variant": "2.184.0",
-        "node-opcua-xml2json": "2.184.0",
+        "node-opcua-pseudo-session": "2.184.1",
+        "node-opcua-service-browse": "2.184.1",
+        "node-opcua-service-call": "2.184.1",
+        "node-opcua-service-history": "2.184.1",
+        "node-opcua-service-translate-browse-path": "2.184.1",
+        "node-opcua-service-write": "2.184.1",
+        "node-opcua-status-code": "2.184.1",
+        "node-opcua-types": "2.184.1",
+        "node-opcua-utils": "2.184.1",
+        "node-opcua-variant": "2.184.1",
+        "node-opcua-xml2json": "2.184.1",
         "semver": "^7.8.5",
         "thenify-ex": "4.4.0",
         "xml-writer": "^1.7.0"
     },
     "devDependencies": {
         "humanize": "0.0.9",
-        "node-opcua-benchmarker": "2.184.0",
-        "node-opcua-leak-detector": "2.184.0",
+        "node-opcua-benchmarker": "2.184.1",
+        "node-opcua-leak-detector": "2.184.1",
         "node-opcua-nodesets": "2.184.0",
-        "node-opcua-packet-analyzer": "2.184.0",
-        "node-opcua-schemas": "2.184.0",
-        "node-opcua-service-filter": "2.184.0",
+        "node-opcua-packet-analyzer": "2.184.1",
+        "node-opcua-schemas": "2.184.1",
+        "node-opcua-service-filter": "2.184.2",
         "node-opcua-test-fixtures": "2.184.0",
         "node-opcua-test-helpers": "2.184.0"
     },
@@ -83,7 +83,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "441a5c63e3a4202eb8de8597acac77a3a49248b7",
+    "gitHead": "cd22145fbd019c2b80faa1b3b493b497e07e28ed",
     "files": [
         "dist",
         "distHelpers",