node-opcua-address-space 2.178.0 → 2.179.0

package/dist/src/ua_variable_impl.d.ts

@@ -1,5 +1,5 @@
 import type { BindVariableOptions, CloneFilter, CloneOptions, ISessionContext, IVariableHistorian, ListenerSignature, TimestampGetFunc, UADataType, UAVariable, UAVariableEvents, UAVariableType } from "node-opcua-address-space-base";
-import { type BindExtensionObjectOptions, type CloneExtraInfo, type ContinuationData, type VariableDataValueSetterWithCallback } from "node-opcua-address-space-base";
+import { type BindExtensionObjectOptions, type CloneExtraInfo, type ContinuationData, type GetFunc, type VariableDataValueSetterWithCallback } from "node-opcua-address-space-base";
 import { AccessLevelFlag, AttributeIds, NodeClass, type QualifiedName, type QualifiedNameLike } from "node-opcua-data-model";
 import { DataValue, type DataValueT } from "node-opcua-data-value";
 import { type PreciseClock } from "node-opcua-date-time";
@@ -89,10 +89,10 @@ export declare class UAVariableImpl<T extends UAVariableEvents & ListenerSignatu
     arrayDimensions: null | number[];
     _timestamped_get_func?: TimestampGetFunc | null;
     _timestamped_set_func?: VariableDataValueSetterWithCallback | null;
-    _get_func: any;
-    _set_func: any;
+    _get_func?: GetFunc | null;
+    _set_func?: ((value: Variant, callback: (err: Error | null, statusCode?: StatusCode) => void) => void) | null;
     refreshFunc?: (callback: CallbackT<DataValue>) => void;
-    __waiting_callbacks?: any[];
+    __waiting_callbacks?: CallbackT<DataValue>[];
     get typeDefinitionObj(): UAVariableType;
     get typeDefinition(): NodeId;
     constructor(options: UAVariableOptions);
@@ -329,20 +329,18 @@ export declare class UAVariableImpl<T extends UAVariableEvents & ListenerSignatu
     bindExtensionObjectScalar(optionalExtensionObject?: ExtensionObject, options?: BindExtensionObjectOptions): ExtensionObject | null;
     bindExtensionObjectArray(optionalExtensionObject?: ExtensionObject[], options?: BindExtensionObjectOptions): ExtensionObject[] | null;
     bindExtensionObject(optionalExtensionObject?: ExtensionObject | ExtensionObject[], options?: BindExtensionObjectOptions): ExtensionObject | ExtensionObject[] | null;
-    updateExtensionObjectPartial(partialExtensionObject?: {
-        [key: string]: any;
-    }): ExtensionObject;
+    updateExtensionObjectPartial(partialExtensionObject?: Record<string, unknown>): ExtensionObject;
     incrementExtensionObjectPartial(path: string | string[]): void;
     toString(): string;
     toJSON(): Record<string, unknown>;
     historyRead(context: ISessionContext, historyReadDetails: HistoryReadDetails | ReadRawModifiedDetails | ReadEventDetails | ReadProcessedDetails | ReadAtTimeDetails, indexRange: NumericRange | null, dataEncoding: QualifiedNameLike | null, continuationData: ContinuationData): Promise<HistoryReadResult>;
     historyRead(context: ISessionContext, historyReadDetails: HistoryReadDetails | ReadRawModifiedDetails | ReadEventDetails | ReadProcessedDetails | ReadAtTimeDetails, indexRange: NumericRange | null, dataEncoding: QualifiedNameLike | null, continuationData: ContinuationData, callback: CallbackT<HistoryReadResult>): void;
     _historyReadRaw(_context: ISessionContext, _historyReadRawModifiedDetails: ReadRawModifiedDetails, _indexRange: NumericRange | null, _dataEncoding: QualifiedNameLike | null, _continuationData: ContinuationData, _callback: CallbackT<HistoryReadResult>): void;
