node-opcua-address-space 2.107.0 → 2.109.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space",
-    "version": "2.107.0",
+    "version": "2.109.0",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/src/index_current.js",
     "types": "./dist/source/index.d.ts",
@@ -16,57 +16,57 @@
         "c": "mocha --version"
     },
     "dependencies": {
-        "@types/lodash": "4.14.195",
+        "@types/lodash": "4.14.197",
         "@types/semver": "^7.5.0",
         "async": "^3.2.4",
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
         "lodash": "4.17.21",
-        "node-opcua-address-space-base": "2.107.0",
+        "node-opcua-address-space-base": "2.109.0",
         "node-opcua-assert": "2.105.0",
-        "node-opcua-basic-types": "2.105.0",
-        "node-opcua-binary-stream": "2.105.0",
-        "node-opcua-client-dynamic-extension-object": "2.107.0",
+        "node-opcua-basic-types": "2.109.0",
+        "node-opcua-binary-stream": "2.109.0",
+        "node-opcua-client-dynamic-extension-object": "2.109.0",
         "node-opcua-constants": "2.98.1",
-        "node-opcua-crypto": "3.0.6",
-        "node-opcua-data-access": "2.107.0",
-        "node-opcua-data-model": "2.105.0",
-        "node-opcua-data-value": "2.105.0",
-        "node-opcua-date-time": "2.105.0",
-        "node-opcua-debug": "2.105.0",
-        "node-opcua-enum": "2.105.0",
-        "node-opcua-extension-object": "2.105.0",
-        "node-opcua-factory": "2.105.0",
-        "node-opcua-nodeid": "2.105.0",
-        "node-opcua-nodeset-ua": "2.107.0",
-        "node-opcua-numeric-range": "2.105.0",
-        "node-opcua-object-registry": "2.105.0",
-        "node-opcua-pseudo-session": "2.107.0",
-        "node-opcua-service-browse": "2.107.0",
-        "node-opcua-service-call": "2.107.0",
-        "node-opcua-service-history": "2.107.0",
-        "node-opcua-service-translate-browse-path": "2.107.0",
-        "node-opcua-service-write": "2.107.0",
-        "node-opcua-status-code": "2.105.0",
-        "node-opcua-types": "2.107.0",
-        "node-opcua-utils": "2.105.0",
-        "node-opcua-variant": "2.105.0",
-        "node-opcua-xml2json": "2.107.0",
-        "semver": "^7.5.1",
+        "node-opcua-crypto": "4.1.0",
+        "node-opcua-data-access": "2.109.0",
+        "node-opcua-data-model": "2.109.0",
+        "node-opcua-data-value": "2.109.0",
+        "node-opcua-date-time": "2.109.0",
+        "node-opcua-debug": "2.109.0",
+        "node-opcua-enum": "2.109.0",
+        "node-opcua-extension-object": "2.109.0",
+        "node-opcua-factory": "2.109.0",
+        "node-opcua-nodeid": "2.109.0",
+        "node-opcua-nodeset-ua": "2.109.0",
+        "node-opcua-numeric-range": "2.109.0",
+        "node-opcua-object-registry": "2.109.0",
+        "node-opcua-pseudo-session": "2.109.0",
+        "node-opcua-service-browse": "2.109.0",
+        "node-opcua-service-call": "2.109.0",
+        "node-opcua-service-history": "2.109.0",
+        "node-opcua-service-translate-browse-path": "2.109.0",
+        "node-opcua-service-write": "2.109.0",
+        "node-opcua-status-code": "2.109.0",
+        "node-opcua-types": "2.109.0",
+        "node-opcua-utils": "2.109.0",
+        "node-opcua-variant": "2.109.0",
+        "node-opcua-xml2json": "2.109.0",
+        "semver": "^7.5.4",
         "set-prototype-of": "^1.0.0",
         "thenify": "^3.3.1",
         "xml-writer": "^1.7.0"
     },
     "devDependencies": {
         "mocha": "^10.2.0",
-        "node-opcua-benchmarker": "2.105.0",
-        "node-opcua-leak-detector": "2.105.0",
-        "node-opcua-nodesets": "2.107.0",
-        "node-opcua-packet-analyzer": "2.105.0",
-        "node-opcua-service-filter": "2.107.0",
-        "node-opcua-test-fixtures": "2.107.0",
+        "node-opcua-benchmarker": "2.109.0",
+        "node-opcua-leak-detector": "2.109.0",
+        "node-opcua-nodesets": "2.109.0",
+        "node-opcua-packet-analyzer": "2.109.0",
+        "node-opcua-service-filter": "2.109.0",
+        "node-opcua-test-fixtures": "2.109.0",
         "should": "^13.2.3",
-        "sinon": "^15.1.0",
+        "sinon": "^15.2.0",
         "source-map-support": "^0.5.21"
     },
     "author": "Etienne Rossignon",
