Merge remote-tracking branch 'node-opcua/master'

BiancoRoyal · Nov 7, 2023 · 0f7e23f · 0f7e23f
2 parents b569328 + 713ad38
commit 0f7e23f
Show file tree

Hide file tree

Showing 161 changed files with 5,972 additions and 2,844 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -31,6 +31,7 @@ module.exports = {
         mocha: true
     },
     rules: {
+        "@typescript-eslint/no-unsafe-declaration-merging": "off",
         "@typescript-eslint/camelcase": "off",
         "@typescript-eslint/no-unused-vars": "off",
         "@typescript-eslint/no-non-null-assertion": "off",

diff --git a/README.md b/README.md
@@ -85,6 +85,40 @@ Grants ensure the following:
 - 🚀 New features & enhancements
 - ⚖️ representing the node-opcua user community at the OPC Foundation
 
+
+## Sponsors
+
+<a href="https://opencollective.com/node-opcua/donate" target="_blank">
+  <img src="https://opencollective.com/node-opcua/donate/button@2x.png?color=blue" width=300 />
+</a>
+
+<a href="https://opencollective.com/node-opcua/sponsor/0/website" target="_blank"><img src="https://opencollective.com/node-opcua/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/node-opcua/sponsor/1/website" target="_blank"><img src="https://opencollective.com/node-opcua/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/node-opcua/sponsor/2/website" target="_blank"><img src="https://opencollective.com/node-opcua/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/node-opcua/sponsor/3/website" target="_blank"><img src="https://opencollective.com/node-opcua/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/node-opcua/sponsor/4/website" target="_blank"><img src="https://opencollective.com/node-opcua/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/node-opcua/sponsor/5/website" target="_blank"><img src="https://opencollective.com/node-opcua/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/node-opcua/sponsor/6/website" target="_blank"><img src="https://opencollective.com/node-opcua/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/node-opcua/sponsor/7/website" target="_blank"><img src="https://opencollective.com/node-opcua/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/node-opcua/sponsor/8/website" target="_blank"><img src="https://opencollective.com/node-opcua/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/node-opcua/sponsor/9/website" target="_blank"><img src="https://opencollective.com/node-opcua/sponsor/9/avatar.svg"></a>
+
+
+## Backers
+
+Thank you to all our backers! [Become a backer](https://opencollective.com/node-opcua#backer)
+
+<img src=https://opencollective.com/node-opcua/tiers/badge.svg>
+
+<a href="https://opencollective.com/node-opcua#backers" target="_blank"><img src="https://opencollective.com/node-opcua/tiers/backer.svg?width=890"></a>
+
+
+## Contributors
+
+This project exists thanks to all the people who contribute. 
+<img src="https://opencollective.com/node-opcua/contributors.svg?width=890&button=true" /></a>
+
+
 ## Getting professional support
 
 To get professional support, consider subscribing to the node-opcua membership community:

diff --git a/dockertest/Dockerfile b/dockertest/Dockerfile
@@ -1,3 +1,3 @@
-FROM node:20.5.1-bookworm-slim
+FROM node:20.8-bookworm-slim
 RUN npm install -g pnpm typescript ts-node mocha
 
diff --git a/lerna.json b/lerna.json
@@ -3,7 +3,7 @@
     "packages/*",
     "packages_extra/*"
   ],
-  "version": "2.113.0",
+  "version": "2.116.0",
   "npmClient": "pnpm",
   "exact": true
 }
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
         "eslint-fix": "eslint --fix packages/*/src/**.js packages/*/__tests__/ utils/*.js scripts/*.js",
         "generate_doc": "make doc",
         "generate_autodoc": "npx autodoc -o _tmp_generated_doc bin/binaryStream.js",
-        "ncu": "ncu -u -x mkdirp,@types/mkdirp,yargs,env-paths,cli-truncate,long,chalk,case-anything,rimraf --target=latest && ncu --deep -u --timeout 100000  -x mkdirp,@types/mkdirp,yargs,env-paths,cli-truncate,long,chalk,case-anything,rimraf --target=latest ",
+        "ncu": "ncu -u -x mkdirp,@types/mkdirp,yargs,env-paths,cli-truncate,long,chalk,case-anything,rimraf --target=latest && ncu --deep -u --timeout 400000  -x mkdirp,@types/mkdirp,yargs,env-paths,cli-truncate,long,chalk,case-anything,rimraf --target=latest ",
         "prettier-watch": "onchange \"packages/*/(src|test|source)/**/*.(js|ts)\" -v -p -- prettier --write {{changed}}",
         "alex": "npx alex documentation/*.md",
         "cost-of-modules": "npx cost-of-modules",
