opcua-webapi-ts 1.0.22 → 1.0.24

package/dist/client/UaWebClient.js

@@ -42,45 +42,31 @@ class UaWebClient {
     }
     browseChild(nodeId, nodeClass, maxReferences) {
         return __awaiter(this, void 0, void 0, function* () {
-            let nodesToBrowse = {
-                NodeId: nodeId.toString(),
-                BrowseDirection: opcua_webapi_1.BrowseDirection.Forward,
-                ReferenceTypeId: opcua_webapi_1.ReferenceTypeIds.HierarchicalReferences,
-                IncludeSubtypes: true,
-                NodeClassMask: (nodeClass) ? nodeClass : Number(opcua_webapi_1.NodeClass.Object | opcua_webapi_1.NodeClass.Variable | opcua_webapi_1.NodeClass.Method),
-                ResultMask: 63
-            };
+            let nodesToBrowse = new common_1.UaBrowseDescription(nodeId, opcua_webapi_1.BrowseDirection.Forward, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), true, (nodeClass) ? nodeClass : Number(opcua_webapi_1.NodeClass.Object | opcua_webapi_1.NodeClass.Variable | opcua_webapi_1.NodeClass.Method), 63);
             let results = yield this.browse([nodesToBrowse], maxReferences);
-            let statusCode = common_1.UaPayloadMapper.statusCodeFromWebApi(results[0].StatusCode);
+            let statusCode = results[0].statusCode;
             if (statusCode.isNotGood())
                 throw new common_1.UaError(statusCode);
-            return common_1.UaPayloadMapper.browseResultFromWebApi(results[0]);
+            return results[0];
         });
     }
     browseReference(nodeId, nodeClass, direction, referenceTypeId, maxReferences) {
         return __awaiter(this, void 0, void 0, function* () {
-            let nodesToBrowse = {
-                NodeId: nodeId.toString(),
-                BrowseDirection: (direction) ? direction : opcua_webapi_1.BrowseDirection.Forward,
-                ReferenceTypeId: (referenceTypeId) ? referenceTypeId.toString() : opcua_webapi_1.ReferenceTypeIds.NonHierarchicalReferences,
-                IncludeSubtypes: true,
-                NodeClassMask: (nodeClass) ? nodeClass : Number(opcua_webapi_1.NodeClass.Object | opcua_webapi_1.NodeClass.Variable | opcua_webapi_1.NodeClass.Method),
-                ResultMask: 63
-            };
+            let nodesToBrowse = new common_1.UaBrowseDescription(nodeId, (direction) ? direction : opcua_webapi_1.BrowseDirection.Forward, (referenceTypeId) ? referenceTypeId : common_1.UaNodeId.from(common_1.ReferenceTypeIds.NonHierarchicalReferences), true, (nodeClass) ? nodeClass : Number(opcua_webapi_1.NodeClass.Object | opcua_webapi_1.NodeClass.Variable | opcua_webapi_1.NodeClass.Method), 63);
             let results = yield this.browse([nodesToBrowse], maxReferences);
-            let statusCode = common_1.UaPayloadMapper.statusCodeFromWebApi(results[0].StatusCode);
+            let statusCode = results[0].statusCode;
             if (statusCode.isNotGood())
                 throw new common_1.UaError(statusCode);
-            return common_1.UaPayloadMapper.browseResultFromWebApi(results[0]);
+            return results[0];
         });
     }
     browseNextByCP(continuationPoint) {
         return __awaiter(this, void 0, void 0, function* () {
             let results = yield this.browseNext([continuationPoint], false);
-            let statusCode = common_1.UaPayloadMapper.statusCodeFromWebApi(results[0].StatusCode);
+            let statusCode = results[0].statusCode;
             if (statusCode.isNotGood())
                 throw new common_1.UaError(statusCode);
-            return common_1.UaPayloadMapper.browseResultFromWebApi(results[0]);
+            return results[0];
         });
     }
     readValues(nodeIds, timestampsToReturn) {
@@ -89,75 +75,51 @@ class UaWebClient {
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
             let nodesToRead = [];
             for (let item of nodeIds) {
-                nodesToRead.push({ NodeId: item.toString(), AttributeId: opcua_webapi_1.Attributes.Value });
-            }
-            let results = yield this.read(nodesToRead, timestampsToReturn);
-            let dataValues = [];
-            for (let item of results) {
-                dataValues.push(common_1.UaPayloadMapper.dataValueFromWebApi(item));
+                let nodeToRead = new common_1.UaReadValueId(item, opcua_webapi_1.Attributes.Value);
+                nodesToRead.push(nodeToRead);
             }
-            return dataValues;
+            let results = yield this.read(nodesToRead, (timestampsToReturn) ? timestampsToReturn : opcua_webapi_1.TimestampsToReturn.Neither);
+            return results;
         });
     }
