@things-factory/integration-opc 6.1.120 → 6.1.123

package/helps/integration/connector/opc-ua-server.ja.md

@@ -2,9 +2,12 @@
 
 OPC-UA サーバーコネクタを使用すると、OPC-UA サーバーインスタンスを作成し、管理することができます。
 
+## エンドポイント
+
+OPC-UA サーバーがリッスンするポート番号です(endpoint)。
+
 ## パラメータ
 
-- **ポート：** OPC-UA サーバーがリッスンするポート番号です。
 - **製品名：** OPC-UA サーバーに関連する製品の名前です。
 - **ビルド番号：** OPC-UA サーバーのビルド番号です。
 - **ビルド日付：** OPC-UA サーバーのビルド日付です。

package/helps/integration/connector/opc-ua-server.ko.md

@@ -2,9 +2,12 @@
 
 OPC-UA 서버 커넥터를 사용하면 OPC-UA 서버 인스턴스를 생성하고 관리할 수 있습니다.
 
+## Endpoint
+
+OPC-UA 서버가 수신 대기할 포트 번호입니다.
+
 ## 매개변수
 
-- **포트:** OPC-UA 서버가 수신 대기할 포트 번호입니다.
 - **제품명:** OPC-UA 서버와 관련된 제품의 이름입니다.
 - **빌드 번호:** OPC-UA 서버의 빌드 번호입니다.
 - **빌드 날짜:** OPC-UA 서버의 빌드 날짜입니다.

package/helps/integration/connector/opc-ua-server.md

@@ -2,9 +2,12 @@
 
 The OPC-UA Server Connector allows you to create and manage an OPC-UA server instance.
 
+## Endpoint
+
+The port number on which the OPC-UA server will listen.
+
 ## Parameters
 
-- **Port:** The port number on which the OPC-UA server will listen.
 - **Product Name:** The name of the product associated with the OPC-UA server.
 - **Build Number:** The build number of the OPC-UA server.
 - **Build Date:** The build date of the OPC-UA server.

package/helps/integration/connector/opc-ua-server.ms.md

@@ -2,9 +2,12 @@
 
 Pemacu Pelayan OPC-UA membolehkan anda untuk membuat dan menguruskan instan Pelayan OPC-UA.
 
+## Endpoin
+
+Nombor port di mana pelayan OPC-UA akan mendengar.
+
 ## Parameter
 
-- **Port:** Nombor port di mana pelayan OPC-UA akan mendengar.
 - **Nama Produk:** Nama produk yang berkaitan dengan pelayan OPC-UA.
 - **Nombor Binaan:** Nombor binaan pelayan OPC-UA.
 - **Tarikh Binaan:** Tarikh binaan pelayan OPC-UA.

package/helps/integration/connector/opc-ua-server.zh.md

@@ -2,9 +2,12 @@
 
 OPC-UA 服务器连接器允许您创建和管理 OPC-UA 服务器实例。
 
+## 终端点
+
+OPC-UA 服务器将侦听的端口号。
+
 ## 参数
 
-- **端口：** OPC-UA 服务器将侦听的端口号。
 - **产品名称：** 与 OPC-UA 服务器相关的产品名称。
 - **构建编号：** OPC-UA 服务器的构建编号。
 - **构建日期：** OPC-UA 服务器的构建日期。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-opc",
-  "version": "6.1.120",
+  "version": "6.1.123",
   "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.119",
+    "@things-factory/integration-base": "^6.1.123",
     "node-opcua": "^2.110.0"
   },
-  "gitHead": "d9026fbb86bb0e66883bc628653aba7d0931babe"
+  "gitHead": "b1440f932f519e74aca05dabf2dd7f6690fcb3cf"
 }

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

@@ -30,7 +30,7 @@ export class OPCUAServerConnector implements Connector {
     })
 
     await server.initialize()
-    ConnectionManager.logger.log('initialized')
+    ConnectionManager.logger.info('initialized')
 
     const addressSpace = server.engine.addressSpace
     const namespace = addressSpace.getOwnNamespace()
