node-opcua-client 2.59.0 → 2.62.1
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/opcua_client.d.ts +4 -0
- package/dist/opcua_client.js +14 -0
- package/dist/opcua_client.js.map +1 -1
- package/dist/private/client_base_impl.js +19 -5
- package/dist/private/client_base_impl.js.map +1 -1
- package/dist/private/client_publish_engine.js +14 -5
- package/dist/private/client_publish_engine.js.map +1 -1
- package/dist/private/client_session_impl.js +1 -3
- package/dist/private/client_session_impl.js.map +1 -1
- package/dist/private/opcua_client_impl.d.ts +33 -0
- package/dist/private/opcua_client_impl.js +85 -10
- package/dist/private/opcua_client_impl.js.map +1 -1
- package/dist/reconnection.js +31 -15
- package/dist/reconnection.js.map +1 -1
- package/dist/tools/read_history_server_capabilities.js +1 -1
- package/dist/tools/read_history_server_capabilities.js.map +1 -1
- package/package.json +40 -40
- package/source/opcua_client.ts +13 -0
- package/source/private/client_base_impl.ts +19 -5
- package/source/private/client_publish_engine.ts +13 -6
- package/source/private/client_session_impl.ts +2 -4
- package/source/private/opcua_client_impl.ts +103 -11
- package/source/reconnection.ts +35 -17
- package/source/tools/read_history_server_capabilities.ts +1 -1
package/dist/reconnection.js
CHANGED
|
@@ -122,6 +122,30 @@ function _ask_for_subscription_republish(session, callback) {
|
|
|
122
122
|
callback(err);
|
|
123
123
|
});
|
|
124
124
|
}
|
|
125
|
+
function create_session_and_repeat_if_failed(client, session, callback) {
|
|
126
|
+
if (session.hasBeenClosed()) {
|
|
127
|
+
return callback(new Error("Cannot complete subscription republish due to session termination"));
|
|
128
|
+
}
|
|
129
|
+
debugLog(chalk.bgWhite.red(" => creating a new session ...."));
|
|
130
|
+
// create new session, based on old session,
|
|
131
|
+
// so we can reuse subscriptions data
|
|
132
|
+
client.__createSession_step2(session, (err, session1) => {
|
|
133
|
+
debugLog(chalk.bgWhite.cyan(" => creating a new session (based on old session data).... Done"));
|
|
134
|
+
if (!err && session1) {
|
|
135
|
+
const newSession = session1;
|
|
136
|
+
(0, node_opcua_assert_1.assert)(session === session1, "session should have been recycled");
|
|
137
|
+
callback(err, newSession);
|
|
138
|
+
return;
|
|
139
|
+
}
|
|
140
|
+
else {
|
|
141
|
+
setTimeout(() => {
|
|
142
|
+
create_session_and_repeat_if_failed(client, session, callback);
|
|
143
|
+
}, 1000);
|
|
144
|
+
return;
|
|
145
|
+
}
|
|
146
|
+
callback(err);
|
|
147
|
+
});
|
|
148
|
+
}
|
|
125
149
|
function repair_client_session_by_recreating_a_new_session(client, session, callback) {
|
|
126
150
|
if (doDebug) {
|
|
127
151
|
debugLog(" repairing client session by_recreating a new session for old session ", session.sessionId.toString());
|
|
@@ -143,19 +167,11 @@ function repair_client_session_by_recreating_a_new_session(client, session, call
|
|
|
143
167
|
innerCallback();
|
|
144
168
|
},
|
|
145
169
|
function create_new_session(innerCallback) {
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
debugLog(chalk.bgWhite.red(" => creating a new session ...."));
|
|
150
|
-
// create new session, based on old session,
|
|
151
|
-
// so we can reuse subscriptions data
|
|
152
|
-
client.__createSession_step2(session, (err, session1) => {
|
|
153
|
-
debugLog(chalk.bgWhite.cyan(" => creating a new session (based on old session data).... Done"));
|
|
154
|
-
if (!err && session1) {
|
|
155
|
-
newSession = session1;
|
|
156
|
-
(0, node_opcua_assert_1.assert)(session === session1, "session should have been recycled");
|
|
170
|
+
create_session_and_repeat_if_failed(client, session, (err, _newSession) => {
|
|
171
|
+
if (_newSession) {
|
|
172
|
+
newSession = _newSession;
|
|
157
173
|
}
|
|
158
|
-
innerCallback(err
|
|
174
|
+
innerCallback(err || undefined);
|
|
159
175
|
});
|
|
160
176
|
},
|
|
161
177
|
function activate_new_session(innerCallback) {
|
|
@@ -316,8 +332,8 @@ function repair_client_session(client, session, callback) {
|
|
|
316
332
|
_repair_client_session(client, session, (err) => {
|
|
317
333
|
privateSession._reconnecting.reconnecting = false;
|
|
318
334
|
if (err) {
|
|
319
|
-
|
|
320
|
-
|
|
335
|
+
errorLog(chalk.red("SESSION RESTORED HAS FAILED! retrying"), err.message, session.sessionId.toString());
|
|
336
|
+
return _repair_client_session(client, session, callback);
|
|
321
337
|
}
|
|
322
338
|
debugLog(chalk.yellow("SESSION RESTORED"), session.sessionId.toString());
|
|
323
339
|
session.emit("session_restored");
|
|
@@ -339,7 +355,7 @@ function repair_client_sessions(client, callback) {
|
|
|
339
355
|
async.map(sessions, (session, next) => {
|
|
340
356
|
repair_client_session(client, session, next);
|
|
341
357
|
}, (err) => {
|
|
342
|
-
|
|
358
|
+
err && errorLog("sessions reactivation completed: err ", err ? err.message : "null");
|
|
343
359
|
return callback(err);
|
|
344
360
|
});
|
|
345
361
|
}
|
package/dist/reconnection.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconnection.js","sourceRoot":"","sources":["../source/reconnection.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"reconnection.js","sourceRoot":"","sources":["../source/reconnection.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,7 +69,7 @@ function readHistoryServerCapabilities(session, callback) {
|
|
|
69
69
|
}
|
|
70
70
|
const nodeIds = results.map((innerResult) => innerResult.statusCode === node_opcua_status_code_1.StatusCodes.Good && innerResult.targets
|
|
71
71
|
? innerResult.targets[0].targetId
|
|
72
|
-
: node_opcua_nodeid_1.NodeId
|
|
72
|
+
: new node_opcua_nodeid_1.NodeId());
|
|
73
73
|
const nodesToRead = nodeIds.map((nodeId) => ({
|
|
74
74
|
attributeId: node_opcua_data_model_1.AttributeIds.Value,
|
|
75
75
|
nodeId /*: coerceNodeId(nodeId)*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read_history_server_capabilities.js","sourceRoot":"","sources":["../../source/tools/read_history_server_capabilities.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,yDAA2C;AAC3C,+DAAiD;AACjD,iEAAqD;AAErD,yDAA2C;AAE3C,uGAAwG;AACxG,mEAAqD;AACrD,uDAAoD;AAcpD,SAAgB,6BAA6B,CACzC,OAAsB,EACtB,QAAgF;IAEhF,IAAI,CAAC,QAAQ,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;KACrC;IACD,wCAAwC;IACxC,MAAM,UAAU,GAAe,IAAA,yDAAc,EAAC,gCAAS,CAAC,aAAa,EAAE,sDAAsD,CAAC,CAAC;IAE/H,OAAO,CAAC,mBAAmB,CAAC,UAAU,EAAE,CAAC,GAAiB,EAAE,MAAyB,EAAE,EAAE;QACrF,IAAI,GAAG,EAAE;YACL,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;SACxB;QACD,0BAA0B;QAC1B,IAAI,CAAC,MAAM,EAAE;YACT,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;SAChD;QACD,IAAI,MAAM,CAAC,UAAU,KAAK,oCAAW,CAAC,IAAI,EAAE;YACxC,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;SAC9E;QAED,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;QAEtC,MAAM,+BAA+B,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QACnE,2BAA2B;QAC3B,IAAA,0BAAM,EAAC,+BAA+B,CAAC,QAAQ,EAAE,KAAK,cAAc,CAAC,CAAC;QAEtE,4BAA4B;QAC5B,MAAM,UAAU,GAAG;YACf,6BAA6B;YAC7B,+BAA+B;YAC/B,wBAAwB;YACxB,qBAAqB;YACrB,uBAAuB;YACvB,4BAA4B;YAC5B,sBAAsB;YACtB,uBAAuB;YACvB,uBAAuB;YACvB,wBAAwB;YACxB,sBAAsB;YACtB,uBAAuB;YACvB,qBAAqB;YACrB,sBAAsB;YACtB,oCAAoC;YACpC,4BAA4B;YAC5B,0BAA0B;YAC1B,0BAA0B;YAC1B,gCAAgC;YAChC,gCAAgC;YAChC,iCAAiC;YACjC,yCAAyC;YACzC,UAAU;SACb,CAAC;QACF,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAA,yDAAc,EAAC,+BAA+B,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC;QAElH,OAAO,CAAC,mBAAmB,CAAC,WAAW,EAAE,CAAC,QAAsB,EAAE,OAA4B,EAAE,EAAE;YAC9F,IAAI,QAAQ,EAAE;gBACV,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAC;aAC7B;YACD,0BAA0B;YAC1B,IAAI,CAAC,OAAO,EAAE;gBACV,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;aAChD;YAED,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,WAA6B,EAAE,EAAE,CAC1D,WAAW,CAAC,UAAU,KAAK,oCAAW,CAAC,IAAI,IAAI,WAAW,CAAC,OAAO;gBAC9D,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ;gBACjC,CAAC,CAAC,0BAAM,
|
|
1
|
+
{"version":3,"file":"read_history_server_capabilities.js","sourceRoot":"","sources":["../../source/tools/read_history_server_capabilities.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-client",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.62.1",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module -client",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"clean": "node -e \"require('rimraf').sync('certificates');\" && node -e \"require('rimraf').sync('dist');\"",
|
|
@@ -14,64 +14,64 @@
|
|
|
14
14
|
"types": "./dist/index.d.ts",
|
|
15
15
|
"dependencies": {
|
|
16
16
|
"@ster5/global-mutex": "^1.1.1",
|
|
17
|
-
"@types/async": "^3.2.
|
|
17
|
+
"@types/async": "^3.2.10",
|
|
18
18
|
"@types/once": "^1.4.0",
|
|
19
19
|
"@types/underscore": "^1.11.3",
|
|
20
|
-
"async": "^3.2.
|
|
20
|
+
"async": "^3.2.2",
|
|
21
21
|
"callbackify": "^1.1.0",
|
|
22
22
|
"chalk": "4.1.2",
|
|
23
23
|
"delayed": "^2.0.0",
|
|
24
24
|
"node-opcua-assert": "2.55.0",
|
|
25
|
-
"node-opcua-basic-types": "2.
|
|
25
|
+
"node-opcua-basic-types": "2.61.0",
|
|
26
26
|
"node-opcua-buffer-utils": "2.55.0",
|
|
27
|
-
"node-opcua-certificate-manager": "2.
|
|
28
|
-
"node-opcua-client-dynamic-extension-object": "2.
|
|
29
|
-
"node-opcua-common": "2.
|
|
27
|
+
"node-opcua-certificate-manager": "2.61.0",
|
|
28
|
+
"node-opcua-client-dynamic-extension-object": "2.62.0",
|
|
29
|
+
"node-opcua-common": "2.62.0",
|
|
30
30
|
"node-opcua-constants": "2.52.0",
|
|
31
31
|
"node-opcua-crypto": "^1.7.4",
|
|
32
|
-
"node-opcua-data-model": "2.
|
|
33
|
-
"node-opcua-data-value": "2.
|
|
34
|
-
"node-opcua-date-time": "2.
|
|
35
|
-
"node-opcua-debug": "2.
|
|
36
|
-
"node-opcua-extension-object": "2.
|
|
32
|
+
"node-opcua-data-model": "2.61.0",
|
|
33
|
+
"node-opcua-data-value": "2.62.0",
|
|
34
|
+
"node-opcua-date-time": "2.61.0",
|
|
35
|
+
"node-opcua-debug": "2.61.0",
|
|
36
|
+
"node-opcua-extension-object": "2.61.0",
|
|
37
37
|
"node-opcua-hostname": "2.55.0",
|
|
38
|
-
"node-opcua-nodeid": "2.
|
|
39
|
-
"node-opcua-object-registry": "2.
|
|
40
|
-
"node-opcua-pki": "^2.12.
|
|
41
|
-
"node-opcua-pseudo-session": "2.
|
|
42
|
-
"node-opcua-schemas": "2.
|
|
43
|
-
"node-opcua-secure-channel": "2.
|
|
44
|
-
"node-opcua-service-browse": "2.
|
|
45
|
-
"node-opcua-service-call": "2.
|
|
46
|
-
"node-opcua-service-discovery": "2.
|
|
47
|
-
"node-opcua-service-endpoints": "2.
|
|
48
|
-
"node-opcua-service-filter": "2.
|
|
49
|
-
"node-opcua-service-history": "2.
|
|
50
|
-
"node-opcua-service-query": "2.
|
|
51
|
-
"node-opcua-service-read": "2.
|
|
52
|
-
"node-opcua-service-register-node": "2.
|
|
53
|
-
"node-opcua-service-secure-channel": "2.
|
|
54
|
-
"node-opcua-service-session": "2.
|
|
55
|
-
"node-opcua-service-subscription": "2.
|
|
56
|
-
"node-opcua-service-translate-browse-path": "2.
|
|
57
|
-
"node-opcua-service-write": "2.
|
|
38
|
+
"node-opcua-nodeid": "2.61.0",
|
|
39
|
+
"node-opcua-object-registry": "2.61.0",
|
|
40
|
+
"node-opcua-pki": "^2.12.1",
|
|
41
|
+
"node-opcua-pseudo-session": "2.62.0",
|
|
42
|
+
"node-opcua-schemas": "2.62.0",
|
|
43
|
+
"node-opcua-secure-channel": "2.62.0",
|
|
44
|
+
"node-opcua-service-browse": "2.62.0",
|
|
45
|
+
"node-opcua-service-call": "2.62.0",
|
|
46
|
+
"node-opcua-service-discovery": "2.62.0",
|
|
47
|
+
"node-opcua-service-endpoints": "2.62.0",
|
|
48
|
+
"node-opcua-service-filter": "2.62.0",
|
|
49
|
+
"node-opcua-service-history": "2.62.0",
|
|
50
|
+
"node-opcua-service-query": "2.62.0",
|
|
51
|
+
"node-opcua-service-read": "2.62.0",
|
|
52
|
+
"node-opcua-service-register-node": "2.62.0",
|
|
53
|
+
"node-opcua-service-secure-channel": "2.62.0",
|
|
54
|
+
"node-opcua-service-session": "2.62.0",
|
|
55
|
+
"node-opcua-service-subscription": "2.62.0",
|
|
56
|
+
"node-opcua-service-translate-browse-path": "2.62.0",
|
|
57
|
+
"node-opcua-service-write": "2.62.0",
|
|
58
58
|
"node-opcua-status-code": "2.56.0",
|
|
59
|
-
"node-opcua-types": "2.
|
|
60
|
-
"node-opcua-utils": "2.
|
|
61
|
-
"node-opcua-variant": "2.
|
|
59
|
+
"node-opcua-types": "2.62.0",
|
|
60
|
+
"node-opcua-utils": "2.60.0",
|
|
61
|
+
"node-opcua-variant": "2.62.0",
|
|
62
62
|
"once": "^1.4.0",
|
|
63
63
|
"thenify": "^3.3.1",
|
|
64
64
|
"underscore": "^1.13.1"
|
|
65
65
|
},
|
|
66
66
|
"devDependencies": {
|
|
67
67
|
"dequeue": "^1.0.5",
|
|
68
|
-
"node-opcua-address-space": "2.
|
|
68
|
+
"node-opcua-address-space": "2.62.1",
|
|
69
69
|
"node-opcua-binary-stream": "2.55.0",
|
|
70
|
-
"node-opcua-factory": "2.
|
|
71
|
-
"node-opcua-leak-detector": "2.
|
|
70
|
+
"node-opcua-factory": "2.61.0",
|
|
71
|
+
"node-opcua-leak-detector": "2.61.0",
|
|
72
72
|
"node-opcua-nodesets": "2.57.0",
|
|
73
73
|
"should": "^13.2.3",
|
|
74
|
-
"sinon": "^
|
|
74
|
+
"sinon": "^12.0.1"
|
|
75
75
|
},
|
|
76
76
|
"eslintConfig": {
|
|
77
77
|
"env": {
|
|
@@ -93,5 +93,5 @@
|
|
|
93
93
|
"internet of things"
|
|
94
94
|
],
|
|
95
95
|
"homepage": "http://node-opcua.github.io/",
|
|
96
|
-
"gitHead": "
|
|
96
|
+
"gitHead": "2c2e9bd471f14c303fc617415f39a8b7c82ad55a"
|
|
97
97
|
}
|
package/source/opcua_client.ts
CHANGED
|
@@ -132,6 +132,12 @@ export interface OPCUAClient extends OPCUAClientBase {
|
|
|
132
132
|
|
|
133
133
|
createSession(callback: (err: Error | null, session?: ClientSession) => void): void;
|
|
134
134
|
|
|
135
|
+
createSession2(userIdentityInfo?: UserIdentityInfo): Promise<ClientSession>;
|
|
136
|
+
|
|
137
|
+
createSession2(userIdentityInfo: UserIdentityInfo, callback: (err: Error | null, session?: ClientSession) => void): void;
|
|
138
|
+
|
|
139
|
+
createSession2(callback: (err: Error | null, session?: ClientSession) => void): void;
|
|
140
|
+
|
|
135
141
|
changeSessionIdentity(session: ClientSession, userIdentityInfo: UserIdentityInfo): Promise<void>;
|
|
136
142
|
|
|
137
143
|
changeSessionIdentity(session: ClientSession, userIdentityInfo: UserIdentityInfo, callback: (err?: Error) => void): void;
|
|
@@ -174,6 +180,13 @@ export class OPCUAClient {
|
|
|
174
180
|
public static create(options: OPCUAClientOptions): OPCUAClient {
|
|
175
181
|
return new OPCUAClientImpl(options);
|
|
176
182
|
}
|
|
183
|
+
public static async createSession(
|
|
184
|
+
endpointUrl: string,
|
|
185
|
+
userIdentity?: UserIdentityInfo,
|
|
186
|
+
clientOptions?: OPCUAClientOptions
|
|
187
|
+
): Promise<ClientSession> {
|
|
188
|
+
return OPCUAClientImpl.createSession(endpointUrl, userIdentity, clientOptions);
|
|
189
|
+
}
|
|
177
190
|
public static set minimumRevisedSessionTimeout(minimumRevisedSessionTimeout: number) {
|
|
178
191
|
OPCUAClientImpl.minimumRevisedSessionTimeout = minimumRevisedSessionTimeout;
|
|
179
192
|
}
|
|
@@ -141,11 +141,11 @@ function __findEndpoint(this: OPCUAClientBase, endpointUrl: string, params: Find
|
|
|
141
141
|
err.message =
|
|
142
142
|
"Fail to connect to server at " +
|
|
143
143
|
endpointUrl +
|
|
144
|
-
" to collect certificate
|
|
144
|
+
" to collect server's certificate (in findEndpoint) \n" +
|
|
145
145
|
" (err =" +
|
|
146
146
|
err.message +
|
|
147
147
|
")";
|
|
148
|
-
debugLog(
|
|
148
|
+
debugLog(err.message);
|
|
149
149
|
}
|
|
150
150
|
return innerCallback(err);
|
|
151
151
|
});
|
|
@@ -185,7 +185,10 @@ function __findEndpoint(this: OPCUAClientBase, endpointUrl: string, params: Find
|
|
|
185
185
|
|
|
186
186
|
async.series(tasks, (err) => {
|
|
187
187
|
if (err) {
|
|
188
|
-
|
|
188
|
+
client.disconnect(()=>{
|
|
189
|
+
callback(err);
|
|
190
|
+
});
|
|
191
|
+
return ;
|
|
189
192
|
}
|
|
190
193
|
|
|
191
194
|
if (!selectedEndpoint) {
|
|
@@ -673,6 +676,7 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
|
|
|
673
676
|
],
|
|
674
677
|
(err) => {
|
|
675
678
|
if (err) {
|
|
679
|
+
debugLog("Inner create secure channel has failed", err.message);
|
|
676
680
|
this._secureChannel = null;
|
|
677
681
|
callback(err);
|
|
678
682
|
} else {
|
|
@@ -743,6 +747,9 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
|
|
|
743
747
|
}
|
|
744
748
|
|
|
745
749
|
protected async initializeCM(): Promise<void> {
|
|
750
|
+
if (!this.clientCertificateManager) {
|
|
751
|
+
return;
|
|
752
|
+
}
|
|
746
753
|
await this.clientCertificateManager.initialize();
|
|
747
754
|
await this.createDefaultCertificate();
|
|
748
755
|
// istanbul ignore next
|
|
@@ -1152,6 +1159,7 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
|
|
|
1152
1159
|
|
|
1153
1160
|
public disconnect(): Promise<void>;
|
|
1154
1161
|
public disconnect(callback: ErrorCallback): void;
|
|
1162
|
+
// eslint-disable-next-line max-statements
|
|
1155
1163
|
public disconnect(...args: any[]): any {
|
|
1156
1164
|
const callback = args[0];
|
|
1157
1165
|
assert(typeof callback === "function", "expecting a callback function here");
|
|
@@ -1192,7 +1200,9 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
|
|
|
1192
1200
|
}
|
|
1193
1201
|
|
|
1194
1202
|
if (this.clientCertificateManager) {
|
|
1195
|
-
this.clientCertificateManager
|
|
1203
|
+
const tmp = this.clientCertificateManager;
|
|
1204
|
+
(this as any).clientCertificateManager = null;
|
|
1205
|
+
tmp.dispose();
|
|
1196
1206
|
}
|
|
1197
1207
|
if (this._internalState === "disconnected" || this._internalState === "disconnecting") {
|
|
1198
1208
|
return callback();
|
|
@@ -1516,7 +1526,7 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
|
|
|
1516
1526
|
/**
|
|
1517
1527
|
* @event connection_lost
|
|
1518
1528
|
*/
|
|
1519
|
-
this.emit("connection_lost"); // instead of "close"
|
|
1529
|
+
this.emit("connection_lost", err?.message); // instead of "close"
|
|
1520
1530
|
this._repairConnection();
|
|
1521
1531
|
}
|
|
1522
1532
|
});
|
|
@@ -1547,12 +1557,16 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
|
|
|
1547
1557
|
} else {
|
|
1548
1558
|
this._finalReconnectionStep((err2?: Error | null) => {
|
|
1549
1559
|
if (err2) {
|
|
1560
|
+
// istanbul ignore next
|
|
1550
1561
|
if (doDebug) {
|
|
1551
1562
|
debugLog("connection_reestablished has failed");
|
|
1552
1563
|
debugLog("err= ", err2);
|
|
1553
1564
|
}
|
|
1554
1565
|
this.disconnect(() => {
|
|
1566
|
+
// we still need to retry connecting here !!!
|
|
1555
1567
|
warningLog("Disconnected following reconnection failure", err2.message);
|
|
1568
|
+
warningLog("I will retry OPCUA client reconnection in 5 seconds");
|
|
1569
|
+
setTimeout(() => this._repairConnection(), 5000);
|
|
1556
1570
|
});
|
|
1557
1571
|
return;
|
|
1558
1572
|
} else {
|
|
@@ -344,7 +344,11 @@ export class ClientSidePublishEngine {
|
|
|
344
344
|
|
|
345
345
|
// feed the server with a new publish Request to the server
|
|
346
346
|
if (!this.isSuspended && active && this.activeSubscriptionCount > 0) {
|
|
347
|
-
|
|
347
|
+
if (err && err.message.match(/Connection Break/)) {
|
|
348
|
+
// do not renew when connection is broken
|
|
349
|
+
} else {
|
|
350
|
+
this.send_publish_request();
|
|
351
|
+
}
|
|
348
352
|
}
|
|
349
353
|
});
|
|
350
354
|
}
|
|
@@ -428,9 +432,12 @@ export class ClientSidePublishEngine {
|
|
|
428
432
|
return callback2();
|
|
429
433
|
}
|
|
430
434
|
session.republish(request, (err: Error | null, response?: RepublishResponse) => {
|
|
431
|
-
|
|
435
|
+
const statusCode = err ? StatusCodes.Bad : response!.responseHeader.serviceResult;
|
|
436
|
+
if (!err && (statusCode.equals(StatusCodes.Good) || statusCode.equals(StatusCodes.BadMessageNotAvailable))) {
|
|
432
437
|
// reprocess notification message and keep going
|
|
433
|
-
|
|
438
|
+
if (statusCode.equals(StatusCodes.Good)) {
|
|
439
|
+
subscription.onNotificationMessage(response!.notificationMessage);
|
|
440
|
+
}
|
|
434
441
|
} else {
|
|
435
442
|
if (!err) {
|
|
436
443
|
err = new Error(response!.responseHeader.serviceResult.toString());
|
|
@@ -445,13 +452,13 @@ export class ClientSidePublishEngine {
|
|
|
445
452
|
setImmediate(() => {
|
|
446
453
|
assert(typeof callback === "function");
|
|
447
454
|
async.whilst(
|
|
448
|
-
(cb: (err: null, truth: boolean) =>
|
|
455
|
+
(cb: (err: null, truth: boolean) => void) => cb(null, !isDone),
|
|
449
456
|
sendRepublishFunc,
|
|
450
|
-
(err?: Error | null) => {
|
|
457
|
+
((err?: Error | null): void => {
|
|
451
458
|
debugLog("nbPendingPublishRequest = ", this.nbPendingPublishRequests);
|
|
452
459
|
debugLog(" _republish ends with ", err ? err.message : "null");
|
|
453
460
|
callback(err!);
|
|
454
|
-
}
|
|
461
|
+
}) as any // Wait for @type/async bug to be fixed !
|
|
455
462
|
);
|
|
456
463
|
});
|
|
457
464
|
}
|
|
@@ -263,7 +263,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
|
|
|
263
263
|
|
|
264
264
|
this.serverCertificate = Buffer.alloc(0);
|
|
265
265
|
|
|
266
|
-
this.sessionId = NodeId
|
|
266
|
+
this.sessionId = new NodeId();
|
|
267
267
|
|
|
268
268
|
this._closeEventHasBeenEmitted = false;
|
|
269
269
|
this._client = client;
|
|
@@ -382,7 +382,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
|
|
|
382
382
|
public browse(...args: any[]): any {
|
|
383
383
|
const arg0 = args[0];
|
|
384
384
|
const isArray = Array.isArray(arg0);
|
|
385
|
-
const callback: ResponseCallback<BrowseResult[]| BrowseResult> = args[1];
|
|
385
|
+
const callback: ResponseCallback<BrowseResult[] | BrowseResult> = args[1];
|
|
386
386
|
assert(typeof callback === "function");
|
|
387
387
|
|
|
388
388
|
assert(isFinite(this.requestedMaxReferencesPerNode));
|
|
@@ -1504,13 +1504,11 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
|
|
|
1504
1504
|
if (this._reconnecting.pendingTransactions.length > 10) {
|
|
1505
1505
|
if (!pendingTransactionMessageDisplayed) {
|
|
1506
1506
|
pendingTransactionMessageDisplayed = true;
|
|
1507
|
-
// tslint:disable-next-line: no-console
|
|
1508
1507
|
warningLog(
|
|
1509
1508
|
"[NODE-OPCUA-W21]",
|
|
1510
1509
|
"Pending transactions: ",
|
|
1511
1510
|
this._reconnecting.pendingTransactions.map((a: any) => a.request.constructor.name).join(" ")
|
|
1512
1511
|
);
|
|
1513
|
-
// tslint:disable-next-line: no-console
|
|
1514
1512
|
warningLog(
|
|
1515
1513
|
"[NODE-OPCUA-W22]",
|
|
1516
1514
|
chalk.yellow(
|