@@ -84,7 +84,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "df5c9168eea0d1a521603d181fa66ace7649e79e",
+    "gitHead": "50cfa07779d4c07b299176ac9c27527fcd97d079",
     "files": [
         "dist",
         "distHelpers",

package/source/helpers/coerce_enum_value.ts

@@ -2,7 +2,7 @@
  * @module node-opcua-address-space
  */
 import { assert } from "node-opcua-assert";
-import { Int64 } from "node-opcua-basic-types";
+import { Int64, coerceInt64 } from "node-opcua-basic-types";
 import { coerceLocalizedText } from "node-opcua-data-model";
 import { EnumValueType } from "node-opcua-types";
 import { EnumValueTypeOptionsLike } from "../address_space_ts";
@@ -15,17 +15,17 @@ export function coerceEnumValues(enumValues: EnumValueTypeOptionsLike[] | { [key
             assert(Object.prototype.hasOwnProperty.call(en, "displayName"));
             return new EnumValueType({
                 displayName: coerceLocalizedText(en.displayName),
-                value: en.value
+                value: coerceInt64(en.value)
             });
         });
     } else {
         return coerceEnumValues(
-            Object.entries(enumValues as { [key: string]: Int64 }).map((entrie: [string, Int64]) => {
-                const [key, value] = entrie;
+            Object.entries(enumValues as { [key: string]: Int64 }).map((entry: [string, Int64]) => {
+                const [key, value] = entry;
                 return new EnumValueType({
                     description: coerceLocalizedText(key),
                     displayName: coerceLocalizedText(key),
-                    value
+                    value: coerceInt64(value)
                 });
             })
         );

package/source/loader/load_nodeset2.ts

@@ -648,7 +648,7 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
                 Value: {
                     finish(this: any) {
                         // Low part
-                        this.parent.enumValueType.value[1] = parseInt(this.text, 10);
+                        this.parent.enumValueType.value = coerceInt64(parseInt(this.text, 10));
                     }
                 },
 

package/src/alarms_and_conditions/ua_certificate_expiration_alarm_impl.ts

@@ -49,7 +49,7 @@ export const TwoWeeksDuration = OneDayDuration * 2 * 7;
  * of expiration. This alarm automatically returns to normal when the certificate is updated.
  */
 class UACertificateExpirationAlarmImpl extends UASystemOffNormalAlarmImpl implements UACertificateExpirationAlarmEx {
-    private timer: any;
+    private timer: NodeJS.Timeout | null = null;
 
     public static instantiate(
         namespace: INamespace,

package/src/base_node_impl.ts

@@ -178,7 +178,11 @@ export class BaseNodeImpl extends EventEmitter implements BaseNode {
         return _private._displayName;
     }
 
-    public setDisplayName(value: LocalizedText[]): void {
+    
+    public setDisplayName(value: LocalizedTextLike[] | LocalizedTextLike): void {
+        if (!Array.isArray(value)) {
+            return this.setDisplayName([value]);
+        }
         this._setDisplayName(value);
         /**
          * fires when the displayName is changed.
@@ -193,8 +197,7 @@ export class BaseNodeImpl extends EventEmitter implements BaseNode {
         return _private._description!;
     }
 
-    public setDescription(value: LocalizedTextLike): void {
-        
+    public setDescription(value: LocalizedTextLike| null): void {
         this._setDescription(value);
         /**
          * fires when the description attribute is changed.

package/src/extension_object_array_node.ts

@@ -4,7 +4,7 @@
 import { assert } from "node-opcua-assert";
 
 import { BrowseDirection, NodeClass } from "node-opcua-data-model";
-import { checkDebugFlag, make_debugLog, make_errorLog } from "node-opcua-debug";
+import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
 import { NodeId } from "node-opcua-nodeid";
 import { Variant } from "node-opcua-variant";
 import { DataType } from "node-opcua-variant";
@@ -13,11 +13,12 @@ import { VariantArrayType } from "node-opcua-variant";
 import { ExtensionObject } from "node-opcua-extension-object";
 import { UADataType, UADynamicVariableArray, UAObject, UAReferenceType, UAVariable } from "node-opcua-address-space-base";
 import { UAVariableImpl } from "./ua_variable_impl";
-import { getProxyTarget } from "./ua_variable_impl_ext_obj";
 
 const doDebug = checkDebugFlag(__filename);
 const debugLog = make_debugLog(__filename);
 const errorLog = make_errorLog(__filename);
+const warningLog= make_warningLog(__filename);
+
 /*
  * define a complex Variable containing a array of extension objects
  * each element of the array is also accessible as a component variable.
@@ -129,7 +130,7 @@ function _getElementBrowseName<T extends ExtensionObject>
     const indexPropertyName1 = this.$$indexPropertyName;
 
     if (!Object.prototype.hasOwnProperty.call(extObj, indexPropertyName1)) {
-        console.log(" extension object do not have ", indexPropertyName1, extObj);
+        warningLog(" extension object does not have ", indexPropertyName1, extObj);
     }
     // assert(extObj.constructor === addressSpace.constructExtensionObject(dataType));
     assert(Object.prototype.hasOwnProperty.call(extObj, indexPropertyName1));

package/src/historical_access/address_space_historical_data_node.ts

@@ -30,12 +30,15 @@ import {
     UAVariable,
     ContinuationData
 } from "node-opcua-address-space-base";
+import { make_warningLog } from "node-opcua-debug";
 import { ISessionContext } from "node-opcua-address-space-base";
 
 import { UAVariableImpl } from "../ua_variable_impl";
 import { AddressSpace } from "../../source/address_space_ts";
 import { AddressSpacePrivate } from "../address_space_private";
 
+const warningLog = make_warningLog(__filename);
+
 // tslint:disable:no-var-requires
 const Dequeue = require("dequeue");
 
@@ -138,12 +141,20 @@ export class VariableHistorian implements IVariableHistorian {
         // ensure that values are set with date increasing
         if (sourceTime.getTime() <= this.lastDate.getTime()) {
             if (!(sourceTime.getTime() === this.lastDate.getTime() && sourcePicoSeconds > this.lastDatePicoSeconds)) {
-                console.log(
+                warningLog(
                     chalk.red("Warning date not increasing "),
+                    chalk.cyan("\n node: ", this.node.browseName.toString(), this.node.nodeId.toString()),
+                    "\n new value       = ",
                     newDataValue.toString(),
-                    " last known date = ",
-                    this.lastDate
+                    "\n last known date = ",
+                    this.lastDate,
+                    "\n last known picoSeconds = ",
+                    this.lastDatePicoSeconds,
+                    "\n lastValue = ",
+                    this._timeline[this._timeline.length - 1]?.toString()
                 );
+                // artificially increment date by one 100 picoseconds
+                newDataValue.sourcePicoseconds++;
             }
         }
 

package/src/state_machine/ua_shelving_state_machine_ex.ts

@@ -26,14 +26,14 @@ const debugLog = make_debugLog(__filename);
 const doDebug = checkDebugFlag(__filename);
 
 export interface UAShelvedStateMachineHelper {
-    _timer: NodeJS.Timer | null;
+    _timer: NodeJS.Timeout | null;
     _sheveldTime: Date;
     _unshelvedTime: Date;
     _duration: number;
 }
 
 export interface UAShelvedStateMachineExImpl extends UAShelvedStateMachineHelper {
-    unshelveTime: UAProperty<number, /*z*/ DataType.Double>;
+        unshelveTime: UAProperty<number, /*z*/ DataType.Double>;
     unshelved: UAState;
     timedShelved: UAState;
     oneShotShelved: UAState;