node-opcua-client 2.118.0 → 2.119.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (43) hide show
  1. package/dist/alarms_and_conditions/client_alarm_tools.d.ts +1 -1
  2. package/dist/alarms_and_conditions/client_alarm_tools.js +5 -8
  3. package/dist/alarms_and_conditions/client_alarm_tools.js.map +1 -1
  4. package/dist/alarms_and_conditions/client_tools.d.ts +1 -7
  5. package/dist/alarms_and_conditions/client_tools.js +15 -147
  6. package/dist/alarms_and_conditions/client_tools.js.map +1 -1
  7. package/dist/client_monitored_item_toolbox.js.map +1 -1
  8. package/dist/client_session.d.ts +9 -0
  9. package/dist/client_session_keepalive_manager.js.map +1 -1
  10. package/dist/client_subscription.d.ts +2 -1
  11. package/dist/client_subscription.js.map +1 -1
  12. package/dist/client_utils.js.map +1 -1
  13. package/dist/index.d.ts +3 -6
  14. package/dist/index.js +3 -6
  15. package/dist/index.js.map +1 -1
  16. package/dist/private/client_base_impl.js +2 -2
  17. package/dist/private/client_base_impl.js.map +1 -1
  18. package/dist/private/client_monitored_item_group_impl.js.map +1 -1
  19. package/dist/private/client_monitored_item_impl.js.map +1 -1
  20. package/dist/private/client_publish_engine.js +1 -1
  21. package/dist/private/client_publish_engine.js.map +1 -1
  22. package/dist/private/client_session_impl.d.ts +4 -0
  23. package/dist/private/client_session_impl.js +7 -3
  24. package/dist/private/client_session_impl.js.map +1 -1
  25. package/dist/private/client_subscription_impl.js.map +1 -1
  26. package/dist/private/opcua_client_impl.js.map +1 -1
  27. package/dist/private/performance.js.map +1 -1
  28. package/dist/reconnection.js.map +1 -1
  29. package/dist/tools/findservers.js.map +1 -1
  30. package/dist/tools/read_history_server_capabilities.js.map +1 -1
  31. package/dist/verify.js.map +1 -1
  32. package/package.json +32 -31
  33. package/source/alarms_and_conditions/client_alarm_tools.ts +2 -6
  34. package/source/alarms_and_conditions/client_tools.ts +21 -185
  35. package/source/client_session.ts +10 -1
  36. package/source/client_subscription.ts +3 -2
  37. package/source/index.ts +3 -6
  38. package/source/private/client_session_impl.ts +4 -0
  39. package/source/alarms_and_conditions/client_alarm.ts +0 -130
  40. package/source/alarms_and_conditions/client_alarm_list.ts +0 -112
  41. package/source/alarms_and_conditions/client_alarm_tools_acknowledge_all_conditions.ts +0 -187
  42. package/source/alarms_and_conditions/client_alarm_tools_dump_event.ts +0 -67
  43. package/source/alarms_and_conditions/client_alarm_tools_extractConditionFields.ts +0 -12
@@ -1,4 +1,4 @@
1
+ import { ClientAlarmList } from "node-opcua-alarm-condition";
1
2
  import { ClientSession } from "../client_session";
2
- import { ClientAlarmList } from "./client_alarm_list";
3
3
  export declare function uninstallAlarmMonitoring(session: ClientSession): Promise<void>;
4
4
  export declare function installAlarmMonitoring(session: ClientSession): Promise<ClientAlarmList>;
@@ -7,10 +7,7 @@ const node_opcua_service_filter_1 = require("node-opcua-service-filter");
7
7
  const node_opcua_service_read_1 = require("node-opcua-service-read");
8
8
  const node_opcua_variant_1 = require("node-opcua-variant");
9
9
  const node_opcua_debug_1 = require("node-opcua-debug");
10
- const client_alarm_1 = require("./client_alarm");
11
- const client_alarm_list_1 = require("./client_alarm_list");
12
- const client_alarm_tools_extractConditionFields_1 = require("./client_alarm_tools_extractConditionFields");
13
- const client_tools_1 = require("./client_tools");
10
+ const node_opcua_alarm_condition_1 = require("node-opcua-alarm-condition");
14
11
  const doDebug = (0, node_opcua_debug_1.checkDebugFlag)("A&E");
15
12
  const debugLog = (0, node_opcua_debug_1.make_debugLog)("A&E");
16
13
  const warningLog = (0, node_opcua_debug_1.make_warningLog)("A&E");
