node-opcua-address-space 2.58.0 → 2.62.0

package/src/address_space.ts

@@ -10,7 +10,7 @@ import { ExtraDataTypeManager } from "node-opcua-client-dynamic-extension-object
 import { DataTypeIds, VariableTypeIds } from "node-opcua-constants";
 import { BrowseDirection, NodeClass, QualifiedName } from "node-opcua-data-model";
 import { ExtensionObject } from "node-opcua-extension-object";
-import { coerceExpandedNodeId, makeNodeId, NodeId, NodeIdLike, resolveNodeId, sameNodeId } from "node-opcua-nodeid";
+import { coerceExpandedNodeId, coerceNodeId, makeNodeId, NodeId, NodeIdLike, resolveNodeId, sameNodeId } from "node-opcua-nodeid";
 import { ObjectRegistry } from "node-opcua-object-registry";
 import { BrowseResult } from "node-opcua-service-browse";
 import { StatusCodes } from "node-opcua-status-code";
@@ -44,6 +44,7 @@ import {
     UAView,
     RaiseEventData
 } from "node-opcua-address-space-base";
+import { make_errorLog } from "node-opcua-debug";
 
 import { adjustBrowseDirection } from "../source/helpers/adjust_browse_direction";
 import { UARootFolder } from "../source/ua_root_folder";
@@ -65,10 +66,13 @@ import { UAReferenceTypeImpl } from "./ua_reference_type_impl";
 import { BaseNodeImpl } from "./base_node_impl";
 
 const doDebug = false;
+const errorLog = make_errorLog(__filename);
+
 // tslint:disable-next-line:no-var-requires
 const Dequeue = require("dequeue");
 
 const regexNumberColumnString = /^([0-9]+):(.*)/;
+const enumerationTypeNodeId = coerceNodeId(DataTypeIds.Enumeration);
 
 function _extract_namespace_and_browse_name_as_string(
     addressSpace: AddressSpace,
@@ -472,10 +476,8 @@ export class AddressSpace implements AddressSpacePrivate {
                     dataTypeNode.constructor.name
             );
         }
-        dataTypeNode = dataTypeNode as UADataType;
 
