node-opcua-server 2.167.0 → 2.168.0

package/dist/server_subscription.js

@@ -8,7 +8,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Subscription = exports.SubscriptionState = void 0;
-const events_1 = require("events");
+const node_events_1 = require("node:events");
 const chalk_1 = __importDefault(require("chalk"));
 const node_opcua_address_space_1 = require("node-opcua-address-space");
 const node_opcua_assert_1 = require("node-opcua-assert");
@@ -20,13 +20,12 @@ const node_opcua_object_registry_1 = require("node-opcua-object-registry");
 const node_opcua_secure_channel_1 = require("node-opcua-secure-channel");
 const node_opcua_service_filter_1 = require("node-opcua-service-filter");
 const node_opcua_service_subscription_1 = require("node-opcua-service-subscription");
-const node_opcua_service_subscription_2 = require("node-opcua-service-subscription");
 const node_opcua_status_code_1 = require("node-opcua-status-code");
 const node_opcua_types_1 = require("node-opcua-types");
-const queue_1 = require("./queue");
+const i_server_side_publish_engine_1 = require("./i_server_side_publish_engine");
 const monitored_item_1 = require("./monitored_item");
+const queue_1 = require("./queue");
 const validate_filter_1 = require("./validate_filter");
-const i_server_side_publish_engine_1 = require("./i_server_side_publish_engine");
 const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
 const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
 const warningLog = (0, node_opcua_debug_1.make_warningLog)(__filename);
@@ -95,10 +94,10 @@ function _adjust_maxNotificationsPerPublish(maxNotificationsPerPublish) {
     return maxNotificationsPerPublish;
 }
 function w(s, length) {
-    return ("000" + s).padStart(length);
+    return `000${s}`.padStart(length);
 }
 function t(d) {
-    return w(d.getHours(), 2) + ":" + w(d.getMinutes(), 2) + ":" + w(d.getSeconds(), 2) + ":" + w(d.getMilliseconds(), 3);
+    return `${w(d.getHours(), 2)}:${w(d.getMinutes(), 2)}:${w(d.getSeconds(), 2)}:${w(d.getMilliseconds(), 3)}`;
 }
 function _getSequenceNumbers(arr) {
     return arr.map((notificationMessage) => notificationMessage.sequenceNumber);
@@ -116,12 +115,12 @@ function analyzeEventFilterResult(node, eventFilter) {
         whereClauseResult
     });
 }
