node-opcua-server 2.111.0 → 2.113.0

package/source/monitored_item.ts

@@ -18,7 +18,7 @@ import {
     coerceTimestampsToReturn,
     sameStatusCode
 } from "node-opcua-data-value";
-import { checkDebugFlag, make_debugLog, make_warningLog } from "node-opcua-debug";
+import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
 import { ExtensionObject } from "node-opcua-extension-object";
 import { NodeId } from "node-opcua-nodeid";
 import { NumericalRange0, NumericRange } from "node-opcua-numeric-range";
@@ -57,6 +57,8 @@ import { validateFilter } from "./validate_filter";
 import { checkWhereClauseOnAdressSpace as checkWhereClauseOnAddressSpace } from "./filter/check_where_clause_on_address_space";
 import { SamplingFunc } from "./sampling_func";
 
+const errorLog = make_errorLog(__filename);
+
 export type QueueItem = MonitoredItemNotification | EventFieldList;
 
 const defaultItemToMonitor: ReadValueIdOptions = new ReadValueId({
@@ -163,7 +165,7 @@ function valueHasChanged(
                     rangeVariant.value as PseudoRange
                 );
             } else {
-                console.log("EURange is not of type Variable");
+                errorLog("EURange is not of type Variable");
             }
             return true;
         }
