node-opcua-server 2.53.0 → 2.56.1

package/source/server_publish_engine.ts

@@ -2,8 +2,8 @@
  * @module node-opcua-server
  */
 // tslint:disable:no-console
-import * as chalk from "chalk";
 import { EventEmitter } from "events";
+import * as chalk from "chalk";
 import { partition, sortBy } from "lodash";
 
 import { assert } from "node-opcua-assert";
@@ -25,7 +25,7 @@ function traceLog(...args: [any?, ...any[]]) {
     }
     const a: string[] = args.map((x?: any) => x!);
     a.unshift(chalk.yellow(" TRACE "));
-    debugLog.apply(null, a as [any?, ...any[]]);
+    debugLog(...a);
 }
 
 export interface ServerSidePublishEngineOptions {
@@ -79,7 +79,7 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
     public static transferSubscriptionsToOrphan(
         srcPublishEngine: ServerSidePublishEngine,
         destPublishEngine: ServerSidePublishEngine
-    ) {
+    ): void {
         debugLog(
             chalk.yellow(
                 "ServerSidePublishEngine#transferSubscriptionsToOrphan! " + "start transferring long live subscriptions to orphan"
@@ -117,7 +117,7 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
         destPublishEngine: ServerSidePublishEngine,
         sendInitialValues: boolean
     ): Promise<void> {
-        const srcPublishEngine = (subscription.publishEngine as any) as ServerSidePublishEngine;
+        const srcPublishEngine = subscription.publishEngine as any as ServerSidePublishEngine;
 
         assert(!destPublishEngine.getSubscriptionById(subscription.id));
         assert(srcPublishEngine.getSubscriptionById(subscription.id));
@@ -160,8 +160,8 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
         assert(!srcPublishEngine.getSubscriptionById(subscription.id));
     }
 
-    public maxPublishRequestInQueue: number = 0;
-    public isSessionClosed: boolean = false;
+    public maxPublishRequestInQueue = 0;
+    public isSessionClosed = false;
 
     private _publish_request_queue: PublishData[] = [];
     private _subscriptions: { [key: string]: Subscription };
@@ -197,10 +197,10 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
         let str = "";
         str += `maxPublishRequestInQueue ${this.maxPublishRequestInQueue}\n`;
         str += `subscriptions ${Object.keys(this._subscriptions).join()}\n`;
-        str += `closed subscriptions ${this._closed_subscriptions.map((s)=> s.id).join()}\n`;
-        return str; 
+        str += `closed subscriptions ${this._closed_subscriptions.map((s) => s.id).join()}\n`;
+        return str;
     }
-    public dispose() {
+    public dispose(): void {
         debugLog("ServerSidePublishEngine#dispose");
 
         assert(Object.keys(this._subscriptions).length === 0, "self._subscriptions count!=0");
@@ -271,7 +271,7 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
 
     /**
      */
-    public shutdown() {
+    public shutdown(): void {
         if (this.subscriptionCount !== 0) {
             debugLog(chalk.red("Shutting down pending subscription"));
             this.subscriptions.map((subscription: Subscription) => subscription.terminate());
@@ -316,7 +316,7 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
         return result;
     }
 
-    public _purge_dangling_subscription(subscriptionId: number) {
+    public _purge_dangling_subscription(subscriptionId: number): void {
         this._closed_subscriptions = this._closed_subscriptions.filter((s) => s.id !== subscriptionId);
     }
 
@@ -365,18 +365,18 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
         return this.findLateSubscriptions().length > 0;
     }
 
-    public findLateSubscriptionsSortedByAge() {
+    public findLateSubscriptionsSortedByAge(): Subscription[] {
         let late_subscriptions = this.findLateSubscriptions();
         late_subscriptions = sortBy(late_subscriptions, "timeToExpiration");
 
         return late_subscriptions;
     }
 
-    public cancelPendingPublishRequestBeforeChannelChange() {
+    public cancelPendingPublishRequestBeforeChannelChange(): void {
         this._cancelPendingPublishRequest(StatusCodes.BadSecureChannelClosed);
     }
 
-    public onSessionClose() {
+    public onSessionClose(): void {
         this.isSessionClosed = true;
         this._cancelPendingPublishRequest(StatusCodes.BadSessionClosed);
     }
@@ -384,7 +384,7 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
     /**
      * @private
      */
-    public cancelPendingPublishRequest() {
+    public cancelPendingPublishRequest(): void {
         assert(this.subscriptionCount === 0);
         this._cancelPendingPublishRequest(StatusCodes.BadNoSubscription);
     }
@@ -396,7 +396,10 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
      * @private
      * @internal
      */
-    public _on_PublishRequest(request: PublishRequest, callback?: any) {
+    public _on_PublishRequest(
+        request: PublishRequest,
+        callback?: (request1: PublishRequest, response: PublishResponse) => void
+    ): void {
         callback = callback || dummy_function;
         assert(typeof callback === "function");
 
@@ -425,8 +428,8 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
                 this._publish_request_queue.push(publishData);
 
                 const processed = this._feed_closed_subscription();
-                //xx ( may be subscription has expired by themselve) assert(verif === this._publish_request_queue.length);
-                //xx  ( may be subscription has expired by themselve) assert(processed);
+                //xx ( may be subscription has expired by themselves) assert(verif === this._publish_request_queue.length);
+                //xx  ( may be subscription has expired by themselves) assert(processed);
                 return;
             }
             traceLog("server has received a PublishRequest but has no subscription opened");
@@ -593,7 +596,7 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
         if (this.pendingPublishRequestCount === 0 || subscription.hasPendingNotifications) {
             // we cannot send the keep alive PublishResponse
             traceLog(
-                "send_keep_alive_response  => cannot send keep-aliave  (no PublishRequest left) subscriptionId = ",
+                "send_keep_alive_response  => cannot send keep-alive  (no PublishRequest left) subscriptionId = ",
                 subscriptionId
             );
             return false;
@@ -614,7 +617,7 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
         );
         return true;
     }
-    public _send_response(subscription: Subscription, response: PublishResponse) {
+    public _send_response(subscription: Subscription, response: PublishResponse): void {
         assert(this.pendingPublishRequestCount > 0);
         assert(response.subscriptionId !== 0xffffff);
         const publishData = this._publish_request_queue.shift()!;
@@ -644,7 +647,7 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
         }
     }
 
-    public _send_response_for_request(publishData: PublishData, response: PublishResponse) {
+    public _send_response_for_request(publishData: PublishData, response: PublishResponse): void {
         if (doDebug) {
             debugLog("_send_response_for_request ", response.toString());
         }

package/source/server_publish_engine_for_orphan_subscriptions.ts

@@ -6,7 +6,7 @@ import * as chalk from "chalk";
 
 import { checkDebugFlag, make_debugLog } from "node-opcua-debug";
 
-import { ServerSidePublishEngine } from "./server_publish_engine";
+import { ServerSidePublishEngine, ServerSidePublishEngineOptions } from "./server_publish_engine";
 import { Subscription } from "./server_subscription";
 
 const debugLog = make_debugLog(__filename);
@@ -22,31 +22,31 @@ const doDebug = checkDebugFlag(__filename);
  * @internal
  */
 export class ServerSidePublishEngineForOrphanSubscription extends ServerSidePublishEngine {
-  constructor(options: any) {
-    super(options);
-  }
+    constructor(options: ServerSidePublishEngineOptions) {
+        super(options);
+    }
 
-  public add_subscription(subscription: Subscription): Subscription {
-    debugLog(chalk.bgCyan.yellow.bold(" adding live subscription with id="), subscription.id, " to orphan");
-    super.add_subscription(subscription);
-    // also add an event handler to detected when the subscription has ended
-    // so we can automatically remove it from the orphan table
-    (subscription as any)._expired_func = function (this: Subscription) {
-      debugLog(chalk.bgCyan.yellow(" Removing expired subscription with id="), this.id, " from orphan");
-      // make sure all monitored item have been deleted
-      // Xx subscription.terminate();
-      // xx publish_engine.detach_subscription(subscription);
-      // Xx subscription.dispose();
-    };
-    subscription.on("expired", (subscription as any)._expired_func);
-    return subscription;
-  }
+    public add_subscription(subscription: Subscription): Subscription {
+        debugLog(chalk.bgCyan.yellow.bold(" adding live subscription with id="), subscription.id, " to orphan");
+        super.add_subscription(subscription);
+        // also add an event handler to detected when the subscription has ended
+        // so we can automatically remove it from the orphan table
+        (subscription as any)._expired_func = function (this: Subscription) {
+            debugLog(chalk.bgCyan.yellow(" Removing expired subscription with id="), this.id, " from orphan");
+            // make sure all monitored item have been deleted
+            // Xx subscription.terminate();
+            // xx publish_engine.detach_subscription(subscription);
+            // Xx subscription.dispose();
+        };
+        subscription.on("expired", (subscription as any)._expired_func);
+        return subscription;
+    }
 
-  public detach_subscription(subscription: Subscription) {
-    // un set the event handler
-    super.detach_subscription(subscription);
-    subscription.removeListener("expired", (subscription as any)._expired_func);
-    (subscription as any)._expired_func = null;
-    return subscription;
-  }
+    public detach_subscription(subscription: Subscription): Subscription {
+        // un set the event handler
+        super.detach_subscription(subscription);
+        subscription.removeListener("expired", (subscription as any)._expired_func);
+        (subscription as any)._expired_func = null;
+        return subscription;
+    }
 }

package/source/server_session.ts

@@ -95,13 +95,13 @@ interface SessionSecurityDiagnosticsDataTypeEx extends SessionSecurityDiagnostic
  */
 export class ServerSession extends EventEmitter implements ISubscriber, ISessionBase, IServerSession {
     public static registry = new ObjectRegistry();
-    public static maxPublishRequestInQueue: number = 100;
+    public static maxPublishRequestInQueue = 100;
 
-    public __status: string = "";
+    public __status = "";
     public parent: ServerEngine;
     public authenticationToken: NodeId;
     public nodeId: NodeId;
-    public sessionName: string = "";
+    public sessionName = "";
 
     public publishEngine: ServerSidePublishEngine;
     public sessionObject: any;
@@ -190,12 +190,12 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
         return this.endpoint!;
     }
 
-    public dispose() {
+    public dispose(): void {
         debugLog("ServerSession#dispose()");
 
         assert(!this.sessionObject, " sessionObject has not been cleared !");
 
-        this.parent = (null as any) as ServerEngine;
+        this.parent = null as any as ServerEngine;
         this.authenticationToken = NodeId.nullNodeId;
 
         if (this.publishEngine) {
@@ -215,11 +215,11 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
         ServerSession.registry.unregister(this);
     }
 
-    public get clientConnectionTime() {
+    public get clientConnectionTime(): Date {
         return this.creationDate;
     }
 
-    public get clientLastContactTime() {
+    public get clientLastContactTime(): number {
         return this._watchDogData!.lastSeen;
     }
 
@@ -245,13 +245,12 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
         return this.publishEngine ? this.publishEngine.pendingPublishRequestCount : 0;
     }
 
-    public updateClientLastContactTime() {
-        const session = this;
-        if (session._sessionDiagnostics && session._sessionDiagnostics.clientLastContactTime) {
+    public updateClientLastContactTime(): void {
+        if (this._sessionDiagnostics && this._sessionDiagnostics.clientLastContactTime) {
             const currentTime = new Date();
             // do not record all ticks as this may be overwhelming,
-            if (currentTime.getTime() - 250 >= session._sessionDiagnostics.clientLastContactTime.getTime()) {
-                session._sessionDiagnostics.clientLastContactTime = currentTime;
+            if (currentTime.getTime() - 250 >= this._sessionDiagnostics.clientLastContactTime.getTime()) {
+                this._sessionDiagnostics.clientLastContactTime = currentTime;
             }
         }
     }
@@ -262,14 +261,14 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
      * @param currentTime {DateTime}
      * @private
      */
-    public onClientSeen() {
+    public onClientSeen(): void {
         this.updateClientLastContactTime();
 
         if (this._sessionDiagnostics) {
             // see https://opcfoundation-onlineapplications.org/mantis/view.php?id=4111
-            assert(this._sessionDiagnostics.hasOwnProperty("currentMonitoredItemsCount"));
-            assert(this._sessionDiagnostics.hasOwnProperty("currentSubscriptionsCount"));
-            assert(this._sessionDiagnostics.hasOwnProperty("currentPublishRequestsInQueue"));
+            assert(Object.prototype.hasOwnProperty.call(this._sessionDiagnostics, "currentMonitoredItemsCount"));
+            assert(Object.prototype.hasOwnProperty.call(this._sessionDiagnostics, "currentSubscriptionsCount"));
+            assert(Object.prototype.hasOwnProperty.call(this._sessionDiagnostics, "currentPublishRequestsInQueue"));
 
             // note : https://opcfoundation-onlineapplications.org/mantis/view.php?id=4111
             // sessionDiagnostics extension object uses a different spelling
@@ -286,16 +285,16 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
         }
     }
 
-    public incrementTotalRequestCount() {
+    public incrementTotalRequestCount(): void {
         if (this._sessionDiagnostics && this._sessionDiagnostics.totalRequestCount) {
             this._sessionDiagnostics.totalRequestCount.totalCount += 1;
         }
     }
 
-    public incrementRequestTotalCounter(counterName: string) {
+    public incrementRequestTotalCounter(counterName: string): void {
         if (this._sessionDiagnostics) {
             const propName = lowerFirstLetter(counterName + "Count");
-            if (!this._sessionDiagnostics.hasOwnProperty(propName)) {
+            if (!Object.prototype.hasOwnProperty.call(this._sessionDiagnostics, propName)) {
                 console.log(" cannot find", propName);
                 // xx return;
             } else {
@@ -305,11 +304,11 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
         }
     }
 
-    public incrementRequestErrorCounter(counterName: string) {
+    public incrementRequestErrorCounter(counterName: string): void {
         this.parent?.incrementRejectedRequestsCount();
         if (this._sessionDiagnostics) {
             const propName = lowerFirstLetter(counterName + "Count");
-            if (!this._sessionDiagnostics.hasOwnProperty(propName)) {
+            if (!Object.prototype.hasOwnProperty.call(this._sessionDiagnostics, propName)) {
                 console.log(" cannot find", propName);
                 // xx  return;
             } else {
@@ -352,8 +351,7 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
      * number of monitored items
      */
     public get currentMonitoredItemCount(): number {
-        const self = this;
-        return self.publishEngine ? self.publishEngine.currentMonitoredItemCount : 0;
+        return this.publishEngine ? this.publishEngine.currentMonitoredItemCount : 0;
     }
 
     /**
@@ -382,8 +380,7 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
      * @return {StatusCode}
      */
     public deleteSubscription(subscriptionId: number): StatusCode {
-        const session = this;
-        const subscription = session.getSubscription(subscriptionId);
+        const subscription = this.getSubscription(subscriptionId);
         if (!subscription) {
             return StatusCodes.BadSubscriptionIdInvalid;
         }
@@ -391,8 +388,8 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
         // xx this.publishEngine.remove_subscription(subscription);
         subscription.terminate();
 
-        if (session.currentSubscriptionCount === 0) {
-            const local_publishEngine = session.publishEngine;
+        if (this.currentSubscriptionCount === 0) {
+            const local_publishEngine = this.publishEngine;
             local_publishEngine.cancelPendingPublishRequest();
         }
         return StatusCodes.Good;
@@ -452,7 +449,7 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
 
             assert(this.publishEngine.subscriptionCount === 0);
             this.publishEngine.dispose();
-            this.publishEngine = (null as any) as ServerSidePublishEngine;
+            this.publishEngine = null as any as ServerSidePublishEngine;
         }
 
         this._removeSessionObjectFromAddressSpace();
@@ -461,9 +458,8 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
         assert(!this.sessionObject, "ServerSession#_removeSessionObjectFromAddressSpace must be called");
     }
 
-    public registerNode(nodeId: NodeId) {
+    public registerNode(nodeId: NodeId): NodeId {
         assert(nodeId instanceof NodeId);
-        const session = this;
 
         if (nodeId.namespace === 0 && nodeId.identifierType === NodeIdType.NUMERIC) {
             return nodeId;
@@ -471,22 +467,22 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
 
         const key = nodeId.toString();
 
-        const registeredNode = session._registeredNodes[key];
+        const registeredNode = this._registeredNodes[key];
         if (registeredNode) {
             // already registered
             return registeredNode;
         }
 
-        const node = session.addressSpace!.findNode(nodeId);
+        const node = this.addressSpace!.findNode(nodeId);
         if (!node) {
             return nodeId;
         }
 
-        session._registeredNodesCounter += 1;
+        this._registeredNodesCounter += 1;
 
-        const aliasNodeId = makeNodeId(session._registeredNodesCounter, registeredNodeNameSpace);
-        session._registeredNodes[key] = aliasNodeId;
-        session._registeredNodesInv[aliasNodeId.toString()] = node;
+        const aliasNodeId = makeNodeId(this._registeredNodesCounter, registeredNodeNameSpace);
+        this._registeredNodes[key] = aliasNodeId;
+        this._registeredNodesInv[aliasNodeId.toString()] = node;
         return aliasNodeId;
     }
 
@@ -495,14 +491,13 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
         if (aliasNodeId.namespace !== registeredNodeNameSpace) {
             return; // not a registered Node
         }
-        const session = this;
 
-        const node = session._registeredNodesInv[aliasNodeId.toString()];
+        const node = this._registeredNodesInv[aliasNodeId.toString()];
         if (!node) {
             return;
         }
-        session._registeredNodesInv[aliasNodeId.toString()] = null;
-        session._registeredNodes[node.nodeId.toString()] = null;
+        this._registeredNodesInv[aliasNodeId.toString()] = null;
+        this._registeredNodes[node.nodeId.toString()] = null;
     }
 
     public resolveRegisteredNode(aliasNodeId: NodeId): NodeId {
@@ -519,7 +514,7 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
     /**
      * true if the underlying channel has been closed or aborted...
      */
-    public get aborted() {
+    public get aborted(): boolean {
         if (!this.channel) {
             return true;
         }
@@ -528,7 +523,7 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
 
     public createSubscription(parameters: CreateSubscriptionRequestOptions): Subscription {
         const subscription = this.parent._createSubscriptionOnSession(this, parameters);
-        assert(!parameters.hasOwnProperty("id"));
+        assert(!Object.prototype.hasOwnProperty.call(parameters, "id"));
         this.assignSubscription(subscription);
         assert(subscription.$session === this);
         assert(subscription.sessionId instanceof NodeId);
@@ -536,12 +531,12 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
         return subscription;
     }
 
-    public _attach_channel(channel: ServerSecureChannelLayer) {
+    public _attach_channel(channel: ServerSecureChannelLayer): void {
         assert(this.nonce && this.nonce instanceof Buffer);
         this.channel = channel;
         this.channelId = channel.channelId;
         const key = this.authenticationToken.toString();
-        assert(!channel.sessionTokens.hasOwnProperty(key), "channel has already a session");
+        assert(!Object.prototype.hasOwnProperty.call(channel.sessionTokens, key), "channel has already a session");
 
         channel.sessionTokens[key] = this;
 
@@ -550,7 +545,7 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
         channel.on("abort", this.channel_abort_event_handler);
     }
 
-    public _detach_channel() {
+    public _detach_channel(): void {
         const channel = this.channel;
         if (!channel) {
             throw new Error("expecting a valid channel");
@@ -558,7 +553,7 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
         assert(this.nonce && this.nonce instanceof Buffer);
         assert(this.authenticationToken);
         const key = this.authenticationToken.toString();
-        assert(channel.sessionTokens.hasOwnProperty(key));
+        assert(Object.prototype.hasOwnProperty.call(channel.sessionTokens, key));
         assert(this.channel);
         assert(typeof this.channel_abort_event_handler === "function");
         channel.removeListener("abort", this.channel_abort_event_handler);
@@ -568,7 +563,7 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
         this.channelId = undefined;
     }
 
-    public _exposeSubscriptionDiagnostics(subscription: Subscription) {
+    public _exposeSubscriptionDiagnostics(subscription: Subscription): void {
         debugLog("ServerSession#_exposeSubscriptionDiagnostics");
         assert(subscription.$session === this);
         const subscriptionDiagnosticsArray = this._getSubscriptionDiagnosticsArray();
@@ -581,7 +576,7 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
         }
     }
 
-    public _unexposeSubscriptionDiagnostics(subscription: Subscription) {
+    public _unexposeSubscriptionDiagnostics(subscription: Subscription): void {
         const subscriptionDiagnosticsArray = this._getSubscriptionDiagnosticsArray();
         const subscriptionDiagnostics = subscription.subscriptionDiagnostics;
         assert(subscriptionDiagnostics instanceof SubscriptionDiagnosticsDataType);
@@ -597,7 +592,7 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
      * used as a callback for the Watchdog
      * @private
      */
-    public watchdogReset() {
+    public watchdogReset(): void {
         debugLog("Session#watchdogReset: the server session has expired and must be removed from the server");
         // the server session has expired and must be removed from the server
         this.emit("timeout");

package/source/server_subscription.ts

@@ -3,9 +3,8 @@
  */
 // tslint:disable:no-console
 
-import { Queue } from "./queue";
-import * as chalk from "chalk";
 import { EventEmitter } from "events";
+import * as chalk from "chalk";
 
 import { AddressSpace, BaseNode, Duration, UAObjectType } from "node-opcua-address-space";
 import { checkSelectClauses } from "node-opcua-address-space";
@@ -35,6 +34,7 @@ import {
 } from "node-opcua-service-subscription";
 import { StatusCode, StatusCodes } from "node-opcua-status-code";
 import { AggregateFilterResult, ContentFilterResult, EventFieldList, EventFilterResult, NotificationData } from "node-opcua-types";
+import { Queue } from "./queue";
 
 import { MonitoredItem, MonitoredItemOptions, QueueItem } from "./monitored_item";
 import { ServerSession } from "./server_session";
@@ -439,12 +439,12 @@ export type DeleteMonitoredItemHook = (subscription: Subscription, monitoredItem
  * The Subscription class used in the OPCUA server side.
  */
 export class Subscription extends EventEmitter {
-    public static minimumPublishingInterval: number = 50; // fastest possible
-    public static defaultPublishingInterval: number = 1000; // one second
+    public static minimumPublishingInterval = 50; // fastest possible
+    public static defaultPublishingInterval = 1000; // one second
     public static maximumPublishingInterval: number = 1000 * 60 * 60 * 24 * 15; // 15 days
-    public static maxNotificationPerPublishHighLimit: number = 1000;
-    public static maxMonitoredItemCount: number = 20000;
-        
+    public static maxNotificationPerPublishHighLimit = 1000;
+    public static maxMonitoredItemCount = 20000;
+
     public static registry = new ObjectRegistry();
 
     public sessionId: NodeId;
@@ -499,13 +499,13 @@ export class Subscription extends EventEmitter {
     public $session?: ServerSession;
 
     private _life_time_counter: number;
-    private _keep_alive_counter: number = 0;
+    private _keep_alive_counter = 0;
     private _pending_notifications: Queue<InternalNotification>;
     private _sent_notification_messages: NotificationMessage[];
     private readonly _sequence_number_generator: SequenceNumberGenerator;
     private readonly monitoredItems: { [key: number]: MonitoredItem };
     private timerId: any;
-    private _hasUncollectedMonitoredItemNotifications: boolean = false;
+    private _hasUncollectedMonitoredItemNotifications = false;
 
     constructor(options: SubscriptionOptions) {
         super();
@@ -649,14 +649,14 @@ export class Subscription extends EventEmitter {
      * the CreateSubscription Service( 5.13.2).
      * @private
      */
-    public resetLifeTimeCounter() {
+    public resetLifeTimeCounter(): void {
         this._life_time_counter = 0;
     }
 
     /**
      * @private
      */
-    public increaseLifeTimeCounter() {
+    public increaseLifeTimeCounter(): void {
         this._life_time_counter += 1;
     }
 
@@ -685,7 +685,7 @@ export class Subscription extends EventEmitter {
      * Calling this method will also remove any monitored items.
      *
      */
-    public terminate() {
+    public terminate(): void {
         assert(arguments.length === 0);
         debugLog("Subscription#terminate status", SubscriptionState[this.state]);
 
@@ -774,7 +774,7 @@ export class Subscription extends EventEmitter {
             removeResults
         };
     }
-    public dispose() {
+    public dispose(): void {
         if (doDebug) {
             debugLog("Subscription#dispose", this.id, this.monitoredItemCount);
         }
@@ -830,7 +830,7 @@ export class Subscription extends EventEmitter {
     /**
      * @internal
      */
-    public _flushSentNotifications() {
+    public _flushSentNotifications(): NotificationMessage[] {
         const tmp = this._sent_notification_messages;
         this._sent_notification_messages = [];
         return tmp;
@@ -864,7 +864,7 @@ export class Subscription extends EventEmitter {
      *  - otherwise the sampling is adjusted
      * @private
      */
-    public adjustSamplingInterval(samplingInterval: number, node: BaseNode) {
+    public adjustSamplingInterval(samplingInterval: number, node: BaseNode): number {
         if (samplingInterval < 0) {
             // - The value -1 indicates that the default sampling interval defined by the publishing
             //   interval of the Subscription is requested.
@@ -1034,7 +1034,7 @@ export class Subscription extends EventEmitter {
      */
     public removeMonitoredItem(monitoredItemId: number): StatusCode {
         debugLog("Removing monitoredIem ", monitoredItemId);
-        if (!this.monitoredItems.hasOwnProperty(monitoredItemId.toString())) {
+        if (!Object.prototype.hasOwnProperty.call(this.monitoredItems, monitoredItemId.toString())) {
             return StatusCodes.BadMonitoredItemIdInvalid;
         }
 
@@ -1079,7 +1079,7 @@ export class Subscription extends EventEmitter {
         return false;
     }
 
-    public get subscriptionId() {
+    public get subscriptionId(): number {
         return this.id;
     }
 
@@ -1092,8 +1092,8 @@ export class Subscription extends EventEmitter {
      * returns true if the notification has expired
      * @param notification
      */
-    public notificationHasExpired(notification: any): boolean {
-        assert(notification.hasOwnProperty("start_tick"));
+    public notificationHasExpired(notification: { start_tick: number }): boolean {
+        assert(Object.prototype.hasOwnProperty.call(notification, "start_tick"));
         assert(isFinite(notification.start_tick + this.maxKeepAliveCount));
         return notification.start_tick + this.maxKeepAliveCount < this.publishIntervalCount;
     }
@@ -1213,7 +1213,7 @@ export class Subscription extends EventEmitter {
      *
      * @private
      */
-    public resetLifeTimeAndKeepAliveCounters() {
+    public resetLifeTimeAndKeepAliveCounters(): void {
         this.resetLifeTimeCounter();
         this.resetKeepAliveCounter();
     }
@@ -1260,8 +1260,8 @@ export class Subscription extends EventEmitter {
         // Update counters ....
         this._updateCounters(notificationMessage);
 
-        assert(notificationMessage.hasOwnProperty("sequenceNumber"));
-        assert(notificationMessage.hasOwnProperty("notificationData"));
+        assert(Object.prototype.hasOwnProperty.call(notificationMessage, "sequenceNumber"));
+        assert(Object.prototype.hasOwnProperty.call(notificationMessage, "notificationData"));
         // update diagnostics
         this.subscriptionDiagnostics.publishRequestCount += 1;
 
@@ -1310,7 +1310,7 @@ export class Subscription extends EventEmitter {
         }
     }
 
-    public process_subscription() {
+    public process_subscription(): void {
         assert(this.publishEngine!.pendingPublishRequestCount > 0);
 
         if (!this.publishingEnabled) {