node-opcua-convert-nodeset-to-javascript 2.104.0 → 2.105.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/private/utils.js +3 -9
- package/dist/private/utils.js.map +1 -1
- package/package.json +17 -17
- package/source/private/utils.ts +4 -12
package/dist/private/utils.js
CHANGED
|
@@ -15,6 +15,8 @@ const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
|
15
15
|
const node_opcua_constants_1 = require("node-opcua-constants");
|
|
16
16
|
const node_opcua_types_1 = require("node-opcua-types");
|
|
17
17
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
18
|
+
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
19
|
+
const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
|
|
18
20
|
function getDefinition(session, nodeId) {
|
|
19
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
20
22
|
const dataValue = yield session.read({ nodeId, attributeId: node_opcua_data_model_1.AttributeIds.DataTypeDefinition });
|
|
@@ -97,11 +99,6 @@ function getModellingRule(session, nodeId) {
|
|
|
97
99
|
});
|
|
98
100
|
if (!browseResult.references || browseResult.references.length === 0) {
|
|
99
101
|
return null;
|
|
100
|
-
/*
|
|
101
|
-
console.log(nodeId.toString());
|
|
102
|
-
const browseName = await getBrowseName(session, nodeId);
|
|
103
|
-
throw new Error("No modelling rule for " + nodeId.toString() + " " + browseName.toString());
|
|
104
|
-
*/
|
|
105
102
|
}
|
|
106
103
|
return browseResult.references[0].browseName.name;
|
|
107
104
|
});
|
|
@@ -197,7 +194,6 @@ function getTypeDefOrBaseType(session, nodeId) {
|
|
|
197
194
|
});
|
|
198
195
|
}
|
|
199
196
|
if (!browseResult.references || browseResult.references.length === 0) {
|
|
200
|
-
// console.log("cannot find type definition / subtype for " + nodeId.toString());
|
|
201
197
|
return new node_opcua_types_1.ReferenceDescription({});
|
|
202
198
|
}
|
|
203
199
|
return browseResult.references[0];
|
|
@@ -215,7 +211,7 @@ function getTypeDefinition(session, nodeId) {
|
|
|
215
211
|
resultMask: 0xffff
|
|
216
212
|
});
|
|
217
213
|
if (!browseResult.references || browseResult.references.length === 0) {
|
|
218
|
-
|
|
214
|
+
debugLog("no subtype", nodeId.toString());
|
|
219
215
|
throw new Error("No subtype");
|
|
220
216
|
}
|
|
221
217
|
return browseResult.references[0];
|
|
@@ -231,8 +227,6 @@ function readBrowseName(session, nodeId) {
|
|
|
231
227
|
const dataValue = yield session.read(nodeToRead);
|
|
232
228
|
// istanbul ignore next
|
|
233
229
|
if (dataValue.statusCode.isNotGood()) {
|
|
234
|
-
// throw new Error("Error " + dataValue.statusCode.toString() + " " + nodeId.toString());
|
|
235
|
-
// console.log("Error " + dataValue.statusCode.toString() + " " + nodeId.toString());
|
|
236
230
|
return new node_opcua_data_model_1.QualifiedName({ name: "", namespaceIndex: 0 });
|
|
237
231
|
}
|
|
238
232
|
const dataTypeName = dataValue.value.value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/private/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAA8H;AAC9H,yDAA+E;AAC/E,+DAAmD;AAEnD,uDAA0F;AAE1F,2DAA8C;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/private/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAA8H;AAC9H,yDAA+E;AAC/E,+DAAmD;AAEnD,uDAA0F;AAE1F,2DAA8C;AAC9C,uDAAiD;AAEjD,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAE3C,SAAsB,aAAa,CAAC,OAAsB,EAAE,MAAc;;QACtE,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,oCAAY,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAC/F,OAAQ,SAAS,CAAC,KAAK,CAAC,KAA4B,IAAI,IAAI,CAAC;IACjE,CAAC;CAAA;AAHD,sCAGC;AACD,SAAsB,aAAa,CAAC,OAAsB,EAAE,MAAc;;QACtE,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,oCAAY,CAAC,UAAU,EAAE,CAAC,CAAC;QACvF,OAAO,SAAS,CAAC,KAAK,CAAC,KAAsB,CAAC;IAClD,CAAC;CAAA;AAHD,sCAGC;AACD,SAAsB,iBAAiB,CAAC,OAAsB,EAAE,MAAc;;QAC1E,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,oCAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrF,OAAQ,SAAS,CAAC,KAAK,CAAC,KAAgB,IAAI,IAAI,CAAC;IACrD,CAAC;CAAA;AAHD,8CAGC;AACD,SAAsB,aAAa,CAAC,OAAsB,EAAE,MAAc;;QACtE,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,oCAAY,CAAC,UAAU,EAAE,CAAC,CAAC;QACvF,OAAO,SAAS,CAAC,KAAK,CAAC,KAAgB,CAAC;IAC5C,CAAC;CAAA;AAHD,sCAGC;AACD,SAAsB,cAAc,CAAC,OAAsB,EAAE,MAAc;;QACvE,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,oCAAY,CAAC,WAAW,EAAE,CAAC,CAAC;QACxF,OAAO,SAAS,CAAC,KAAK,CAAC,KAAsB,CAAC;IAClD,CAAC;CAAA;AAHD,wCAGC;AAED,SAAsB,YAAY,CAAC,OAAsB,EAAE,MAAc;;QACrE,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,oCAAY,CAAC,SAAS,EAAE,CAAC,CAAC;QACtF,OAAO,SAAS,CAAC,KAAK,CAAC,KAAkB,CAAC;IAC9C,CAAC;CAAA;AAHD,oCAGC;AACD,SAAsB,WAAW,CAAC,OAAsB,EAAE,MAAc;;QACpE,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;YACtC,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,IAAI;YACrB,aAAa,EAAE,qCAAa,CAAC,MAAM,GAAG,qCAAa,CAAC,MAAM,GAAG,iCAAS,CAAC,QAAQ;YAC/E,MAAM;YACN,eAAe,EAAE,IAAA,iCAAa,EAAC,UAAU,CAAC;YAC1C,UAAU,EAAE,MAAM;SACrB,CAAC,CAAC;QACH,OAAO,YAAY,CAAC,UAAU,IAAI,EAAE,CAAC;IACzC,CAAC;CAAA;AAVD,kCAUC;AACD,SAAsB,iBAAiB,CAAC,OAAsB,EAAE,MAAc;;QAC1E,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;YACtC,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,IAAI;YACrB,aAAa,EAAE,qCAAa,CAAC,MAAM,GAAG,qCAAa,CAAC,MAAM,GAAG,iCAAS,CAAC,QAAQ;YAC/E,MAAM;YACN,eAAe,EAAE,IAAA,iCAAa,EAAC,WAAW,CAAC;YAC3C,UAAU,EAAE,MAAM;SACrB,CAAC,CAAC;QACH,OAAO,YAAY,CAAC,UAAU,IAAI,EAAE,CAAC;IACzC,CAAC;CAAA;AAVD,8CAUC;AAED,SAAsB,gBAAgB,CAAC,OAAsB,EAAE,MAAc;;QACzE,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;YACtC,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,IAAI;YACrB,aAAa,EAAE,qCAAa,CAAC,MAAM,GAAG,qCAAa,CAAC,MAAM,GAAG,iCAAS,CAAC,QAAQ;YAC/E,MAAM;YACN,eAAe,EAAE,IAAA,iCAAa,EAAC,kBAAkB,CAAC;YAClD,UAAU,EAAE,MAAM;SACrB,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,CAAC,UAAU,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YAClE,OAAO,IAAI,CAAC;SACf;QACD,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAA0B,CAAC;IAC5E,CAAC;CAAA;AAbD,4CAaC;AACD,SAAsB,iBAAiB,CAAC,OAAsB,EAAE,MAAc;;QAC1E,MAAM,CAAC,GAAG,MAAiB,CAAC;QAC5B,IAAI,CAAC,CAAC,SAAS,KAAK,CAAC,IAAI,CAAC,CAAC,cAAc,KAAK,8BAAU,CAAC,OAAO,IAAI,CAAC,CAAC,KAAK,KAAK,kCAAW,CAAC,SAAS,EAAE;YACnG,OAAO,IAAI,CAAC;SACf;QACD,IAAI,CAAC,CAAC,SAAS,KAAK,CAAC,IAAI,CAAC,CAAC,cAAc,KAAK,8BAAU,CAAC,OAAO,IAAI,CAAC,CAAC,KAAK,IAAI,kCAAW,CAAC,cAAc,EAAE;YACvG,OAAO,KAAK,CAAC;SAChB;QACD,MAAM,CAAC,GAAG,MAAM,qBAAqB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACvD,OAAO,MAAM,iBAAiB,CAAC,OAAO,EAAE,CAAE,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC;CAAA;AAVD,8CAUC;AAED,SAAsB,aAAa,CAAC,OAAsB,EAAE,MAAc;;QACtE,MAAM,CAAC,GAAG,MAAiB,CAAC;QAC5B,IAAI,CAAC,CAAC,SAAS,KAAK,CAAC,IAAI,CAAC,CAAC,cAAc,KAAK,8BAAU,CAAC,OAAO,IAAI,CAAC,CAAC,KAAK,KAAK,kCAAW,CAAC,WAAW,EAAE;YACrG,OAAO,IAAI,CAAC;SACf;QACD,IAAI,CAAC,CAAC,SAAS,KAAK,CAAC,IAAI,CAAC,CAAC,cAAc,KAAK,8BAAU,CAAC,OAAO,IAAI,CAAC,CAAC,KAAK,IAAI,kCAAW,CAAC,cAAc,EAAE;YACvG,OAAO,KAAK,CAAC;SAChB;QACD,MAAM,CAAC,GAAG,MAAM,qBAAqB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACvD,OAAO,MAAM,aAAa,CAAC,OAAO,EAAE,CAAE,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;CAAA;AAVD,sCAUC;AAED,SAAsB,oBAAoB,CAAC,OAAsB,EAAE,cAAsB;;QACrF,MAAM,CAAC,GAAG,cAAyB,CAAC;QACpC,IAAI,CAAC,CAAC,SAAS,KAAK,CAAC,IAAI,CAAC,CAAC,cAAc,KAAK,8BAAU,CAAC,OAAO,IAAI,CAAC,CAAC,KAAK,IAAI,kCAAW,CAAC,cAAc,EAAE;YACvG,OAAO,cAAc,CAAC,KAAiB,CAAC;SAC3C;QACD,MAAM,CAAC,GAAG,MAAM,qBAAqB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAC/D,OAAO,MAAM,oBAAoB,CAAC,OAAO,EAAE,CAAE,CAAC,MAAM,CAAC,CAAC;IAC1D,CAAC;CAAA;AAPD,oDAOC;AAED,SAAsB,qBAAqB,CAAC,OAAsB,EAAE,MAAc;;QAC9E,IAAI,MAAM,CAAC,OAAO,EAAE,EAAE;YAClB,OAAO,IAAI,CAAC;SACf;QACD,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;YACtC,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,IAAI;YACrB,aAAa,EAAE,CAAC;YAChB,MAAM;YACN,eAAe,EAAE,IAAA,iCAAa,EAAC,YAAY,CAAC;YAC5C,UAAU,EAAE,MAAM;SACrB,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,CAAC,UAAU,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YAClE,OAAO,IAAI,CAAC;SACf;QACD,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC;CAAA;AAhBD,sDAgBC;AACD,SAAsB,gBAAgB,CAAC,OAAsB,EAAE,MAAc;;QACzE,MAAM,CAAC,GAAG,MAAM,qBAAqB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACvD,IAAI,CAAC,CAAC,EAAE;YACJ,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;SACjC;QACD,OAAO,CAAC,CAAC;IACb,CAAC;CAAA;AAND,4CAMC;AAED,SAAsB,oBAAoB,CAAC,OAAsB,EAAE,MAAc;;QAC7E,IAAI,YAAY,GAAiB,MAAM,OAAO,CAAC,MAAM,CAAC;YAClD,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,IAAI;YACrB,aAAa,EAAE,CAAC;YAChB,MAAM;YACN,eAAe,EAAE,IAAA,iCAAa,EAAC,mBAAmB,CAAC;YACnD,UAAU,EAAE,MAAM;SACrB,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,UAAU,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YAClE,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBAChC,eAAe,EAAE,uCAAe,CAAC,OAAO;gBACxC,eAAe,EAAE,IAAI;gBACrB,aAAa,EAAE,CAAC;gBAChB,MAAM;gBACN,eAAe,EAAE,IAAA,iCAAa,EAAC,YAAY,CAAC;gBAC5C,UAAU,EAAE,MAAM;aACrB,CAAC,CAAC;SACN;QACD,IAAI,CAAC,YAAY,CAAC,UAAU,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YAClE,OAAO,IAAI,uCAAoB,CAAC,EAAE,CAAC,CAAC;SACvC;QACD,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC;CAAA;AAxBD,oDAwBC;AACD,SAAsB,iBAAiB,CAAC,OAAsB,EAAE,MAAc;;QAC1E,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;YACtC,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,IAAI;YACrB,aAAa,EAAE,CAAC;YAChB,MAAM;YACN,eAAe,EAAE,IAAA,iCAAa,EAAC,mBAAmB,CAAC;YACnD,UAAU,EAAE,MAAM;SACrB,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,CAAC,UAAU,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YAClE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;SACjC;QACD,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC;CAAA;AAdD,8CAcC;AAED,SAAe,cAAc,CAAC,OAAsB,EAAE,MAAc;;QAChE,MAAM,UAAU,GAAG;YACf,WAAW,EAAE,oCAAY,CAAC,UAAU;YACpC,MAAM;SACT,CAAC;QACF,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjD,uBAAuB;QACvB,IAAI,SAAS,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE;YAClC,OAAO,IAAI,qCAAa,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC;SAC7D;QACD,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC;QAC3C,OAAO,YAAY,CAAC;IACxB,CAAC;CAAA;AAOD,wBAAwB;AACxB,SAAsB,6BAA6B,CAAC,OAAsB,EAAE,UAAkB;;QAC1F,MAAM,YAAY,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAE/D,IAAI,QAAkB,CAAC;QAEvB,IAAI,UAAU,CAAC,SAAS,KAAK,CAAC,IAAI,UAAU,CAAC,KAAK,KAAK,kCAAW,CAAC,WAAW,EAAE;YAC5E,OAAO,EAAE,QAAQ,EAAE,6BAAQ,CAAC,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC;SAClE;QACD,IAAI,UAAU,CAAC,SAAS,KAAK,CAAC,IAAI,6BAAQ,CAAC,UAAU,CAAC,KAAe,CAAC,EAAE;YACpE,QAAQ,GAAG,UAAU,CAAC,KAAiB,CAAC;YACxC,OAAO,EAAE,QAAQ,EAAE,CAAC;SACvB;QAED,gDAAgD;QAChD,iBAAiB;QACjB,MAAM,YAAY,GAAG;YACjB,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,MAAM,EAAE,UAAU;YAClB,eAAe,EAAE,IAAA,iCAAa,EAAC,YAAY,CAAC;YAC5C,UAAU,EAAE,IAAI;SACnB,CAAC;QACF,sCAAsC;QACtC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAExD,MAAM,UAAU,GAAG,YAAa,CAAC,UAAU,CAAC;QAE5C,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YACxC,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC1E;QACD,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAEpC,MAAM,IAAI,GAAG,MAAM,6BAA6B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAClE,IAAI,IAAI,CAAC,aAAa,EAAE;YACpB,uCAAY,IAAI,KAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,YAAY,CAAC,IAAK,IAAG;SACtF;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CAAA;AApCD,sEAoCC;AAED,SAAsB,2BAA2B,CAAC,OAAsB,EAAE,MAAc;;QACpF,MAAM,EAAE,GAAG,MAAM,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC9C,MAAM,EAAE,GAAG,MAAM,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACpD,OAAgC,EAAG,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACvD,CAAC;CAAA;AAJD,kEAIC;AACD,SAAsB,YAAY,CAAC,OAAsB,EAAE,MAAc;;QACrE,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,oCAAY,CAAC,SAAS,EAAE,CAAC,CAAC;QAC/F,OAAO,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC;IAC1C,CAAC;CAAA;AAHD,oCAGC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-convert-nodeset-to-javascript",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.105.0",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module convert-nodeset-to-javascript",
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -15,26 +15,26 @@
|
|
|
15
15
|
"@types/wordwrap": "^1.0.1",
|
|
16
16
|
"case-anything": "1.1.5",
|
|
17
17
|
"chalk": "4.1.2",
|
|
18
|
-
"node-opcua-address-space": "2.
|
|
19
|
-
"node-opcua-address-space-base": "2.
|
|
20
|
-
"node-opcua-assert": "2.
|
|
18
|
+
"node-opcua-address-space": "2.105.0",
|
|
19
|
+
"node-opcua-address-space-base": "2.105.0",
|
|
20
|
+
"node-opcua-assert": "2.105.0",
|
|
21
21
|
"node-opcua-constants": "2.98.1",
|
|
22
|
-
"node-opcua-data-model": "2.
|
|
23
|
-
"node-opcua-debug": "2.
|
|
24
|
-
"node-opcua-extension-object": "2.
|
|
25
|
-
"node-opcua-nodeid": "2.
|
|
22
|
+
"node-opcua-data-model": "2.105.0",
|
|
23
|
+
"node-opcua-debug": "2.105.0",
|
|
24
|
+
"node-opcua-extension-object": "2.105.0",
|
|
25
|
+
"node-opcua-nodeid": "2.105.0",
|
|
26
26
|
"node-opcua-nodesets": "2.103.0",
|
|
27
|
-
"node-opcua-pseudo-session": "2.
|
|
28
|
-
"node-opcua-status-code": "2.
|
|
29
|
-
"node-opcua-types": "2.
|
|
30
|
-
"node-opcua-utils": "2.
|
|
31
|
-
"node-opcua-variant": "2.
|
|
27
|
+
"node-opcua-pseudo-session": "2.105.0",
|
|
28
|
+
"node-opcua-status-code": "2.105.0",
|
|
29
|
+
"node-opcua-types": "2.105.0",
|
|
30
|
+
"node-opcua-utils": "2.105.0",
|
|
31
|
+
"node-opcua-variant": "2.105.0",
|
|
32
32
|
"wordwrap": "^1.0.0"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
|
-
"node-opcua-leak-detector": "2.
|
|
36
|
-
"node-opcua-packet-analyzer": "2.
|
|
37
|
-
"node-opcua-service-translate-browse-path": "2.
|
|
35
|
+
"node-opcua-leak-detector": "2.105.0",
|
|
36
|
+
"node-opcua-packet-analyzer": "2.105.0",
|
|
37
|
+
"node-opcua-service-translate-browse-path": "2.105.0",
|
|
38
38
|
"should": "^13.2.3"
|
|
39
39
|
},
|
|
40
40
|
"author": "Etienne Rossignon",
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"internet of things"
|
|
53
53
|
],
|
|
54
54
|
"homepage": "http://node-opcua.github.io/",
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "41c30f321debfe92128905d97a52426b9d7f9b9e",
|
|
56
56
|
"files": [
|
|
57
57
|
"dist",
|
|
58
58
|
"source"
|
package/source/private/utils.ts
CHANGED
|
@@ -5,7 +5,9 @@ import { IBasicSession } from "node-opcua-pseudo-session";
|
|
|
5
5
|
import { BrowseResult, DataTypeDefinition, ReferenceDescription } from "node-opcua-types";
|
|
6
6
|
import { ModellingRuleType } from "node-opcua-address-space-base";
|
|
7
7
|
import { DataType } from "node-opcua-variant";
|
|
8
|
-
import {
|
|
8
|
+
import { make_debugLog } from "node-opcua-debug";
|
|
9
|
+
|
|
10
|
+
const debugLog = make_debugLog(__filename);
|
|
9
11
|
|
|
10
12
|
export async function getDefinition(session: IBasicSession, nodeId: NodeId): Promise<DataTypeDefinition | null> {
|
|
11
13
|
const dataValue = await session.read({ nodeId, attributeId: AttributeIds.DataTypeDefinition });
|
|
@@ -66,16 +68,10 @@ export async function getModellingRule(session: IBasicSession, nodeId: NodeId):
|
|
|
66
68
|
});
|
|
67
69
|
if (!browseResult.references || browseResult.references.length === 0) {
|
|
68
70
|
return null;
|
|
69
|
-
/*
|
|
70
|
-
console.log(nodeId.toString());
|
|
71
|
-
const browseName = await getBrowseName(session, nodeId);
|
|
72
|
-
throw new Error("No modelling rule for " + nodeId.toString() + " " + browseName.toString());
|
|
73
|
-
*/
|
|
74
71
|
}
|
|
75
72
|
return browseResult.references[0].browseName.name! as ModellingRuleType;
|
|
76
73
|
}
|
|
77
74
|
export async function isExtensionObject(session: IBasicSession, nodeId: NodeId): Promise<boolean> {
|
|
78
|
-
|
|
79
75
|
const n = nodeId as INodeId;
|
|
80
76
|
if (n.namespace === 0 && n.identifierType === NodeIdType.NUMERIC && n.value === DataTypeIds.Structure) {
|
|
81
77
|
return true;
|
|
@@ -154,7 +150,6 @@ export async function getTypeDefOrBaseType(session: IBasicSession, nodeId: NodeI
|
|
|
154
150
|
});
|
|
155
151
|
}
|
|
156
152
|
if (!browseResult.references || browseResult.references.length === 0) {
|
|
157
|
-
// console.log("cannot find type definition / subtype for " + nodeId.toString());
|
|
158
153
|
return new ReferenceDescription({});
|
|
159
154
|
}
|
|
160
155
|
return browseResult.references[0];
|
|
@@ -169,7 +164,7 @@ export async function getTypeDefinition(session: IBasicSession, nodeId: NodeId):
|
|
|
169
164
|
resultMask: 0xffff
|
|
170
165
|
});
|
|
171
166
|
if (!browseResult.references || browseResult.references.length === 0) {
|
|
172
|
-
|
|
167
|
+
debugLog("no subtype", nodeId.toString());
|
|
173
168
|
throw new Error("No subtype");
|
|
174
169
|
}
|
|
175
170
|
return browseResult.references[0];
|
|
@@ -181,11 +176,8 @@ async function readBrowseName(session: IBasicSession, nodeId: NodeId): Promise<Q
|
|
|
181
176
|
nodeId
|
|
182
177
|
};
|
|
183
178
|
const dataValue = await session.read(nodeToRead);
|
|
184
|
-
|
|
185
179
|
// istanbul ignore next
|
|
186
180
|
if (dataValue.statusCode.isNotGood()) {
|
|
187
|
-
// throw new Error("Error " + dataValue.statusCode.toString() + " " + nodeId.toString());
|
|
188
|
-
// console.log("Error " + dataValue.statusCode.toString() + " " + nodeId.toString());
|
|
189
181
|
return new QualifiedName({ name: "", namespaceIndex: 0 });
|
|
190
182
|
}
|
|
191
183
|
const dataTypeName = dataValue.value.value;
|