@@ -98,10 +98,10 @@ export class OPCUAServerConnector implements Connector {
     })
 
     server.start(function () {
-      ConnectionManager.logger.log('Server is now listening ... ( press CTRL+C to stop)')
-      ConnectionManager.logger.log('port ', server.endpoints[0].port)
+      ConnectionManager.logger.info('Server is now listening ... ( press CTRL+C to stop)')
+      ConnectionManager.logger.info('port ', server.endpoints[0].port)
       const endpointUrl = server.endpoints[0].endpointDescriptions()[0].endpointUrl
-      ConnectionManager.logger.log(' the primary server endpoint url is ', endpointUrl)
+      ConnectionManager.logger.info(' the primary server endpoint url is ', endpointUrl)
     })
 
     ConnectionManager.addConnectionInstance(config, server)

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

@@ -6,8 +6,10 @@ import {
   StatusCodes,
   TimestampsToReturn,
   DataValue,
+  DataType,
   StatusCode,
-  ClientMonitoredItem
+  ClientMonitoredItem,
+  Variant
 } from 'node-opcua'
 
 import { Connection, ConnectionManager, Connector } from '@things-factory/integration-base'
@@ -45,7 +47,7 @@ export class OPCUAConnector implements Connector {
       }
     })
 
-    client.on('backoff', () => ConnectionManager.logger.log('retrying connection'))
+    client.on('backoff', () => ConnectionManager.logger.info('retrying connection'))
 
     await client.connect(endpoint)
 
