node-opcua-basic-types 2.71.0 → 2.74.0

package/dist/string.js

@@ -1,31 +1,31 @@
-"use strict";
-/***
- * @module node-opcua-basic-types
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeUAString = exports.decodeUAString = exports.encodeString = exports.decodeString = exports.randomString = exports.isValidString = void 0;
-const utils_1 = require("./utils");
-function isValidString(value) {
-    return typeof value === "string";
-}
-exports.isValidString = isValidString;
-function randomString() {
-    const nbCar = (0, utils_1.getRandomInt)(1, 20);
-    const cars = [];
-    for (let i = 0; i < nbCar; i++) {
-        cars.push(String.fromCharCode(65 + (0, utils_1.getRandomInt)(0, 26)));
-    }
-    return cars.join("");
-}
-exports.randomString = randomString;
-function decodeString(stream, value) {
-    return stream.readString();
-}
-exports.decodeString = decodeString;
-function encodeString(value, stream) {
-    stream.writeString(value);
-}
-exports.encodeString = encodeString;
-exports.decodeUAString = decodeString;
-exports.encodeUAString = encodeString;
+"use strict";
+/***
+ * @module node-opcua-basic-types
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.encodeUAString = exports.decodeUAString = exports.encodeString = exports.decodeString = exports.randomString = exports.isValidString = void 0;
+const utils_1 = require("./utils");
+function isValidString(value) {
+    return typeof value === "string";
+}
+exports.isValidString = isValidString;
+function randomString() {
+    const nbCar = (0, utils_1.getRandomInt)(1, 20);
+    const cars = [];
+    for (let i = 0; i < nbCar; i++) {
+        cars.push(String.fromCharCode(65 + (0, utils_1.getRandomInt)(0, 26)));
+    }
+    return cars.join("");
+}
+exports.randomString = randomString;
+function decodeString(stream, value) {
+    return stream.readString();
+}
+exports.decodeString = decodeString;
+function encodeString(value, stream) {
+    stream.writeString(value);
+}
+exports.encodeString = encodeString;
+exports.decodeUAString = decodeString;
+exports.encodeUAString = encodeString;
 //# sourceMappingURL=string.js.map

package/dist/utils.d.ts

@@ -1,12 +1,12 @@
-/***
- * @module node-opcua-basic-types
- */
-/**
- * return a random integer value in the range of  min inclusive and  max exclusive
- * @method getRandomInt
- * @param min
- * @param max
- * @return {*}
- * @private
- */
-export declare function getRandomInt(min: number, max: number): number;
+/***
+ * @module node-opcua-basic-types
+ */
+/**
+ * return a random integer value in the range of  min inclusive and  max exclusive
+ * @method getRandomInt
+ * @param min
+ * @param max
+ * @return {*}
+ * @private
+ */
+export declare function getRandomInt(min: number, max: number): number;

package/dist/utils.js

@@ -1,20 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRandomInt = void 0;
-/***
- * @module node-opcua-basic-types
- */
-/**
- * return a random integer value in the range of  min inclusive and  max exclusive
- * @method getRandomInt
- * @param min
- * @param max
- * @return {*}
- * @private
- */
-function getRandomInt(min, max) {
-    // note : Math.random() returns a random number between 0 (inclusive) and 1 (exclusive):
-    return Math.floor(Math.random() * (max - min)) + min;
-}
-exports.getRandomInt = getRandomInt;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRandomInt = void 0;
+/***
+ * @module node-opcua-basic-types
+ */
+/**
+ * return a random integer value in the range of  min inclusive and  max exclusive
+ * @method getRandomInt
+ * @param min
+ * @param max
+ * @return {*}
+ * @private
+ */
+function getRandomInt(min, max) {
+    // note : Math.random() returns a random number between 0 (inclusive) and 1 (exclusive):
+    return Math.floor(Math.random() * (max - min)) + min;
+}
+exports.getRandomInt = getRandomInt;
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-basic-types",
-    "version": "2.71.0",
+    "version": "2.74.0",
     "description": "pure nodejs OPCUA SDK - module -basic-types",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -11,20 +11,20 @@
         "lint": "eslint source/*.ts"
     },
     "dependencies": {
-        "node-opcua-assert": "2.66.0",
-        "node-opcua-binary-stream": "2.71.0",
-        "node-opcua-buffer-utils": "2.71.0",
-        "node-opcua-date-time": "2.71.0",
-        "node-opcua-enum": "2.71.0",
-        "node-opcua-guid": "2.66.0",
-        "node-opcua-nodeid": "2.71.0",
-        "node-opcua-status-code": "2.71.0",
-        "node-opcua-utils": "2.71.0"
+        "node-opcua-assert": "2.74.0",
+        "node-opcua-binary-stream": "2.74.0",
+        "node-opcua-buffer-utils": "2.74.0",
+        "node-opcua-date-time": "2.74.0",
+        "node-opcua-enum": "2.74.0",
+        "node-opcua-guid": "2.74.0",
+        "node-opcua-nodeid": "2.74.0",
+        "node-opcua-status-code": "2.74.0",
+        "node-opcua-utils": "2.74.0"
     },
     "devDependencies": {
         "@types/node": "18.0.0",
-        "node-opcua-benchmarker": "2.71.0",
-        "node-opcua-debug": "2.71.0",
+        "node-opcua-benchmarker": "2.74.0",
+        "node-opcua-debug": "2.74.0",
         "should": "^13.2.3"
     },
     "author": "Etienne Rossignon",
