node-opcua-address-space 2.85.0 → 2.86.1

package/src/historical_access/address_space_historical_data_node.ts

@@ -224,7 +224,7 @@ function _update_startOfOnlineArchive(this: UAVariableImpl, newDate: Date): void
     const startOfArchiveDataValue = _get_startOfOfflineArchive(this);
     if (
         startOfArchiveDataValue &&
-        (startOfArchiveDataValue.statusCode !== StatusCodes.Good ||
+        (startOfArchiveDataValue.statusCode.isNotGood() ||
             !startOfArchiveDataValue.value ||
             !startOfArchiveDataValue.value.value ||
             startOfArchiveDataValue.value.value.getTime() >= newDate.getTime())
@@ -806,8 +806,8 @@ export function AddressSpace_installHistoricalDataNode(
 
     const dataValue = node.readValue();
     if (
-        dataValue.statusCode !== StatusCodes.BadWaitingForInitialData &&
-        dataValue.statusCode !== StatusCodes.UncertainInitialValue
+        dataValue.statusCode.isNot(StatusCodes.BadWaitingForInitialData) &&
+        dataValue.statusCode.isNot(StatusCodes.UncertainInitialValue)
     ) {
         on_value_change.call(node, dataValue);
     }

package/src/nodeset_tools/nodeset_to_xml.ts

@@ -922,7 +922,7 @@ function _dumpUADataTypeDefinition(xw: XmlWriter, uaDataType: UADataType) {
 
         const dataValue = uaDataType.readAttribute(SessionContext.defaultContext, AttributeIds.DataTypeDefinition);
 
-        if (true || dataValue.statusCode === StatusCodes.Good) {
+        if (true || dataValue.statusCode.isGood()) {
             const definition = uaDataType.getStructureDefinition();
             const baseDefinition = uaDataTypeBase ? uaDataTypeBase.getStructureDefinition() : null;
             xw.startElement("Definition");

package/src/state_machine/finite_state_machine.ts

@@ -403,7 +403,7 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
 
         const d = this.currentState.readValue();
 
-        if (d.statusCode !== StatusCodes.Good) {
+        if (d.statusCode.isNotGood()) {
             this.setState(null);
         } else {
             const txt =

package/src/state_machine/ua_two_state_variable.ts

@@ -76,7 +76,7 @@ function _getEffectiveDisplayName<T, DT extends DataType>(
     node: UATwoStateVariableImpl
 ): DataValueT<LocalizedText, DataType.LocalizedText> {
     const humanReadableString = _getHumanReadableString(node);
-    if (humanReadableString.statusCode !== StatusCodes.Good) {
+    if (humanReadableString.statusCode.isNotGood()) {
         return humanReadableString;
     }
     const boolValue = node.getValue();
@@ -97,7 +97,7 @@ function _getEffectiveDisplayName<T, DT extends DataType>(
 function _getHumanReadableString(node: UATwoStateVariableImpl): DataValueT<LocalizedText, DataType.LocalizedText> {
     const dataValue = node.id.readValue();
 
-    if (dataValue.statusCode !== StatusCodes.Good) {
+    if (dataValue.statusCode.isNotGood()) {
         const _c = dataValue.clone() as DataValueT<LocalizedText, DataType.LocalizedText>;
         _c.value = new Variant({
             dataType: DataType.LocalizedText,
@@ -313,7 +313,7 @@ export class UATwoStateVariableImpl extends UAVariableImplT<LocalizedText, DataT
         assert(typeof boolValue === "boolean");
         const dataValue = this.id!.readValue();
         const oldValue = dataValue.value.value;
-        if (dataValue.statusCode === StatusCodes.Good && boolValue === oldValue) {
+        if (dataValue.statusCode.isGood() && boolValue === oldValue) {
             return; // nothing to do
         }
         //
@@ -328,7 +328,7 @@ export class UATwoStateVariableImpl extends UAVariableImplT<LocalizedText, DataT
      */
     public getValue(): boolean {
         const dataValue = this.id!.readValue();
-        assert(dataValue.statusCode === StatusCodes.Good);
+        assert(dataValue.statusCode.isGood());
         assert(dataValue.value.dataType === DataType.Boolean);
         return dataValue.value.value;
     }
@@ -339,7 +339,7 @@ export class UATwoStateVariableImpl extends UAVariableImplT<LocalizedText, DataT
      */
     public getValueAsString(): string {
         const dataValue = this.readValue();
-        assert(dataValue.statusCode === StatusCodes.Good);
+        assert(dataValue.statusCode.isGood());
         assert(dataValue.value.dataType === DataType.LocalizedText);
         return dataValue.value.value.text?.toString() || "";
     }

package/src/ua_variable_impl.ts

@@ -97,9 +97,7 @@ const warningLog = make_warningLog(__filename);
 const doDebug = checkDebugFlag(__filename);
 const errorLog = make_errorLog(__filename);
 
-function isGoodish(statusCode: StatusCode) {
-    return statusCode.value < 0x10000000;
-}
+
 
 export function adjust_accessLevel(accessLevel: string | number | null): AccessLevelFlag {
     accessLevel = utils.isNullOrUndefined(accessLevel) ? "CurrentRead | CurrentWrite" : accessLevel;
@@ -494,7 +492,7 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
 
         let dataValue = this.$dataValue;
 
-        if (isGoodish(dataValue.statusCode)) {
+        if (dataValue.statusCode.isGoodish()) {
             // note : extractRange will clone the dataValue
             dataValue = extractRange(dataValue, indexRange);
         }
@@ -542,7 +540,7 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
     public asyncRefresh(oldestDate: Date, callback: CallbackT<DataValue>): void;
     public asyncRefresh(oldestDate: Date): Promise<DataValue>;
     public asyncRefresh(...args: any[]): any {
-        if (isGoodish(this.$dataValue.statusCode)) {
+        if (this.$dataValue.statusCode.isGoodish()) {
             this.verifyVariantCompatibility(this.$dataValue.value);
         }
 
@@ -1980,7 +1978,7 @@ function _Variable_bind_with_async_refresh(this: UAVariableImpl, options: any) {
 
     this.refreshFunc = options.refreshFunc;
 
-    // assert(this.readValue().statusCode === StatusCodes.BadNodeIdUnknown);
+    // assert(this.readValue().statusCode.equals(StatusCodes.BadNodeIdUnknown));
     this.$dataValue.statusCode = StatusCodes.UncertainInitialValue;
 
     // TO DO : REVISIT THIS ASSUMPTION
@@ -2071,7 +2069,7 @@ function _Variable_bind_with_simple_get(this: UAVariableImpl, options: GetterOpt
         if (is_StatusCode(value)) {
             return new DataValue({ statusCode: value });
         } else {
-            if (!this.$dataValue || !isGoodish(this.$dataValue.statusCode) || !sameVariant(this.$dataValue.value, value)) {
+            if (!this.$dataValue || !this.$dataValue.statusCode.isGoodish() || !sameVariant(this.$dataValue.value, value)) {
                 this.setValueFromSource(value, StatusCodes.Good);
             }
             return this.$dataValue;

package/src/ua_variable_type_impl.ts

@@ -242,7 +242,7 @@ export class UAVariableTypeImpl extends BaseNodeImpl implements UAVariableType {
         // BadAttributeIdInvalid
         const defaultDataValue = this.readAttribute(null, AttributeIds.Value);
         const defaultValue =
-            (defaultDataType.namespace === 0 && defaultDataType.value == 0) || defaultDataValue.statusCode !== StatusCodes.Good
+            (defaultDataType.namespace === 0 && defaultDataType.value == 0) || defaultDataValue.statusCode.isNotGood()
                 ? undefined
                 : defaultDataValue.value;