opcua-webapi-ts 1.1.20 → 1.1.22

package/dist/cjs/client/UaWebClient.js

@@ -17,7 +17,7 @@ const common_2 = require("../common");
 class UaWebClient {
     constructor(clientConfig) {
         this.clientConfig = clientConfig;
-        this.api = this.createApi();
+        this.api = new __1.UaWebClientNative(this.clientConfig.apiConfig);
         this.requestHandle = 1;
     }
     getUrl() {
@@ -689,14 +689,18 @@ class UaWebClient {
             return results;
         });
     }
-    findServer(endpointUrl, serverUris, localeIds, additionalParameters) {
+    addNodes(nodesToAdd, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            let request = (0, opcua_webapi_1.FindServersRequestFromJSON)({
+            if (nodesToAdd.length == 0)
+                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
+            let NodesToAdd = [];
+            for (let item of nodesToAdd) {
+                NodesToAdd.push(item.toStruct());
+            }
+            let request = (0, opcua_webapi_1.AddNodesRequestFromJSON)({
                 RequestHeader: this.requestHeader(additionalParameters),
-                ServerUris: serverUris,
-                EndpointUrl: endpointUrl,
-                LocaleIds: localeIds
+                NodesToAdd: NodesToAdd
             });
             let timeout = this.requestTimeout(additionalParameters);
             let response;
@@ -704,9 +708,10 @@ class UaWebClient {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.findServers(request, { signal: controller.signal });
+                    response = yield this.api.addNodes(request, { signal: controller.signal });
                 }
                 catch (error) {
+                    console.error(error);
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
                 }
                 finally {
@@ -715,7 +720,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.findServers(request);
+                    response = yield this.api.addNodes(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -723,19 +728,30 @@ class UaWebClient {
             }
             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.Servers)
+            if (!response.Results)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDataLost));
-            return response.Servers;
+            let results = [];
+            for (let item of response.Results) {
+                let result = common_1.UaAddNodesResult.fromStruct(item);
+                if (null == result)
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDecodingError));
+                results.push(result);
+            }
+            return results;
         });
     }