-    writeValues(nodesToWrite) {
+    writeValue(nodeId, value) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (nodesToWrite.length == 0)
-                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
-            let writeValues = [];
-            for (let item of nodesToWrite) {
-                let variant = common_1.UaPayloadMapper.variantToWebApi(item.value);
-                writeValues.push({
-                    NodeId: item.nodeId.toString(),
-                    Value: {
-                        UaType: variant.UaType,
-                        Value: variant.Value
-                    },
-                    AttributeId: opcua_webapi_1.Attributes.Value
-                });
-            }
-            let results = yield this.write(writeValues);
-            let statusCodes = [];
-            for (let item of results) {
-                statusCodes.push(common_1.UaPayloadMapper.statusCodeFromWebApi(item));
-            }
-            return statusCodes;
+            let writeValue = new common_1.UaWriteValue(nodeId, value);
+            let results = yield this.write([writeValue]);
+            if (results[0].isNotGood())
+                throw new common_1.UaError(results[0]);
         });
     }
     readNodeAttributes(nodeId, returnDescription) {
         return __awaiter(this, void 0, void 0, function* () {
-            let nodeIdStr = nodeId.toString();
             let nodesToRead = [
-                { NodeId: nodeIdStr, AttributeId: opcua_webapi_1.Attributes.NodeClass },
-                { NodeId: nodeIdStr, AttributeId: opcua_webapi_1.Attributes.BrowseName },
-                { NodeId: nodeIdStr, AttributeId: opcua_webapi_1.Attributes.DisplayName },
-                { NodeId: nodeIdStr, AttributeId: opcua_webapi_1.Attributes.UserWriteMask }
+                new common_1.UaReadValueId(nodeId, opcua_webapi_1.Attributes.NodeClass),
+                new common_1.UaReadValueId(nodeId, opcua_webapi_1.Attributes.BrowseName),
+                new common_1.UaReadValueId(nodeId, opcua_webapi_1.Attributes.DisplayName),
+                new common_1.UaReadValueId(nodeId, opcua_webapi_1.Attributes.UserWriteMask)
             ];
             if (returnDescription) {
-                nodesToRead.push({ NodeId: nodeIdStr, AttributeId: opcua_webapi_1.Attributes.Description });
+                nodesToRead.push(new common_1.UaReadValueId(nodeId, opcua_webapi_1.Attributes.Description));
             }
             let results = yield this.read(nodesToRead);
-            let dataValues = [];
-            for (let item of results) {
-                dataValues.push(common_1.UaPayloadMapper.dataValueFromWebApi(item));
-            }
-            if (dataValues[0].statusCode.isNotGood())
-                throw new common_1.UaError(dataValues[0].statusCode);
-            if (dataValues[1].statusCode.isNotGood())
-                throw new common_1.UaError(dataValues[1].statusCode);
-            if (dataValues[2].statusCode.isNotGood())
-                throw new common_1.UaError(dataValues[2].statusCode);
-            let nodeClassValue = dataValues[0].value;
-            let browseNameValue = dataValues[1].value;
-            let displayNameValue = dataValues[2].value;
+            if (results[0].statusCode.isNotGood())
+                throw new common_1.UaError(results[0].statusCode);
+            if (results[1].statusCode.isNotGood())
+                throw new common_1.UaError(results[1].statusCode);
+            if (results[2].statusCode.isNotGood())
+                throw new common_1.UaError(results[2].statusCode);
+            let nodeClassValue = results[0].value;
+            let browseNameValue = results[1].value;
+            let displayNameValue = results[2].value;
             if (common_1.UaVariantType.Int32 != nodeClassValue.type ||
                 common_1.UaVariantType.QualifiedName != browseNameValue.type ||
                 common_1.UaVariantType.LocalizedText != displayNameValue.type)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNodeAttributesInvalid));
-            let writeMaskValue = (dataValues[3].statusCode.isGood() &&
-                dataValues[3].value.type == common_1.UaVariantType.UInt32) ? dataValues[3].value : undefined;
+            let writeMaskValue = (results[3].statusCode.isGood() &&
+                results[3].value.type == common_1.UaVariantType.UInt32) ? results[3].value : undefined;
             let descriptionValue = (returnDescription &&
-                dataValues[4].statusCode.isGood() &&
-                dataValues[4].value.type == common_1.UaVariantType.LocalizedText) ? dataValues[4].value : undefined;
+                results[4].statusCode.isGood() &&
+                results[4].value.type == common_1.UaVariantType.LocalizedText) ? results[4].value : undefined;
             let ret = {
                 nodeClass: nodeClassValue.value,
                 browseName: browseNameValue.value,
@@ -174,19 +136,18 @@ class UaWebClient {
                 return [];
             let nodesToRead = [];
             for (let item of nodeIds) {
-                let nodeIdString = item.toString();
-                nodesToRead.push({ NodeId: nodeIdString, AttributeId: opcua_webapi_1.Attributes.NodeClass });
-                nodesToRead.push({ NodeId: nodeIdString, AttributeId: opcua_webapi_1.Attributes.DataType });
-                nodesToRead.push({ NodeId: nodeIdString, AttributeId: opcua_webapi_1.Attributes.ValueRank });
-                nodesToRead.push({ NodeId: nodeIdString, AttributeId: opcua_webapi_1.Attributes.AccessLevel });
-                nodesToRead.push({ NodeId: nodeIdString, AttributeId: opcua_webapi_1.Attributes.UserAccessLevel });
-                nodesToRead.push({ NodeId: nodeIdString, AttributeId: opcua_webapi_1.Attributes.Historizing });
+                nodesToRead.push(new common_1.UaReadValueId(item, opcua_webapi_1.Attributes.NodeClass));
+                nodesToRead.push(new common_1.UaReadValueId(item, opcua_webapi_1.Attributes.DataType));
+                nodesToRead.push(new common_1.UaReadValueId(item, opcua_webapi_1.Attributes.ValueRank));
+                nodesToRead.push(new common_1.UaReadValueId(item, opcua_webapi_1.Attributes.AccessLevel));
+                nodesToRead.push(new common_1.UaReadValueId(item, opcua_webapi_1.Attributes.UserAccessLevel));
+                nodesToRead.push(new common_1.UaReadValueId(item, opcua_webapi_1.Attributes.Historizing));
             }
             let results = yield this.read(nodesToRead);
             let dataValues = [];
             let ret = [];
             for (let item of results) {
-                dataValues.push(common_1.UaPayloadMapper.dataValueFromWebApi(item));
+                dataValues.push(item);
                 if (dataValues.length == 6) {
                     let dataType = common_1.UaNodeId.nullNodeId;
                     let valueRank = -1;
@@ -274,18 +235,13 @@ class UaWebClient {
     }
     readObjectAttributes(nodeId) {
         return __awaiter(this, void 0, void 0, function* () {
-            let nodeIdStr = nodeId.toString();
             let nodesToRead = [
-                { NodeId: nodeIdStr, AttributeId: opcua_webapi_1.Attributes.EventNotifier }
+                new common_1.UaReadValueId(nodeId, opcua_webapi_1.Attributes.EventNotifier)
             ];
             let results = yield this.read(nodesToRead);
-            let dataValues = [];
-            for (let item of results) {
-                dataValues.push(common_1.UaPayloadMapper.dataValueFromWebApi(item));
-            }
-            if (dataValues[0].statusCode.isNotGood())
-                throw new common_1.UaError(dataValues[0].statusCode);
-            let eventNotifierValue = dataValues[0].value;
+            if (results[0].statusCode.isNotGood())
+                throw new common_1.UaError(results[0].statusCode);
+            let eventNotifierValue = results[0].value;
             if (common_1.UaVariantType.Byte != eventNotifierValue.type)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNodeAttributesInvalid));
             let ret = {
@@ -301,36 +257,23 @@ class UaWebClient {
                 inputs.push(common_1.UaPayloadMapper.variantToWebApi(item));
             }
             let methodsToCall = [
-                { ObjectId: objectId.toString(), MethodId: methodId.toString(), InputArguments: inputs }
+                new common_2.UaCallMethodRequest(objectId, methodId, inputArguments)
             ];
             let results = yield this.call(methodsToCall);
-            let statusCode = common_1.UaPayloadMapper.statusCodeFromWebApi(results[0].StatusCode);
-            if (statusCode.isNotGood())
-                throw new common_1.UaError(statusCode);
-            let outputs = [];
-            if (results[0].OutputArguments) {
-                for (let item of results[0].OutputArguments) {
-                    outputs.push(common_1.UaPayloadMapper.variantFromWebApi(item));
-                }
-            }
+            if (results[0].statusCode.isNotGood())
+                throw new common_1.UaError(results[0].statusCode);
+            let outputs = results[0].outputArguments;
             return outputs;
         });
     }
     getGeneratedEventType(typeId) {
         return __awaiter(this, void 0, void 0, function* () {
-            let nodesToBrowse = {
-                NodeId: typeId.toString(),
-                BrowseDirection: opcua_webapi_1.BrowseDirection.Forward,
-                ReferenceTypeId: opcua_webapi_1.ReferenceTypeIds.GeneratesEvent,
-                IncludeSubtypes: false,
-                NodeClassMask: opcua_webapi_1.NodeClass.ObjectType,
-                ResultMask: 0
-            };
+            let nodesToBrowse = new common_1.UaBrowseDescription(typeId, opcua_webapi_1.BrowseDirection.Forward, common_1.UaNodeId.from(common_1.ReferenceTypeIds.GeneratesEvent), false, opcua_webapi_1.NodeClass.ObjectType, 0);
             let results = yield this.browse([nodesToBrowse]);
-            let statusCode = common_1.UaPayloadMapper.statusCodeFromWebApi(results[0].StatusCode);
+            let statusCode = results[0].statusCode;
             if (statusCode.isNotGood())
                 throw new common_1.UaError(statusCode);
-            let browseResult = common_1.UaPayloadMapper.browseResultFromWebApi(results[0]);
+            let browseResult = results[0];
             let ret = [];
             for (let item of browseResult.results) {
                 ret.push(item.nodeId.getNodeId());
@@ -340,24 +283,18 @@ class UaWebClient {
     }
     historyReadRawData(nodeId, startTime, endTime, numValuesPerNode, continuationPoint, returnBounds, isReadModified, timestampsToReturn, releaseContinuationPoints) {
         return __awaiter(this, void 0, void 0, function* () {
-            let nodeToRead = {
-                NodeId: nodeId.toString(),
-                ContinuationPoint: (continuationPoint) ? continuationPoint : undefined
-            };
+            let nodeToRead = new common_1.UaHistoryReadValueId(nodeId, continuationPoint);
             let details = new common_2.UaReadRawModifiedDetails(startTime, endTime, numValuesPerNode, returnBounds, isReadModified);
-            let historyReadDetails = common_1.UaPayloadMapper.extensionObjectToWebApi(details.toExtensionObject());
+            let historyReadDetails = details.toExtensionObject();
             let nodesToRead = [nodeToRead];
             let results = yield this.historyRead(nodesToRead, historyReadDetails, timestampsToReturn, releaseContinuationPoints);
-            if (results.length != 1)
-                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadUnexpectedError));
-            let statusCode = common_1.UaPayloadMapper.statusCodeFromWebApi(results[0].StatusCode);
-            if (statusCode.isNotGood())
-                throw new common_1.UaError(statusCode);
-            let extensionObject = common_1.UaPayloadMapper.extensionObjectFromWebApi(results[0].HistoryData);
+            if (results[0].statusCode.isNotGood())
+                throw new common_1.UaError(results[0].statusCode);
+            let extensionObject = results[0].historyData;
             let historyData = common_1.UaHistoryData.fromExtensionObject(extensionObject);
             if (null == historyData)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDecodingError));
-            let ret = new common_1.UaHistoryDataResult(historyData.dataValues, results[0].ContinuationPoint);
+            let ret = new common_1.UaHistoryDataResult(historyData.dataValues, results[0].continuationPoint);
             return ret;
         });
     }
@@ -365,24 +302,18 @@ class UaWebClient {
         return __awaiter(this, void 0, void 0, function* () {
             if (requiredTimes.length == 0)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadInvalidArgument));
-            let nodeToRead = {
-                NodeId: nodeId.toString(),
-                ContinuationPoint: (continuationPoint) ? continuationPoint : undefined
-            };
+            let nodeToRead = new common_1.UaHistoryReadValueId(nodeId, continuationPoint);
             let details = new common_2.UaReadAtTimeDetails(requiredTimes, useSimpleBounds);
-            let historyReadDetails = common_1.UaPayloadMapper.extensionObjectToWebApi(details.toExtensionObject());
+            let historyReadDetails = details.toExtensionObject();
             let nodesToRead = [nodeToRead];
             let results = yield this.historyRead(nodesToRead, historyReadDetails, timestampsToReturn, releaseContinuationPoints);
-            if (results.length != 1)
-                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadUnexpectedError));
-            let statusCode = common_1.UaPayloadMapper.statusCodeFromWebApi(results[0].StatusCode);
-            if (statusCode.isNotGood())
-                throw new common_1.UaError(statusCode);
-            let extensionObject = common_1.UaPayloadMapper.extensionObjectFromWebApi(results[0].HistoryData);
+            if (results[0].statusCode.isNotGood())
+                throw new common_1.UaError(results[0].statusCode);
+            let extensionObject = results[0].historyData;
             let historyData = common_1.UaHistoryData.fromExtensionObject(extensionObject);
             if (null == historyData)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDecodingError));
