node-opcua-client-dynamic-extension-object 2.68.1 → 2.70.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/get_extra_data_type_manager.js +1 -1
- package/dist/get_extra_data_type_manager.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +6 -1
- package/dist/index.js.map +1 -1
- package/dist/private/populate_data_type_manager_104.js +1 -1
- package/dist/private/populate_data_type_manager_104.js.map +1 -1
- package/dist/promote_opaque_structure_in_notification_data.d.ts +3 -0
- package/dist/promote_opaque_structure_in_notification_data.js +52 -0
- package/dist/promote_opaque_structure_in_notification_data.js.map +1 -0
- package/dist/resolve_dynamic_extension_object.d.ts +1 -1
- package/dist/resolve_dynamic_extension_object.js.map +1 -1
- package/package.json +17 -17
- package/source/get_extra_data_type_manager.ts +1 -1
- package/source/index.ts +2 -1
- package/source/private/populate_data_type_manager_104.ts +3 -2
- package/source/promote_opaque_structure_in_notification_data.ts +40 -0
- package/source/resolve_dynamic_extension_object.ts +2 -2
|
@@ -39,7 +39,7 @@ function getExtraDataTypeManager(session) {
|
|
|
39
39
|
const dataTypeFactory1 = new node_opcua_factory_1.DataTypeFactory([(0, node_opcua_factory_1.getStandardDataTypeFactory)()]);
|
|
40
40
|
dataTypeManager.registerDataTypeFactory(namespaceIndex, dataTypeFactory1);
|
|
41
41
|
}
|
|
42
|
-
yield (0, populate_data_type_manager_1.populateDataTypeManager)(session, dataTypeManager,
|
|
42
|
+
yield (0, populate_data_type_manager_1.populateDataTypeManager)(session, dataTypeManager, true);
|
|
43
43
|
}
|
|
44
44
|
// istanbul ignore next
|
|
45
45
|
if (sessionPriv.$$extraDataTypeManager.namespaceArray.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get_extra_data_type_manager.js","sourceRoot":"","sources":["../source/get_extra_data_type_manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAgF;AAChF,2DAAiF;AACjF,yEAA8E;AAC9E,EAAE;AACF,uEAAiE;AACjE,6EAAuE;AAEvE,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;AAM3C,SAAsB,uBAAuB,CAAC,OAAsB;;QAChE,MAAM,WAAW,GAAoB,OAA0B,CAAC;QAChE,IAAI,CAAC,WAAW,CAAC,sBAAsB,EAAE;YACrC,MAAM,eAAe,GAAG,IAAI,8CAAoB,EAAE,CAAC;YAEnD,MAAM,cAAc,GAAG,MAAM,IAAA,8CAAkB,EAAC,WAAW,CAAC,CAAC;YAC7D,uBAAuB;YACvB,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC7B,QAAQ,CAAC,gFAAgF,CAAC,CAAC;aAC9F;YACD,uBAAuB;YACvB,IAAI,OAAO,EAAE;gBACT,QAAQ,CAAC,oBAAoB,EAAE,cAAc,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC;aAChF;YACD,WAAW,CAAC,sBAAsB,GAAG,eAAe,CAAC;YACrD,eAAe,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;YAClD,KAAK,IAAI,cAAc,GAAG,CAAC,EAAE,cAAc,GAAG,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE;gBACnF,MAAM,gBAAgB,GAAG,IAAI,oCAAe,CAAC,CAAC,IAAA,+CAA0B,GAAE,CAAC,CAAC,CAAC;gBAC7E,eAAe,CAAC,uBAAuB,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;aAC7E;YACD,MAAM,IAAA,oDAAuB,EAAC,OAAO,EAAE,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"get_extra_data_type_manager.js","sourceRoot":"","sources":["../source/get_extra_data_type_manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAgF;AAChF,2DAAiF;AACjF,yEAA8E;AAC9E,EAAE;AACF,uEAAiE;AACjE,6EAAuE;AAEvE,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;AAM3C,SAAsB,uBAAuB,CAAC,OAAsB;;QAChE,MAAM,WAAW,GAAoB,OAA0B,CAAC;QAChE,IAAI,CAAC,WAAW,CAAC,sBAAsB,EAAE;YACrC,MAAM,eAAe,GAAG,IAAI,8CAAoB,EAAE,CAAC;YAEnD,MAAM,cAAc,GAAG,MAAM,IAAA,8CAAkB,EAAC,WAAW,CAAC,CAAC;YAC7D,uBAAuB;YACvB,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC7B,QAAQ,CAAC,gFAAgF,CAAC,CAAC;aAC9F;YACD,uBAAuB;YACvB,IAAI,OAAO,EAAE;gBACT,QAAQ,CAAC,oBAAoB,EAAE,cAAc,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC;aAChF;YACD,WAAW,CAAC,sBAAsB,GAAG,eAAe,CAAC;YACrD,eAAe,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;YAClD,KAAK,IAAI,cAAc,GAAG,CAAC,EAAE,cAAc,GAAG,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE;gBACnF,MAAM,gBAAgB,GAAG,IAAI,oCAAe,CAAC,CAAC,IAAA,+CAA0B,GAAE,CAAC,CAAC,CAAC;gBAC7E,eAAe,CAAC,uBAAuB,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;aAC7E;YACD,MAAM,IAAA,oDAAuB,EAAC,OAAO,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;SACjE;QACD,uBAAuB;QACvB,IAAI,WAAW,CAAC,sBAAsB,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YAChE,MAAM,IAAI,KAAK,CAAC,gFAAgF,CAAC,CAAC;SACrG;QACD,OAAO,WAAW,CAAC,sBAAsB,CAAC;IAC9C,CAAC;CAAA;AA3BD,0DA2BC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -9,3 +9,4 @@ export * from "./get_extension_object_constructor";
|
|
|
9
9
|
export * from "./get_extra_data_type_manager";
|
|
10
10
|
export * from "./resolve_dynamic_extension_object";
|
|
11
11
|
export * from "./convert_data_type_definition_to_structuretype_schema";
|
|
12
|
+
export * from "./promote_opaque_structure_in_notification_data";
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
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);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -21,4 +25,5 @@ __exportStar(require("./get_extension_object_constructor"), exports);
|
|
|
21
25
|
__exportStar(require("./get_extra_data_type_manager"), exports);
|
|
22
26
|
__exportStar(require("./resolve_dynamic_extension_object"), exports);
|
|
23
27
|
__exportStar(require("./convert_data_type_definition_to_structuretype_schema"), exports);
|
|
28
|
+
__exportStar(require("./promote_opaque_structure_in_notification_data"), exports);
|
|
24
29
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,+DAA6C;AAC7C,4DAA0C;AAC1C,qEAAmD;AACnD,6DAA2C;AAC3C,qEAAmD;AACnD,gEAA8C;AAC9C,qEAAmD;AACnD,yFAAuE;AACvE,kFAAgE"}
|
|
@@ -12,11 +12,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.populateDataTypeManager104 = exports.readDataTypeDefinitionAndBuildType = void 0;
|
|
13
13
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
14
14
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
15
|
+
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
15
16
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
16
17
|
const node_opcua_schemas_1 = require("node-opcua-schemas");
|
|
17
18
|
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
18
19
|
const convert_data_type_definition_to_structuretype_schema_1 = require("../convert_data_type_definition_to_structuretype_schema");
|
|
19
|
-
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
20
20
|
const errorLog = (0, node_opcua_debug_1.make_errorLog)(__filename);
|
|
21
21
|
const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
|
|
22
22
|
function readDataTypeDefinitionAndBuildType(session, dataTypeNodeId, name, dataTypeFactory, cache) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"populate_data_type_manager_104.js","sourceRoot":"","sources":["../../source/private/populate_data_type_manager_104.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA2C;AAC3C,iEAAsE;
|
|
1
|
+
{"version":3,"file":"populate_data_type_manager_104.js","sourceRoot":"","sources":["../../source/private/populate_data_type_manager_104.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import { NotificationData } from "node-opcua-types";
|
|
2
|
+
import { IBasicSession } from "node-opcua-pseudo-session/source/basic_session_interface";
|
|
3
|
+
export declare function promoteOpaqueStructureInNotificationData(session: IBasicSession, notificationData: NotificationData[]): Promise<void>;
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.promoteOpaqueStructureInNotificationData = void 0;
|
|
13
|
+
const node_opcua_types_1 = require("node-opcua-types");
|
|
14
|
+
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
15
|
+
const promote_opaque_structure_1 = require("./promote_opaque_structure");
|
|
16
|
+
function promoteOpaqueStructureInNotificationData(session, notificationData) {
|
|
17
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
18
|
+
const dataValuesToPromote = [];
|
|
19
|
+
for (const notification of notificationData) {
|
|
20
|
+
if (!notification) {
|
|
21
|
+
continue;
|
|
22
|
+
}
|
|
23
|
+
if (notification instanceof node_opcua_types_1.DataChangeNotification) {
|
|
24
|
+
if (notification.monitoredItems) {
|
|
25
|
+
for (const monitoredItem of notification.monitoredItems) {
|
|
26
|
+
if (monitoredItem.value.value && monitoredItem.value.value.dataType === node_opcua_variant_1.DataType.ExtensionObject) {
|
|
27
|
+
dataValuesToPromote.push(monitoredItem.value);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
else if (notification instanceof node_opcua_types_1.EventNotificationList) {
|
|
33
|
+
if (notification.events) {
|
|
34
|
+
for (const events of notification.events) {
|
|
35
|
+
if (events.eventFields) {
|
|
36
|
+
// eslint-disable-next-line max-depth
|
|
37
|
+
for (const eventField of events.eventFields) {
|
|
38
|
+
// eslint-disable-next-line max-depth
|
|
39
|
+
if (eventField.dataType === node_opcua_variant_1.DataType.ExtensionObject) {
|
|
40
|
+
dataValuesToPromote.push({ value: eventField });
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
yield (0, promote_opaque_structure_1.promoteOpaqueStructure)(session, dataValuesToPromote);
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
exports.promoteOpaqueStructureInNotificationData = promoteOpaqueStructureInNotificationData;
|
|
52
|
+
//# sourceMappingURL=promote_opaque_structure_in_notification_data.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"promote_opaque_structure_in_notification_data.js","sourceRoot":"","sources":["../source/promote_opaque_structure_in_notification_data.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAmG;AACnG,2DAAuD;AAEvD,yEAAoE;AAEpE,SAAsB,wCAAwC,CAC1D,OAAsB,EACtB,gBAAoC;;QAEpC,MAAM,mBAAmB,GAAyB,EAAE,CAAC;QACrD,KAAK,MAAM,YAAY,IAAI,gBAAgB,EAAE;YACzC,IAAI,CAAC,YAAY,EAAE;gBACf,SAAS;aACZ;YACD,IAAI,YAAY,YAAY,yCAAsB,EAAE;gBAChD,IAAI,YAAY,CAAC,cAAc,EAAE;oBAC7B,KAAK,MAAM,aAAa,IAAI,YAAY,CAAC,cAAc,EAAE;wBACrD,IAAI,aAAa,CAAC,KAAK,CAAC,KAAK,IAAI,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,KAAK,6BAAQ,CAAC,eAAe,EAAE;4BAC9F,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;yBACjD;qBACJ;iBACJ;aACJ;iBAAM,IAAI,YAAY,YAAY,wCAAqB,EAAE;gBACtD,IAAI,YAAY,CAAC,MAAM,EAAE;oBACrB,KAAK,MAAM,MAAM,IAAI,YAAY,CAAC,MAAM,EAAE;wBACtC,IAAI,MAAM,CAAC,WAAW,EAAE;4BACpB,qCAAqC;4BACrC,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,WAAW,EAAE;gCACzC,qCAAqC;gCACrC,IAAI,UAAU,CAAC,QAAQ,KAAK,6BAAQ,CAAC,eAAe,EAAE;oCAClD,mBAAmB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;iCACnD;6BACJ;yBACJ;qBACJ;iBACJ;aACJ;SACJ;QACD,MAAM,IAAA,iDAAsB,EAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;IAC/D,CAAC;CAAA;AAlCD,4FAkCC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Variant } from "node-opcua-variant";
|
|
2
|
-
import { ExtraDataTypeManager } from "./extra_data_type_manager";
|
|
3
2
|
import { IBasicSession } from "node-opcua-pseudo-session";
|
|
3
|
+
import { ExtraDataTypeManager } from "./extra_data_type_manager";
|
|
4
4
|
export declare function resolveDynamicExtensionObject(session: IBasicSession, variant: Variant, dataTypeManager: ExtraDataTypeManager): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve_dynamic_extension_object.js","sourceRoot":"","sources":["../source/resolve_dynamic_extension_object.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAAwD;AACxD,6EAA+E;AAC/E,2DAAyE;AACzE,uDAA4D;
|
|
1
|
+
{"version":3,"file":"resolve_dynamic_extension_object.js","sourceRoot":"","sources":["../source/resolve_dynamic_extension_object.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-client-dynamic-extension-object",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.70.0",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module client-dynamic-extension-object",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -12,21 +12,21 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"chalk": "4.1.2",
|
|
14
14
|
"node-opcua-assert": "2.66.0",
|
|
15
|
-
"node-opcua-binary-stream": "2.
|
|
16
|
-
"node-opcua-constants": "2.
|
|
17
|
-
"node-opcua-data-model": "2.
|
|
18
|
-
"node-opcua-data-value": "2.
|
|
19
|
-
"node-opcua-debug": "2.
|
|
20
|
-
"node-opcua-extension-object": "2.
|
|
21
|
-
"node-opcua-factory": "2.
|
|
22
|
-
"node-opcua-nodeid": "2.
|
|
23
|
-
"node-opcua-pseudo-session": "2.
|
|
24
|
-
"node-opcua-schemas": "2.
|
|
25
|
-
"node-opcua-service-browse": "2.
|
|
26
|
-
"node-opcua-service-translate-browse-path": "2.
|
|
27
|
-
"node-opcua-status-code": "2.
|
|
28
|
-
"node-opcua-types": "2.
|
|
29
|
-
"node-opcua-variant": "2.
|
|
15
|
+
"node-opcua-binary-stream": "2.69.0",
|
|
16
|
+
"node-opcua-constants": "2.70.0",
|
|
17
|
+
"node-opcua-data-model": "2.70.0",
|
|
18
|
+
"node-opcua-data-value": "2.70.0",
|
|
19
|
+
"node-opcua-debug": "2.69.0",
|
|
20
|
+
"node-opcua-extension-object": "2.70.0",
|
|
21
|
+
"node-opcua-factory": "2.70.0",
|
|
22
|
+
"node-opcua-nodeid": "2.70.0",
|
|
23
|
+
"node-opcua-pseudo-session": "2.70.0",
|
|
24
|
+
"node-opcua-schemas": "2.70.0",
|
|
25
|
+
"node-opcua-service-browse": "2.70.0",
|
|
26
|
+
"node-opcua-service-translate-browse-path": "2.70.0",
|
|
27
|
+
"node-opcua-status-code": "2.70.0",
|
|
28
|
+
"node-opcua-types": "2.70.0",
|
|
29
|
+
"node-opcua-variant": "2.70.0"
|
|
30
30
|
},
|
|
31
31
|
"author": "Etienne Rossignon",
|
|
32
32
|
"license": "MIT",
|
|
@@ -43,5 +43,5 @@
|
|
|
43
43
|
"internet of things"
|
|
44
44
|
],
|
|
45
45
|
"homepage": "http://node-opcua.github.io/",
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "3b692ffb3e2ef0542da32f349fb0c76b3acc75ce"
|
|
47
47
|
}
|
|
@@ -33,7 +33,7 @@ export async function getExtraDataTypeManager(session: IBasicSession): Promise<E
|
|
|
33
33
|
const dataTypeFactory1 = new DataTypeFactory([getStandardDataTypeFactory()]);
|
|
34
34
|
dataTypeManager.registerDataTypeFactory(namespaceIndex, dataTypeFactory1);
|
|
35
35
|
}
|
|
36
|
-
await populateDataTypeManager(session, dataTypeManager,
|
|
36
|
+
await populateDataTypeManager(session, dataTypeManager, true);
|
|
37
37
|
}
|
|
38
38
|
// istanbul ignore next
|
|
39
39
|
if (sessionPriv.$$extraDataTypeManager.namespaceArray.length === 0) {
|
package/source/index.ts
CHANGED
|
@@ -8,4 +8,5 @@ export * from "./promote_opaque_structure";
|
|
|
8
8
|
export * from "./get_extension_object_constructor";
|
|
9
9
|
export * from "./get_extra_data_type_manager";
|
|
10
10
|
export * from "./resolve_dynamic_extension_object";
|
|
11
|
-
export * from "./convert_data_type_definition_to_structuretype_schema";
|
|
11
|
+
export * from "./convert_data_type_definition_to_structuretype_schema";
|
|
12
|
+
export * from "./promote_opaque_structure_in_notification_data";
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { assert } from "node-opcua-assert";
|
|
2
2
|
import { AttributeIds, BrowseDirection } from "node-opcua-data-model";
|
|
3
|
+
import { make_debugLog, make_errorLog } from "node-opcua-debug";
|
|
3
4
|
import { DataTypeFactory } from "node-opcua-factory";
|
|
4
5
|
import { NodeId, resolveNodeId } from "node-opcua-nodeid";
|
|
5
6
|
import { IBasicSession, BrowseDescriptionLike } from "node-opcua-pseudo-session";
|
|
@@ -13,7 +14,6 @@ import {
|
|
|
13
14
|
CacheForFieldResolution,
|
|
14
15
|
convertDataTypeDefinitionToStructureTypeSchema
|
|
15
16
|
} from "../convert_data_type_definition_to_structuretype_schema";
|
|
16
|
-
import { make_debugLog, make_errorLog } from "node-opcua-debug";
|
|
17
17
|
const errorLog = make_errorLog(__filename);
|
|
18
18
|
const debugLog =make_debugLog(__filename);
|
|
19
19
|
|
|
@@ -106,12 +106,13 @@ export async function populateDataTypeManager104(session: IBasicSession, dataTyp
|
|
|
106
106
|
}
|
|
107
107
|
}
|
|
108
108
|
|
|
109
|
-
async function fencedAction(lambda: () => Promise<void>) {
|
|
109
|
+
async function fencedAction(lambda: () => Promise<void>): Promise<void> {
|
|
110
110
|
busyCount += 1;
|
|
111
111
|
await lambda();
|
|
112
112
|
busyCount -= 1;
|
|
113
113
|
flushBrowse();
|
|
114
114
|
}
|
|
115
|
+
|
|
115
116
|
function flushBrowse() {
|
|
116
117
|
assert(busyCount >= 0);
|
|
117
118
|
if (pendingContinuationPoints.length) {
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { NotificationData, DataChangeNotification, EventNotificationList } from "node-opcua-types";
|
|
2
|
+
import { Variant, DataType } from "node-opcua-variant";
|
|
3
|
+
import { IBasicSession } from "node-opcua-pseudo-session/source/basic_session_interface";
|
|
4
|
+
import { promoteOpaqueStructure } from "./promote_opaque_structure";
|
|
5
|
+
|
|
6
|
+
export async function promoteOpaqueStructureInNotificationData(
|
|
7
|
+
session: IBasicSession,
|
|
8
|
+
notificationData: NotificationData[]
|
|
9
|
+
): Promise<void> {
|
|
10
|
+
const dataValuesToPromote: { value: Variant }[] = [];
|
|
11
|
+
for (const notification of notificationData) {
|
|
12
|
+
if (!notification) {
|
|
13
|
+
continue;
|
|
14
|
+
}
|
|
15
|
+
if (notification instanceof DataChangeNotification) {
|
|
16
|
+
if (notification.monitoredItems) {
|
|
17
|
+
for (const monitoredItem of notification.monitoredItems) {
|
|
18
|
+
if (monitoredItem.value.value && monitoredItem.value.value.dataType === DataType.ExtensionObject) {
|
|
19
|
+
dataValuesToPromote.push(monitoredItem.value);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
} else if (notification instanceof EventNotificationList) {
|
|
24
|
+
if (notification.events) {
|
|
25
|
+
for (const events of notification.events) {
|
|
26
|
+
if (events.eventFields) {
|
|
27
|
+
// eslint-disable-next-line max-depth
|
|
28
|
+
for (const eventField of events.eventFields) {
|
|
29
|
+
// eslint-disable-next-line max-depth
|
|
30
|
+
if (eventField.dataType === DataType.ExtensionObject) {
|
|
31
|
+
dataValuesToPromote.push({ value: eventField });
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
await promoteOpaqueStructure(session, dataValuesToPromote);
|
|
40
|
+
}
|
|
@@ -2,13 +2,13 @@ import { BinaryStream } from "node-opcua-binary-stream";
|
|
|
2
2
|
import { ExtensionObject, OpaqueStructure } from "node-opcua-extension-object";
|
|
3
3
|
import { DataType, Variant, VariantArrayType } from "node-opcua-variant";
|
|
4
4
|
import { hexDump, make_warningLog } from "node-opcua-debug";
|
|
5
|
-
//
|
|
6
|
-
import { ExtraDataTypeManager } from "./extra_data_type_manager";
|
|
7
5
|
import { IBasicSession } from "node-opcua-pseudo-session";
|
|
8
6
|
import { NodeId } from "node-opcua-nodeid";
|
|
9
7
|
import { ConstructorFunc } from "node-opcua-factory";
|
|
10
8
|
import { BrowseDirection, NodeClassMask, ResultMask } from "node-opcua-data-model";
|
|
11
9
|
import { StatusCodes } from "node-opcua-status-code";
|
|
10
|
+
//
|
|
11
|
+
import { ExtraDataTypeManager } from "./extra_data_type_manager";
|
|
12
12
|
import { readDataTypeDefinitionAndBuildType } from "./private/populate_data_type_manager_104";
|
|
13
13
|
|
|
14
14
|
const warningLog = make_warningLog(__filename);
|