-    _historyReadRawModify(_context: ISessionContext, _historyReadRawModifiedDetails: ReadRawModifiedDetails, _indexRange: NumericRange | null, _dataEncoding: QualifiedNameLike | null, _continuationData: ContinuationData, _callback?: CallbackT<HistoryReadResult>): any;
+    _historyReadRawModify(_context: ISessionContext, _historyReadRawModifiedDetails: ReadRawModifiedDetails, _indexRange: NumericRange | null, _dataEncoding: QualifiedNameLike | null, _continuationData: ContinuationData, _callback?: CallbackT<HistoryReadResult>): void;
     _historyRead(context: ISessionContext, _historyReadDetails: HistoryReadDetails | ReadRawModifiedDetails | ReadEventDetails | ReadProcessedDetails | ReadAtTimeDetails, _indexRange: NumericRange | null, _dataEncoding: QualifiedNameLike | null, _continuationData: ContinuationData, callback: CallbackT<HistoryReadResult>): void;
-    _historyPush(_newDataValue: DataValue): any;
-    _historyReadRawAsync(_historyReadRawModifiedDetails: ReadRawModifiedDetails, _maxNumberToExtract: number, _isReversed: boolean, _reverseDataValue: boolean, _callback: CallbackT<DataValue[]>): any;
-    _historyReadModify(_context: ISessionContext, _historyReadRawModifiedDetails: ReadRawModifiedDetails, _indexRange: NumericRange | null, _dataEncoding: QualifiedNameLike | null, _continuationData: ContinuationData, _callback: CallbackT<HistoryReadResult>): any;
+    _historyPush(_newDataValue: DataValue): void;
+    _historyReadRawAsync(_historyReadRawModifiedDetails: ReadRawModifiedDetails, _maxNumberToExtract: number, _isReversed: boolean, _reverseDataValue: boolean, _callback: CallbackT<DataValue[]>): void;
+    _historyReadModify(_context: ISessionContext, _historyReadRawModifiedDetails: ReadRawModifiedDetails, _indexRange: NumericRange | null, _dataEncoding: QualifiedNameLike | null, _continuationData: ContinuationData, _callback: CallbackT<HistoryReadResult>): void;
     _update_startOfOnlineArchive(_newDate: Date): void;
     _update_startOfArchive(_newDate: Date): void;
     _validate_DataType(variantDataType: DataType): boolean;

package/dist/src/ua_variable_impl.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UAVariableImplT = exports.UAVariableImpl = void 0;
 exports.adjust_accessLevel = adjust_accessLevel;
 exports.adjust_userAccessLevel = adjust_userAccessLevel;
-/* eslint-disable max-statements */
 /**
  * @module node-opcua-address-space
  */
@@ -116,6 +115,10 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
     nodeClass = node_opcua_data_model_1.NodeClass.Variable;
     dataType;
     _basicDataType;
+    // narrowing this to ExtensionObject breaks declaration-merging in ua_two_state_variable.ts and elsewhere
+    // (concrete *T variants bind $extensionObject to a different, more specific shape) — see the matching
+    // comment on UAVariable.$extensionObject in node-opcua-address-space-base for the documented precedent.
+    // biome-ignore lint/suspicious/noExplicitAny: see comment above
     $extensionObject;
     $set_ExtensionObject;
     $historicalDataConfiguration;