-            let ret = new common_1.UaHistoryDataResult(historyData.dataValues, results[0].ContinuationPoint);
+            let ret = new common_1.UaHistoryDataResult(historyData.dataValues, results[0].continuationPoint);
             return ret;
         });
     }
@@ -390,10 +321,7 @@ class UaWebClient {
         return __awaiter(this, void 0, void 0, function* () {
             if (select.length == 0)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadInvalidArgument));
-            let nodeToRead = {
-                NodeId: nodeId.toString(),
-                ContinuationPoint: (continuationPoint) ? continuationPoint : undefined
-            };
+            let nodeToRead = new common_1.UaHistoryReadValueId(nodeId, continuationPoint);
             let selectClauses = [];
             let whereClauses = (where) ? where.toContentFilter() : null;
             for (let item of select) {
@@ -401,19 +329,16 @@ class UaWebClient {
                 selectClauses.push(selectedField);
             }
             let details = new common_1.UaReadEventDetails(startTime, endTime, new common_1.UaEventFilter(selectClauses, whereClauses), numValuesPerNode);
-            let historyReadDetails = common_1.UaPayloadMapper.extensionObjectToWebApi(details.toExtensionObject());
+            let historyReadDetails = details.toExtensionObject();
             let nodesToRead = [nodeToRead];
             let results = yield this.historyRead(nodesToRead, historyReadDetails, opcua_webapi_1.TimestampsToReturn.Both, releaseContinuationPoints);
-            if (results.length != 1)
-                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadUnexpectedError));
-            let statusCode = common_1.UaPayloadMapper.statusCodeFromWebApi(results[0].StatusCode);
-            if (statusCode.isNotGood())
-                throw new common_1.UaError(statusCode);
-            let extensionObject = common_1.UaPayloadMapper.extensionObjectFromWebApi(results[0].HistoryData);
+            if (results[0].statusCode.isNotGood())
+                throw new common_1.UaError(results[0].statusCode);
+            let extensionObject = results[0].historyData;
             let historyData = common_2.UaHistoryEvent.fromExtensionObject(extensionObject);
             if (null == historyData)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDecodingError));
