@things-factory/integration-opc 6.1.129 → 6.1.138

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

@@ -8,16 +8,14 @@ OPC-UA コネクタを使用すると、OPC-UA サーバに接続し、データ
 
 ## エンドポイント
 
-次の形式で OPC-UA サーバの接続情報を指定してください：
+OPC-UA サーバーの接続情報を、以下の形式で指定してください。
 
 ```
-ホスト名[:ポート] # デフォルトのポート : 4334
+opc.tcp://ホスト名:ポート
 
 # 例
-localhost
-localhost:4334
-192.168.0.1
-192.168.0.1:4334
+opc.tcp://127.0.0.1:4840
+opc.tcp://192.168.0.100:9999
 ```
 
 ## パラメータ

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

@@ -11,13 +11,11 @@ OPC-UA 커넥터를 사용하면 OPC-UA 서버에 연결하고 해당 데이터
 다음 형식으로 OPC-UA 서버 연결 정보를 지정하세요:
 
 ```
-호스트이름[:포트] # 기본 포트 : 4334
+opc.tcp://호스트이름:포트 
 
 # 예시
-localhost
-localhost:4334
-192.168.0.1
-192.168.0.1:4334
+opc.tcp://127.0.0.1:4840
+opc.tcp://192.168.0.100:9999
 ```
 
 ## 파라미터

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

@@ -11,13 +11,11 @@ The OPCUA connector allows you to connect to an OPC-UA server and interact with
 Specify the OPC-UA server connection information in the following format:
 
 ```
-hostname[:port] # default port : 4334
+opc.tcp://host_name:port
 
-# Examples
-localhost
-localhost:4334
-192.168.0.1
-192.168.0.1:4334
+# Example
+opc.tcp://127.0.0.1:4840
+opc.tcp://192.168.0.100:9999
 ```
 
 ## Parameters

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

@@ -8,18 +8,16 @@ ified_Architecture) merupakan protokol untuk pertukaran data yang selamat dan bo
 
 Dengan menggunakan Pemacu OPC-UA, anda boleh menyambungkan ke pelayan OPC-UA dan berinteraksi dengan data.
 
-## Endpoin
+## Endpoint
 
-Sila tentukan maklumat sambungan pelayan OPC-UA seperti berikut:
+Sila tentukan maklumat sambungan pelayan OPC-UA dalam format berikut:
 
 ```
-Nama_Hos[:Port] # Port lalai : 4334
+opc.tcp://nama_hos:port
 
 # Contoh
-localhost
-localhost:4334
-192.168.0.1
-192.168.0.1:4334
+opc.tcp://127.0.0.1:4840
+opc.tcp://192.168.0.100:9999
 ```
 
 ## Parameter

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

@@ -6,18 +6,16 @@
 
 使用 OPC-UA 连接器，您可以连接到 OPC-UA 服务器并与其交互以获取数据。
 
-## 终端点
+## 端点
 
-请按以下格式指定 OPC-UA 服务器连接信息：
+请按照以下格式指定 OPC-UA 服务器连接信息：
 
 ```
-主机名[:端口] # 默认端口 : 4334
+opc.tcp://主机名:端口
 
-# 例子
-localhost
-localhost:4334
-192.168.0.1
-192.168.0.1:4334
+# 示例
+opc.tcp://127.0.0.1:4840
+opc.tcp://192.168.0.100:9999
 ```
 
 ## 参数

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-opc",
-  "version": "6.1.129",
+  "version": "6.1.138",
   "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.129",
+    "@things-factory/integration-base": "^6.1.138",
     "node-opcua": "^2.110.0"
   },
-  "gitHead": "34348ec14b8648940212758df1945b9321a13593"
+  "gitHead": "6bcb91fa7d1647f069212383bf0ece8039e742e5"
 }

package/server/engine/task/index.ts

@@ -1,5 +1,5 @@
 import './opc-ua-read'
 import './opc-ua-write'
 import './opc-ua-start-monitor'
-import './opc-ua-stop-monitor'
+//import './opc-ua-stop-monitor'
 import './utils'

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

@@ -1,34 +1,63 @@
 import { ConnectionManager, TaskRegistry } from '@things-factory/integration-base'
 import { DataValue } from 'node-opcua'
+import { sleep } from '@things-factory/utils'
 
-async function OPCUAStartMonitor(step, { logger, domain, data }) {
+async function OPCUAStartMonitor(step, context) {
   var {
     connection,
     params: { node, samplingInterval, discardOldest, queueSize }
   } = step
 
+  const { logger, domain, closures, __opcua_moinitor } = context
+  if (!__opcua_moinitor) {
+    context.__opcua_moinitor = {}
+  }
+
   var client = ConnectionManager.getConnectionInstanceByName(domain, connection)
   if (!client) {
     throw new Error(`no connection : ${connection}`)
   }
 
-  const callback = (dataValue: DataValue) => {
-    logger.log('monitored value: %s', dataValue?.value.value)
+  if (!context.__opcua_moinitor[node]) {
+    var MONINTORED_VALUE
+    context.__opcua_moinitor[node] = async () => {
+      while (!MONINTORED_VALUE) {
+        await sleep(100)
+      }
+
+      var monitoringValue = MONINTORED_VALUE
+
+      MONINTORED_VALUE = null
+
+      return monitoringValue
+    }
+
+    var { startMonitor, stopMonitor } = client
+    var monitoredItem = await startMonitor(
+      node,
+      (dataValue: DataValue) => {
+        MONINTORED_VALUE = dataValue?.value.value
+      },
+      {
+        samplingInterval,
+        discardOldest,
+        queueSize
+      },
+      { logger }
+    )
+
+    closures.push(async () => {
+      try {
+        monitoredItem && (await stopMonitor(monitoredItem, { logger }))
+      } catch (e) {
+        logger.error(e)
+      }
+    })
   }
 
-  var { startMonitor } = client
-  var monitoredItem = await startMonitor(
-    node,
-    callback,
-    {
-      samplingInterval,
-      discardOldest,
-      queueSize
-    },
-    { logger }
-  )
-
-  return { data: monitoredItem }
+  var monitoringValue = await context.__opcua_moinitor[node]()
+
+  return { data: monitoringValue }
 }
 
 OPCUAStartMonitor.parameterSpec = [