add machinery and update nodesets

node-opcua · Nov 7, 2020 · be04f71 · be04f71
1 parent 6a312d7
commit be04f71
Show file tree

Hide file tree

Showing 18 changed files with 16,541 additions and 272 deletions.
diff --git a/code_gen/fetch.js b/code_gen/fetch.js
@@ -30,14 +30,14 @@ function wget(dest_folder, file_url) {
     }
     console.log(" downloading " + filename + " from " + file_url);
 
-    const stream = fs.createWriteStream(filename, {flag: "w"});
+    const stream = fs.createWriteStream(filename, { flag: "w" });
 
     const request_options = url.parse(file_url);
 
-    request_options.headers = {'user-agent': 'Mozilla/5.0'};
+    request_options.headers = { 'user-agent': 'Mozilla/5.0' };
 
     // Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.101 Safari/537.36
-    const req = http.get(request_options, function (response) {
+    const req = http.get(request_options, function(response) {
         // handle the response
         let res_data = '';
         // console.log(response);
@@ -52,7 +52,7 @@ function wget(dest_folder, file_url) {
             total: fileBytes
         });
 
-        response.on('data', function (chunk) {
+        response.on('data', function(chunk) {
             res_data += chunk;
 
             if (chunk.length) {
@@ -65,11 +65,11 @@ function wget(dest_folder, file_url) {
             stream.write(chunk, "binary");
 
         });
-        response.on('end', function () {
+        response.on('end', function() {
             stream.end();
         });
     });
-    req.on('error', function (err) {
+    req.on('error', function(err) {
         console.log("Request error: " + err.message);
     });
 }
@@ -256,9 +256,9 @@ if (false) {
 
 // with git hub
 
-function fetch_from_github(version,file){
+function fetch_from_github(version, file) {
 
-    wget("1.04","https://raw.githubusercontent.com/OPCFoundation/UA-Nodeset/v" + version + "/" + file);
+    wget("1.04", "https://raw.githubusercontent.com/OPCFoundation/UA-Nodeset/v" + version + "/" + file);
 
 }
 const version = "1.04";
@@ -275,14 +275,27 @@ fetch_from_github(version, "Schema/Opc.Ua.NodeSet2.Part8.xml");
 fetch_from_github(version, "Schema/Opc.Ua.NodeSet2.xml");
 fetch_from_github(version, "Schema/Opc.Ua.Types.xsd");
 
-fetch_from_github(version, "/DI/Opc.Ua.Di.NodeSet2.xml");
-fetch_from_github(version, "/DI/Opc.Ua.Di.Types.xsd");
-fetch_from_github(version, "/DI/Opc.Ua.Di.Types.bsd");
+fetch_from_github(version, "DI/Opc.Ua.Di.NodeSet2.xml");
+fetch_from_github(version, "DI/Opc.Ua.Di.Types.xsd");
+fetch_from_github(version, "DI/Opc.Ua.Di.Types.bsd");
 
 fetch_from_github(version, "ADI/Opc.Ua.Adi.NodeSet2.xml");
 fetch_from_github(version, "ADI/Opc.Ua.Adi.Types.xsd");
 fetch_from_github(version, "ADI/Opc.Ua.Adi.Types.bsd");
 
+fetch_from_github(version, "GDS/Opc.Ua.Gds.NodeSet2.xml");
+fetch_from_github(version, "AutoID/Opc.Ua.AutoID.NodeSet2.xml");
+fetch_from_github(version, "Machinery/Opc.Ua.Machinery.NodeSet2.xml");
+fetch_from_github(version, "ISA-95/Opc.ISA95.NodeSet2.xml");
+fetch_from_github(version, "PackML/Opc.Ua.PackML.NodeSet2.xml");
+fetch_from_github(version, "Robotics/Opc.Ua.Robotics.NodeSet2.xml");
+fetch_from_github(version, "CNC/Opc.Ua.CNC.NodeSet.xml");
+fetch_from_github(version, "MachineVision/Opc.Ua.MachineVision.NodeSet2.xml");
+fetch_from_github(version, "Robotics/Opc.Ua.Robotics.NodeSet2.xml");
+
+// 
+fetch_from_github(version, "PlasticsRubber/Extrusion/Pelletizer/1.0/Opc.Ua.PlasticsRubber.Extrusion.Pelletizer.NodeSet2.xml");
+
 fetch_from_github(version, "Schema/SecuredApplication.xsd");
 fetch_from_github(version, "Schema/UANodeSet.xsd");
 fetch_from_github(version, "Schema/UAVariant.xsd");

diff --git a/packages/node-opcua-address-space/source/loader/load_nodeset2.ts b/packages/node-opcua-address-space/source/loader/load_nodeset2.ts
@@ -234,7 +234,10 @@ function makeDefaultVariant(addressSpace: AddressSpacePublic, dataTypeNode: Node
             return { dataType: DataType.ExtensionObject, value: null };
         }
         const dv = findSimpleType(DataType[dataType]).defaultValue;
-
+        if (dv === undefined || dv === null) {
+            // return
+            return { dataType: DataType.Null };
+        }
         let arrayType: VariantArrayType;
         const value = typeof dv === "function" ? dv() : dv;
         //  if (dataType === DataType.ByteString ) { value = Buffer.alloc(0) }

diff --git a/packages/node-opcua-address-space/src/address_space.ts b/packages/node-opcua-address-space/src/address_space.ts
@@ -456,6 +456,11 @@ export class AddressSpace implements AddressSpacePrivate {
             return DataType.Int32;
         }
 
+        if (dataTypeNode.nodeId.namespace === 0 && dataTypeNode.nodeId.value === 29) {
+            // Number
+            return DataType.Null; //which one ?
+        }
+
         if (dataTypeNode.nodeId.namespace === 0 && DataType[dataTypeNode.nodeId.value as number]) {
             return dataTypeNode.nodeId.value as DataType;
         }

diff --git a/packages/node-opcua-data-value/source/datavalue.ts b/packages/node-opcua-data-value/source/datavalue.ts
@@ -73,6 +73,7 @@ export function encodeDataValue(dataValue: DataValue, stream: OutputBinaryStream
         if (!dataValue.value) {
             dataValue.value = new Variant();
         }
+        // istanbul ignore next
         if (!dataValue.value.encode) {
             // tslint:disable-next-line:no-console
             console.log(" CANNOT FIND ENCODE METHOD ON VARIANT !!! HELP", JSON.stringify(dataValue, null, " "));

diff --git a/packages/node-opcua-nodesets/index_web.js b/packages/node-opcua-nodesets/index_web.js
@@ -7,6 +7,9 @@ module.exports = {
         autoId: "nodeset:autoId",
         robotics: "nodeset:robotics",
         machineVision: "nodeset:machineVision",
-        packML: "nodeset:packML"
+        packML: "nodeset:packML",
+        cnc: "nodeset:CNC",
+        machinery: "nodeset:machinery",
+        commercialKitchenEquipment: "nodeset:commercialKitchenEquipment"
     }
 };
diff --git a/packages/node-opcua-nodesets/nodesets/Opc.Ua.Adi.NodeSet2.xml b/packages/node-opcua-nodesets/nodesets/Opc.Ua.Adi.NodeSet2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
- * Copyright (c) 2005-2019 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2020 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  * 

diff --git a/packages/node-opcua-nodesets/nodesets/Opc.Ua.AutoID.NodeIds.csv b/packages/node-opcua-nodesets/nodesets/Opc.Ua.AutoID.NodeIds.csv