node-opcua-server 2.149.0 → 2.151.0

package/source/monitored_item.ts

@@ -4,7 +4,7 @@
 import { EventEmitter } from "events";
 import chalk from "chalk";
 import { assert } from "node-opcua-assert";
-import { ISessionContext } from "node-opcua-address-space-base";
+import { ISessionContext, UAMethod, UAObject } from "node-opcua-address-space-base";
 import { BaseNode, IEventData, makeAttributeEventName, SessionContext, UAVariable, AddressSpace } from "node-opcua-address-space";
 import { extractEventFields } from "node-opcua-service-filter";
 import { DateTime, UInt32 } from "node-opcua-basic-types";
@@ -56,6 +56,7 @@ import { appendToTimer, removeFromTimer } from "./node_sampler";
 import { validateFilter } from "./validate_filter";
 import { checkWhereClauseOnAdressSpace as checkWhereClauseOnAddressSpace } from "./filter/check_where_clause_on_address_space";
 import { SamplingFunc } from "./sampling_func";
+import { MonitoredItemBase } from "./server_subscription";
 
 const errorLog = make_errorLog(__filename);
 
@@ -374,12 +375,12 @@ const badDataUnavailable = new DataValue({ statusCode: StatusCodes.BadDataUnavai
  * - It is up to the  event receiver to call {{#crossLink "MonitoredItem/recordValue:method"}}{{/crossLink}}.
  *
  */
-export class MonitoredItem extends EventEmitter {
-    public get node(): BaseNode | null {
+export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
+    public get node(): UAVariable | UAObject | UAMethod |null {
         return this._node;
     }
 
-    public set node(someNode: BaseNode | null) {
+    public set node(someNode: UAVariable | UAObject | UAMethod | null) {
         throw new Error("Unexpected way to set node");
     }
 
@@ -403,7 +404,7 @@ export class MonitoredItem extends EventEmitter {
     public _samplingId?: NodeJS.Timeout | string;
     public samplingFunc: SamplingFunc | null = null;
 
-    private _node: BaseNode | null;
+    private _node: UAVariable | UAObject | UAMethod | null;
     public queue: QueueItem[];
     private _semantic_version: number;
     private _is_sampling = false;
@@ -455,12 +456,12 @@ export class MonitoredItem extends EventEmitter {
         MonitoredItem.registry.register(this);
     }
 
-    public setNode(node: BaseNode): void {
+    public setNode(node: UAVariable | UAObject | UAMethod): void {
         assert(!this.node || this.node === node, "node already set");
         this._node = node;
         this._semantic_version = (node as any).semantic_version;
         this._on_node_disposed_listener = () => this._on_node_disposed(this._node!);
-        this._node.on("dispose", this._on_node_disposed_listener);
+        (this._node as BaseNode).on("dispose", this._on_node_disposed_listener);
     }
 
     public setMonitoringMode(monitoringMode: MonitoringMode): void {
@@ -1096,7 +1097,9 @@ export class MonitoredItem extends EventEmitter {
             if (!this._on_opcua_event_received_callback) {
                 // we are monitoring OPCUA Event
                 this._on_opcua_event_received_callback = this._on_opcua_event.bind(this);
-                this.node.on("event", this._on_opcua_event_received_callback);
+                if (this.node && this.node.nodeClass == NodeClass.Object) {
+                    this.node.on("event", this._on_opcua_event_received_callback);
+                }
             }
             return;
         }
@@ -1108,7 +1111,7 @@ export class MonitoredItem extends EventEmitter {
             if (!this._attribute_changed_callback) {
                 this._attribute_changed_callback = this._on_value_changed.bind(this);
                 const event_name = makeAttributeEventName(this.itemToMonitor.attributeId);
-                this.node.on(event_name, this._attribute_changed_callback);
+                (this.node as BaseNode).on(event_name, this._attribute_changed_callback);
             }
 
             if (recordInitialValue) {
@@ -1126,8 +1129,10 @@ export class MonitoredItem extends EventEmitter {
                 assert(!this._semantic_changed_callback);
                 this._value_changed_callback = this._on_value_changed.bind(this);
                 this._semantic_changed_callback = this._on_semantic_changed.bind(this);
-                this.node.on("value_changed", this._value_changed_callback);
-                this.node.on("semantic_changed", this._semantic_changed_callback);
+                if (this.node.nodeClass == NodeClass.Variable) {
+                    this.node.on("value_changed", this._value_changed_callback);
+                    this.node.on("semantic_changed", this._semantic_changed_callback);
+                } 
             }
 
             // initiate first read

package/source/opcua_server.ts

@@ -3620,10 +3620,17 @@ export class OPCUAServer extends OPCUABaseServer {
     }
 }
 
-const userIdentityTokenPasswordRemoved = (userIdentityToken: any) => {
-    const a = userIdentityToken.clone();
-    // remove password
-    a.password = "*************";
+const userIdentityTokenPasswordRemoved = (userIdentityToken?: UserIdentityToken): UserIdentityToken => {
+    if (!userIdentityToken) return new AnonymousIdentityToken();
+    const a: UserIdentityToken  = userIdentityToken.clone();
+    // For Username/Password tokens the password shall not be included.
+    if (a instanceof UserNameIdentityToken) {
+        // remove password
+        a.password = Buffer.from("*************","ascii");
+    }
+    // if (a instanceof X509IdentityToken) {
+    //     a.certificateData = Buffer.alloc(0);
+    // }
     return a;
 };
 

package/source/server_engine.ts

@@ -574,6 +574,7 @@ export class ServerEngine extends EventEmitter implements IAddressSpaceAccessor
         for (const task of this._shutdownTasks) {
             await task.call(this);
         }
+        this.setServerState(ServerState.Invalid);
 
         this.dispose();
     }

package/source/server_subscription.ts

@@ -13,7 +13,10 @@ import {
     Duration,
     UAObjectType,
     ISessionContext,
-    IAddressSpace
+    IAddressSpace,
+    UAVariable,
+    UAObject,
+    UAMethod
 } from "node-opcua-address-space";
 import { assert } from "node-opcua-assert";
 import { Byte, UInt32 } from "node-opcua-basic-types";
@@ -40,7 +43,7 @@ import {
     MonitoredItemCreateRequest
 } from "node-opcua-service-subscription";
 import { StatusCode, StatusCodes } from "node-opcua-status-code";
-import { AggregateFilterResult, ContentFilterResult, EventFieldList, EventFilterResult, NotificationData } from "node-opcua-types";
+import { AggregateFilterResult, ContentFilterResult, EventFieldList, EventFilterResult, MonitoringFilter, NotificationData } from "node-opcua-types";
 import { Queue } from "./queue";
 
 import { MonitoredItem, MonitoredItemOptions, QueueItem } from "./monitored_item";
@@ -465,7 +468,14 @@ export interface InternalCreateMonitoredItemResult {
 }
 
 export interface MonitoredItemBase {
-    node: any | null;
+    node: UAVariable | UAObject | UAMethod | null;
+    // from monitoring parameters
+    filter: MonitoringFilter | null;
+    monitoringMode: MonitoringMode;
+    timestampsToReturn: TimestampsToReturn;
+    discardOldest: boolean;
+    queueSize: number;
+    clientHandle: UInt32;
 }
 export type CreateMonitoredItemHook = (subscription: Subscription, monitoredItem: MonitoredItemBase) => Promise<StatusCode>;
 export type DeleteMonitoredItemHook = (subscription: Subscription, monitoredItem: MonitoredItemBase) => Promise<StatusCode>;
@@ -1030,8 +1040,8 @@ export class Subscription extends EventEmitter {
 
         const itemToMonitor = monitoredItemCreateRequest.itemToMonitor;
 
-        const node = addressSpace.findNode(itemToMonitor.nodeId);
-        if (!node) {
+        const node = addressSpace.findNode(itemToMonitor.nodeId) as UAObject | UAVariable | UAMethod;
+        if (!node || (node.nodeClass !== NodeClass.Variable && node.nodeClass !== NodeClass.Object && node.nodeClass !== NodeClass.Method)) {
             return handle_error(StatusCodes.BadNodeIdUnknown);
         }