-            let ret = new common_2.UaHistoryEventResult(historyData.events, results[0].ContinuationPoint);
+            let ret = new common_2.UaHistoryEventResult(historyData.events, results[0].continuationPoint);
             return ret;
         });
     }
@@ -421,9 +346,15 @@ class UaWebClient {
     browse(nodesToBrowse, maxReferencesPerNode, view, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            if (nodesToBrowse.length == 0)
+                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
+            let NodesToBrowse = [];
+            for (let item of nodesToBrowse) {
+                NodesToBrowse.push(item.toStruct());
+            }
             let request = (0, opcua_webapi_1.BrowseRequestFromJSON)({
                 RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
-                NodesToBrowse: nodesToBrowse,
+                NodesToBrowse: NodesToBrowse,
                 RequestedMaxReferencesPerNode: (maxReferencesPerNode && maxReferencesPerNode > 0) ? maxReferencesPerNode : undefined,
                 View: view
             });
@@ -432,12 +363,23 @@ class UaWebClient {
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(response.ResponseHeader.ServiceResult.Code));
             if (!response.Results || nodesToBrowse.length != response.Results.length)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDataLost));
-            return response.Results;
+            let results = [];
+            if (response.Results) {
+                for (let item of response.Results) {
+                    let result = common_1.UaBrowseResult.fromStruct(item);
+                    if (null == result)
+                        throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDecodingError));
+                    results.push(result);
+                }
+            }
+            return results;
         });
     }
     browseNext(continuationPoints, releaseContinuationPoints, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            if (continuationPoints.length == 0)
+                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
             let request = (0, opcua_webapi_1.BrowseNextRequestFromJSON)({
                 RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
                 ContinuationPoints: continuationPoints,
@@ -448,91 +390,131 @@ class UaWebClient {
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(response.ResponseHeader.ServiceResult.Code));
             if (!response.Results || continuationPoints.length != response.Results.length)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDataLost));
-            return response.Results;
-        });
-    }
-    translate(browsePaths, additionalParameters) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            let request = (0, opcua_webapi_1.TranslateBrowsePathsToNodeIdsRequestFromJSON)({
-                RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
-                BrowsePaths: browsePaths
-            });
-            let response = yield this.api.translateBrowsePathsToNodeIds({ translateBrowsePathsToNodeIdsRequest: request });
-            if ((_b = (_a = response === null || response === void 0 ? void 0 : response.ResponseHeader) === null || _a === void 0 ? void 0 : _a.ServiceResult) === null || _b === void 0 ? void 0 : _b.Code)
-                throw new common_1.UaError((0, common_1.makeUaStatusCode)(response.ResponseHeader.ServiceResult.Code));
-            if (!response.Results || browsePaths.length != response.Results.length)
-                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadUnknownResponse));
-            return response.Results;
+            let results = [];
+            for (let item of response.Results) {
+                let result = common_1.UaBrowseResult.fromStruct(item);
+                if (null == result)
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDecodingError));
+                results.push(result);
+            }
+            return results;
         });
     }
     read(nodesToRead, timestampsToReturn, maxAge, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            if (nodesToRead.length == 0)
+                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
+            let NodesToRead = [];
+            for (let item of nodesToRead) {
+                NodesToRead.push(item.toStruct());
+            }
             let request = (0, opcua_webapi_1.ReadRequestFromJSON)({
                 RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
-                NodesToRead: nodesToRead,
+                NodesToRead: NodesToRead,
                 MaxAge: (maxAge && maxAge > 0) ? maxAge : undefined,
                 TimestampsToReturn: (timestampsToReturn &&
                     timestampsToReturn >= opcua_webapi_1.TimestampsToReturn.Source &&
-                    timestampsToReturn < opcua_webapi_1.TimestampsToReturn.Invalid) ? timestampsToReturn : undefined
+                    timestampsToReturn < opcua_webapi_1.TimestampsToReturn.Invalid) ? timestampsToReturn : opcua_webapi_1.TimestampsToReturn.Neither
             });
             let response = yield this.api.read({ readRequest: request });
             if ((_b = (_a = response === null || response === void 0 ? void 0 : response.ResponseHeader) === null || _a === void 0 ? void 0 : _a.ServiceResult) === null || _b === void 0 ? void 0 : _b.Code)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(response.ResponseHeader.ServiceResult.Code));
             if (!response.Results || nodesToRead.length != response.Results.length)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDataLost));
