node-opcua-address-space 2.169.0 → 2.172.0

package/dist/src/address_space_change_event_tools.js

@@ -10,7 +10,6 @@ exports._handle_delete_node_model_change_event = _handle_delete_node_model_chang
  * @module node-opcua-address-space
  */
 const chalk_1 = __importDefault(require("chalk"));
-const node_opcua_assert_1 = require("node-opcua-assert");
 const node_opcua_data_model_1 = require("node-opcua-data-model");
 const node_opcua_enum_1 = require("node-opcua-enum");
 const node_opcua_types_1 = require("node-opcua-types");
@@ -34,8 +33,7 @@ const verbFlags = new node_opcua_enum_1.Enum({
 });
 function makeVerb(verbs) {
     const e = verbFlags.get(verbs);
-    (0, node_opcua_assert_1.assert)(e !== null);
-    return e.value;
+    return e?.value || 0;
 }
 function _getTypeDef(node) {
     if (node.nodeClass === node_opcua_data_model_1.NodeClass.Object || node.nodeClass === node_opcua_data_model_1.NodeClass.Variable) {
@@ -77,15 +75,15 @@ try {
                 return "";
             }
             const node = addressSpace.findNode(nodeId);
-            return '"' + nodeId.toString() + '"' + chalk_1.default.yellow(" /* " + (node ? node.browseName.toString() : "???") + " */");
+            return `"${nodeId.toString()}"${chalk_1.default.yellow(` /* ${node ? node.browseName.toString() : "???"} */`)}`;
         }
-        let str = "{ verb:" + verbFlags.get(this.verb).key + ",";
-        str += " affected: " + n(this.affected) + ",";
-        str += " type: " + n(this.affectedType) + " }";
+        let str = `{ verb:${verbFlags.get(this.verb)?.key},`;
+        str += ` affected: ${n(this.affected)},`;
+        str += ` type: ${n(this.affectedType)} }`;
         return str;
     };
 }