@@ -42,5 +42,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "10f7cc1e1cd30dfef75adad9cb709a78401fabf3"
+    "gitHead": "003ee041795f3b737afaaef5721045ee31ea9f77"
 }

package/source/data_type.ts

@@ -0,0 +1,31 @@
+/***
+ * @module node-opcua-basic-types
+ */
+export enum DataType {
+    Null = 0,
+    Boolean = 1,
+    SByte = 2, // signed Byte = Int8
+    Byte = 3, // unsigned Byte = UInt8
+    Int16 = 4,
+    UInt16 = 5,
+    Int32 = 6,
+    UInt32 = 7,
+    Int64 = 8,
+    UInt64 = 9,
+    Float = 10,
+    Double = 11,
+    String = 12,
+    DateTime = 13,
+    Guid = 14,
+    ByteString = 15,
+    XmlElement = 16,
+    NodeId = 17,
+    ExpandedNodeId = 18,
+    StatusCode = 19,
+    QualifiedName = 20,
+    LocalizedText = 21,
+    ExtensionObject = 22,
+    DataValue = 23,
+    Variant = 24,
+    DiagnosticInfo = 25
+}

package/source/index.ts

@@ -2,17 +2,18 @@
  * @module node-opcua-basic-types
  */
 
+export * from "./array";
+export * from "./attributeIds";
 export * from "./boolean";
-export * from "./integers";
-export * from "./floats";
-export * from "./string";
-export * from "./date_time";
 export * from "./byte_string";
-export * from "./node_id";
-export * from "./status_code";
+export * from "./data_type";
+export * from "./date_time";
+export * from "./floats";
 export * from "./guid";
-export * from "./array";
+export * from "./integers";
 export * from "./locale_id";
-export * from "./attributeIds";
+export * from "./node_id";
 export * from "./round_to_float";
+export * from "./status_code";
+export * from "./string";
 export type ByteString = Buffer;

package/source/integers.ts

@@ -155,7 +155,7 @@ export function randomUInt64(): UInt64 {
     return [getRandomInt(0, 0xffffffff), getRandomInt(0, 0xffffffff)];
 }
 
-export function encodeUInt64(value: UInt64 | number, stream: OutputBinaryStream): void  {
+export function encodeUInt64(value: UInt64 | number, stream: OutputBinaryStream): void {
     if (typeof value === "number") {
         const arr = coerceUInt64(value);
         stream.writeUInt32(arr[1]);
@@ -173,6 +173,10 @@ export function decodeUInt64(stream: BinaryStream, value?: UInt64): UInt64 {
 }
 
 export function constructInt64(high: UInt32, low: UInt32): Int64 {
+    if (high === 0 && low < 0) {
+        high = 0xffffffff;
+        low = 0xffffffff + low + 1;
+    }
     assert(low >= 0 && low <= 0xffffffff);
     assert(high >= 0 && high <= 0xffffffff);
     return [high, low];
@@ -192,14 +196,24 @@ export function coerceUInt64(value: number | UInt64 | Int32 | string | null): UI
     }
     if (typeof value === "string") {
         v = value.split(",");
-        high = parseInt(v[0], 10);
-        low = parseInt(v[1], 10);
+        if (v.length === 1) {
+            // was a single string, good news ! BigInt can be used with nodejs >=12
+            let a = BigInt(value);
+            if (a < BigInt(0)) {
+                const mask = BigInt("0xFFFFFFFFFFFFFFFF");
+                a = (mask + a + BigInt(1)) & mask;
+            }
+            high = Number(a >> BigInt(32));
+            low = Number(a & BigInt(0xffffffff));
+        } else {
+            high = parseInt(v[0], 10);
+            low = parseInt(v[1], 10);
+        }
         return constructInt64(high, low);
     }
     if (value > 0xffffffff) {
         // beware : as per javascript, value is a double here !
         //          our conversion will suffer from some inaccuracy
-
         high = Math.floor(value / 0x100000000);
         low = value - high * 0x100000000;
         return constructInt64(high, low);