-            return response.Results;
+            let results = [];
+            for (let item of response.Results) {
+                let result = common_1.UaPayloadMapper.dataValueFromWebApi(item);
+                results.push(result);
+            }
+            return results;
         });
     }
     write(nodesToWrite, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            if (nodesToWrite.length == 0)
+                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
+            let NodesToWrite = [];
+            for (let item of nodesToWrite) {
+                NodesToWrite.push(item.toStruct());
+            }
             let request = (0, opcua_webapi_1.WriteRequestFromJSON)({
                 RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
-                NodesToWrite: nodesToWrite
+                NodesToWrite: NodesToWrite
             });
             let response = yield this.api.write({ writeRequest: request });
             if ((_b = (_a = response === null || response === void 0 ? void 0 : response.ResponseHeader) === null || _a === void 0 ? void 0 : _a.ServiceResult) === null || _b === void 0 ? void 0 : _b.Code)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(response.ResponseHeader.ServiceResult.Code));
             if (!response.Results || nodesToWrite.length != response.Results.length)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDataLost));
-            return response.Results;
+            let results = [];
+            for (let item of response.Results) {
+                let result = common_1.UaPayloadMapper.statusCodeFromWebApi(item);
+                results.push(result);
+            }
+            return results;
         });
     }
     call(methodsToCall, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            if (methodsToCall.length == 0)
+                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
+            let MethodsToCall = [];
+            for (let item of methodsToCall) {
+                MethodsToCall.push(item.toStruct());
+            }
             let request = (0, opcua_webapi_1.CallRequestFromJSON)({
                 RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
-                MethodsToCall: methodsToCall
+                MethodsToCall: MethodsToCall
             });
             let response = yield this.api.call({ callRequest: request });
             if ((_b = (_a = response === null || response === void 0 ? void 0 : response.ResponseHeader) === null || _a === void 0 ? void 0 : _a.ServiceResult) === null || _b === void 0 ? void 0 : _b.Code)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(response.ResponseHeader.ServiceResult.Code));
             if (!response.Results || methodsToCall.length != response.Results.length)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDataLost));
