opcua-webapi-ts 1.0.29 → 1.1.1

package/dist/cjs/client/UaWebClient.js

@@ -12,19 +12,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UaWebClient = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../common");
+const __1 = require("..");
 const common_2 = require("../common");
 class UaWebClient {
     constructor(clientConfig) {
-        this.api = new opcua_webapi_1.DefaultApi(clientConfig.apiConfig);
         this.clientConfig = clientConfig;
+        this.api = this.createApi();
         this.requestHandle = 1;
     }
     getUrl() {
         return this.clientConfig.apiConfig.basePath;
     }
-    getNativeApi() {
-        return this.api;
-    }
     find(applicationUris) {
         return __awaiter(this, void 0, void 0, function* () {
             let results = yield this.findServer(this.clientConfig.apiConfig.basePath, (applicationUris) ? applicationUris : []);
@@ -360,18 +358,18 @@ class UaWebClient {
                 NodesToBrowse.push(item.toStruct());
             }
             let request = (0, opcua_webapi_1.BrowseRequestFromJSON)({
-                RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
+                RequestHeader: this.requestHeader(additionalParameters),
                 NodesToBrowse: NodesToBrowse,
                 RequestedMaxReferencesPerNode: (maxReferencesPerNode && maxReferencesPerNode > 0) ? maxReferencesPerNode : undefined,
                 View: view
             });
-            let timeout = this.requestTimeout(this.clientConfig, additionalParameters);
+            let timeout = this.requestTimeout(additionalParameters);
             let response;
             if (timeout > 0 && typeof AbortController !== "undefined") {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.browse({ browseRequest: request }, { signal: controller.signal });
+                    response = yield this.api.browse(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -382,7 +380,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.browse({ browseRequest: request });
+                    response = yield this.api.browse(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -410,17 +408,17 @@ class UaWebClient {
             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),
+                RequestHeader: this.requestHeader(additionalParameters),
                 ContinuationPoints: continuationPoints,
                 ReleaseContinuationPoints: releaseContinuationPoints
             });
-            let timeout = this.requestTimeout(this.clientConfig, additionalParameters);
+            let timeout = this.requestTimeout(additionalParameters);
             let response;
             if (timeout > 0 && typeof AbortController !== "undefined") {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.browseNext({ browseNextRequest: request }, { signal: controller.signal });
+                    response = yield this.api.browseNext(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -431,7 +429,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.browseNext({ browseNextRequest: request });
+                    response = yield this.api.browseNext(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -461,20 +459,20 @@ class UaWebClient {
                 NodesToRead.push(item.toStruct());
             }
             let request = (0, opcua_webapi_1.ReadRequestFromJSON)({
-                RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
+                RequestHeader: this.requestHeader(additionalParameters),
                 NodesToRead: NodesToRead,
                 MaxAge: (maxAge && maxAge > 0) ? maxAge : undefined,
                 TimestampsToReturn: (timestampsToReturn &&
                     timestampsToReturn >= opcua_webapi_1.TimestampsToReturn.Source &&
                     timestampsToReturn < opcua_webapi_1.TimestampsToReturn.Invalid) ? timestampsToReturn : opcua_webapi_1.TimestampsToReturn.Neither
             });
-            let timeout = this.requestTimeout(this.clientConfig, additionalParameters);
+            let timeout = this.requestTimeout(additionalParameters);
             let response;
             if (timeout > 0 && typeof AbortController !== "undefined") {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.read({ readRequest: request }, { signal: controller.signal });
+                    response = yield this.api.read(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -485,7 +483,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.read({ readRequest: request });
+                    response = yield this.api.read(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -513,16 +511,16 @@ class UaWebClient {
                 NodesToWrite.push(item.toStruct());
             }
             let request = (0, opcua_webapi_1.WriteRequestFromJSON)({
-                RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
+                RequestHeader: this.requestHeader(additionalParameters),
                 NodesToWrite: NodesToWrite
             });
-            let timeout = this.requestTimeout(this.clientConfig, additionalParameters);
+            let timeout = this.requestTimeout(additionalParameters);
             let response;
             if (timeout > 0 && typeof AbortController !== "undefined") {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.write({ writeRequest: request }, { signal: controller.signal });
+                    response = yield this.api.write(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -533,7 +531,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.write({ writeRequest: request });
+                    response = yield this.api.write(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -561,16 +559,16 @@ class UaWebClient {
                 MethodsToCall.push(item.toStruct());
             }
             let request = (0, opcua_webapi_1.CallRequestFromJSON)({
-                RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
+                RequestHeader: this.requestHeader(additionalParameters),
                 MethodsToCall: MethodsToCall
             });
-            let timeout = this.requestTimeout(this.clientConfig, additionalParameters);
+            let timeout = this.requestTimeout(additionalParameters);
             let response;
             if (timeout > 0 && typeof AbortController !== "undefined") {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.call({ callRequest: request }, { signal: controller.signal });
+                    response = yield this.api.call(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -581,7 +579,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.call({ callRequest: request });
+                    response = yield this.api.call(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -611,7 +609,7 @@ class UaWebClient {
                 NodesToRead.push(item.toStruct());
             }
             let request = (0, opcua_webapi_1.HistoryReadRequestFromJSON)({
-                RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
+                RequestHeader: this.requestHeader(additionalParameters),
                 HistoryReadDetails: common_1.UaPayloadMapper.extensionObjectToWebApi(historyReadDetails),
                 TimestampsToReturn: (timestampsToReturn &&
                     timestampsToReturn >= opcua_webapi_1.TimestampsToReturn.Source &&
@@ -619,13 +617,13 @@ class UaWebClient {
                 ReleaseContinuationPoints: releaseContinuationPoints,
                 NodesToRead: NodesToRead
             });
-            let timeout = this.requestTimeout(this.clientConfig, additionalParameters);
+            let timeout = this.requestTimeout(additionalParameters);
             let response;
             if (timeout > 0 && typeof AbortController !== "undefined") {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.historyRead({ historyReadRequest: request }, { signal: controller.signal });
+                    response = yield this.api.historyRead(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -636,7 +634,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.historyRead({ historyReadRequest: request });
+                    response = yield this.api.historyRead(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -660,18 +658,18 @@ class UaWebClient {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             let request = (0, opcua_webapi_1.FindServersRequestFromJSON)({
-                RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
+                RequestHeader: this.requestHeader(additionalParameters),
                 ServerUris: serverUris,
                 EndpointUrl: endpointUrl,
                 LocaleIds: localeIds
             });
-            let timeout = this.requestTimeout(this.clientConfig, additionalParameters);
+            let timeout = this.requestTimeout(additionalParameters);
             let response;
             if (timeout > 0 && typeof AbortController !== "undefined") {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.findServers({ findServersRequest: 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));
@@ -682,7 +680,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.findServers({ findServersRequest: request });
+                    response = yield this.api.findServers(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -699,18 +697,18 @@ class UaWebClient {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             let request = (0, opcua_webapi_1.GetEndpointsRequestFromJSON)({
-                RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
+                RequestHeader: this.requestHeader(additionalParameters),
                 EndpointUrl: endpointUrl,
                 LocaleIds: localeIds,
                 ProfileUris: profileUris
             });
-            let timeout = this.requestTimeout(this.clientConfig, additionalParameters);
+            let timeout = this.requestTimeout(additionalParameters);
             let response;
             if (timeout > 0 && typeof AbortController !== "undefined") {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.getEndpoints({ getEndpointsRequest: 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));
@@ -721,7 +719,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.getEndpoints({ getEndpointsRequest: request });
+                    response = yield this.api.getEndpoints(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -734,13 +732,12 @@ class UaWebClient {
             return response.Endpoints;
         });
     }
-    requestHeader(clientConfig, additionalParameters) {
-        let timeout = this.requestTimeout(clientConfig, additionalParameters);
+    requestHeader(additionalParameters) {
+        let timeout = this.requestTimeout(additionalParameters);
         let ret = {
             RequestHandle: this.requestHandle,
             TimeoutHint: timeout,
             Timestamp: new Date(),
-            AuthenticationToken: this.authenticationToken,
             ReturnDiagnostics: (additionalParameters) ? additionalParameters.returnDiagnostics : undefined,
             AuditEntryId: (additionalParameters) ? additionalParameters.auditEntryId : undefined,
         };
@@ -749,11 +746,14 @@ class UaWebClient {
             this.requestHandle = 1;
         return ret;
     }
-    requestTimeout(clientConfig, additionalParameters) {
-        let timeout = clientConfig.defaultTimeout;
+    requestTimeout(additionalParameters) {
+        let timeout = this.clientConfig.defaultTimeout;
         if (additionalParameters && additionalParameters.timeout > 1000)
             timeout = additionalParameters.timeout;
         return timeout;
     }
+    createApi() {
+        return new __1.UaWebClientNative(this.clientConfig.apiConfig);
+    }
 }
 exports.UaWebClient = UaWebClient;

package/dist/cjs/client/base/UaWebClientApi.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/client/base/UaWebClientNative.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UaWebClientNative = void 0;
+const opcua_webapi_1 = require("opcua-webapi");
+class UaWebClientNative {
+    constructor(configure) {
+        this.api = new opcua_webapi_1.DefaultApi(configure);
+    }
+    browse(request, initOverrides) {
+        return this.api.browse({ browseRequest: request }, initOverrides);
+    }
+    browseNext(request, initOverrides) {
+        return this.api.browseNext({ browseNextRequest: request }, initOverrides);
+    }
+    call(request, initOverrides) {
+        return this.api.call({ callRequest: request }, initOverrides);
+    }
+    findServers(request, initOverrides) {
+        return this.api.findServers({ findServersRequest: request }, initOverrides);
+    }
+    getEndpoints(request, initOverrides) {
+        return this.api.getEndpoints({ getEndpointsRequest: request }, initOverrides);
+    }
+    historyRead(request, initOverrides) {
+        return this.api.historyRead({ historyReadRequest: request }, initOverrides);
+    }
+    read(request, initOverrides) {
+        return this.api.read({ readRequest: request }, initOverrides);
+    }
+    write(request, initOverrides) {
+        return this.api.write({ writeRequest: request }, initOverrides);
+    }
+}
+exports.UaWebClientNative = UaWebClientNative;

package/dist/cjs/client/base/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./UaWebClientApi"), exports);
+__exportStar(require("./UaWebClientNative"), exports);

package/dist/cjs/client/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./UaWebClient"), exports);
 __exportStar(require("./UaClientConfigure"), exports);
 __exportStar(require("./utils"), exports);
+__exportStar(require("./base"), exports);

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

@@ -56,7 +56,7 @@ class UaNodeReaderBase {
                 for (let item of currentResult.references) {
                     let nodeId = item.nodeId.getNodeId();
                     let typeDefinition = (_a = item.typeDefinition) === null || _a === void 0 ? void 0 : _a.getNodeId();
-                    if (null == nodeId || null == typeDefinition)
+                    if (null == nodeId || null === typeDefinition)
                         continue;
                     this._browseResults.push({
                         fromNodeId: currentNode.nodeId,
@@ -575,7 +575,7 @@ class UaNodeLinkReader {
                 };
                 ret.set(item.fromNodeId.toString(), result);
             }
-            result.links.push(new common_1.UaLink(item.nodeId, item.nodeClass, item.referenceTypeId, item.isForward));
+            result.links.push(new common_1.UaLink(item.nodeId, item.nodeClass, item.browseName, item.displayName, item.referenceTypeId, item.isForward));
         }
         return [...ret.values()];
     }
@@ -587,7 +587,7 @@ class UaNodeLinkReader {
             let nodesToBrowse = this._nodesToBrowse.splice(0, 50);
             let browseDescriptions = [];
             for (let item of nodesToBrowse) {
-                let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Both, common_1.UaNodeId.from(common_1.ReferenceTypeIds.NonHierarchicalReferences), true, opcua_webapi_1.NodeClass.Object | opcua_webapi_1.NodeClass.Variable | opcua_webapi_1.NodeClass.Method, 7);
+                let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Both, common_1.UaNodeId.from(common_1.ReferenceTypeIds.NonHierarchicalReferences), true, opcua_webapi_1.NodeClass.Object, 63);
                 browseDescriptions.push(browseDescription);
             }
             let results = yield client.browse(browseDescriptions, 50);
@@ -599,15 +599,15 @@ class UaNodeLinkReader {
                 for (let item of currentResult.references) {
                     let nodeId = item.nodeId.getNodeId();
                     let typeDefinition = (_a = item.typeDefinition) === null || _a === void 0 ? void 0 : _a.getNodeId();
-                    if (null == nodeId || null == typeDefinition)
+                    if (null == nodeId || null === typeDefinition)
                         continue;
                     this._browseResults.push({
                         fromNodeId: currentNodeId,
                         nodeId: nodeId,
-                        nodeClass: item.nodeClass,
-                        browseName: item.browseName,
-                        displayName: item.displayName,
-                        referenceTypeId: item.referenceTypeId,
+                        nodeClass: (item.nodeClass) ? item.nodeClass : opcua_webapi_1.NodeClass.Unspecified,
+                        browseName: (item.browseName) ? item.browseName : "",
+                        displayName: (item.displayName) ? item.displayName : common_1.UaLocalizedText.nullText,
+                        referenceTypeId: (item.referenceTypeId) ? item.referenceTypeId : common_1.UaNodeId.nullNodeId,
                         isForward: item.isForward,
                         typeDefinitionId: typeDefinition
                     });
@@ -638,15 +638,15 @@ class UaNodeLinkReader {
                 for (let item of currentResult.references) {
                     let nodeId = item.nodeId.getNodeId();
                     let typeDefinition = (_a = item.typeDefinition) === null || _a === void 0 ? void 0 : _a.getNodeId();
-                    if (null == nodeId || null == typeDefinition)
+                    if (null == nodeId || null === typeDefinition)
                         continue;
                     this._browseResults.push({
                         fromNodeId: currentNodeId,
                         nodeId: nodeId,
-                        nodeClass: item.nodeClass,
-                        browseName: item.browseName,
-                        displayName: item.displayName,
-                        referenceTypeId: item.referenceTypeId,
+                        nodeClass: (item.nodeClass) ? item.nodeClass : opcua_webapi_1.NodeClass.Unspecified,
+                        browseName: (item.browseName) ? item.browseName : "",
+                        displayName: (item.displayName) ? item.displayName : common_1.UaLocalizedText.nullText,
+                        referenceTypeId: (item.referenceTypeId) ? item.referenceTypeId : common_1.UaNodeId.nullNodeId,
                         isForward: item.isForward,
                         typeDefinitionId: typeDefinition
                     });

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

@@ -38,7 +38,7 @@ class UaObjectTypeDictionary {
             let nodeIds = this._remainingNodesToBrowse.splice(0, 15);
             let nodesToBrowse = [];
             for (let item of nodeIds) {
-                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.ObjectType, 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.ObjectType, 63);
                 nodesToBrowse.push(browseDescription);
             }
             let results = yield client.browse(nodesToBrowse);

package/dist/cjs/common/types/UaLink.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UaLink = void 0;
 class UaLink {
-    constructor(targetId, nodeClass, referenceTypeId, isForward) {
+    constructor(targetId, nodeClass, browseName, displayName, referenceTypeId, isForward) {
         this._targetId = targetId;
+        this._browseName = browseName;
+        this._displayName = displayName;
         this._nodeClass = nodeClass;
         this._referenceTypeId = referenceTypeId;
         this._isForward = isForward;
@@ -11,6 +13,12 @@ class UaLink {
     get targetId() {
         return this._targetId;
     }
+    get browseName() {
+        return this._browseName;
+    }
+    get displayName() {
+        return this._displayName;
+    }
     get nodeClass() {
         return this._nodeClass;
     }

package/dist/client/UaWebClient.d.ts

@@ -1,15 +1,13 @@
-import { DefaultApi, ViewDescription, ApplicationDescription, BrowseDirection, EndpointDescription } from "opcua-webapi";
+import { ViewDescription, RequestHeader, ApplicationDescription, BrowseDirection, EndpointDescription } from "opcua-webapi";
 import { UaBrowseResult, UaNodeAttributes, UaVariableAttributes, UaNodeId, UaDataValue, UaVariant, UaStatusCode, UaExtensionObject, UaHistoryDataResult, UaQuery, UaObjectAttributes, UaMethodArguments, UaApplicationDescriptor, UaBrowseDescription, UaReadValueId, UaWriteValue, UaHistoryReadValueId, UaHistoryReadResult } from "../common";
-import { UaClientConfiguration, UaClientParameters } from "..";
+import { UaClientConfiguration, UaClientParameters, UaWebClientApi } from "..";
 import { UaHistoryEventResult, UaCallMethodRequest, UaCallMethodResult } from "../common";
 export declare class UaWebClient {
     private api;
     private clientConfig;
     private requestHandle;
-    protected authenticationToken: string | undefined;
     constructor(clientConfig: UaClientConfiguration);
     getUrl(): string;
-    getNativeApi(): DefaultApi;
     find(applicationUris?: Array<string>): Promise<Array<UaApplicationDescriptor>>;
     browseChild(nodeId: UaNodeId, nodeClass?: number, maxReferences?: number): Promise<UaBrowseResult>;
     browseReference(nodeId: UaNodeId, nodeClass?: number, direction?: BrowseDirection, referenceTypeId?: UaNodeId, maxReferences?: number): Promise<UaBrowseResult>;
@@ -33,6 +31,7 @@ export declare class UaWebClient {
     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>>;
-    private requestHeader;
-    private requestTimeout;
+    protected requestHeader(additionalParameters?: UaClientParameters): RequestHeader;
+    protected requestTimeout(additionalParameters?: UaClientParameters): number;
+    protected createApi(): UaWebClientApi;
 }

package/dist/client/UaWebClient.js

@@ -12,19 +12,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UaWebClient = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../common");
+const __1 = require("..");
 const common_2 = require("../common");
 class UaWebClient {
     constructor(clientConfig) {
-        this.api = new opcua_webapi_1.DefaultApi(clientConfig.apiConfig);
         this.clientConfig = clientConfig;
+        this.api = this.createApi();
         this.requestHandle = 1;
     }
     getUrl() {
         return this.clientConfig.apiConfig.basePath;
     }
-    getNativeApi() {
-        return this.api;
-    }
     find(applicationUris) {
         return __awaiter(this, void 0, void 0, function* () {
             let results = yield this.findServer(this.clientConfig.apiConfig.basePath, (applicationUris) ? applicationUris : []);
@@ -360,18 +358,18 @@ class UaWebClient {
                 NodesToBrowse.push(item.toStruct());
             }
             let request = (0, opcua_webapi_1.BrowseRequestFromJSON)({
-                RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
+                RequestHeader: this.requestHeader(additionalParameters),
                 NodesToBrowse: NodesToBrowse,
                 RequestedMaxReferencesPerNode: (maxReferencesPerNode && maxReferencesPerNode > 0) ? maxReferencesPerNode : undefined,
                 View: view
             });
-            let timeout = this.requestTimeout(this.clientConfig, additionalParameters);
+            let timeout = this.requestTimeout(additionalParameters);
             let response;
             if (timeout > 0 && typeof AbortController !== "undefined") {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.browse({ browseRequest: request }, { signal: controller.signal });
+                    response = yield this.api.browse(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -382,7 +380,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.browse({ browseRequest: request });
+                    response = yield this.api.browse(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -410,17 +408,17 @@ class UaWebClient {
             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),
+                RequestHeader: this.requestHeader(additionalParameters),
                 ContinuationPoints: continuationPoints,
                 ReleaseContinuationPoints: releaseContinuationPoints
             });
-            let timeout = this.requestTimeout(this.clientConfig, additionalParameters);
+            let timeout = this.requestTimeout(additionalParameters);
             let response;
             if (timeout > 0 && typeof AbortController !== "undefined") {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.browseNext({ browseNextRequest: request }, { signal: controller.signal });
+                    response = yield this.api.browseNext(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -431,7 +429,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.browseNext({ browseNextRequest: request });
+                    response = yield this.api.browseNext(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -461,20 +459,20 @@ class UaWebClient {
                 NodesToRead.push(item.toStruct());
             }
             let request = (0, opcua_webapi_1.ReadRequestFromJSON)({
-                RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
+                RequestHeader: this.requestHeader(additionalParameters),
                 NodesToRead: NodesToRead,
                 MaxAge: (maxAge && maxAge > 0) ? maxAge : undefined,
                 TimestampsToReturn: (timestampsToReturn &&
                     timestampsToReturn >= opcua_webapi_1.TimestampsToReturn.Source &&
                     timestampsToReturn < opcua_webapi_1.TimestampsToReturn.Invalid) ? timestampsToReturn : opcua_webapi_1.TimestampsToReturn.Neither
             });
-            let timeout = this.requestTimeout(this.clientConfig, additionalParameters);
+            let timeout = this.requestTimeout(additionalParameters);
             let response;
             if (timeout > 0 && typeof AbortController !== "undefined") {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.read({ readRequest: request }, { signal: controller.signal });
+                    response = yield this.api.read(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -485,7 +483,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.read({ readRequest: request });
+                    response = yield this.api.read(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -513,16 +511,16 @@ class UaWebClient {
                 NodesToWrite.push(item.toStruct());
             }
             let request = (0, opcua_webapi_1.WriteRequestFromJSON)({
-                RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
+                RequestHeader: this.requestHeader(additionalParameters),
                 NodesToWrite: NodesToWrite
             });
-            let timeout = this.requestTimeout(this.clientConfig, additionalParameters);
+            let timeout = this.requestTimeout(additionalParameters);
             let response;
             if (timeout > 0 && typeof AbortController !== "undefined") {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.write({ writeRequest: request }, { signal: controller.signal });
+                    response = yield this.api.write(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -533,7 +531,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.write({ writeRequest: request });
+                    response = yield this.api.write(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -561,16 +559,16 @@ class UaWebClient {
                 MethodsToCall.push(item.toStruct());
             }
             let request = (0, opcua_webapi_1.CallRequestFromJSON)({
-                RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
+                RequestHeader: this.requestHeader(additionalParameters),
                 MethodsToCall: MethodsToCall
             });
-            let timeout = this.requestTimeout(this.clientConfig, additionalParameters);
+            let timeout = this.requestTimeout(additionalParameters);
             let response;
             if (timeout > 0 && typeof AbortController !== "undefined") {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.call({ callRequest: request }, { signal: controller.signal });
+                    response = yield this.api.call(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -581,7 +579,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.call({ callRequest: request });
+                    response = yield this.api.call(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -611,7 +609,7 @@ class UaWebClient {
                 NodesToRead.push(item.toStruct());
             }
             let request = (0, opcua_webapi_1.HistoryReadRequestFromJSON)({
-                RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
+                RequestHeader: this.requestHeader(additionalParameters),
                 HistoryReadDetails: common_1.UaPayloadMapper.extensionObjectToWebApi(historyReadDetails),
                 TimestampsToReturn: (timestampsToReturn &&
                     timestampsToReturn >= opcua_webapi_1.TimestampsToReturn.Source &&
@@ -619,13 +617,13 @@ class UaWebClient {
                 ReleaseContinuationPoints: releaseContinuationPoints,
                 NodesToRead: NodesToRead
             });
-            let timeout = this.requestTimeout(this.clientConfig, additionalParameters);
+            let timeout = this.requestTimeout(additionalParameters);
             let response;
             if (timeout > 0 && typeof AbortController !== "undefined") {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.historyRead({ historyReadRequest: request }, { signal: controller.signal });
+                    response = yield this.api.historyRead(request, { signal: controller.signal });
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -636,7 +634,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.historyRead({ historyReadRequest: request });
+                    response = yield this.api.historyRead(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -660,18 +658,18 @@ class UaWebClient {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             let request = (0, opcua_webapi_1.FindServersRequestFromJSON)({
-                RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
+                RequestHeader: this.requestHeader(additionalParameters),
                 ServerUris: serverUris,
                 EndpointUrl: endpointUrl,
                 LocaleIds: localeIds
             });
-            let timeout = this.requestTimeout(this.clientConfig, additionalParameters);
+            let timeout = this.requestTimeout(additionalParameters);
             let response;
             if (timeout > 0 && typeof AbortController !== "undefined") {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.findServers({ findServersRequest: 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));
@@ -682,7 +680,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.findServers({ findServersRequest: request });
+                    response = yield this.api.findServers(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -699,18 +697,18 @@ class UaWebClient {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             let request = (0, opcua_webapi_1.GetEndpointsRequestFromJSON)({
-                RequestHeader: this.requestHeader(this.clientConfig, additionalParameters),
+                RequestHeader: this.requestHeader(additionalParameters),
                 EndpointUrl: endpointUrl,
                 LocaleIds: localeIds,
                 ProfileUris: profileUris
             });
-            let timeout = this.requestTimeout(this.clientConfig, additionalParameters);
+            let timeout = this.requestTimeout(additionalParameters);
             let response;
             if (timeout > 0 && typeof AbortController !== "undefined") {
                 let controller = new AbortController();
                 let timeoutId = setTimeout(() => controller.abort(), timeout);
                 try {
-                    response = yield this.api.getEndpoints({ getEndpointsRequest: 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));
@@ -721,7 +719,7 @@ class UaWebClient {
             }
             else {
                 try {
-                    response = yield this.api.getEndpoints({ getEndpointsRequest: request });
+                    response = yield this.api.getEndpoints(request);
                 }
                 catch (error) {
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
@@ -734,13 +732,12 @@ class UaWebClient {
             return response.Endpoints;
         });
     }
-    requestHeader(clientConfig, additionalParameters) {
-        let timeout = this.requestTimeout(clientConfig, additionalParameters);
+    requestHeader(additionalParameters) {
+        let timeout = this.requestTimeout(additionalParameters);
         let ret = {
             RequestHandle: this.requestHandle,
             TimeoutHint: timeout,
             Timestamp: new Date(),
-            AuthenticationToken: this.authenticationToken,
             ReturnDiagnostics: (additionalParameters) ? additionalParameters.returnDiagnostics : undefined,
             AuditEntryId: (additionalParameters) ? additionalParameters.auditEntryId : undefined,
         };
@@ -749,11 +746,14 @@ class UaWebClient {
             this.requestHandle = 1;
         return ret;
     }
-    requestTimeout(clientConfig, additionalParameters) {
-        let timeout = clientConfig.defaultTimeout;
+    requestTimeout(additionalParameters) {
+        let timeout = this.clientConfig.defaultTimeout;
         if (additionalParameters && additionalParameters.timeout > 1000)
             timeout = additionalParameters.timeout;
         return timeout;
     }
+    createApi() {
+        return new __1.UaWebClientNative(this.clientConfig.apiConfig);
+    }
 }
 exports.UaWebClient = UaWebClient;

package/dist/client/base/UaWebClientApi.d.ts

@@ -0,0 +1,11 @@
+import { BrowseNextRequest, BrowseNextResponse, BrowseRequest, BrowseResponse, CallRequest, CallResponse, FindServersRequest, FindServersResponse, GetEndpointsRequest, GetEndpointsResponse, HistoryReadRequest, HistoryReadResponse, ReadRequest, ReadResponse, WriteRequest, WriteResponse } from "opcua-webapi";
+export interface UaWebClientApi {
+    browse(request: BrowseRequest, initOverrides?: RequestInit): Promise<BrowseResponse>;
+    browseNext(request: BrowseNextRequest, initOverrides?: RequestInit): Promise<BrowseNextResponse>;
+    call(request: CallRequest, initOverrides?: RequestInit): Promise<CallResponse>;
+    findServers(request: FindServersRequest, initOverrides?: RequestInit): Promise<FindServersResponse>;
+    getEndpoints(request: GetEndpointsRequest, initOverrides?: RequestInit): Promise<GetEndpointsResponse>;
+    historyRead(request: HistoryReadRequest, initOverrides?: RequestInit): Promise<HistoryReadResponse>;
+    read(request: ReadRequest, initOverrides?: RequestInit): Promise<ReadResponse>;
+    write(request: WriteRequest, initOverrides?: RequestInit): Promise<WriteResponse>;
+}

package/dist/client/base/UaWebClientApi.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/client/base/UaWebClientNative.d.ts

@@ -0,0 +1,15 @@
+import { Configuration } from "opcua-webapi";
+import { UaWebClientApi } from "./UaWebClientApi";
+import { BrowseNextRequest, BrowseNextResponse, BrowseRequest, BrowseResponse, CallRequest, CallResponse, FindServersRequest, FindServersResponse, GetEndpointsRequest, GetEndpointsResponse, HistoryReadRequest, HistoryReadResponse, ReadRequest, ReadResponse, WriteRequest, WriteResponse } from "opcua-webapi";
+export declare class UaWebClientNative implements UaWebClientApi {
+    private api;
+    constructor(configure: Configuration);
+    browse(request: BrowseRequest, initOverrides?: RequestInit): Promise<BrowseResponse>;
+    browseNext(request: BrowseNextRequest, initOverrides?: RequestInit): Promise<BrowseNextResponse>;
+    call(request: CallRequest, initOverrides?: RequestInit): Promise<CallResponse>;
+    findServers(request: FindServersRequest, initOverrides?: RequestInit): Promise<FindServersResponse>;
+    getEndpoints(request: GetEndpointsRequest, initOverrides?: RequestInit): Promise<GetEndpointsResponse>;
+    historyRead(request: HistoryReadRequest, initOverrides?: RequestInit): Promise<HistoryReadResponse>;
+    read(request: ReadRequest, initOverrides?: RequestInit): Promise<ReadResponse>;
+    write(request: WriteRequest, initOverrides?: RequestInit): Promise<WriteResponse>;
+}

package/dist/client/base/UaWebClientNative.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UaWebClientNative = void 0;
+const opcua_webapi_1 = require("opcua-webapi");
+class UaWebClientNative {
+    constructor(configure) {
+        this.api = new opcua_webapi_1.DefaultApi(configure);
+    }
+    browse(request, initOverrides) {
+        return this.api.browse({ browseRequest: request }, initOverrides);
+    }
+    browseNext(request, initOverrides) {
+        return this.api.browseNext({ browseNextRequest: request }, initOverrides);
+    }
+    call(request, initOverrides) {
+        return this.api.call({ callRequest: request }, initOverrides);
+    }
+    findServers(request, initOverrides) {
+        return this.api.findServers({ findServersRequest: request }, initOverrides);
+    }
+    getEndpoints(request, initOverrides) {
+        return this.api.getEndpoints({ getEndpointsRequest: request }, initOverrides);
+    }
+    historyRead(request, initOverrides) {
+        return this.api.historyRead({ historyReadRequest: request }, initOverrides);
+    }
+    read(request, initOverrides) {
+        return this.api.read({ readRequest: request }, initOverrides);
+    }
+    write(request, initOverrides) {
+        return this.api.write({ writeRequest: request }, initOverrides);
+    }
+}
+exports.UaWebClientNative = UaWebClientNative;

package/dist/client/base/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./UaWebClientApi";
+export * from "./UaWebClientNative";

package/dist/client/base/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./UaWebClientApi"), exports);
+__exportStar(require("./UaWebClientNative"), exports);

package/dist/client/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./UaWebClient";
 export * from "./UaClientConfigure";
 export * from "./utils";
+export * from "./base";

package/dist/client/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./UaWebClient"), exports);
 __exportStar(require("./UaClientConfigure"), exports);
 __exportStar(require("./utils"), exports);
+__exportStar(require("./base"), exports);

package/dist/client/utils/UaNodeReader.js

@@ -56,7 +56,7 @@ class UaNodeReaderBase {
                 for (let item of currentResult.references) {
                     let nodeId = item.nodeId.getNodeId();
                     let typeDefinition = (_a = item.typeDefinition) === null || _a === void 0 ? void 0 : _a.getNodeId();
-                    if (null == nodeId || null == typeDefinition)
+                    if (null == nodeId || null === typeDefinition)
                         continue;
                     this._browseResults.push({
                         fromNodeId: currentNode.nodeId,
@@ -575,7 +575,7 @@ class UaNodeLinkReader {
                 };
                 ret.set(item.fromNodeId.toString(), result);
             }
-            result.links.push(new common_1.UaLink(item.nodeId, item.nodeClass, item.referenceTypeId, item.isForward));
+            result.links.push(new common_1.UaLink(item.nodeId, item.nodeClass, item.browseName, item.displayName, item.referenceTypeId, item.isForward));
         }
         return [...ret.values()];
     }
@@ -587,7 +587,7 @@ class UaNodeLinkReader {
             let nodesToBrowse = this._nodesToBrowse.splice(0, 50);
             let browseDescriptions = [];
             for (let item of nodesToBrowse) {
-                let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Both, common_1.UaNodeId.from(common_1.ReferenceTypeIds.NonHierarchicalReferences), true, opcua_webapi_1.NodeClass.Object | opcua_webapi_1.NodeClass.Variable | opcua_webapi_1.NodeClass.Method, 7);
+                let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Both, common_1.UaNodeId.from(common_1.ReferenceTypeIds.NonHierarchicalReferences), true, opcua_webapi_1.NodeClass.Object, 63);
                 browseDescriptions.push(browseDescription);
             }
             let results = yield client.browse(browseDescriptions, 50);
@@ -599,15 +599,15 @@ class UaNodeLinkReader {
                 for (let item of currentResult.references) {
                     let nodeId = item.nodeId.getNodeId();
                     let typeDefinition = (_a = item.typeDefinition) === null || _a === void 0 ? void 0 : _a.getNodeId();
-                    if (null == nodeId || null == typeDefinition)
+                    if (null == nodeId || null === typeDefinition)
                         continue;
                     this._browseResults.push({
                         fromNodeId: currentNodeId,
                         nodeId: nodeId,
-                        nodeClass: item.nodeClass,
-                        browseName: item.browseName,
-                        displayName: item.displayName,
-                        referenceTypeId: item.referenceTypeId,
+                        nodeClass: (item.nodeClass) ? item.nodeClass : opcua_webapi_1.NodeClass.Unspecified,
+                        browseName: (item.browseName) ? item.browseName : "",
+                        displayName: (item.displayName) ? item.displayName : common_1.UaLocalizedText.nullText,
+                        referenceTypeId: (item.referenceTypeId) ? item.referenceTypeId : common_1.UaNodeId.nullNodeId,
                         isForward: item.isForward,
                         typeDefinitionId: typeDefinition
                     });
@@ -638,15 +638,15 @@ class UaNodeLinkReader {
                 for (let item of currentResult.references) {
                     let nodeId = item.nodeId.getNodeId();
                     let typeDefinition = (_a = item.typeDefinition) === null || _a === void 0 ? void 0 : _a.getNodeId();
-                    if (null == nodeId || null == typeDefinition)
+                    if (null == nodeId || null === typeDefinition)
                         continue;
                     this._browseResults.push({
                         fromNodeId: currentNodeId,
                         nodeId: nodeId,
-                        nodeClass: item.nodeClass,
-                        browseName: item.browseName,
-                        displayName: item.displayName,
-                        referenceTypeId: item.referenceTypeId,
+                        nodeClass: (item.nodeClass) ? item.nodeClass : opcua_webapi_1.NodeClass.Unspecified,
+                        browseName: (item.browseName) ? item.browseName : "",
+                        displayName: (item.displayName) ? item.displayName : common_1.UaLocalizedText.nullText,
+                        referenceTypeId: (item.referenceTypeId) ? item.referenceTypeId : common_1.UaNodeId.nullNodeId,
                         isForward: item.isForward,
                         typeDefinitionId: typeDefinition
                     });

package/dist/client/utils/UaObjectTypeDictionary.js

@@ -38,7 +38,7 @@ class UaObjectTypeDictionary {
             let nodeIds = this._remainingNodesToBrowse.splice(0, 15);
             let nodesToBrowse = [];
             for (let item of nodeIds) {
-                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.ObjectType, 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.ObjectType, 63);
                 nodesToBrowse.push(browseDescription);
             }
             let results = yield client.browse(nodesToBrowse);

package/dist/common/types/UaLink.d.ts

@@ -1,11 +1,16 @@
+import { UaLocalizedText } from "./UaLocalizedText";
 import { UaNodeId } from "./UaNodeId";
 export declare class UaLink {
     private _targetId;
     private _nodeClass;
+    private _browseName;
+    private _displayName;
     private _referenceTypeId;
     private _isForward;
-    constructor(targetId: UaNodeId, nodeClass: number, referenceTypeId: UaNodeId, isForward: boolean);
+    constructor(targetId: UaNodeId, nodeClass: number, browseName: string, displayName: UaLocalizedText, referenceTypeId: UaNodeId, isForward: boolean);
     get targetId(): UaNodeId;
+    get browseName(): string;
+    get displayName(): UaLocalizedText;
     get nodeClass(): number;
     get referenceTypeId(): UaNodeId;
     get isForward(): boolean;

package/dist/common/types/UaLink.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UaLink = void 0;
 class UaLink {
-    constructor(targetId, nodeClass, referenceTypeId, isForward) {
+    constructor(targetId, nodeClass, browseName, displayName, referenceTypeId, isForward) {
         this._targetId = targetId;
+        this._browseName = browseName;
+        this._displayName = displayName;
         this._nodeClass = nodeClass;
         this._referenceTypeId = referenceTypeId;
         this._isForward = isForward;
@@ -11,6 +13,12 @@ class UaLink {
     get targetId() {
         return this._targetId;
     }
+    get browseName() {
+        return this._browseName;
+    }
+    get displayName() {
+        return this._displayName;
+    }
     get nodeClass() {
         return this._nodeClass;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opcua-webapi-ts",
-  "version": "1.0.29",
+  "version": "1.1.1",
   "description": "Provides OPC UA WebAPI wrapper and client based on opcua-webapi-typescript",
   "author": "DingYan",
   "main": "./dist/cjs/index.js",