-        const enumerationType = this.findDataType("Enumeration")!;
-        if (sameNodeId(enumerationType.nodeId, dataTypeNode!.nodeId)) {
+        if (sameNodeId(enumerationTypeNodeId, dataTypeNode!.nodeId)) {
             return DataType.Int32;
         }
 
@@ -484,10 +486,17 @@ export class AddressSpace implements AddressSpacePrivate {
             return DataType.Null; //which one ?
         }
 
-        if (dataTypeNode.nodeId.namespace === 0 && DataType[dataTypeNode.nodeId.value as number]) {
+        if (dataTypeNode.nodeId.namespace === 0 && dataTypeNode.nodeId.value === 0) {
+            return DataType.Null;
+        }
+
+        if (dataTypeNode.nodeId.namespace === 0 && dataTypeNode.nodeId.value <= 25) {
             return dataTypeNode.nodeId.value as DataType;
         }
-        return this.findCorrespondingBasicDataType(dataTypeNode.subtypeOfObj as UADataType);
+
+        const result = this.findCorrespondingBasicDataType(dataTypeNode.subtypeOfObj as UADataType);
+
+        return result;
     }
 
     /**
@@ -1267,7 +1276,7 @@ export class AddressSpace implements AddressSpacePrivate {
         try {
             func();
         } catch (err) {
-            console.log("err");
+            errorLog("modelChangeTransaction", (err as Error)?.message);
             throw err;
         } finally {
             endModelChange.call(this);

package/src/alarms_and_conditions/condition_snapshot.ts

@@ -9,7 +9,7 @@ import { UInt16 } from "node-opcua-basic-types";
 import { coerceLocalizedText, LocalizedText, LocalizedTextLike, NodeClass } from "node-opcua-data-model";
 import { DataValue } from "node-opcua-data-value";
 import { checkDebugFlag, make_debugLog } from "node-opcua-debug";
-import { NodeId } from "node-opcua-nodeid";
+import { NodeId, sameNodeId } from "node-opcua-nodeid";
 import { UAAcknowledgeableCondition } from "node-opcua-nodeset-ua";
 import { StatusCode, StatusCodes } from "node-opcua-status-code";
 import { SimpleAttributeOperand, TimeZoneDataType } from "node-opcua-types";
@@ -175,14 +175,14 @@ export class ConditionSnapshot extends EventEmitter {
         // a nodeId/Variant map
         _record_condition_state(this, condition);
 
-        if (branchId === NodeId.nullNodeId) {
+        if (sameNodeId(branchId, NodeId.nullNodeId)) {
             _installOnChangeEventHandlers(this, condition, "");
         }
         this._set_var("branchId", DataType.NodeId, branchId);
     }
 
     public _constructEventData(): IEventData {
-        if (this.branchId === NodeId.nullNodeId) {
+        if (this.branchId && sameNodeId(this.branchId, NodeId.nullNodeId)) {
             _ensure_condition_values_correctness(this, this.condition!, "", []);
         }
         const c = this.condition as UAConditionImpl;
@@ -594,7 +594,7 @@ export class ConditionSnapshot extends EventEmitter {
     }
 
     public isCurrentBranch(): boolean {
-        return this._get_var("branchId") === NodeId.nullNodeId;
+        return sameNodeId(this._get_var("branchId"), NodeId.nullNodeId);
     }
 
     // -- ACKNOWLEDGEABLE -------------------------------------------------------------------

package/src/alarms_and_conditions/ua_alarm_condition_impl.ts

@@ -6,7 +6,7 @@ import { isEqual } from "lodash";
 import { assert } from "node-opcua-assert";
 import { NodeClass } from "node-opcua-data-model";
 import { DataValue } from "node-opcua-data-value";
-import { NodeId } from "node-opcua-nodeid";
+import { NodeId, sameNodeId } from "node-opcua-nodeid";
 import { StatusCodes } from "node-opcua-status-code";
 import { DataType } from "node-opcua-variant";
 import { UAAlarmCondition_Base } from "node-opcua-nodeset-ua";
@@ -498,7 +498,7 @@ export class UAAlarmConditionImpl extends UAAcknowledgeableConditionImpl impleme
                 if (this.currentBranch().getRetain()) {
                     // we need to create a new branch so the previous state could be acknowledged
                     const newBranch = this.createBranch();
-                    assert(newBranch.getBranchId() !== NodeId.nullNodeId);
+                    assert(!sameNodeId(newBranch.getBranchId(), NodeId.nullNodeId));
                     // also raised a new Event for the new branch as branchId has changed
                     this.raiseNewBranchState(newBranch);
                 }

package/src/alarms_and_conditions/ua_condition_impl.ts

@@ -238,7 +238,7 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
      */
     public post_initialize(): void {
         assert(!this._branch0);
-        this._branch0 = new ConditionSnapshot(this, NodeId.nullNodeId);
+        this._branch0 = new ConditionSnapshot(this, new NodeId());
 
         // the condition OPCUA object alway reflects the default branch states
         // so we set a mechanism that automatically keeps self in sync
@@ -284,7 +284,7 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
      */
     public deleteBranch(branch: ConditionSnapshot): void {
         const key = branch.getBranchId().toString();
-        assert(branch.getBranchId() !== NodeId.nullNodeId, "cannot delete branch zero");
+        assert(!sameNodeId(branch.getBranchId(), NodeId.nullNodeId), "cannot delete branch zero");
         assert(Object.prototype.hasOwnProperty.call(this._branches, key));
         delete this._branches[key];
         this.emit("branch_deleted", key);
@@ -560,7 +560,7 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
     public raiseNewBranchState(branch: ConditionSnapshot): void {
         this.raiseConditionEvent(branch, true);
 
-        if (branch.getBranchId() !== NodeId.nullNodeId && !branch.getRetain()) {
+        if (!sameNodeId(branch.getBranchId(), NodeId.nullNodeId) && !branch.getRetain()) {
             // xx console.log(" Deleting not longer needed branch ", branch.getBranchId().toString());
             // branch can be deleted
             this.deleteBranch(branch);
@@ -789,7 +789,7 @@ function UACondition_instantiate(
     // install initial branch ID (null NodeId);
     conditionNode.branchId.setValueFromSource({
         dataType: DataType.NodeId,
-        value: NodeId.nullNodeId
+        value: new NodeId()
     });
 
     // install 'Comment' condition variable
@@ -920,7 +920,9 @@ function UACondition_instantiate(
             conditionNode.sourceNode.setValueFromSource(conditionSourceNode.readAttribute(null, AttributeIds.NodeId).value);
 
             // set source Name (defined in UABaseEventType)
-            conditionNode.sourceName.setValueFromSource(conditionSourceNode.readAttribute(null, AttributeIds.DisplayName).value);
+            const displayName: LocalizedText = conditionSourceNode.readAttribute(null, AttributeIds.DisplayName).value
+                .value as LocalizedText;
+            conditionNode.sourceName.setValueFromSource({ dataType: DataType.String, value: displayName.text });
         }
     }
 
@@ -953,7 +955,7 @@ function UACondition_instantiate(
      */
     const baseConditionClassType = addressSpace.findObjectType("ProcessConditionClassType");
     // assert(baseConditionClassType,"Expecting BaseConditionClassType to be in addressSpace");
-    let conditionClassId = baseConditionClassType ? baseConditionClassType.nodeId : NodeId.nullNodeId;
+    let conditionClassId = baseConditionClassType ? baseConditionClassType.nodeId : new NodeId();
     let conditionClassName = baseConditionClassType ? baseConditionClassType.displayName[0] : "";
     if (options.conditionClass) {
         if (typeof options.conditionClass === "string") {
@@ -1123,7 +1125,11 @@ function _perform_condition_refresh(addressSpace: AddressSpacePrivate, inputArgu
     return StatusCodes.Good;
 }
 
-function _condition_refresh2_method(inputArguments: VariantLike[], context: ISessionContext, callback: CallbackT<CallMethodResultOptions>) {
+function _condition_refresh2_method(
+    inputArguments: VariantLike[],
+    context: ISessionContext,
+    callback: CallbackT<CallMethodResultOptions>
+) {
     // arguments : IntegerId SubscriptionId
     // arguments : IntegerId MonitoredItemId
     assert(inputArguments.length === 2);
@@ -1146,7 +1152,11 @@ function _condition_refresh2_method(inputArguments: VariantLike[], context: ISes
     });
 }
 
-function _add_comment_method(inputArguments: VariantLike[], context: ISessionContext, callback: CallbackT<CallMethodResultOptions>) {
+function _add_comment_method(
+    inputArguments: VariantLike[],
+    context: ISessionContext,
+    callback: CallbackT<CallMethodResultOptions>
+) {
     //
     // The AddComment Method is used to apply a comment to a specific state of a Condition
     // instance. Normally, the NodeId of the object instance as the ObjectId is passed to the Call

package/src/alarms_and_conditions/ua_off_normal_alarm_impl.ts

@@ -79,7 +79,7 @@ export class UAOffNormalAlarmImpl extends UADiscreteAlarmImpl implements UAOffNo
         const normalState = addressSpace._coerceNode(options.normalState)! as UAVariable;
         //       assert(normalState, "Expecting a valid normalState node");
 
-        const normalStateNodeId = normalState ? normalState.nodeId : NodeId.nullNodeId;
+        const normalStateNodeId = normalState ? normalState.nodeId : new NodeId();
         alarmNode.normalState.setValueFromSource({ dataType: DataType.NodeId, value: normalStateNodeId });
 
         if (inputNode) {

package/src/base_node_impl.ts

@@ -38,7 +38,7 @@ import {
     AccessRestrictionsFlag
 } from "node-opcua-data-model";
 import { DataValue } from "node-opcua-data-value";
-import { dumpIf, make_warningLog } from "node-opcua-debug";
+import { dumpIf, make_warningLog, make_errorLog } from "node-opcua-debug";
 import { coerceNodeId, makeNodeId, NodeId, NodeIdLike, resolveNodeId, sameNodeId } from "node-opcua-nodeid";
 import { NumericRange } from "node-opcua-numeric-range";
 import { ReferenceDescription } from "node-opcua-service-browse";
@@ -83,6 +83,7 @@ import { coerceRolePermissions } from "./role_permissions";
 
 const doDebug = false;
 const warningLog = make_warningLog(__filename);
+const errorLog = make_errorLog(__filename);
 
 function defaultBrowseFilterFunc(context?: ISessionContext): boolean {
     return true;
@@ -1205,6 +1206,7 @@ export class BaseNodeImpl extends EventEmitter implements BaseNode {
             result = this.addressSpace.findReferenceType(referenceType)!;
             /* istanbul ignore next */
             if (!result) {
+                errorLog("referenceType ", referenceType, " cannot be found");
                 throw new Error("Cannot coerce reference with name " + referenceType);
             }
         } else if (referenceType instanceof NodeId) {