@@ -53,7 +55,7 @@ export class OPCUAConnector implements Connector {
 
     const browseResult: BrowseResult = (await session.browse('RootFolder')) as BrowseResult
 
-    ConnectionManager.logger.log(
+    ConnectionManager.logger.info(
       browseResult.references.map((r: ReferenceDescription) => r.browseName.toString()).join('\n')
     )
 
@@ -68,34 +70,37 @@ export class OPCUAConnector implements Connector {
 
     subscription
       .on('started', () =>
-        ConnectionManager.logger.log('subscription started - subscriptionId=', subscription.subscriptionId)
+        ConnectionManager.logger.info('subscription started - subscriptionId=', subscription.subscriptionId)
       )
-      .on('keepalive', () => ConnectionManager.logger.log('keepalive'))
-      .on('terminated', () => ConnectionManager.logger.log('subscription terminated'))
+      .on('keepalive', () => ConnectionManager.logger.info('keepalive'))
+      .on('terminated', () => ConnectionManager.logger.info('subscription terminated'))
 
     try {
       ConnectionManager.addConnectionInstance(config, {
         read: async function (node, { logger }): Promise<DataValue> {
           const dataValue = await session.read({ nodeId: node, attributeId: AttributeIds.Value })
           if (dataValue.statusCode !== StatusCodes.Good) {
-            logger.log('Could not read ', node)
+            logger.info('Could not read ', node)
           }
-          logger.log(` dataValue = ${dataValue.value.toString()}`)
+          logger.info(` dataValue = ${dataValue.value.toString()}`)
 
           return dataValue
         },
-        write: async function (node, value, { logger }): Promise<StatusCode> {
+        write: async function (node, dataValue, dataType, { logger }): Promise<StatusCode> {
+          const resultVariant = new Variant({
+            dataType,
+            value: dataValue
+          })
+
           const statusCode = await session.write({
             nodeId: node,
             attributeId: AttributeIds.Value,
             value: {
-              statusCode: StatusCodes.Good,
-              sourceTimestamp: new Date(),
-              value
+              value: resultVariant
             }
           })
 
-          logger.log('statusCode = ', statusCode.toString())
+          logger.info('statusCode = ', statusCode.name)
           return statusCode
         },
         startMonitor: async function (
@@ -123,6 +128,7 @@ export class OPCUAConnector implements Connector {
         },
         stopMonitor: async function (monitoredItem, { logger }): Promise<void> {
           await monitoredItem.terminate()
+          return monitoredItem
         },
         close: async function (): Promise<void> {
           await subscription?.terminate()

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

@@ -1,4 +1,5 @@
 import { ConnectionManager, TaskRegistry } from '@things-factory/integration-base'
+import { DataValue } from 'node-opcua'
 
 async function OPCUARead(step, { logger, domain }) {
   var {
@@ -16,8 +17,14 @@ async function OPCUARead(step, { logger, domain }) {
   }
 
   var { read } = client
-  var content = await read(node, { logger })
-  return content
+  var content: DataValue = await read(node, { logger })
+
+  return {
+    data: {
+      dataType: content?.value.dataType,
+      value: content?.value.value
+    }
+  }
 }
 
 OPCUARead.parameterSpec = [

package/server/engine/task/opc-ua-start-monitor.ts

@@ -13,11 +13,11 @@ async function OPCUAStartMonitor(step, { logger, domain, data }) {
   }
 
   const callback = (dataValue: DataValue) => {
-    logger.log('monitored value: %s', dataValue)
+    logger.log('monitored value: %s', dataValue?.value.value)
   }
 
   var { startMonitor } = client
-  return await startMonitor(
+  var monitoredItem = await startMonitor(
     node,
     callback,
     {
@@ -27,6 +27,8 @@ async function OPCUAStartMonitor(step, { logger, domain, data }) {
     },
     { logger }
   )
+
+  return { data: monitoredItem }
 }
 
 OPCUAStartMonitor.parameterSpec = [

package/server/engine/task/opc-ua-stop-monitor.ts

@@ -1,6 +1,8 @@
 import { access } from '@things-factory/utils'
 import { ConnectionManager, TaskRegistry } from '@things-factory/integration-base'
 
+import { ClientMonitoredItem } from 'node-opcua'
+
 async function OPCUAStopMonitor(step, { logger, domain, data }) {
   var {
     connection,
@@ -15,7 +17,11 @@ async function OPCUAStopMonitor(step, { logger, domain, data }) {
   const item = access(monitorItem, data)
 
   var { stopMonitor } = client
-  return await stopMonitor(item, { logger })
+  var monitoredItem: ClientMonitoredItem = await stopMonitor(item, { logger })
+
+  return {
+    data: monitoredItem.statusCode
+  }
 }
 
 OPCUAStopMonitor.parameterSpec = [

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

@@ -1,10 +1,11 @@
 import { access } from '@things-factory/utils'
 import { ConnectionManager, TaskRegistry } from '@things-factory/integration-base'
+import { StatusCode, DataType } from 'node-opcua'
 
 async function OPCUAWrite(step, { logger, domain, data }) {
   var {
     connection,
-    params: { node, accessor }
+    params: { node, accessor, type }
   } = step
 
   var client = ConnectionManager.getConnectionInstanceByName(domain, connection)
@@ -15,9 +16,15 @@ async function OPCUAWrite(step, { logger, domain, data }) {
   const value = access(accessor, data)
 
   var { write } = client
-  var content = await write(node, value, { logger })
+  var content: StatusCode = await write(node, value, type, { logger })
 
-  return content
+  return {
+    data: {
+      name: content.name,
+      description: content.description,
+      result: content.isGood()
+    }
+  }
 }
 
 OPCUAWrite.parameterSpec = [
@@ -30,6 +37,41 @@ OPCUAWrite.parameterSpec = [
     type: 'scenario-step-input',
     name: 'accessor',
     label: 'accessor'
+  },
+  {
+    type: 'select',
+    label: 'type',
+    name: 'type',
+    property: {
+      options: [
+        { display: 'Null', value: DataType.Null },
+        { display: 'Boolean', value: DataType.Boolean },
+        { display: 'SByte', value: DataType.SByte },
+        { display: 'Byte', value: DataType.Byte },
+        { display: 'Int16', value: DataType.Int16 },
+        { display: 'UInt16', value: DataType.UInt16 },
+        { display: 'Int32', value: DataType.Int32 },
+        { display: 'UInt32', value: DataType.UInt32 },
+        { display: 'Int64', value: DataType.Int64 },
+        { display: 'UInt64', value: DataType.UInt64 },
+        { display: 'Float', value: DataType.Float },
+        { display: 'Double', value: DataType.Double },
+        { display: 'String', value: DataType.String },
+        { display: 'DateTime', value: DataType.DateTime },
+        { display: 'Guid', value: DataType.Guid },
+        { display: 'ByteString', value: DataType.ByteString },
+        { display: 'XmlElement', value: DataType.XmlElement },
+        { display: 'NodeId', value: DataType.NodeId },
+        { display: 'ExpandedNodeId', value: DataType.ExpandedNodeId },
+        { display: 'StatusCode', value: DataType.StatusCode },
+        { display: 'QualifiedName', value: DataType.QualifiedName },
+        { display: 'LocalizedText', value: DataType.LocalizedText },
+        { display: 'ExtensionObject', value: DataType.ExtensionObject },
+        { display: 'Variant', value: DataType.Variant },
+        { display: 'DataValue', value: DataType.DataValue },
+        { display: 'DiagnosticInfo', value: DataType.DiagnosticInfo }
+      ]
+    }
   }
 ]