node-opcua-client 2.85.0 → 2.86.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.js +1 -2
- package/dist/alarms_and_conditions/client_alarm_tools_dump_event.js.map +1 -1
- package/dist/alarms_and_conditions/client_tools.js +1 -2
- package/dist/alarms_and_conditions/client_tools.js.map +1 -1
- package/dist/client_base.d.ts +4 -4
- package/dist/client_monitored_item_toolbox.js +1 -2
- package/dist/client_monitored_item_toolbox.js.map +1 -1
- package/dist/client_session.d.ts +12 -12
- package/dist/client_session_keepalive_manager.js +1 -2
- package/dist/client_session_keepalive_manager.js.map +1 -1
- package/dist/client_subscription.d.ts +1 -1
- package/dist/client_utils.js +1 -2
- package/dist/client_utils.js.map +1 -1
- package/dist/common.d.ts +2 -2
- package/dist/opcua_client.d.ts +4 -4
- package/dist/private/client_base_impl.d.ts +1 -1
- package/dist/private/client_base_impl.js +59 -51
- package/dist/private/client_base_impl.js.map +1 -1
- package/dist/private/client_monitored_item_impl.d.ts +1 -1
- package/dist/private/client_monitored_item_impl.js +3 -4
- package/dist/private/client_monitored_item_impl.js.map +1 -1
- package/dist/private/client_session_impl.d.ts +4 -4
- package/dist/private/client_session_impl.js +1 -1
- package/dist/private/client_session_impl.js.map +1 -1
- package/dist/private/client_subscription_impl.js +18 -18
- package/dist/private/client_subscription_impl.js.map +1 -1
- package/dist/private/opcua_client_impl.js +6 -5
- package/dist/private/opcua_client_impl.js.map +1 -1
- package/dist/reconnection.d.ts +1 -1
- package/dist/reconnection.js +1 -1
- package/dist/reconnection.js.map +1 -1
- package/dist/tools/read_history_server_capabilities.js +2 -3
- package/dist/tools/read_history_server_capabilities.js.map +1 -1
- package/dist/verify.js +1 -1
- package/dist/verify.js.map +1 -1
- package/package.json +41 -41
- package/source/alarms_and_conditions/client_alarm_tools_dump_event.ts +1 -2
- package/source/alarms_and_conditions/client_tools.ts +1 -1
- package/source/client_monitored_item_toolbox.ts +1 -1
- package/source/client_session_keepalive_manager.ts +1 -1
- package/source/client_utils.ts +1 -1
- package/source/private/client_base_impl.ts +15 -2
- package/source/private/client_monitored_item_impl.ts +4 -5
- package/source/private/client_session_impl.ts +3 -3
- package/source/private/client_subscription_impl.ts +1 -1
- package/source/private/opcua_client_impl.ts +7 -7
- package/source/reconnection.ts +2 -2
- package/source/tools/read_history_server_capabilities.ts +2 -2
- package/source/verify.ts +2 -1
|
@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.dumpEvent = void 0;
|
|
13
13
|
const chalk = require("chalk");
|
|
14
14
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
15
|
-
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
16
15
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
17
16
|
/**
|
|
18
17
|
*
|
|
@@ -28,7 +27,7 @@ function dumpEvent(session, fields, eventFields) {
|
|
|
28
27
|
attributeId: node_opcua_data_model_1.AttributeIds.BrowseName,
|
|
29
28
|
nodeId
|
|
30
29
|
});
|
|
31
|
-
if (dataValue.statusCode
|
|
30
|
+
if (dataValue.statusCode.isGood()) {
|
|
32
31
|
const browseName = dataValue.value.value.name;
|
|
33
32
|
return browseName;
|
|
34
33
|
}
|
|
@@ -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":";;;;;;;;;;;;AAAA,+BAA+B;AAC/B,iEAAqD;AAGrD,
|
|
1
|
+
{"version":3,"file":"client_alarm_tools_dump_event.js","sourceRoot":"","sources":["../../source/alarms_and_conditions/client_alarm_tools_dump_event.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA+B;AAC/B,iEAAqD;AAGrD,2DAAoE;AAEpE;;;;;GAKG;AACH,SAAsB,SAAS,CAAC,OAAsB,EAAE,MAAgB,EAAE,WAAsB;;QAC5F,SAAe,aAAa,CAAC,QAAuB,EAAE,MAAc;;gBAChE,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC;oBAClC,WAAW,EAAE,oCAAY,CAAC,UAAU;oBACpC,MAAM;iBACT,CAAC,CAAC;gBACH,IAAI,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE;oBAC/B,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,IAAK,CAAC;oBAC/C,OAAO,UAAU,CAAC;iBACrB;qBAAM;oBACH,OAAO,KAAK,CAAC;iBAChB;YACL,CAAC;SAAA;QACD,SAAS,CAAC,CAAC,GAAW,EAAE,CAAS;YAC7B,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9C,CAAC;QACD,SAAe,YAAY,CAAC,QAAuB,EAAE,OAAY,EAAE,OAAoB,EAAE,KAAa;;gBAClG,IAAI,OAAO,CAAC,QAAQ,KAAK,6BAAQ,CAAC,IAAI,EAAE;oBACpC,OAAO;iBACV;gBACD,IAAI,OAAO,CAAC,QAAQ,KAAK,6BAAQ,CAAC,MAAM,EAAE;oBACtC,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;oBAC1D,uCAAuC;oBACvC,OAAO,CAAC,GAAG,CACP,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAChD,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,6BAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,EACxD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EACrB,GAAG,EACH,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EACpB,GAAG,CACN,CAAC;iBACL;qBAAM;oBACH,uCAAuC;oBACvC,OAAO,CAAC,GAAG,CACP,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAC9C,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,6BAAQ,CAAC,OAAO,CAAC,QAAkB,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,EAClE,OAAO,CAAC,KAAK,CAChB,CAAC;iBACL;YACL,CAAC;SAAA;QAED,SAAe,WAAW,CAAC,QAAuB,EAAE,OAAiB,EAAE,YAAuB;;gBAC1F,IAAI,KAAK,GAAG,CAAC,CAAC;gBACd,MAAM,QAAQ,GAAG,EAAE,CAAC;gBACpB,KAAK,MAAM,OAAO,IAAI,YAAY,EAAE;oBAChC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;oBAC/D,KAAK,EAAE,CAAC;iBACX;gBACD,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAChC,CAAC;SAAA;QACD,MAAM,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IACpD,CAAC;CAAA;AAnDD,8BAmDC"}
|
|
@@ -13,7 +13,6 @@ const node_opcua_debug_1 = require("node-opcua-debug");
|
|
|
13
13
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
14
14
|
const node_opcua_service_call_1 = require("node-opcua-service-call");
|
|
15
15
|
const node_opcua_service_translate_browse_path_1 = require("node-opcua-service-translate-browse-path");
|
|
16
|
-
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
17
16
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
18
17
|
const client_session_impl_1 = require("../private/client_session_impl");
|
|
19
18
|
const debugLog = (0, node_opcua_debug_1.make_debugLog)("A&E");
|
|
@@ -60,7 +59,7 @@ function callConditionRefresh(subscription, callback) {
|
|
|
60
59
|
}
|
|
61
60
|
result = result;
|
|
62
61
|
// istanbul ignore next
|
|
63
|
-
if (result.statusCode
|
|
62
|
+
if (result.statusCode.isNotGood()) {
|
|
64
63
|
warningLog(new node_opcua_service_call_1.CallMethodRequest(methodToCall).toString());
|
|
65
64
|
return innerCallback(new Error("Error " + result.statusCode.toString()));
|
|
66
65
|
}
|
|
@@ -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;;;AAEvC,+BAA+B;AAC/B,yDAA2C;AAC3C,iEAAyE;AACzE,uDAAkF;AAClF,yDAAoF;AACpF,qEAA8E;AAC9E,uGAA4F;
|
|
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.d.ts
CHANGED
|
@@ -16,9 +16,9 @@ import { ChannelSecurityToken, MessageSecurityMode } from "node-opcua-service-se
|
|
|
16
16
|
import { ErrorCallback } from "node-opcua-status-code";
|
|
17
17
|
import { ResponseCallback } from "./client_session";
|
|
18
18
|
import { Request, Response } from "./common";
|
|
19
|
-
export
|
|
20
|
-
export
|
|
21
|
-
export
|
|
19
|
+
export type FindServersRequestLike = FindServersRequestOptions;
|
|
20
|
+
export type FindServersOnNetworkRequestLike = FindServersOnNetworkRequestOptions;
|
|
21
|
+
export type CreateSecureChannelCallbackFunc = (err: Error | null, secureChannel?: ClientSecureChannelLayer) => void;
|
|
22
22
|
export interface FindEndpointOptions {
|
|
23
23
|
securityMode: MessageSecurityMode;
|
|
24
24
|
securityPolicy: SecurityPolicy;
|
|
@@ -33,7 +33,7 @@ export interface FindEndpointResult {
|
|
|
33
33
|
selectedEndpoint: EndpointDescription;
|
|
34
34
|
endpoints: EndpointDescription[];
|
|
35
35
|
}
|
|
36
|
-
export
|
|
36
|
+
export type FindEndpointCallback = (err: Error | null, result?: FindEndpointResult) => void;
|
|
37
37
|
export interface TransportSettings {
|
|
38
38
|
maxChunkCount?: number;
|
|
39
39
|
maxMessageSize?: number;
|
|
@@ -8,7 +8,6 @@ const chalk = require("chalk");
|
|
|
8
8
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
9
9
|
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
10
10
|
const node_opcua_service_subscription_1 = require("node-opcua-service-subscription");
|
|
11
|
-
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
12
11
|
const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
|
|
13
12
|
const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
|
|
14
13
|
/**
|
|
@@ -86,7 +85,7 @@ class ClientMonitoredItemToolbox {
|
|
|
86
85
|
(0, node_opcua_assert_1.assert)(response.results.length === monitoredItems.length);
|
|
87
86
|
const res = response.results[0];
|
|
88
87
|
/* istanbul ignore next */
|
|
89
|
-
if (response.results.length === 1 && res.statusCode
|
|
88
|
+
if (response.results.length === 1 && res.statusCode.isNotGood()) {
|
|
90
89
|
return callback(new Error("Error" + res.statusCode.toString()));
|
|
91
90
|
}
|
|
92
91
|
callback(null, response.results);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client_monitored_item_toolbox.js","sourceRoot":"","sources":["../source/client_monitored_item_toolbox.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,+BAA+B;AAE/B,yDAA2C;AAE3C,uDAAiE;AACjE,qFASyC;
|
|
1
|
+
{"version":3,"file":"client_monitored_item_toolbox.js","sourceRoot":"","sources":["../source/client_monitored_item_toolbox.ts"],"names":[],"mappings":"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"}
|
package/dist/client_session.d.ts
CHANGED
|
@@ -34,7 +34,7 @@ export { ExtraDataTypeManager } from "node-opcua-client-dynamic-extension-object
|
|
|
34
34
|
export { ExtensionObject } from "node-opcua-extension-object";
|
|
35
35
|
export { ArgumentDefinition, CallMethodRequestLike, MethodId } from "node-opcua-pseudo-session";
|
|
36
36
|
import { ClientSubscription } from "./client_subscription";
|
|
37
|
-
export
|
|
37
|
+
export type ResponseCallback<T> = (err: Error | null, response?: T) => void;
|
|
38
38
|
export interface NodeAttributes {
|
|
39
39
|
nodeId: NodeId;
|
|
40
40
|
statusCode: StatusCode;
|
|
@@ -52,17 +52,17 @@ export interface CreateSubscriptionOptions {
|
|
|
52
52
|
publishingEnabled?: boolean;
|
|
53
53
|
priority?: UInt8;
|
|
54
54
|
}
|
|
55
|
-
export
|
|
56
|
-
export
|
|
57
|
-
export
|
|
58
|
-
export
|
|
59
|
-
export
|
|
60
|
-
export
|
|
61
|
-
export
|
|
62
|
-
export
|
|
63
|
-
export
|
|
64
|
-
export
|
|
65
|
-
export
|
|
55
|
+
export type BrowseDescriptionLike = string | BrowseDescriptionOptions;
|
|
56
|
+
export type DeleteMonitoredItemsRequestLike = DeleteMonitoredItemsRequestOptions;
|
|
57
|
+
export type CreateSubscriptionRequestLike = CreateSubscriptionRequestOptions;
|
|
58
|
+
export type DeleteSubscriptionsRequestLike = DeleteSubscriptionsRequestOptions;
|
|
59
|
+
export type TransferSubscriptionsRequestLike = TransferSubscriptionsRequestOptions;
|
|
60
|
+
export type CreateMonitoredItemsRequestLike = CreateMonitoredItemsRequestOptions;
|
|
61
|
+
export type ModifyMonitoredItemsRequestLike = ModifyMonitoredItemsRequestOptions;
|
|
62
|
+
export type ModifySubscriptionRequestLike = ModifySubscriptionRequestOptions;
|
|
63
|
+
export type SetMonitoringModeRequestLike = SetMonitoringModeRequestOptions;
|
|
64
|
+
export type QueryFirstRequestLike = QueryFirstRequestOptions;
|
|
65
|
+
export type SubscriptionId = number;
|
|
66
66
|
export interface ClientSessionBase {
|
|
67
67
|
/** the session Id */
|
|
68
68
|
timeout: number;
|
|
@@ -20,7 +20,6 @@ const node_opcua_common_1 = require("node-opcua-common");
|
|
|
20
20
|
const node_opcua_constants_1 = require("node-opcua-constants");
|
|
21
21
|
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
22
22
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
23
|
-
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
24
23
|
const serverStatusStateNodeId = (0, node_opcua_nodeid_1.coerceNodeId)(node_opcua_constants_1.VariableIds.Server_ServerStatus_State);
|
|
25
24
|
const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
|
|
26
25
|
const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
|
|
@@ -130,7 +129,7 @@ class ClientSessionKeepAliveManager extends events_1.EventEmitter {
|
|
|
130
129
|
resolve(0);
|
|
131
130
|
return;
|
|
132
131
|
}
|
|
133
|
-
if (dataValue.statusCode
|
|
132
|
+
if (dataValue.statusCode.isGood()) {
|
|
134
133
|
const newState = dataValue.value.value;
|
|
135
134
|
// istanbul ignore next
|
|
136
135
|
if (newState !== this.lastKnownState && this.lastKnownState) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client_session_keepalive_manager.js","sourceRoot":"","sources":["../source/client_session_keepalive_manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;GAEG;AACH,mCAAsC;AACtC,+BAA+B;AAC/B,yDAA2C;AAC3C,yDAAgD;AAChD,+DAAmD;AAEnD,uDAAkF;AAClF,yDAAiD;
|
|
1
|
+
{"version":3,"file":"client_session_keepalive_manager.js","sourceRoot":"","sources":["../source/client_session_keepalive_manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ export interface ClientSubscriptionOptions {
|
|
|
21
21
|
publishingEnabled?: boolean;
|
|
22
22
|
priority?: number;
|
|
23
23
|
}
|
|
24
|
-
export
|
|
24
|
+
export type ClientHandle = number;
|
|
25
25
|
export interface ClientMonitoredItemBaseMap {
|
|
26
26
|
[key: string]: ClientMonitoredItemBase;
|
|
27
27
|
}
|
package/dist/client_utils.js
CHANGED
|
@@ -8,7 +8,6 @@ const node_opcua_assert_1 = require("node-opcua-assert");
|
|
|
8
8
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
9
9
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
10
10
|
const node_opcua_service_translate_browse_path_1 = require("node-opcua-service-translate-browse-path");
|
|
11
|
-
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
12
11
|
const hasPropertyRefId = (0, node_opcua_nodeid_1.resolveNodeId)("HasProperty");
|
|
13
12
|
/* NodeId ns=0;i=46*/
|
|
14
13
|
function browsePathPropertyRequest(nodeId, propertyName) {
|
|
@@ -51,7 +50,7 @@ function readUAAnalogItem(session, nodeId, ...args) {
|
|
|
51
50
|
const actions = [];
|
|
52
51
|
const nodesToRead = [];
|
|
53
52
|
function processProperty(browsePathResult, propertyName) {
|
|
54
|
-
if (browsePathResult.statusCode
|
|
53
|
+
if (browsePathResult.statusCode.isGood()) {
|
|
55
54
|
browsePathResult.targets = browsePathResult.targets || [];
|
|
56
55
|
nodesToRead.push({
|
|
57
56
|
attributeId: node_opcua_data_model_1.AttributeIds.Value,
|
package/dist/client_utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client_utils.js","sourceRoot":"","sources":["../source/client_utils.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,yDAA2C;AAC3C,iEAAqD;AAErD,yDAA8D;AAE9D,uGAAwF;
|
|
1
|
+
{"version":3,"file":"client_utils.js","sourceRoot":"","sources":["../source/client_utils.ts"],"names":[],"mappings":"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"}
|
package/dist/common.d.ts
CHANGED
|
@@ -13,5 +13,5 @@ import { ActivateSessionRequest, ActivateSessionResponse, CloseSessionRequest, C
|
|
|
13
13
|
import { CreateMonitoredItemsRequest, CreateMonitoredItemsResponse, CreateSubscriptionRequest, CreateSubscriptionResponse, DeleteMonitoredItemsRequest, DeleteMonitoredItemsResponse, DeleteSubscriptionsRequest, DeleteSubscriptionsResponse, ModifyMonitoredItemsRequest, ModifyMonitoredItemsResponse, ModifySubscriptionRequest, ModifySubscriptionResponse, PublishRequest, PublishResponse, RepublishRequest, RepublishResponse, SetMonitoringModeRequest, SetMonitoringModeResponse, SetPublishingModeRequest, SetPublishingModeResponse, TransferSubscriptionsRequest, TransferSubscriptionsResponse } from "node-opcua-service-subscription";
|
|
14
14
|
import { TranslateBrowsePathsToNodeIdsRequest, TranslateBrowsePathsToNodeIdsResponse } from "node-opcua-service-translate-browse-path";
|
|
15
15
|
import { WriteRequest, WriteResponse } from "node-opcua-service-write";
|
|
16
|
-
export
|
|
17
|
-
export
|
|
16
|
+
export type Request = CreateSessionRequest | ActivateSessionRequest | CloseSessionRequest | GetEndpointsRequest | ReadRequest | BrowseRequest | BrowseNextRequest | WriteRequest | CallRequest | TranslateBrowsePathsToNodeIdsRequest | CreateSubscriptionRequest | DeleteSubscriptionsRequest | TransferSubscriptionsRequest | CreateMonitoredItemsRequest | ModifyMonitoredItemsRequest | ModifySubscriptionRequest | SetMonitoringModeRequest | PublishRequest | RepublishRequest | DeleteMonitoredItemsRequest | SetPublishingModeRequest | FindServersOnNetworkRequest | FindServersRequest | HistoryReadRequest | RegisterNodesRequest | UnregisterNodesRequest | QueryFirstRequest | QueryNextRequest;
|
|
17
|
+
export type Response = CreateSessionResponse | ActivateSessionResponse | CloseSessionResponse | GetEndpointsResponse | ReadResponse | BrowseResponse | BrowseNextResponse | WriteResponse | CallResponse | TranslateBrowsePathsToNodeIdsResponse | CreateSubscriptionResponse | DeleteSubscriptionsResponse | TransferSubscriptionsResponse | CreateMonitoredItemsResponse | ModifyMonitoredItemsResponse | ModifySubscriptionResponse | SetMonitoringModeResponse | PublishResponse | RepublishResponse | DeleteMonitoredItemsResponse | SetPublishingModeResponse | FindServersOnNetworkResponse | FindServersResponse | HistoryReadResponse | RegisterNodesResponse | UnregisterNodesResponse | QueryFirstResponse | QueryNextResponse;
|
package/dist/opcua_client.d.ts
CHANGED
|
@@ -101,10 +101,10 @@ export interface EndpointWithUserIdentity {
|
|
|
101
101
|
endpointUrl: string;
|
|
102
102
|
userIdentity: UserIdentityInfo;
|
|
103
103
|
}
|
|
104
|
-
export
|
|
105
|
-
export
|
|
106
|
-
export
|
|
107
|
-
export
|
|
104
|
+
export type WithSessionFunc = (session: ClientSession) => Promise<void>;
|
|
105
|
+
export type WithSessionFuncP<T> = (session: ClientSession) => Promise<T>;
|
|
106
|
+
export type WithSubscriptionFunc = (session: ClientSession, subscription: ClientSubscription) => Promise<void>;
|
|
107
|
+
export type WithSubscriptionFuncP<T> = (session: ClientSession, subscription: ClientSubscription) => Promise<T>;
|
|
108
108
|
export interface OPCUAClient {
|
|
109
109
|
withSessionAsync<T>(endpointUrl: string | EndpointWithUserIdentity, inner_func: WithSessionFuncP<T>): Promise<T>;
|
|
110
110
|
withSession(endpointUrl: string | EndpointWithUserIdentity, inner_func: (session: ClientSession, done: (err?: Error) => void) => void, callback: (err?: Error) => void): void;
|
|
@@ -12,7 +12,7 @@ import { CreateSecureChannelCallbackFunc, FindServersOnNetworkRequestLike, FindS
|
|
|
12
12
|
import { UserIdentityInfo } from "../user_identity_info";
|
|
13
13
|
import { ClientSessionImpl } from "./client_session_impl";
|
|
14
14
|
import { IClientBase } from "./i_private_client";
|
|
15
|
-
|
|
15
|
+
type InternalClientState = "uninitialized" | "disconnected" | "connecting" | "connected" | "reconnecting" | "reconnecting_newchannel_connected" | "disconnecting";
|
|
16
16
|
/**
|
|
17
17
|
* @internal
|
|
18
18
|
*/
|
|
@@ -209,55 +209,6 @@ let g_ClientCounter = 0;
|
|
|
209
209
|
*/
|
|
210
210
|
// tslint:disable-next-line: max-classes-per-file
|
|
211
211
|
class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
|
|
212
|
-
constructor(options) {
|
|
213
|
-
options = options || {};
|
|
214
|
-
if (!options.clientCertificateManager) {
|
|
215
|
-
options.clientCertificateManager = (0, node_opcua_certificate_manager_1.getDefaultCertificateManager)("PKI");
|
|
216
|
-
}
|
|
217
|
-
options.privateKeyFile = options.privateKeyFile || options.clientCertificateManager.privateKey;
|
|
218
|
-
options.certificateFile =
|
|
219
|
-
options.certificateFile || path.join(options.clientCertificateManager.rootDir, "own/certs/client_certificate.pem");
|
|
220
|
-
super(options);
|
|
221
|
-
this._inside_repairConnection = false;
|
|
222
|
-
this._instanceNumber = g_ClientCounter++;
|
|
223
|
-
this._internalState = "uninitialized";
|
|
224
|
-
this.applicationName = options.applicationName || "NodeOPCUA-Client";
|
|
225
|
-
(0, node_opcua_assert_1.assert)(!this.applicationName.match(/^locale=/), "applicationName badly converted from LocalizedText");
|
|
226
|
-
(0, node_opcua_assert_1.assert)(!this.applicationName.match(/urn:/), "applicationName should not be a URI");
|
|
227
|
-
// we need to delay _applicationUri initialization
|
|
228
|
-
this._applicationUri = options.applicationUri || this._getBuiltApplicationUri();
|
|
229
|
-
this.disconnecting = false;
|
|
230
|
-
this.clientCertificateManager = options.clientCertificateManager;
|
|
231
|
-
this._secureChannel = null;
|
|
232
|
-
this._reconnectionIsCanceled = false;
|
|
233
|
-
this.endpointUrl = "";
|
|
234
|
-
this.clientName = options.clientName || "ClientSession";
|
|
235
|
-
// must be ZERO with Spec 1.0.2
|
|
236
|
-
this.protocolVersion = 0;
|
|
237
|
-
this._sessions = [];
|
|
238
|
-
this._serverEndpoints = [];
|
|
239
|
-
this.defaultSecureTokenLifetime = options.defaultSecureTokenLifetime || 600000;
|
|
240
|
-
this.tokenRenewalInterval = options.tokenRenewalInterval || 0;
|
|
241
|
-
(0, node_opcua_assert_1.assert)(isFinite(this.tokenRenewalInterval) && this.tokenRenewalInterval >= 0);
|
|
242
|
-
this.securityMode = (0, node_opcua_service_secure_channel_1.coerceMessageSecurityMode)(options.securityMode);
|
|
243
|
-
this.securityPolicy = (0, node_opcua_secure_channel_1.coerceSecurityPolicy)(options.securityPolicy);
|
|
244
|
-
this.serverCertificate = options.serverCertificate;
|
|
245
|
-
this.keepSessionAlive = typeof options.keepSessionAlive === "boolean" ? options.keepSessionAlive : false;
|
|
246
|
-
// statistics...
|
|
247
|
-
this._byteRead = 0;
|
|
248
|
-
this._byteWritten = 0;
|
|
249
|
-
this._transactionsPerformed = 0;
|
|
250
|
-
this._timedOutRequestCount = 0;
|
|
251
|
-
this.connectionStrategy = (0, node_opcua_secure_channel_1.coerceConnectionStrategy)(options.connectionStrategy || defaultConnectionStrategy);
|
|
252
|
-
/***
|
|
253
|
-
* @property keepPendingSessionsOnDisconnect²
|
|
254
|
-
* @type {boolean}
|
|
255
|
-
*/
|
|
256
|
-
this.keepPendingSessionsOnDisconnect = options.keepPendingSessionsOnDisconnect || false;
|
|
257
|
-
this.discoveryUrl = options.discoveryUrl || "";
|
|
258
|
-
this._setInternalState("disconnected");
|
|
259
|
-
this._transportSettings = options.transportSettings || {};
|
|
260
|
-
}
|
|
261
212
|
/**
|
|
262
213
|
* total number of requests that been canceled due to timeout
|
|
263
214
|
*/
|
|
@@ -313,6 +264,55 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
|
|
|
313
264
|
}
|
|
314
265
|
return super.emit(eventName, ...others);
|
|
315
266
|
}
|
|
267
|
+
constructor(options) {
|
|
268
|
+
options = options || {};
|
|
269
|
+
if (!options.clientCertificateManager) {
|
|
270
|
+
options.clientCertificateManager = (0, node_opcua_certificate_manager_1.getDefaultCertificateManager)("PKI");
|
|
271
|
+
}
|
|
272
|
+
options.privateKeyFile = options.privateKeyFile || options.clientCertificateManager.privateKey;
|
|
273
|
+
options.certificateFile =
|
|
274
|
+
options.certificateFile || path.join(options.clientCertificateManager.rootDir, "own/certs/client_certificate.pem");
|
|
275
|
+
super(options);
|
|
276
|
+
this._inside_repairConnection = false;
|
|
277
|
+
this._instanceNumber = g_ClientCounter++;
|
|
278
|
+
this._internalState = "uninitialized";
|
|
279
|
+
this.applicationName = options.applicationName || "NodeOPCUA-Client";
|
|
280
|
+
(0, node_opcua_assert_1.assert)(!this.applicationName.match(/^locale=/), "applicationName badly converted from LocalizedText");
|
|
281
|
+
(0, node_opcua_assert_1.assert)(!this.applicationName.match(/urn:/), "applicationName should not be a URI");
|
|
282
|
+
// we need to delay _applicationUri initialization
|
|
283
|
+
this._applicationUri = options.applicationUri || this._getBuiltApplicationUri();
|
|
284
|
+
this.disconnecting = false;
|
|
285
|
+
this.clientCertificateManager = options.clientCertificateManager;
|
|
286
|
+
this._secureChannel = null;
|
|
287
|
+
this._reconnectionIsCanceled = false;
|
|
288
|
+
this.endpointUrl = "";
|
|
289
|
+
this.clientName = options.clientName || "ClientSession";
|
|
290
|
+
// must be ZERO with Spec 1.0.2
|
|
291
|
+
this.protocolVersion = 0;
|
|
292
|
+
this._sessions = [];
|
|
293
|
+
this._serverEndpoints = [];
|
|
294
|
+
this.defaultSecureTokenLifetime = options.defaultSecureTokenLifetime || 600000;
|
|
295
|
+
this.tokenRenewalInterval = options.tokenRenewalInterval || 0;
|
|
296
|
+
(0, node_opcua_assert_1.assert)(isFinite(this.tokenRenewalInterval) && this.tokenRenewalInterval >= 0);
|
|
297
|
+
this.securityMode = (0, node_opcua_service_secure_channel_1.coerceMessageSecurityMode)(options.securityMode);
|
|
298
|
+
this.securityPolicy = (0, node_opcua_secure_channel_1.coerceSecurityPolicy)(options.securityPolicy);
|
|
299
|
+
this.serverCertificate = options.serverCertificate;
|
|
300
|
+
this.keepSessionAlive = typeof options.keepSessionAlive === "boolean" ? options.keepSessionAlive : false;
|
|
301
|
+
// statistics...
|
|
302
|
+
this._byteRead = 0;
|
|
303
|
+
this._byteWritten = 0;
|
|
304
|
+
this._transactionsPerformed = 0;
|
|
305
|
+
this._timedOutRequestCount = 0;
|
|
306
|
+
this.connectionStrategy = (0, node_opcua_secure_channel_1.coerceConnectionStrategy)(options.connectionStrategy || defaultConnectionStrategy);
|
|
307
|
+
/***
|
|
308
|
+
* @property keepPendingSessionsOnDisconnect²
|
|
309
|
+
* @type {boolean}
|
|
310
|
+
*/
|
|
311
|
+
this.keepPendingSessionsOnDisconnect = options.keepPendingSessionsOnDisconnect || false;
|
|
312
|
+
this.discoveryUrl = options.discoveryUrl || "";
|
|
313
|
+
this._setInternalState("disconnected");
|
|
314
|
+
this._transportSettings = options.transportSettings || {};
|
|
315
|
+
}
|
|
316
316
|
_cancel_reconnection(callback) {
|
|
317
317
|
// _cancel_reconnection is invoked during disconnection
|
|
318
318
|
// when we detect that a reconnection is in progress..
|
|
@@ -399,7 +399,8 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
|
|
|
399
399
|
if (err.message.match("BadCertificateInvalid") ||
|
|
400
400
|
err.message.match(/_socket has been disconnected by third party/)) {
|
|
401
401
|
warningLog("the server certificate has changed, we need to retrieve server certificate again: ", err.message);
|
|
402
|
-
|
|
402
|
+
const oldServerCertificate = this.serverCertificate;
|
|
403
|
+
warningLog("old server certificate ", oldServerCertificate ? (0, node_opcua_crypto_1.makeSHA1Thumbprint)(oldServerCertificate).toString("hex") : "undefined");
|
|
403
404
|
// the server may have shut down the channel because its certificate
|
|
404
405
|
// has changed ....
|
|
405
406
|
// let request the server certificate again ....
|
|
@@ -407,7 +408,14 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
|
|
|
407
408
|
if (err1) {
|
|
408
409
|
return _failAndRetry(err1, "Failing to fetch new server certificate", callback);
|
|
409
410
|
}
|
|
410
|
-
|
|
411
|
+
const newServerCertificate = this.serverCertificate;
|
|
412
|
+
warningLog("new server certificate ", (0, node_opcua_crypto_1.makeSHA1Thumbprint)(newServerCertificate).toString("hex"));
|
|
413
|
+
const sha1Old = (0, node_opcua_crypto_1.makeSHA1Thumbprint)(oldServerCertificate);
|
|
414
|
+
const sha1New = (0, node_opcua_crypto_1.makeSHA1Thumbprint)(newServerCertificate);
|
|
415
|
+
if (sha1Old === sha1New) {
|
|
416
|
+
warningLog("server certificate has not changed, but was expected to have changed");
|
|
417
|
+
return _failAndRetry(new Error("Server Certificate not changed"), "Failing to fetch new server certificate", callback);
|
|
418
|
+
}
|
|
411
419
|
this._internal_create_secure_channel(infiniteConnectionRetry, (err3) => {
|
|
412
420
|
if (err3) {
|
|
413
421
|
return _failAndRetry(err3, "trying to create new channel with new certificate", callback);
|