node-opcua-address-space 2.130.0 → 2.132.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space",
-    "version": "2.130.0",
+    "version": "2.132.0",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/src/index_current.js",
     "types": "./dist/source/index.d.ts",
@@ -18,41 +18,41 @@
     "dependencies": {
         "@types/lodash": "4.17.7",
         "@types/semver": "^7.5.8",
-        "async": "^3.2.5",
+        "async": "^3.2.6",
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
         "lodash": "4.17.21",
-        "node-opcua-address-space-base": "2.129.0",
+        "node-opcua-address-space-base": "2.132.0",
         "node-opcua-assert": "2.120.0",
-        "node-opcua-basic-types": "2.128.0",
+        "node-opcua-basic-types": "2.132.0",
         "node-opcua-binary-stream": "2.128.0",
-        "node-opcua-client-dynamic-extension-object": "2.130.0",
+        "node-opcua-client-dynamic-extension-object": "2.132.0",
         "node-opcua-constants": "2.125.0",
-        "node-opcua-crypto": "4.9.2",
-        "node-opcua-data-access": "2.129.0",
-        "node-opcua-data-model": "2.128.0",
-        "node-opcua-data-value": "2.129.0",
-        "node-opcua-date-time": "2.128.0",
+        "node-opcua-crypto": "4.9.4",
+        "node-opcua-data-access": "2.132.0",
+        "node-opcua-data-model": "2.132.0",
+        "node-opcua-data-value": "2.132.0",
+        "node-opcua-date-time": "2.132.0",
         "node-opcua-debug": "2.128.0",
         "node-opcua-enum": "2.128.0",
-        "node-opcua-extension-object": "2.128.0",
-        "node-opcua-factory": "2.128.0",
+        "node-opcua-extension-object": "2.132.0",
+        "node-opcua-factory": "2.132.0",
         "node-opcua-nodeid": "2.128.0",
-        "node-opcua-nodeset-ua": "2.129.0",
-        "node-opcua-numeric-range": "2.128.0",
+        "node-opcua-nodeset-ua": "2.132.0",
+        "node-opcua-numeric-range": "2.132.0",
         "node-opcua-object-registry": "2.128.0",
-        "node-opcua-pseudo-session": "2.130.0",
-        "node-opcua-service-browse": "2.129.0",
-        "node-opcua-service-call": "2.129.0",
-        "node-opcua-service-history": "2.129.0",
-        "node-opcua-service-translate-browse-path": "2.129.0",
-        "node-opcua-service-write": "2.129.0",
+        "node-opcua-pseudo-session": "2.132.0",
+        "node-opcua-service-browse": "2.132.0",
+        "node-opcua-service-call": "2.132.0",
+        "node-opcua-service-history": "2.132.0",
+        "node-opcua-service-translate-browse-path": "2.132.0",
+        "node-opcua-service-write": "2.132.0",
         "node-opcua-status-code": "2.128.0",
-        "node-opcua-types": "2.129.0",
+        "node-opcua-types": "2.132.0",
         "node-opcua-utils": "2.128.0",
-        "node-opcua-variant": "2.129.0",
+        "node-opcua-variant": "2.132.0",
         "node-opcua-xml2json": "2.128.0",
-        "semver": "^7.6.2",
+        "semver": "^7.6.3",
         "set-prototype-of": "^1.0.0",
         "thenify": "^3.3.1",
         "xml-writer": "^1.7.0"
@@ -61,9 +61,9 @@
         "node-opcua-benchmarker": "2.128.0",
         "node-opcua-leak-detector": "2.128.0",
         "node-opcua-nodesets": "2.121.0",
-        "node-opcua-packet-analyzer": "2.128.0",
-        "node-opcua-service-filter": "2.129.0",
-        "node-opcua-test-fixtures": "2.129.0",
+        "node-opcua-packet-analyzer": "2.132.0",
+        "node-opcua-service-filter": "2.132.0",
+        "node-opcua-test-fixtures": "2.132.0",
         "source-map-support": "^0.5.21"
     },
     "author": "Etienne Rossignon",