-function analyzeDataChangeFilterResult(node, dataChangeFilter) {
-    (0, node_opcua_assert_1.assert)(dataChangeFilter instanceof node_opcua_service_subscription_2.DataChangeFilter);
+function analyzeDataChangeFilterResult(_node, dataChangeFilter) {
+    (0, node_opcua_assert_1.assert)(dataChangeFilter instanceof node_opcua_service_subscription_1.DataChangeFilter);
     // the opcua specification doesn't provide dataChangeFilterResult
     return null;
 }
-function analyzeAggregateFilterResult(node, aggregateFilter) {
+function analyzeAggregateFilterResult(_node, aggregateFilter) {
     (0, node_opcua_assert_1.assert)(aggregateFilter instanceof node_opcua_service_subscription_1.AggregateFilter);
     return new node_opcua_types_1.AggregateFilterResult({});
 }
@@ -132,7 +131,7 @@ function _process_filter(node, filter) {
     if (filter instanceof node_opcua_service_filter_1.EventFilter) {
         return analyzeEventFilterResult(node, filter);
     }
-    else if (filter instanceof node_opcua_service_subscription_2.DataChangeFilter) {
+    else if (filter instanceof node_opcua_service_subscription_1.DataChangeFilter) {
         return analyzeDataChangeFilterResult(node, filter);
     }
     else if (filter instanceof node_opcua_service_subscription_1.AggregateFilter) {
@@ -147,67 +146,70 @@ function _process_filter(node, filter) {
 function createSubscriptionDiagnostics(subscription) {
     (0, node_opcua_assert_1.assert)(subscription instanceof Subscription);
     const subscriptionDiagnostics = new node_opcua_common_1.SubscriptionDiagnosticsDataType({});
-    const subscription_subscriptionDiagnostics = subscriptionDiagnostics;
-    subscription_subscriptionDiagnostics.$subscription = subscription;
+    const sd = subscriptionDiagnostics;
+    sd.$subscription = subscription;
+    const defineGetter = (name, getter) => {
+        Object.defineProperty(sd, name, { get: getter, configurable: true });
+    };
     // "sessionId"
-    subscription_subscriptionDiagnostics.__defineGetter__("sessionId", function () {
+    defineGetter("sessionId", function () {
         if (!this.$subscription) {
             return node_opcua_nodeid_1.NodeId.nullNodeId;
         }
         return this.$subscription.getSessionId();
     });
-    subscription_subscriptionDiagnostics.__defineGetter__("subscriptionId", function () {
+    defineGetter("subscriptionId", function () {
         if (!this.$subscription) {
             return 0;
         }
         return this.$subscription.id;
     });
-    subscription_subscriptionDiagnostics.__defineGetter__("priority", function () {
+    defineGetter("priority", function () {
         if (!this.$subscription) {
             return 0;
         }
         return this.$subscription.priority;
     });
-    subscription_subscriptionDiagnostics.__defineGetter__("publishingInterval", function () {
+    defineGetter("publishingInterval", function () {
         if (!this.$subscription) {
             return 0;
         }
         return this.$subscription.publishingInterval;
     });
-    subscription_subscriptionDiagnostics.__defineGetter__("maxLifetimeCount", function () {
+    defineGetter("maxLifetimeCount", function () {
         return this.$subscription.lifeTimeCount;
     });
-    subscription_subscriptionDiagnostics.__defineGetter__("maxKeepAliveCount", function () {
+    defineGetter("maxKeepAliveCount", function () {
         if (!this.$subscription) {
             return 0;
         }
         return this.$subscription.maxKeepAliveCount;
     });
-    subscription_subscriptionDiagnostics.__defineGetter__("maxNotificationsPerPublish", function () {
+    defineGetter("maxNotificationsPerPublish", function () {
         if (!this.$subscription) {
             return 0;
         }
         return this.$subscription.maxNotificationsPerPublish;
     });
-    subscription_subscriptionDiagnostics.__defineGetter__("publishingEnabled", function () {
+    defineGetter("publishingEnabled", function () {
         if (!this.$subscription) {
             return false;
         }
         return this.$subscription.publishingEnabled;
     });
-    subscription_subscriptionDiagnostics.__defineGetter__("monitoredItemCount", function () {
+    defineGetter("monitoredItemCount", function () {
         if (!this.$subscription) {
             return 0;
         }
         return this.$subscription.monitoredItemCount;
     });
-    subscription_subscriptionDiagnostics.__defineGetter__("nextSequenceNumber", function () {
+    defineGetter("nextSequenceNumber", function () {
         if (!this.$subscription) {
             return 0;
         }
         return this.$subscription.futureSequenceNumber;
     });
-    subscription_subscriptionDiagnostics.__defineGetter__("disabledMonitoredItemCount", function () {
+    defineGetter("disabledMonitoredItemCount", function () {
         if (!this.$subscription) {
             return 0;
         }
@@ -237,13 +239,13 @@ function createSubscriptionDiagnostics(subscription) {
    "monitoringQueueOverflowCount",
    "eventQueueOverflowCount"
    */
-    subscription_subscriptionDiagnostics.__defineGetter__("currentKeepAliveCount", function () {
+    defineGetter("currentKeepAliveCount", function () {
         if (!this.$subscription) {
             return 0;
         }
         return this.$subscription.currentKeepAliveCount;
     });
-    subscription_subscriptionDiagnostics.__defineGetter__("currentLifetimeCount", function () {
+    defineGetter("currentLifetimeCount", function () {
         if (!this.$subscription) {
             return 0;
         }
@@ -286,7 +288,7 @@ const INVALID_ID = -1;
 /**
  * The Subscription class used in the OPCUA server side.
  */
-class Subscription extends events_1.EventEmitter {
+class Subscription extends node_events_1.EventEmitter {
     static minimumPublishingInterval = 50; // fastest possible
     static defaultPublishingInterval = 1000; // one second
     static maximumPublishingInterval = 1000 * 60; // one minute
@@ -427,13 +429,13 @@ class Subscription extends events_1.EventEmitter {
     }
     toString() {
         let str = "Subscription:\n";
-        str += "  subscriptionId          " + this.id + "\n";
-        str += "  sessionId          " + this.getSessionId()?.toString() + "\n";
-        str += "  publishingEnabled  " + this.publishingEnabled + "\n";
-        str += "  maxKeepAliveCount  " + this.maxKeepAliveCount + "\n";
-        str += "  publishingInterval " + this.publishingInterval + "\n";
-        str += "  lifeTimeCount      " + this.lifeTimeCount + "\n";
-        str += "  maxKeepAliveCount  " + this.maxKeepAliveCount + "\n";
+        str += `  subscriptionId          ${this.id}\n`;
+        str += `  sessionId          ${this.getSessionId()?.toString()}\n`;
+        str += `  publishingEnabled  ${this.publishingEnabled}\n`;
+        str += `  maxKeepAliveCount  ${this.maxKeepAliveCount}\n`;
+        str += `  publishingInterval ${this.publishingInterval}\n`;
+        str += `  lifeTimeCount      ${this.lifeTimeCount}\n`;
+        str += `  maxKeepAliveCount  ${this.maxKeepAliveCount}\n`;
         return str;
     }
     /**
@@ -525,7 +527,6 @@ class Subscription extends events_1.EventEmitter {
      *
      */
     terminate() {
-        (0, node_opcua_assert_1.assert)(arguments.length === 0);
         debugLog("Subscription#terminate status", SubscriptionState[this.state]);
         if (this.state === SubscriptionState.CLOSED) {
             // todo verify if asserting is required here
@@ -541,7 +542,7 @@ class Subscription extends events_1.EventEmitter {
             (0, node_opcua_assert_1.assert)(status === node_opcua_status_code_1.StatusCodes.Good);
         }
         (0, node_opcua_assert_1.assert)(this.monitoredItemCount === 0);
-        if (this.$session && this.$session._unexposeSubscriptionDiagnostics) {
+        if (this.$session?._unexposeSubscriptionDiagnostics) {
             this.$session._unexposeSubscriptionDiagnostics(this);
         }
         this.state = SubscriptionState.CLOSED;
@@ -646,7 +647,7 @@ class Subscription extends events_1.EventEmitter {
      */
     get disabledMonitoredItemCount() {
         return Object.values(this.monitoredItems).reduce((sum, monitoredItem) => {
-            return sum + (monitoredItem.monitoringMode === node_opcua_service_subscription_2.MonitoringMode.Disabled ? 1 : 0);
+            return sum + (monitoredItem.monitoringMode === node_opcua_service_subscription_1.MonitoringMode.Disabled ? 1 : 0);
         }, 0);
     }
     /**
@@ -707,16 +708,17 @@ class Subscription extends events_1.EventEmitter {
      * @param monitoredItemCreateRequest - the parameters describing the monitored Item to create
      */
     preCreateMonitoredItem(addressSpace, timestampsToReturn, monitoredItemCreateRequest) {
-        (0, node_opcua_assert_1.assert)(monitoredItemCreateRequest instanceof node_opcua_service_subscription_2.MonitoredItemCreateRequest);
+        (0, node_opcua_assert_1.assert)(monitoredItemCreateRequest instanceof node_opcua_service_subscription_1.MonitoredItemCreateRequest);
         function handle_error(statusCode) {
             return {
-                createResult: new node_opcua_service_subscription_2.MonitoredItemCreateResult({ statusCode }),
+                createResult: new node_opcua_service_subscription_1.MonitoredItemCreateResult({ statusCode }),
                 monitoredItemCreateRequest
             };
         }
         const itemToMonitor = monitoredItemCreateRequest.itemToMonitor;
         const node = addressSpace.findNode(itemToMonitor.nodeId);
-        if (!node || (node.nodeClass !== node_opcua_data_model_1.NodeClass.Variable && node.nodeClass !== node_opcua_data_model_1.NodeClass.Object && node.nodeClass !== node_opcua_data_model_1.NodeClass.Method)) {
+        if (!node ||
+            (node.nodeClass !== node_opcua_data_model_1.NodeClass.Variable && node.nodeClass !== node_opcua_data_model_1.NodeClass.Object && node.nodeClass !== node_opcua_data_model_1.NodeClass.Method)) {
             return handle_error(node_opcua_status_code_1.StatusCodes.BadNodeIdUnknown);
         }
         if (itemToMonitor.attributeId === node_opcua_data_model_1.AttributeIds.Value && !(node.nodeClass === node_opcua_data_model_1.NodeClass.Variable)) {
@@ -769,11 +771,14 @@ class Subscription extends events_1.EventEmitter {
             await functor(m);
         }
     }
-    postCreateMonitoredItem(monitoredItem, monitoredItemCreateRequest, createResult) {
+    postCreateMonitoredItem(monitoredItem, monitoredItemCreateRequest, _createResult) {
         this._createMonitoredItemStep3(monitoredItem, monitoredItemCreateRequest);
     }
     async createMonitoredItem(addressSpace, timestampsToReturn, monitoredItemCreateRequest) {
         const { monitoredItem, createResult } = this.preCreateMonitoredItem(addressSpace, timestampsToReturn, monitoredItemCreateRequest);
+        if (!monitoredItem) {
+            return createResult;
+        }
         this.postCreateMonitoredItem(monitoredItem, monitoredItemCreateRequest, createResult);
         return createResult;
     }
@@ -791,7 +796,7 @@ class Subscription extends events_1.EventEmitter {
      */
     removeMonitoredItem(monitoredItemId) {
         debugLog("Removing monitoredIem ", monitoredItemId);
-        if (!Object.prototype.hasOwnProperty.call(this.monitoredItems, monitoredItemId.toString())) {
+        if (!Object.hasOwn(this.monitoredItems, monitoredItemId.toString())) {
             return node_opcua_status_code_1.StatusCodes.BadMonitoredItemIdInvalid;
         }
         const monitoredItem = this.monitoredItems[monitoredItemId];
@@ -841,8 +846,8 @@ class Subscription extends events_1.EventEmitter {
      * @param notification
      */
     notificationHasExpired(notification) {
-        (0, node_opcua_assert_1.assert)(Object.prototype.hasOwnProperty.call(notification, "start_tick"));
-        (0, node_opcua_assert_1.assert)(isFinite(notification.start_tick + this.maxKeepAliveCount));
+        (0, node_opcua_assert_1.assert)(Object.hasOwn(notification, "start_tick"));
+        (0, node_opcua_assert_1.assert)(Number.isFinite(notification.start_tick + this.maxKeepAliveCount));
         return notification.start_tick + this.maxKeepAliveCount < this.publishIntervalCount;
     }
     /**
@@ -901,6 +906,10 @@ class Subscription extends events_1.EventEmitter {
             const monitoredItemId = monitoredItems[index];
             const serverHandle = parseInt(monitoredItemId, 10);
             const monitoredItem = this.getMonitoredItem(serverHandle);
+            // c8 ignore next
+            if (!monitoredItem) {
+                throw new Error("monitoredItem is null");
+            }
             result.clientHandles[index] = monitoredItem.clientHandle;
             // TODO:  serverHandle is defined anywhere in the OPCUA Specification 1.02
             //        I am not sure what shall be reported for serverHandle...
@@ -946,10 +955,10 @@ class Subscription extends events_1.EventEmitter {
         // a StatusChangeNotification notificationMessage with the status code
         // Good_SubscriptionTransferred to the old Session.
         debugLog(chalk_1.default.red(" Subscription => Notifying Transfer                                  "));
-        const notificationData = new node_opcua_service_subscription_2.StatusChangeNotification({
+        const notificationData = new node_opcua_service_subscription_1.StatusChangeNotification({
             status: node_opcua_status_code_1.StatusCodes.GoodSubscriptionTransferred
         });
-        if (this.publishEngine.pendingPublishRequestCount) {
+        if (this.publishEngine?.pendingPublishRequestCount) {
             // the GoodSubscriptionTransferred can be processed immediately
             this._addNotificationMessage(notificationData);
             debugLog(chalk_1.default.red("pendingPublishRequestCount"), this.publishEngine?.pendingPublishRequestCount);
@@ -957,6 +966,11 @@ class Subscription extends events_1.EventEmitter {
         }
         else {
             debugLog(chalk_1.default.red("Cannot  send GoodSubscriptionTransferred => lets create a TransferredSubscription "));
+            // c8 ignore next
+            if (!this.publishEngine) {
+                warningLog("notifyTransfer: publishEngine is not available");
+                return;
+            }
             const ts = new i_server_side_publish_engine_1.TransferredSubscription({
                 generator: this._sequence_number_generator,
                 id: this.id,
@@ -981,18 +995,18 @@ class Subscription extends events_1.EventEmitter {
     _updateCounters(notificationMessage) {
         for (const notificationData of notificationMessage.notificationData || []) {
             // update diagnostics
-            if (notificationData instanceof node_opcua_service_subscription_2.DataChangeNotification) {
-                const nbNotifs = notificationData.monitoredItems.length;
+            if (notificationData instanceof node_opcua_service_subscription_1.DataChangeNotification) {
+                const nbNotifs = notificationData.monitoredItems?.length || 0;
                 this.subscriptionDiagnostics.dataChangeNotificationsCount += nbNotifs;
                 this.subscriptionDiagnostics.notificationsCount += nbNotifs;
             }
-            else if (notificationData instanceof node_opcua_service_subscription_2.EventNotificationList) {
-                const nbNotifs = notificationData.events.length;
+            else if (notificationData instanceof node_opcua_service_subscription_1.EventNotificationList) {
+                const nbNotifs = notificationData.events?.length || 0;
                 this.subscriptionDiagnostics.eventNotificationsCount += nbNotifs;
                 this.subscriptionDiagnostics.notificationsCount += nbNotifs;
             }
             else {
-                (0, node_opcua_assert_1.assert)(notificationData instanceof node_opcua_service_subscription_2.StatusChangeNotification);
+                (0, node_opcua_assert_1.assert)(notificationData instanceof node_opcua_service_subscription_1.StatusChangeNotification);
                 // TODO
                 // note: :there is no way to count StatusChangeNotifications in opcua yet.
             }
@@ -1008,23 +1022,27 @@ class Subscription extends events_1.EventEmitter {
      */
     _publish_pending_notifications() {
         const publishEngine = this.publishEngine;
+        // c8 ignore next
+        if (!publishEngine) {
+            throw new Error("publishEngine is null");
+        }
         const subscriptionId = this.id;
         // preconditions
         (0, node_opcua_assert_1.assert)(publishEngine.pendingPublishRequestCount > 0);
         (0, node_opcua_assert_1.assert)(this.hasPendingNotifications);
         const notificationMessage = this._popNotificationToSend();
-        if (notificationMessage.notificationData.length === 0) {
+        if (notificationMessage.notificationData?.length === 0) {
             return; // nothing to do
         }
         const moreNotifications = this.hasPendingNotifications;
         this.emit("notification", notificationMessage);
         // Update counters ....
         this._updateCounters(notificationMessage);
-        (0, node_opcua_assert_1.assert)(Object.prototype.hasOwnProperty.call(notificationMessage, "sequenceNumber"));
-        (0, node_opcua_assert_1.assert)(Object.prototype.hasOwnProperty.call(notificationMessage, "notificationData"));
+        (0, node_opcua_assert_1.assert)(Object.hasOwn(notificationMessage, "sequenceNumber"));
+        (0, node_opcua_assert_1.assert)(Object.hasOwn(notificationMessage, "notificationData"));
         // update diagnostics
         this.subscriptionDiagnostics.publishRequestCount += 1;
-        const response = new node_opcua_service_subscription_2.PublishResponse({
+        const response = new node_opcua_service_subscription_1.PublishResponse({
             moreNotifications,
             notificationMessage: {
                 notificationData: notificationMessage.notificationData,
@@ -1048,13 +1066,13 @@ class Subscription extends events_1.EventEmitter {
             // debugLog(notificationMessage.toString());
         }
         if (this.state !== SubscriptionState.CLOSED) {
-            (0, node_opcua_assert_1.assert)(notificationMessage.notificationData.length > 0, "We are not expecting a keep-alive message here");
+            (0, node_opcua_assert_1.assert)((notificationMessage.notificationData?.length || 0) > 0, "We are not expecting a keep-alive message here");
             this.state = SubscriptionState.NORMAL;
-            debugLog("subscription " + this.id + chalk_1.default.bgYellow(" set to NORMAL"));
+            debugLog(`subscription ${this.id}${chalk_1.default.bgYellow(" set to NORMAL")}`);
         }
     }
     process_subscription() {
-        (0, node_opcua_assert_1.assert)(this.publishEngine.pendingPublishRequestCount > 0);
+        (0, node_opcua_assert_1.assert)((this.publishEngine?.pendingPublishRequestCount || 0) > 0);
         if (!this.publishingEnabled) {
             // no publish to do, except keep alive
             debugLog("    -> no publish to do, except keep alive");
@@ -1153,10 +1171,10 @@ class Subscription extends events_1.EventEmitter {
         this.discardOldSentNotifications();
         // c8 ignore next
         if (doDebug) {
-            debugLog(t(new Date()) + "  " + this._life_time_counter + "/" + this.lifeTimeCount + chalk_1.default.cyan("   Subscription#_tick"), "  processing subscriptionId=", this.id, "hasUncollectedMonitoredItemNotifications = ", this.hasUncollectedMonitoredItemNotifications, " publishingIntervalCount =", this.publishIntervalCount);
+            debugLog(`${t(new Date())}  ${this._life_time_counter}/${this.lifeTimeCount}${chalk_1.default.cyan("   Subscription#_tick")}`, "  processing subscriptionId=", this.id, "hasUncollectedMonitoredItemNotifications = ", this.hasUncollectedMonitoredItemNotifications, " publishingIntervalCount =", this.publishIntervalCount);
         }
         // give a chance to the publish engine to cancel timed out publish requests
-        this.publishEngine._on_tick();
+        this.publishEngine?._on_tick();
         this.publishIntervalCount += 1;
         if (this.state === SubscriptionState.LATE) {
             this.increaseLifeTimeCounter();
@@ -1172,12 +1190,15 @@ class Subscription extends events_1.EventEmitter {
             this.emit("expired");
             // notify new terminated status only when subscription has timeout.
             doDebug && debugLog("adding StatusChangeNotification notification message for BadTimeout subscription = ", this.id);
-            this._addNotificationMessage(new node_opcua_service_subscription_2.StatusChangeNotification({ status: node_opcua_status_code_1.StatusCodes.BadTimeout }));
+            this._addNotificationMessage(new node_opcua_service_subscription_1.StatusChangeNotification({ status: node_opcua_status_code_1.StatusCodes.BadTimeout }));
             // kill timer and delete monitored items and transfer pending notification messages
             this.terminate();
             return;
         }
         const publishEngine = this.publishEngine;
+        if (!publishEngine) {
+            throw new Error("publishEngine is null");
+        }
         // c8 ignore next
         doDebug && debugLog("Subscription#_tick  self._pending_notifications= ", this._pending_notifications.size);
         if (publishEngine.pendingPublishRequestCount === 0 &&
@@ -1214,7 +1235,7 @@ class Subscription extends events_1.EventEmitter {
      */
     _sendKeepAliveResponse() {
         const future_sequence_number = this._get_future_sequence_number();
-        if (this.publishEngine.send_keep_alive_response(this.id, future_sequence_number)) {
+        if (this.publishEngine?.send_keep_alive_response(this.id, future_sequence_number)) {
             this.messageSent = true;
             // c8 ignore next
             doDebug &&
@@ -1277,15 +1298,15 @@ class Subscription extends events_1.EventEmitter {
      */
     _popNotificationToSend() {
         (0, node_opcua_assert_1.assert)(this._pending_notifications.size > 0);
-        const notificationMessage = new node_opcua_service_subscription_2.NotificationMessage({
+        const notificationMessage = new node_opcua_service_subscription_1.NotificationMessage({
             sequenceNumber: 0xffffffff,
             notificationData: [],
             publishTime: new Date()
         }); //
-        const dataChangeNotifications = new node_opcua_service_subscription_2.DataChangeNotification({
+        const dataChangeNotifications = new node_opcua_service_subscription_1.DataChangeNotification({
             monitoredItems: []
         });
-        const eventNotificationList = new node_opcua_service_subscription_2.EventNotificationList({
+        const eventNotificationList = new node_opcua_service_subscription_1.EventNotificationList({
             events: []
         });
         let statusChangeNotification;
@@ -1295,36 +1316,36 @@ class Subscription extends events_1.EventEmitter {
         const m = this.maxNotificationsPerPublish;
         while (i < m && this._pending_notifications.size > 0) {
             if (hasEventFieldList || hasMonitoredItemNotification) {
-                const notification1 = this._pending_notifications.first().notification;
-                if (notification1 instanceof node_opcua_service_subscription_2.StatusChangeNotification) {
+                const notification1 = this._pending_notifications.first()?.notification;
+                if (notification1 instanceof node_opcua_service_subscription_1.StatusChangeNotification) {
                     break;
                 }
             }
-            const notification = this._pending_notifications.shift().notification;
-            if (notification instanceof node_opcua_service_subscription_2.MonitoredItemNotification) {
+            const notification = this._pending_notifications.shift()?.notification;
+            if (notification instanceof node_opcua_service_subscription_1.MonitoredItemNotification) {
                 (0, node_opcua_assert_1.assert)(notification.clientHandle !== 4294967295);
-                dataChangeNotifications.monitoredItems.push(notification);
+                dataChangeNotifications.monitoredItems?.push(notification);
                 hasMonitoredItemNotification = 1;
             }
             else if (notification instanceof node_opcua_types_1.EventFieldList) {
-                eventNotificationList.events.push(notification);
+                eventNotificationList.events?.push(notification);
                 hasEventFieldList = 1;
             }
-            else if (notification instanceof node_opcua_service_subscription_2.StatusChangeNotification) {
+            else if (notification instanceof node_opcua_service_subscription_1.StatusChangeNotification) {
                 // to do
                 statusChangeNotification = notification;
                 break;
             }
             i += 1;
         }
-        if (dataChangeNotifications.monitoredItems.length) {
-            notificationMessage.notificationData.push(dataChangeNotifications);
+        if (dataChangeNotifications.monitoredItems?.length) {
+            notificationMessage.notificationData?.push(dataChangeNotifications);
         }
-        if (eventNotificationList.events.length) {
-            notificationMessage.notificationData.push(eventNotificationList);
+        if (eventNotificationList.events?.length) {
+            notificationMessage.notificationData?.push(eventNotificationList);
         }
         if (statusChangeNotification) {
-            notificationMessage.notificationData.push(statusChangeNotification);
+            notificationMessage.notificationData?.push(statusChangeNotification);
         }
         return notificationMessage;
     }
@@ -1360,7 +1381,7 @@ class Subscription extends events_1.EventEmitter {
     _createMonitoredItemStep2(timestampsToReturn, monitoredItemCreateRequest, node) {
         // note : most of the parameter inconsistencies shall have been handled by the caller
         // any error here will raise an assert here
-        (0, node_opcua_assert_1.assert)(monitoredItemCreateRequest instanceof node_opcua_service_subscription_2.MonitoredItemCreateRequest);
+        (0, node_opcua_assert_1.assert)(monitoredItemCreateRequest instanceof node_opcua_service_subscription_1.MonitoredItemCreateRequest);
         const itemToMonitor = monitoredItemCreateRequest.itemToMonitor;
         // xx check if attribute Id invalid (we only support Value or EventNotifier )
         // xx assert(itemToMonitor.attributeId !== AttributeIds.INVALID);
@@ -1381,7 +1402,7 @@ class Subscription extends events_1.EventEmitter {
         this.globalCounter.totalMonitoredItemCount += 1;
         (0, node_opcua_assert_1.assert)(monitoredItem.clientHandle !== 4294967295);
         const filterResult = _process_filter(node, requestedParameters.filter);
-        const monitoredItemCreateResult = new node_opcua_service_subscription_2.MonitoredItemCreateResult({
+        const monitoredItemCreateResult = new node_opcua_service_subscription_1.MonitoredItemCreateResult({
             filterResult,
             monitoredItemId,
             revisedQueueSize: monitoredItem.queueSize,
@@ -1401,7 +1422,7 @@ class Subscription extends events_1.EventEmitter {
         if (!monitoredItem) {
             return;
         }
-        (0, node_opcua_assert_1.assert)(monitoredItem.monitoringMode === node_opcua_service_subscription_2.MonitoringMode.Invalid);
+        (0, node_opcua_assert_1.assert)(monitoredItem.monitoringMode === node_opcua_service_subscription_1.MonitoringMode.Invalid);
         (0, node_opcua_assert_1.assert)(typeof monitoredItem.samplingFunc === "function", " expecting a sampling function here");
         const monitoringMode = monitoredItemCreateRequest.monitoringMode; // Disabled, Sampling, Reporting
         monitoredItem.setMonitoringMode(monitoringMode);