node-opcua-client-dynamic-extension-object 2.99.0 → 2.101.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.
|
@@ -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;AAI5D,iEAAmF;
|
|
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.101.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",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"node-opcua-extension-object": "2.99.0",
|
|
21
21
|
"node-opcua-factory": "2.99.0",
|
|
22
22
|
"node-opcua-nodeid": "2.99.0",
|
|
23
|
-
"node-opcua-pseudo-session": "2.
|
|
23
|
+
"node-opcua-pseudo-session": "2.101.0",
|
|
24
24
|
"node-opcua-schemas": "2.99.0",
|
|
25
25
|
"node-opcua-service-browse": "2.99.0",
|
|
26
26
|
"node-opcua-service-translate-browse-path": "2.99.0",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"internet of things"
|
|
44
44
|
],
|
|
45
45
|
"homepage": "http://node-opcua.github.io/",
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "77abad969406b6d7d76e6bc07a8aa94ae07f3db2",
|
|
47
47
|
"files": [
|
|
48
48
|
"dist",
|
|
49
49
|
"source"
|
|
@@ -6,7 +6,6 @@ import { IBasicSession } from "node-opcua-pseudo-session";
|
|
|
6
6
|
import { NodeId } from "node-opcua-nodeid";
|
|
7
7
|
import { ConstructorFunc, StructuredTypeField } from "node-opcua-factory";
|
|
8
8
|
import { BrowseDirection, NodeClassMask, ResultMask } from "node-opcua-data-model";
|
|
9
|
-
import { StatusCodes } from "node-opcua-status-code";
|
|
10
9
|
//
|
|
11
10
|
import { ExtraDataTypeManager } from "./extra_data_type_manager";
|
|
12
11
|
import { readDataTypeDefinitionAndBuildType } from "./private/populate_data_type_manager_104";
|
|
@@ -19,8 +18,8 @@ async function getOrExtractConstructor(
|
|
|
19
18
|
dataTypeManager: ExtraDataTypeManager
|
|
20
19
|
): Promise<ConstructorFunc> {
|
|
21
20
|
const dataTypeFactory = dataTypeManager.getDataTypeFactoryForNamespace(binaryEncodingNodeId.namespace);
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
|
|
22
|
+
|
|
24
23
|
const Constructor = dataTypeFactory.getConstructor(binaryEncodingNodeId);
|
|
25
24
|
if (Constructor) {
|
|
26
25
|
return Constructor;
|
|
@@ -48,7 +47,7 @@ async function getOrExtractConstructor(
|
|
|
48
47
|
}
|
|
49
48
|
await readDataTypeDefinitionAndBuildType(session, dataTypeNodeId, r.browseName.name!, dataTypeFactory, {});
|
|
50
49
|
|
|
51
|
-
const structureInfo
|
|
50
|
+
const structureInfo = dataTypeFactory.getStructureInfoForDataType(dataTypeNodeId)!;
|
|
52
51
|
if (!structureInfo.constructor) {
|
|
53
52
|
throw new Error("Cannot find constructor for abstract DataType");
|
|
54
53
|
}
|
|
@@ -59,7 +58,7 @@ export async function resolveOpaqueStructureInExtentionObject(
|
|
|
59
58
|
session: IBasicSession,
|
|
60
59
|
dataTypeManager: ExtraDataTypeManager,
|
|
61
60
|
object: ExtensionObject
|
|
62
|
-
) {
|
|
61
|
+
): Promise<void> {
|
|
63
62
|
const schema = object.schema;
|
|
64
63
|
interface D {
|
|
65
64
|
dataTypeManager: ExtraDataTypeManager;
|
|
@@ -83,10 +82,10 @@ export async function resolveOpaqueStructureInExtentionObject(
|
|
|
83
82
|
return variant.value as unknown;
|
|
84
83
|
}
|
|
85
84
|
function fixOpaqueStructure(object: any, field: StructuredTypeField, data: D, args?: any) {
|
|
86
|
-
|
|
87
|
-
|
|
85
|
+
if (field.category === "complex" && !field.allowSubType) {
|
|
86
|
+
return;
|
|
88
87
|
}
|
|
89
|
-
if (field.category === "basic"
|
|
88
|
+
if (field.category === "basic" && field.fieldType !== "Variant") {
|
|
90
89
|
return;
|
|
91
90
|
}
|
|
92
91
|
console.log("field", field.name, field.category, field.fieldType);
|
|
@@ -152,7 +151,7 @@ async function resolveDynamicExtensionObjectV(
|
|
|
152
151
|
} catch (err) {
|
|
153
152
|
warningLog("Constructor = ", Constructor.name);
|
|
154
153
|
warningLog("opaqueStructure = ", opaque?.nodeId?.toString());
|
|
155
|
-
warningLog("opaqueStructure = ", hexDump(opaque.buffer,132,100));
|
|
154
|
+
warningLog("opaqueStructure = ", hexDump(opaque.buffer, 132, 100));
|
|
156
155
|
warningLog(hexDump(opaque.buffer));
|
|
157
156
|
warningLog("resolveDynamicExtensionObjectV err = ", err);
|
|
158
157
|
// try again for debugging
|
|
@@ -162,7 +161,7 @@ async function resolveDynamicExtensionObjectV(
|
|
|
162
161
|
} catch (err) {
|
|
163
162
|
warningLog("err", err);
|
|
164
163
|
warningLog("opaqueStructure = ", opaque.nodeId.toString());
|
|
165
|
-
warningLog("opaqueStructure = ", "0x" + hexDump(opaque.buffer,132,100));
|
|
164
|
+
warningLog("opaqueStructure = ", "0x" + hexDump(opaque.buffer, 132, 100));
|
|
166
165
|
warningLog(hexDump(opaque.buffer));
|
|
167
166
|
warningLog(dataTypeManager.toString());
|
|
168
167
|
throw err;
|