-    getEndpoints(endpointUrl, localeIds, profileUris, additionalParameters) {
+    deleteNodes(nodesToDelete, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            let request = (0, opcua_webapi_1.GetEndpointsRequestFromJSON)({
+            if (nodesToDelete.length == 0)
+                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
+            let NodesToDelete = [];
+            for (let item of nodesToDelete) {
+                NodesToDelete.push(item.toStruct());
+            }
+            let request = (0, opcua_webapi_1.DeleteNodesRequestFromJSON)({
                 RequestHeader: this.requestHeader(additionalParameters),
-                EndpointUrl: endpointUrl,
-                LocaleIds: localeIds,
-                ProfileUris: profileUris
+                NodesToDelete: NodesToDelete
             });
             let timeout = this.requestTimeout(additionalParameters);
             let response;
@@ -743,7 +759,7 @@ class UaWebClient {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.getEndpoints(request, { signal: controller.signal });
+                    response = yield this.api.deleteNodes(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -754,7 +770,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.getEndpoints(request);
+                    response = yield this.api.deleteNodes(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -762,23 +778,28 @@ class UaWebClient {
             }
             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.Endpoints)
+            if (!response.Results)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDataLost));
-            return response.Endpoints;
+            let results = [];
+            for (let item of response.Results) {
+                let result = common_1.UaPayloadMapper.statusCodeFromWebApi(item);
+                results.push(result);
+            }
+            return results;
         });
     }
-    addNodes(nodesToAdd, additionalParameters) {
+    addReferences(referencesToAdd, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            if (nodesToAdd.length == 0)
+            if (referencesToAdd.length == 0)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
-            let NodesToAdd = [];
-            for (let item of nodesToAdd) {
-                NodesToAdd.push(item.toStruct());
+            let ReferencesToAdd = [];
+            for (let item of referencesToAdd) {
+                ReferencesToAdd.push(item.toStruct());
             }
-            let request = (0, opcua_webapi_1.AddNodesRequestFromJSON)({
+            let request = (0, opcua_webapi_1.AddReferencesRequestFromJSON)({
                 RequestHeader: this.requestHeader(additionalParameters),
-                NodesToAdd: NodesToAdd
+                ReferencesToAdd: ReferencesToAdd
             });
             let timeout = this.requestTimeout(additionalParameters);
             let response;
@@ -786,10 +807,9 @@ class UaWebClient {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.addNodes(request, { signal: controller.signal });
+                    response = yield this.api.addReferences(request, { signal: controller.signal });
                 }
                 catch (error) {
-                    console.error(error);
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
                 }
                 finally {
@@ -798,7 +818,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.addNodes(request);
+                    response = yield this.api.addReferences(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -810,26 +830,24 @@ class UaWebClient {
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDataLost));
             let results = [];
             for (let item of response.Results) {
-                let result = common_1.UaAddNodesResult.fromStruct(item);
-                if (null == result)
-                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDecodingError));
+                let result = common_1.UaPayloadMapper.statusCodeFromWebApi(item);
                 results.push(result);
             }
             return results;
         });
     }
-    deleteNodes(nodesToDelete, additionalParameters) {
+    deleteReferences(referencesToDelete, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            if (nodesToDelete.length == 0)
+            if (referencesToDelete.length == 0)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
-            let NodesToDelete = [];
-            for (let item of nodesToDelete) {
-                NodesToDelete.push(item.toStruct());
+            let ReferencesToDelete = [];
+            for (let item of referencesToDelete) {
+                ReferencesToDelete.push(item.toStruct());
             }
-            let request = (0, opcua_webapi_1.DeleteNodesRequestFromJSON)({
+            let request = (0, opcua_webapi_1.DeleteReferencesRequestFromJSON)({
                 RequestHeader: this.requestHeader(additionalParameters),
-                NodesToDelete: NodesToDelete
+                ReferencesToDelete: ReferencesToDelete
             });
             let timeout = this.requestTimeout(additionalParameters);
             let response;
@@ -837,7 +855,7 @@ class UaWebClient {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.deleteNodes(request, { signal: controller.signal });
+                    response = yield this.api.deleteReferences(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -848,7 +866,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.deleteNodes(request);
+                    response = yield this.api.deleteReferences(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -866,18 +884,14 @@ class UaWebClient {
             return results;
         });
     }
-    addReferences(referencesToAdd, additionalParameters) {
+    findServer(endpointUrl, serverUris, localeIds, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            if (referencesToAdd.length == 0)
-                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
-            let ReferencesToAdd = [];
-            for (let item of referencesToAdd) {
-                ReferencesToAdd.push(item.toStruct());
-            }
-            let request = (0, opcua_webapi_1.AddReferencesRequestFromJSON)({
+            let request = (0, opcua_webapi_1.FindServersRequestFromJSON)({
                 RequestHeader: this.requestHeader(additionalParameters),
-                ReferencesToAdd: ReferencesToAdd
+                ServerUris: serverUris,
+                EndpointUrl: endpointUrl,
+                LocaleIds: localeIds
             });
             let timeout = this.requestTimeout(additionalParameters);
             let response;
@@ -885,7 +899,7 @@ class UaWebClient {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.addReferences(request, { signal: controller.signal });
+                    response = yield this.api.findServers(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -896,7 +910,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.addReferences(request);
+                    response = yield this.api.findServers(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -904,28 +918,19 @@ class UaWebClient {
             }
             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)
+            if (!response.Servers)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDataLost));
-            let results = [];
-            for (let item of response.Results) {
-                let result = common_1.UaPayloadMapper.statusCodeFromWebApi(item);
-                results.push(result);
-            }
-            return results;
+            return response.Servers;
         });
     }
-    deleteReferences(referencesToDelete, additionalParameters) {
+    getEndpoints(endpointUrl, localeIds, profileUris, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            if (referencesToDelete.length == 0)
-                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
-            let ReferencesToDelete = [];
-            for (let item of referencesToDelete) {
-                ReferencesToDelete.push(item.toStruct());
-            }
-            let request = (0, opcua_webapi_1.DeleteReferencesRequestFromJSON)({
+            let request = (0, opcua_webapi_1.GetEndpointsRequestFromJSON)({
                 RequestHeader: this.requestHeader(additionalParameters),
-                ReferencesToDelete: ReferencesToDelete
+                EndpointUrl: endpointUrl,
+                LocaleIds: localeIds,
+                ProfileUris: profileUris
             });
             let timeout = this.requestTimeout(additionalParameters);
             let response;
@@ -933,7 +938,7 @@ class UaWebClient {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.deleteReferences(request, { signal: controller.signal });
+                    response = yield this.api.getEndpoints(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -944,7 +949,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.deleteReferences(request);
+                    response = yield this.api.getEndpoints(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -952,14 +957,9 @@ class UaWebClient {
             }
             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)
+            if (!response.Endpoints)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDataLost));
-            let results = [];
-            for (let item of response.Results) {
-                let result = common_1.UaPayloadMapper.statusCodeFromWebApi(item);
-                results.push(result);
-            }
-            return results;
+            return response.Endpoints;
         });
     }
     requestHeader(additionalParameters) {
@@ -982,8 +982,5 @@ class UaWebClient {
             timeout = additionalParameters.timeout;
         return timeout;
     }
-    createApi() {
-        return new __1.UaWebClientNative(this.clientConfig.apiConfig);
-    }
 }
 exports.UaWebClient = UaWebClient;

package/dist/cjs/client/utils/UaNodeReader.js

@@ -14,11 +14,12 @@ const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
 const UaNodeBrowser_1 = require("./UaNodeBrowser");
 class UaNodeReader {
-    constructor(client, returnDescription, returnVariable, returnMethod, returnAttributes, returnValue) {
+    constructor(client, returnDescription, returnVariable, returnMethod, returnAttributes, returnValue, referenceTypeToReturn) {
         this._client = client;
         this._returnDescription = (returnDescription) ? returnDescription : false;
         this._returnAttributes = (returnAttributes) ? returnAttributes : false;
         this._returnValue = (returnValue) ? returnValue : false;
+        this._referenceTypeToReturn = (referenceTypeToReturn) ? referenceTypeToReturn : common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences);
         this._nodeClassToReturn = 0;
         if (returnVariable)
             this._nodeClassToReturn += opcua_webapi_1.NodeClass.Variable;
@@ -68,7 +69,7 @@ class UaNodeReader {
                 nodeIdsToBrowse.push(item.nodeId);
                 nodeIdsSet.add(item.nodeId.toString());
             }
-            let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), this._nodeClassToReturn, false);
+            let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, this._referenceTypeToReturn, this._nodeClassToReturn, false);
             yield nodeReferenceBrowser.browse();
             let childReferences = nodeReferenceBrowser.results();
             let childNodesToBrowse = [];

package/dist/client/UaWebClient.d.ts

@@ -13,7 +13,7 @@ export type UaMethodArguments = {
     outputArguments: Array<UaArgument>;
 };
 export declare class UaWebClient {
-    private api;
+    protected api: UaWebClientApi;
     private clientConfig;
     private requestHandle;
     constructor(clientConfig: UaClientConfiguration);
@@ -41,13 +41,12 @@ export declare class UaWebClient {
     write(nodesToWrite: Array<UaWriteValue>, additionalParameters?: UaClientParameters): Promise<Array<UaStatusCode>>;
     call(methodsToCall: Array<UaCallMethodRequest>, additionalParameters?: UaClientParameters): Promise<Array<UaCallMethodResult>>;
     historyRead(nodesToRead: Array<UaHistoryReadValueId>, historyReadDetails: UaExtensionObject, timestampsToReturn?: number, releaseContinuationPoints?: boolean, additionalParameters?: UaClientParameters): Promise<Array<UaHistoryReadResult>>;
-    findServer(endpointUrl: string, serverUris: Array<string>, localeIds?: Array<string>, additionalParameters?: UaClientParameters): Promise<Array<ApplicationDescription>>;
-    getEndpoints(endpointUrl?: string, localeIds?: Array<string>, profileUris?: Array<string>, additionalParameters?: UaClientParameters): Promise<Array<EndpointDescription>>;
     addNodes(nodesToAdd: Array<UaAddNodesItem>, additionalParameters?: UaClientParameters): Promise<Array<UaAddNodesResult>>;
     deleteNodes(nodesToDelete: Array<UaDeleteNodesItem>, additionalParameters?: UaClientParameters): Promise<Array<UaStatusCode>>;
     addReferences(referencesToAdd: Array<UaAddReferencesItem>, additionalParameters?: UaClientParameters): Promise<Array<UaStatusCode>>;
     deleteReferences(referencesToDelete: Array<UaDeleteReferencesItem>, additionalParameters?: UaClientParameters): Promise<Array<UaStatusCode>>;
+    findServer(endpointUrl: string, serverUris: Array<string>, localeIds?: Array<string>, additionalParameters?: UaClientParameters): Promise<Array<ApplicationDescription>>;
+    getEndpoints(endpointUrl?: string, localeIds?: Array<string>, profileUris?: Array<string>, additionalParameters?: UaClientParameters): Promise<Array<EndpointDescription>>;
     protected requestHeader(additionalParameters?: UaClientParameters): RequestHeader;
     protected requestTimeout(additionalParameters?: UaClientParameters): number;
-    protected createApi(): UaWebClientApi;
 }

package/dist/client/UaWebClient.js

@@ -17,7 +17,7 @@ const common_2 = require("../common");
 class UaWebClient {
     constructor(clientConfig) {
         this.clientConfig = clientConfig;
-        this.api = this.createApi();
+        this.api = new __1.UaWebClientNative(this.clientConfig.apiConfig);
         this.requestHandle = 1;
     }
     getUrl() {
@@ -689,14 +689,18 @@ class UaWebClient {
             return results;
         });
     }
-    findServer(endpointUrl, serverUris, localeIds, additionalParameters) {
+    addNodes(nodesToAdd, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            let request = (0, opcua_webapi_1.FindServersRequestFromJSON)({
+            if (nodesToAdd.length == 0)
+                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
+            let NodesToAdd = [];
+            for (let item of nodesToAdd) {
+                NodesToAdd.push(item.toStruct());
+            }
+            let request = (0, opcua_webapi_1.AddNodesRequestFromJSON)({
                 RequestHeader: this.requestHeader(additionalParameters),
-                ServerUris: serverUris,
-                EndpointUrl: endpointUrl,
-                LocaleIds: localeIds
+                NodesToAdd: NodesToAdd
             });
             let timeout = this.requestTimeout(additionalParameters);
             let response;
@@ -704,9 +708,10 @@ class UaWebClient {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.findServers(request, { signal: controller.signal });
+                    response = yield this.api.addNodes(request, { signal: controller.signal });
                 }
                 catch (error) {
+                    console.error(error);
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
                 }
                 finally {
@@ -715,7 +720,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.findServers(request);
+                    response = yield this.api.addNodes(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -723,19 +728,30 @@ class UaWebClient {
             }
             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.Servers)
+            if (!response.Results)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDataLost));
-            return response.Servers;
+            let results = [];
+            for (let item of response.Results) {
+                let result = common_1.UaAddNodesResult.fromStruct(item);
+                if (null == result)
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDecodingError));
+                results.push(result);
+            }
+            return results;
         });
     }
-    getEndpoints(endpointUrl, localeIds, profileUris, additionalParameters) {
+    deleteNodes(nodesToDelete, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            let request = (0, opcua_webapi_1.GetEndpointsRequestFromJSON)({
+            if (nodesToDelete.length == 0)
+                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
+            let NodesToDelete = [];
+            for (let item of nodesToDelete) {
+                NodesToDelete.push(item.toStruct());
+            }
+            let request = (0, opcua_webapi_1.DeleteNodesRequestFromJSON)({
                 RequestHeader: this.requestHeader(additionalParameters),
-                EndpointUrl: endpointUrl,
-                LocaleIds: localeIds,
-                ProfileUris: profileUris
+                NodesToDelete: NodesToDelete
             });
             let timeout = this.requestTimeout(additionalParameters);
             let response;
@@ -743,7 +759,7 @@ class UaWebClient {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.getEndpoints(request, { signal: controller.signal });
+                    response = yield this.api.deleteNodes(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -754,7 +770,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.getEndpoints(request);
+                    response = yield this.api.deleteNodes(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -762,23 +778,28 @@ class UaWebClient {
             }
             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.Endpoints)
+            if (!response.Results)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDataLost));
-            return response.Endpoints;
+            let results = [];
+            for (let item of response.Results) {
+                let result = common_1.UaPayloadMapper.statusCodeFromWebApi(item);
+                results.push(result);
+            }
+            return results;
         });
     }
-    addNodes(nodesToAdd, additionalParameters) {
+    addReferences(referencesToAdd, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            if (nodesToAdd.length == 0)
+            if (referencesToAdd.length == 0)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
-            let NodesToAdd = [];
-            for (let item of nodesToAdd) {
-                NodesToAdd.push(item.toStruct());
+            let ReferencesToAdd = [];
+            for (let item of referencesToAdd) {
+                ReferencesToAdd.push(item.toStruct());
             }
-            let request = (0, opcua_webapi_1.AddNodesRequestFromJSON)({
+            let request = (0, opcua_webapi_1.AddReferencesRequestFromJSON)({
                 RequestHeader: this.requestHeader(additionalParameters),
-                NodesToAdd: NodesToAdd
+                ReferencesToAdd: ReferencesToAdd
             });
             let timeout = this.requestTimeout(additionalParameters);
             let response;
@@ -786,10 +807,9 @@ class UaWebClient {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.addNodes(request, { signal: controller.signal });
+                    response = yield this.api.addReferences(request, { signal: controller.signal });
                 }
                 catch (error) {
-                    console.error(error);
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
                 }
                 finally {
@@ -798,7 +818,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.addNodes(request);
+                    response = yield this.api.addReferences(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -810,26 +830,24 @@ class UaWebClient {
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDataLost));
             let results = [];
             for (let item of response.Results) {
-                let result = common_1.UaAddNodesResult.fromStruct(item);
-                if (null == result)
-                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDecodingError));
+                let result = common_1.UaPayloadMapper.statusCodeFromWebApi(item);
                 results.push(result);
             }
             return results;
         });
     }
-    deleteNodes(nodesToDelete, additionalParameters) {
+    deleteReferences(referencesToDelete, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            if (nodesToDelete.length == 0)
+            if (referencesToDelete.length == 0)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
-            let NodesToDelete = [];
-            for (let item of nodesToDelete) {
-                NodesToDelete.push(item.toStruct());
+            let ReferencesToDelete = [];
+            for (let item of referencesToDelete) {
+                ReferencesToDelete.push(item.toStruct());
             }
-            let request = (0, opcua_webapi_1.DeleteNodesRequestFromJSON)({
+            let request = (0, opcua_webapi_1.DeleteReferencesRequestFromJSON)({
                 RequestHeader: this.requestHeader(additionalParameters),
-                NodesToDelete: NodesToDelete
+                ReferencesToDelete: ReferencesToDelete
             });
             let timeout = this.requestTimeout(additionalParameters);
             let response;
@@ -837,7 +855,7 @@ class UaWebClient {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.deleteNodes(request, { signal: controller.signal });
+                    response = yield this.api.deleteReferences(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -848,7 +866,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.deleteNodes(request);
+                    response = yield this.api.deleteReferences(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -866,18 +884,14 @@ class UaWebClient {
             return results;
         });
     }
-    addReferences(referencesToAdd, additionalParameters) {
+    findServer(endpointUrl, serverUris, localeIds, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            if (referencesToAdd.length == 0)
-                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
-            let ReferencesToAdd = [];
-            for (let item of referencesToAdd) {
-                ReferencesToAdd.push(item.toStruct());
-            }
-            let request = (0, opcua_webapi_1.AddReferencesRequestFromJSON)({
+            let request = (0, opcua_webapi_1.FindServersRequestFromJSON)({
                 RequestHeader: this.requestHeader(additionalParameters),
-                ReferencesToAdd: ReferencesToAdd
+                ServerUris: serverUris,
+                EndpointUrl: endpointUrl,
+                LocaleIds: localeIds
             });
             let timeout = this.requestTimeout(additionalParameters);
             let response;
@@ -885,7 +899,7 @@ class UaWebClient {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.addReferences(request, { signal: controller.signal });
+                    response = yield this.api.findServers(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -896,7 +910,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.addReferences(request);
+                    response = yield this.api.findServers(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -904,28 +918,19 @@ class UaWebClient {
             }
             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)
+            if (!response.Servers)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDataLost));
-            let results = [];
-            for (let item of response.Results) {
-                let result = common_1.UaPayloadMapper.statusCodeFromWebApi(item);
-                results.push(result);
-            }
-            return results;
+            return response.Servers;
         });
     }
-    deleteReferences(referencesToDelete, additionalParameters) {
+    getEndpoints(endpointUrl, localeIds, profileUris, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            if (referencesToDelete.length == 0)
-                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNothingToDo));
-            let ReferencesToDelete = [];
-            for (let item of referencesToDelete) {
-                ReferencesToDelete.push(item.toStruct());
-            }
-            let request = (0, opcua_webapi_1.DeleteReferencesRequestFromJSON)({
+            let request = (0, opcua_webapi_1.GetEndpointsRequestFromJSON)({
                 RequestHeader: this.requestHeader(additionalParameters),
-                ReferencesToDelete: ReferencesToDelete
+                EndpointUrl: endpointUrl,
+                LocaleIds: localeIds,
+                ProfileUris: profileUris
             });
             let timeout = this.requestTimeout(additionalParameters);
             let response;
@@ -933,7 +938,7 @@ class UaWebClient {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.deleteReferences(request, { signal: controller.signal });
+                    response = yield this.api.getEndpoints(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -944,7 +949,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.deleteReferences(request);
+                    response = yield this.api.getEndpoints(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -952,14 +957,9 @@ class UaWebClient {
             }
             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)
+            if (!response.Endpoints)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDataLost));
-            let results = [];
-            for (let item of response.Results) {
-                let result = common_1.UaPayloadMapper.statusCodeFromWebApi(item);
-                results.push(result);
-            }
-            return results;
+            return response.Endpoints;
         });
     }
     requestHeader(additionalParameters) {
@@ -982,8 +982,5 @@ class UaWebClient {
             timeout = additionalParameters.timeout;
         return timeout;
     }
-    createApi() {
-        return new __1.UaWebClientNative(this.clientConfig.apiConfig);
-    }
 }
 exports.UaWebClient = UaWebClient;

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

@@ -1,4 +1,4 @@
-import { UaNode, UaNodeId, UaReference } from "../../common";
+import { UaNode, UaNodeId, UaObject, UaReference, UaDefintionNode } from "../../common";
 import { UaWebClient } from "../UaWebClient";
 export declare class UaNodeReader {
     private _client;
@@ -6,9 +6,10 @@ export declare class UaNodeReader {
     private _returnDescription;
     private _returnAttributes;
     private _returnValue;
+    private _referenceTypeToReturn;
     private static s_variableTypeWithoutMember;
     private static s_variablesNameToRead;
-    constructor(client: UaWebClient, returnDescription?: boolean | null, returnVariable?: boolean | null, returnMethod?: boolean | null, returnAttributes?: boolean | null, returnValue?: boolean | null);
+    constructor(client: UaWebClient, returnDescription?: boolean | null, returnVariable?: boolean | null, returnMethod?: boolean | null, returnAttributes?: boolean | null, returnValue?: boolean | null, referenceTypeToReturn?: UaNodeId);
     read(nodeIds: Array<UaNodeId>): Promise<Array<UaNode>>;
     readByReferences(references: Array<UaReference>): Promise<Array<UaNode>>;
     private _readRootNodes;
@@ -21,9 +22,9 @@ export declare class UaNodeReader {
 }
 export declare class UaObjectReader extends UaNodeReader {
     constructor(client: UaWebClient, returnDescription?: boolean | null, returnValue?: boolean | null);
-    read(nodeIds: Array<UaNodeId>): Promise<Array<UaNode>>;
+    read(nodeIds: Array<UaNodeId>): Promise<Array<UaObject>>;
 }
 export declare class UaTypeReader extends UaNodeReader {
     constructor(client: UaWebClient);
-    read(nodeIds: Array<UaNodeId>): Promise<Array<UaNode>>;
+    read(nodeIds: Array<UaNodeId>): Promise<Array<UaDefintionNode>>;
 }

package/dist/client/utils/UaNodeReader.js

@@ -14,11 +14,12 @@ const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
 const UaNodeBrowser_1 = require("./UaNodeBrowser");
 class UaNodeReader {
-    constructor(client, returnDescription, returnVariable, returnMethod, returnAttributes, returnValue) {
+    constructor(client, returnDescription, returnVariable, returnMethod, returnAttributes, returnValue, referenceTypeToReturn) {
         this._client = client;
         this._returnDescription = (returnDescription) ? returnDescription : false;
         this._returnAttributes = (returnAttributes) ? returnAttributes : false;
         this._returnValue = (returnValue) ? returnValue : false;
+        this._referenceTypeToReturn = (referenceTypeToReturn) ? referenceTypeToReturn : common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences);
         this._nodeClassToReturn = 0;
         if (returnVariable)
             this._nodeClassToReturn += opcua_webapi_1.NodeClass.Variable;
@@ -68,7 +69,7 @@ class UaNodeReader {
                 nodeIdsToBrowse.push(item.nodeId);
                 nodeIdsSet.add(item.nodeId.toString());
             }
-            let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), this._nodeClassToReturn, false);
+            let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, this._referenceTypeToReturn, this._nodeClassToReturn, false);
             yield nodeReferenceBrowser.browse();
             let childReferences = nodeReferenceBrowser.results();
             let childNodesToBrowse = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opcua-webapi-ts",
-  "version": "1.1.20",
+  "version": "1.1.22",
   "description": "Provides OPC UA WebAPI wrapper and client based on opcua-webapi-typescript",
   "author": "DingYan",
   "license": "MIT",