@@ -52,7 +49,7 @@ async function installAlarmMonitoring(session) {
52
49
  if (_sessionPriv.$clientAlarmList) {
53
50
  return _sessionPriv.$clientAlarmList;
54
51
  }
55
- const clientAlarmList = new client_alarm_list_1.ClientAlarmList();
52
+ const clientAlarmList = new node_opcua_alarm_condition_1.ClientAlarmList();
56
53
  _sessionPriv.$clientAlarmList = clientAlarmList;
57
54
  const request = {
58
55
  maxNotificationsPerPublish: 100,
@@ -68,7 +65,7 @@ async function installAlarmMonitoring(session) {
68
65
  attributeId: node_opcua_data_model_1.AttributeIds.EventNotifier,
69
66
  nodeId: (0, node_opcua_nodeid_1.resolveNodeId)("Server") // i=2253
70
67
  };
71
- const fields = await (0, client_alarm_tools_extractConditionFields_1.extractConditionFields)(session, "AlarmConditionType");
68
+ const fields = await (0, node_opcua_alarm_condition_1.extractConditionFields)(session, "AlarmConditionType");
72
69
  const AcknowledgeableConditionType = (0, node_opcua_nodeid_1.resolveNodeId)("AcknowledgeableConditionType");
73
70
  const eventFilter = (0, node_opcua_service_filter_1.constructEventFilter)(fields, (0, node_opcua_service_filter_1.ofType)(AcknowledgeableConditionType));
74
71
  const monitoringParameters = {
@@ -89,7 +86,7 @@ async function installAlarmMonitoring(session) {
89
86
  }
90
87
  let inInit = true;
91
88
  eventMonitoringItem.on("changed", (eventFields) => {
92
- const pojo = (0, client_alarm_1.fieldsToJson)(fields, eventFields);
89
+ const pojo = (0, node_opcua_alarm_condition_1.fieldsToJson)(fields, eventFields);
93
90
  const { eventType, eventId, conditionId, conditionName } = pojo;
94
91
  debugLog("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ---- ALARM RECEIVED " +
95
92
  eventType.value.toString() +
@@ -123,7 +120,7 @@ async function installAlarmMonitoring(session) {
123
120
  // TODO
124
121
  });
125
122
  try {
126
- await (0, client_tools_1.callConditionRefresh)(subscription);
123
+ await (0, node_opcua_alarm_condition_1.callConditionRefresh)(session, subscription.subscriptionId);
127
124
  }
128
125
  catch (err) {
129
126
  if (err.message.match(/BadNothingToDo/)) {
@@ -1 +1 @@
1
- {"version":3,"file":"client_alarm_tools.js","sourceRoot":"","sources":["../../source/alarms_and_conditions/client_alarm_tools.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client_alarm_tools.js","sourceRoot":"","sources":["../../source/alarms_and_conditions/client_alarm_tools.ts"],"names":[],"mappings":";;;AAAA,iEAAqD;AACrD,yDAAkD;AAClD,yEAAyE;AACzE,qEAAiF;AAEjF,2DAAuD;AACvD,uDAAkF;AAClF,2EAAqI;AAMrI,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,KAAK,CAAC,CAAC;AACtC,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,KAAK,CAAC,CAAC;AACtC,MAAM,UAAU,GAAG,IAAA,kCAAe,EAAC,KAAK,CAAC,CAAC;AAE1C,SAAS,CAAC,CAAC,IAAY,EAAE,CAA0C;IAC/D,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;QAC7B,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,OAAO,CAAC,CAAC;AACb,CAAC;AAMD,iIAAiI;AAC1H,KAAK,UAAU,wBAAwB,CAAC,OAAsB;IACjE,MAAM,YAAY,GAAG,OAA4B,CAAC;IAClD,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC;QACjC,OAAO;IACX,CAAC;IAED,MAAM,EAAE,GAAG,YAAY,CAAC,0BAAiD,CAAC;IAC1E,EAAE,CAAC,kBAAkB,EAAE,CAAC;IAExB,YAAY,CAAC,0BAA0B,GAAG,IAAI,CAAC;IAC/C,MAAM,YAAY,CAAC,yBAA0B,CAAC,SAAS,EAAE,CAAC;IAC1D,YAAY,CAAC,gBAAgB,GAAG,IAAI,CAAC;IACrC,OAAO;AACX,CAAC;AAbD,4DAaC;AAED,kDAAkD;AAClD,sCAAsC;AACtC,EAAE;AACF,0FAA0F;AAC1F,iGAAiG;AACjG,uFAAuF;AACvF,6FAA6F;AAC7F,+FAA+F;AAC/F,kFAAkF;AAClF,yFAAyF;AACzF,SAAS;AAET,iIAAiI;AAC1H,KAAK,UAAU,sBAAsB,CAAC,OAAsB;IAC/D,MAAM,YAAY,GAAG,OAA4B,CAAC;IAClD,SAAS;IACT,IAAI,YAAY,CAAC,gBAAgB,EAAE,CAAC;QAChC,OAAO,YAAY,CAAC,gBAAgB,CAAC;IACzC,CAAC;IACD,MAAM,eAAe,GAAG,IAAI,4CAAe,EAAE,CAAC;IAC9C,YAAY,CAAC,gBAAgB,GAAG,eAAe,CAAC;IAEhD,MAAM,OAAO,GAAqC;QAC9C,0BAA0B,EAAE,GAAG;QAC/B,QAAQ,EAAE,CAAC;QACX,iBAAiB,EAAE,IAAI;QACvB,sBAAsB,EAAE,KAAK;QAC7B,0BAA0B,EAAE,EAAE;QAC9B,2BAA2B,EAAE,GAAG;KACnC,CAAC;IACF,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAChE,YAAY,CAAC,yBAAyB,GAAG,YAAY,CAAC;IAEtD,MAAM,aAAa,GAAuB;QACtC,WAAW,EAAE,oCAAY,CAAC,aAAa;QACvC,MAAM,EAAE,IAAA,iCAAa,EAAC,QAAQ,CAAC,CAAC,SAAS;KAC5C,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,IAAA,mDAAsB,EAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;IAE3E,MAAM,4BAA4B,GAAG,IAAA,iCAAa,EAAC,8BAA8B,CAAC,CAAC;IAEnF,MAAM,WAAW,GAAG,IAAA,gDAAoB,EAAC,MAAM,EAAE,IAAA,kCAAM,EAAC,4BAA4B,CAAC,CAAC,CAAC;IAEvF,MAAM,oBAAoB,GAAgC;QACtD,aAAa,EAAE,KAAK;QACpB,MAAM,EAAE,WAAW;QACnB,SAAS,EAAE,IAAI;QACf,gBAAgB,EAAE,CAAC;KACtB,CAAC;IAEF,oCAAoC;IACpC,MAAM,mBAAmB,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,aAAa,EAAE,oBAAoB,EAAE,4CAAkB,CAAC,IAAI,CAAC,CAAC;IAErH,MAAM,UAAU,GAAiB,EAAE,CAAC;IACpC,SAAS,UAAU;QACf,MAAM,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,CAAC;QAC1B,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;QACtB,KAAK,MAAM,IAAI,IAAI,CAAC,EAAE,CAAC;YACnB,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;IACL,CAAC;IAED,IAAI,MAAM,GAAG,IAAI,CAAC;IAClB,mBAAmB,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,WAAsB,EAAE,EAAE;QACzD,MAAM,IAAI,GAAG,IAAA,yCAAY,EAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC/C,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;QAEhE,QAAQ,CACJ,oFAAoF;YAChF,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE;YAC1B,GAAG;YACH,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CACrC,CAAC;QACF,IAAI,CAAC;YACD,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,QAAQ,KAAK,6BAAQ,CAAC,IAAI,EAAE,CAAC;gBAC/E,kCAAkC;gBAClC,UAAU,CACN,sCAAsC,GAAG,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,GAAG,EACzE,WAAW,EACX,aAAa,EAAE,KAAK,EACpB,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CACvC,CAAC;gBACF,OAAO;YACX,CAAC;YACD,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtB,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACrC,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;YACvC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;YACzC,UAAU,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAChC,CAAC;QAED,kDAAkD;QAClD,sCAAsC;QACtC,2BAA2B;QAC3B,uFAAuF;QACvF,yFAAyF;QACzF,uFAAuF;QACvF,qFAAqF;QACrF,iFAAiF;QACjF,qFAAqF;QACrF,oEAAoE;QACpE,OAAO;IACX,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC;QACD,MAAM,IAAA,iDAAoB,EAAC,OAAO,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IACrE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,IAAK,GAAa,CAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACjD,0BAA0B;QAC9B,CAAC;aAAM,CAAC;YACJ,UAAU,CAAC,4CAA4C,EAAU,GAAI,CAAC,OAAO,CAAC,CAAC;QACnF,CAAC;IACL,CAAC;IACD,YAAY,CAAC,0BAA0B,GAAG,mBAAmB,CAAC;IAE9D,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;IACnC,MAAM,GAAG,KAAK,CAAC;IAEf,uBAAuB;IACvB,OAAO,eAAe,CAAC;AAC3B,CAAC;AA9GD,wDA8GC"}
@@ -1,7 +1 @@
1
- /**
2
- * @module node-opcua-client
3
- */
4
- import { ErrorCallback } from "node-opcua-status-code";
5
- import { ClientSubscription } from "../client_subscription";
6
- export declare function callConditionRefresh(subscription: ClientSubscription): Promise<void>;
7
- export declare function callConditionRefresh(subscription: ClientSubscription, callback: ErrorCallback): void;
1
+ export {};
@@ -1,79 +1,12 @@
1
1
  "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
2
3
  /**
3
4
  * @module node-opcua-client
4
5
  */
5
- // tslint:disable:no-empty
6
- // tslint:disable: only-arrow-functions
7
- var __importDefault = (this && this.__importDefault) || function (mod) {
8
- return (mod && mod.__esModule) ? mod : { "default": mod };
9
- };
10
- Object.defineProperty(exports, "__esModule", { value: true });
11
- exports.callConditionRefresh = void 0;
12
- const async_1 = __importDefault(require("async"));
13
- const node_opcua_assert_1 = require("node-opcua-assert");
14
- const node_opcua_data_model_1 = require("node-opcua-data-model");
15
- const node_opcua_debug_1 = require("node-opcua-debug");
16
- const node_opcua_nodeid_1 = require("node-opcua-nodeid");
17
- const node_opcua_service_call_1 = require("node-opcua-service-call");
18
- const node_opcua_service_translate_browse_path_1 = require("node-opcua-service-translate-browse-path");
19
- const node_opcua_variant_1 = require("node-opcua-variant");
6
+ const util_1 = require("util");
7
+ const node_opcua_alarm_condition_1 = require("node-opcua-alarm-condition");
8
+ const node_opcua_pseudo_session_1 = require("node-opcua-pseudo-session");
20
9
  const client_session_impl_1 = require("../private/client_session_impl");
21
- const debugLog = (0, node_opcua_debug_1.make_debugLog)("A&E");
22
- const doDebug = (0, node_opcua_debug_1.checkDebugFlag)("A&E");
23
- const warningLog = (0, node_opcua_debug_1.make_warningLog)("A&E");
24
- function callConditionRefresh(subscription, callback) {
25
- const subscriptionI = subscription;
26
- const theSession = subscriptionI.publishEngine.session;
27
- const subscriptionId = subscription.subscriptionId;
28
- (0, node_opcua_assert_1.assert)(isFinite(subscriptionId), "May be subscription is not yet initialized");
29
- (0, node_opcua_assert_1.assert)(typeof callback === "function");
30
- const conditionTypeNodeId = (0, node_opcua_nodeid_1.resolveNodeId)("ConditionType");
31
- let conditionRefreshId = (0, node_opcua_nodeid_1.resolveNodeId)("ConditionType_ConditionRefresh");
32
- async_1.default.series([
33
- // find conditionRefreshId
34
- (innerCallback) => {
35
- const browsePath = (0, node_opcua_service_translate_browse_path_1.makeBrowsePath)(conditionTypeNodeId, ".ConditionRefresh");
36
- theSession.translateBrowsePath(browsePath, (err, result) => {
37
- if (!err) {
38
- result = result;
39
- // istanbul ignore else
40
- if (result.targets && result.targets.length > 0) {
41
- conditionRefreshId = result.targets[0].targetId;
42
- }
43
- else {
44
- // cannot find conditionRefreshId
45
- debugLog("cannot find conditionRefreshId", result.toString());
46
- err = new Error(" cannot find conditionRefreshId");
47
- }
48
- }
49
- innerCallback(err ? err : undefined);
50
- });
51
- },
52
- (innerCallback) => {
53
- const methodToCall = {
54
- inputArguments: [new node_opcua_variant_1.Variant({ dataType: node_opcua_variant_1.DataType.UInt32, value: subscriptionId })],
55
- methodId: conditionRefreshId,
56
- objectId: conditionTypeNodeId
57
- };
58
- doDebug && debugLog("Calling method ", new node_opcua_service_call_1.CallMethodRequest(methodToCall).toString());
59
- theSession.call(methodToCall, (err, result) => {
60
- if (err) {
61
- return innerCallback(err);
62
- }
63
- result = result;
64
- // istanbul ignore next
65
- if (result.statusCode.isNotGood()) {
66
- warningLog(new node_opcua_service_call_1.CallMethodRequest(methodToCall).toString());
67
- return innerCallback(new Error("Error " + result.statusCode.toString()));
68
- }
69
- innerCallback();
70
- });
71
- }
72
- ], (err) => {
73
- callback(err || undefined);
74
- });
75
- }
76
- exports.callConditionRefresh = callConditionRefresh;
77
10
  client_session_impl_1.ClientSessionImpl.prototype.disableCondition = () => {
78
11
  /** */
79
12
  };
@@ -81,95 +14,31 @@ client_session_impl_1.ClientSessionImpl.prototype.enableCondition = () => {
81
14
  /** */
82
15
  };
83
16
  client_session_impl_1.ClientSessionImpl.prototype.addCommentCondition = function (conditionId, eventId, comment, callback) {
84
- this._callMethodCondition("AddComment", conditionId, eventId, comment, callback);
17
+ (0, util_1.callbackify)(node_opcua_alarm_condition_1.callMethodCondition)(this, "AddComment", conditionId, eventId, comment, callback);
85
18
  };
19
+ /** @deprecated */
86
20
  client_session_impl_1.ClientSessionImpl.prototype.findMethodId = function (nodeId, methodName, callback) {
87
- const browsePath = (0, node_opcua_service_translate_browse_path_1.makeBrowsePath)(nodeId, "/" + methodName);
88
- let methodId;
89
- this.translateBrowsePath(browsePath, (err, result) => {
90
- if (err) {
91
- return callback(err);
92
- }
93
- /* istanbul ignore next */
94
- if (!result) {
95
- return callback(new Error("Internal Error"));
96
- }
97
- result.targets = result.targets || [];
98
- // istanbul ignore else
99
- if (result.targets.length > 0) {
100
- methodId = result.targets[0].targetId;
101
- return callback(null, methodId);
21
+ (0, node_opcua_pseudo_session_1.findMethodId)(this, nodeId, methodName)
22
+ .then((data) => {
23
+ if (data.methodId) {
24
+ callback(null, data.methodId);
102
25
  }
103
26
  else {
104
- // cannot find objectWithMethodNodeId
105
- debugLog("cannot find " + methodName + " Method", result.toString());
106
- err = new Error(" cannot find " + methodName + " Method");
27
+ callback(data.err);
107
28
  }
29
+ })
30
+ .catch((err) => {
108
31
  callback(err);
109
32
  });
110
33
  };
111
- /**
112
- *
113
- * @param methodName
114
- * @param conditionId
115
- * @param eventId
116
- * @param comment
117
- * @param callback
118
- * @private
119
- */
120
- client_session_impl_1.ClientSessionImpl.prototype._callMethodCondition = function (methodName, conditionId, eventId, comment, callback) {
121
- conditionId = (0, node_opcua_nodeid_1.coerceNodeId)(conditionId);
122
- (0, node_opcua_assert_1.assert)(conditionId instanceof node_opcua_nodeid_1.NodeId);
123
- (0, node_opcua_assert_1.assert)(eventId instanceof Buffer);
124
- (0, node_opcua_assert_1.assert)(typeof comment === "string" || comment instanceof node_opcua_data_model_1.LocalizedText);
125
- comment = node_opcua_data_model_1.LocalizedText.coerce(comment) || new node_opcua_data_model_1.LocalizedText();
126
- let methodId;
127
- let statusCode;
128
- async_1.default.series([
129
- (innerCallback) => {
130
- this.findMethodId(conditionId, methodName, (err, _methodId) => {
131
- if (err) {
132
- return innerCallback(err);
133
- }
134
- if (_methodId) {
135
- methodId = _methodId;
136
- }
137
- innerCallback();
138
- });
139
- },
140
- (innerCallback) => {
141
- const methodToCalls = [];
142
- methodToCalls.push(new node_opcua_service_call_1.CallMethodRequest({
143
- inputArguments: [
144
- /* eventId */ new node_opcua_variant_1.Variant({ dataType: "ByteString", value: eventId }),
145
- /* comment */ new node_opcua_variant_1.Variant({ dataType: "LocalizedText", value: comment })
146
- ],
147
- methodId,
148
- objectId: conditionId
149
- }));
150
- this.call(methodToCalls, (err, results) => {
151
- if (err) {
152
- return innerCallback(err);
153
- }
154
- statusCode = results[0].statusCode;
155
- innerCallback();
156
- });
157
- }
158
- ], (err) => {
159
- if (err) {
160
- return callback(err);
161
- }
162
- callback(null, statusCode);
163
- });
164
- };
165
34
  client_session_impl_1.ClientSessionImpl.prototype.confirmCondition = function (conditionId, eventId, comment, callback) {
166
35
  // ns=0;i=9113 AcknowledgeableConditionType#Confirm
167
36
  // note that confirm method is Optionals on condition
168
- this._callMethodCondition("Confirm", conditionId, eventId, comment, callback);
37
+ (0, util_1.callbackify)(node_opcua_alarm_condition_1.confirmCondition)(this, conditionId, eventId, comment, callback);
169
38
  };
170
39
  client_session_impl_1.ClientSessionImpl.prototype.acknowledgeCondition = function (conditionId, eventId, comment, callback) {
171
40
  // ns=0;i=9111 AcknowledgeableConditionType#Acknowledge
172
- this._callMethodCondition("Acknowledge", conditionId, eventId, comment, callback);
41
+ (0, util_1.callbackify)(node_opcua_alarm_condition_1.acknowledgeCondition)(this, conditionId, eventId, comment, callback);
173
42
  };
174
43
  // tslint:disable:no-var-requires
175
44
  // tslint:disable:max-line-length
@@ -179,5 +48,4 @@ client_session_impl_1.ClientSessionImpl.prototype.addCommentCondition = thenify.
179
48
  client_session_impl_1.ClientSessionImpl.prototype.findMethodId = thenify.withCallback(client_session_impl_1.ClientSessionImpl.prototype.findMethodId, opts);
180
49
  client_session_impl_1.ClientSessionImpl.prototype.confirmCondition = thenify.withCallback(client_session_impl_1.ClientSessionImpl.prototype.confirmCondition, opts);
181
50
  client_session_impl_1.ClientSessionImpl.prototype.acknowledgeCondition = thenify.withCallback(client_session_impl_1.ClientSessionImpl.prototype.acknowledgeCondition, opts);
182
- module.exports.callConditionRefresh = thenify.withCallback(module.exports.callConditionRefresh, opts);
183
51
  //# sourceMappingURL=client_tools.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"client_tools.js","sourceRoot":"","sources":["../../source/alarms_and_conditions/client_tools.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client_tools.js","sourceRoot":"","sources":["../../source/alarms_and_conditions/client_tools.ts"],"names":[],"mappings":";;AAAA;;GAEG;AACH,+BAAmC;AAKnC,2EAAyG;AACzG,yEAA2E;AAE3E,wEAAmE;AAEnE,uCAAiB,CAAC,SAAS,CAAC,gBAAgB,GAAG,GAAG,EAAE;IAChD,MAAM;AACV,CAAC,CAAC;AAEF,uCAAiB,CAAC,SAAS,CAAC,eAAe,GAAG,GAAG,EAAE;IAC/C,MAAM;AACV,CAAC,CAAC;AAEF,uCAAiB,CAAC,SAAS,CAAC,mBAAmB,GAAG,UAC9C,WAAuB,EACvB,OAAe,EACf,OAA0B,EAC1B,QAA8B;IAE9B,IAAA,kBAAW,EAAC,gDAAmB,CAAC,CAAC,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAClG,CAAC,CAAC;AAEF,kBAAkB;AAClB,uCAAiB,CAAC,SAAS,CAAC,YAAY,GAAG,UAAU,MAAkB,EAAE,UAAkB,EAAE,QAAkC;IAC3H,IAAA,wCAAY,EAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC;SACjC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QACX,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;aAAM,CAAC;YACJ,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC;IACL,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,QAAQ,CAAC,GAAG,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACX,CAAC,CAAC;AAEF,uCAAiB,CAAC,SAAS,CAAC,gBAAgB,GAAG,UAC3C,WAAmB,EACnB,OAAe,EACf,OAA0B,EAC1B,QAA8B;IAE9B,mDAAmD;IACnD,qDAAqD;IACrD,IAAA,kBAAW,EAAC,6CAAgB,CAAC,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AACjF,CAAC,CAAC;AAEF,uCAAiB,CAAC,SAAS,CAAC,oBAAoB,GAAG,UAC/C,WAAmB,EACnB,OAAe,EACf,OAA0B,EAC1B,QAA8B;IAE9B,uDAAuD;IACvD,IAAA,kBAAW,EAAC,iDAAoB,CAAC,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AACrF,CAAC,CAAC;AAEF,iCAAiC;AACjC,iCAAiC;AACjC,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACnC,MAAM,IAAI,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;AAClC,uCAAiB,CAAC,SAAS,CAAC,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC,uCAAiB,CAAC,SAAS,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;AAC9H,uCAAiB,CAAC,SAAS,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,uCAAiB,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;AAChH,uCAAiB,CAAC,SAAS,CAAC,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC,uCAAiB,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;AACxH,uCAAiB,CAAC,SAAS,CAAC,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC,uCAAiB,CAAC,SAAS,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"client_monitored_item_toolbox.js","sourceRoot":"","sources":["../source/client_monitored_item_toolbox.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client_monitored_item_toolbox.js","sourceRoot":"","sources":["../source/client_monitored_item_toolbox.ts"],"names":[],"mappings":"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"}
@@ -479,6 +479,15 @@ export interface ClientSessionConditionService {
479
479
  * @param nodeId the nodeId of the parent Object
480
480
  * @param methodName the method name
481
481
  * @param callback
482
+ *
483
+ * note:
484
+ * - methodName is a browse name and may therefore be prefixed with a namespace index.
485
+ * - if method is not found on the object specified by nodeId, then the findMethodId will
486
+ * recursively browse up the hierarchy of object typeDefinition Node
487
+ * until it reaches the root type. and try to find the first method that matches the
488
+ * provided name.
489
+ *
490
+ * @deprecated use global findMethodId(session, nodeId, methoName): Promise<NodeId> instead
482
491
  */
483
492
  findMethodId(nodeId: NodeIdLike, methodName: string, callback: ResponseCallback<NodeId>): void;
484
493
  findMethodId(nodeId: NodeIdLike, methodName: string): Promise<NodeId>;
@@ -1 +1 @@
1
- {"version":3,"file":"client_session_keepalive_manager.js","sourceRoot":"","sources":["../source/client_session_keepalive_manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client_session_keepalive_manager.js","sourceRoot":"","sources":["../source/client_session_keepalive_manager.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,7 @@ import { EventEmitter } from "events";
6
6
  import { Byte, Double, UInt32 } from "node-opcua-basic-types";
7
7
  import { DiagnosticInfo } from "node-opcua-data-model";
8
8
  import { ReadValueIdOptions, TimestampsToReturn } from "node-opcua-service-read";
9
+ import { IBasicSubscription } from "node-opcua-pseudo-session";
9
10
  import { MonitoringMode, MonitoringParametersOptions, NotificationMessage, SetTriggeringResponse } from "node-opcua-service-subscription";
10
11
  import { Callback, StatusCode } from "node-opcua-status-code";
11
12
  import { ErrorCallback } from "node-opcua-status-code";
@@ -235,7 +236,7 @@ export declare interface ClientSubscription {
235
236
  export declare interface ClientSubscription {
236
237
  _createMonitoredItem(itemToMonitor: ReadValueIdOptions, monitoringParameters: MonitoringParametersOptions, timestampsToReturn: TimestampsToReturn): ClientMonitoredItem;
237
238
  }
238
- export declare class ClientSubscription {
239
+ export declare class ClientSubscription implements IBasicSubscription {
239
240
  static create(clientSession: ClientSession, options: ClientSubscriptionOptions): ClientSubscription;
240
241
  static ignoreNextWarning: boolean;
241
242
  }
@@ -1 +1 @@
1
- {"version":3,"file":"client_subscription.js","sourceRoot":"","sources":["../source/client_subscription.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAgTH,MAAa,kBAAkB;IACpB,MAAM,CAAC,MAAM,CAAC,aAA4B,EAAE,OAAkC;QACjF,yBAAyB;QACzB,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;;AAJL,gDAMC;AADiB,oCAAiB,GAAG,KAAK,CAAC"}
1
+ {"version":3,"file":"client_subscription.js","sourceRoot":"","sources":["../source/client_subscription.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAiTH,MAAa,kBAAkB;IACpB,MAAM,CAAC,MAAM,CAAC,aAA4B,EAAE,OAAkC;QACjF,yBAAyB;QACzB,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;;AAJL,gDAMC;AADiB,oCAAiB,GAAG,KAAK,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"client_utils.js","sourceRoot":"","sources":["../source/client_utils.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,iEAAqD;AAErD,yDAA8D;AAE9D,uGAAwF;AAIxF,MAAM,gBAAgB,GAAG,IAAA,iCAAa,EAAC,aAAa,CAAC,CAAC;AAEtD,sBAAsB;AAEtB,SAAS,yBAAyB,CAAC,MAAkB,EAAE,YAAoB;IACvE,OAAO,IAAI,qDAAU,CAAC;QAClB,YAAY,EAAE,oBAAoB,CAAC;YAC/B,QAAQ,EAAE,yBAAyB,CAAC;gBAChC;oBACI,eAAe,EAAE,KAAK;oBACtB,SAAS,EAAE,KAAK;oBAChB,eAAe,EAAE,gBAAgB;oBACjC,UAAU,EAAE,EAAE,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE;iBACxD;aACJ;SACJ;QACD,YAAY,EAAE,aAAa,CAAC,MAAM;KACrC,CAAC,CAAC;AACP,CAAC;AAUD;;;;;GAKG;AACI,KAAK,UAAU,gBAAgB,CAClC,OAAuF,EACvF,MAAkB;IAElB,MAAM,WAAW,GAAG;QAChB,yBAAyB,CAAC,MAAM,EAAE,kBAAkB,CAAC;QACrD,yBAAyB,CAAC,MAAM,EAAE,SAAS,CAAC;QAC5C,yBAAyB,CAAC,MAAM,EAAE,iBAAiB,CAAC;QACpD,yBAAyB,CAAC,MAAM,EAAE,gBAAgB,CAAC;QACnD,yBAAyB,CAAC,MAAM,EAAE,YAAY,CAAC;KAClD,CAAC;IAEF,MAAM,cAAc,GAA2B;QAC3C,UAAU,EAAE,IAAI;QAChB,gBAAgB,EAAE,IAAI;QACtB,qBAAqB,EAAE,IAAI;QAC3B,eAAe,EAAE,IAAI;QACrB,cAAc,EAAE,IAAI;KACvB,CAAC;IAEF,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;IAEzE,MAAM,OAAO,GAAwC,EAAE,CAAC;IACxD,MAAM,WAAW,GAAyB,EAAE,CAAC;IAE7C,SAAS,eAAe,CAAC,gBAAkC,EAAE,YAAoB;QAC7E,IAAI,gBAAgB,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE;YACtC,gBAAgB,CAAC,OAAO,GAAG,gBAAgB,CAAC,OAAO,IAAI,EAAE,CAAC;YAC1D,WAAW,CAAC,IAAI,CAAC;gBACb,WAAW,EAAE,oCAAY,CAAC,KAAK;gBAC/B,MAAM,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ;aAC/C,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CACR,CAAC,UAAqB,EAAE,EAAE,CACtB,CAAE,cAAqD,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CACtG,CAAC;SACL;IACL,CAAC;IAED,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;IAC1D,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,uBAAuB,CAAC,CAAC;IAC/D,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC;IACzD,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;IACxD,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;IAEpD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAEnD,UAAU,CAAC,OAAO,CAAC,CAAC,MAAiB,EAAE,KAAa,EAAE,EAAE;QACpD,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IACH,OAAO,cAAc,CAAC;AAC1B,CAAC;AAnDD,4CAmDC"}
1
+ {"version":3,"file":"client_utils.js","sourceRoot":"","sources":["../source/client_utils.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,iEAAqD;AAErD,yDAA8D;AAE9D,uGAAwF;AAIxF,MAAM,gBAAgB,GAAG,IAAA,iCAAa,EAAC,aAAa,CAAC,CAAC;AAEtD,sBAAsB;AAEtB,SAAS,yBAAyB,CAAC,MAAkB,EAAE,YAAoB;IACvE,OAAO,IAAI,qDAAU,CAAC;QAClB,YAAY,EAAE,oBAAoB,CAAC;YAC/B,QAAQ,EAAE,yBAAyB,CAAC;gBAChC;oBACI,eAAe,EAAE,KAAK;oBACtB,SAAS,EAAE,KAAK;oBAChB,eAAe,EAAE,gBAAgB;oBACjC,UAAU,EAAE,EAAE,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE;iBACxD;aACJ;SACJ;QACD,YAAY,EAAE,aAAa,CAAC,MAAM;KACrC,CAAC,CAAC;AACP,CAAC;AAUD;;;;;GAKG;AACI,KAAK,UAAU,gBAAgB,CAClC,OAAuF,EACvF,MAAkB;IAElB,MAAM,WAAW,GAAG;QAChB,yBAAyB,CAAC,MAAM,EAAE,kBAAkB,CAAC;QACrD,yBAAyB,CAAC,MAAM,EAAE,SAAS,CAAC;QAC5C,yBAAyB,CAAC,MAAM,EAAE,iBAAiB,CAAC;QACpD,yBAAyB,CAAC,MAAM,EAAE,gBAAgB,CAAC;QACnD,yBAAyB,CAAC,MAAM,EAAE,YAAY,CAAC;KAClD,CAAC;IAEF,MAAM,cAAc,GAA2B;QAC3C,UAAU,EAAE,IAAI;QAChB,gBAAgB,EAAE,IAAI;QACtB,qBAAqB,EAAE,IAAI;QAC3B,eAAe,EAAE,IAAI;QACrB,cAAc,EAAE,IAAI;KACvB,CAAC;IAEF,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;IAEzE,MAAM,OAAO,GAAwC,EAAE,CAAC;IACxD,MAAM,WAAW,GAAyB,EAAE,CAAC;IAE7C,SAAS,eAAe,CAAC,gBAAkC,EAAE,YAAoB;QAC7E,IAAI,gBAAgB,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC;YACvC,gBAAgB,CAAC,OAAO,GAAG,gBAAgB,CAAC,OAAO,IAAI,EAAE,CAAC;YAC1D,WAAW,CAAC,IAAI,CAAC;gBACb,WAAW,EAAE,oCAAY,CAAC,KAAK;gBAC/B,MAAM,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ;aAC/C,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CACR,CAAC,UAAqB,EAAE,EAAE,CACtB,CAAE,cAAqD,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CACtG,CAAC;QACN,CAAC;IACL,CAAC;IAED,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;IAC1D,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,uBAAuB,CAAC,CAAC;IAC/D,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC;IACzD,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;IACxD,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;IAEpD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAEnD,UAAU,CAAC,OAAO,CAAC,CAAC,MAAiB,EAAE,KAAa,EAAE,EAAE;QACpD,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IACH,OAAO,cAAc,CAAC;AAC1B,CAAC;AAnDD,4CAmDC"}
package/dist/index.d.ts CHANGED
@@ -9,17 +9,14 @@ export * from "./client_monitored_item_base";
9
9
  export * from "./client_monitored_item";
10
10
  export * from "./client_monitored_item_group";
11
11
  export * from "./alarms_and_conditions/client_tools";
12
- export * from "./alarms_and_conditions/client_alarm";
13
- export * from "./alarms_and_conditions/client_alarm_list";
14
- export * from "./alarms_and_conditions/client_alarm_tools";
15
- export * from "./alarms_and_conditions/client_alarm_tools_extractConditionFields";
16
- export * from "./alarms_and_conditions/client_alarm_tools_dump_event";
17
- export * from "./alarms_and_conditions/client_alarm_tools_acknowledge_all_conditions";
18
12
  export * from "./tools/findservers";
19
13
  export * from "./tools/read_history_server_capabilities";
20
14
  export * from "./client_utils";
21
15
  export * from "./verify";
22
16
  export * from "./user_identity_info";
17
+ export * from "./alarms_and_conditions/client_alarm_tools";
18
+ export * from "./alarms_and_conditions/client_tools";
19
+ export * from "node-opcua-alarm-condition";
23
20
  export { assert } from "node-opcua-assert";
24
21
  export * from "node-opcua-utils";
25
22
  export { ClientSidePublishEngine } from "./private/client_publish_engine";
package/dist/index.js CHANGED
@@ -38,17 +38,14 @@ __exportStar(require("./client_monitored_item_base"), exports);
38
38
  __exportStar(require("./client_monitored_item"), exports);
39
39
  __exportStar(require("./client_monitored_item_group"), exports);
40
40
  __exportStar(require("./alarms_and_conditions/client_tools"), exports);
41
- __exportStar(require("./alarms_and_conditions/client_alarm"), exports);
42
- __exportStar(require("./alarms_and_conditions/client_alarm_list"), exports);
43
- __exportStar(require("./alarms_and_conditions/client_alarm_tools"), exports);
44
- __exportStar(require("./alarms_and_conditions/client_alarm_tools_extractConditionFields"), exports);
45
- __exportStar(require("./alarms_and_conditions/client_alarm_tools_dump_event"), exports);
46
- __exportStar(require("./alarms_and_conditions/client_alarm_tools_acknowledge_all_conditions"), exports);
47
41
  __exportStar(require("./tools/findservers"), exports);
48
42
  __exportStar(require("./tools/read_history_server_capabilities"), exports);
49
43
  __exportStar(require("./client_utils"), exports);
50
44
  __exportStar(require("./verify"), exports);
51
45
  __exportStar(require("./user_identity_info"), exports);
46
+ __exportStar(require("./alarms_and_conditions/client_alarm_tools"), exports);
47
+ __exportStar(require("./alarms_and_conditions/client_tools"), exports);
48
+ __exportStar(require("node-opcua-alarm-condition"), exports);
52
49
  var node_opcua_assert_1 = require("node-opcua-assert");
53
50
  Object.defineProperty(exports, "assert", { enumerable: true, get: function () { return node_opcua_assert_1.assert; } });
54
51
  __exportStar(require("node-opcua-utils"), exports);
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,gDAA8B;AAC9B,iDAA+B;AAC/B,mDAAiC;AACjC,wDAAsC;AACtC,+DAA6C;AAC7C,0DAAwC;AACxC,gEAA8C;AAC9C,uEAAqD;AACrD,uEAAqD;AACrD,4EAA0D;AAC1D,6EAA2D;AAC3D,oGAAkF;AAClF,wFAAsE;AACtE,wGAAsF;AACtF,sDAAoC;AACpC,2EAAyD;AACzD,iDAA+B;AAC/B,2CAAyB;AACzB,uDAAqC;AAErC,uDAA2C;AAAlC,2GAAA,MAAM,OAAA;AACf,mDAAiC;AAEjC,yEAA0E;AAAjE,gIAAA,uBAAuB,OAAA;AAEhC,uDAAwE;AAA/D,gHAAA,WAAW,OAAA;AAAE,2HAAA,sBAAsB,OAAA;AAE5C,uEAAgH;AAAvG,2HAAA,cAAc,OAAA;AAAE,qIAAA,wBAAwB,OAAA;AAEjD,yDAA2C;AAC9B,QAAA,KAAK,GAAG,MAAM,CAAC;AAE5B,gEAAkD;AACrC,QAAA,YAAY,GAAG,YAAY,CAAC;AAEzC,qDAAoH;AAA3G,2GAAA,OAAO,OAAA;AAAE,4GAAA,QAAQ,OAAA;AAAE,+GAAA,WAAW,OAAA;AAAE,kHAAA,cAAc,OAAA;AAAE,oHAAA,gBAAgB,OAAA;AAAE,kHAAA,cAAc,OAAA;AAEzF,GAAG;AACH,uDAS2B;AARvB,2GAAA,MAAM,OAAA;AACN,kHAAA,aAAa,OAAA;AACb,+GAAA,UAAU,OAAA;AACV,iHAAA,YAAY,OAAA;AACZ,+GAAA,UAAU,OAAA;AACV,mHAAA,cAAc,OAAA;AACd,uHAAA,kBAAkB,OAAA;AAClB,yHAAA,oBAAoB,OAAA;AAExB,iEAAiE;AAAxD,oHAAA,UAAU,OAAA;AAAE,qHAAA,WAAW,OAAA;AAChC,qDAAmC;AACnC,wDAAsC;AACtC,wDAAsC;AACtC,uDAAqC;AACrC,4DAA0C;AAC1C,uDAAuD;AAA9C,uHAAA,kBAAkB,OAAA;AAE3B,+DAA6C;AAC7C,4DAA0C;AAC1C,0DAAwC;AACxC,+DAA6C;AAC7C,+DAA6C;AAC7C,6DAA2C;AAC3C,2DAAyC;AACzC,0DAAwC;AACxC,oEAAkD;AAClD,6DAA2C;AAC3C,kEAAgD;AAChD,2EAAyD;AACzD,2DAAyC;AACzC,4DAA0C;AAC1C,4DAA0C;AAC1C,6EAA2D"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,gDAA8B;AAC9B,iDAA+B;AAC/B,mDAAiC;AACjC,wDAAsC;AACtC,+DAA6C;AAC7C,0DAAwC;AACxC,gEAA8C;AAC9C,uEAAqD;AACrD,sDAAoC;AACpC,2EAAyD;AACzD,iDAA+B;AAC/B,2CAAyB;AACzB,uDAAqC;AACrC,6EAA2D;AAC3D,uEAAqD;AACrD,6DAA2C;AAE3C,uDAA2C;AAAlC,2GAAA,MAAM,OAAA;AACf,mDAAiC;AAEjC,yEAA0E;AAAjE,gIAAA,uBAAuB,OAAA;AAEhC,uDAAwE;AAA/D,gHAAA,WAAW,OAAA;AAAE,2HAAA,sBAAsB,OAAA;AAE5C,uEAAgH;AAAvG,2HAAA,cAAc,OAAA;AAAE,qIAAA,wBAAwB,OAAA;AAEjD,yDAA2C;AAC9B,QAAA,KAAK,GAAG,MAAM,CAAC;AAE5B,gEAAkD;AACrC,QAAA,YAAY,GAAG,YAAY,CAAC;AAEzC,qDAAoH;AAA3G,2GAAA,OAAO,OAAA;AAAE,4GAAA,QAAQ,OAAA;AAAE,+GAAA,WAAW,OAAA;AAAE,kHAAA,cAAc,OAAA;AAAE,oHAAA,gBAAgB,OAAA;AAAE,kHAAA,cAAc,OAAA;AAEzF,GAAG;AACH,uDAS2B;AARvB,2GAAA,MAAM,OAAA;AACN,kHAAA,aAAa,OAAA;AACb,+GAAA,UAAU,OAAA;AACV,iHAAA,YAAY,OAAA;AACZ,+GAAA,UAAU,OAAA;AACV,mHAAA,cAAc,OAAA;AACd,uHAAA,kBAAkB,OAAA;AAClB,yHAAA,oBAAoB,OAAA;AAExB,iEAAiE;AAAxD,oHAAA,UAAU,OAAA;AAAE,qHAAA,WAAW,OAAA;AAChC,qDAAmC;AACnC,wDAAsC;AACtC,wDAAsC;AACtC,uDAAqC;AACrC,4DAA0C;AAC1C,uDAAuD;AAA9C,uHAAA,kBAAkB,OAAA;AAE3B,+DAA6C;AAC7C,4DAA0C;AAC1C,0DAAwC;AACxC,+DAA6C;AAC7C,+DAA6C;AAC7C,6DAA2C;AAC3C,2DAAyC;AACzC,0DAAwC;AACxC,oEAAkD;AAClD,6DAA2C;AAC3C,kEAAgD;AAChD,2EAAyD;AACzD,2DAAyC;AACzC,4DAA0C;AAC1C,4DAA0C;AAC1C,6EAA2D"}
@@ -37,8 +37,8 @@ const warningLog = (0, node_opcua_debug_1.make_warningLog)(__filename);
37
37
  const traceInternalState = false;
38
38
  const defaultConnectionStrategy = {
39
39
  initialDelay: 1000,
40
- maxDelay: 20 * 1000,
41
- maxRetry: -1,
40
+ maxDelay: 20 * 1000, // 20 seconds
41
+ maxRetry: -1, // infinite
42
42
  randomisationFactor: 0.1
43
43
  };
44
44
  function __findEndpoint(endpointUrl, params, _callback) {