node-opcua-client 2.103.0 → 2.105.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.
- package/dist/alarms_and_conditions/client_alarm_tools_acknowledge_all_conditions.js +0 -1
- package/dist/alarms_and_conditions/client_alarm_tools_acknowledge_all_conditions.js.map +1 -1
- package/dist/alarms_and_conditions/client_alarm_tools_dump_event.js +8 -4
- package/dist/alarms_and_conditions/client_alarm_tools_dump_event.js.map +1 -1
- package/dist/alarms_and_conditions/client_tools.js +24 -1
- package/dist/alarms_and_conditions/client_tools.js.map +1 -1
- package/dist/client_base.js +1 -1
- package/dist/client_base.js.map +1 -1
- package/dist/client_monitored_item_toolbox.js +5 -2
- package/dist/client_monitored_item_toolbox.js.map +1 -1
- package/dist/client_session_keepalive_manager.js +5 -3
- package/dist/client_session_keepalive_manager.js.map +1 -1
- package/dist/client_subscription.js +1 -1
- package/dist/client_subscription.js.map +1 -1
- package/dist/index.js +14 -2
- package/dist/index.js.map +1 -1
- package/dist/private/client_base_impl.js +70 -31
- package/dist/private/client_base_impl.js.map +1 -1
- package/dist/private/client_publish_engine.js +39 -13
- package/dist/private/client_publish_engine.js.map +1 -1
- package/dist/private/client_session_impl.js +27 -24
- package/dist/private/client_session_impl.js.map +1 -1
- package/dist/private/client_subscription_impl.js +45 -19
- package/dist/private/client_subscription_impl.js.map +1 -1
- package/dist/private/opcua_client_impl.js +60 -24
- package/dist/private/opcua_client_impl.js.map +1 -1
- package/dist/reconnection.js +53 -28
- package/dist/reconnection.js.map +1 -1
- package/dist/tools/findservers.js +24 -1
- package/dist/tools/findservers.js.map +1 -1
- package/dist/tools/read_history_server_capabilities.js.map +1 -1
- package/dist/verify.d.ts +1 -1
- package/dist/verify.js +9 -8
- package/dist/verify.js.map +1 -1
- package/package.json +47 -47
- package/source/alarms_and_conditions/client_alarm_tools_acknowledge_all_conditions.ts +1 -5
- package/source/alarms_and_conditions/client_alarm_tools_dump_event.ts +7 -4
- package/source/client_monitored_item_toolbox.ts +1 -1
- package/source/client_session_keepalive_manager.ts +1 -2
- package/source/private/client_base_impl.ts +37 -24
- package/source/private/client_publish_engine.ts +1 -1
- package/source/private/client_session_impl.ts +22 -23
- package/source/private/client_subscription_impl.ts +1 -1
- package/source/private/opcua_client_impl.ts +40 -33
- package/source/reconnection.ts +2 -4
- package/source/tools/read_history_server_capabilities.ts +6 -0
- package/source/verify.ts +9 -8
|
@@ -101,7 +101,6 @@ function findActiveConditions(session) {
|
|
|
101
101
|
}
|
|
102
102
|
// dumpEvent(session, fields, eventFields);
|
|
103
103
|
const pojo = (0, client_alarm_1.fieldsToJson)(fields, eventFields);
|
|
104
|
-
// console.log(pojo.eventType.value.toString({ addressSpace}), RefreshEndEventType, RefreshStartEventType);
|
|
105
104
|
// make sure we only start recording event after the RefreshStartEvent has been received
|
|
106
105
|
if (!refreshStartEventHasBeenReceived) {
|
|
107
106
|
if (pojo.eventType.value.toString() === RefreshStartEventType) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client_alarm_tools_acknowledge_all_conditions.js","sourceRoot":"","sources":["../../source/alarms_and_conditions/client_alarm_tools_acknowledge_all_conditions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAkD;AAClD,yEAAiE;AACjE,qEAA+F;AAE/F,mEAAiE;AACjE,2DAAuD;AACvD,uDAAgF;AAEhF,iDAA0D;AAC1D,2GAAqF;AACrF,iDAAsD;AAEtD,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAE3C;;;;;GAKG;AACH,SAAsB,oBAAoB,CAAC,OAAsB,EAAE,UAAsB,EAAE,OAAe;;
|
|
1
|
+
{"version":3,"file":"client_alarm_tools_acknowledge_all_conditions.js","sourceRoot":"","sources":["../../source/alarms_and_conditions/client_alarm_tools_acknowledge_all_conditions.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,11 +8,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.dumpEvent = void 0;
|
|
13
|
-
const
|
|
16
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
14
17
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
15
18
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
19
|
+
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
20
|
+
const warningLog = (0, node_opcua_debug_1.make_warningLog)("ClientAlarmTool");
|
|
16
21
|
/**
|
|
17
22
|
*
|
|
18
23
|
* @param session
|
|
@@ -46,12 +51,11 @@ function dumpEvent(session, fields, eventFields) {
|
|
|
46
51
|
}
|
|
47
52
|
if (variant.dataType === node_opcua_variant_1.DataType.NodeId) {
|
|
48
53
|
const name = yield getBrowseName(_session, variant.value);
|
|
49
|
-
|
|
50
|
-
console.log(chalk.yellow(w(name, 30), w(_fields[index], 25)), chalk.cyan(w(node_opcua_variant_1.DataType[variant.dataType], 10).toString()), chalk.cyan.bold(name), "(", w(variant.value, 20), ")");
|
|
54
|
+
warningLog(chalk_1.default.yellow(w(name, 30), w(_fields[index], 25)), chalk_1.default.cyan(w(node_opcua_variant_1.DataType[variant.dataType], 10).toString()), chalk_1.default.cyan.bold(name), "(", w(variant.value, 20), ")");
|
|
51
55
|
}
|
|
52
56
|
else {
|
|
53
57
|
// tslint:disable-next-line: no-console
|
|
54
|
-
|
|
58
|
+
warningLog(chalk_1.default.yellow(w("", 30), w(_fields[index], 25)), chalk_1.default.cyan(w(node_opcua_variant_1.DataType[variant.dataType], 10).toString()), variant.value);
|
|
55
59
|
}
|
|
56
60
|
});
|
|
57
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client_alarm_tools_dump_event.js","sourceRoot":"","sources":["../../source/alarms_and_conditions/client_alarm_tools_dump_event.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client_alarm_tools_dump_event.js","sourceRoot":"","sources":["../../source/alarms_and_conditions/client_alarm_tools_dump_event.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,32 @@
|
|
|
4
4
|
*/
|
|
5
5
|
// tslint:disable:no-empty
|
|
6
6
|
// tslint:disable: only-arrow-functions
|
|
7
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
8
|
+
if (k2 === undefined) k2 = k;
|
|
9
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
10
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
11
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
12
|
+
}
|
|
13
|
+
Object.defineProperty(o, k2, desc);
|
|
14
|
+
}) : (function(o, m, k, k2) {
|
|
15
|
+
if (k2 === undefined) k2 = k;
|
|
16
|
+
o[k2] = m[k];
|
|
17
|
+
}));
|
|
18
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
19
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
20
|
+
}) : function(o, v) {
|
|
21
|
+
o["default"] = v;
|
|
22
|
+
});
|
|
23
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
24
|
+
if (mod && mod.__esModule) return mod;
|
|
25
|
+
var result = {};
|
|
26
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
27
|
+
__setModuleDefault(result, mod);
|
|
28
|
+
return result;
|
|
29
|
+
};
|
|
7
30
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
31
|
exports.callConditionRefresh = void 0;
|
|
9
|
-
const async = require("async");
|
|
32
|
+
const async = __importStar(require("async"));
|
|
10
33
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
11
34
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
12
35
|
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client_tools.js","sourceRoot":"","sources":["../../source/alarms_and_conditions/client_tools.ts"],"names":[],"mappings":";AAAA;;GAEG;AACH,0BAA0B;AAC1B,uCAAuC
|
|
1
|
+
{"version":3,"file":"client_tools.js","sourceRoot":"","sources":["../../source/alarms_and_conditions/client_tools.ts"],"names":[],"mappings":"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"}
|
package/dist/client_base.js
CHANGED
|
@@ -9,7 +9,7 @@ class OPCUAClientBase {
|
|
|
9
9
|
throw new Error("Not Implemented");
|
|
10
10
|
}
|
|
11
11
|
}
|
|
12
|
+
exports.OPCUAClientBase = OPCUAClientBase;
|
|
12
13
|
OPCUAClientBase.registry = new node_opcua_object_registry_1.ObjectRegistry();
|
|
13
14
|
OPCUAClientBase.retryDelay = 1000 * 5;
|
|
14
|
-
exports.OPCUAClientBase = OPCUAClientBase;
|
|
15
15
|
//# sourceMappingURL=client_base.js.map
|
package/dist/client_base.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client_base.js","sourceRoot":"","sources":["../source/client_base.ts"],"names":[],"mappings":";;;AASA,2EAA4D;AAsU5D,MAAa,eAAe;IAIjB,MAAM,CAAC,MAAM,CAAC,OAA+B;QAChD,yBAAyB;QACzB,OAAO,CAAC;QACR,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;;
|
|
1
|
+
{"version":3,"file":"client_base.js","sourceRoot":"","sources":["../source/client_base.ts"],"names":[],"mappings":";;;AASA,2EAA4D;AAsU5D,MAAa,eAAe;IAIjB,MAAM,CAAC,MAAM,CAAC,OAA+B;QAChD,yBAAyB;QACzB,OAAO,CAAC;QACR,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;;AARL,0CASC;AARiB,wBAAQ,GAAG,IAAI,2CAAc,EAAE,CAAC;AAChC,0BAAU,GAAG,IAAI,GAAG,CAAC,CAAC"}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.ClientMonitoredItemToolbox = void 0;
|
|
4
7
|
/**
|
|
5
8
|
* @module node-opcua-client
|
|
6
9
|
*/
|
|
7
|
-
const
|
|
10
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
8
11
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
9
12
|
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
10
13
|
const node_opcua_service_subscription_1 = require("node-opcua-service-subscription");
|
|
@@ -39,7 +42,7 @@ class ClientMonitoredItemToolbox {
|
|
|
39
42
|
session.createMonitoredItems(createMonitorItemsRequest, (err, response) => {
|
|
40
43
|
/* istanbul ignore next */
|
|
41
44
|
if (err) {
|
|
42
|
-
debugLog(
|
|
45
|
+
debugLog(chalk_1.default.red("ClientMonitoredItemBase#_toolbox_monitor: ERROR in createMonitoredItems ", err.message));
|
|
43
46
|
}
|
|
44
47
|
else {
|
|
45
48
|
/* istanbul ignore next */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client_monitored_item_toolbox.js","sourceRoot":"","sources":["../source/client_monitored_item_toolbox.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client_monitored_item_toolbox.js","sourceRoot":"","sources":["../source/client_monitored_item_toolbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,13 +8,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.ClientSessionKeepAliveManager = void 0;
|
|
13
16
|
/**
|
|
14
17
|
* @module node-opcua-client
|
|
15
18
|
*/
|
|
16
19
|
const events_1 = require("events");
|
|
17
|
-
const
|
|
20
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
18
21
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
19
22
|
const node_opcua_common_1 = require("node-opcua-common");
|
|
20
23
|
const node_opcua_constants_1 = require("node-opcua-constants");
|
|
@@ -99,7 +102,6 @@ class ClientSessionKeepAliveManager extends events_1.EventEmitter {
|
|
|
99
102
|
if (timeSinceLastServerContact < this.pingTimeout) {
|
|
100
103
|
debugLog("ClientSessionKeepAliveManager#ping_server skipped because last communication with server was not that long ago ping timeout=", Math.round(this.pingTimeout), "timeSinceLastServerContact = ", timeSinceLastServerContact);
|
|
101
104
|
// no need to send a ping yet
|
|
102
|
-
// console.log("Skipping ",timeSinceLastServerContact,this.session.timeout);
|
|
103
105
|
return timeSinceLastServerContact - this.pingTimeout;
|
|
104
106
|
}
|
|
105
107
|
if (session.isReconnecting) {
|
|
@@ -125,7 +127,7 @@ class ClientSessionKeepAliveManager extends events_1.EventEmitter {
|
|
|
125
127
|
this.transactionInProgress = false;
|
|
126
128
|
if (err || !dataValue || !dataValue.value) {
|
|
127
129
|
if (err) {
|
|
128
|
-
warningLog(
|
|
130
|
+
warningLog(chalk_1.default.cyan(" warning : ClientSessionKeepAliveManager#ping_server "), chalk_1.default.yellow(err.message));
|
|
129
131
|
}
|
|
130
132
|
/**
|
|
131
133
|
* @event failure
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client_session_keepalive_manager.js","sourceRoot":"","sources":["../source/client_session_keepalive_manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client_session_keepalive_manager.js","sourceRoot":"","sources":["../source/client_session_keepalive_manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,6 @@ class ClientSubscription {
|
|
|
10
10
|
throw new Error("Not Implemented");
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
|
-
ClientSubscription.ignoreNextWarning = false;
|
|
14
13
|
exports.ClientSubscription = ClientSubscription;
|
|
14
|
+
ClientSubscription.ignoreNextWarning = false;
|
|
15
15
|
//# sourceMappingURL=client_subscription.js.map
|
|
@@ -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;;
|
|
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"}
|
package/dist/index.js
CHANGED
|
@@ -13,9 +13,21 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
|
|
|
13
13
|
if (k2 === undefined) k2 = k;
|
|
14
14
|
o[k2] = m[k];
|
|
15
15
|
}));
|
|
16
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
17
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
18
|
+
}) : function(o, v) {
|
|
19
|
+
o["default"] = v;
|
|
20
|
+
});
|
|
16
21
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
17
22
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
18
23
|
};
|
|
24
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
25
|
+
if (mod && mod.__esModule) return mod;
|
|
26
|
+
var result = {};
|
|
27
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
28
|
+
__setModuleDefault(result, mod);
|
|
29
|
+
return result;
|
|
30
|
+
};
|
|
19
31
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
32
|
exports.readNamespaceArray = exports.browseAll = exports.makeApplicationUrn = exports.StatusCodes = exports.StatusCode = exports.coerceExpandedNodeId = exports.makeExpandedNodeId = exports.ExpandedNodeId = exports.sameNodeId = exports.coerceNodeId = exports.makeNodeId = exports.resolveNodeId = exports.NodeId = exports.hexDump = exports.crypto_utils = exports.utils = exports.ClientSecureChannelLayer = exports.SecurityPolicy = exports.ServiceCounterDataType = exports.ServerState = exports.ClientSidePublishEngine = exports.assert = void 0;
|
|
21
33
|
__exportStar(require("./client_base"), exports);
|
|
@@ -48,9 +60,9 @@ Object.defineProperty(exports, "ServiceCounterDataType", { enumerable: true, get
|
|
|
48
60
|
var node_opcua_secure_channel_1 = require("node-opcua-secure-channel");
|
|
49
61
|
Object.defineProperty(exports, "SecurityPolicy", { enumerable: true, get: function () { return node_opcua_secure_channel_1.SecurityPolicy; } });
|
|
50
62
|
Object.defineProperty(exports, "ClientSecureChannelLayer", { enumerable: true, get: function () { return node_opcua_secure_channel_1.ClientSecureChannelLayer; } });
|
|
51
|
-
const utils1 = require("node-opcua-utils");
|
|
63
|
+
const utils1 = __importStar(require("node-opcua-utils"));
|
|
52
64
|
exports.utils = utils1;
|
|
53
|
-
const crypto_util1 = require("node-opcua-crypto");
|
|
65
|
+
const crypto_util1 = __importStar(require("node-opcua-crypto"));
|
|
54
66
|
exports.crypto_utils = crypto_util1;
|
|
55
67
|
var node_opcua_debug_1 = require("node-opcua-debug");
|
|
56
68
|
Object.defineProperty(exports, "hexDump", { enumerable: true, get: function () { return node_opcua_debug_1.hexDump; } });
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";AAAA;;GAEG
|
|
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,qDAA2C;AAAlC,2GAAA,OAAO,OAAA;AAEhB,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,uEAAyF;AAAjE,sHAAA,SAAS,OAAA;AAAE,+HAAA,kBAAkB,OAAA;AACrD,6EAA2D"}
|
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
26
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
27
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -8,16 +31,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
31
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
32
|
});
|
|
10
33
|
};
|
|
34
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
|
+
};
|
|
11
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
38
|
exports.ClientBaseImpl = void 0;
|
|
13
39
|
/**
|
|
14
40
|
* @module node-opcua-client-private
|
|
15
41
|
*/
|
|
16
42
|
// tslint:disable:no-unused-expression
|
|
17
|
-
const fs = require("fs");
|
|
18
|
-
const path = require("path");
|
|
19
|
-
const async = require("async");
|
|
20
|
-
const
|
|
43
|
+
const fs = __importStar(require("fs"));
|
|
44
|
+
const path = __importStar(require("path"));
|
|
45
|
+
const async = __importStar(require("async"));
|
|
46
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
21
47
|
const global_mutex_1 = require("@ster5/global-mutex");
|
|
22
48
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
23
49
|
const node_opcua_common_1 = require("node-opcua-common");
|
|
@@ -140,7 +166,7 @@ function __findEndpoint(endpointUrl, params, _callback) {
|
|
|
140
166
|
}
|
|
141
167
|
// istanbul ignore next
|
|
142
168
|
if (doDebug) {
|
|
143
|
-
debugLog(
|
|
169
|
+
debugLog(chalk_1.default.bgWhite.red("xxxxxxxxxxxxxxxxxxxxx => selected EndPoint = "), selectedEndpoint.toString());
|
|
144
170
|
}
|
|
145
171
|
const result = {
|
|
146
172
|
endpoints: allEndpoints,
|
|
@@ -253,13 +279,13 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
|
|
|
253
279
|
_setInternalState(internalState) {
|
|
254
280
|
const previousState = this._internalState;
|
|
255
281
|
if (doDebug || traceInternalState) {
|
|
256
|
-
(traceInternalState ? warningLog : debugLog)(
|
|
282
|
+
(traceInternalState ? warningLog : debugLog)(chalk_1.default.cyan(` Client ${this._instanceNumber} ${this.clientName} : _internalState from `), chalk_1.default.yellow(previousState), "to", chalk_1.default.yellow(internalState));
|
|
257
283
|
}
|
|
258
284
|
this._internalState = internalState;
|
|
259
285
|
}
|
|
260
286
|
emit(eventName, ...others) {
|
|
261
287
|
if (doDebug) {
|
|
262
|
-
debugLog(
|
|
288
|
+
debugLog(chalk_1.default.cyan(` Client ${this._instanceNumber} ${this.clientName} emitting `), chalk_1.default.magentaBright(eventName));
|
|
263
289
|
}
|
|
264
290
|
return super.emit(eventName, ...others);
|
|
265
291
|
}
|
|
@@ -375,7 +401,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
|
|
|
375
401
|
this.emit("after_reconnection", null); // send after callback
|
|
376
402
|
(0, node_opcua_assert_1.assert)(this._secureChannel, "expecting a secureChannel here ");
|
|
377
403
|
// a new channel has be created and a new connection is established
|
|
378
|
-
debugLog(
|
|
404
|
+
debugLog(chalk_1.default.bgWhite.red("ClientBaseImpl: RECONNECTED !!!"));
|
|
379
405
|
this._setInternalState("reconnecting_newchannel_connected");
|
|
380
406
|
return callback();
|
|
381
407
|
};
|
|
@@ -545,8 +571,12 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
|
|
|
545
571
|
}
|
|
546
572
|
this._inCreateDefaultCertificate = true;
|
|
547
573
|
if (!fs.existsSync(this.certificateFile)) {
|
|
548
|
-
|
|
549
|
-
|
|
574
|
+
yield (0, global_mutex_1.withLock)({ fileToLock: this.certificateFile + ".mutex" }, () => __awaiter(this, void 0, void 0, function* () {
|
|
575
|
+
if (fs.existsSync(this.certificateFile)) {
|
|
576
|
+
// the file may have been created in between
|
|
577
|
+
return;
|
|
578
|
+
}
|
|
579
|
+
warningLog("Creating default certificate ... please wait");
|
|
550
580
|
if (this.disconnecting)
|
|
551
581
|
return;
|
|
552
582
|
yield ClientBaseImpl.createCertificate(this.clientCertificateManager, this.certificateFile, this.applicationName, this._getBuiltApplicationUri());
|
|
@@ -584,23 +614,20 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
|
|
|
584
614
|
}
|
|
585
615
|
if (this.disconnecting)
|
|
586
616
|
return;
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
if (this.disconnecting)
|
|
590
|
-
return;
|
|
591
|
-
yield verify_1.performCertificateSanityCheck.call(this, "client", this.clientCertificateManager, this._getBuiltApplicationUri());
|
|
617
|
+
yield this.clientCertificateManager.withLock2(() => __awaiter(this, void 0, void 0, function* () {
|
|
618
|
+
yield (0, verify_1.performCertificateSanityCheck)(this, "client", this.clientCertificateManager, this._getBuiltApplicationUri());
|
|
592
619
|
}));
|
|
593
620
|
});
|
|
594
621
|
}
|
|
595
622
|
_handleUnrecoverableConnectionFailure(err, callback) {
|
|
596
623
|
debugLog(err.message);
|
|
597
|
-
this.emit("connection_failed");
|
|
624
|
+
this.emit("connection_failed", err);
|
|
598
625
|
this._setInternalState("disconnected");
|
|
599
626
|
return callback(err);
|
|
600
627
|
}
|
|
601
628
|
_handleDisconnectionWhileConnecting(err, callback) {
|
|
602
629
|
debugLog(err.message);
|
|
603
|
-
this.emit("connection_failed");
|
|
630
|
+
this.emit("connection_failed", err);
|
|
604
631
|
this._setInternalState("disconnected");
|
|
605
632
|
return callback(err);
|
|
606
633
|
}
|
|
@@ -686,14 +713,14 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
|
|
|
686
713
|
this._clockAdjuster.dispose();
|
|
687
714
|
this._clockAdjuster = undefined;
|
|
688
715
|
}
|
|
689
|
-
debugLog(
|
|
716
|
+
debugLog(chalk_1.default.red("SecureChannel creation has failed with error :", err.message));
|
|
690
717
|
if (err.message.match(/ECONNABORTED/)) {
|
|
691
|
-
debugLog(
|
|
718
|
+
debugLog(chalk_1.default.yellow("- The client cannot to :" + endpointUrl + ". Connection has been aborted."));
|
|
692
719
|
err = new Error("The connection has been aborted");
|
|
693
720
|
this._handleUnrecoverableConnectionFailure(err, callback);
|
|
694
721
|
}
|
|
695
722
|
else if (err.message.match(/ECONNREF/)) {
|
|
696
|
-
debugLog(
|
|
723
|
+
debugLog(chalk_1.default.yellow("- The client cannot to :" + endpointUrl + ". Server is not reachable."));
|
|
697
724
|
err = new Error("The connection cannot be established with server " +
|
|
698
725
|
endpointUrl +
|
|
699
726
|
" .\n" +
|
|
@@ -878,7 +905,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
|
|
|
878
905
|
if (!this._secureChannel.isValid()) {
|
|
879
906
|
return callback(null);
|
|
880
907
|
}
|
|
881
|
-
debugLog(
|
|
908
|
+
debugLog(chalk_1.default.bgWhite.green("_closeSession ") + this._secureChannel.channelId);
|
|
882
909
|
if (this.isReconnecting) {
|
|
883
910
|
errorLog("OPCUAClientImpl#_closeSession called while reconnection in progress ! What shall we do");
|
|
884
911
|
return callback(null);
|
|
@@ -987,13 +1014,13 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
|
|
|
987
1014
|
tmpChannel = null;
|
|
988
1015
|
this._destroy_secure_channel();
|
|
989
1016
|
this._setInternalState("disconnected");
|
|
990
|
-
|
|
1017
|
+
callback();
|
|
991
1018
|
});
|
|
992
1019
|
}
|
|
993
1020
|
else {
|
|
994
1021
|
this._setInternalState("disconnected");
|
|
995
1022
|
// this.emit("close", null);
|
|
996
|
-
|
|
1023
|
+
callback();
|
|
997
1024
|
}
|
|
998
1025
|
}
|
|
999
1026
|
// override me !
|
|
@@ -1099,9 +1126,21 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
|
|
|
1099
1126
|
_verify_serverCertificate(this.clientCertificateManager, endpoint.serverCertificate, (err1) => {
|
|
1100
1127
|
if (err1) {
|
|
1101
1128
|
warningLog("[NODE-OPCUA-W25] client's server certificate verification has failed ", err1.message);
|
|
1102
|
-
warningLog(" ", this.clientCertificateManager.rootDir);
|
|
1103
|
-
|
|
1104
|
-
|
|
1129
|
+
warningLog(" clientCertificateManager.rootDir = ", this.clientCertificateManager.rootDir);
|
|
1130
|
+
const f = (b) => " " + b.toString("base64").replace(/(.{80})/g, "$1\n ");
|
|
1131
|
+
const chain = (0, node_opcua_crypto_1.split_der)(endpoint.serverCertificate);
|
|
1132
|
+
warningLog(` server certificate contains ${chain.length} elements`);
|
|
1133
|
+
for (let i = 0; i < chain.length; i++) {
|
|
1134
|
+
const c = chain[i];
|
|
1135
|
+
warningLog("certificate", i, "\n" + f(c));
|
|
1136
|
+
}
|
|
1137
|
+
if (chain.length > 1) {
|
|
1138
|
+
warningLog(" verify also that the issuer certificate is trusted and the issuer's certificate is present in the issuer.cert folder\n" +
|
|
1139
|
+
" of the client certificate manager located in ", this.clientCertificateManager.rootDir);
|
|
1140
|
+
}
|
|
1141
|
+
else {
|
|
1142
|
+
warningLog(" verify that the server certificate is trusted or that server certificate issuer's certificate is present in the issuer folder");
|
|
1143
|
+
}
|
|
1105
1144
|
return callback(err1);
|
|
1106
1145
|
}
|
|
1107
1146
|
this.serverCertificate = endpoint.serverCertificate;
|
|
@@ -1118,10 +1157,10 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
|
|
|
1118
1157
|
this._timedOutRequestCount += this._secureChannel.timedOutRequestCount;
|
|
1119
1158
|
if (doDebug) {
|
|
1120
1159
|
const h = `Client ${this._instanceNumber} ${this.clientName}`;
|
|
1121
|
-
debugLog(
|
|
1122
|
-
debugLog(
|
|
1123
|
-
debugLog(
|
|
1124
|
-
debugLog(
|
|
1160
|
+
debugLog(chalk_1.default.cyan(`${h} byteWritten = `), this._byteWritten);
|
|
1161
|
+
debugLog(chalk_1.default.cyan(`${h} byteRead = `), this._byteRead);
|
|
1162
|
+
debugLog(chalk_1.default.cyan(`${h} transactions = `), this._transactionsPerformed);
|
|
1163
|
+
debugLog(chalk_1.default.cyan(`${h} timedOutRequestCount = `), this._timedOutRequestCount);
|
|
1125
1164
|
}
|
|
1126
1165
|
}
|
|
1127
1166
|
}
|
|
@@ -1216,7 +1255,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
|
|
|
1216
1255
|
if (err) {
|
|
1217
1256
|
this._setInternalState("panic");
|
|
1218
1257
|
}
|
|
1219
|
-
debugLog(
|
|
1258
|
+
debugLog(chalk_1.default.yellow.bold(" ClientBaseImpl emitting close"), err === null || err === void 0 ? void 0 : err.message);
|
|
1220
1259
|
this._destroy_secure_channel();
|
|
1221
1260
|
if (!err || !this.reconnectOnFailure) {
|
|
1222
1261
|
// this is a normal close operation initiated by us
|