node-opcua-client 2.165.2 → 2.167.0

package/source/client_subscription.ts

@@ -3,25 +3,24 @@
  */
 
 // tslint:disable:unified-signatures
-import { EventEmitter } from "events";
-import { Byte, Double, UInt32 } from "node-opcua-basic-types";
+import type { EventEmitter } from "events";
+import type { Byte, Double, UInt32 } from "node-opcua-basic-types";
 
-import { DiagnosticInfo } from "node-opcua-data-model";
-import { ReadValueIdOptions, TimestampsToReturn } from "node-opcua-service-read";
-import { IBasicSubscription } from "node-opcua-pseudo-session";
-import {
+import type { DiagnosticInfo } from "node-opcua-data-model";
+import type { IBasicSubscription } from "node-opcua-pseudo-session";
+import type { ReadValueIdOptions, TimestampsToReturn } from "node-opcua-service-read";
+import type {
     MonitoringMode,
     MonitoringParametersOptions,
     NotificationMessage,
     SetTriggeringResponse
 } from "node-opcua-service-subscription";
-import { Callback, StatusCode } from "node-opcua-status-code";
-import { ErrorCallback } from "node-opcua-status-code";
+import type { Callback, ErrorCallback, StatusCode } from "node-opcua-status-code";
 
-import { ClientMonitoredItem } from "./client_monitored_item";
-import { ClientMonitoredItemBase } from "./client_monitored_item_base";
-import { ClientMonitoredItemGroup } from "./client_monitored_item_group";
-import { ClientSession, MonitoredItemData, SubscriptionId } from "./client_session";
+import type { ClientMonitoredItem } from "./client_monitored_item";
+import type { ClientMonitoredItemBase } from "./client_monitored_item_base";
+import type { ClientMonitoredItemGroup } from "./client_monitored_item_group";
+import type { ClientSession, MonitoredItemData, SubscriptionId } from "./client_session";
 
 export interface ClientSubscriptionOptions {
     requestedPublishingInterval?: number;

package/source/client_utils.ts

@@ -3,12 +3,12 @@
  */
 
 import { AttributeIds } from "node-opcua-data-model";
-import { DataValue } from "node-opcua-data-value";
-import { NodeIdLike, resolveNodeId } from "node-opcua-nodeid";
-import { ReadValueIdOptions } from "node-opcua-service-read";
-import { BrowsePath, BrowsePathResult } from "node-opcua-service-translate-browse-path";
-import { Variant } from "node-opcua-variant";
-import { IBasicSessionReadAsyncMultiple, IBasicSessionTranslateBrowsePathAsyncMultiple } from "node-opcua-pseudo-session";
+import type { DataValue } from "node-opcua-data-value";
+import { type NodeIdLike, resolveNodeId } from "node-opcua-nodeid";
+import type { IBasicSessionReadAsyncMultiple, IBasicSessionTranslateBrowsePathAsyncMultiple } from "node-opcua-pseudo-session";
+import type { ReadValueIdOptions } from "node-opcua-service-read";
+import { BrowsePath, type BrowsePathResult } from "node-opcua-service-translate-browse-path";
+import type { Variant } from "node-opcua-variant";
 
 const hasPropertyRefId = resolveNodeId("HasProperty");
 

package/source/common.ts

@@ -2,25 +2,25 @@
  * @module node-opcua-client
  */
 
-import { BrowseNextRequest, BrowseNextResponse, BrowseRequest, BrowseResponse } from "node-opcua-service-browse";
-import { CallRequest, CallResponse } from "node-opcua-service-call";
-import {
+import type { BrowseNextRequest, BrowseNextResponse, BrowseRequest, BrowseResponse } from "node-opcua-service-browse";
+import type { CallRequest, CallResponse } from "node-opcua-service-call";
+import type {
     FindServersOnNetworkRequest,
     FindServersOnNetworkResponse,
     FindServersRequest,
     FindServersResponse
 } from "node-opcua-service-discovery";
-import { GetEndpointsRequest, GetEndpointsResponse } from "node-opcua-service-endpoints";
-import { HistoryReadRequest, HistoryReadResponse } from "node-opcua-service-history";
-import { QueryFirstRequest, QueryFirstResponse, QueryNextRequest, QueryNextResponse } from "node-opcua-service-query";
-import { ReadRequest, ReadResponse } from "node-opcua-service-read";
-import {
+import type { GetEndpointsRequest, GetEndpointsResponse } from "node-opcua-service-endpoints";
+import type { HistoryReadRequest, HistoryReadResponse } from "node-opcua-service-history";
+import type { QueryFirstRequest, QueryFirstResponse, QueryNextRequest, QueryNextResponse } from "node-opcua-service-query";
+import type { ReadRequest, ReadResponse } from "node-opcua-service-read";
+import type {
     RegisterNodesRequest,
     RegisterNodesResponse,
     UnregisterNodesRequest,
     UnregisterNodesResponse
 } from "node-opcua-service-register-node";
-import {
+import type {
     ActivateSessionRequest,
     ActivateSessionResponse,
     CloseSessionRequest,
@@ -28,7 +28,7 @@ import {
     CreateSessionRequest,
     CreateSessionResponse
 } from "node-opcua-service-session";
-import {
+import type {
     CreateMonitoredItemsRequest,
     CreateMonitoredItemsResponse,
     CreateSubscriptionRequest,
@@ -52,11 +52,11 @@ import {
     TransferSubscriptionsRequest,
     TransferSubscriptionsResponse
 } from "node-opcua-service-subscription";
-import {
+import type {
     TranslateBrowsePathsToNodeIdsRequest,
     TranslateBrowsePathsToNodeIdsResponse
 } from "node-opcua-service-translate-browse-path";
-import { WriteRequest, WriteResponse } from "node-opcua-service-write";
+import type { WriteRequest, WriteResponse } from "node-opcua-service-write";
 
 export type Request =
     | CreateSessionRequest

package/source/index.ts

@@ -9,10 +9,10 @@
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  *   The above copyright notice and this permission notice shall be included in all
  *   copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -20,31 +20,28 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+
+export * from "node-opcua-alarm-condition";
+export { assert } from "node-opcua-assert";
+export { ServerState, ServiceCounterDataType } from "node-opcua-common";
+export { ClientSecureChannelLayer, ConnectionStrategyOptions, SecurityPolicy } from "node-opcua-secure-channel";
+export * from "node-opcua-utils";
+export * from "./alarms_and_conditions/client_alarm_tools";
+export * from "./alarms_and_conditions/client_tools";
+export * from "./alarms_and_conditions/client_tools";
 export * from "./client_base";
-export * from "./opcua_client";
-export * from "./client_session";
-export * from "./client_subscription";
-export * from "./client_monitored_item_base";
 export * from "./client_monitored_item";
+export * from "./client_monitored_item_base";
 export * from "./client_monitored_item_group";
-export * from "./alarms_and_conditions/client_tools";
+export * from "./client_session";
+export * from "./client_subscription";
+export * from "./client_utils";
+export * from "./opcua_client";
+export { ClientSidePublishEngine } from "./private/client_publish_engine";
 export * from "./tools/findservers";
 export * from "./tools/read_history_server_capabilities";
-export * from "./client_utils";
-export * from "./verify";
 export * from "./user_identity_info";
-export * from "./alarms_and_conditions/client_alarm_tools";
-export * from "./alarms_and_conditions/client_tools";
-export * from "node-opcua-alarm-condition";
-
-export { assert } from "node-opcua-assert";
-export * from "node-opcua-utils";
-
-export { ClientSidePublishEngine } from "./private/client_publish_engine";
-
-export { ServerState, ServiceCounterDataType } from "node-opcua-common";
-
-export { SecurityPolicy, ClientSecureChannelLayer, ConnectionStrategyOptions } from "node-opcua-secure-channel";
+export * from "./verify";
 
 import * as utils1 from "node-opcua-utils";
 export const utils = utils1;
@@ -52,33 +49,42 @@ export const utils = utils1;
 import * as crypto_util1 from "node-opcua-crypto/web";
 export const crypto_utils = crypto_util1;
 
-export { hexDump, LogLevel, setLogLevel, setDebugLogger, setWarningLogger, setErrorLogger } from "node-opcua-debug";
-
+export * from "node-opcua-client-dynamic-extension-object";
+export { makeApplicationUrn } from "node-opcua-common";
+export * from "node-opcua-constants";
+export * from "node-opcua-data-model";
+export * from "node-opcua-data-value";
+export {
+    checkDebugFlag,
+    hexDump,
+    LogLevel,
+    make_debugLog,
+    make_warningLog,
+    setDebugLogger,
+    setErrorLogger,
+    setLogLevel,
+    setWarningLogger
+} from "node-opcua-debug";
 ///
 export {
-    NodeId,
-    resolveNodeId,
-    makeNodeId,
+    coerceExpandedNodeId,
     coerceNodeId,
-    sameNodeId,
     ExpandedNodeId,
     makeExpandedNodeId,
+    makeNodeId,
+    NodeId,
     NodeIdLike,
-    coerceExpandedNodeId
+    resolveNodeId,
+    sameNodeId
 } from "node-opcua-nodeid";
-export { StatusCode, StatusCodes, ErrorCallback } from "node-opcua-status-code";
-export * from "node-opcua-variant";
-export * from "node-opcua-data-value";
-export * from "node-opcua-data-model";
-export * from "node-opcua-constants";
+export * from "node-opcua-pseudo-session";
 export * from "node-opcua-secure-channel";
-export { makeApplicationUrn } from "node-opcua-common";
-
-export * from "node-opcua-service-endpoints";
 export * from "node-opcua-service-browse";
 export * from "node-opcua-service-call";
 export * from "node-opcua-service-discovery";
 export * from "node-opcua-service-endpoints";
+export * from "node-opcua-service-endpoints";
+export * from "node-opcua-service-filter";
 export * from "node-opcua-service-history";
 export * from "node-opcua-service-query";
 export * from "node-opcua-service-read";
@@ -87,8 +93,6 @@ export * from "node-opcua-service-session";
 export * from "node-opcua-service-subscription";
 export * from "node-opcua-service-translate-browse-path";
 export * from "node-opcua-service-write";
-export * from "node-opcua-service-filter";
-export * from "node-opcua-pseudo-session";
-export * from "node-opcua-client-dynamic-extension-object";
+export { ErrorCallback, StatusCode, StatusCodes } from "node-opcua-status-code";
 export { DataTypeDefinition } from "node-opcua-types";
-export { checkDebugFlag, make_debugLog, make_warningLog } from "node-opcua-debug";
+export * from "node-opcua-variant";

package/source/opcua_client.ts

@@ -2,16 +2,21 @@
  * @module node-opcua-client
  */
 
-import { ApplicationDescription, EndpointDescription } from "node-opcua-service-endpoints";
-import { CallbackT, ErrorCallback, StatusCode } from "node-opcua-status-code";
-import { ResponseCallback } from "node-opcua-pseudo-session";
-import { FindServersRequestLike, GetEndpointsOptions, OPCUAClientBase, OPCUAClientBaseOptions } from "./client_base";
-
-import { ClientSession } from "./client_session";
-import { ClientSubscription, ClientSubscriptionOptions } from "./client_subscription";
+import type { DataTypeExtractStrategy } from "node-opcua-client-dynamic-extension-object";
+import type { ResponseCallback } from "node-opcua-pseudo-session";
+import type { ApplicationDescription, EndpointDescription } from "node-opcua-service-endpoints";
+import type { CallbackT, ErrorCallback, StatusCode } from "node-opcua-status-code";
+import type {
+    FindServersRequestLike,
+    GetEndpointsOptions,
+    OPCUAClientBase,
+    OPCUAClientBaseEvents,
+    OPCUAClientBaseOptions
+} from "./client_base";
+import type { ClientSession } from "./client_session";
+import type { ClientSubscription, ClientSubscriptionOptions } from "./client_subscription";
 import { OPCUAClientImpl } from "./private/opcua_client_impl";
-import { UserIdentityInfo } from "./user_identity_info";
-import { DataTypeExtractStrategy } from "node-opcua-client-dynamic-extension-object";
+import type { UserIdentityInfo } from "./user_identity_info";
 
 export interface OPCUAClientOptions extends OPCUAClientBaseOptions {
     /**
@@ -45,10 +50,18 @@ export interface OPCUAClientOptions extends OPCUAClientBaseOptions {
      * default value : "Auto" : the client will attempt to extract DataTypeDefinition using the most efficient strategy
      */
     dataTypeExtractStrategy?: DataTypeExtractStrategy;
+}
 
+export interface EndpointWithUserIdentity {
+    endpointUrl: string;
+    userIdentity: UserIdentityInfo;
 }
+export type WithSessionFunc = (session: ClientSession) => Promise<void>;
+export type WithSessionFuncP<T> = (session: ClientSession) => Promise<T>;
+export type WithSubscriptionFunc = (session: ClientSession, subscription: ClientSubscription) => Promise<void>;
+export type WithSubscriptionFuncP<T> = (session: ClientSession, subscription: ClientSubscription) => Promise<T>;
 
-export interface OPCUAClient extends OPCUAClientBase {
+export interface OPCUAClient<Events extends OPCUAClientBaseEvents = OPCUAClientBaseEvents> extends OPCUAClientBase<Events> {
     connect(endpointUrl: string): Promise<void>;
     connect(endpointUrl: string, callback: ErrorCallback): void;
 
@@ -93,18 +106,7 @@ export interface OPCUAClient extends OPCUAClientBase {
 
     // @private
     createDefaultCertificate(): Promise<void>;
-}
 
-export interface EndpointWithUserIdentity {
-    endpointUrl: string;
-    userIdentity: UserIdentityInfo;
-}
-export type WithSessionFunc = (session: ClientSession) => Promise<void>;
-export type WithSessionFuncP<T> = (session: ClientSession) => Promise<T>;
-export type WithSubscriptionFunc = (session: ClientSession, subscription: ClientSubscription) => Promise<void>;
-export type WithSubscriptionFuncP<T> = (session: ClientSession, subscription: ClientSubscription) => Promise<T>;
-
-export interface OPCUAClient {
     /**
      *
      * @param endpointUrl
@@ -112,7 +114,6 @@ export interface OPCUAClient {
      */
     withSessionAsync<T>(endpointUrl: string | EndpointWithUserIdentity, inner_func: WithSessionFuncP<T>): Promise<T>;
 
-
     /**
      *
      * @param endpointUrl
@@ -128,7 +129,7 @@ export interface OPCUAClient {
 
 export class OPCUAClient {
     public static create(options: OPCUAClientOptions): OPCUAClient {
-        return new OPCUAClientImpl(options);
+        return new OPCUAClientImpl(options) as unknown as OPCUAClient;
     }
     public static async createSession(
         endpointUrl: string,