-            return response.Results;
+            let results = [];
+            for (let item of response.Results) {
+                let result = common_2.UaCallMethodResult.fromStruct(item);
+                if (null == result)
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDecodingError));
+                results.push(result);
+            }
+            return results;
         });
     }
     historyRead(nodesToRead, historyReadDetails, timestampsToReturn, releaseContinuationPoints, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            if (nodesToRead.length == 0)
+                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
+            let NodesToRead = [];
+            for (let item of nodesToRead) {
+                NodesToRead.push(item.toStruct());
+            }
             let request = (0, opcua_webapi_1.HistoryReadRequestFromJSON)({
                 RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
-                HistoryReadDetails: historyReadDetails,
+                HistoryReadDetails: common_1.UaPayloadMapper.extensionObjectToWebApi(historyReadDetails),
                 TimestampsToReturn: (timestampsToReturn &&
                     timestampsToReturn >= opcua_webapi_1.TimestampsToReturn.Source &&
                     timestampsToReturn < opcua_webapi_1.TimestampsToReturn.Invalid) ? timestampsToReturn : undefined,
                 ReleaseContinuationPoints: releaseContinuationPoints,
-                NodesToRead: nodesToRead
+                NodesToRead: NodesToRead
             });
             let response = yield this.api.historyRead({ historyReadRequest: request });
             if ((_b = (_a = response === null || response === void 0 ? void 0 : response.ResponseHeader) === null || _a === void 0 ? void 0 : _a.ServiceResult) === null || _b === void 0 ? void 0 : _b.Code)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(response.ResponseHeader.ServiceResult.Code));
             if (!response.Results || nodesToRead.length != response.Results.length)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDataLost));