@@ -60,10 +60,10 @@
         "packages_extra/*"
     ],
     "devDependencies": {
-        "@types/mocha": "^10.0.1",
+        "@types/mocha": "^10.0.2",
         "@types/prettier": "^2.7.3",
-        "@typescript-eslint/eslint-plugin": "^6.6.0",
-        "@typescript-eslint/parser": "^6.6.0",
+        "@typescript-eslint/eslint-plugin": "^6.7.3",
+        "@typescript-eslint/parser": "^6.7.3",
         "app-module-path": "^2.2.0",
         "benchmark": "^2.1.4",
         "bignumber.js": "^9.1.2",
@@ -86,17 +86,17 @@
     "typings": "./packages/node-opcua/node-opcua.d.ts",
     "dependencies": {
         "@ster5/global-mutex": "^2.0.0",
-        "@types/async": "^3.2.20",
-        "@types/bonjour": "^3.5.10",
-        "@types/lodash": "4.14.198",
+        "@types/async": "^3.2.21",
+        "@types/bonjour": "^3.5.11",
+        "@types/lodash": "4.14.199",
         "@types/long": "^4.0.2",
         "@types/mkdirp": "1.0.2",
-        "@types/node": "20.5.9",
+        "@types/node": "20.8.0",
         "@types/rimraf": "^3.0.2",
-        "@types/sinon": "10.0.16",
+        "@types/sinon": "10.0.17",
         "@types/underscore": "^1.11.9",
         "@types/wordwrap": "^1.0.1",
-        "@types/yargs": "17.0.24",
+        "@types/yargs": "17.0.26",
         "async": "^3.2.4",
         "backoff": "^2.5.0",
         "better-assert": "^1.0.2",
@@ -112,7 +112,7 @@
         "dequeue": "^1.0.5",
         "easy-table": "^1.2.0",
         "env-paths": "2.2.1",
-        "eslint": "8.48.0",
+        "eslint": "8.50.0",
         "exit": "^0.1.2",
         "fqdn": "^0.0.3",
         "hexy": "0.3.5",
@@ -122,7 +122,7 @@
         "lockfile": "^1.0.4",
         "lodash": "4.17.21",
         "long": "^4.0.0",
-        "memfs": "^4.2.1",
+        "memfs": "^4.5.0",
         "mkdirp": "1.0.4",
         "mocha-clean": "^1.0.0",
         "node-opcua-crypto": "4.5.0",
@@ -134,9 +134,9 @@
         "semver": "^7.5.4",
         "set-prototype-of": "^1.0.0",
         "shebang-loader": "^0.0.1",
-        "sinon": "^15.2.0",
+        "sinon": "^16.0.0",
         "source-map-support": "^0.5.21",
-        "sprintf-js": "^1.1.2",
+        "sprintf-js": "^1.1.3",
         "sterfive-bonjour-service": "1.1.4",
         "thenify": "^3.3.1",
         "treeify": "^1.1.0",

diff --git a/packages/node-opcua-address-space-base/package.json b/packages/node-opcua-address-space-base/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space-base",
-    "version": "2.113.0",
+    "version": "2.114.0",
     "description": "pure nodejs OPCUA SDK - module address-space-base",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -17,20 +17,20 @@
     },
     "dependencies": {
         "node-opcua-assert": "2.105.0",
-        "node-opcua-basic-types": "2.113.0",
-        "node-opcua-constants": "2.98.1",
+        "node-opcua-basic-types": "2.114.0",
+        "node-opcua-constants": "2.114.0",
         "node-opcua-crypto": "4.5.0",
-        "node-opcua-data-model": "2.113.0",
-        "node-opcua-data-value": "2.113.0",
-        "node-opcua-date-time": "2.113.0",
-        "node-opcua-debug": "2.113.0",
-        "node-opcua-extension-object": "2.113.0",
-        "node-opcua-nodeid": "2.113.0",
-        "node-opcua-numeric-range": "2.113.0",
-        "node-opcua-schemas": "2.113.0",
-        "node-opcua-status-code": "2.110.0",
-        "node-opcua-types": "2.113.0",
-        "node-opcua-variant": "2.113.0"
+        "node-opcua-data-model": "2.114.0",
+        "node-opcua-data-value": "2.114.0",
+        "node-opcua-date-time": "2.114.0",
+        "node-opcua-debug": "2.114.0",
+        "node-opcua-extension-object": "2.114.0",
+        "node-opcua-nodeid": "2.114.0",
+        "node-opcua-numeric-range": "2.114.0",
+        "node-opcua-schemas": "2.114.0",
+        "node-opcua-status-code": "2.114.0",
+        "node-opcua-types": "2.114.0",
+        "node-opcua-variant": "2.114.0"
     },
     "author": "Etienne Rossignon",
     "license": "MIT",

diff --git a/packages/node-opcua-address-space-base/source/ua_variable_type.ts b/packages/node-opcua-address-space-base/source/ua_variable_type.ts
@@ -20,7 +20,7 @@ export interface InstantiateVariableOptions extends InstantiateOptions {
     nodeId?: NodeIdLike;
     minimumSamplingInterval?: number;
     propertyOf?: NodeIdLike | UAObject | UAObjectType | UAVariable | UAVariableType | UAMethod;
-    value?: BindVariableOptions;    
+    value?: BindVariableOptions;
     /**
      * This attribute indicates whether the Value attribute of the Variableis an array and how many dimensions the array has.
      * It may have the following values:
@@ -31,8 +31,8 @@ export interface InstantiateVariableOptions extends InstantiateOptions {
      *   * Any (−2): The value can be a scalar or an array with any number of dimensions.
      *   * ScalarOrOneDimension (−3): The value can be a scalar or a one dimensional array.
      *   * All DataTypes are considered to be scalar, even if they have array-like semantics like ByteString and String.
-     * 
-     * 
+     *
+     *
      * Note: the valueRank of the instantiated variable must be compatible with the valueRank of the VariableType.
      */
     valueRank?: number;
@@ -50,12 +50,13 @@ export declare class UAVariableType extends BaseNode implements VariableAttribut
 
     public isAbstract: boolean;
 
-    public isSubtypeOf(type:  UAVariableType | NodeIdLike): boolean;
+    public isSubtypeOf(type: UAVariableType | NodeIdLike): boolean;
 
     /** @deprecated - use isSubtypeOf instead */
-    public isSupertypeOf(type:  UAVariableType | NodeIdLike): boolean;
+    public isSupertypeOf(type: UAVariableType | NodeIdLike): boolean;
 
     public instantiate(options: InstantiateVariableOptions): UAVariable;
+    public getBasicDataType(): DataType;
 }
 
 export interface UAVariableTypeT<T, DT extends DataType> extends UAVariableType {

diff --git a/packages/node-opcua-address-space-for-conformance-testing/package.json b/packages/node-opcua-address-space-for-conformance-testing/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space-for-conformance-testing",
-    "version": "2.113.0",
+    "version": "2.116.0",
     "description": "pure nodejs OPCUA SDK - module address-space-for-conformance-testing",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -11,17 +11,17 @@
         "test": "mocha"
     },
     "dependencies": {
-        "node-opcua-address-space": "2.113.0",
+        "node-opcua-address-space": "2.116.0",
         "node-opcua-assert": "2.105.0",
-        "node-opcua-basic-types": "2.113.0",
-        "node-opcua-data-access": "2.113.0",
-        "node-opcua-data-model": "2.113.0",
-        "node-opcua-data-value": "2.113.0",
-        "node-opcua-debug": "2.113.0",
-        "node-opcua-factory": "2.113.0",
-        "node-opcua-nodeid": "2.113.0",
-        "node-opcua-status-code": "2.110.0",
-        "node-opcua-variant": "2.113.0"
+        "node-opcua-basic-types": "2.114.0",
+        "node-opcua-data-access": "2.114.0",
+        "node-opcua-data-model": "2.114.0",
+        "node-opcua-data-value": "2.114.0",
+        "node-opcua-debug": "2.114.0",
+        "node-opcua-factory": "2.114.0",
+        "node-opcua-nodeid": "2.114.0",
+        "node-opcua-status-code": "2.114.0",
+        "node-opcua-variant": "2.114.0"
     },
     "author": "Etienne Rossignon",
     "license": "MIT",

diff --git a/packages/node-opcua-address-space/package.json b/packages/node-opcua-address-space/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space",
-    "version": "2.113.0",
+    "version": "2.116.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.198",
-        "@types/semver": "^7.5.1",
+        "@types/lodash": "4.14.199",
+        "@types/semver": "^7.5.3",
         "async": "^3.2.4",
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
         "lodash": "4.17.21",
-        "node-opcua-address-space-base": "2.113.0",
+        "node-opcua-address-space-base": "2.114.0",
         "node-opcua-assert": "2.105.0",
-        "node-opcua-basic-types": "2.113.0",
-        "node-opcua-binary-stream": "2.110.0",
-        "node-opcua-client-dynamic-extension-object": "2.113.0",
-        "node-opcua-constants": "2.98.1",
+        "node-opcua-basic-types": "2.114.0",
+        "node-opcua-binary-stream": "2.114.0",
+        "node-opcua-client-dynamic-extension-object": "2.116.0",
+        "node-opcua-constants": "2.114.0",
         "node-opcua-crypto": "4.5.0",
-        "node-opcua-data-access": "2.113.0",
-        "node-opcua-data-model": "2.113.0",
-        "node-opcua-data-value": "2.113.0",
-        "node-opcua-date-time": "2.113.0",
-        "node-opcua-debug": "2.113.0",
-        "node-opcua-enum": "2.110.0",
-        "node-opcua-extension-object": "2.113.0",
-        "node-opcua-factory": "2.113.0",
-        "node-opcua-nodeid": "2.113.0",
-        "node-opcua-nodeset-ua": "2.113.0",
-        "node-opcua-numeric-range": "2.113.0",
-        "node-opcua-object-registry": "2.113.0",
-        "node-opcua-pseudo-session": "2.113.0",
-        "node-opcua-service-browse": "2.113.0",
-        "node-opcua-service-call": "2.113.0",
-        "node-opcua-service-history": "2.113.0",
-        "node-opcua-service-translate-browse-path": "2.113.0",
-        "node-opcua-service-write": "2.113.0",
-        "node-opcua-status-code": "2.110.0",
-        "node-opcua-types": "2.113.0",
-        "node-opcua-utils": "2.110.0",
-        "node-opcua-variant": "2.113.0",
-        "node-opcua-xml2json": "2.113.0",
+        "node-opcua-data-access": "2.114.0",
+        "node-opcua-data-model": "2.114.0",
+        "node-opcua-data-value": "2.114.0",
+        "node-opcua-date-time": "2.114.0",
+        "node-opcua-debug": "2.114.0",
+        "node-opcua-enum": "2.114.0",
+        "node-opcua-extension-object": "2.114.0",
+        "node-opcua-factory": "2.114.0",
+        "node-opcua-nodeid": "2.114.0",
+        "node-opcua-nodeset-ua": "2.114.0",
+        "node-opcua-numeric-range": "2.114.0",
+        "node-opcua-object-registry": "2.114.0",
+        "node-opcua-pseudo-session": "2.116.0",
+        "node-opcua-service-browse": "2.114.0",
+        "node-opcua-service-call": "2.114.0",
+        "node-opcua-service-history": "2.114.0",
+        "node-opcua-service-translate-browse-path": "2.114.0",
+        "node-opcua-service-write": "2.114.0",
+        "node-opcua-status-code": "2.114.0",
+        "node-opcua-types": "2.114.0",
+        "node-opcua-utils": "2.114.0",
+        "node-opcua-variant": "2.114.0",
+        "node-opcua-xml2json": "2.114.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.110.0",
-        "node-opcua-leak-detector": "2.113.0",
+        "node-opcua-benchmarker": "2.114.0",
+        "node-opcua-leak-detector": "2.114.0",
         "node-opcua-nodesets": "2.110.0",
-        "node-opcua-packet-analyzer": "2.113.0",
-        "node-opcua-service-filter": "2.113.0",
-        "node-opcua-test-fixtures": "2.113.0",
+        "node-opcua-packet-analyzer": "2.114.0",
+        "node-opcua-service-filter": "2.114.0",
+        "node-opcua-test-fixtures": "2.114.0",
         "should": "^13.2.3",
-        "sinon": "^15.2.0",
+        "sinon": "^16.0.0",
         "source-map-support": "^0.5.21"
     },
     "author": "Etienne Rossignon",