@@ -262,7 +264,7 @@ function safeGuardVerify(monitoredItem: MonitoredItem) {
     if ((monitoredItem as any)._$safeGuard) {
         const verif = s(monitoredItem.oldDataValue|| "");
         if (verif !== (monitoredItem as any)._$safeGuard) {
-            console.log(verif, (monitoredItem as any)._$safeGuard);
+            errorLog(verif, (monitoredItem as any)._$safeGuard);
             throw new Error("Internal error: DataValue has been altereed !!!");
         }
     }
@@ -443,6 +445,7 @@ export class MonitoredItem extends EventEmitter {
         this._node = null;
         this._semantic_version = 0;
 
+        // istanbul ignore next
         if (doDebug) {
             debugLog("Monitoring ", options.itemToMonitor.toString());
         }
@@ -504,6 +507,7 @@ export class MonitoredItem extends EventEmitter {
     }
 
     public dispose(): void {
+        // istanbul ignore next
         if (doDebug) {
             debugLog("DISPOSING MONITORED ITEM", this._node!.nodeId.toString());
         }
@@ -595,12 +599,7 @@ export class MonitoredItem extends EventEmitter {
 
         const hasSemanticChanged = this.node && (this.node as any).semantic_version !== this._semantic_version;
 
-        // xx   console.log("`\n----------------------------",skipChangeTest,this.clientHandle,
-        //             this.node.listenerCount("value_changed"),this.node.nodeId.toString());
-        // xx   console.log("events ---- ",this.node.eventNames().join("-"));
-        // xx    console.log("indexRange = ",indexRange ? indexRange.toString() :"");
-        // xx    console.log("this.itemToMonitor.indexRange = ",this.itemToMonitor.indexRange.toString());
-
+       
         if (!hasSemanticChanged && indexRange && this.itemToMonitor.indexRange) {
             // we just ignore changes that do not fall within our range
             // ( unless semantic bit has changed )
@@ -885,7 +884,6 @@ export class MonitoredItem extends EventEmitter {
 
                 return;
             }
-            // xx console.log("xxxx ON SAMPLING");
             assert(!this._is_sampling, "sampling func shall not be re-entrant !! fix it");
 
             // istanbul ignore next
@@ -903,7 +901,7 @@ export class MonitoredItem extends EventEmitter {
                 }
                 // istanbull ignore next
                 if (err) {
-                    console.log(" SAMPLING ERROR =>", err);
+                    errorLog(" SAMPLING ERROR =>", err);
                 } else {
                     // only record value if source timestamp is newer
                     // xx if (newDataValue && isSourceNewerThan(newDataValue, this.oldDataValue)) {
@@ -1001,10 +999,10 @@ export class MonitoredItem extends EventEmitter {
 
         // istanbul ignore next
         if (doDebug) {
-            console.log(" RECEIVED INTERNAL EVENT THAT WE ARE MONITORING");
-            console.log(this.filter ? this.filter.toString() : "no filter");
+            debugLog(" RECEIVED INTERNAL EVENT THAT WE ARE MONITORING");
+            debugLog(this.filter ? this.filter.toString() : "no filter");
             eventFields.forEach((e: any) => {
-                console.log(e.toString());
+                debugLog(e.toString());
             });
         }
 
@@ -1173,11 +1171,10 @@ export class MonitoredItem extends EventEmitter {
             assert(sameStatusCode(notification.value.statusCode, StatusCodes.GoodWithOverflowBit));
             assert(notification.value.statusCode.hasOverflowBit);
         }
-        // console.log(chalk.cyan("Setting Over"), !!this.$subscription, !!this.$subscription!.subscriptionDiagnostics);
         if (this.$subscription && this.$subscription.subscriptionDiagnostics) {
             this.$subscription.subscriptionDiagnostics.monitoringQueueOverflowCount++;
         }
-        // to do eventQueueOverFlowCount
+        // to do: eventQueueOverFlowCount
     }
 
     private _enqueue_notification(notification: QueueItem) {
@@ -1313,6 +1310,7 @@ export class MonitoredItem extends EventEmitter {
     }
 
     private _enqueue_event(eventFields: any[]) {
+        // istanbul ignore next
         if (doDebug) {
             debugLog(" MonitoredItem#_enqueue_event");
         }
@@ -1355,7 +1353,6 @@ export class MonitoredItem extends EventEmitter {
                 this._on_sampling_timer();
             }, this.samplingInterval);
         }
-        // xx console.log("MonitoredItem#_set_timer",this._samplingId);
     }
 
     private _adjust_queue_to_match_new_queue_size() {

package/source/node_sampler.ts

@@ -55,6 +55,7 @@ export function appendToTimer(monitoredItem: MonitoredItem): string {
                     counter++;
                 }
             }
+            // istanbul ignore next
             if (doDebug) {
                 const elapsed = hrtime(start);
                 debugLog(

package/source/opcua_server.ts

@@ -636,10 +636,18 @@ function validate_security_endpoint(
     //             The Server uses this information for diagnostics and to determine the set of
     //             EndpointDescriptions to return in the response.
     // ToDo: check endpointUrl validity and emit an AuditUrlMismatchEventType event if not
+    
+    // sometime endpoints have a extra leading "/" that can be ignored
+    // don't be too harsh.
+    if (endpoints.length === 0 && request.endpointUrl?.endsWith("/")) {
+         endpoints = server._get_endpoints(request.endpointUrl.slice(0, -1));   
+    }
+
     if (endpoints.length === 0) {
         // we have a UrlMismatch here
         const ua_server = server.engine.addressSpace!.rootFolder.objects.server;
-        errorLog("Cannot find suitable endpoints in available endpoints. endpointUri =", request.endpointUrl);
+        warningLog("Cannot find suitable endpoints in available endpoints. endpointUri =", request.endpointUrl);
+        // e
         ua_server.raiseEvent("AuditUrlMismatchEventType", {
             endpointUrl: { dataType: DataType.String, value: request.endpointUrl }
         });
@@ -899,6 +907,7 @@ export interface OPCUAServerOptions extends OPCUABaseServerOptions, OPCUAServerE
     onDeleteMonitoredItem?: DeleteMonitoredItemHook;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export interface OPCUAServer {
     /**
      *
@@ -2659,7 +2668,6 @@ export class OPCUAServer extends OPCUABaseServer {
 
                 // ask for a refresh of asynchronous variables
                 this.engine.refreshValues(request.nodesToRead, request.maxAge, (err?: Error | null) => {
-              
                     this.engine.read(context, request).then((results) => {
                         assert(results[0].schema.name === "DataValue");
                         assert(results.length === request.nodesToRead!.length);
@@ -3797,6 +3805,7 @@ export interface OPCUAServer {
     raiseEvent(eventType: "AuditCertificateMismatchEventType", options: RaiseAuditCertificateMismatchEventData): void;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export interface OPCUAServer extends EventEmitter {
     on(event: "create_session", eventHandler: (session: ServerSession) => void): this;
 

package/source/server_engine.ts

@@ -1552,7 +1552,7 @@ export class ServerEngine extends EventEmitter implements IAddressSpaceAccessor
 
         // now check that new session has sufficient right
         // if (session.authenticationToken.toString() !== subscription.authenticationToken.toString()) {
-        //     console.log("ServerEngine#transferSubscription => BadUserAccessDenied");
+        //     warningLog("ServerEngine#transferSubscription => BadUserAccessDenied");
         //     return new TransferResult({ statusCode: StatusCodes.BadUserAccessDenied });
         // }
         if ((session.publishEngine as any) === subscription.publishEngine) {
@@ -1717,7 +1717,7 @@ export class ServerEngine extends EventEmitter implements IAddressSpaceAccessor
                 addElement(subscriptionDiagnostics, subscriptionDiagnosticsArray);
             }
         } catch (err) {
-            console.log("err", err);
+            errorLog("_exposeSubscriptionDiagnostics err", err);
         }
     }
 

package/source/server_publish_engine.ts

@@ -651,6 +651,7 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
 
         const invalid_published_request = parts[0];
         for (const publishData of invalid_published_request) {
+            // istanbul ignore next
             if (doDebug) {
                 debugLog(chalk.cyan(" CANCELING TIMEOUT PUBLISH REQUEST "));
             }
@@ -662,6 +663,7 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
         publishData.callback(publishData.request, response);
     }
     public _send_valid_response_for_request(publishData: PublishData, response: PublishResponse): void {
+        // istanbul ignore next
         if (doDebug) {
             debugLog("_send_response_for_request ", response.toString());
         }

package/source/server_session.ts

@@ -901,6 +901,7 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
      */
     private _getSubscriptionDiagnosticsArray() {
         if (!this.addressSpace) {
+            // istanbul ignore next
             if (doDebug) {
                 console.warn("ServerSession#_getSubscriptionDiagnosticsArray : no addressSpace");
             }

package/source/server_subscription.ts

@@ -853,6 +853,7 @@ export class Subscription extends EventEmitter {
         };
     }
     public dispose(): void {
+        // istanbul ignore next
         if (doDebug) {
             debugLog("Subscription#dispose", this.id, this.monitoredItemCount);
         }
@@ -1201,11 +1202,13 @@ export class Subscription extends EventEmitter {
         });
 
         if (foundIndex === -1) {
+            // istanbul ignore next
             if (doDebug) {
                 debugLog(chalk.red("acknowledging sequence FAILED !!! "), chalk.cyan(sequenceNumber.toString()));
             }
             return StatusCodes.BadSequenceNumberUnknown;
         } else {
+            // istanbul ignore next
             if (doDebug) {
                 debugLog(chalk.yellow("acknowledging sequence "), chalk.cyan(sequenceNumber.toString()));
             }
@@ -1377,6 +1380,8 @@ export class Subscription extends EventEmitter {
 
         this.resetLifeTimeAndKeepAliveCounters();
 
+        
+        // istanbul ignore next
         if (doDebug) {
             debugLog(
                 "Subscription sending a notificationMessage subscriptionId=",

package/source/validate_filter.ts

@@ -13,6 +13,9 @@ import { DeadbandType } from "node-opcua-service-subscription";
 import { StatusCode, StatusCodes } from "node-opcua-status-code";
 import { ReadValueIdOptions } from "node-opcua-types";
 import { DataType } from "node-opcua-basic-types";
+import { make_warningLog } from "node-opcua-debug";
+
+const warningLog = make_warningLog(__filename);
 
 function isNumberDataType(node: UAVariable): boolean {
 
@@ -60,8 +63,7 @@ function __validateDataChangeFilter(filter: DataChangeFilter, itemToMonitor: Rea
 
         // node must also have a valid euRange
         if (!node.getChildByName("EURange", 0)) {
-            // tslint:disable:no-console
-            console.log(" node has no euRange ! Dead band Percent cannot be used on node " + node.nodeId.toString());
+            warningLog(" node has no euRange ! Dead band Percent cannot be used on node " + node.nodeId.toString());
             return StatusCodes.BadMonitoredItemFilterUnsupported;
         }
     }