opcua-webapi-ts 1.0.28 → 1.1.0

package/dist/cjs/client/UaClientConfigure.js

@@ -4,7 +4,7 @@ exports.UaClientConfiguration = void 0;
 class UaClientConfiguration {
     constructor(apiConfig) {
         this._apiConfig = apiConfig;
-        this._defaultTimeout = 60000;
+        this._defaultTimeout = 0;
     }
     get apiConfig() {
         return this._apiConfig;
@@ -13,8 +13,8 @@ class UaClientConfiguration {
         return this._defaultTimeout;
     }
     set defaultTimeout(timeout) {
-        if (timeout < 5000) {
-            this._defaultTimeout = 5000;
+        if (timeout < 1000) {
+            this._defaultTimeout = 0;
         }
         else {
             this._defaultTimeout = timeout;

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,12 +358,34 @@ 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 response = yield this.api.browse({ browseRequest: request });
+            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(request, { signal: controller.signal });
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+                finally {
+                    clearTimeout(timeoutId);
+                }
+            }
+            else {
+                try {
+                    response = yield this.api.browse(request);
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+            }
             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 || nodesToBrowse.length != response.Results.length)
@@ -388,11 +408,33 @@ 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 response = yield this.api.browseNext({ browseNextRequest: request });
+            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(request, { signal: controller.signal });
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+                finally {
+                    clearTimeout(timeoutId);
+                }
+            }
+            else {
+                try {
+                    response = yield this.api.browseNext(request);
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+            }
             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 || continuationPoints.length != response.Results.length)
@@ -417,14 +459,36 @@ 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 response = yield this.api.read({ readRequest: request });
+            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(request, { signal: controller.signal });
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+                finally {
+                    clearTimeout(timeoutId);
+                }
+            }
+            else {
+                try {
+                    response = yield this.api.read(request);
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+            }
             if ((_b = (_a = response === null || response === void 0 ? void 0 : response.ResponseHeader) === null || _a === void 0 ? void 0 : _a.ServiceResult) === null || _b === void 0 ? void 0 : _b.Code)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(response.ResponseHeader.ServiceResult.Code));
             if (!response.Results || nodesToRead.length != response.Results.length)
@@ -447,10 +511,32 @@ 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 response = yield this.api.write({ writeRequest: request });
+            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(request, { signal: controller.signal });
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+                finally {
+                    clearTimeout(timeoutId);
+                }
+            }
+            else {
+                try {
+                    response = yield this.api.write(request);
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+            }
             if ((_b = (_a = response === null || response === void 0 ? void 0 : response.ResponseHeader) === null || _a === void 0 ? void 0 : _a.ServiceResult) === null || _b === void 0 ? void 0 : _b.Code)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(response.ResponseHeader.ServiceResult.Code));
             if (!response.Results || nodesToWrite.length != response.Results.length)
@@ -473,10 +559,32 @@ 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 response = yield this.api.call({ callRequest: request });
+            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(request, { signal: controller.signal });
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+                finally {
+                    clearTimeout(timeoutId);
+                }
+            }
+            else {
+                try {
+                    response = yield this.api.call(request);
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+            }
             if ((_b = (_a = response === null || response === void 0 ? void 0 : response.ResponseHeader) === null || _a === void 0 ? void 0 : _a.ServiceResult) === null || _b === void 0 ? void 0 : _b.Code)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(response.ResponseHeader.ServiceResult.Code));
             if (!response.Results || methodsToCall.length != response.Results.length)
@@ -501,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 &&
@@ -509,7 +617,29 @@ class UaWebClient {
                 ReleaseContinuationPoints: releaseContinuationPoints,
                 NodesToRead: NodesToRead
             });
-            let response = yield this.api.historyRead({ historyReadRequest: request });
+            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(request, { signal: controller.signal });
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+                finally {
+                    clearTimeout(timeoutId);
+                }
+            }
+            else {
+                try {
+                    response = yield this.api.historyRead(request);
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+            }
             if ((_b = (_a = response === null || response === void 0 ? void 0 : response.ResponseHeader) === null || _a === void 0 ? void 0 : _a.ServiceResult) === null || _b === void 0 ? void 0 : _b.Code)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(response.ResponseHeader.ServiceResult.Code));
             if (!response.Results || nodesToRead.length != response.Results.length)
@@ -528,12 +658,34 @@ 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 response = yield this.api.findServers({ findServersRequest: request });
+            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(request, { signal: controller.signal });
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+                finally {
+                    clearTimeout(timeoutId);
+                }
+            }
+            else {
+                try {
+                    response = yield this.api.findServers(request);
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+            }
             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)
@@ -545,12 +697,34 @@ 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 response = yield this.api.getEndpoints({ getEndpointsRequest: request });
+            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(request, { signal: controller.signal });
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+                finally {
+                    clearTimeout(timeoutId);
+                }
+            }
+            else {
+                try {
+                    response = yield this.api.getEndpoints(request);
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+            }
             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)
@@ -558,15 +732,12 @@ class UaWebClient {
             return response.Endpoints;
         });
     }
-    requestHeader(clientConfig, additionalParameters) {
-        let timeout = clientConfig.defaultTimeout;
-        if (additionalParameters && additionalParameters.timeout)
-            timeout = additionalParameters.timeout;
+    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,
         };
@@ -575,5 +746,14 @@ class UaWebClient {
             this.requestHandle = 1;
         return ret;
     }
+    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/common/types/UaRequestPatameters.js

