@things-factory/integration-opc 6.1.129 → 6.1.138

package/dist-server/engine/task/index.js

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("./opc-ua-read");
 require("./opc-ua-write");
 require("./opc-ua-start-monitor");
-require("./opc-ua-stop-monitor");
+//import './opc-ua-stop-monitor'
 require("./utils");
 //# sourceMappingURL=index.js.map

package/dist-server/engine/task/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/engine/task/index.ts"],"names":[],"mappings":";;AAAA,yBAAsB;AACtB,0BAAuB;AACvB,kCAA+B;AAC/B,iCAA8B;AAC9B,mBAAgB","sourcesContent":["import './opc-ua-read'\nimport './opc-ua-write'\nimport './opc-ua-start-monitor'\nimport './opc-ua-stop-monitor'\nimport './utils'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/engine/task/index.ts"],"names":[],"mappings":";;AAAA,yBAAsB;AACtB,0BAAuB;AACvB,kCAA+B;AAC/B,gCAAgC;AAChC,mBAAgB","sourcesContent":["import './opc-ua-read'\nimport './opc-ua-write'\nimport './opc-ua-start-monitor'\n//import './opc-ua-stop-monitor'\nimport './utils'\n"]}

package/dist-server/engine/task/opc-ua-start-monitor.js

@@ -1,22 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const integration_base_1 = require("@things-factory/integration-base");
-async function OPCUAStartMonitor(step, { logger, domain, data }) {
+const utils_1 = require("@things-factory/utils");
+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 = integration_base_1.ConnectionManager.getConnectionInstanceByName(domain, connection);
     if (!client) {
         throw new Error(`no connection : ${connection}`);
     }
-    const callback = (dataValue) => {
-        logger.log('monitored value: %s', dataValue === null || dataValue === void 0 ? void 0 : dataValue.value.value);
-    };
-    var { startMonitor } = client;
-    var monitoredItem = await startMonitor(node, callback, {
-        samplingInterval,
-        discardOldest,
-        queueSize
-    }, { logger });
-    return { data: monitoredItem };
+    if (!context.__opcua_moinitor[node]) {
+        var MONINTORED_VALUE;
+        context.__opcua_moinitor[node] = async () => {
+            while (!MONINTORED_VALUE) {
+                await (0, utils_1.sleep)(100);
+            }
+            var monitoringValue = MONINTORED_VALUE;
+            MONINTORED_VALUE = null;
+            return monitoringValue;
+        };
+        var { startMonitor, stopMonitor } = client;
+        var monitoredItem = await startMonitor(node, (dataValue) => {
+            MONINTORED_VALUE = dataValue === null || dataValue === void 0 ? void 0 : dataValue.value.value;
+        }, {
+            samplingInterval,
+            discardOldest,
+            queueSize
+        }, { logger });
+        closures.push(async () => {
+            try {
+                monitoredItem && (await stopMonitor(monitoredItem, { logger }));
+            }
+            catch (e) {
+                logger.error(e);
+            }
+        });
+    }
+    var monitoringValue = await context.__opcua_moinitor[node]();
+    return { data: monitoringValue };
 }
 OPCUAStartMonitor.parameterSpec = [
     {

package/dist-server/engine/task/opc-ua-start-monitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"opc-ua-start-monitor.js","sourceRoot":"","sources":["../../../server/engine/task/opc-ua-start-monitor.ts"],"names":[],"mappings":";;AAAA,uEAAkF;AAGlF,KAAK,UAAU,iBAAiB,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE;IAC7D,IAAI,EACF,UAAU,EACV,MAAM,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,aAAa,EAAE,SAAS,EAAE,EAC7D,GAAG,IAAI,CAAA;IAER,IAAI,MAAM,GAAG,oCAAiB,CAAC,2BAA2B,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC9E,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,mBAAmB,UAAU,EAAE,CAAC,CAAA;KACjD;IAED,MAAM,QAAQ,GAAG,CAAC,SAAoB,EAAE,EAAE;QACxC,MAAM,CAAC,GAAG,CAAC,qBAAqB,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IAC3D,CAAC,CAAA;IAED,IAAI,EAAE,YAAY,EAAE,GAAG,MAAM,CAAA;IAC7B,IAAI,aAAa,GAAG,MAAM,YAAY,CACpC,IAAI,EACJ,QAAQ,EACR;QACE,gBAAgB;QAChB,aAAa;QACb,SAAS;KACV,EACD,EAAE,MAAM,EAAE,CACX,CAAA;IAED,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAA;AAChC,CAAC;AAED,iBAAiB,CAAC,aAAa,GAAG;IAChC;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,MAAM;KACd;IACD;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,kBAAkB;QACxB,KAAK,EAAE,mBAAmB;KAC3B;IACD;QACE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,eAAe;QACrB,KAAK,EAAE,gBAAgB;KACxB;IACD;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE,YAAY;KACpB;CACF,CAAA;AAED,iBAAiB,CAAC,IAAI,GAAG,uCAAuC,CAAA;AAEhE,+BAAY,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,iBAAiB,CAAC,CAAA","sourcesContent":["import { ConnectionManager, TaskRegistry } from '@things-factory/integration-base'\nimport { DataValue } from 'node-opcua'\n\nasync function OPCUAStartMonitor(step, { logger, domain, data }) {\n  var {\n    connection,\n    params: { node, samplingInterval, discardOldest, queueSize }\n  } = step\n\n  var client = ConnectionManager.getConnectionInstanceByName(domain, connection)\n  if (!client) {\n    throw new Error(`no connection : ${connection}`)\n  }\n\n  const callback = (dataValue: DataValue) => {\n    logger.log('monitored value: %s', dataValue?.value.value)\n  }\n\n  var { startMonitor } = client\n  var monitoredItem = await startMonitor(\n    node,\n    callback,\n    {\n      samplingInterval,\n      discardOldest,\n      queueSize\n    },\n    { logger }\n  )\n\n  return { data: monitoredItem }\n}\n\nOPCUAStartMonitor.parameterSpec = [\n  {\n    type: 'string',\n    name: 'node',\n    label: 'node'\n  },\n  {\n    type: 'number',\n    name: 'samplingInterval',\n    label: 'sampling-interval'\n  },\n  {\n    type: 'boolean',\n    name: 'discardOldest',\n    label: 'discard-oldest'\n  },\n  {\n    type: 'number',\n    name: 'queueSize',\n    label: 'queue-size'\n  }\n]\n\nOPCUAStartMonitor.help = 'integration/task/opc-ua-start-monitor'\n\nTaskRegistry.registerTaskHandler('opc-ua-start-monitor', OPCUAStartMonitor)\n"]}
+{"version":3,"file":"opc-ua-start-monitor.js","sourceRoot":"","sources":["../../../server/engine/task/opc-ua-start-monitor.ts"],"names":[],"mappings":";;AAAA,uEAAkF;AAElF,iDAA6C;AAE7C,KAAK,UAAU,iBAAiB,CAAC,IAAI,EAAE,OAAO;IAC5C,IAAI,EACF,UAAU,EACV,MAAM,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,aAAa,EAAE,SAAS,EAAE,EAC7D,GAAG,IAAI,CAAA;IAER,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAA;IAC9D,IAAI,CAAC,gBAAgB,EAAE;QACrB,OAAO,CAAC,gBAAgB,GAAG,EAAE,CAAA;KAC9B;IAED,IAAI,MAAM,GAAG,oCAAiB,CAAC,2BAA2B,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC9E,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,mBAAmB,UAAU,EAAE,CAAC,CAAA;KACjD;IAED,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE;QACnC,IAAI,gBAAgB,CAAA;QACpB,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,KAAK,IAAI,EAAE;YAC1C,OAAO,CAAC,gBAAgB,EAAE;gBACxB,MAAM,IAAA,aAAK,EAAC,GAAG,CAAC,CAAA;aACjB;YAED,IAAI,eAAe,GAAG,gBAAgB,CAAA;YAEtC,gBAAgB,GAAG,IAAI,CAAA;YAEvB,OAAO,eAAe,CAAA;QACxB,CAAC,CAAA;QAED,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,MAAM,CAAA;QAC1C,IAAI,aAAa,GAAG,MAAM,YAAY,CACpC,IAAI,EACJ,CAAC,SAAoB,EAAE,EAAE;YACvB,gBAAgB,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAC,KAAK,CAAA;QAC3C,CAAC,EACD;YACE,gBAAgB;YAChB,aAAa;YACb,SAAS;SACV,EACD,EAAE,MAAM,EAAE,CACX,CAAA;QAED,QAAQ,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YACvB,IAAI;gBACF,aAAa,IAAI,CAAC,MAAM,WAAW,CAAC,aAAa,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAA;aAChE;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;aAChB;QACH,CAAC,CAAC,CAAA;KACH;IAED,IAAI,eAAe,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAA;IAE5D,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,CAAA;AAClC,CAAC;AAED,iBAAiB,CAAC,aAAa,GAAG;IAChC;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,MAAM;KACd;IACD;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,kBAAkB;QACxB,KAAK,EAAE,mBAAmB;KAC3B;IACD;QACE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,eAAe;QACrB,KAAK,EAAE,gBAAgB;KACxB;IACD;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE,YAAY;KACpB;CACF,CAAA;AAED,iBAAiB,CAAC,IAAI,GAAG,uCAAuC,CAAA;AAEhE,+BAAY,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,iBAAiB,CAAC,CAAA","sourcesContent":["import { ConnectionManager, TaskRegistry } from '@things-factory/integration-base'\nimport { DataValue } from 'node-opcua'\nimport { sleep } from '@things-factory/utils'\n\nasync function OPCUAStartMonitor(step, context) {\n  var {\n    connection,\n    params: { node, samplingInterval, discardOldest, queueSize }\n  } = step\n\n  const { logger, domain, closures, __opcua_moinitor } = context\n  if (!__opcua_moinitor) {\n    context.__opcua_moinitor = {}\n  }\n\n  var client = ConnectionManager.getConnectionInstanceByName(domain, connection)\n  if (!client) {\n    throw new Error(`no connection : ${connection}`)\n  }\n\n  if (!context.__opcua_moinitor[node]) {\n    var MONINTORED_VALUE\n    context.__opcua_moinitor[node] = async () => {\n      while (!MONINTORED_VALUE) {\n        await sleep(100)\n      }\n\n      var monitoringValue = MONINTORED_VALUE\n\n      MONINTORED_VALUE = null\n\n      return monitoringValue\n    }\n\n    var { startMonitor, stopMonitor } = client\n    var monitoredItem = await startMonitor(\n      node,\n      (dataValue: DataValue) => {\n        MONINTORED_VALUE = dataValue?.value.value\n      },\n      {\n        samplingInterval,\n        discardOldest,\n        queueSize\n      },\n      { logger }\n    )\n\n    closures.push(async () => {\n      try {\n        monitoredItem && (await stopMonitor(monitoredItem, { logger }))\n      } catch (e) {\n        logger.error(e)\n      }\n    })\n  }\n\n  var monitoringValue = await context.__opcua_moinitor[node]()\n\n  return { data: monitoringValue }\n}\n\nOPCUAStartMonitor.parameterSpec = [\n  {\n    type: 'string',\n    name: 'node',\n    label: 'node'\n  },\n  {\n    type: 'number',\n    name: 'samplingInterval',\n    label: 'sampling-interval'\n  },\n  {\n    type: 'boolean',\n    name: 'discardOldest',\n    label: 'discard-oldest'\n  },\n  {\n    type: 'number',\n    name: 'queueSize',\n    label: 'queue-size'\n  }\n]\n\nOPCUAStartMonitor.help = 'integration/task/opc-ua-start-monitor'\n\nTaskRegistry.registerTaskHandler('opc-ua-start-monitor', OPCUAStartMonitor)\n"]}