-            return response.Results;
+            let results = [];
+            for (let item of response.Results) {
+                let result = common_1.UaHistoryReadResult.fromStruct(item);
+                if (null == result)
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDecodingError));
+                results.push(result);
+            }
+            return results;
         });
     }
     findServer(endpointUrl, serverUris, localeIds, additionalParameters) {

package/dist/client/utils/UaDataTypeDictionary.js

@@ -49,31 +49,25 @@ class UaDataTypeDictionary {
             let nodeIds = this._remainingNodesToBrowse.splice(0, 15);
             let nodesToBrowse = [];
             for (let item of nodeIds) {
-                nodesToBrowse.push({
-                    NodeId: item.toString(),
-                    BrowseDirection: opcua_webapi_1.BrowseDirection.Forward,
-                    ReferenceTypeId: new common_1.UaNodeId(common_1.ReferenceTypeIds.HasSubtype).toString(),
-                    IncludeSubtypes: false,
-                    NodeClassMask: opcua_webapi_1.NodeClass.DataType,
-                    ResultMask: 31
-                });
+                let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Forward, new common_1.UaNodeId(common_1.ReferenceTypeIds.HasSubtype), false, opcua_webapi_1.NodeClass.DataType, 31);
+                nodesToBrowse.push(browseDescription);
             }
             let results = yield client.browse(nodesToBrowse);
             for (let i = 0; i < nodeIds.length; ++i) {
-                let statusCode = common_1.UaPayloadMapper.statusCodeFromWebApi(results[i].StatusCode);
-                if (statusCode.isNotGood() || !results[i].References)
+                if (results[i].statusCode.isNotGood())
                     continue;
                 let parentType = this._dataTypes.get(nodeIds[i].toString());
-                for (let item of results[i].References) {
-                    let dataTypeId = (0, common_1.parseUaNodeIdOrNull)(item.NodeId);
-                    if (!dataTypeId || opcua_webapi_1.NodeClass.DataType != item.NodeClass ||
-                        !item.BrowseName || !item.DisplayName)
+                for (let item of results[i].references) {
+                    let dataTypeId = item.nodeId.getNodeId();
+                    if (null == dataTypeId ||
+                        opcua_webapi_1.NodeClass.DataType != item.nodeClass ||
+                        !item.browseName || !item.displayName)
                         continue;
                     let isAbstract = false;
                     if (dataTypeId.nsIndex == 0 &&
                         UaDataTypeDictionary._abstractDataTypeIds.has(dataTypeId.numericId()))
                         isAbstract = true;
-                    let dataType = new common_1.UaDataType(dataTypeId, item.BrowseName, common_1.UaPayloadMapper.localizedTextFromWebApi(item.DisplayName), isAbstract);
+                    let dataType = new common_1.UaDataType(dataTypeId, item.browseName, item.displayName, isAbstract);
                     this._dataTypes.set(dataTypeId.toString(), dataType);
                     this._remainingNodesToBrowse.push(dataTypeId);
                     if (parentType)
@@ -97,24 +91,18 @@ class UaDataTypeDictionary {
             let nodeIds = this._remainingEnumerationToRead.splice(0, 20);
             let nodesToBrowse = [];
             for (let item of nodeIds) {
-                nodesToBrowse.push({
-                    NodeId: item.toString(),
-                    BrowseDirection: opcua_webapi_1.BrowseDirection.Forward,
-                    ReferenceTypeId: new common_1.UaNodeId(common_1.ReferenceTypeIds.HasProperty).toString(),
-                    IncludeSubtypes: false,
-                    NodeClassMask: opcua_webapi_1.NodeClass.Variable,
-                    ResultMask: 8
-                });
+                let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Forward, new common_1.UaNodeId(common_1.ReferenceTypeIds.HasProperty), false, opcua_webapi_1.NodeClass.Variable, 8);
+                nodesToBrowse.push(browseDescription);
             }
             let results = yield client.browse(nodesToBrowse);
             let enumDataTypeIds = [];
             let enumValueIds = [];
             for (let i = 0; i < nodeIds.length; ++i) {
-                let statusCode = common_1.UaPayloadMapper.statusCodeFromWebApi(results[i].StatusCode);
-                if (statusCode.isNotGood() || !results[i].References || results[i].References.length == 0)
+                if (results[i].statusCode.isNotGood() ||
+                    results[i].references.length == 0)
                     continue;
-                if (results[i].References[0].BrowseName == "EnumStrings" || results[i].References[0].BrowseName == "EnumValues") {
-                    let enumValueId = (0, common_1.parseUaNodeIdOrNull)(results[i].References[0].NodeId);
+                if (results[i].references[0].browseName == "EnumStrings" || results[i].references[0].browseName == "EnumValues") {
+                    let enumValueId = results[i].references[0].nodeId.getNodeId();
                     if (enumValueId) {
                         enumDataTypeIds.push(nodeIds[i]);
                         enumValueIds.push(enumValueId);

package/dist/client/utils/UaNodeReader.d.ts

@@ -16,7 +16,7 @@ type BrowseResult = {
     displayName: UaLocalizedText;
     referenceTypeId: UaNodeId;
     isForward: boolean;
-    typeDefinitionId?: UaNodeId;
+    typeDefinitionId?: UaNodeId | null;
 };
 type ReadResult = {
     parentId: UaNodeId;