@@ -289,7 +292,6 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
                     if (dataValueOrPromise !== this.$dataValue) {
                         // we may have a problem here if we use a getter that returns a dataValue that is a ExtensionObject
                         if (dataValueOrPromise.value?.dataType === node_opcua_variant_1.DataType.ExtensionObject) {
-                            // eslint-disable-next-line max-depth
                             if (this.$extensionObject || this.$$extensionObjectArray) {
                                 // we have an extension object already bound to this node
                                 // the client is asking us to replace the object entirely by a new one
@@ -318,11 +320,13 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
         /* c8 ignore next */
         if (dataValue.statusCode.equals(node_opcua_status_code_1.StatusCodes.BadWaitingForInitialData) ||
             dataValue.statusCode.equals(node_opcua_status_code_1.StatusCodes.UncertainInitialValue)) {
-            debugLog(chalk_1.default.red(" Warning:  UAVariable#readValue ") +
-                chalk_1.default.cyan(this.browseName.toString()) +
-                " (" +
-                chalk_1.default.yellow(this.nodeId.toString()) +
-                ") exists but dataValue has not been defined");
+            // c8 ignore next
+            doDebug &&
+                debugLog(chalk_1.default.red(" Warning:  UAVariable#readValue ") +
+                    chalk_1.default.cyan(this.browseName.toString()) +
+                    " (" +
+                    chalk_1.default.yellow(this.nodeId.toString()) +
+                    ") exists but dataValue has not been defined");
         }
         return dataValue;
     }
@@ -353,12 +357,14 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
         const dataTypeNode = this.addressSpace.findDataType(this.dataType);
         return dataTypeNode._getEnumerationInfo();
     }
-    asyncRefresh(...args) {
+    asyncRefresh(oldestDate, callback) {
+        // asyncRefresh is always invoked with a callback at runtime: the public overload without
+        // a callback is only reachable through the withCallback() wrapper installed below, which
+        // synthesizes one before calling into this implementation.
+        const cb = callback;
         if (this.$dataValue.statusCode.isGoodish()) {
             this.verifyVariantCompatibility(this.$dataValue.value);
         }
-        const oldestDate = args[0];
-        const callback = args[1];
         const lessOrEqual = (a, b) => {
             return (a.timestamp.getTime() < b.timestamp.getTime() ||
                 (a.timestamp.getTime() === b.timestamp.getTime() && a.picoseconds <= b.picoseconds));
@@ -370,21 +376,24 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
             dataValue.serverPicoseconds = oldestDate.picoseconds;
             const serverClock = (0, node_opcua_date_time_1.coerceClock)(dataValue.serverTimestamp, dataValue.serverPicoseconds);
             if (lessOrEqual(oldestDate, serverClock)) {
-                return callback(null, dataValue);
+                cb(null, dataValue);
+                return;
             }
             else {
                 // fake
-                return callback(null, dataValue);
+                cb(null, dataValue);
+                return;
             }
         }
         const c1 = this.$dataValue.serverTimestamp
             ? (0, node_opcua_date_time_1.coerceClock)(this.$dataValue.serverTimestamp, this.$dataValue.serverPicoseconds)
             : null;
-        if (this.$dataValue.serverTimestamp && lessOrEqual(oldestDate, c1)) {
+        if (c1 && lessOrEqual(oldestDate, c1)) {
             const dataValue = this.readValue().clone();
             dataValue.serverTimestamp = oldestDate.timestamp;
             dataValue.serverPicoseconds = oldestDate.picoseconds;
-            return callback(null, dataValue);
+            cb(null, dataValue);
+            return;
         }
         try {
             this.refreshFunc.call(this, (err, dataValue) => {
@@ -396,7 +405,7 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
                 if (dataValue && dataValue !== this.$dataValue) {
                     this._internal_set_dataValue(coerceDataValue(dataValue), null);
                 }
-                callback(err, this.$dataValue);
+                cb(err, this.$dataValue);
             });
         }
         catch (err) {
@@ -404,8 +413,9 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
             errorLog(err);
             const dataValue = new node_opcua_data_value_1.DataValue({ statusCode: node_opcua_status_code_1.StatusCodes.BadInternalError });
             this._internal_set_dataValue(dataValue, null);
-            callback(err, this.$dataValue);
+            cb(err, this.$dataValue);
         }
+        return undefined;
     }
     readEnumValue() {
         const value = this.readValue().value.value;
@@ -638,30 +648,36 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
         indexRange = node_opcua_numeric_range_1.NumericRange.coerce(indexRange);
         // test write permission
         if (!this.isWritable(context)) {
-            return callback?.(null, node_opcua_status_code_1.StatusCodes.BadNotWritable);
+            callback?.(null, node_opcua_status_code_1.StatusCodes.BadNotWritable);
+            return;
         }
         if (!this.checkPermissionPrivate(context, node_opcua_types_1.PermissionType.Write)) {
-            return new node_opcua_data_value_1.DataValue({ statusCode: node_opcua_status_code_1.StatusCodes.BadUserAccessDenied });
+            callback?.(null, node_opcua_status_code_1.StatusCodes.BadUserAccessDenied);
+            return;
         }
         if (!this.isUserWritable(context)) {
-            return callback?.(null, node_opcua_status_code_1.StatusCodes.BadWriteNotSupported);
+            callback?.(null, node_opcua_status_code_1.StatusCodes.BadWriteNotSupported);
+            return;
         }
         // adjust special case
         const variant = adjustVariant2.call(this, dataValue.value);
         const statusCode = this.checkVariantCompatibility(variant);
         if (statusCode.isNot(node_opcua_status_code_1.StatusCodes.Good)) {
-            return callback?.(null, statusCode);
+            callback?.(null, statusCode);
+            return;
         }
         // adjust dataValue.statusCode based on InstrumentRange and EngineeringUnits
         const statusCode2 = this.adjustDataValueStatusCode(dataValue);
         if (statusCode2.isNotGood()) {
-            return callback?.(null, statusCode2);
+            callback?.(null, statusCode2);
+            return;
         }
         const write_func = this._timestamped_set_func || default_func;
         if (!write_func) {
             warningLog(` warning ${this.nodeId.toString()} ${this.browseName.toString()} has no setter. \n`);
             warningLog("Please make sure to bind the variable or to pass a valid value: new Variant({}) during construction time");
-            return callback?.(null, node_opcua_status_code_1.StatusCodes.BadNotWritable);
+            callback?.(null, node_opcua_status_code_1.StatusCodes.BadNotWritable);
+            return;
         }
         (0, node_opcua_assert_1.assert)(write_func);
         write_func.call(this, dataValue, (err, statusCode1) => {
@@ -669,19 +685,22 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
                 dataValue && this.verifyVariantCompatibility(dataValue.value);
                 if (indexRange && !indexRange.isEmpty()) {
                     if (!indexRange.isValid()) {
-                        return callback?.(null, node_opcua_status_code_1.StatusCodes.BadIndexRangeInvalid);
+                        callback?.(null, node_opcua_status_code_1.StatusCodes.BadIndexRangeInvalid);
+                        return;
                     }
                     const newArrayOrMatrix = dataValue.value.value;
                     if (dataValue.value.arrayType === node_opcua_variant_1.VariantArrayType.Array) {
                         if (this.$dataValue.value.arrayType !== node_opcua_variant_1.VariantArrayType.Array) {
-                            return callback(null, node_opcua_status_code_1.StatusCodes.BadTypeMismatch);
+                            callback(null, node_opcua_status_code_1.StatusCodes.BadTypeMismatch);
+                            return;
                         }
                         // check that destination data is also an array
                         (0, node_opcua_assert_1.assert)(check_valid_array(this.$dataValue.value.dataType, this.$dataValue.value.value));
                         const destArr = this.$dataValue.value.value;
                         const result = indexRange.set_values(destArr, newArrayOrMatrix);
                         if (result.statusCode.isNot(node_opcua_status_code_1.StatusCodes.Good)) {
-                            return callback?.(null, result.statusCode);
+                            callback?.(null, result.statusCode);
+                            return;
                         }
                         dataValue.value.value = result.array;
                         // scrap original array so we detect range
@@ -691,7 +710,8 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
                         const dimensions = this.$dataValue.value.dimensions;
                         if (this.$dataValue.value.arrayType !== node_opcua_variant_1.VariantArrayType.Matrix || !dimensions) {
                             // not a matrix !
-                            return callback?.(null, node_opcua_status_code_1.StatusCodes.BadTypeMismatch);
+                            callback?.(null, node_opcua_status_code_1.StatusCodes.BadTypeMismatch);
+                            return;
                         }
                         const matrix = this.$dataValue.value.value;
                         const result = indexRange.set_values_matrix({
@@ -699,7 +719,8 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
                             dimensions
                         }, newArrayOrMatrix);
                         if (result.statusCode.isNot(node_opcua_status_code_1.StatusCodes.Good)) {
-                            return callback?.(null, result.statusCode);
+                            callback?.(null, result.statusCode);
+                            return;
                         }
                         dataValue.value.dimensions = this.$dataValue.value.dimensions;
                         dataValue.value.value = result.matrix;
@@ -707,7 +728,8 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
                         this.$dataValue.value.value = null;
                     }
                     else {
-                        return callback?.(null, node_opcua_status_code_1.StatusCodes.BadTypeMismatch);
+                        callback?.(null, node_opcua_status_code_1.StatusCodes.BadTypeMismatch);
+                        return;
                     }
                 }
                 try {
@@ -717,11 +739,13 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
                     if (node_util_1.types.isNativeError(err)) {
                         warningLog(err.message);
                     }
-                    return callback?.(null, node_opcua_status_code_1.StatusCodes.BadInternalError);
+                    callback?.(null, node_opcua_status_code_1.StatusCodes.BadInternalError);
+                    return;
                 }
             }
             callback?.(err || null, statusCode1);
         });
+        return undefined;
     }
     writeAttribute(context, writeValueOptions, callback) {
         // c8 ignore next
@@ -729,7 +753,8 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
             throw new Error("Internal error");
         }
         if (!this.canUserWriteAttribute(context, writeValueOptions.attributeId)) {
-            return callback(null, node_opcua_status_code_1.StatusCodes.BadUserAccessDenied);
+            callback(null, node_opcua_status_code_1.StatusCodes.BadUserAccessDenied);
+            return;
         }
         const writeValue = writeValueOptions instanceof node_opcua_service_write_1.WriteValue ? writeValueOptions : new node_opcua_service_write_1.WriteValue(writeValueOptions);
         context = context || session_context_1.SessionContext.defaultContext;
@@ -748,26 +773,32 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
                 break;
             case node_opcua_data_model_1.AttributeIds.Historizing:
                 if (writeValue.value?.value.dataType !== node_opcua_variant_1.DataType.Boolean) {
-                    return callback(null, node_opcua_status_code_1.StatusCodes.BadTypeMismatch);
+                    callback(null, node_opcua_status_code_1.StatusCodes.BadTypeMismatch);
+                    break;
                 }
                 if (!this.checkPermissionPrivate(context, node_opcua_types_1.PermissionType.WriteHistorizing)) {
-                    return callback(null, node_opcua_status_code_1.StatusCodes.BadUserAccessDenied);
+                    callback(null, node_opcua_status_code_1.StatusCodes.BadUserAccessDenied);
+                    break;
                 }
                 if (!this.canUserWriteHistorizingAttribute(context)) {
-                    return callback(null, node_opcua_status_code_1.StatusCodes.BadHistoryOperationUnsupported);
+                    callback(null, node_opcua_status_code_1.StatusCodes.BadHistoryOperationUnsupported);
+                    break;
                 }
                 // if the variable has no historizing in place reject
                 if (!this.getChildByName("HA Configuration")) {
-                    return callback(null, node_opcua_status_code_1.StatusCodes.BadNotSupported);
+                    callback(null, node_opcua_status_code_1.StatusCodes.BadNotSupported);
+                    break;
                 }
                 // check if user is allowed to do that !
                 // TODO
                 this.historizing = !!writeValue.value?.value.value; // yes ! indeed !
-                return callback(null, node_opcua_status_code_1.StatusCodes.Good);
+                callback(null, node_opcua_status_code_1.StatusCodes.Good);
+                break;
             default:
                 super.writeAttribute(context, writeValue, callback);
                 break;
         }
+        return undefined;
     }
     /**
 
@@ -952,7 +983,8 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
             return;
         }
         if (this.isDisposed()) {
-            return callback?.(null, new node_opcua_data_value_1.DataValue({ statusCode: node_opcua_status_code_1.StatusCodes.BadNodeIdUnknown }));
+            callback?.(null, new node_opcua_data_value_1.DataValue({ statusCode: node_opcua_status_code_1.StatusCodes.BadNodeIdUnknown }));
+            return;
         }
         const readImmediate = (innerCallback) => {
             (0, node_opcua_assert_1.assert)(this.$dataValue instanceof node_opcua_data_value_1.DataValue);
@@ -960,23 +992,24 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
             innerCallback(null, dataValue);
         };
         let func;
-        if (!this.isReadable(context)) {
-            func = (innerCallback) => {
-                const dataValue = new node_opcua_data_value_1.DataValue({ statusCode: node_opcua_status_code_1.StatusCodes.BadNotReadable });
-                innerCallback(null, dataValue);
-            };
+        const answerStatusOnly = (statusCode) => (innerCallback) => innerCallback(null, new node_opcua_data_value_1.DataValue({ statusCode }));
+        if (context.isAccessRestricted(this)) {
+            // same gate as readValue(): a variable bound with a simple get()
+            // also gets a refreshFunc, sending every read down the asyncRefresh
+            // branch below - which calls the getter directly and never passes
+            // through readValue(). Without this check here, a node hardened
+            // with AccessRestrictions(EncryptionRequired) answered its value
+            // over an unencrypted channel.
+            func = answerStatusOnly(node_opcua_status_code_1.StatusCodes.BadSecurityModeInsufficient);
+        }
+        else if (!this.isReadable(context)) {
+            func = answerStatusOnly(node_opcua_status_code_1.StatusCodes.BadNotReadable);
         }
         else if (!this.checkPermissionPrivate(context, node_opcua_types_1.PermissionType.Read)) {
-            func = (innerCallback) => {
-                const dataValue = new node_opcua_data_value_1.DataValue({ statusCode: node_opcua_status_code_1.StatusCodes.BadUserAccessDenied });
-                innerCallback(null, dataValue);
-            };
+            func = answerStatusOnly(node_opcua_status_code_1.StatusCodes.BadUserAccessDenied);
         }
         else if (!this.isUserReadable(context)) {
-            func = (innerCallback) => {
-                const dataValue = new node_opcua_data_value_1.DataValue({ statusCode: node_opcua_status_code_1.StatusCodes.BadNotReadable });
-                innerCallback(null, dataValue);
-            };
+            func = answerStatusOnly(node_opcua_status_code_1.StatusCodes.BadNotReadable);
         }
         else {
             const clock = (0, node_opcua_date_time_1.getCurrentClock)();
@@ -1004,6 +1037,7 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
             }
             satisfy_callbacks(err);
         }
+        return undefined;
     }
     getWriteMask() {
         return super.getWriteMask();
@@ -1147,7 +1181,8 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
                         continue;
                     }
                     if (e.constructor.name !== Constructor.name) {
-                        debugLog("extObj.constructor.name ", e.constructor.name, "expected", Constructor.name);
+                        // c8 ignore next
+                        doDebug && debugLog("extObj.constructor.name ", e.constructor.name, "expected", Constructor.name);
                         return false;
                     }
                 }
@@ -1313,9 +1348,11 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
         (0, node_opcua_assert_1.assert)(context instanceof session_context_1.SessionContext);
         (0, node_opcua_assert_1.assert)(typeof callback === "function");
         if (typeof this._historyRead !== "function") {
-            return callback?.(null, new node_opcua_types_1.HistoryReadResult({ statusCode: node_opcua_status_code_1.StatusCodes.BadNotReadable }));
+            callback?.(null, new node_opcua_types_1.HistoryReadResult({ statusCode: node_opcua_status_code_1.StatusCodes.BadNotReadable }));
+            return;
         }
         this._historyRead(context, historyReadDetails, indexRange, dataEncoding, continuationData, callback);
+        return undefined;
     }
     _historyReadRaw(_context, _historyReadRawModifiedDetails, _indexRange, _dataEncoding, _continuationData, _callback) {
         throw new Error("");
@@ -1544,7 +1581,6 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
     }
 }
 exports.UAVariableImpl = UAVariableImpl;
-// tslint:disable:no-var-requires
 const thenify_ex_1 = require("thenify-ex");
 UAVariableImpl.prototype.asyncRefresh = (0, thenify_ex_1.withCallback)(UAVariableImpl.prototype.asyncRefresh);
 UAVariableImpl.prototype.writeValue = (0, thenify_ex_1.withCallback)(UAVariableImpl.prototype.writeValue);
@@ -1683,14 +1719,15 @@ function _Variable_bind_with_async_refresh(options) {
     (0, node_opcua_assert_1.assert)(!this.refreshFunc);
     this.refreshFunc = options.refreshFunc;
     /*
-        // TO DO : REVISIT THIS ASSUMPTION
-        if (false && this.minimumSamplingInterval === 0) {
-            // when a getter /timestamped_getter or async_getter is provided
-            // samplingInterval cannot be 0, as the item value must be scanned to be updated.
-            this.minimumSamplingInterval = _default_minimumSamplingInterval; // MonitoredItem.minimumSamplingInterval;
-            debugLog(`adapting minimumSamplingInterval on ${this.browseName.toString()} to ${this.minimumSamplingInterval}`);
-        }
-            */
+    // TO DO : REVISIT THIS ASSUMPTION
+    if (false && this.minimumSamplingInterval === 0) {
+        // when a getter /timestamped_getter or async_getter is provided
+        // samplingInterval cannot be 0, as the item value must be scanned to be updated.
+        this.minimumSamplingInterval = _default_minimumSamplingInterval; // MonitoredItem.minimumSamplingInterval;
+        // c8 ignore next
+        doDebug && debugLog(`adapting minimumSamplingInterval on ${this.browseName.toString()} to ${this.minimumSamplingInterval}`);
+    }
+        */
 }
 // variation 2
 function _Variable_bind_with_timestamped_get(options) {
@@ -1773,11 +1810,12 @@ function _Variable_bind_with_simple_set(options) {
     (0, node_opcua_assert_1.assert)(!this._timestamped_set_func);
     (0, node_opcua_assert_1.assert)(!this._set_func);
     //
-    this._set_func = turn_sync_to_async(options.set, 1);
-    (0, node_opcua_assert_1.assert)(this._set_func.length === 2, " set function must have 2 arguments ( variant, callback)");
+    const set_func = turn_sync_to_async(options.set, 1);
+    this._set_func = set_func;
+    (0, node_opcua_assert_1.assert)(set_func.length === 2, " set function must have 2 arguments ( variant, callback)");
     this._timestamped_set_func = (timestamped_value, callback) => {
         (0, node_opcua_assert_1.assert)(timestamped_value instanceof node_opcua_data_value_1.DataValue);
-        this._set_func(timestamped_value.value, (err, statusCode) => {
+        set_func.call(this, timestamped_value.value, (err, statusCode) => {
             // c8 ignore next
             if (!err && !statusCode) {
                 errorLog(chalk_1.default.red("UAVariable Binding Error _set_func must return a StatusCode, check the bindVariable parameters"));
@@ -1788,7 +1826,7 @@ function _Variable_bind_with_simple_set(options) {
                 // record the value but still record the statusCode !
                 timestamped_value.statusCode = statusCode;
             }
-            callback(err, statusCode, timestamped_value);
+            callback(err, statusCode ?? node_opcua_status_code_1.StatusCodes.BadInternalError, timestamped_value);
         });
     };
 }
@@ -1894,7 +1932,7 @@ function changeUAVariableDataType(uaVariable, newDataType, valueLike) {
     // change uaVariable.dataType
     uaVariable.dataType = newDataTypeNode.nodeId;
     uaVariable._basicDataType = null;
-    uaVariable.$dataValue.value.dataType = newDataType;
+    uaVariable.$dataValue.value.dataType = newBaseDataType;
     uaVariable.$dataValue.value = value;
     // also change the value to ensure that we have a default value with the correct dataType
     uaVariable._internal_set_value(value);