@@ -81,7 +81,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "94bf9012b03dbd4325cd122ce04edfa5466875bc",
+    "gitHead": "5fab0f1eac0e59abf94bab9034035aec44890456",
     "files": [
         "dist",
         "distHelpers",

package/source/loader/generateAddressSpaceRaw.ts

@@ -2,7 +2,7 @@ import { checkDebugFlag, make_debugLog, make_errorLog } from "node-opcua-debug";
 import { CallbackT } from "node-opcua-status-code";
 import { IAddressSpace, RequiredModel } from "node-opcua-address-space-base";
 import { ReaderStateParserLike, Xml2Json } from "node-opcua-xml2json";
-import { minDate } from "node-opcua-date-time";
+import { getMinOPCUADate } from "node-opcua-date-time";
 import { adjustNamespaceArray } from "../../src/nodeset_tools/adjust_namespace_array";
 import { NodeSetLoaderOptions } from "../interfaces/nodeset_loader_options";
 import { NamespacePrivate } from "../../src/namespace_private";
@@ -85,7 +85,7 @@ async function parseDependencies(xmlData: string): Promise<NodesetInfo> {
         models.push({
             modelUri: namespaceUris[0],
             version: "1",
-            publicationDate: minDate,
+            publicationDate: getMinOPCUADate(),
             requiredModel: []
         });
     }

package/src/alarms_and_conditions/condition.ts

@@ -4,7 +4,7 @@
 require("set-prototype-of");
 import { assert } from "node-opcua-assert";
 import { LocalizedText, LocalizedTextLike } from "node-opcua-data-model";
-import { minDate } from "node-opcua-basic-types";
+import { getMinOPCUADate } from "node-opcua-basic-types";
 import { StatusCode, StatusCodes } from "node-opcua-status-code";
 import { ISetStateOptions } from "../../source/interfaces/i_set_state_options";
 import { ConditionSnapshotImpl } from "./condition_snapshot_impl";
@@ -30,7 +30,7 @@ export function _setAckedState(
 // tslint:disable:max-classes-per-file
 function prepare_date(sourceTimestamp: { value: Date } | null) {
     if (!sourceTimestamp || !sourceTimestamp.value) {
-        return minDate;
+        return getMinOPCUADate();
     }
     assert(sourceTimestamp.value instanceof Date);
     return sourceTimestamp;

package/src/alarms_and_conditions/condition_snapshot_impl.ts

@@ -542,8 +542,7 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
      * @param time {Date} : UTCTime
      */
     public setReceiveTime(time: UtcTime): void {
-        if (!(time instanceof Date)) { throw new Error("setReceiveTime expecting a Date")};
-        return this._set_var("ReceiveTime", DataType.DateTime, time, { sourceTimestamp: time });
+        return this._set_var("ReceiveTime", DataType.DateTime, time, { sourceTimestamp: time  || undefined });
     }
 
     /**

package/src/alarms_and_conditions/ua_certificate_expiration_alarm_impl.ts

@@ -2,7 +2,7 @@
  * @module node-opcua-address-space.AlarmsAndConditions
  */
 import { Certificate, exploreCertificate, makeSHA1Thumbprint } from "node-opcua-crypto";
-import { DateTime, minOPCUADate, StatusCodes } from "node-opcua-basic-types";
+import { DateTime, getMinOPCUADate, isMinDate, StatusCodes } from "node-opcua-basic-types";
 import { make_warningLog } from "node-opcua-debug";
 import { NodeId } from "node-opcua-nodeid";
 import { DataType, Variant, VariantOptions } from "node-opcua-variant";
@@ -97,7 +97,7 @@ class UACertificateExpirationAlarmImpl extends UASystemOffNormalAlarmImpl implem
 
         const certificate = this.getCertificate();
 
-        if (!expirationDate || (expirationDate === minOPCUADate && !certificate)) {
+        if (!expirationDate || (isMinDate(expirationDate) && !certificate)) {
             if (!this.currentBranch() || this.currentBranch().getActiveState()) {
                 this.updateAlarmState2(true, 255, "certificate is missing");
             }
@@ -163,13 +163,13 @@ class UACertificateExpirationAlarmImpl extends UASystemOffNormalAlarmImpl implem
     private _extractAndSetExpiryDate(certificate: Certificate | null): void {
         if (certificate && certificate.length > 0) {
             const info = exploreCertificate(certificate);
-            if (info.tbsCertificate.validity.notAfter instanceof Date) {
+            if (info.tbsCertificate.validity.notAfter) {
                 this.setExpirationDate(info.tbsCertificate.validity.notAfter);
             } else {
-                this.setExpirationDate(minOPCUADate);
+                this.setExpirationDate(getMinOPCUADate());
             }
         } else {
-            this.setExpirationDate(minOPCUADate);
+            this.setExpirationDate(getMinOPCUADate());
         }
     }
 

package/src/alarms_and_conditions/ua_condition_impl.ts

@@ -18,7 +18,7 @@ import {
     QualifiedName
 } from "node-opcua-data-model";
 import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
-import { minDate } from "node-opcua-basic-types";
+import { getMinOPCUADate } from "node-opcua-basic-types";
 import { coerceNodeId, makeNodeId, NodeId, resolveNodeId, sameNodeId } from "node-opcua-nodeid";
 import { CallbackT, StatusCode, StatusCodes } from "node-opcua-status-code";
 import { CallMethodResultOptions, TimeZoneDataType } from "node-opcua-types";
@@ -997,8 +997,8 @@ function UACondition_instantiate(
     );
     branch0.setMessage("");
 
-    branch0.setReceiveTime(minDate);
-    branch0.setTime(minDate);
+    branch0.setReceiveTime(getMinOPCUADate());
+    branch0.setTime(getMinOPCUADate());
 
     return conditionNode;
 }

package/src/base_node_impl.ts

@@ -1791,12 +1791,10 @@ function install_components_as_object_properties(parentObj: BaseNode) {
         }
 
         // ignore reserved names
-        if (doDebug) {
-            debugLog("Installing property " + name, " on ", parentObj.browseName.toString());
-        }
+        doDebug && debugLog("Installing property " + name, " on ", parentObj.browseName.toString());
 
-        /* istanbul ignore next */
-        if (Object.prototype.hasOwnProperty.call(parentObj, name)) {
+        const hasProperty = Object.prototype.hasOwnProperty.call(parentObj, name);
+        if (hasProperty && ((parentObj as any)[name] !== null && (parentObj as any)[name] !== undefined)) {
             continue;
         }
 

package/src/nodeset_tools/nodeset_to_xml.ts

@@ -17,13 +17,12 @@ import {
     makeAccessLevelFlag,
     QualifiedName
 } from "node-opcua-data-model";
-import { ExpandedNodeId, NodeId, NodeIdType, resolveNodeId } from "node-opcua-nodeid";
+import { NodeId, NodeIdType, resolveNodeId } from "node-opcua-nodeid";
 import { lowerFirstLetter, isNullOrUndefined } from "node-opcua-utils";
 import { Variant, VariantArrayType, DataType } from "node-opcua-variant";
 import {
     IAddressSpace,
     BaseNode,
-    INamespace,
     UADataType,
     UAMethod,
     UAObject,
@@ -33,10 +32,10 @@ import {
     UAVariableType,
     UAView
 } from "node-opcua-address-space-base";
-import { AttributeIds, Int64, minOPCUADate, StatusCode, StatusCodes } from "node-opcua-basic-types";
+import { AttributeIds, Int64, isMinDate, StatusCode } from "node-opcua-basic-types";
 import { BrowseDescription, EnumDefinition, StructureDefinition, StructureType } from "node-opcua-types";
 
-import { ITranslationTable, XmlWriter } from "../../source/xml_writer";
+import { XmlWriter } from "../../source/xml_writer";
 import { ReferenceImpl } from "../reference_impl";
 import { BaseNodeImpl, getReferenceType } from "../base_node_impl";
 import { UAReferenceTypeImpl } from "../ua_reference_type_impl";
@@ -50,7 +49,7 @@ import { UAVariableTypeImpl } from "../ua_variable_type_impl";
 import { SessionContext } from "../index_current";
 import { UAViewImpl } from "../ua_view_impl";
 
-import { DefinitionMap2, TypeInfo } from "../../source/loader/make_xml_extension_object_parser";
+import { DefinitionMap2 } from "../../source/loader/make_xml_extension_object_parser";
 import { makeDefinitionMap } from "../../source/loader/decode_xml_extension_object";
 import {
     _constructNamespaceTranslationTable,
@@ -558,7 +557,7 @@ function _isDefaultValue(value: Variant): boolean {
                 }
                 break;
             case DataType.DateTime:
-                if (!value.value || value.value.getTime() === minOPCUADate) {
+                if (!value.value || isMinDate(value.value)) {
                     return true;
                 }
                 break;

package/src/ua_variable_impl.ts

@@ -32,7 +32,7 @@ import { extractRange, sameDataValue, DataValue, DataValueLike, DataValueT } fro
 import { coerceClock, getCurrentClock, PreciseClock } from "node-opcua-date-time";
 import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
 import { ExtensionObject } from "node-opcua-extension-object";
-import { NodeId } from "node-opcua-nodeid";
+import { NodeId, NodeIdLike } from "node-opcua-nodeid";
 import { NumericRange } from "node-opcua-numeric-range";
 import { WriteValue } from "node-opcua-service-write";
 import { StatusCode, StatusCodes, CallbackT } from "node-opcua-status-code";
@@ -421,7 +421,7 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
                         this.$dataValue = dataValueOrPromise as DataValue;
                         if (this.$dataValue.statusCode.isGoodish()) {
                             this.verifyVariantCompatibility(this.$dataValue.value);
-                        } 
+                        }
                     }
                 } else {
                     errorLog(
@@ -1407,6 +1407,10 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
         }
     }
 
+    public changeDataType(newDataType: NodeIdLike, newValue?: VariantLike): void {
+        changeUAVariableDataType(this, newDataType, newValue);
+    }
+
     /**
      * @private
      * install UAVariable to exposed th
@@ -2287,3 +2291,35 @@ export interface UAVariableImplT<T, DT extends DataType> extends UAVariableImpl,
     writeValue(context: ISessionContext, dataValue: DataValueT<T, DT>, indexRange?: NumericRange | null): Promise<StatusCode>;
 }
 export class UAVariableImplT<T, DT extends DataType> extends UAVariableImpl {}
+
+function changeUAVariableDataType(uaVariable: UAVariableImpl, newDataType: NodeIdLike, valueLike?: VariantLike) {
+    let value: Variant | null = valueLike ? (valueLike instanceof Variant ? valueLike : new Variant(valueLike)) : null;
+
+    const addressSpace = uaVariable.addressSpace;
+    const newDataTypeNode = addressSpace.findNode(newDataType) as UADataType;
+    // istanbul ignore next
+    if (!newDataTypeNode || !(newDataTypeNode instanceof UADataTypeImpl)) {
+        throw new Error("Cannot find newDataTypeNode " + newDataType.toString());
+    }
+
+    const newBaseDataType: DataType = newDataTypeNode.basicDataType;
+    // istanbul ignore next
+    if (newBaseDataType === DataType.Null) {
+        throw new Error("newDataTypeNode must be a DataType");
+    }
+    if (!value) {
+        value = uaVariable.readValue().value;
+        value.dataType = newBaseDataType;
+    }
+    if (newBaseDataType !== value.dataType) {
+        throw new Error("newDataTypeNode must be of the same base dataType as the value");
+    }
+
+    // change uaVariable.dataType
+    uaVariable.dataType = newDataTypeNode.nodeId;
+    (uaVariable as any)._basicDataType = null;
+    (uaVariable as any).$dataValue.value.dataType = newDataType;
+    (uaVariable as any).$dataValue.value.value = value;
+    // also change the value to ensure that we have a default value with the correct dataType
+    uaVariable._internal_set_value(value);
+}