node-opcua-client 2.158.0 → 2.160.0

package/dist/client_monitored_item_base.d.ts

@@ -4,11 +4,15 @@
 import { EventEmitter } from "events";
 import { DataValue } from "node-opcua-data-value";
 import { ExtensionObject } from "node-opcua-extension-object";
-import { ReadValueId, TimestampsToReturn } from "node-opcua-service-read";
+import { TimestampsToReturn } from "node-opcua-service-read";
 import { MonitoredItemCreateResult, MonitoringMode, MonitoringParameters, MonitoringParametersOptions } from "node-opcua-service-subscription";
 import { StatusCode } from "node-opcua-status-code";
 import { Callback, ErrorCallback } from "node-opcua-status-code";
 import { Variant } from "node-opcua-variant";
+import { NumericRange } from "node-opcua-numeric-range";
+import { QualifiedNameLike } from "node-opcua-data-model";
+import { NodeId } from "node-opcua-nodeid";
+import { AttributeIds } from "node-opcua-basic-types";
 import { ClientSubscription } from "./client_subscription";
 export interface ClientMonitoredItemOrGroupAction {
     modify(parameters: MonitoringParametersOptions, timestampsToReturn?: TimestampsToReturn): Promise<StatusCode>;
@@ -27,12 +31,17 @@ export interface ClientMonitoredItemBase extends EventEmitter, ClientMonitoredIt
     on(event: "initialized", eventHandler: () => void): this;
 }
 export interface ClientMonitoredItemBase {
-    itemToMonitor: ReadValueId;
-    monitoringParameters: MonitoringParameters;
-    subscription: ClientSubscription;
-    monitoringMode: MonitoringMode;
-    statusCode: StatusCode;
-    monitoredItemId?: any;
-    result?: MonitoredItemCreateResult;
-    filterResult?: ExtensionObject;
+    readonly itemToMonitor: {
+        nodeId: NodeId;
+        attributeId: AttributeIds;
+        indexRange?: NumericRange | undefined;
+        dataEncoding?: QualifiedNameLike | null;
+    };
+    readonly monitoringParameters: MonitoringParameters;
+    readonly subscription: ClientSubscription;
+    readonly monitoringMode: MonitoringMode;
+    readonly statusCode: StatusCode;
+    readonly monitoredItemId?: any;
+    readonly result?: MonitoredItemCreateResult;
+    readonly filterResult?: ExtensionObject;
 }

package/dist/client_monitored_item_toolbox.d.ts

@@ -5,11 +5,14 @@ import { Callback, ErrorCallback } from "node-opcua-status-code";
 import { MonitoringParametersOptions } from "node-opcua-types";
 import { ClientMonitoredItemBase } from "./client_monitored_item_base";
 import { ClientSubscription } from "./client_subscription";
+export interface ClientMonitoredItemBaseEx extends ClientMonitoredItemBase {
+    internalSetMonitoringMode(monitoringMode: MonitoringMode): void;
+}
 /**
  * @internal
  */
 export declare class ClientMonitoredItemToolbox {
     static _toolbox_monitor(subscription: ClientSubscription, timestampsToReturn: TimestampsToReturn, monitoredItems: ClientMonitoredItemBase[], done: ErrorCallback): void;
     static _toolbox_modify(subscription: ClientSubscription, monitoredItems: ClientMonitoredItemBase[], parameters: MonitoringParametersOptions, timestampsToReturn: TimestampsToReturn, callback: Callback<MonitoredItemModifyResult[]>): void;
-    static _toolbox_setMonitoringMode(subscription: ClientSubscription, monitoredItems: ClientMonitoredItemBase[], monitoringMode: MonitoringMode, callback: Callback<StatusCode[]>): void;
+    static _toolbox_setMonitoringMode(subscription: ClientSubscription, monitoredItems: ClientMonitoredItemBaseEx[], monitoringMode: MonitoringMode, callback: Callback<StatusCode[]>): void;
 }

package/dist/client_monitored_item_toolbox.js