diff --git a/packages/node-opcua-address-space/source/helpers/call_helpers.ts b/packages/node-opcua-address-space/source/helpers/call_helpers.ts
@@ -8,6 +8,7 @@ import { CallMethodRequest } from "node-opcua-service-call";
 import { StatusCode, StatusCodes } from "node-opcua-status-code";
 import { CallMethodResultOptions } from "node-opcua-types";
 import { Variant } from "node-opcua-variant";
+import { ResponseCallback } from "node-opcua-pseudo-session";
 import { ISessionContext, IAddressSpace, UAMethod, UAObject } from "node-opcua-address-space-base";
 
 import { getMethodDeclaration_ArgumentList, verifyArguments_ArgumentList } from "./argument_list";
@@ -28,7 +29,6 @@ import { resolveOpaqueOnAddressSpace } from "./resolve_opaque_on_address_space";
 //                               A ByteString is structurally the same as a one dimensional array of Byte.
 //                               A server shall accept a ByteString if an array of Byte is expected.
 // BadNoCommunication
-type ResponseCallback<T> = (err: Error | null, result?: T) => void;
 
 export function callMethodHelper(
     context: ISessionContext,

diff --git a/packages/node-opcua-address-space/source/index.ts b/packages/node-opcua-address-space/source/index.ts
@@ -41,7 +41,7 @@ export { promoteToMultiStateDiscrete } from "../src/data_access/ua_multistate_di
 export { promoteToMultiStateValueDiscrete } from "../src/data_access/ua_multistate_value_discrete_impl";
 export { promoteToTwoStateDiscrete } from "../src/data_access/ua_two_state_discrete_impl";
 export { validateDataType } from "../src/data_access/ua_multistate_value_discrete_impl";
-
+export { validateDataTypeCorrectness  } from "../src/validate_data_type_correctness";
 export * from "./ua_root_folder";
 export * from "./session_context";
 export * from "./pseudo_session";