-catch (err) {
+catch (_err) {
     //
 }
 function _handle_model_change_event(node) {
@@ -98,7 +96,7 @@ function _handle_model_change_event(node) {
         typeDefinitionNodeId = node.typeDefinitionObj.nodeId;
     }
     for (const parent of [...parents, ...containingFolders]) {
-        if (parent && parent.getNodeVersion()) {
+        if (parent?.getNodeVersion()) {
             addressSpace.modelChangeTransaction(() => {
                 const modelChange1 = new node_opcua_types_1.ModelChangeStructureDataType({
                     affected: node.nodeId,
@@ -139,7 +137,7 @@ function _handle_delete_node_model_change_event(node) {
             for (const r of references) {
                 const target = addressSpace.findNode(r.nodeId);
                 const modelChangeSrc_l = new node_opcua_types_1.ModelChangeStructureDataType({
-                    affected: target.nodeId,
+                    affected: target?.nodeId,
                     affectedType: null,
                     verb: makeVerb("ReferenceDeleted")
                 });

package/dist/src/address_space_change_event_tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"address_space_change_event_tools.js","sourceRoot":"","sources":["../../src/address_space_change_event_tools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"address_space_change_event_tools.js","sourceRoot":"","sources":["../../src/address_space_change_event_tools.ts"],"names":[],"mappings":"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"}

package/dist/src/address_space_private.d.ts

@@ -1,17 +1,17 @@
 /**
  * @module node-opcua-address-space.Private
  */
-import { ExtraDataTypeManager } from "node-opcua-client-dynamic-extension-object";
-import { NodeClass, QualifiedNameLike } from "node-opcua-data-model";
-import { ExtensionObject } from "node-opcua-extension-object";
-import { NodeId, NodeIdLike } from "node-opcua-nodeid";
-import { ModelChangeStructureDataType, ReadProcessedDetails, HistoryReadResult } from "node-opcua-types";
-import { NumericRange } from "node-opcua-numeric-range";
-import { CallbackT } from "node-opcua-status-code";
-import { IAddressSpace, BaseNode, UADataType, UAView, ISessionContext, AddReferenceOpts, UAVariableType, UAObjectType, UAReference, UAVariable, ContinuationData, MethodCallInterceptor } from "node-opcua-address-space-base";
-import { UARootFolder } from "../source/ua_root_folder";
-import { ExtensionObjectConstructorFuncWithSchema } from "../source/interfaces/extension_object_constructor";
-import { NamespacePrivate } from "./namespace_private";
+import type { AddReferenceOpts, BaseNode, ContinuationData, IAddressSpace, ISessionContext, MethodCallInterceptor, UADataType, UAObjectType, UAReference, UAVariable, UAVariableType, UAView } from "node-opcua-address-space-base";
+import type { ExtraDataTypeManager } from "node-opcua-client-dynamic-extension-object";
+import type { NodeClass, QualifiedNameLike } from "node-opcua-data-model";
+import type { ExtensionObject } from "node-opcua-extension-object";
+import type { NodeId, NodeIdLike } from "node-opcua-nodeid";
+import type { NumericRange } from "node-opcua-numeric-range";
+import type { CallbackT } from "node-opcua-status-code";
+import type { HistoryReadResult, ModelChangeStructureDataType, ReadProcessedDetails } from "node-opcua-types";
+import type { ExtensionObjectConstructorFuncWithSchema } from "../source/interfaces/extension_object_constructor";
+import type { UARootFolder } from "../source/ua_root_folder";
+import type { NamespacePrivate } from "./namespace_private";
 export interface AddressSpacePrivate extends IAddressSpace {
     rootFolder: UARootFolder;
     isFrugal: boolean;

package/dist/src/address_space_private.js

@@ -1,3 +1,6 @@
 "use strict";
+/**
+ * @module node-opcua-address-space.Private
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=address_space_private.js.map

package/dist/src/address_space_private.js.map

@@ -1 +1 @@
-{"version":3,"file":"address_space_private.js","sourceRoot":"","sources":["../../src/address_space_private.ts"],"names":[],"mappings":""}
+{"version":3,"file":"address_space_private.js","sourceRoot":"","sources":["../../src/address_space_private.ts"],"names":[],"mappings":";AAAA;;GAEG"}

package/dist/src/alarms_and_conditions/condition.js.map

@@ -1 +1 @@
-{"version":3,"file":"condition.js","sourceRoot":"","sources":["../../../src/alarms_and_conditions/condition.ts"],"names":[],"mappings":";AAAA;;GAEG;;AAIH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG"}
+{"version":3,"file":"condition.js","sourceRoot":"","sources":["../../../src/alarms_and_conditions/condition.ts"],"names":[],"mappings":";AAAA;;GAEG;;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG"}

package/dist/src/alarms_and_conditions/condition_info_impl.d.ts

@@ -1,7 +1,10 @@
-import { UInt16 } from "node-opcua-basic-types";
+/**
+ * @module node-opcua-address-space.AlarmsAndConditions
+ */
+import type { UInt16 } from "node-opcua-basic-types";
 import { LocalizedText } from "node-opcua-data-model";
-import { StatusCode } from "node-opcua-status-code";
-import { ConditionInfo, ConditionInfoOptions } from "../../source/interfaces/alarms_and_conditions/condition_info_i";
+import type { StatusCode } from "node-opcua-status-code";
+import type { ConditionInfo, ConditionInfoOptions } from "../../source/interfaces/alarms_and_conditions/condition_info_i";
 /**
  * @private
  */
@@ -11,8 +14,5 @@ export declare class ConditionInfoImpl implements ConditionInfo {
     severity: UInt16 | null;
     retain: boolean | null;
     constructor(options: ConditionInfoOptions);
-    /**
-     *
-     */
     isDifferentFrom(otherConditionInfo: ConditionInfo): boolean;
 }

package/dist/src/alarms_and_conditions/condition_info_impl.js

@@ -1,10 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConditionInfoImpl = void 0;
-/**
- * @module node-opcua-address-space.AlarmsAndConditions
- */
-const node_opcua_assert_1 = require("node-opcua-assert");
 const node_opcua_data_model_1 = require("node-opcua-data-model");
 /**
  * @private
@@ -19,24 +15,19 @@ class ConditionInfoImpl {
         this.quality = null;
         this.message = null;
         this.retain = null;
-        if (Object.prototype.hasOwnProperty.call(options, "message") && options.message) {
+        if (Object.hasOwn(options, "message") && options.message) {
             this.message = node_opcua_data_model_1.LocalizedText.coerce(options.message);
         }
-        if (Object.prototype.hasOwnProperty.call(options, "quality") && options.quality !== null) {
+        if (Object.hasOwn(options, "quality") && options.quality) {
             this.quality = options.quality;
         }
-        if (Object.prototype.hasOwnProperty.call(options, "severity") && options.severity !== null) {
-            (0, node_opcua_assert_1.assert)(typeof options.severity === "number");
-            this.severity = options.severity;
+        if (Object.hasOwn(options, "severity") && options.severity !== null) {
+            this.severity = options.severity || 0;
         }
-        if (Object.prototype.hasOwnProperty.call(options, "retain") && options.retain !== null) {
-            (0, node_opcua_assert_1.assert)(typeof options.retain === "boolean");
-            this.retain = options.retain;
+        if (Object.hasOwn(options, "retain") && options.retain !== null) {
+            this.retain = options.retain || false;
         }
     }
-    /**
-     *
-     */
     isDifferentFrom(otherConditionInfo) {
         return (this.severity !== otherConditionInfo.severity ||
             this.quality !== otherConditionInfo.quality ||

package/dist/src/alarms_and_conditions/condition_info_impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"condition_info_impl.js","sourceRoot":"","sources":["../../../src/alarms_and_conditions/condition_info_impl.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,yDAA2C;AAE3C,iEAAyE;AAKzE;;GAEG;AACH,MAAa,iBAAiB;IACnB,OAAO,GAAyB,IAAI,CAAC;IACrC,OAAO,GAAsB,IAAI,CAAC;IAClC,QAAQ,GAAkB,CAAC,CAAC;IAC5B,MAAM,GAAmB,KAAK,CAAC;IAEtC,YAAY,OAA6B;QACrC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QAEnB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YAC9E,IAAI,CAAC,OAAO,GAAG,qCAAa,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YACvF,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAQ,CAAC;QACpC,CAAC;QACD,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,OAAO,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YACzF,IAAA,0BAAM,EAAC,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;YAC7C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAS,CAAC;QACtC,CAAC;QACD,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YACrF,IAAA,0BAAM,EAAC,OAAO,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC;YAC5C,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAO,CAAC;QAClC,CAAC;IACL,CAAC;IAED;;OAEG;IACI,eAAe,CAAC,kBAAiC;QACpD,OAAO,CACH,IAAI,CAAC,QAAQ,KAAK,kBAAkB,CAAC,QAAQ;YAC7C,IAAI,CAAC,OAAO,KAAK,kBAAkB,CAAC,OAAO;YAC3C,IAAI,CAAC,OAAO,KAAK,kBAAkB,CAAC,OAAO,CAC9C,CAAC;IACN,CAAC;CACJ;AAtCD,8CAsCC"}
+{"version":3,"file":"condition_info_impl.js","sourceRoot":"","sources":["../../../src/alarms_and_conditions/condition_info_impl.ts"],"names":[],"mappings":";;;AAIA,iEAAsD;AAItD;;GAEG;AACH,MAAa,iBAAiB;IACnB,OAAO,GAAyB,IAAI,CAAC;IACrC,OAAO,GAAsB,IAAI,CAAC;IAClC,QAAQ,GAAkB,CAAC,CAAC;IAC5B,MAAM,GAAmB,KAAK,CAAC;IAEtC,YAAY,OAA6B;QACrC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QAEnB,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACvD,IAAI,CAAC,OAAO,GAAG,qCAAa,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACvD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QACnC,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,OAAO,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YAClE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YAC9D,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC;QAC1C,CAAC;IACL,CAAC;IACM,eAAe,CAAC,kBAAiC;QACpD,OAAO,CACH,IAAI,CAAC,QAAQ,KAAK,kBAAkB,CAAC,QAAQ;YAC7C,IAAI,CAAC,OAAO,KAAK,kBAAkB,CAAC,OAAO;YAC3C,IAAI,CAAC,OAAO,KAAK,kBAAkB,CAAC,OAAO,CAC9C,CAAC;IACN,CAAC;CACJ;AAhCD,8CAgCC"}

package/dist/src/alarms_and_conditions/condition_snapshot_impl.d.ts

@@ -1,17 +1,17 @@
 /**
  * @module node-opcua-address-space.AlarmsAndConditions
  */
-import { EventEmitter } from "events";
-import { IEventData, BaseNode } from "node-opcua-address-space-base";
-import { UInt16 } from "node-opcua-basic-types";
-import { LocalizedText, LocalizedTextLike } from "node-opcua-data-model";
+import { EventEmitter } from "node:events";
+import type { BaseNode, IEventData } from "node-opcua-address-space-base";
+import type { UInt16 } from "node-opcua-basic-types";
+import { type LocalizedText, type LocalizedTextLike } from "node-opcua-data-model";
 import { NodeId } from "node-opcua-nodeid";
-import { StatusCode } from "node-opcua-status-code";
+import { type StatusCode } from "node-opcua-status-code";
 import { TimeZoneDataType } from "node-opcua-types";
-import { ConditionSnapshot } from "../../source/interfaces/alarms_and_conditions/condition_snapshot";
-import { IConditionVariableTypeSetterOptions } from "../../source/interfaces/i_condition_variable_type_setter_options";
-import { UtcTime } from "../../source/interfaces/state_machine/ua_state_machine_type";
-import { ISetStateOptions } from "../../source/interfaces/i_set_state_options";
+import type { ConditionSnapshot } from "../../source/interfaces/alarms_and_conditions/condition_snapshot";
+import type { IConditionVariableTypeSetterOptions } from "../../source/interfaces/i_condition_variable_type_setter_options";
+import type { ISetStateOptions } from "../../source/interfaces/i_set_state_options";
+import type { UtcTime } from "../../source/interfaces/state_machine/ua_state_machine_type";
 declare function normalizeName(str: string): string;
 export declare class ConditionSnapshotImpl extends EventEmitter implements ConditionSnapshot {
     #private;
@@ -264,6 +264,6 @@ export declare class ConditionSnapshotImpl extends EventEmitter implements Condi
     getSilentState(): boolean;
     setShelvingState(): void;
     toString(): string;
-    _setAckedState(requestedAckedState: boolean, conditionEventId?: Buffer, comment?: string | LocalizedText | LocalizedTextLike, options?: ISetStateOptions): StatusCode;
+    _setAckedState(requestedAckedState: boolean, _conditionEventId?: Buffer, _comment?: string | LocalizedText | LocalizedTextLike, options?: ISetStateOptions): StatusCode;
 }
 export {};

package/dist/src/alarms_and_conditions/condition_snapshot_impl.js

@@ -5,7 +5,7 @@ exports.ConditionSnapshotImpl = void 0;
 /**
  * @module node-opcua-address-space.AlarmsAndConditions
  */
-const events_1 = require("events");
+const node_events_1 = require("node:events");
 const node_opcua_assert_1 = require("node-opcua-assert");
 const node_opcua_data_model_1 = require("node-opcua-data-model");
 const node_opcua_debug_1 = require("node-opcua-debug");
@@ -24,7 +24,8 @@ function normalizeName(str) {
 }
 const disabledVar = new node_opcua_variant_1.Variant({
     dataType: "StatusCode",
-    value: node_opcua_status_code_1.StatusCodes.BadConditionDisabled
+    value: node_opcua_status_code_1.StatusCodes.BadConditionDisabled,
+    // statusCode: StatusCodes.BadConditionDisabled    
 });
 // list of Condition variables that should not be published as BadConditionDisabled when the condition
 // is in a disabled state.
@@ -45,7 +46,7 @@ const _varTable = {
     SourceNode: 1,
     Time: 1
 };
-class ConditionSnapshotImpl extends events_1.EventEmitter {
+class ConditionSnapshotImpl extends node_events_1.EventEmitter {
     static normalizeName = normalizeName;
     condition;
     eventData = null;
@@ -80,7 +81,7 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
                 debugLog("cannot node for find key", fullBrowsePath);
                 continue;
             }
-            if (isDisabled && !Object.prototype.hasOwnProperty.call(_varTable, fullBrowsePath)) {
+            if (isDisabled && !Object.hasOwn(_varTable, fullBrowsePath)) {
                 eventData._createValue(fullBrowsePath, node, disabledVar);
             }
             else {
@@ -97,7 +98,7 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
             if (aggregate.nodeClass === node_opcua_data_model_1.NodeClass.Variable) {
                 const name = aggregate.browseName.toString();
                 const key = prefix + name;
-                const snapshot_value = this._map.get(key).toString();
+                const snapshot_value = this._map.get(key)?.toString();
                 const aggregateVariable = aggregate;
                 const condition_value = aggregateVariable.readValue().value.toString();
                 if (snapshot_value !== condition_value) {
@@ -109,7 +110,7 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
                         condition_value);
                 }
                 this._node_index.set(key, aggregateVariable);
-                this.#_ensure_condition_values_correctness(aggregate, prefix + name + ".", error);
+                this.#_ensure_condition_values_correctness(aggregate, `${prefix + name}.`, error);
             }
         }
         if (displayError && error.length) {
@@ -129,7 +130,7 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
                 const aggregateVariable = aggregate;
                 this._map.set(key, aggregateVariable.readValue().value);
                 this._node_index.set(key, aggregateVariable);
-                this.#_visit(aggregate, prefix + name + ".");
+                this.#_visit(aggregate, `${prefix + name}.`);
             }
         }
     }
@@ -143,11 +144,14 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
                 if (doDebug) {
                     debugLog("adding key =", key);
                 }
-                aggregate.on("value_changed", (newDataValue) => {
+                if (aggregate.nodeClass !== node_opcua_data_model_1.NodeClass.Variable) {
+                    continue;
+                }
+                aggregate.on("value_changed", (newDataValue, _indexRange) => {
                     this._map.set(key, newDataValue.value);
                     this._node_index.set(key, aggregate);
                 });
-                this.#_installOnChangeEventHandlers(aggregate, prefix + name + ".");
+                this.#_installOnChangeEventHandlers(aggregate, `${prefix + name}.`);
             }
         }
     }
@@ -160,16 +164,43 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
     /**
      * @internal
      */
-    #_get_var(varName) {
+    #_get_var_inner(varName) {
         const c = this.condition;
-        if (!c.getEnabledState() && !Object.prototype.hasOwnProperty.call(_varTable, varName)) {
+        if (!c.getEnabledState() && !Object.hasOwn(_varTable, varName)) {
             // xx debuglog("ConditionSnapshot#_get_var condition enabled =", self.condition.getEnabledState());
             return disabledVar;
         }
         const key = normalizeName(varName);
         const variant = this._map.get(key);
         if (!variant) {
-            throw new Error("cannot find key " + key);
+            throw new Error(`cannot find key ${key}`);
+        }
+        return variant;
+    }
+    #_is_varValid(varName) {
+        const key = normalizeName(varName);
+        const variant = this._map.get(key);
+        return !(variant && variant.dataType === node_opcua_variant_1.DataType.StatusCode && variant.value === node_opcua_status_code_1.StatusCodes.BadConditionDisabled);
+    }
+    #_get_varTDefault(dataType, varName, defaultValue) {
+        const variant = this.#_get_var_inner(varName);
+        if (variant.dataType !== dataType) {
+            if (variant.dataType === node_opcua_variant_1.DataType.StatusCode) {
+                // Warning: we need to improve this,
+                return defaultValue;
+            }
+            throw new Error(`Expected dataType ${node_opcua_variant_1.DataType[dataType]} but got ${node_opcua_variant_1.DataType[variant.dataType]}`);
+        }
+        return variant.value;
+    }
+    #_get_varT(dataType, varName) {
+        const variant = this.#_get_var_inner(varName);
+        if (variant.dataType !== dataType) {
+            // if (variant.dataType === DataType.StatusCode) {
+            //     // Warning: we need to improve this,
+            //     return variant.value as T;
+            // }
+            throw new Error(`Expected dataType ${node_opcua_variant_1.DataType[dataType]} but got ${node_opcua_variant_1.DataType[variant.dataType]}`);
         }
         return variant.value;
     }
@@ -182,7 +213,7 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
         if (!this._map.has(key)) {
             // c8 ignore next
             if (doDebug) {
-                debugLog(" cannot find node " + varName);
+                debugLog(` cannot find node ${varName}`);
                 debugLog("  map=", [...this._map.keys()].join(" "));
             }
         }
@@ -191,7 +222,7 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
             value
         }));
         const sourceTimestamp = options?.sourceTimestamp || new Date();
-        const sourceTimestampKey = key + ".SourceTimestamp";
+        const sourceTimestampKey = `${key}.SourceTimestamp`;
         if (this._map.has(sourceTimestampKey)) {
             // from spec 1.03 : 5.3 condition variables
             // a condition VariableType has a sourceTimeStamp exposed property
@@ -210,7 +241,7 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
         const node = this._node_index.get(key);
         if (!node) {
             // for instance localTime is optional
-            debugLog("Cannot serVar " + varName + " dataType " + node_opcua_variant_1.DataType[dataType]);
+            debugLog(`Cannot serVar ${varName} dataType ${node_opcua_variant_1.DataType[dataType]}`);
             return;
         }
         (0, node_opcua_assert_1.assert)(node.nodeClass === node_opcua_data_model_1.NodeClass.Variable);
@@ -220,26 +251,26 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
      *
      */
     getBranchId() {
-        return this.#_get_var("BranchId");
+        return this.#_get_varT(node_opcua_variant_1.DataType.NodeId, "BranchId");
     }
     /**
      *
      */
     getEventId() {
-        return this.#_get_var("EventId");
+        return this.#_get_varT(node_opcua_variant_1.DataType.ByteString, "EventId");
     }
     /**
      *
      */
     getRetain() {
-        return this.#_get_var("Retain");
+        return this.#_get_varTDefault(node_opcua_variant_1.DataType.Boolean, "Retain", false);
     }
     /**
      *
      */
     setRetain(retainFlag) {
         retainFlag = !!retainFlag;
-        return this.#_set_var("Retain", node_opcua_variant_1.DataType.Boolean, retainFlag);
+        this.#_set_var("Retain", node_opcua_variant_1.DataType.Boolean, retainFlag);
     }
     /**
      *
@@ -248,8 +279,7 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
         const addressSpace = this.condition.addressSpace;
         // create a new event  Id for this new condition
         const eventId = addressSpace.generateEventId();
-        const ret = this.#_set_var("EventId", node_opcua_variant_1.DataType.ByteString, eventId.value);
-        return ret;
+        this.#_set_var("EventId", node_opcua_variant_1.DataType.ByteString, eventId.value);
     }
     /**
      *
@@ -261,19 +291,19 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
      *
      */
     setEnabledState(value, options) {
-        return this.#_set_twoStateVariable("EnabledState", value, options);
+        this.#_set_twoStateVariable("EnabledState", value, options);
     }
     /**
      *
      */
     getEnabledStateAsString() {
-        return this.#_get_var("EnabledState").text;
+        return this.#_get_varT(node_opcua_variant_1.DataType.LocalizedText, "EnabledState").text || "";
     }
     /**
      *
      */
     getComment() {
-        return this.#_get_var("Comment");
+        return this.#_get_varT(node_opcua_variant_1.DataType.LocalizedText, "Comment");
     }
     /**
      * Set condition comment
@@ -294,13 +324,13 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
      */
     setMessage(txtMessage) {
         const txtMessage1 = (0, node_opcua_data_model_1.coerceLocalizedText)(txtMessage);
-        return this.#_set_var("Message", node_opcua_variant_1.DataType.LocalizedText, txtMessage1);
+        this.#_set_var("Message", node_opcua_variant_1.DataType.LocalizedText, txtMessage1);
     }
     /**
      *
      */
     setClientUserId(userIdentity) {
-        return this.#_set_var("ClientUserId", node_opcua_variant_1.DataType.String, userIdentity.toString());
+        this.#_set_var("ClientUserId", node_opcua_variant_1.DataType.String, userIdentity.toString());
     }
     /*
      *
@@ -349,7 +379,7 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
      *
      */
     getQuality() {
-        return this.#_get_var("Quality");
+        return this.#_get_varT(node_opcua_variant_1.DataType.StatusCode, "Quality");
     }
     /**
      * **as per spec 1.0.3 - Part 9**
@@ -400,7 +430,6 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
      * of 1 to 333.
      */
     setSeverity(severity, options) {
-        (0, node_opcua_assert_1.assert)(isFinite(severity), "expecting a UInt16");
         // record automatically last severity
         const lastSeverity = this.getSeverity();
         const sourceTimestamp = this.getSeveritySourceTimestamp();
@@ -412,7 +441,7 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
     getSeverity() {
         const c = this.condition;
         (0, node_opcua_assert_1.assert)(c.getEnabledState(), "condition must be enabled");
-        const value = this.#_get_var("Severity");
+        const value = this.#_get_varT(node_opcua_variant_1.DataType.UInt16, "Severity");
         return +value;
     }
     getSeveritySourceTimestamp() {
@@ -432,13 +461,13 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
      */
     setLastSeverity(severity, options) {
         severity = +severity;
-        return this.#_set_var("LastSeverity", node_opcua_variant_1.DataType.UInt16, severity, options);
+        this.#_set_var("LastSeverity", node_opcua_variant_1.DataType.UInt16, severity, options);
     }
     /**
      *
      */
     getLastSeverity() {
-        const value = this.#_get_var("LastSeverity");
+        const value = this.#_get_varT(node_opcua_variant_1.DataType.UInt16, "LastSeverity");
         return +value;
     }
     /**
@@ -459,7 +488,7 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
      *
      */
     setReceiveTime(time) {
-        return this.#_set_var("ReceiveTime", node_opcua_variant_1.DataType.DateTime, time, { sourceTimestamp: time || undefined });
+        this.#_set_var("ReceiveTime", node_opcua_variant_1.DataType.DateTime, time, { sourceTimestamp: time || undefined });
     }
     /**
      * Time provides the time the Event occurred.
@@ -473,7 +502,7 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
      *
      */
     setTime(time) {
-        return this.#_set_var("Time", node_opcua_variant_1.DataType.DateTime, time, { sourceTimestamp: time });
+        this.#_set_var("Time", node_opcua_variant_1.DataType.DateTime, time, { sourceTimestamp: time });
     }
     /**
      * LocalTime is a structure containing the Offset and the DaylightSavingInOffset flag.
@@ -491,29 +520,29 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
      */
     setLocalTime(localTime) {
         (0, node_opcua_assert_1.assert)(localTime instanceof node_opcua_types_1.TimeZoneDataType);
-        return this.#_set_var("LocalTime", node_opcua_variant_1.DataType.ExtensionObject, new node_opcua_types_1.TimeZoneDataType(localTime));
+        this.#_set_var("LocalTime", node_opcua_variant_1.DataType.ExtensionObject, new node_opcua_types_1.TimeZoneDataType(localTime));
     }
     // read only !
     getSourceName() {
-        return this.#_get_var("SourceName");
+        return this.#_get_varT(node_opcua_variant_1.DataType.LocalizedText, "SourceName");
     }
     /**
      *
      */
     getSourceNode() {
-        return this.#_get_var("SourceNode");
+        return this.#_get_varT(node_opcua_variant_1.DataType.NodeId, "SourceNode");
     }
     /**
      *
      */
     getEventType() {
-        return this.#_get_var("EventType");
+        return this.#_get_varT(node_opcua_variant_1.DataType.NodeId, "EventType");
     }
     getMessage() {
-        return this.#_get_var("Message");
+        return this.#_get_varT(node_opcua_variant_1.DataType.LocalizedText, "Message");
     }
     isCurrentBranch() {
-        return (0, node_opcua_nodeid_1.sameNodeId)(this.#_get_var("BranchId"), node_opcua_nodeid_1.NodeId.nullNodeId);
+        return (0, node_opcua_nodeid_1.sameNodeId)(this.#_get_varT(node_opcua_variant_1.DataType.NodeId, "BranchId"), node_opcua_nodeid_1.NodeId.nullNodeId);
     }
     // -- ACKNOWLEDGEABLE -------------------------------------------------------------------
     getAckedState() {
@@ -545,12 +574,12 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
             return;
         }
         // todo deal with Error code BadConditionBranchAlreadyConfirmed
-        return this.#_set_twoStateVariable("ConfirmedState", confirmedState, options);
+        this.#_set_twoStateVariable("ConfirmedState", confirmedState, options);
     }
     setConfirmedState(confirmedState) {
         const acknowledgeableCondition = this.condition;
         (0, node_opcua_assert_1.assert)(acknowledgeableCondition.confirmedState, "Must have a confirmed state.  Add ConfirmedState to the optionals");
-        return this.setConfirmedStateIfExists(confirmedState);
+        this.setConfirmedStateIfExists(confirmedState);
     }
     // ---- Shelving
     getSuppressedState() {
@@ -604,7 +633,7 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
             "condition: " +
             (this.condition.browseName.toString() + " " + this.condition.nodeId.toString()) +
             ", type: " +
-            (t.browseName.toString() + " " + t.nodeId.toString()) +
+            (t ? `${t.browseName.toString()} ${t.nodeId.toString()}` : "<null>") +
             ", branchId: " +
             (this.branchId ? this.branchId.toString() : "<null>") +
             ", acked: " +
@@ -624,16 +653,16 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
     #_set_twoStateVariable(varName, value, options) {
         value = !!value;
         const hrKey = _a.normalizeName(varName);
-        const idKey = _a.normalizeName(varName + ".Id");
+        const idKey = _a.normalizeName(`${varName}.Id`);
         const variant = new node_opcua_variant_1.Variant({ dataType: node_opcua_variant_1.DataType.Boolean, value });
         this._map.set(idKey, variant);
         // also change varName with human readable text
         const twoStateNode = this._node_index.get(hrKey);
         if (!twoStateNode) {
-            throw new Error("Cannot find twoState Variable with name " + varName);
+            throw new Error(`Cannot find twoState Variable with name ${varName}`);
         }
         if (!(twoStateNode instanceof ua_two_state_variable_1.UATwoStateVariableImpl)) {
-            throw new Error("Cannot find twoState Variable with name " + varName + " " + twoStateNode);
+            throw new Error(`Cannot find twoState Variable with name ${varName} ${twoStateNode}`);
         }
         const hrValue = new node_opcua_variant_1.Variant({
             dataType: node_opcua_variant_1.DataType.LocalizedText,
@@ -650,16 +679,16 @@ class ConditionSnapshotImpl extends events_1.EventEmitter {
         this.emit("valueChanged", node, variant, { sourceTimestamp });
     }
     #_get_twoStateVariable(varName) {
-        const key = _a.normalizeName(varName) + ".Id";
+        const key = `${_a.normalizeName(varName)}.Id`;
         const variant = this._map.get(key);
         // c8 ignore next
         if (!variant) {
-            return "???";
+            return false;
             // throw new Error("Cannot find TwoStateVariable with name " + varName);
         }
         return variant.value;
     }
-    _setAckedState(requestedAckedState, conditionEventId, comment, options) {
+    _setAckedState(requestedAckedState, _conditionEventId, _comment, options) {
         const ackedState = this.getAckedState();
         if (ackedState && requestedAckedState) {
             return node_opcua_status_code_1.StatusCodes.BadConditionBranchAlreadyAcked;