@@ -19,6 +19,22 @@ const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
 class ClientMonitoredItemToolbox {
     static _toolbox_monitor(subscription, timestampsToReturn, monitoredItems, done) {
         (0, node_opcua_assert_1.assert)(typeof done === "function");
+        // we expect subscription to be valid and have a valid session
+        if (!subscription || !subscription.session) {
+            const err0 = new Error("Invalid subscription");
+            if (done) {
+                return done(err0);
+            }
+            return;
+        }
+        // may be the subscription has been terminated or is not fully initialize, in the meantime
+        if (!subscription.isActive) {
+            const err1 = new Error("Subscription has been terminated or is not fully initialized");
+            if (done) {
+                return done(err1);
+            }
+            return;
+        }
         const itemsToCreate = [];
         for (const monitoredItem of monitoredItems) {
             const monitoredItemI = monitoredItem;
@@ -111,7 +127,7 @@ class ClientMonitoredItemToolbox {
                 return callback(err);
             }
             monitoredItems.forEach((monitoredItem) => {
-                monitoredItem.monitoringMode = monitoringMode;
+                monitoredItem.internalSetMonitoringMode(monitoringMode);
             });
             response = response;
             response.results = response.results || [];

package/dist/client_monitored_item_toolbox.js.map

@@ -1 +1 @@
-{"version":3,"file":"client_monitored_item_toolbox.js","sourceRoot":"","sources":["../source/client_monitored_item_toolbox.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client_monitored_item_toolbox.js","sourceRoot":"","sources":["../source/client_monitored_item_toolbox.ts"],"names":[],"mappings":";;;;;;AAAA;;GAEG;AACH,kDAA0B;AAE1B,yDAA2C;AAE3C,uDAAiE;AACjE,qFASyC;AAWzC,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,UAAU,CAAC,CAAC;AAK3C;;GAEG;AACH,MAAa,0BAA0B;IAC5B,MAAM,CAAC,gBAAgB,CAC1B,YAAgC,EAChC,kBAAsC,EACtC,cAAyC,EACzC,IAAmB;QAEnB,IAAA,0BAAM,EAAC,OAAO,IAAI,KAAK,UAAU,CAAC,CAAC;QAEnC,8DAA8D;QAC9D,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;YACzC,MAAM,IAAI,GAAG,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;YAC/C,IAAI,IAAI,EAAE,CAAC;gBACP,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC;YACtB,CAAC;YACD,OAAO;QACX,CAAC;QAED,0FAA0F;QAC1F,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;YACzB,MAAM,IAAI,GAAG,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;YACvF,IAAI,IAAI,EAAE,CAAC;gBACP,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC;YACtB,CAAC;YACD,OAAO;QACX,CAAC;QAED,MAAM,aAAa,GAAwC,EAAE,CAAC;QAC9D,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE,CAAC;YACzC,MAAM,cAAc,GAAG,aAAwC,CAAC;YAChE,MAAM,YAAY,GAAG,cAAc,CAAC,uBAAuB,EAAE,CAAC;YAC9D,IAAI,OAAO,YAAY,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACzC,OAAO,IAAI,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;YAC/C,CAAC;YACD,aAAa,CAAC,IAAI,CAAC,YAAiD,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,yBAAyB,GAAG,IAAI,6DAA2B,CAAC;YAC9D,aAAa;YACb,cAAc,EAAE,YAAY,CAAC,cAAc;YAC3C,kBAAkB;SACrB,CAAC,CAAC;QAEH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7C,MAAM,aAAa,GAAG,cAAc,CAAC,CAAC,CAA4B,CAAC;YACnE,aAAa,CAAC,cAAc,EAAE,CAAC;QACnC,CAAC;QAED,MAAM,OAAO,GAAG,YAAY,CAAC,OAA4B,CAAC;QAC1D,IAAA,0BAAM,EAAC,OAAO,EAAE,yDAAyD,CAAC,CAAC;QAE3E,OAAO,CAAC,oBAAoB,CAAC,yBAAyB,EAAE,CAAC,GAAkB,EAAE,QAAuC,EAAE,EAAE;YACpH,0BAA0B;YAC1B,IAAI,GAAG,EAAE,CAAC;gBACN,QAAQ,CAAC,eAAK,CAAC,GAAG,CAAC,2EAA2E,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;YAClH,CAAC;iBAAM,CAAC;gBACJ,0BAA0B;gBAC1B,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACZ,OAAO,IAAI,CAAC,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;gBAC7C,CAAC;gBAED,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC;gBAE1C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBAC/C,MAAM,mBAAmB,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;oBAChD,MAAM,aAAa,GAAG,cAAc,CAAC,CAAC,CAA4B,CAAC;oBACnE,aAAa,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;gBACrD,CAAC;YACL,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,eAAe,CACzB,YAAgC,EAChC,cAAyC,EACzC,UAAuC,EACvC,kBAAsC,EACtC,QAA+C;QAE/C,IAAA,0BAAM,EAAC,QAAQ,KAAK,SAAS,IAAI,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC;QAEjE,MAAM,aAAa,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,aAAsC,EAAE,EAAE;YAChF,MAAM,YAAY,GAAG,aAAa,CAAC,oBAAoB,CAAC,YAAY,CAAC;YACrE,IAAA,0BAAM,EAAC,YAAY,KAAK,UAAU,CAAC,CAAC;YACpC,OAAO,IAAI,4DAA0B,CAAC;gBAClC,eAAe,EAAE,aAAa,CAAC,eAAe;gBAC9C,mBAAmB,EAAE;oBACjB,GAAG,UAAU;oBACb,YAAY;iBACf;aACJ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,MAAM,2BAA2B,GAAG,IAAI,6DAA2B,CAAC;YAChE,aAAa;YACb,cAAc,EAAE,YAAY,CAAC,cAAc;YAC3C,kBAAkB;SACrB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,YAAY,CAAC,OAA4B,CAAC;QAC1D,IAAA,0BAAM,EAAC,OAAO,EAAE,yDAAyD,CAAC,CAAC;QAE3E,OAAO,CAAC,oBAAoB,CAAC,2BAA2B,EAAE,CAAC,GAAiB,EAAE,QAAuC,EAAE,EAAE;YACrH,0BAA0B;YAC1B,IAAI,GAAG,EAAE,CAAC;gBACN,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;YACzB,CAAC;YACD,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,YAAY,8DAA4B,CAAC,EAAE,CAAC;gBACnE,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;YACjD,CAAC;YAED,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC;YAE1C,IAAA,0BAAM,EAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,cAAc,CAAC,MAAM,CAAC,CAAC;YAE1D,MAAM,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAEhC,0BAA0B;YAC1B,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE,CAAC;gBAC9D,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YACpE,CAAC;YACD,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,0BAA0B,CACpC,YAAgC,EAChC,cAA2C,EAC3C,cAA8B,EAC9B,QAAgC;QAEhC,MAAM,gBAAgB,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QAE9F,MAAM,wBAAwB,GAAiC;YAC3D,gBAAgB;YAChB,cAAc;YACd,cAAc,EAAE,YAAY,CAAC,cAAc;SAC9C,CAAC;QAEF,MAAM,OAAO,GAAG,YAAY,CAAC,OAA4B,CAAC;QAC1D,IAAA,0BAAM,EAAC,OAAO,EAAE,yDAAyD,CAAC,CAAC;QAE3E,OAAO,CAAC,iBAAiB,CAAC,wBAAwB,EAAE,CAAC,GAAiB,EAAE,QAAoC,EAAE,EAAE;YAC5G,IAAI,GAAG,EAAE,CAAC;gBACN,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;YACzB,CAAC;YACD,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;gBACrC,aAAa,CAAC,yBAAyB,CAAC,cAAc,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;YACH,QAAQ,GAAG,QAAS,CAAC;YACrB,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC;YAC1C,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AA1JD,gEA0JC"}

package/dist/client_subscription.d.ts

@@ -38,28 +38,28 @@ export interface ModifySubscriptionResult {
     revisedMaxKeepAliveCount: UInt32;
 }
 export interface ClientSubscription extends EventEmitter {
-    subscriptionId: SubscriptionId;
-    publishingInterval: number;
-    lifetimeCount: number;
-    maxKeepAliveCount: number;
-    maxNotificationsPerPublish: number;
-    publishingEnabled: boolean;
-    priority: number;
-    monitoredItems: ClientMonitoredItemBaseMap;
-    timeoutHint: number;
+    readonly subscriptionId: SubscriptionId;
+    readonly publishingInterval: number;
+    readonly lifetimeCount: number;
+    readonly maxKeepAliveCount: number;
+    readonly maxNotificationsPerPublish: number;
+    readonly publishingEnabled: boolean;
+    readonly priority: number;
+    readonly monitoredItems: ClientMonitoredItemBaseMap;
+    readonly timeoutHint: number;
     /**
      * return the session associated with the subscription.
      * (may throw if the session is not valid)
      */
-    session: ClientSession;
+    readonly session: ClientSession;
     /**
      * return true if the subscription is attached to a valid session
      */
-    hasSession: boolean;
+    readonly hasSession: boolean;
     /**
      * true is the subscription is fully active
      */
-    isActive: boolean;
+    readonly isActive: boolean;
     /**
      * add a monitor item to the subscription
      *

package/dist/private/client_monitored_item_group_impl.d.ts

@@ -6,9 +6,9 @@ import { TimestampsToReturn } from "node-opcua-data-value";
 import { MonitoringMode, MonitoringParametersOptions } from "node-opcua-service-subscription";
 import { StatusCode } from "node-opcua-status-code";
 import { Callback, ErrorCallback } from "node-opcua-status-code";
-import { ClientMonitoredItemBase } from "../client_monitored_item_base";
 import { ClientMonitoredItemGroup } from "../client_monitored_item_group";
 import { ClientSubscription } from "../client_subscription";
+import { ClientMonitoredItemBaseEx } from "../client_monitored_item_toolbox";
 /**
  * ClientMonitoredItemGroup
  * event:
@@ -19,7 +19,7 @@ import { ClientSubscription } from "../client_subscription";
  *  note: this.monitoringMode = subscription_service.MonitoringMode.Reporting;
  */
 export declare class ClientMonitoredItemGroupImpl extends EventEmitter implements ClientMonitoredItemGroup {
-    readonly monitoredItems: ClientMonitoredItemBase[];
+    readonly monitoredItems: ClientMonitoredItemBaseEx[];
     private readonly subscription;
     private timestampsToReturn;
     private readonly monitoringMode;

package/dist/private/client_monitored_item_group_impl.js

@@ -99,6 +99,7 @@ class ClientMonitoredItemGroupImpl extends events_1.EventEmitter {
      */
     _monitor(done) {
         (0, node_opcua_assert_1.assert)(done === undefined || typeof done === "function");
+        (0, node_opcua_assert_1.assert)(this.subscription, "expecting a valid subscription");
         this.monitoredItems.forEach((monitoredItem, index) => {
             monitoredItem.on("changed", (dataValue) => {
                 /**

package/dist/private/client_monitored_item_group_impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"client_monitored_item_group_impl.js","sourceRoot":"","sources":["../../source/private/client_monitored_item_group_impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client_monitored_item_group_impl.js","sourceRoot":"","sources":["../../source/private/client_monitored_item_group_impl.ts"],"names":[],"mappings":"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"}

package/dist/private/client_monitored_item_impl.d.ts

@@ -10,6 +10,7 @@ import { StatusCode } from "node-opcua-status-code";
 import { Variant } from "node-opcua-variant";
 import { Callback, ErrorCallback } from "node-opcua-status-code";
 import { ClientMonitoredItem } from "../client_monitored_item";
+import { ClientMonitoredItemBaseEx } from "../client_monitored_item_toolbox";
 import { ClientSubscription } from "../client_subscription";
 import { ClientSubscriptionImpl } from "./client_subscription_impl";
 export type PrepareForMonitoringResult = {
@@ -32,7 +33,8 @@ export type PrepareForMonitoringResult = {
  *
  *  note: this.monitoringMode = subscription_service.MonitoringMode.Reporting;
  */
-export declare class ClientMonitoredItemImpl extends EventEmitter implements ClientMonitoredItem {
+export declare class ClientMonitoredItemImpl extends EventEmitter implements ClientMonitoredItem, ClientMonitoredItemBaseEx {
+    #private;
     itemToMonitor: ReadValueId;
     monitoringParameters: MonitoringParameters;
     subscription: ClientSubscriptionImpl;
@@ -42,8 +44,7 @@ export declare class ClientMonitoredItemImpl extends EventEmitter implements Cli
     result?: MonitoredItemCreateResult;
     filterResult?: ExtensionObject;
     timestampsToReturn: TimestampsToReturn;
-    private _pendingDataValue?;
-    private _pendingEvents?;
+    internalSetMonitoringMode(monitoringMode: MonitoringMode): void;
     constructor(subscription: ClientSubscription, itemToMonitor: ReadValueIdOptions, monitoringParameters: MonitoringParametersOptions, timestampsToReturn: TimestampsToReturn, monitoringMode?: MonitoringMode);
     toString(): string;
     /**

package/dist/private/client_monitored_item_impl.js

@@ -43,8 +43,11 @@ class ClientMonitoredItemImpl extends events_1.EventEmitter {
     result;
     filterResult;
     timestampsToReturn;
-    _pendingDataValue;
-    _pendingEvents;
+    #pendingDataValue;
+    #pendingEvents;
+    internalSetMonitoringMode(monitoringMode) {
+        this.monitoringMode = monitoringMode;
+    }
     constructor(subscription, itemToMonitor, monitoringParameters, timestampsToReturn, monitoringMode = node_opcua_service_subscription_1.MonitoringMode.Reporting) {
         super();
         this.statusCode = node_opcua_status_code_1.StatusCodes.BadDataUnavailable;
@@ -113,8 +116,8 @@ class ClientMonitoredItemImpl extends events_1.EventEmitter {
         // in this case we need to put the dataValue aside so we can send the notification changed after
         // the node-opcua client had time to fully install the on("changed") event handler
         if (this.statusCode?.value === node_opcua_status_code_1.StatusCodes.BadDataUnavailable.value) {
-            this._pendingDataValue = this._pendingDataValue || [];
-            this._pendingDataValue.push(value);
+            this.#pendingDataValue = this.#pendingDataValue || [];
+            this.#pendingDataValue.push(value);
             return;
         }
         /**
@@ -137,8 +140,8 @@ class ClientMonitoredItemImpl extends events_1.EventEmitter {
      */
     _notify_event(eventFields) {
         if (this.statusCode?.value === node_opcua_status_code_1.StatusCodes.BadDataUnavailable.value) {
-            this._pendingEvents = this._pendingEvents || [];
-            this._pendingEvents.push(eventFields);
+            this.#pendingEvents = this.#pendingEvents || [];
+            this.#pendingEvents.push(eventFields);
             return;
         }
         /**
@@ -161,7 +164,7 @@ class ClientMonitoredItemImpl extends events_1.EventEmitter {
     _prepare_for_monitoring() {
         (0, node_opcua_assert_1.assert)(this.monitoringParameters.clientHandle === 4294967295, "should not have a client handle yet");
         const subscription = this.subscription;
-        this.monitoringParameters.clientHandle = subscription.nextClientHandle();
+        this.monitoringParameters.clientHandle = subscription._nextClientHandle();
         (0, node_opcua_assert_1.assert)(this.monitoringParameters.clientHandle > 0 && this.monitoringParameters.clientHandle !== 4294967295);
         // If attributeId is EventNotifier then monitoring parameters need a filter.
         // The filter must then either be DataChangeFilter, EventFilter or AggregateFilter.
@@ -234,16 +237,16 @@ class ClientMonitoredItemImpl extends events_1.EventEmitter {
         }
         // some PublishRequest with DataNotificationChange might have been sent by the server, before the monitored
         // item has been fully initialized it is time to process now any pending notification that were put on hold.
-        if (this._pendingDataValue) {
-            const dataValues = this._pendingDataValue;
-            this._pendingDataValue = undefined;
+        if (this.#pendingDataValue) {
+            const dataValues = this.#pendingDataValue;
+            this.#pendingDataValue = undefined;
             setImmediate(() => {
                 dataValues.map((dataValue) => this._notify_value_change(dataValue));
             });
         }
-        if (this._pendingEvents) {
-            const events = this._pendingEvents;
-            this._pendingEvents = undefined;
+        if (this.#pendingEvents) {
+            const events = this.#pendingEvents;
+            this.#pendingEvents = undefined;
             setImmediate(() => {
                 events.map((event) => this._notify_event(event));
             });
@@ -294,7 +297,7 @@ class ClientMonitoredItemImpl extends events_1.EventEmitter {
         this.removeAllListeners();
         // also remove from subscription
         const clientHandle = this.monitoringParameters.clientHandle;
-        delete this.subscription.monitoredItems[clientHandle];
+        this.subscription._removeMonitoredItem(clientHandle);
     }
 }
 exports.ClientMonitoredItemImpl = ClientMonitoredItemImpl;

package/dist/private/client_monitored_item_impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"client_monitored_item_impl.js","sourceRoot":"","sources":["../../source/private/client_monitored_item_impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client_monitored_item_impl.js","sourceRoot":"","sources":["../../source/private/client_monitored_item_impl.ts"],"names":[],"mappings":"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"}

package/dist/private/client_subscription_impl.d.ts

@@ -18,6 +18,7 @@ export declare const PENDING_SUBSCRIPTION_ID = 3234512922;
 export declare const TERMINATED_SUBSCRIPTION_ID = 3234512923;
 export declare const TERMINATING_SUBSCRIPTION_ID = 3234512924;
 export declare class ClientSubscriptionImpl extends EventEmitter implements ClientSubscription {
+    #private;
     /**
      * the associated session
      * @property session
@@ -33,19 +34,18 @@ export declare class ClientSubscriptionImpl extends EventEmitter implements Clie
     maxNotificationsPerPublish: number;
     publishingEnabled: boolean;
     priority: number;
-    monitoredItems: ClientMonitoredItemBaseMap;
-    monitoredItemGroups: ClientMonitoredItemGroup[];
+    get monitoredItems(): ClientMonitoredItemBaseMap;
+    set monitoredItems(value: ClientMonitoredItemBaseMap);
     timeoutHint: number;
     publishEngine: ClientSidePublishEngine;
     lastSequenceNumber: number;
-    private _nextClientHandle;
     hasTimedOut: boolean;
     constructor(session: ClientSession, options: ClientSubscriptionOptions);
     terminate(...args: any[]): any;
     /**
 
      */
-    nextClientHandle(): number;
+    _nextClientHandle(): number;
     monitor(itemToMonitor: ReadValueIdOptions, requestedParameters: MonitoringParametersOptions, timestampsToReturn: TimestampsToReturn, monitoringMode: MonitoringMode): Promise<ClientMonitoredItemBase>;
     monitor(itemToMonitor: ReadValueIdOptions, requestedParameters: MonitoringParametersOptions, timestampsToReturn: TimestampsToReturn, monitoringMode: MonitoringMode, done: Callback<ClientMonitoredItemBase>): void;
     monitorItems(itemsToMonitor: ReadValueIdOptions[], requestedParameters: MonitoringParametersOptions, timestampsToReturn: TimestampsToReturn): Promise<ClientMonitoredItemGroup>;
@@ -76,6 +76,7 @@ export declare class ClientSubscriptionImpl extends EventEmitter implements Clie
     onNotificationMessage(notificationMessage: NotificationMessage): void;
     private _terminate_step2;
     private _remove;
+    _removeMonitoredItem(clientHandle: ClientHandle): void;
     _removeGroup(monitoredItemGroup: ClientMonitoredItemGroup): void;
     /**
      * @private

package/dist/private/client_subscription_impl.js

@@ -97,12 +97,18 @@ class ClientSubscriptionImpl extends events_1.EventEmitter {
     maxNotificationsPerPublish;
     publishingEnabled;
     priority;
-    monitoredItems;
-    monitoredItemGroups = [];
+    #monitoredItems;
+    get monitoredItems() {
+        return this.#monitoredItems;
+    }
+    set monitoredItems(value) {
+        this.#monitoredItems = value;
+    }
+    #monitoredItemGroups = [];
     timeoutHint = 0;
     publishEngine;
     lastSequenceNumber;
-    _nextClientHandle = 0;
+    #nextClientHandle = 0;
     hasTimedOut;
     constructor(session, options) {
         super();
@@ -134,8 +140,8 @@ class ClientSubscriptionImpl extends events_1.EventEmitter {
         this.publishingEnabled = options.publishingEnabled === undefined ? true : options.publishingEnabled;
         this.priority = options.priority;
         this.subscriptionId = exports.PENDING_SUBSCRIPTION_ID;
-        this._nextClientHandle = 0;
-        this.monitoredItems = {};
+        this.#nextClientHandle = 0;
+        this.#monitoredItems = {};
         /**
          * set to True when the server has notified us that this subscription has timed out
          * ( maxLifeCounter x published interval without being able to process a PublishRequest
@@ -211,9 +217,9 @@ class ClientSubscriptionImpl extends events_1.EventEmitter {
     /**
 
      */
-    nextClientHandle() {
-        this._nextClientHandle += 1;
-        return this._nextClientHandle;
+    _nextClientHandle() {
+        this.#nextClientHandle += 1;
+        return this.#nextClientHandle;
     }
     monitor(...args) {
         const itemToMonitor = args[0];
@@ -394,7 +400,7 @@ class ClientSubscriptionImpl extends events_1.EventEmitter {
     _add_monitored_item(clientHandle, monitoredItem) {
         (0, node_opcua_assert_1.assert)(this.isActive, "subscription must be active and not terminated");
         (0, node_opcua_assert_1.assert)(monitoredItem.monitoringParameters.clientHandle === clientHandle);
-        this.monitoredItems[clientHandle] = monitoredItem;
+        this.#monitoredItems[clientHandle] = monitoredItem;
         /**
          * notify the observers that a new monitored item has been added to the subscription.
          * @event item_added
@@ -403,7 +409,7 @@ class ClientSubscriptionImpl extends events_1.EventEmitter {
         this.emit("item_added", monitoredItem);
     }
     _add_monitored_items_group(monitoredItemGroup) {
-        this.monitoredItemGroups.push(monitoredItemGroup);
+        this.#monitoredItemGroups.push(monitoredItemGroup);
     }
     _wait_for_subscription_to_be_ready(done) {
         let _watchDogCount = 0;
@@ -432,7 +438,7 @@ class ClientSubscriptionImpl extends events_1.EventEmitter {
         const monitoredItems = notification.monitoredItems || [];
         let repeated = 0;
         for (const monitoredItem of monitoredItems) {
-            const monitorItemObj = this.monitoredItems[monitoredItem.clientHandle];
+            const monitorItemObj = this.#monitoredItems[monitoredItem.clientHandle];
             if (monitorItemObj) {
                 if (monitorItemObj.itemToMonitor.attributeId === node_opcua_data_model_1.AttributeIds.EventNotifier) {
                     warningLog(chalk_1.default.yellow("Warning"), chalk_1.default.cyan(" Server send a DataChangeNotification for an EventNotifier." + " EventNotificationList was expected"));
@@ -497,7 +503,7 @@ class ClientSubscriptionImpl extends events_1.EventEmitter {
         (0, node_opcua_assert_1.assert)(notification.schema.name === "EventNotificationList");
         const events = notification.events || [];
         for (const event of events) {
-            const monitorItemObj = this.monitoredItems[event.clientHandle];
+            const monitorItemObj = this.#monitoredItems[event.clientHandle];
             (0, node_opcua_assert_1.assert)(monitorItemObj, "Expecting a monitored item");
             const monitoredItemImpl = monitorItemObj;
             monitoredItemImpl._notify_event(event.eventFields || []);
@@ -566,15 +572,15 @@ class ClientSubscriptionImpl extends events_1.EventEmitter {
         }
     }
     _terminate_step2(callback) {
-        const monitoredItems = Object.values(this.monitoredItems);
+        const monitoredItems = Object.values(this.#monitoredItems);
         for (const monitoredItem of monitoredItems) {
             this._remove(monitoredItem);
         }
-        const monitoredItemGroups = this.monitoredItemGroups;
+        const monitoredItemGroups = this.#monitoredItemGroups;
         for (const monitoredItemGroup of monitoredItemGroups) {
             this._removeGroup(monitoredItemGroup);
         }
-        (0, node_opcua_assert_1.assert)(Object.values(this.monitoredItems).length === 0);
+        (0, node_opcua_assert_1.assert)(Object.values(this.#monitoredItems).length === 0);
         setImmediate(() => {
             /**
              * notify the observers that the client subscription has terminated
@@ -587,17 +593,18 @@ class ClientSubscriptionImpl extends events_1.EventEmitter {
     }
     _remove(monitoredItem) {
         const clientHandle = monitoredItem.monitoringParameters.clientHandle;
-        (0, node_opcua_assert_1.assert)(clientHandle > 0);
-        if (!Object.prototype.hasOwnProperty.call(this.monitoredItems, clientHandle)) {
-            return; // may be monitoredItem failed to be created  ....
-        }
-        (0, node_opcua_assert_1.assert)(Object.prototype.hasOwnProperty.call(this.monitoredItems, clientHandle));
+        this._removeMonitoredItem(clientHandle);
         const priv = monitoredItem;
         priv._terminate_and_emit();
     }
+    _removeMonitoredItem(clientHandle) {
+        if (this.#monitoredItems[clientHandle]) {
+            delete this.#monitoredItems[clientHandle];
+        }
+    }
     _removeGroup(monitoredItemGroup) {
         monitoredItemGroup._terminate_and_emit();
-        this.monitoredItemGroups = this.monitoredItemGroups.filter((obj) => obj !== monitoredItemGroup);
+        this.#monitoredItemGroups = this.#monitoredItemGroups.filter((obj) => obj !== monitoredItemGroup);
     }
     /**
      * @private
@@ -613,9 +620,13 @@ class ClientSubscriptionImpl extends events_1.EventEmitter {
 }
 exports.ClientSubscriptionImpl = ClientSubscriptionImpl;
 function ClientMonitoredItem_create(subscription, itemToMonitor, monitoringParameters, timestampsToReturn, monitoringMode = node_opcua_service_subscription_1.MonitoringMode.Reporting, callback) {
-    const monitoredItem = new client_monitored_item_impl_1.ClientMonitoredItemImpl(subscription, itemToMonitor, monitoringParameters, timestampsToReturn, monitoringMode);
+    const subscriptionImpl = subscription;
+    if (!subscriptionImpl) {
+        throw new Error("Invalid subscription");
+    }
+    const monitoredItem = new client_monitored_item_impl_1.ClientMonitoredItemImpl(subscriptionImpl, itemToMonitor, monitoringParameters, timestampsToReturn, monitoringMode);
     setImmediate(() => {
-        subscription._wait_for_subscription_to_be_ready((err) => {
+        subscriptionImpl._wait_for_subscription_to_be_ready((err) => {
             if (err) {
                 if (callback) {
                     callback(err);

package/dist/private/client_subscription_impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"client_subscription_impl.js","sourceRoot":"","sources":["../../source/private/client_subscription_impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client_subscription_impl.js","sourceRoot":"","sources":["../../source/private/client_subscription_impl.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-client",
-    "version": "2.158.0",
+    "version": "2.160.0",
     "description": "pure nodejs OPCUA SDK - module client",
     "scripts": {
         "clean": "npx rimraf -g node_modules dist *.tsbuildinfo certificates",
@@ -16,50 +16,51 @@
         "@ster5/global-mutex": "^2.0.0",
         "async": "^3.2.6",
         "chalk": "4.1.2",
-        "node-opcua-alarm-condition": "2.158.0",
+        "node-opcua-alarm-condition": "2.160.0",
         "node-opcua-assert": "2.157.0",
         "node-opcua-basic-types": "2.157.0",
         "node-opcua-buffer-utils": "2.157.0",
-        "node-opcua-certificate-manager": "2.157.0",
-        "node-opcua-client-dynamic-extension-object": "2.158.0",
-        "node-opcua-common": "2.158.0",
+        "node-opcua-certificate-manager": "2.160.0",
+        "node-opcua-client-dynamic-extension-object": "2.160.0",
+        "node-opcua-common": "2.159.0",
         "node-opcua-constants": "2.157.0",
-        "node-opcua-crypto": "4.16.0",
+        "node-opcua-crypto": "4.16.1",
         "node-opcua-data-model": "2.158.0",
-        "node-opcua-data-value": "2.158.0",
+        "node-opcua-data-value": "2.159.0",
         "node-opcua-date-time": "2.157.0",
         "node-opcua-debug": "2.157.0",
         "node-opcua-extension-object": "2.158.0",
         "node-opcua-hostname": "2.157.0",
         "node-opcua-nodeid": "2.157.0",
+        "node-opcua-numeric-range": "2.158.0",
         "node-opcua-object-registry": "2.157.0",
-        "node-opcua-pki": "5.5.0",
-        "node-opcua-pseudo-session": "2.158.0",
-        "node-opcua-schemas": "2.158.0",
-        "node-opcua-secure-channel": "2.158.0",
-        "node-opcua-service-browse": "2.158.0",
-        "node-opcua-service-call": "2.158.0",
-        "node-opcua-service-discovery": "2.158.0",
-        "node-opcua-service-endpoints": "2.158.0",
-        "node-opcua-service-filter": "2.158.0",
-        "node-opcua-service-history": "2.158.0",
-        "node-opcua-service-query": "2.158.0",
-        "node-opcua-service-read": "2.158.0",
-        "node-opcua-service-register-node": "2.158.0",
-        "node-opcua-service-secure-channel": "2.158.0",
-        "node-opcua-service-session": "2.158.0",
-        "node-opcua-service-subscription": "2.158.0",
-        "node-opcua-service-translate-browse-path": "2.158.0",
-        "node-opcua-service-write": "2.158.0",
+        "node-opcua-pki": "5.7.0",
+        "node-opcua-pseudo-session": "2.160.0",
+        "node-opcua-schemas": "2.159.0",
+        "node-opcua-secure-channel": "2.160.0",
+        "node-opcua-service-browse": "2.159.0",
+        "node-opcua-service-call": "2.159.0",
+        "node-opcua-service-discovery": "2.159.0",
+        "node-opcua-service-endpoints": "2.159.0",
+        "node-opcua-service-filter": "2.159.0",
+        "node-opcua-service-history": "2.159.0",
+        "node-opcua-service-query": "2.159.0",
+        "node-opcua-service-read": "2.159.0",
+        "node-opcua-service-register-node": "2.159.0",
+        "node-opcua-service-secure-channel": "2.159.0",
+        "node-opcua-service-session": "2.159.0",
+        "node-opcua-service-subscription": "2.160.0",
+        "node-opcua-service-translate-browse-path": "2.159.0",
+        "node-opcua-service-write": "2.159.0",
         "node-opcua-status-code": "2.157.0",
-        "node-opcua-types": "2.158.0",
+        "node-opcua-types": "2.159.0",
         "node-opcua-utils": "2.157.0",
-        "node-opcua-variant": "2.158.0",
+        "node-opcua-variant": "2.159.0",
         "thenify-ex": "4.4.0"
     },
     "devDependencies": {
         "dequeue": "^1.0.5",
-        "node-opcua-address-space": "2.158.0",
+        "node-opcua-address-space": "2.160.0",
         "node-opcua-binary-stream": "2.157.0",
         "node-opcua-factory": "2.158.0",
         "node-opcua-leak-detector": "2.157.0",
@@ -85,7 +86,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "d92c1c46754548964c3a7821dfec2b52a8522232",
+    "gitHead": "5cd10d45289651e4219d1feff2331b0b3e547c61",
     "files": [
         "dist",
         "source"

package/source/client_monitored_item_base.ts

@@ -5,7 +5,7 @@ import { EventEmitter } from "events";
 
 import { DataValue } from "node-opcua-data-value";
 import { ExtensionObject } from "node-opcua-extension-object";
-import { ReadValueId, TimestampsToReturn } from "node-opcua-service-read";
+import { TimestampsToReturn } from "node-opcua-service-read";
 import {
     MonitoredItemCreateResult,
     MonitoringMode,
@@ -15,6 +15,10 @@ import {
 import { StatusCode } from "node-opcua-status-code";
 import { Callback, ErrorCallback } from "node-opcua-status-code";
 import { Variant } from "node-opcua-variant";
+import { NumericRange } from "node-opcua-numeric-range";
+import { QualifiedNameLike } from "node-opcua-data-model";
+import { NodeId } from "node-opcua-nodeid";
+import { AttributeIds, UInt32 } from "node-opcua-basic-types";
 
 import { ClientSubscription } from "./client_subscription";
 
@@ -48,12 +52,17 @@ export interface ClientMonitoredItemBase extends EventEmitter, ClientMonitoredIt
 }
 
 export interface ClientMonitoredItemBase {
-    itemToMonitor: ReadValueId;
-    monitoringParameters: MonitoringParameters;
-    subscription: ClientSubscription;
-    monitoringMode: MonitoringMode;
-    statusCode: StatusCode;
-    monitoredItemId?: any;
-    result?: MonitoredItemCreateResult;
-    filterResult?: ExtensionObject;
+    readonly itemToMonitor: {
+        nodeId: NodeId;
+        attributeId: AttributeIds;
+        indexRange?: NumericRange | undefined;
+        dataEncoding?: QualifiedNameLike | null;
+    };
+    readonly monitoringParameters: MonitoringParameters;
+    readonly subscription: ClientSubscription;
+    readonly monitoringMode: MonitoringMode;
+    readonly statusCode: StatusCode;
+    readonly monitoredItemId?: any;
+    readonly result?: MonitoredItemCreateResult;
+    readonly filterResult?: ExtensionObject;
 }

package/source/client_monitored_item_toolbox.ts

@@ -29,6 +29,9 @@ import { ClientSessionImpl } from "./private/client_session_impl";
 const debugLog = make_debugLog(__filename);
 const doDebug = checkDebugFlag(__filename);
 
+export interface ClientMonitoredItemBaseEx extends ClientMonitoredItemBase {
+    internalSetMonitoringMode(monitoringMode: MonitoringMode): void;
+}
 /**
  * @internal
  */
@@ -40,6 +43,25 @@ export class ClientMonitoredItemToolbox {
         done: ErrorCallback
     ): void {
         assert(typeof done === "function");
+
+        // we expect subscription to be valid and have a valid session
+        if (!subscription || !subscription.session) {
+            const err0 = new Error("Invalid subscription");
+            if (done) {
+                return done(err0);
+            }
+            return;
+        }
+
+        // may be the subscription has been terminated or is not fully initialize, in the meantime
+        if (!subscription.isActive) {
+            const err1 = new Error("Subscription has been terminated or is not fully initialized");
+            if (done) {
+                return done(err1);
+            }
+            return;
+        }
+
         const itemsToCreate: MonitoredItemCreateRequestOptions[] = [];
         for (const monitoredItem of monitoredItems) {
             const monitoredItemI = monitoredItem as ClientMonitoredItemImpl;
@@ -60,8 +82,10 @@ export class ClientMonitoredItemToolbox {
             const monitoredItem = monitoredItems[i] as ClientMonitoredItemImpl;
             monitoredItem._before_create();
         }
+
         const session = subscription.session as ClientSessionImpl;
         assert(session, "expecting a valid session attached to the subscription ");
+
         session.createMonitoredItems(createMonitorItemsRequest, (err?: Error | null, response?: CreateMonitoredItemsResponse) => {
             /* istanbul ignore next */
             if (err) {
@@ -138,7 +162,7 @@ export class ClientMonitoredItemToolbox {
 
     public static _toolbox_setMonitoringMode(
         subscription: ClientSubscription,
-        monitoredItems: ClientMonitoredItemBase[],
+        monitoredItems: ClientMonitoredItemBaseEx[],
         monitoringMode: MonitoringMode,
         callback: Callback<StatusCode[]>
     ): void {
@@ -158,7 +182,7 @@ export class ClientMonitoredItemToolbox {
                 return callback(err);
             }
             monitoredItems.forEach((monitoredItem) => {
-                monitoredItem.monitoringMode = monitoringMode;
+                monitoredItem.internalSetMonitoringMode(monitoringMode);
             });
             response = response!;
             response.results = response.results || [];

package/source/client_subscription.ts

@@ -52,32 +52,32 @@ export interface ModifySubscriptionResult {
     revisedMaxKeepAliveCount: UInt32;
 }
 
-export interface ClientSubscription extends EventEmitter  {
-    subscriptionId: SubscriptionId;
-    publishingInterval: number;
-    lifetimeCount: number;
-    maxKeepAliveCount: number;
-    maxNotificationsPerPublish: number;
-    publishingEnabled: boolean;
-    priority: number;
-    monitoredItems: ClientMonitoredItemBaseMap;
-    timeoutHint: number;
+export interface ClientSubscription extends EventEmitter {
+    readonly subscriptionId: SubscriptionId;
+    readonly publishingInterval: number;
+    readonly lifetimeCount: number;
+    readonly maxKeepAliveCount: number;
+    readonly maxNotificationsPerPublish: number;
+    readonly publishingEnabled: boolean;
+    readonly priority: number;
+    readonly monitoredItems: ClientMonitoredItemBaseMap;
+    readonly timeoutHint: number;
 
     /**
      * return the session associated with the subscription.
      * (may throw if the session is not valid)
      */
-    session: ClientSession;
+    readonly session: ClientSession;
 
     /**
      * return true if the subscription is attached to a valid session
      */
-    hasSession: boolean;
+    readonly hasSession: boolean;
 
     /**
      * true is the subscription is fully active
      */
-    isActive: boolean;
+    readonly isActive: boolean;
 
     /**
      * add a monitor item to the subscription

package/source/private/client_monitored_item_group_impl.ts

@@ -18,6 +18,7 @@ import { ClientMonitoredItemToolbox } from "../client_monitored_item_toolbox";
 import { ClientSubscription } from "../client_subscription";
 import { ClientMonitoredItemImpl } from "./client_monitored_item_impl";
 import { ClientSubscriptionImpl } from "./client_subscription_impl";
+import { ClientMonitoredItemBaseEx } from "../client_monitored_item_toolbox";
 
 const debugLog = make_debugLog(__filename);
 const doDebug = checkDebugFlag(__filename);
@@ -33,7 +34,7 @@ const warningLog = make_warningLog(__filename);
  *  note: this.monitoringMode = subscription_service.MonitoringMode.Reporting;
  */
 export class ClientMonitoredItemGroupImpl extends EventEmitter implements ClientMonitoredItemGroup {
-    public readonly monitoredItems: ClientMonitoredItemBase[];
+    public readonly monitoredItems: ClientMonitoredItemBaseEx[];
     private readonly subscription: ClientSubscription;
     private timestampsToReturn: TimestampsToReturn;
     private readonly monitoringMode: MonitoringMode;
@@ -162,7 +163,7 @@ export class ClientMonitoredItemGroupImpl extends EventEmitter implements Client
      */
     public _monitor(done: ErrorCallback): void {
         assert(done === undefined || typeof done === "function");
-
+        assert(this.subscription, "expecting a valid subscription");
         this.monitoredItems.forEach((monitoredItem: ClientMonitoredItemBase, index: number) => {
             monitoredItem.on("changed", (dataValue: DataValue) => {
                 /**

package/source/private/client_monitored_item_impl.ts

@@ -24,7 +24,7 @@ import { Variant } from "node-opcua-variant";
 import { Callback, ErrorCallback } from "node-opcua-status-code";
 
 import { ClientMonitoredItem } from "../client_monitored_item";
-import { ClientMonitoredItemToolbox } from "../client_monitored_item_toolbox";
+import { ClientMonitoredItemToolbox, ClientMonitoredItemBaseEx } from "../client_monitored_item_toolbox";
 import { ClientSubscription } from "../client_subscription";
 import { ClientMonitoredItem_create, ClientSubscriptionImpl } from "./client_subscription_impl";
 
@@ -35,11 +35,11 @@ const doDebug = checkDebugFlag(__filename);
 export type PrepareForMonitoringResult =
     | { error: string }
     | {
-          error?: null;
-          itemToMonitor: ReadValueIdOptions;
-          monitoringMode: MonitoringMode;
-          requestedParameters: MonitoringParameters;
-      };
+        error?: null;
+        itemToMonitor: ReadValueIdOptions;
+        monitoringMode: MonitoringMode;
+        requestedParameters: MonitoringParameters;
+    };
 
 /**
  * ClientMonitoredItem
@@ -53,7 +53,7 @@ export type PrepareForMonitoringResult =
  *
  *  note: this.monitoringMode = subscription_service.MonitoringMode.Reporting;
  */
-export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonitoredItem {
+export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonitoredItem, ClientMonitoredItemBaseEx {
     public itemToMonitor: ReadValueId;
     public monitoringParameters: MonitoringParameters;
     public subscription: ClientSubscriptionImpl;
@@ -64,8 +64,12 @@ export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonit
     public filterResult?: ExtensionObject;
     public timestampsToReturn: TimestampsToReturn;
 
-    private _pendingDataValue?: DataValue[];
-    private _pendingEvents?: Variant[][];
+    #pendingDataValue?: DataValue[];
+    #pendingEvents?: Variant[][];
+
+    public internalSetMonitoringMode(monitoringMode: MonitoringMode): void {
+        this.monitoringMode = monitoringMode;
+    }
 
     constructor(
         subscription: ClientSubscription,
@@ -163,7 +167,7 @@ export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonit
             [this],
             monitoringMode,
             (err?: Error | null, statusCodes?: StatusCode[]) => {
-                callback(err ? err : null, statusCodes ? statusCodes[0]: undefined);
+                callback(err ? err : null, statusCodes ? statusCodes[0] : undefined);
             }
         );
     }
@@ -178,8 +182,8 @@ export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonit
         // in this case we need to put the dataValue aside so we can send the notification changed after
         // the node-opcua client had time to fully install the on("changed") event handler
         if (this.statusCode?.value === StatusCodes.BadDataUnavailable.value) {
-            this._pendingDataValue = this._pendingDataValue || [];
-            this._pendingDataValue.push(value);
+            this.#pendingDataValue = this.#pendingDataValue || [];
+            this.#pendingDataValue.push(value);
             return;
         }
         /**
@@ -205,8 +209,8 @@ export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonit
      */
     public _notify_event(eventFields: Variant[]): void {
         if (this.statusCode?.value === StatusCodes.BadDataUnavailable.value) {
-            this._pendingEvents = this._pendingEvents || [];
-            this._pendingEvents.push(eventFields);
+            this.#pendingEvents = this.#pendingEvents || [];
+            this.#pendingEvents.push(eventFields);
             return;
         }
         /**
@@ -234,7 +238,7 @@ export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonit
 
         const subscription = this.subscription as ClientSubscriptionImpl;
 
-        this.monitoringParameters.clientHandle = subscription.nextClientHandle();
+        this.monitoringParameters.clientHandle = subscription._nextClientHandle();
 
         assert(this.monitoringParameters.clientHandle > 0 && this.monitoringParameters.clientHandle !== 4294967295);
 
@@ -317,17 +321,17 @@ export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonit
 
         // some PublishRequest with DataNotificationChange might have been sent by the server, before the monitored
         // item has been fully initialized it is time to process now any pending notification that were put on hold.
-        if (this._pendingDataValue) {
-            const dataValues = this._pendingDataValue;
-            this._pendingDataValue = undefined;
+        if (this.#pendingDataValue) {
+            const dataValues = this.#pendingDataValue;
+            this.#pendingDataValue = undefined;
             setImmediate(() => {
                 dataValues.map((dataValue) => this._notify_value_change(dataValue));
             });
         }
 
-        if (this._pendingEvents) {
-            const events = this._pendingEvents;
-            this._pendingEvents = undefined;
+        if (this.#pendingEvents) {
+            const events = this.#pendingEvents;
+            this.#pendingEvents = undefined;
             setImmediate(() => {
                 events.map((event) => this._notify_event(event));
             });
@@ -377,10 +381,10 @@ export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonit
          */
         this.emit("terminated", err);
         this.removeAllListeners();
-    
+
         // also remove from subscription
         const clientHandle = this.monitoringParameters.clientHandle;
-        delete this.subscription.monitoredItems[clientHandle];
+        this.subscription._removeMonitoredItem(clientHandle);
     }
 }
 

package/source/private/client_subscription_impl.ts

@@ -144,14 +144,20 @@ export class ClientSubscriptionImpl extends EventEmitter implements ClientSubscr
     public maxNotificationsPerPublish: number;
     public publishingEnabled: boolean;
     public priority: number;
-    public monitoredItems: ClientMonitoredItemBaseMap;
-    public monitoredItemGroups: ClientMonitoredItemGroup[] = [];
+    #monitoredItems: ClientMonitoredItemBaseMap;
+    public get monitoredItems(): ClientMonitoredItemBaseMap {
+        return this.#monitoredItems;
+    }
+    public set monitoredItems(value: ClientMonitoredItemBaseMap) {
+        this.#monitoredItems = value;
+    }
+    #monitoredItemGroups: ClientMonitoredItemGroup[] = [];
 
     public timeoutHint = 0;
     public publishEngine: ClientSidePublishEngine;
 
     public lastSequenceNumber: number;
-    private _nextClientHandle = 0;
+    #nextClientHandle = 0;
     public hasTimedOut: boolean;
 
     constructor(session: ClientSession, options: ClientSubscriptionOptions) {
@@ -203,8 +209,8 @@ export class ClientSubscriptionImpl extends EventEmitter implements ClientSubscr
 
         this.subscriptionId = PENDING_SUBSCRIPTION_ID;
 
-        this._nextClientHandle = 0;
-        this.monitoredItems = {};
+        this.#nextClientHandle = 0;
+        this.#monitoredItems = {};
 
         /**
          * set to True when the server has notified us that this subscription has timed out
@@ -288,9 +294,9 @@ export class ClientSubscriptionImpl extends EventEmitter implements ClientSubscr
     /**
 
      */
-    public nextClientHandle(): number {
-        this._nextClientHandle += 1;
-        return this._nextClientHandle;
+    public _nextClientHandle(): number {
+        this.#nextClientHandle += 1;
+        return this.#nextClientHandle;
     }
 
     public async monitor(
@@ -555,7 +561,7 @@ export class ClientSubscriptionImpl extends EventEmitter implements ClientSubscr
     public _add_monitored_item(clientHandle: ClientHandle, monitoredItem: ClientMonitoredItemBase): void {
         assert(this.isActive, "subscription must be active and not terminated");
         assert(monitoredItem.monitoringParameters.clientHandle === clientHandle);
-        this.monitoredItems[clientHandle] = monitoredItem;
+        this.#monitoredItems[clientHandle] = monitoredItem;
 
         /**
          * notify the observers that a new monitored item has been added to the subscription.
@@ -566,7 +572,7 @@ export class ClientSubscriptionImpl extends EventEmitter implements ClientSubscr
     }
 
     public _add_monitored_items_group(monitoredItemGroup: ClientMonitoredItemGroupImpl): void {
-        this.monitoredItemGroups.push(monitoredItemGroup);
+        this.#monitoredItemGroups.push(monitoredItemGroup);
     }
 
     public _wait_for_subscription_to_be_ready(done: ErrorCallback): void {
@@ -600,7 +606,7 @@ export class ClientSubscriptionImpl extends EventEmitter implements ClientSubscr
 
         let repeated = 0;
         for (const monitoredItem of monitoredItems) {
-            const monitorItemObj = this.monitoredItems[monitoredItem.clientHandle];
+            const monitorItemObj = this.#monitoredItems[monitoredItem.clientHandle];
             if (monitorItemObj) {
                 if (monitorItemObj.itemToMonitor.attributeId === AttributeIds.EventNotifier) {
                     warningLog(
@@ -679,7 +685,7 @@ export class ClientSubscriptionImpl extends EventEmitter implements ClientSubscr
         assert(notification.schema.name === "EventNotificationList");
         const events = notification.events || [];
         for (const event of events) {
-            const monitorItemObj = this.monitoredItems[event.clientHandle];
+            const monitorItemObj = this.#monitoredItems[event.clientHandle];
             assert(monitorItemObj, "Expecting a monitored item");
 
             const monitoredItemImpl = monitorItemObj as ClientMonitoredItemImpl;
@@ -751,8 +757,7 @@ export class ClientSubscriptionImpl extends EventEmitter implements ClientSubscr
                         if (s(this).$_slowNotifCount > 0 && s(this).$_slowNotifCount % 1000 !== 0) return;
                         s(this).$_slowNotifCount++;
                         warningLog(
-                            `[NODE-OPCUA-W32]}: monitored.item event handler takes too much time : operation duration ${duration} ms [repeated ${
-                                s(this).$_slowNotifCount
+                            `[NODE-OPCUA-W32]}: monitored.item event handler takes too much time : operation duration ${duration} ms [repeated ${s(this).$_slowNotifCount
                             } times]\n         please ensure that your monitoredItem event handler is not blocking the event loop.`
                         );
                     }
@@ -762,17 +767,17 @@ export class ClientSubscriptionImpl extends EventEmitter implements ClientSubscr
     }
 
     private _terminate_step2(callback: (err?: Error) => void) {
-        const monitoredItems = Object.values(this.monitoredItems);
+        const monitoredItems = Object.values(this.#monitoredItems);
         for (const monitoredItem of monitoredItems) {
             this._remove(monitoredItem);
         }
 
-        const monitoredItemGroups = this.monitoredItemGroups;
+        const monitoredItemGroups = this.#monitoredItemGroups;
         for (const monitoredItemGroup of monitoredItemGroups) {
             this._removeGroup(monitoredItemGroup);
         }
 
-        assert(Object.values(this.monitoredItems).length === 0);
+        assert(Object.values(this.#monitoredItems).length === 0);
 
         setImmediate(() => {
             /**
@@ -787,19 +792,20 @@ export class ClientSubscriptionImpl extends EventEmitter implements ClientSubscr
 
     private _remove(monitoredItem: ClientMonitoredItemBase) {
         const clientHandle = monitoredItem.monitoringParameters.clientHandle;
-        assert(clientHandle > 0);
-        if (!Object.prototype.hasOwnProperty.call(this.monitoredItems, clientHandle)) {
-            return; // may be monitoredItem failed to be created  ....
-        }
-        assert(Object.prototype.hasOwnProperty.call(this.monitoredItems, clientHandle));
-
+        this._removeMonitoredItem(clientHandle);
         const priv = monitoredItem as ClientMonitoredItemImpl;
         priv._terminate_and_emit();
     }
 
+    public _removeMonitoredItem(clientHandle: ClientHandle) {
+        if (this.#monitoredItems[clientHandle]) {
+            delete this.#monitoredItems[clientHandle];
+        }
+    }
+
     public _removeGroup(monitoredItemGroup: ClientMonitoredItemGroup): void {
         (monitoredItemGroup as any)._terminate_and_emit();
-        this.monitoredItemGroups = this.monitoredItemGroups.filter((obj) => obj !== monitoredItemGroup);
+        this.#monitoredItemGroups = this.#monitoredItemGroups.filter((obj) => obj !== monitoredItemGroup);
     }
     /**
      * @private
@@ -833,8 +839,14 @@ export function ClientMonitoredItem_create(
     monitoringMode: MonitoringMode = MonitoringMode.Reporting,
     callback?: (err3?: Error | null, monitoredItem?: ClientMonitoredItem) => void
 ): ClientMonitoredItem {
+
+    const subscriptionImpl = subscription as ClientSubscriptionImpl;
+    if (!subscriptionImpl) {
+        throw new Error("Invalid subscription");
+    }
+
     const monitoredItem = new ClientMonitoredItemImpl(
-        subscription,
+        subscriptionImpl,
         itemToMonitor,
         monitoringParameters,
         timestampsToReturn,
@@ -842,13 +854,14 @@ export function ClientMonitoredItem_create(
     );
 
     setImmediate(() => {
-        (subscription as ClientSubscriptionImpl)._wait_for_subscription_to_be_ready((err?: Error) => {
+        subscriptionImpl._wait_for_subscription_to_be_ready((err?: Error) => {
             if (err) {
                 if (callback) {
                     callback(err);
                 }
                 return;
             }
+
             ClientMonitoredItemToolbox._toolbox_monitor(subscription, timestampsToReturn, [monitoredItem], (err1?: Error) => {
                 if (err1) {
                     monitoredItem._terminate_and_emit(err1);