@things-factory/integration-opc 6.1.122 → 6.1.124

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-opc",
-  "version": "6.1.122",
+  "version": "6.1.124",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -23,8 +23,8 @@
     "clean": "npm run clean:server"
   },
   "dependencies": {
-    "@things-factory/integration-base": "^6.1.122",
+    "@things-factory/integration-base": "^6.1.123",
     "node-opcua": "^2.110.0"
   },
-  "gitHead": "01735af77d98fa26fbcc312e9b982eee1638114d"
+  "gitHead": "206aa7c2b8d4d5cf73ceb282be740fb6aec44308"
 }

package/server/engine/connector/opc-ua.ts

@@ -77,8 +77,8 @@ export class OPCUAConnector implements Connector {
 
     try {
       ConnectionManager.addConnectionInstance(config, {
-        read: async function (node, { logger }): Promise<DataValue> {
-          const dataValue = await session.read({ nodeId: node, attributeId: AttributeIds.Value })
+        read: async function (node, attribute, { logger }): Promise<DataValue> {
+          const dataValue = await session.read({ nodeId: node, attributeId: Number(attribute) })
           if (dataValue.statusCode !== StatusCodes.Good) {
             logger.info('Could not read ', node)
           }

package/server/engine/task/index.ts

@@ -2,3 +2,4 @@ import './opc-ua-read'
 import './opc-ua-write'
 import './opc-ua-start-monitor'
 import './opc-ua-stop-monitor'
+import './utils'

package/server/engine/task/opc-ua-read.ts

@@ -1,10 +1,11 @@
 import { ConnectionManager, TaskRegistry } from '@things-factory/integration-base'
-import { DataValue } from 'node-opcua'
+import { DataType, DataValue, AttributeIds } from 'node-opcua'
+import { DataTypeString } from './utils'
 
 async function OPCUARead(step, { logger, domain }) {
   var {
     connection,
-    params: { node }
+    params: { node, attribute }
   } = step
 
   var client = ConnectionManager.getConnectionInstanceByName(domain, connection)
@@ -17,11 +18,11 @@ async function OPCUARead(step, { logger, domain }) {
   }
 
   var { read } = client
-  var content: DataValue = await read(node, { logger })
+  var content: DataValue = await read(node, attribute, { logger })
 
   return {
     data: {
-      dataType: content?.value.dataType,
+      dataType: DataTypeString[content?.value.dataType],
       value: content?.value.value
     }
   }
@@ -32,6 +33,42 @@ OPCUARead.parameterSpec = [
     type: 'string',
     name: 'node',
     label: 'node'
+  },
+  {
+    type: 'select',
+    label: 'attribute',
+    name: 'attribute',
+    property: {
+      options: [
+        { display: 'Value', value: AttributeIds.Value },
+        { display: 'DataType', value: AttributeIds.DataType },
+        { display: 'NodeId', value: AttributeIds.NodeId },
+        { display: 'NodeClass', value: AttributeIds.NodeClass },
+        { display: 'BrowseName', value: AttributeIds.BrowseName },
+        { display: 'DisplayName', value: AttributeIds.DisplayName },
+        { display: 'Description', value: AttributeIds.Description },
+        { display: 'WriteMask', value: AttributeIds.WriteMask },
+        { display: 'UserWriteMask', value: AttributeIds.UserWriteMask },
+        { display: 'IsAbstract', value: AttributeIds.IsAbstract },
+        { display: 'Symmetric', value: AttributeIds.Symmetric },
+        { display: 'InverseName', value: AttributeIds.InverseName },
+        { display: 'ContainsNoLoops', value: AttributeIds.ContainsNoLoops },
+        { display: 'EventNotifier', value: AttributeIds.EventNotifier },
+        { display: 'ValueRank', value: AttributeIds.ValueRank },
+        { display: 'ArrayDimensions', value: AttributeIds.ArrayDimensions },
+        { display: 'AccessLevel', value: AttributeIds.AccessLevel },
+        { display: 'UserAccessLevel', value: AttributeIds.UserAccessLevel },
+        { display: 'MinimumSamplingInterval', value: AttributeIds.MinimumSamplingInterval },
+        { display: 'Historizing', value: AttributeIds.Historizing },
+        { display: 'Executable', value: AttributeIds.Executable },
+        { display: 'UserExecutable', value: AttributeIds.UserExecutable },
+        { display: 'DataTypeDefinition', value: AttributeIds.DataTypeDefinition },
+        { display: 'RolePermissions', value: AttributeIds.RolePermissions },
+        { display: 'UserRolePermissions', value: AttributeIds.UserRolePermissions },
+        { display: 'AccessRestrictions', value: AttributeIds.AccessRestrictions },
+        { display: 'AccessLevelEx', value: AttributeIds.AccessLevelEx }
+      ]
+    }
   }
 ]
 

package/server/engine/task/utils.ts

@@ -0,0 +1,30 @@
+import { DataType } from 'node-opcua'
+
+export const DataTypeString = {
+  [DataType.Null]: 'Null',
+  [DataType.Boolean]: 'Boolean',
+  [DataType.SByte]: 'SByte',
+  [DataType.Byte]: 'Byte',
+  [DataType.Int16]: 'Int16',
+  [DataType.UInt16]: 'UInt16',
+  [DataType.Int32]: 'Int32',
+  [DataType.UInt32]: 'UInt32',
+  [DataType.Int64]: 'Int64',
+  [DataType.UInt64]: 'UInt64',
+  [DataType.Float]: 'Float',
+  [DataType.Double]: 'Double',
+  [DataType.String]: 'String',
+  [DataType.DateTime]: 'DateTime',
+  [DataType.Guid]: 'Guid',
+  [DataType.ByteString]: 'ByteString',
+  [DataType.XmlElement]: 'XmlElement',
+  [DataType.NodeId]: 'NodeId',
+  [DataType.ExpandedNodeId]: 'ExpandedNodeId',
+  [DataType.StatusCode]: 'StatusCode',
+  [DataType.QualifiedName]: 'QualifiedName',
+  [DataType.LocalizedText]: 'LocalizedText',
+  [DataType.ExtensionObject]: 'ExtensionObject',
+  [DataType.DataValue]: 'DataValue',
+  [DataType.Variant]: 'Variant',
+  [DataType.DiagnosticInfo]: 'DiagnosticInfo'
+}

package/translations/en.json

@@ -15,5 +15,6 @@
   "label.monitor-item": "monitor item",
   "label.product-name": "product name",
   "label.build-number": "build number",
-  "label.build-date": "build date"
+  "label.build-date": "build date",
+  "label.attribute": "attribute"
 }

package/translations/ja.json

@@ -15,5 +15,6 @@
   "label.monitor-item": "monitor item",
   "label.product-name": "product name",
   "label.build-number": "build number",
-  "label.build-date": "build date"
+  "label.build-date": "build date",
+  "label.attribute": "attribute"
 }

package/translations/ko.json

@@ -15,5 +15,6 @@
   "label.monitor-item": "monitor item",
   "label.product-name": "product name",
   "label.build-number": "build number",
-  "label.build-date": "build date"
+  "label.build-date": "build date",
+  "label.attribute": "attribute"
 }

package/translations/ms.json

@@ -15,5 +15,6 @@
   "label.monitor-item": "monitor item",
   "label.product-name": "product name",
   "label.build-number": "build number",
-  "label.build-date": "build date"
+  "label.build-date": "build date",
+  "label.attribute": "attribute"
 }

package/translations/zh.json

@@ -15,5 +15,6 @@
   "label.monitor-item": "monitor item",
   "label.product-name": "product name",
   "label.build-number": "build number",
-  "label.build-date": "build date"
+  "label.build-date": "build date",
+  "label.attribute": "attribute"
 }