@@ -10,7 +10,7 @@ class UaClientParameters {
             this._timeout = 500;
         }
         else {
-            this._timeout = this.timeout;
+            this._timeout = timeout;
         }
     }
     get returnDiagnostics() {

package/dist/client/UaClientConfigure.js

@@ -4,7 +4,7 @@ exports.UaClientConfiguration = void 0;
 class UaClientConfiguration {
     constructor(apiConfig) {
         this._apiConfig = apiConfig;
-        this._defaultTimeout = 60000;
+        this._defaultTimeout = 0;
     }
     get apiConfig() {
         return this._apiConfig;
@@ -13,8 +13,8 @@ class UaClientConfiguration {
         return this._defaultTimeout;
     }
     set defaultTimeout(timeout) {
-        if (timeout < 5000) {
-            this._defaultTimeout = 5000;
+        if (timeout < 1000) {
+            this._defaultTimeout = 0;
         }
         else {
             this._defaultTimeout = timeout;

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,5 +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;
+    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,12 +358,34 @@ 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 response = yield this.api.browse({ browseRequest: request });
+            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(request, { signal: controller.signal });
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+                finally {
+                    clearTimeout(timeoutId);
+                }
+            }
+            else {
+                try {
+                    response = yield this.api.browse(request);
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+            }
             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 || nodesToBrowse.length != response.Results.length)
@@ -388,11 +408,33 @@ 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 response = yield this.api.browseNext({ browseNextRequest: request });
+            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(request, { signal: controller.signal });
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+                finally {
+                    clearTimeout(timeoutId);
+                }
+            }
+            else {
+                try {
+                    response = yield this.api.browseNext(request);
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+            }
             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 || continuationPoints.length != response.Results.length)
@@ -417,14 +459,36 @@ 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 response = yield this.api.read({ readRequest: request });
+            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(request, { signal: controller.signal });
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+                finally {
+                    clearTimeout(timeoutId);
+                }
+            }
+            else {
+                try {
+                    response = yield this.api.read(request);
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+            }
             if ((_b = (_a = response === null || response === void 0 ? void 0 : response.ResponseHeader) === null || _a === void 0 ? void 0 : _a.ServiceResult) === null || _b === void 0 ? void 0 : _b.Code)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(response.ResponseHeader.ServiceResult.Code));
             if (!response.Results || nodesToRead.length != response.Results.length)
@@ -447,10 +511,32 @@ 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 response = yield this.api.write({ writeRequest: request });
+            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(request, { signal: controller.signal });
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+                finally {
+                    clearTimeout(timeoutId);
+                }
+            }
+            else {
+                try {
+                    response = yield this.api.write(request);
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+            }
             if ((_b = (_a = response === null || response === void 0 ? void 0 : response.ResponseHeader) === null || _a === void 0 ? void 0 : _a.ServiceResult) === null || _b === void 0 ? void 0 : _b.Code)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(response.ResponseHeader.ServiceResult.Code));
             if (!response.Results || nodesToWrite.length != response.Results.length)
@@ -473,10 +559,32 @@ 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 response = yield this.api.call({ callRequest: request });
+            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(request, { signal: controller.signal });
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+                finally {
+                    clearTimeout(timeoutId);
+                }
+            }
+            else {
+                try {
+                    response = yield this.api.call(request);
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+            }
             if ((_b = (_a = response === null || response === void 0 ? void 0 : response.ResponseHeader) === null || _a === void 0 ? void 0 : _a.ServiceResult) === null || _b === void 0 ? void 0 : _b.Code)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(response.ResponseHeader.ServiceResult.Code));
             if (!response.Results || methodsToCall.length != response.Results.length)
@@ -501,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 &&
@@ -509,7 +617,29 @@ class UaWebClient {
                 ReleaseContinuationPoints: releaseContinuationPoints,
                 NodesToRead: NodesToRead
             });
-            let response = yield this.api.historyRead({ historyReadRequest: request });
+            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(request, { signal: controller.signal });
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+                finally {
+                    clearTimeout(timeoutId);
+                }
+            }
+            else {
+                try {
+                    response = yield this.api.historyRead(request);
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+            }
             if ((_b = (_a = response === null || response === void 0 ? void 0 : response.ResponseHeader) === null || _a === void 0 ? void 0 : _a.ServiceResult) === null || _b === void 0 ? void 0 : _b.Code)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(response.ResponseHeader.ServiceResult.Code));
             if (!response.Results || nodesToRead.length != response.Results.length)
@@ -528,12 +658,34 @@ 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 response = yield this.api.findServers({ findServersRequest: request });
+            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(request, { signal: controller.signal });
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+                finally {
+                    clearTimeout(timeoutId);
+                }
+            }
+            else {
+                try {
+                    response = yield this.api.findServers(request);
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+            }
             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)
@@ -545,12 +697,34 @@ 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 response = yield this.api.getEndpoints({ getEndpointsRequest: request });
+            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(request, { signal: controller.signal });
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+                finally {
+                    clearTimeout(timeoutId);
+                }
+            }
+            else {
+                try {
+                    response = yield this.api.getEndpoints(request);
+                }
+                catch (error) {
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
+                }
+            }
             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)
@@ -558,15 +732,12 @@ class UaWebClient {
             return response.Endpoints;
         });
     }
-    requestHeader(clientConfig, additionalParameters) {
-        let timeout = clientConfig.defaultTimeout;
-        if (additionalParameters && additionalParameters.timeout)
-            timeout = additionalParameters.timeout;
+    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,
         };
@@ -575,5 +746,14 @@ class UaWebClient {
             this.requestHandle = 1;
         return ret;
     }
+    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/common/types/UaRequestPatameters.js

@@ -10,7 +10,7 @@ class UaClientParameters {
             this._timeout = 500;
         }
         else {
-            this._timeout = this.timeout;
+            this._timeout = timeout;
         }
     }
     get returnDiagnostics() {

package/package.json

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