node-opcua-server 2.163.0 → 2.164.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-server",
-    "version": "2.163.0",
+    "version": "2.164.2",
     "description": "pure nodejs OPCUA SDK - module server",
     "scripts": {
         "build": "tsc -b",
@@ -12,61 +12,61 @@
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "dependencies": {
-        "@ster5/global-mutex": "^2.0.0",
+        "@ster5/global-mutex": "^3.2.2",
         "@types/async": "3.2.25",
-        "@types/lodash": "4.17.23",
+        "@types/lodash": "4.17.24",
         "async": "^3.2.6",
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
         "lodash": "4.17.23",
-        "node-opcua-address-space": "2.163.0",
-        "node-opcua-address-space-base": "2.163.0",
-        "node-opcua-assert": "2.157.0",
-        "node-opcua-basic-types": "2.162.0",
-        "node-opcua-binary-stream": "2.162.0",
-        "node-opcua-certificate-manager": "2.162.0",
-        "node-opcua-client": "2.163.0",
-        "node-opcua-common": "2.163.0",
+        "node-opcua-address-space": "2.164.2",
+        "node-opcua-address-space-base": "2.164.0",
+        "node-opcua-assert": "2.164.0",
+        "node-opcua-basic-types": "2.164.0",
+        "node-opcua-binary-stream": "2.164.0",
+        "node-opcua-certificate-manager": "2.164.2",
+        "node-opcua-client": "2.164.2",
+        "node-opcua-common": "2.164.0",
         "node-opcua-constants": "2.157.0",
-        "node-opcua-crypto": "4.16.1",
-        "node-opcua-data-model": "2.163.0",
-        "node-opcua-data-value": "2.163.0",
-        "node-opcua-date-time": "2.162.0",
-        "node-opcua-debug": "2.157.0",
-        "node-opcua-extension-object": "2.163.0",
-        "node-opcua-factory": "2.163.0",
-        "node-opcua-hostname": "2.157.0",
-        "node-opcua-nodeid": "2.157.0",
-        "node-opcua-nodesets": "2.162.0",
-        "node-opcua-numeric-range": "2.163.0",
-        "node-opcua-object-registry": "2.157.0",
-        "node-opcua-pki": "5.7.0",
-        "node-opcua-secure-channel": "2.163.0",
-        "node-opcua-service-browse": "2.163.0",
-        "node-opcua-service-call": "2.163.0",
-        "node-opcua-service-discovery": "2.163.0",
-        "node-opcua-service-endpoints": "2.163.0",
-        "node-opcua-service-filter": "2.163.0",
-        "node-opcua-service-history": "2.163.0",
-        "node-opcua-service-node-management": "2.163.0",
-        "node-opcua-service-query": "2.163.0",
-        "node-opcua-service-read": "2.163.0",
-        "node-opcua-service-register-node": "2.163.0",
-        "node-opcua-service-secure-channel": "2.163.0",
-        "node-opcua-service-session": "2.163.0",
-        "node-opcua-service-subscription": "2.163.0",
-        "node-opcua-service-translate-browse-path": "2.163.0",
-        "node-opcua-service-write": "2.163.0",
-        "node-opcua-status-code": "2.162.0",
-        "node-opcua-transport": "2.163.0",
-        "node-opcua-types": "2.163.0",
-        "node-opcua-utils": "2.157.0",
-        "node-opcua-variant": "2.163.0",
+        "node-opcua-crypto": "5.3.0",
+        "node-opcua-data-model": "2.164.0",
+        "node-opcua-data-value": "2.164.0",
+        "node-opcua-date-time": "2.164.0",
+        "node-opcua-debug": "2.164.0",
+        "node-opcua-extension-object": "2.164.0",
+        "node-opcua-factory": "2.164.0",
+        "node-opcua-hostname": "2.164.0",
+        "node-opcua-nodeid": "2.164.0",
+        "node-opcua-nodesets": "2.163.1",
+        "node-opcua-numeric-range": "2.164.0",
+        "node-opcua-object-registry": "2.164.0",
+        "node-opcua-pki": "6.8.2",
+        "node-opcua-secure-channel": "2.164.2",
+        "node-opcua-service-browse": "2.164.0",
+        "node-opcua-service-call": "2.164.0",
+        "node-opcua-service-discovery": "2.164.0",
+        "node-opcua-service-endpoints": "2.164.0",
+        "node-opcua-service-filter": "2.164.0",
+        "node-opcua-service-history": "2.164.0",
+        "node-opcua-service-node-management": "2.164.0",
+        "node-opcua-service-query": "2.164.0",
+        "node-opcua-service-read": "2.164.0",
+        "node-opcua-service-register-node": "2.164.0",
+        "node-opcua-service-secure-channel": "2.164.0",
+        "node-opcua-service-session": "2.164.0",
+        "node-opcua-service-subscription": "2.164.2",
+        "node-opcua-service-translate-browse-path": "2.164.0",
+        "node-opcua-service-write": "2.164.0",
+        "node-opcua-status-code": "2.164.0",
+        "node-opcua-transport": "2.164.0",
+        "node-opcua-types": "2.164.0",
+        "node-opcua-utils": "2.164.0",
+        "node-opcua-variant": "2.164.0",
         "thenify-ex": "4.4.0"
     },
     "devDependencies": {
-        "node-opcua-data-access": "2.163.0",
-        "node-opcua-leak-detector": "2.157.0",
+        "node-opcua-data-access": "2.164.0",
+        "node-opcua-leak-detector": "2.164.0",
         "node-opcua-test-helpers": "2.157.0"
     },
     "author": "Etienne Rossignon",
@@ -84,7 +84,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "20862daa7ac42893d32d2bcb4dcecc272c320a67",
+    "gitHead": "eb76d34b885c7584785d8eff69ada66f95b55c2e",
     "files": [
         "dist",
         "source"

package/source/addressSpace_accessor.ts

@@ -13,7 +13,6 @@ import { TimestampsToReturn, DataValue, coerceTimestampsToReturn, apply_timestam
 import { getCurrentClock, isMinDate } from "node-opcua-date-time";
 import { resolveNodeId, coerceNodeId, NodeId } from "node-opcua-nodeid";
 import { NumericRange } from "node-opcua-numeric-range";
-import { doDebug, debugLog } from "node-opcua-pki";
 import { StatusCode, StatusCodes } from "node-opcua-status-code";
 import {
     BrowseDescriptionOptions,
@@ -33,6 +32,10 @@ import {
 } from "node-opcua-types";
 import { Variant } from "node-opcua-variant";
 import { IAddressSpaceAccessor } from "./i_address_space_accessor";
+import { checkDebugFlag, make_debugLog } from "node-opcua-debug";
+
+const doDebug = checkDebugFlag(__filename);
+const debugLog = make_debugLog(__filename);
 
 function checkReadProcessedDetails(historyReadDetails: ReadProcessedDetails): StatusCode {
     if (!historyReadDetails.aggregateConfiguration) {
@@ -369,7 +372,7 @@ export class AddressSpaceAccessor implements IAddressSpaceAccessor, IAddressSpac
             // Object Not Found
             return new HistoryReadResult({ statusCode: StatusCodes.BadNodeIdUnknown });
         } else {
-            // istanbul ignore next
+            // c8 ignore next
             if (!obj.historyRead) {
                 // note : Object and View may also support historyRead to provide Event historical data
                 //        todo implement historyRead for Object and View
@@ -384,7 +387,7 @@ export class AddressSpaceAccessor implements IAddressSpaceAccessor, IAddressSpac
                     "\n" +
                     "HistoryReadDetails " +
                     historyReadDetails.toString();
-                // istanbul ignore next
+                // c8 ignore next
                 if (doDebug) {
                     debugLog(chalk.cyan("ServerEngine#_historyReadNode "), chalk.white.bold(msg));
                 }

package/source/base_server.ts

@@ -36,7 +36,7 @@ import { ServiceFault } from "node-opcua-service-secure-channel";
 import { StatusCode, StatusCodes } from "node-opcua-status-code";
 import { ApplicationDescriptionOptions } from "node-opcua-types";
 import { EndpointDescription, GetEndpointsRequest } from "node-opcua-types";
-import { matchUri } from "node-opcua-utils";
+import { matchUri, checkFileExistsAndIsNotEmpty } from "node-opcua-utils";
 
 import { performCertificateSanityCheck } from "node-opcua-client";
 import { OPCUAServerEndPoint } from "./server_end_point";
@@ -189,9 +189,9 @@ export class OPCUABaseServer extends OPCUASecureObject {
                 /* to do */
             }
         }
-        if (!fs.existsSync(this.certificateFile)) {
+        if (!checkFileExistsAndIsNotEmpty(this.certificateFile)) {
             await withLock({ fileToLock: this.certificateFile + ".mutex" }, async () => {
-                if (fs.existsSync(this.certificateFile)) {
+                if (checkFileExistsAndIsNotEmpty(this.certificateFile)) {
                     return;
                 }
                 const applicationUri = this.serverInfo.applicationUri!;
@@ -387,7 +387,7 @@ export class OPCUABaseServer extends OPCUASecureObject {
                 channel.send_response("MSG", response, message, emptyCallback);
             }
         } catch (err) {
-            /* istanbul ignore if */
+            /* c8 ignore next */
             const errMessage1 = "[NODE-OPCUA-W08] EXCEPTION CAUGHT WHILE PROCESSING REQUEST !! " + request.schema.name;
             warningLog(chalk.red.bold(errMessage1));
             warningLog(request.toString());
@@ -449,20 +449,20 @@ export class OPCUABaseServer extends OPCUASecureObject {
     public async suspendEndPoints(): Promise<void>;
     public suspendEndPoints(callback: (err?: Error) => void): void;
     public suspendEndPoints(callback?: (err?: Error) => void): void | Promise<void> {
-        /* istanbul ignore next */
+        /* c8 ignore next */
         if (!callback) {
             throw new Error("Internal Error");
         }
         async.forEach(
             this.endpoints,
             (ep: OPCUAServerEndPoint, _inner_callback) => {
-                /* istanbul ignore next */
+                /* c8 ignore next */
                 if (doDebug) {
                     debugLog("Suspending ", ep.endpointDescriptions()[0].endpointUrl);
                 }
 
                 ep.suspendConnection((err?: Error | null) => {
-                    /* istanbul ignore next */
+                    /* c8 ignore next */
                     if (doDebug) {
                         debugLog("Suspended ", ep.endpointDescriptions()[0].endpointUrl);
                     }

package/source/monitored_item.ts

@@ -184,13 +184,13 @@ function timestampHasChanged(t1: DateTime, t2: DateTime): boolean {
 }
 
 function apply_dataChange_filter(this: MonitoredItem, newDataValue: DataValue, oldDataValue: DataValue): boolean {
-    /* istanbul ignore next */
+    /* c8 ignore next */
     if (!this.filter || !(this.filter instanceof DataChangeFilter)) {
         throw new Error("Internal Error");
     }
 
     const trigger = this.filter.trigger;
-    // istanbul ignore next
+    // c8 ignore next
     if (doDebug) {
         try {
             debugLog("filter pass ?", DataChangeTrigger[trigger], this.oldDataValue?.toString(), newDataValue.toString());
@@ -274,7 +274,7 @@ function apply_filter(this: MonitoredItem, newDataValue: DataValue) {
         return true; // keep
     }
 
-    // istanbul ignore next
+    // c8 ignore next
     doDebug && safeGuardVerify(this);
 
     if (this.filter instanceof DataChangeFilter) {
@@ -451,7 +451,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
         this._node = null;
         this._semantic_version = 0;
 
-        // istanbul ignore next
+        // c8 ignore next
         if (doDebug) {
             debugLog("Monitoring ", options.itemToMonitor.toString());
         }
@@ -515,7 +515,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
     }
 
     public dispose(): void {
-        // istanbul ignore next
+        // c8 ignore next
         if (doDebug) {
             debugLog("DISPOSING MONITORED ITEM", this._node!.nodeId.toString());
         }
@@ -591,7 +591,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
     public recordValue(dataValue: DataValue, skipChangeTest?: boolean, indexRange?: NumericRange): boolean {
         if (!this.itemToMonitor) {
             // we must have a valid itemToMonitor(have this monitoredItem been disposed already ?)
-            // istanbul ignore next
+            // c8 ignore next
             doDebug && debugLog("recordValue => Rejected", this.node?.browseName.toString(), " because no itemToMonitor");
             return false;
         }
@@ -607,7 +607,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
             // we just ignore changes that do not fall within our range
             // ( unless semantic bit has changed )
             if (!NumericRange.overlap(indexRange as NumericalRange0, this.itemToMonitor.indexRange)) {
-                // istanbul ignore next
+                // c8 ignore next
                 doDebug && debugLog("recordValue => Rejected", this.node?.browseName.toString(), " because no range not overlap");
                 return false; // no overlap !
             }
@@ -616,7 +616,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
         // extract the range that we are interested with
         dataValue = extractRange(dataValue, this.itemToMonitor.indexRange);
 
-        // istanbul ignore next
+        // c8 ignore next
         if (doDebug2) {
             debugLog(
                 "MonitoredItem#recordValue",
@@ -637,7 +637,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
             setSemanticChangeBit(dataValue);
             this._semantic_version = (this.node as UAVariable).semantic_version;
             this._enqueue_value(dataValue);
-            // istanbul ignore next
+            // c8 ignore next
             doDebug && debugLog("recordValue => OK ", this.node?.browseName.toString(), " because hasSemanticChanged");
             return true;
         }
@@ -647,7 +647,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
         if (!skipChangeTest) {
             const hasChanged = !sameDataValue(dataValue, this.oldDataValue!);
             if (!hasChanged) {
-                // istanbul ignore next
+                // c8 ignore next
                 doDebug2 &&
                     debugLog(
                         "recordValue => Rejected ",
@@ -659,7 +659,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
         }
 
         if (!skipChangeTest && !apply_filter.call(this, dataValue)) {
-            // istanbul ignore next
+            // c8 ignore next
             if (doDebug) {
                 debugLog("recordValue => Rejected ", this.node?.browseName.toString(), " because apply_filter");
                 debugLog("current Value =>", this.oldDataValue?.toString());
@@ -673,7 +673,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
             // when an indexRange is provided , make sure that no record happens unless
             // extracted variant in the selected range  has really changed.
 
-            // istanbul ignore next
+            // c8 ignore next
             if (doDebug) {
                 debugLog("Current : ", this.oldDataValue?.toString());
                 debugLog("New : ", dataValue.toString());
@@ -681,7 +681,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
             }
 
             if (this.oldDataValue !== badDataUnavailable && sameVariant(dataValue.value, this.oldDataValue.value)) {
-                // istanbul ignore next
+                // c8 ignore next
                 doDebug &&
                     debugLog("recordValue => Rejected ", this.node?.browseName.toString(), " because useIndexRange && sameVariant");
                 return false;
@@ -693,7 +693,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
 
         // store last value
         this._enqueue_value(dataValue);
-        // istanbul ignore next
+        // c8 ignore next
         doDebug && debugLog("recordValue => OK ", this.node?.browseName.toString());
         return true;
     }
@@ -748,7 +748,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
             }
             assert(linkedMonitoredItem.monitoringMode === MonitoringMode.Sampling);
 
-            // istanbul ignore next
+            // c8 ignore next
             if (doDebug) {
                 debugLog("triggerLinkedItems => ", this.node?.nodeId.toString(), linkedMonitoredItem.node?.nodeId.toString());
             }
@@ -852,12 +852,12 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
         // the last Publish response was sent.
         // This parameter only applies to MonitoredItems used for monitoring Attribute changes.
 
-        // istanbul ignore next
+        // c8 ignore next
         if (!this.node) return;
 
         const sessionContext = this.getSessionContext() || SessionContext.defaultContext;
 
-        // istanbul ignore next
+        // c8 ignore next
         if (!sessionContext) return;
 
         // no need to resend if a value is already in the queue
@@ -894,7 +894,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
             warningLog("MonitoredItem#_on_sampling_timer : ", this.node?.nodeId.toString(), "cannot find session");
             return;
         }
-        // istanbul ignore next
+        // c8 ignore next
         if (doDebug2) {
             debugLog(
                 "MonitoredItem#_on_sampling_timer",
@@ -919,7 +919,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
             }
             assert(!this._is_sampling, "sampling func shall not be re-entrant !! fix it");
 
-            // istanbul ignore next
+            // c8 ignore next
             if (!this.samplingFunc) {
                 throw new Error("internal error : missing samplingFunc");
             }
@@ -932,7 +932,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
                     // was taking place ... just ignore this
                     return;
                 }
-                // istanbul ignore next
+                // c8 ignore next
                 if (err) {
                     errorLog(" SAMPLING ERROR =>", err);
                 } else {
@@ -944,14 +944,14 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
                 this._is_sampling = false;
             });
         } else {
-            /* istanbul ignore next */
+            /* c8 ignore next */
             debugLog("_on_sampling_timer call but MonitoredItem has been terminated !!! ");
         }
     }
 
     private _stop_sampling() {
         // debugLog("MonitoredItem#_stop_sampling");
-        /* istanbul ignore next */
+        /* c8 ignore next */
         if (!this.node) {
             throw new Error("Internal Error");
         }
@@ -1015,7 +1015,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
         // ignore the Event content filtering associated with a Subscription and will always be
         // delivered to the Client.
 
-        // istanbul ignore next
+        // c8 ignore next
         if (!this.filter || !(this.filter instanceof EventFilter)) {
             throw new Error("Internal Error : a EventFilter is requested");
         }
@@ -1030,7 +1030,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
 
         const eventFields: Variant[] = extractEventFields(SessionContext.defaultContext, selectClauses, eventData);
 
-        // istanbul ignore next
+        // c8 ignore next
         if (doDebug) {
             debugLog(" RECEIVED INTERNAL EVENT THAT WE ARE MONITORING");
             debugLog(this.filter ? this.filter.toString() : "no filter");
@@ -1053,7 +1053,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
     }
 
     private _start_sampling(recordInitialValue: boolean): void {
-        // istanbul ignore next
+        // c8 ignore next
         if (!this.node) {
             return; // we just want to ignore here ...
         }
@@ -1077,7 +1077,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
         } else {
             const o = this.oldDataValue;
             this.oldDataValue = badDataUnavailable;
-            // istanbul ignore next
+            // c8 ignore next
             if (doDebug) {
                 safeGuardRegister(this);
             }
@@ -1085,13 +1085,13 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
         }
     }
     private __start_sampling(recordInitialValue?: boolean): void {
-        // istanbul ignore next
+        // c8 ignore next
         if (!this.node) {
             return; // we just want to ignore here ...
         }
 
         const sessionContext = this.getSessionContext() || SessionContext.defaultContext;
-        // istanbul ignore next
+        // c8 ignore next
         if (!sessionContext) {
             return;
         }
@@ -1099,7 +1099,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
         this._stop_sampling();
 
         if (this.itemToMonitor.attributeId === AttributeIds.EventNotifier) {
-            // istanbul ignore next
+            // c8 ignore next
             if (doDebug) {
                 debugLog("xxxxxx monitoring EventNotifier on", this.node.nodeId.toString(), this.node.browseName.toString());
             }
@@ -1309,13 +1309,13 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
             );
         }
 
-        // istanbul ignore next
+        // c8 ignore next
         if (doDebug) {
             debugLog("MonitoredItem#_enqueue_value", this.node!.nodeId.toString());
             safeGuardVerify(this);
         }
         this.oldDataValue = dataValue.clone();
-        // istanbul ignore next
+        // c8 ignore next
         if (doDebug) {
             safeGuardRegister(this);
         }
@@ -1332,7 +1332,7 @@ export class MonitoredItem extends EventEmitter implements MonitoredItemBase {
     }
 
     private _enqueue_event(eventFields: any[]) {
-        // istanbul ignore next
+        // c8 ignore next
         if (doDebug) {
             debugLog(" MonitoredItem#_enqueue_event");
         }

package/source/node_sampler.ts

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