node-opcua-address-space 2.184.1 → 2.184.3

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,35 @@ function _condition_refresh_method(
     });
 }
 
-function _perform_condition_refresh(addressSpace: AddressSpacePrivate, _inputArguments: VariantLike[], context: ISessionContext) {
+/**
+ * Who the refresh in progress is for.
+ *
+ * OPC 10000-9 5.5.7: the SubscriptionId argument says "which Client Subscription shall be
+ * refreshed", and both halves of the bracket and the Retained Conditions replayed in between go to
+ * that Subscription's Notifier MonitoredItems; 5.5.8 narrows all of it to the one MonitoredItem
+ * ConditionRefresh2 names. But the bracket is raised on the Server Object and the Conditions on
+ * their own nodes, and from there every Event bubbles to every event MonitoredItem of the whole
+ * Server - the address space knows nothing of Subscriptions. So it publishes what the call named
+ * and the MonitoredItem drops a refresh addressed elsewhere.
+ *
+ * The same scope carries 4.5's other half: the RefreshStart/RefreshEnd bracket "ignore[s] the
+ * Event content filtering associated with a Subscription", which the MonitoredItem applies for
+ * the named 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 narrowed and 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 +1178,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 +1190,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.1",
+    "version": "2.184.3",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/api/index.js",
     "types": "./dist/api/index.d.ts",
@@ -23,7 +23,7 @@
         "@types/semver": "7.8.0",
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
-        "node-opcua-address-space-base": "2.184.1",
+        "node-opcua-address-space-base": "2.184.3",
         "node-opcua-assert": "2.184.0",
         "node-opcua-basic-types": "2.184.1",
         "node-opcua-binary-stream": "2.184.1",
@@ -39,7 +39,7 @@
         "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.1",
+        "node-opcua-nodeset-ua": "2.184.3",
         "node-opcua-numeric-range": "2.184.1",
         "node-opcua-object-registry": "2.184.0",
         "node-opcua-pseudo-session": "2.184.1",
@@ -64,7 +64,7 @@
         "node-opcua-nodesets": "2.184.0",
         "node-opcua-packet-analyzer": "2.184.1",
         "node-opcua-schemas": "2.184.1",
-        "node-opcua-service-filter": "2.184.1",
+        "node-opcua-service-filter": "2.184.3",
         "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": "29af4e8ac45f585e7b0d8cff9c799b4f0f2f0985",
+    "gitHead": "44adf973a0d633ecdfde62b13d87c2622642b23f",
     "files": [
         "dist",
         "distHelpers",