node-opcua-client 2.116.0 → 2.118.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_dump_event.d.ts +2 -2
- package/dist/alarms_and_conditions/client_alarm_tools_dump_event.js.map +1 -1
- package/dist/alarms_and_conditions/client_alarm_tools_extractConditionFields.d.ts +2 -2
- package/dist/alarms_and_conditions/client_alarm_tools_extractConditionFields.js.map +1 -1
- package/dist/alarms_and_conditions/client_tools.js +5 -25
- package/dist/alarms_and_conditions/client_tools.js.map +1 -1
- package/dist/client_utils.d.ts +2 -2
- package/dist/client_utils.js +2 -2
- package/dist/client_utils.js.map +1 -1
- package/dist/private/client_base_impl.js +12 -35
- package/dist/private/client_base_impl.js.map +1 -1
- package/dist/private/client_publish_engine.js +3 -26
- package/dist/private/client_publish_engine.js.map +1 -1
- package/dist/private/client_session_impl.js +7 -1
- package/dist/private/client_session_impl.js.map +1 -1
- package/dist/private/client_subscription_impl.js +4 -27
- package/dist/private/client_subscription_impl.js.map +1 -1
- package/dist/private/opcua_client_impl.js +2 -25
- package/dist/private/opcua_client_impl.js.map +1 -1
- package/dist/reconnection.js +31 -29
- package/dist/reconnection.js.map +1 -1
- package/dist/tools/findservers.js +4 -24
- package/dist/tools/findservers.js.map +1 -1
- package/package.json +47 -47
- package/source/alarms_and_conditions/client_alarm_tools_dump_event.ts +5 -5
- package/source/alarms_and_conditions/client_alarm_tools_extractConditionFields.ts +2 -2
- package/source/alarms_and_conditions/client_tools.ts +1 -1
- package/source/client_utils.ts +8 -5
- package/source/private/client_base_impl.ts +3 -3
- package/source/private/client_publish_engine.ts +1 -1
- package/source/private/client_session_impl.ts +17 -8
- package/source/private/client_subscription_impl.ts +5 -5
- package/source/private/opcua_client_impl.ts +1 -1
- package/source/reconnection.ts +47 -50
- package/source/tools/findservers.ts +1 -1
package/dist/reconnection.js
CHANGED
|
@@ -142,6 +142,7 @@ function _ask_for_subscription_republish(session, callback) {
|
|
|
142
142
|
}
|
|
143
143
|
doDebug && debugLog(chalk_1.default.bgCyan.green.bold("_ask_for_subscription_republish done "), err ? err.message : "OK");
|
|
144
144
|
if (err) {
|
|
145
|
+
warningLog("republish has failed with error :", err.message);
|
|
145
146
|
doDebug && debugLog("_ask_for_subscription_republish has : recreating subscription");
|
|
146
147
|
return repair_client_session_by_recreating_a_new_session(session._client, session, callback);
|
|
147
148
|
}
|
|
@@ -193,6 +194,28 @@ function repair_client_session_by_recreating_a_new_session(client, session, call
|
|
|
193
194
|
}
|
|
194
195
|
let newSession;
|
|
195
196
|
const listenerCountBefore = session.listenerCount("");
|
|
197
|
+
function recreateSubscription(subscriptionsToRecreate, innerCallback) {
|
|
198
|
+
async.forEach(subscriptionsToRecreate, (subscriptionId, next) => {
|
|
199
|
+
if (!session.getPublishEngine().hasSubscription(subscriptionId)) {
|
|
200
|
+
doDebug && debugLog(chalk_1.default.red(" => CANNOT RECREATE SUBSCRIPTION "), subscriptionId);
|
|
201
|
+
return next();
|
|
202
|
+
}
|
|
203
|
+
const subscription = session.getPublishEngine().getSubscription(subscriptionId);
|
|
204
|
+
(0, node_opcua_assert_1.assert)(subscription.constructor.name === "ClientSubscriptionImpl");
|
|
205
|
+
doDebug && debugLog(chalk_1.default.red(" => RECREATING SUBSCRIPTION "), subscriptionId);
|
|
206
|
+
(0, node_opcua_assert_1.assert)(subscription.session === newSession, "must have the session");
|
|
207
|
+
subscription.recreateSubscriptionAndMonitoredItem((err1) => {
|
|
208
|
+
if (err1) {
|
|
209
|
+
doDebug && debugLog("_recreateSubscription failed !" + err1.message);
|
|
210
|
+
}
|
|
211
|
+
doDebug &&
|
|
212
|
+
debugLog(chalk_1.default.cyan(" => RECREATING SUBSCRIPTION AND MONITORED ITEM DONE "), subscriptionId);
|
|
213
|
+
next();
|
|
214
|
+
});
|
|
215
|
+
}, (err1) => {
|
|
216
|
+
innerCallback(err1);
|
|
217
|
+
});
|
|
218
|
+
}
|
|
196
219
|
async.series([
|
|
197
220
|
function suspend_old_session_publish_engine(innerCallback) {
|
|
198
221
|
if (session.hasBeenClosed()) {
|
|
@@ -266,22 +289,20 @@ function repair_client_session_by_recreating_a_new_session(client, session, call
|
|
|
266
289
|
warningLog("Warning : we should not be publishing here");
|
|
267
290
|
}
|
|
268
291
|
newSession.transferSubscriptions(subscriptionsToTransfer, (err, transferSubscriptionsResponse) => {
|
|
269
|
-
if (err) {
|
|
270
|
-
warningLog(chalk_1.default.bgCyan("Warning TransferSubscription has failed " + err
|
|
292
|
+
if (err || !transferSubscriptionsResponse) {
|
|
293
|
+
warningLog(chalk_1.default.bgCyan("Warning TransferSubscription has failed " + err?.message));
|
|
271
294
|
warningLog(chalk_1.default.bgCyan("May be the server is not supporting this feature"));
|
|
272
295
|
// when transfer subscription has failed, we have no other choice but
|
|
273
296
|
// recreate the subscriptions on the server side
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
return innerCallback(new Error("Internal Error"));
|
|
297
|
+
const subscriptionsToRecreate = [...(subscriptionsToTransfer.subscriptionIds || [])];
|
|
298
|
+
warningLog(chalk_1.default.bgCyan("We need to recreate entirely the subscription"));
|
|
299
|
+
recreateSubscription(subscriptionsToRecreate, innerCallback);
|
|
300
|
+
return;
|
|
279
301
|
}
|
|
280
302
|
const results = transferSubscriptionsResponse.results || [];
|
|
281
303
|
// istanbul ignore next
|
|
282
304
|
if (doDebug) {
|
|
283
|
-
|
|
284
|
-
debugLog(chalk_1.default.cyan(" => transfer subscriptions done"), results.map((x) => x.statusCode.toString()).join(" "));
|
|
305
|
+
debugLog(chalk_1.default.cyan(" => transfer subscriptions done"), results.map((x) => x.statusCode.toString()).join(" "));
|
|
285
306
|
}
|
|
286
307
|
const subscriptionsToRecreate = [];
|
|
287
308
|
// some subscriptions may be marked as invalid on the server side ...
|
|
@@ -302,26 +323,7 @@ function repair_client_session_by_recreating_a_new_session(client, session, call
|
|
|
302
323
|
}
|
|
303
324
|
}
|
|
304
325
|
doDebug && debugLog(" new session subscriptionCount = ", newSession.getPublishEngine().subscriptionCount);
|
|
305
|
-
|
|
306
|
-
if (!session.getPublishEngine().hasSubscription(subscriptionId)) {
|
|
307
|
-
doDebug && debugLog(chalk_1.default.red(" => CANNOT RECREATE SUBSCRIPTION "), subscriptionId);
|
|
308
|
-
return next();
|
|
309
|
-
}
|
|
310
|
-
const subscription = session.getPublishEngine().getSubscription(subscriptionId);
|
|
311
|
-
(0, node_opcua_assert_1.assert)(subscription.constructor.name === "ClientSubscriptionImpl");
|
|
312
|
-
doDebug && debugLog(chalk_1.default.red(" => RECREATING SUBSCRIPTION "), subscriptionId);
|
|
313
|
-
(0, node_opcua_assert_1.assert)(subscription.session === newSession, "must have the session");
|
|
314
|
-
subscription.recreateSubscriptionAndMonitoredItem((err1) => {
|
|
315
|
-
if (err1) {
|
|
316
|
-
doDebug && debugLog("_recreateSubscription failed !" + err1.message);
|
|
317
|
-
}
|
|
318
|
-
doDebug &&
|
|
319
|
-
debugLog(chalk_1.default.cyan(" => RECREATING SUBSCRIPTION AND MONITORED ITEM DONE "), subscriptionId);
|
|
320
|
-
next();
|
|
321
|
-
});
|
|
322
|
-
}, (err1) => {
|
|
323
|
-
innerCallback(err1);
|
|
324
|
-
});
|
|
326
|
+
recreateSubscription(subscriptionsToRecreate, innerCallback);
|
|
325
327
|
});
|
|
326
328
|
},
|
|
327
329
|
function ask_for_subscription_republish(innerCallback) {
|
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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"}
|
|
@@ -1,39 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
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;
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
24
4
|
};
|
|
25
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
6
|
exports.findServersOnNetwork = exports.findServers = void 0;
|
|
27
7
|
/**
|
|
28
8
|
* @module node-opcua-client
|
|
29
9
|
*/
|
|
30
|
-
const
|
|
10
|
+
const async_1 = __importDefault(require("async"));
|
|
31
11
|
const client_base_impl_1 = require("../private/client_base_impl");
|
|
32
12
|
function findServers(discoveryServerEndpointUri, callback) {
|
|
33
13
|
const client = new client_base_impl_1.ClientBaseImpl({ connectionStrategy: { maxRetry: 3 } });
|
|
34
14
|
let servers = [];
|
|
35
15
|
let endpoints = [];
|
|
36
|
-
|
|
16
|
+
async_1.default.series([
|
|
37
17
|
(innerCallback) => {
|
|
38
18
|
client.connect(discoveryServerEndpointUri, innerCallback);
|
|
39
19
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findservers.js","sourceRoot":"","sources":["../../source/tools/findservers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"findservers.js","sourceRoot":"","sources":["../../source/tools/findservers.ts"],"names":[],"mappings":";;;;;;AAAA;;GAEG;AACH,kDAA0B;AAK1B,kEAA6D;AAkB7D,SAAgB,WAAW,CACvB,0BAAkC,EAClC,QAAkE;IAElE,MAAM,MAAM,GAAG,IAAI,iCAAc,CAAC,EAAE,kBAAkB,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAE3E,IAAI,OAAO,GAA6B,EAAE,CAAC;IAC3C,IAAI,SAAS,GAA0B,EAAE,CAAC;IAE1C,eAAK,CAAC,MAAM,CACR;QACI,CAAC,aAA4B,EAAE,EAAE;YAC7B,MAAM,CAAC,OAAO,CAAC,0BAA0B,EAAE,aAAa,CAAC,CAAC;QAC9D,CAAC;QAED,CAAC,aAA4B,EAAE,EAAE;YAC7B,MAAM,CAAC,WAAW,CAAC,CAAC,GAAiB,EAAE,QAAmC,EAAE,EAAE;gBAC1E,IAAI,QAAQ,EAAE;oBACV,OAAO,GAAG,QAAQ,CAAC;iBACtB;gBACD,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC;QACP,CAAC;QAED,CAAC,aAA4B,EAAE,EAAE;YAC7B,MAAM,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,CAAC,GAAiB,EAAE,UAAkC,EAAE,EAAE;gBACtG,IAAI,UAAU,EAAE;oBACZ,SAAS,GAAG,UAAU,CAAC;iBAC1B;gBACD,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC;QACP,CAAC;KACJ,EACD,CAAC,GAAG,EAAE,EAAE;QACJ,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;YACnB,QAAS,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACP,CAAC,CACJ,CAAC;AACN,CAAC;AAvCD,kCAuCC;AAUD,SAAgB,oBAAoB,CAChC,0BAAkC,EAClC,QAAmE;IAEnE,MAAM,MAAM,GAAG,IAAI,iCAAc,CAAC,EAAE,kBAAkB,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAE3E,MAAM,CAAC,OAAO,CAAC,0BAA0B,EAAE,CAAC,GAAW,EAAE,EAAE;QACvD,IAAI,CAAC,GAAG,EAAE;YACN,MAAM,CAAC,oBAAoB,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;gBAC1C,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;oBACnB,QAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAC7B,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;SACN;aAAM;YACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;gBACnB,QAAS,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;SACN;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAnBD,oDAmBC;AAED,iCAAiC;AACjC,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAClC,MAAM,CAAC,OAAe,CAAC,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAE,MAAM,CAAC,OAAe,CAAC,oBAAoB,CAAC,CAAC;AACjH,MAAM,CAAC,OAAe,CAAC,WAAW,GAAG,OAAO,CAAC,YAAY,CAAE,MAAM,CAAC,OAAe,CAAC,WAAW,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-client",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.118.0",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module client",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"clean": "npx rimraf node_modules dist *.tsbuildinfo certificates",
|
|
@@ -14,60 +14,60 @@
|
|
|
14
14
|
"types": "./dist/index.d.ts",
|
|
15
15
|
"dependencies": {
|
|
16
16
|
"@ster5/global-mutex": "^2.0.0",
|
|
17
|
-
"@types/async": "^3.2.
|
|
18
|
-
"async": "^3.2.
|
|
17
|
+
"@types/async": "^3.2.23",
|
|
18
|
+
"async": "^3.2.5",
|
|
19
19
|
"chalk": "4.1.2",
|
|
20
20
|
"node-opcua-assert": "2.105.0",
|
|
21
|
-
"node-opcua-basic-types": "2.
|
|
22
|
-
"node-opcua-buffer-utils": "2.
|
|
23
|
-
"node-opcua-certificate-manager": "2.
|
|
24
|
-
"node-opcua-client-dynamic-extension-object": "2.
|
|
25
|
-
"node-opcua-common": "2.
|
|
21
|
+
"node-opcua-basic-types": "2.118.0",
|
|
22
|
+
"node-opcua-buffer-utils": "2.117.0",
|
|
23
|
+
"node-opcua-certificate-manager": "2.118.0",
|
|
24
|
+
"node-opcua-client-dynamic-extension-object": "2.118.0",
|
|
25
|
+
"node-opcua-common": "2.118.0",
|
|
26
26
|
"node-opcua-constants": "2.114.0",
|
|
27
|
-
"node-opcua-crypto": "4.
|
|
28
|
-
"node-opcua-data-model": "2.
|
|
29
|
-
"node-opcua-data-value": "2.
|
|
30
|
-
"node-opcua-date-time": "2.
|
|
31
|
-
"node-opcua-debug": "2.
|
|
32
|
-
"node-opcua-extension-object": "2.
|
|
33
|
-
"node-opcua-hostname": "2.
|
|
34
|
-
"node-opcua-nodeid": "2.
|
|
35
|
-
"node-opcua-object-registry": "2.
|
|
36
|
-
"node-opcua-pki": "4.
|
|
37
|
-
"node-opcua-pseudo-session": "2.
|
|
38
|
-
"node-opcua-schemas": "2.
|
|
39
|
-
"node-opcua-secure-channel": "2.
|
|
40
|
-
"node-opcua-service-browse": "2.
|
|
41
|
-
"node-opcua-service-call": "2.
|
|
42
|
-
"node-opcua-service-discovery": "2.
|
|
43
|
-
"node-opcua-service-endpoints": "2.
|
|
44
|
-
"node-opcua-service-filter": "2.
|
|
45
|
-
"node-opcua-service-history": "2.
|
|
46
|
-
"node-opcua-service-query": "2.
|
|
47
|
-
"node-opcua-service-read": "2.
|
|
48
|
-
"node-opcua-service-register-node": "2.
|
|
49
|
-
"node-opcua-service-secure-channel": "2.
|
|
50
|
-
"node-opcua-service-session": "2.
|
|
51
|
-
"node-opcua-service-subscription": "2.
|
|
52
|
-
"node-opcua-service-translate-browse-path": "2.
|
|
53
|
-
"node-opcua-service-write": "2.
|
|
54
|
-
"node-opcua-status-code": "2.
|
|
55
|
-
"node-opcua-types": "2.
|
|
56
|
-
"node-opcua-utils": "2.
|
|
57
|
-
"node-opcua-variant": "2.
|
|
27
|
+
"node-opcua-crypto": "4.6.2",
|
|
28
|
+
"node-opcua-data-model": "2.118.0",
|
|
29
|
+
"node-opcua-data-value": "2.118.0",
|
|
30
|
+
"node-opcua-date-time": "2.118.0",
|
|
31
|
+
"node-opcua-debug": "2.118.0",
|
|
32
|
+
"node-opcua-extension-object": "2.118.0",
|
|
33
|
+
"node-opcua-hostname": "2.118.0",
|
|
34
|
+
"node-opcua-nodeid": "2.118.0",
|
|
35
|
+
"node-opcua-object-registry": "2.118.0",
|
|
36
|
+
"node-opcua-pki": "4.8.1",
|
|
37
|
+
"node-opcua-pseudo-session": "2.118.0",
|
|
38
|
+
"node-opcua-schemas": "2.118.0",
|
|
39
|
+
"node-opcua-secure-channel": "2.118.0",
|
|
40
|
+
"node-opcua-service-browse": "2.118.0",
|
|
41
|
+
"node-opcua-service-call": "2.118.0",
|
|
42
|
+
"node-opcua-service-discovery": "2.118.0",
|
|
43
|
+
"node-opcua-service-endpoints": "2.118.0",
|
|
44
|
+
"node-opcua-service-filter": "2.118.0",
|
|
45
|
+
"node-opcua-service-history": "2.118.0",
|
|
46
|
+
"node-opcua-service-query": "2.118.0",
|
|
47
|
+
"node-opcua-service-read": "2.118.0",
|
|
48
|
+
"node-opcua-service-register-node": "2.118.0",
|
|
49
|
+
"node-opcua-service-secure-channel": "2.118.0",
|
|
50
|
+
"node-opcua-service-session": "2.118.0",
|
|
51
|
+
"node-opcua-service-subscription": "2.118.0",
|
|
52
|
+
"node-opcua-service-translate-browse-path": "2.118.0",
|
|
53
|
+
"node-opcua-service-write": "2.118.0",
|
|
54
|
+
"node-opcua-status-code": "2.117.0",
|
|
55
|
+
"node-opcua-types": "2.118.0",
|
|
56
|
+
"node-opcua-utils": "2.117.0",
|
|
57
|
+
"node-opcua-variant": "2.118.0",
|
|
58
58
|
"thenify": "^3.3.1"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
|
-
"@types/underscore": "^1.11.
|
|
61
|
+
"@types/underscore": "^1.11.14",
|
|
62
62
|
"dequeue": "^1.0.5",
|
|
63
63
|
"mocha": "^10.2.0",
|
|
64
|
-
"node-opcua-address-space": "2.
|
|
65
|
-
"node-opcua-binary-stream": "2.
|
|
66
|
-
"node-opcua-factory": "2.
|
|
67
|
-
"node-opcua-leak-detector": "2.
|
|
68
|
-
"node-opcua-nodesets": "2.
|
|
64
|
+
"node-opcua-address-space": "2.118.0",
|
|
65
|
+
"node-opcua-binary-stream": "2.117.0",
|
|
66
|
+
"node-opcua-factory": "2.118.0",
|
|
67
|
+
"node-opcua-leak-detector": "2.118.0",
|
|
68
|
+
"node-opcua-nodesets": "2.118.0",
|
|
69
69
|
"should": "^13.2.3",
|
|
70
|
-
"sinon": "^
|
|
70
|
+
"sinon": "^17.0.1",
|
|
71
71
|
"underscore": "^1.13.6"
|
|
72
72
|
},
|
|
73
73
|
"eslintConfig": {
|
|
@@ -90,7 +90,7 @@
|
|
|
90
90
|
"internet of things"
|
|
91
91
|
],
|
|
92
92
|
"homepage": "http://node-opcua.github.io/",
|
|
93
|
-
"gitHead": "
|
|
93
|
+
"gitHead": "6210aaa97b43554e3982113041963b2720e50a95",
|
|
94
94
|
"files": [
|
|
95
95
|
"dist",
|
|
96
96
|
"source"
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import chalk from "chalk";
|
|
2
2
|
import { AttributeIds } from "node-opcua-data-model";
|
|
3
3
|
import { NodeId } from "node-opcua-nodeid";
|
|
4
|
-
import {
|
|
4
|
+
import { IBasicSessionReadAsyncSimple } from "node-opcua-pseudo-session";
|
|
5
5
|
import { DataType, Variant, VariantLike } from "node-opcua-variant";
|
|
6
6
|
|
|
7
7
|
import { make_warningLog } from "node-opcua-debug";
|
|
@@ -14,8 +14,8 @@ const warningLog = make_warningLog("ClientAlarmTool");
|
|
|
14
14
|
* @param fields
|
|
15
15
|
* @param eventFields
|
|
16
16
|
*/
|
|
17
|
-
export async function dumpEvent(session:
|
|
18
|
-
async function getBrowseName(_session:
|
|
17
|
+
export async function dumpEvent(session: IBasicSessionReadAsyncSimple, fields: string[], eventFields: Variant[]): Promise<void> {
|
|
18
|
+
async function getBrowseName(_session: IBasicSessionReadAsyncSimple, nodeId: NodeId): Promise<string> {
|
|
19
19
|
const dataValue = await _session.read({
|
|
20
20
|
attributeId: AttributeIds.BrowseName,
|
|
21
21
|
nodeId
|
|
@@ -30,7 +30,7 @@ export async function dumpEvent(session: IBasicSession, fields: string[], eventF
|
|
|
30
30
|
function w(str: string, l: number): string {
|
|
31
31
|
return (str || "").toString().padEnd(l, " ").substring(0, l);
|
|
32
32
|
}
|
|
33
|
-
async function __dumpEvent1(_session:
|
|
33
|
+
async function __dumpEvent1(_session: IBasicSessionReadAsyncSimple, _fields: any, variant: VariantLike, index: number) {
|
|
34
34
|
if (variant.dataType === DataType.Null) {
|
|
35
35
|
return;
|
|
36
36
|
}
|
|
@@ -54,7 +54,7 @@ export async function dumpEvent(session: IBasicSession, fields: string[], eventF
|
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
|
|
57
|
-
async function __dumpEvent(_session:
|
|
57
|
+
async function __dumpEvent(_session: IBasicSessionReadAsyncSimple, _fields: string[], _eventFields: Variant[]) {
|
|
58
58
|
let index = 0;
|
|
59
59
|
const promises = [];
|
|
60
60
|
for (const variant of _eventFields) {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { NodeIdLike } from "node-opcua-nodeid";
|
|
2
|
-
import {
|
|
2
|
+
import { simpleBrowsePathsToString, extractFields, ISessionForExtractField } from "node-opcua-pseudo-session";
|
|
3
3
|
|
|
4
|
-
export async function extractConditionFields(session:
|
|
4
|
+
export async function extractConditionFields(session: ISessionForExtractField, conditionNodeId: NodeIdLike): Promise<string[]> {
|
|
5
5
|
// conditionNodeId could be a Object of type ConditionType
|
|
6
6
|
// or it could be directly a ObjectType which is a subType of ConditionType
|
|
7
7
|
const p = await extractFields(session, conditionNodeId);
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
// tslint:disable:no-empty
|
|
5
5
|
// tslint:disable: only-arrow-functions
|
|
6
6
|
|
|
7
|
-
import
|
|
7
|
+
import async from "async";
|
|
8
8
|
import { assert } from "node-opcua-assert";
|
|
9
9
|
import { LocalizedText, LocalizedTextLike } from "node-opcua-data-model";
|
|
10
10
|
import { checkDebugFlag, make_debugLog, make_warningLog } from "node-opcua-debug";
|
package/source/client_utils.ts
CHANGED
|
@@ -8,7 +8,7 @@ import { NodeIdLike, resolveNodeId } from "node-opcua-nodeid";
|
|
|
8
8
|
import { ReadValueIdOptions } from "node-opcua-service-read";
|
|
9
9
|
import { BrowsePath, BrowsePathResult } from "node-opcua-service-translate-browse-path";
|
|
10
10
|
import { Variant } from "node-opcua-variant";
|
|
11
|
-
import {
|
|
11
|
+
import { IBasicSessionReadAsyncMultiple, IBasicSessionTranslateBrowsePathAsyncMultiple } from "node-opcua-pseudo-session";
|
|
12
12
|
|
|
13
13
|
const hasPropertyRefId = resolveNodeId("HasProperty");
|
|
14
14
|
|
|
@@ -44,8 +44,11 @@ interface AnalogDataItemSnapshot {
|
|
|
44
44
|
* @param nodeId
|
|
45
45
|
* @param callback
|
|
46
46
|
*/
|
|
47
|
-
export async function readUAAnalogItem(
|
|
48
|
-
|
|
47
|
+
export async function readUAAnalogItem(
|
|
48
|
+
session: IBasicSessionTranslateBrowsePathAsyncMultiple & IBasicSessionReadAsyncMultiple,
|
|
49
|
+
nodeId: NodeIdLike
|
|
50
|
+
): Promise<AnalogDataItemSnapshot> {
|
|
51
|
+
const browsePaths = [
|
|
49
52
|
browsePathPropertyRequest(nodeId, "EngineeringUnits"),
|
|
50
53
|
browsePathPropertyRequest(nodeId, "EURange"),
|
|
51
54
|
browsePathPropertyRequest(nodeId, "InstrumentRange"),
|
|
@@ -61,9 +64,9 @@ export async function readUAAnalogItem(session: IBasicSessionAsync, nodeId: Node
|
|
|
61
64
|
valuePrecision: null
|
|
62
65
|
};
|
|
63
66
|
|
|
64
|
-
const browsePathResults = await session.translateBrowsePath(
|
|
67
|
+
const browsePathResults = await session.translateBrowsePath(browsePaths);
|
|
65
68
|
|
|
66
|
-
const actions: (
|
|
69
|
+
const actions: ((readResult: DataValue) => void)[] = [];
|
|
67
70
|
const nodesToRead: ReadValueIdOptions[] = [];
|
|
68
71
|
|
|
69
72
|
function processProperty(browsePathResult: BrowsePathResult, propertyName: string) {
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
* @module node-opcua-client-private
|
|
3
3
|
*/
|
|
4
4
|
// tslint:disable:no-unused-expression
|
|
5
|
-
import
|
|
6
|
-
import
|
|
7
|
-
import
|
|
5
|
+
import fs from "fs";
|
|
6
|
+
import path from "path";
|
|
7
|
+
import async from "async";
|
|
8
8
|
import chalk from "chalk";
|
|
9
9
|
import { withLock } from "@ster5/global-mutex";
|
|
10
10
|
import { assert } from "node-opcua-assert";
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @module node-opcua-client-private
|
|
3
3
|
*/
|
|
4
4
|
import { types } from "util";
|
|
5
|
-
import
|
|
5
|
+
import async from "async";
|
|
6
6
|
import chalk from "chalk";
|
|
7
7
|
import { assert } from "node-opcua-assert";
|
|
8
8
|
import { checkDebugFlag, make_debugLog, make_warningLog } from "node-opcua-debug";
|
|
@@ -16,7 +16,7 @@ import {
|
|
|
16
16
|
PseudoDataValue
|
|
17
17
|
} from "node-opcua-client-dynamic-extension-object";
|
|
18
18
|
import { Certificate, Nonce } from "node-opcua-crypto";
|
|
19
|
-
import {
|
|
19
|
+
import { BrowseDirection, LocalizedTextLike } from "node-opcua-data-model";
|
|
20
20
|
import { DataValue } from "node-opcua-data-value";
|
|
21
21
|
import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
|
|
22
22
|
import { ExtensionObject } from "node-opcua-extension-object";
|
|
@@ -24,12 +24,12 @@ import { coerceNodeId, NodeId, NodeIdLike, resolveNodeId } from "node-opcua-node
|
|
|
24
24
|
import {
|
|
25
25
|
getBuiltInDataType,
|
|
26
26
|
getArgumentDefinitionHelper,
|
|
27
|
-
IBasicSession,
|
|
28
27
|
IBasicTransportSettings,
|
|
29
28
|
readAllAttributes,
|
|
30
29
|
NodeAttributes,
|
|
31
30
|
ResponseCallback,
|
|
32
|
-
BrowseDescriptionLike
|
|
31
|
+
BrowseDescriptionLike,
|
|
32
|
+
IBasicSessionAsync2
|
|
33
33
|
} from "node-opcua-pseudo-session";
|
|
34
34
|
import { AnyConstructorFunc } from "node-opcua-schemas";
|
|
35
35
|
import { ClientSecureChannelLayer, requestHandleNotSetValue, SignatureData } from "node-opcua-secure-channel";
|
|
@@ -102,7 +102,7 @@ import {
|
|
|
102
102
|
UserTokenType,
|
|
103
103
|
WriteValueOptions
|
|
104
104
|
} from "node-opcua-types";
|
|
105
|
-
import { buffer_ellipsis, getFunctionParameterNames, isNullOrUndefined
|
|
105
|
+
import { buffer_ellipsis, getFunctionParameterNames, isNullOrUndefined } from "node-opcua-utils";
|
|
106
106
|
import { DataType, Variant, VariantLike } from "node-opcua-variant";
|
|
107
107
|
|
|
108
108
|
import {
|
|
@@ -1836,7 +1836,13 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
|
|
|
1836
1836
|
const methodId = args[0] as MethodId;
|
|
1837
1837
|
const callback = args[1] as ResponseCallback<ArgumentDefinition>;
|
|
1838
1838
|
assert(typeof callback === "function");
|
|
1839
|
-
return getArgumentDefinitionHelper(this, methodId
|
|
1839
|
+
return getArgumentDefinitionHelper(this, methodId)
|
|
1840
|
+
.then((result) => {
|
|
1841
|
+
callback!(null, result);
|
|
1842
|
+
})
|
|
1843
|
+
.catch((err) => {
|
|
1844
|
+
callback(err);
|
|
1845
|
+
});
|
|
1840
1846
|
}
|
|
1841
1847
|
|
|
1842
1848
|
public async registerNodes(nodesToRegister: NodeIdLike[]): Promise<NodeId[]>;
|
|
@@ -2215,12 +2221,15 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
|
|
|
2215
2221
|
}
|
|
2216
2222
|
|
|
2217
2223
|
type promoteOpaqueStructure3WithCallbackFunc = (
|
|
2218
|
-
session:
|
|
2224
|
+
session: IBasicSessionAsync2,
|
|
2219
2225
|
callMethodResults: CallMethodResult[],
|
|
2220
2226
|
callback: ErrorCallback
|
|
2221
2227
|
) => void;
|
|
2222
2228
|
|
|
2223
|
-
async function promoteOpaqueStructure2(
|
|
2229
|
+
async function promoteOpaqueStructure2(
|
|
2230
|
+
session: IBasicSessionAsync2,
|
|
2231
|
+
callMethodResult: CallMethodResult
|
|
2232
|
+
): Promise<void> {
|
|
2224
2233
|
if (!callMethodResult || !callMethodResult.outputArguments || callMethodResult.outputArguments.length === 0) {
|
|
2225
2234
|
return;
|
|
2226
2235
|
}
|
|
@@ -2242,7 +2251,7 @@ function countOpaqueStructures(callMethodResults: CallMethodResult[]): number {
|
|
|
2242
2251
|
}, 0);
|
|
2243
2252
|
return opaqueStructureCount;
|
|
2244
2253
|
}
|
|
2245
|
-
async function promoteOpaqueStructure3(session:
|
|
2254
|
+
async function promoteOpaqueStructure3(session: IBasicSessionAsync2, callMethodResults: CallMethodResult[]): Promise<void> {
|
|
2246
2255
|
const opaqueStructureCount = countOpaqueStructures(callMethodResults);
|
|
2247
2256
|
if (0 === opaqueStructureCount) return;
|
|
2248
2257
|
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
// tslint:disable:unified-signatures
|
|
5
5
|
import { EventEmitter } from "events";
|
|
6
|
-
import
|
|
6
|
+
import async from "async";
|
|
7
7
|
import chalk from "chalk";
|
|
8
8
|
|
|
9
9
|
import { assert } from "node-opcua-assert";
|
|
@@ -35,9 +35,9 @@ import {
|
|
|
35
35
|
|
|
36
36
|
import { StatusCode, StatusCodes } from "node-opcua-status-code";
|
|
37
37
|
import { Callback, ErrorCallback } from "node-opcua-status-code";
|
|
38
|
-
import
|
|
38
|
+
import { isNullOrUndefined } from "node-opcua-utils";
|
|
39
39
|
import { promoteOpaqueStructureInNotificationData } from "node-opcua-client-dynamic-extension-object";
|
|
40
|
-
import { createMonitoredItemsLimit,
|
|
40
|
+
import { createMonitoredItemsLimit, IBasicSessionReadAsync, readOperationLimits } from "node-opcua-pseudo-session";
|
|
41
41
|
|
|
42
42
|
import { IBasicSessionWithSubscription } from "node-opcua-pseudo-session";
|
|
43
43
|
import { ClientMonitoredItemBase } from "../client_monitored_item_base";
|
|
@@ -123,7 +123,7 @@ function displayKeepAliveWarning(sessionTimeout: number, maxKeepAliveCount: numb
|
|
|
123
123
|
}
|
|
124
124
|
|
|
125
125
|
function createMonitoredItemsAndRespectOperationalLimits(
|
|
126
|
-
session:
|
|
126
|
+
session: IBasicSessionReadAsync & IBasicSessionWithSubscription,
|
|
127
127
|
createMonitorItemsRequest: CreateMonitoredItemsRequest,
|
|
128
128
|
callback: (err: Error | null, response?: CreateMonitoredItemsResponse) => void
|
|
129
129
|
) {
|
|
@@ -208,7 +208,7 @@ export class ClientSubscriptionImpl extends EventEmitter implements ClientSubscr
|
|
|
208
208
|
);
|
|
209
209
|
}
|
|
210
210
|
|
|
211
|
-
options.maxNotificationsPerPublish =
|
|
211
|
+
options.maxNotificationsPerPublish = isNullOrUndefined(options.maxNotificationsPerPublish)
|
|
212
212
|
? 0
|
|
213
213
|
: options.maxNotificationsPerPublish;
|
|
214
214
|
|