node-opcua-client 2.74.0 → 2.76.1

package/source/alarms_and_conditions/client_alarm_tools_acknowledge_all_conditions.ts

@@ -5,7 +5,6 @@ import { CreateSubscriptionRequestOptions, MonitoringParametersOptions } from "n
 import { StatusCode, StatusCodes } from "node-opcua-status-code";
 import { DataType, Variant } from "node-opcua-variant";
 import { checkDebugFlag, make_debugLog, make_errorLog } from "node-opcua-debug";
-import { ClientMonitoredItem } from "../client_monitored_item";
 import { ClientSession } from "../client_session";
 import { EventStuff, fieldsToJson } from "./client_alarm";
 import { extractConditionFields } from "./client_alarm_tools_extractConditionFields";
@@ -22,6 +21,7 @@ const errorLog = make_errorLog(__filename);
  * @param comment
  */
 export async function acknowledgeCondition(session: ClientSession, eventStuff: EventStuff, comment: string): Promise<StatusCode> {
+
     try {
         const conditionId = eventStuff.conditionId.value;
         const eventId = eventStuff.eventId.value;
@@ -65,7 +65,9 @@ export async function findActiveConditions(session: ClientSession): Promise<Even
 
     const fields = await extractConditionFields(session, "AcknowledgeableConditionType");
 
-    const eventFilter = constructEventFilter(fields, [resolveNodeId("AcknowledgeableConditionType")]);
+    // note: we may want to have this select clause
+    //  Or(OfType("AcknowledgeableConditionType"), OfType("RefreshStartEventType"), OfType("RefreshEndEventType"))
+    const eventFilter = constructEventFilter(fields);
 
     const monitoringParameters: MonitoringParametersOptions = {
         discardOldest: false,
@@ -88,13 +90,17 @@ export async function findActiveConditions(session: ClientSession): Promise<Even
         // now create a event monitored Item
         event_monitoringItem.on("changed", (_eventFields: any) => {
             const eventFields = _eventFields as Variant[];
+
             try {
                 if (RefreshEndEventHasBeenReceived) {
                     return;
                 }
+          
+          
                 // dumpEvent(session, fields, eventFields);
                 const pojo = fieldsToJson(fields, eventFields) as any;
-                // console.log(pojo.eventType.value.toString(), RefreshEndEventType, RefreshStartEventType);
+                
+                // console.log(pojo.eventType.value.toString({ addressSpace}), RefreshEndEventType, RefreshStartEventType);
 
                 // make sure we only start recording event after the RefreshStartEvent has been received
                 if (!refreshStartEventHasBeenReceived) {
@@ -147,7 +153,7 @@ export async function acknwoledgeAllConditions(session: ClientSession, message:
         // filter acknowledgable conditions (no acked yet)
         conditions = conditions.filter((pojo) => pojo.ackedState.id.value === false);
 
-        const promises: Array<Promise<any>> = [];
+        const promises: Array<Promise<StatusCode>> = [];
         for (const eventStuff of conditions) {
             promises.push(acknowledgeCondition(session, eventStuff, message));
         }

package/source/alarms_and_conditions/client_alarm_tools_extractConditionFields.ts

@@ -2,15 +2,11 @@ import { BrowseDirection, NodeClassMask, QualifiedName } from "node-opcua-data-m
 import { NodeId, NodeIdLike, resolveNodeId } from "node-opcua-nodeid";
 import { IBasicSession } from "node-opcua-pseudo-session";
 import { BrowseDescriptionOptions } from "node-opcua-service-browse";
+import { NodeClass } from "node-opcua-types";
 
-/**
- *
- * @param session
- * @param conditionNodeId
- */
 export async function extractConditionFields(session: IBasicSession, conditionNodeId: NodeIdLike): Promise<string[]> {
     // conditionNodeId could be a Object of type ConditionType
-    // or it could be directly a ObhectType which is a  subType of ConditionType
+    // or it could be directly a ObjectType which is a subType of ConditionType
 
     const _duplicateMap: any = {};
     const fields1: string[] = [];
@@ -63,7 +59,9 @@ export async function extractConditionFields(session: IBasicSession, conditionNo
 
             for (const ref of result.references) {
                 const n = name + "." + ref.browseName.toString();
-                addField(n);
+                if (ref.nodeClass === NodeClass.Variable) {
+                    addField(n);
+                }
                 deferObjectOrVariableInvestigation(ref.nodeId, n);
             }
         }
@@ -83,8 +81,10 @@ export async function extractConditionFields(session: IBasicSession, conditionNo
         const nodeToBrowse2: BrowseDescriptionOptions = {
             browseDirection: BrowseDirection.Forward,
             includeSubtypes: true,
+
             // tslint:disable-next-line: no-bitwise
             nodeClassMask: NodeClassMask.Object | NodeClassMask.Variable,
+
             nodeId: conditionNodeId,
             referenceTypeId: resolveNodeId("HasChild"),
             resultMask: 63
@@ -92,12 +92,11 @@ export async function extractConditionFields(session: IBasicSession, conditionNo
         const nodesToBrowse = [nodeToBrowse1, nodeToBrowse2];
         const browseResults = await session.browse(nodesToBrowse);
 
-        // console.log(browseResults[0].toString());
-        // console.log(browseResults[1].toString());
-
         if (browseResults[1] && browseResults[1].references) {
             for (const ref of browseResults[1].references) {
-                addField(ref.browseName.toString());
+                if (ref.nodeClass === NodeClass.Variable) {
+                    addField(ref.browseName.toString());
+                }
                 deferObjectOrVariableInvestigation(ref.nodeId, ref.browseName.toString());
             }
         }
@@ -115,5 +114,6 @@ export async function extractConditionFields(session: IBasicSession, conditionNo
 
     // add this field which will always be added
     addField("ConditionId");
+
     return fields1;
 }

package/source/private/client_monitored_item_impl.ts

@@ -8,7 +8,7 @@ import { assert } from "node-opcua-assert";
 
 import { AttributeIds } from "node-opcua-data-model";
 import { DataValue, coerceTimestampsToReturn } from "node-opcua-data-value";
-import { checkDebugFlag, make_debugLog } from "node-opcua-debug";
+import { checkDebugFlag, make_debugLog, make_warningLog } from "node-opcua-debug";
 import { ExtensionObject } from "node-opcua-extension-object";
 import { EventFilter } from "node-opcua-service-filter";
 import { ReadValueId, ReadValueIdOptions, TimestampsToReturn } from "node-opcua-service-read";
@@ -29,6 +29,7 @@ import { ClientSubscription } from "../client_subscription";
 import { ClientMonitoredItem_create, ClientSubscriptionImpl } from "./client_subscription_impl";
 
 const debugLog = make_debugLog(__filename);
+const warningLog = make_warningLog(__filename);
 const doDebug = checkDebugFlag(__filename);
 
 export type PrepareForMonitoringResult =
@@ -216,8 +217,8 @@ export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonit
         try {
             this.emit("changed", eventFields);
         } catch (err) {
-            debugLog("Exception raised inside the event handler called by ClientMonitoredItem.on('change')", err);
-            debugLog("Please verify the application using this node-opcua client");
+            warningLog("Exception raised inside the event handler called by ClientMonitoredItem.on('change')", err);
+            warningLog("Please verify the application using this node-opcua client");
         }
     }