Merge 64df285 into 94a810c

appveyor.yml

@@ -9,8 +9,10 @@ environment:
     # - nodejs_version: "11" (not supported any more)
     # - nodejs_version: "12"  (deprecated in April 30th 2022)
     # - nodejs_version: "14"
-    - nodejs_version: "16"
+    # - nodejs_version: "16" (deprecated in October 2023)
     # - nodejs_version: "18" 
+     - nodejs_version: "20" 
+
 
 platform:
   - x64

package.json

@@ -64,8 +64,8 @@
     "devDependencies": {
         "@types/mocha": "^10.0.1",
         "@types/prettier": "^2.7.3",
-        "@typescript-eslint/eslint-plugin": "^6.5.0",
-        "@typescript-eslint/parser": "^6.5.0",
+        "@typescript-eslint/eslint-plugin": "^6.6.0",
+        "@typescript-eslint/parser": "^6.6.0",
         "app-module-path": "^2.2.0",
         "benchmark": "^2.1.4",
         "bignumber.js": "^9.1.2",
@@ -90,7 +90,7 @@
         "@ster5/global-mutex": "^2.0.0",
         "@types/async": "^3.2.20",
         "@types/bonjour": "^3.5.10",
-        "@types/lodash": "4.14.197",
+        "@types/lodash": "4.14.198",
         "@types/long": "^4.0.2",
         "@types/mkdirp": "1.0.2",
         "@types/node": "20.5.9",
@@ -128,8 +128,8 @@
         "memfs": "^4.2.1",
         "mkdirp": "1.0.4",
         "mocha-clean": "^1.0.0",
-        "node-opcua-crypto": "4.3.1",
-        "node-opcua-pki": "4.5.0",
+        "node-opcua-crypto": "4.4.0",
+        "node-opcua-pki": "4.6.0",
         "object.values": "^1.1.7",
         "pretty-ms": "^8.0.0",
         "progress": "^2.0.3",

packages/node-opcua-address-space-base/package.json

@@ -19,7 +19,7 @@
         "node-opcua-assert": "2.105.0",
         "node-opcua-basic-types": "2.111.0",
         "node-opcua-constants": "2.98.1",
-        "node-opcua-crypto": "4.3.1",
+        "node-opcua-crypto": "4.4.0",
         "node-opcua-data-model": "2.111.0",
         "node-opcua-data-value": "2.111.0",
         "node-opcua-date-time": "2.111.0",

packages/node-opcua-address-space/package.json

@@ -16,7 +16,7 @@
         "c": "mocha --version"
     },
     "dependencies": {
-        "@types/lodash": "4.14.197",
+        "@types/lodash": "4.14.198",
         "@types/semver": "^7.5.1",
         "async": "^3.2.4",
         "chalk": "4.1.2",
@@ -28,7 +28,7 @@
         "node-opcua-binary-stream": "2.110.0",
         "node-opcua-client-dynamic-extension-object": "2.111.0",
         "node-opcua-constants": "2.98.1",
-        "node-opcua-crypto": "4.3.1",
+        "node-opcua-crypto": "4.4.0",
         "node-opcua-data-access": "2.111.0",
         "node-opcua-data-model": "2.111.0",
         "node-opcua-data-value": "2.111.0",

packages/node-opcua-address-space/test/test_issue_1119.ts

@@ -93,6 +93,11 @@ describe("historization and status code Bad #1119", function () {
         await write(100, StatusCodes.Good);
         await write(1000, StatusCodes.Good);
         await write(10, StatusCodes.GoodClamped);
+
+        // ensure all async actions are completed
+        // is server side
+        await pause(1000);
+
         const defaultContext = new SessionContext({
             session: session as unknown as ISessionBase
         });

packages/node-opcua-certificate-manager/package.json

@@ -16,10 +16,10 @@
         "env-paths": "2.2.1",
         "mkdirp": "1.0.4",
         "node-opcua-assert": "2.105.0",
-        "node-opcua-crypto": "4.3.1",
+        "node-opcua-crypto": "4.4.0",
         "node-opcua-debug": "2.110.0",
         "node-opcua-object-registry": "2.110.0",
-        "node-opcua-pki": "4.5.0",
+        "node-opcua-pki": "4.6.0",
         "node-opcua-status-code": "2.110.0",
         "thenify": "^3.3.1"
     },

packages/node-opcua-chunkmanager/source/SequenceHeader.ts

@@ -17,10 +17,10 @@ const schemaSequenceHeader: IStructuredTypeSchema = buildStructuredType({
     fields: [
         // A monotonically increasing sequence number assigned by the sender to each
         // MessageChunk sent over the ClientSecureChannelLayer.
-        { name: "sequenceNumber", fieldType: "UInt32" },
+        { name: "SequenceNumber", fieldType: "UInt32" },
         // An identifier assigned by the client to OPC UA request Message. All MessageChunks for
         // the request and the associated response use the same identifier.
-        { name: "requestId", fieldType: "UInt32" }
+        { name: "RequestId", fieldType: "UInt32" }
     ],
     name: "SequenceHeader"
 });

packages/node-opcua-client/package.json

@@ -24,7 +24,7 @@
         "node-opcua-client-dynamic-extension-object": "2.111.0",
         "node-opcua-common": "2.111.0",
         "node-opcua-constants": "2.98.1",
-        "node-opcua-crypto": "4.3.1",
+        "node-opcua-crypto": "4.4.0",
         "node-opcua-data-model": "2.111.0",
         "node-opcua-data-value": "2.111.0",
         "node-opcua-date-time": "2.111.0",
@@ -33,7 +33,7 @@
         "node-opcua-hostname": "2.105.0",
         "node-opcua-nodeid": "2.110.0",
         "node-opcua-object-registry": "2.110.0",
-        "node-opcua-pki": "4.5.0",
+        "node-opcua-pki": "4.6.0",
         "node-opcua-pseudo-session": "2.111.0",
         "node-opcua-schemas": "2.111.0",
         "node-opcua-secure-channel": "2.111.0",

packages/node-opcua-common/package.json

@@ -12,7 +12,7 @@
     "types": "./dist/index.d.ts",
     "dependencies": {
         "node-opcua-assert": "2.105.0",
-        "node-opcua-crypto": "4.3.1",
+        "node-opcua-crypto": "4.4.0",
         "node-opcua-types": "2.111.0"
     },
     "devDependencies": {

packages/node-opcua-data-model/source/diagnostic_info.ts

@@ -36,48 +36,48 @@ export const schemaDiagnosticInfo: IStructuredTypeSchema = buildStructuredType({
 
     fields: [
         {
-            name: "namespaceUri",
+            name: "NamespaceUri",
 
             fieldType: "Int32",
 
             defaultValue: -1,
             documentation: "The symbolicId is defined within the context of a namespace."
         },
         {
-            name: "symbolicId",
+            name: "SymbolicId",
 
             fieldType: "Int32",
 
             defaultValue: -1,
             documentation: "The symbolicId shall be used to identify a vendor-specific error or condition"
         },
         {
-            name: "locale",
+            name: "Locale",
 
             fieldType: "Int32",
 
             defaultValue: -1,
             documentation: "The locale part of the vendor-specific localized text describing the symbolic id."
         },
-        { name: "localizedText", fieldType: "Int32", defaultValue: -1 },
+        { name: "LocalizedText", fieldType: "Int32", defaultValue: -1 },
         {
-            name: "additionalInfo",
+            name: "AdditionalInfo",
 
             fieldType: "String",
 
             defaultValue: null,
             documentation: "Vendor-specific diagnostic information."
         },
         {
-            name: "innerStatusCode",
+            name: "InnerStatusCode",
 
             fieldType: "StatusCode",
 
             defaultValue: StatusCodes.Good,
             documentation: "The StatusCode from the inner operation."
         },
         {
-            name: "innerDiagnosticInfo",
+            name: "InnerDiagnosticInfo",
 
             fieldType: "DiagnosticInfo",
             category: FieldCategory.basic,

packages/node-opcua-data-model/source/localized_text.ts

@@ -34,15 +34,13 @@ const schemaLocalizedText = buildStructuredType({
 
     fields: [
         {
-            name: "locale",
-
+            name: "Locale",
             fieldType: "LocaleId",
 
             defaultValue: null
         },
         {
-            name: "text",
-
+            name: "Text",
             fieldType: "String",
 
             defaultValue: null

packages/node-opcua-data-model/source/qualified_name.ts

@@ -23,15 +23,12 @@ export const schemaQualifiedName = buildStructuredType({
 
     fields: [
         {
-            name: "namespaceIndex",
-
+            name: "NamespaceIndex",
             fieldType: "UInt16"
         },
         {
-            name: "name",
-
+            name: "Name",
             fieldType: "String",
-
             defaultValue: null
         }
     ]

packages/node-opcua-data-value/source/datavalue.ts

@@ -219,12 +219,12 @@ const schemaDataValue: IStructuredTypeSchema = buildStructuredType({
     name: "DataValue",
 
     fields: [
-        { name: "value", fieldType: "Variant", defaultValue: null },
-        { name: "statusCode", fieldType: "StatusCode", defaultValue: StatusCodes.Good },
-        { name: "sourceTimestamp", fieldType: "DateTime", defaultValue: null },
-        { name: "sourcePicoseconds", fieldType: "UInt16", defaultValue: 0 },
-        { name: "serverTimestamp", fieldType: "DateTime", defaultValue: null },
-        { name: "serverPicoseconds", fieldType: "UInt16", defaultValue: 0 }
+        { name: "Value", fieldType: "Variant", defaultValue: null },
+        { name: "StatusCode", fieldType: "StatusCode", defaultValue: StatusCodes.Good },
+        { name: "SourceTimestamp", fieldType: "DateTime", defaultValue: null },
+        { name: "SourcePicoseconds", fieldType: "UInt16", defaultValue: 0 },
+        { name: "ServerTimestamp", fieldType: "DateTime", defaultValue: null },
+        { name: "ServerPicoseconds", fieldType: "UInt16", defaultValue: 0 }
     ]
 });
 

packages/node-opcua-end2end-test/package.json

@@ -26,7 +26,7 @@
         "node-opcua-client-crawler": "2.111.0",
         "node-opcua-client-proxy": "2.111.0",
         "node-opcua-constants": "2.98.1",
-        "node-opcua-crypto": "4.3.1",
+        "node-opcua-crypto": "4.4.0",
         "node-opcua-debug": "2.110.0",
         "node-opcua-extension-object": "2.111.0",
         "node-opcua-factory": "2.111.0",
@@ -35,7 +35,7 @@
         "node-opcua-nodeid": "2.110.0",
         "node-opcua-nodeset-ijt": "2.111.0",
         "node-opcua-packet-analyzer": "2.111.0",
-        "node-opcua-pki": "4.5.0",
+        "node-opcua-pki": "4.6.0",
         "node-opcua-server": "2.111.0",
         "node-opcua-server-discovery": "2.111.0",
         "node-opcua-service-browse": "2.111.0",

packages/node-opcua-end2end-test/test_helpers/unimplementedRequest.js

@@ -20,7 +20,7 @@ const schemaServerSideUnimplementedRequest = buildStructuredType({
     baseType: "BaseUAObject",
 //x    id: ObjectIds.Annotation_Encoding_DefaultXml,
     fields: [
-        {name: "requestHeader", fieldType: "RequestHeader"}
+        {name: "RequestHeader", fieldType: "RequestHeader"}
     ]
 });
 

packages/node-opcua-factory/source/types.ts

@@ -41,7 +41,6 @@ export interface CommonInterface {
 export interface FieldInterfaceOptions {
     name: string;
     defaultValue?: any | DefaultValueFunc;
-
     fieldType: string;
     isArray?: boolean;
     documentation?: string;
@@ -87,9 +86,8 @@ export interface ConstructorFuncWithSchema extends ConstructorFunc {
 }
 
 export interface StructuredTypeField {
-
-    name: string;               // the name that may have been lowercased
-    originalName: string;       // the orignal name from the raw OPCUA description
+    name: string; // the name that may have been lowercased
+    originalName: string; // the orignal name from the raw OPCUA description
 
     fieldType: string;
     isArray?: boolean;
@@ -134,7 +132,7 @@ export interface StructuredTypeOptions {
     baseType: string;
     category?: FieldCategory;
     _resolved?: boolean;
-    bitFields?: { name: string, length: number }[];
+    bitFields?: { name: string; length: number }[];
     deprecated_base?: StructuredTypeOptions;
     dataTypeFactory: DataTypeFactory;
 }
@@ -185,10 +183,10 @@ export interface IStructuredTypeSchema extends CommonInterface {
     fields: FieldType[];
     dataTypeNodeId: NodeId;
     baseType: string;
-   
+
     getBaseSchema(): IStructuredTypeSchema | null;
     getDataTypeFactory(): DataTypeFactory;
-    
+
     documentation?: string;
 
     isValid?: (options: any) => boolean;

packages/node-opcua-generator/source/generate_extension_object_code.ts

@@ -123,7 +123,7 @@ function writeStructuredTypeWithSchema(structuredType: IStructuredTypeSchema) {
     write(`    fields: [`);
     for (const field of structuredType.fields) {
         write(`        {`);
-        write(`            name: "${field.name}",`);
+        write(`            name: "${field.originalName}",`);
         write(``);
         write(`            fieldType: "${field.fieldType}",`);
         if (field.isArray) {

packages/node-opcua-samples/package.json

@@ -30,9 +30,9 @@
         "node-opcua-assert": "2.105.0",
         "node-opcua-client-crawler": "2.111.0",
         "node-opcua-client-proxy": "2.111.0",
-        "node-opcua-crypto": "4.3.1",
+        "node-opcua-crypto": "4.4.0",
         "node-opcua-packet-analyzer": "2.111.0",
-        "node-opcua-pki": "4.5.0",
+        "node-opcua-pki": "4.6.0",
         "node-opcua-server-configuration": "2.111.0",
         "node-opcua-utils": "2.110.0",
         "node-opcua-vendor-diagnostic": "2.111.0",

packages/node-opcua-secure-channel/package.json

@@ -20,7 +20,7 @@
         "node-opcua-certificate-manager": "2.111.0",
         "node-opcua-chunkmanager": "2.111.0",
         "node-opcua-common": "2.111.0",
-        "node-opcua-crypto": "4.3.1",
+        "node-opcua-crypto": "4.4.0",
         "node-opcua-debug": "2.110.0",
         "node-opcua-factory": "2.111.0",
         "node-opcua-nodeid": "2.110.0",

packages/node-opcua-server-configuration/package.json

@@ -24,13 +24,13 @@
         "node-opcua-client": "2.111.0",
         "node-opcua-common": "2.111.0",
         "node-opcua-constants": "2.98.1",
-        "node-opcua-crypto": "4.3.1",
+        "node-opcua-crypto": "4.4.0",
         "node-opcua-data-model": "2.111.0",
         "node-opcua-debug": "2.110.0",
         "node-opcua-file-transfer": "2.111.0",
         "node-opcua-hostname": "2.105.0",
         "node-opcua-nodeid": "2.110.0",
-        "node-opcua-pki": "4.5.0",
+        "node-opcua-pki": "4.6.0",
         "node-opcua-pseudo-session": "2.111.0",
         "node-opcua-secure-channel": "2.111.0",
         "node-opcua-server": "2.111.0",

packages/node-opcua-server/package.json

@@ -27,7 +27,7 @@
         "node-opcua-client-dynamic-extension-object": "2.111.0",
         "node-opcua-common": "2.111.0",
         "node-opcua-constants": "2.98.1",
-        "node-opcua-crypto": "4.3.1",
+        "node-opcua-crypto": "4.4.0",
         "node-opcua-data-model": "2.111.0",
         "node-opcua-data-value": "2.111.0",
         "node-opcua-date-time": "2.111.0",