node-opcua-address-space 2.111.0 → 2.113.0

package/distHelpers/add_event_generator_object.js

@@ -37,10 +37,6 @@ function add_eventGeneratorObject(namespace, parentFolder) {
         outputArguments: []
     });
     method.bindMethod((inputArguments, context, callback) => {
-        // xx console.log("In Event Generator Method");
-        // xx console.log(this.toString());
-        // xx console.log(context.object.toString());
-        // xx console.log("inputArguments ", inputArguments[0].toString());
         const message = inputArguments[0].value || "Hello from Event Generator Object";
         const severity = inputArguments[1].value || 0;
         const myEventType = namespace.addressSpace.findEventType("MyEventType", namespace.index);

package/distHelpers/add_event_generator_object.js.map

@@ -1 +1 @@
-{"version":3,"file":"add_event_generator_object.js","sourceRoot":"","sources":["../test_helpers/add_event_generator_object.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,mEAAgE;AAChE,2DAAuD;AAKvD,SAAgB,wBAAwB,CAAC,SAAqB,EAAE,YAA+B;IAC3F,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,CAAC;QACrC,UAAU,EAAE,aAAa;QACzB,SAAS,EAAE,eAAe,CAAC,qBAAqB;KACnD,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC;QACjC,UAAU,EAAE,sBAAsB;QAClC,aAAa,EAAE,CAAC;QAChB,WAAW,EAAE,YAAY;KAC5B,CAAC,CAAC;IAEH,QAAQ,CAAC,YAAY,CAAC;QAClB,MAAM,EAAE,SAAS;QACjB,aAAa,EAAE,sBAAsB;KACxC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE;QACzC,UAAU,EAAE,sBAAsB;QAClC,cAAc,EAAE;YACZ;gBACI,QAAQ,EAAE,6BAAQ,CAAC,MAAM;gBACzB,WAAW,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE;gBACtC,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,QAAQ,EAAE,6BAAQ,CAAC,MAAM;gBACzB,WAAW,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE;gBACvC,IAAI,EAAE,UAAU;aACnB;SACJ;QACD,eAAe,EAAE,EAAE;KACtB,CAAC,CAAC;IAEH,MAAM,CAAC,UAAU,CAAC,CAAC,cAAyB,EAAE,OAAwB,EAAE,QAA4C,EAAE,EAAE;QACpH,+CAA+C;QAC/C,mCAAmC;QACnC,6CAA6C;QAE7C,mEAAmE;QAEnE,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,mCAAmC,CAAC;QAC/E,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;QAE9C,MAAM,WAAW,GAAG,SAAS,CAAC,YAAY,CAAC,aAAa,CAAC,aAAa,EAAE,SAAS,CAAC,KAAK,CAAE,CAAC;QACzF,OAAO,CAAC,MAAmB,CAAC,UAAU,CAAC,WAAW,EAAE;YACjD,OAAO,EAAE;gBACL,QAAQ,EAAE,6BAAQ,CAAC,aAAa;gBAChC,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;aAC3B;YACD,QAAQ,EAAE;gBACN,QAAQ,EAAE,6BAAQ,CAAC,MAAM;gBACzB,KAAK,EAAE,QAAQ;aAClB;SACJ,CAAC,CAAC;QACH,MAAM,gBAAgB,GAAG;YACrB,eAAe,EAAE,EAAE;YACnB,UAAU,EAAE,oCAAW,CAAC,IAAI;SAC/B,CAAC;QACF,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;AACP,CAAC;AA7DD,4DA6DC"}
+{"version":3,"file":"add_event_generator_object.js","sourceRoot":"","sources":["../test_helpers/add_event_generator_object.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,mEAAgE;AAChE,2DAAuD;AAKvD,SAAgB,wBAAwB,CAAC,SAAqB,EAAE,YAA+B;IAC3F,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,CAAC;QACrC,UAAU,EAAE,aAAa;QACzB,SAAS,EAAE,eAAe,CAAC,qBAAqB;KACnD,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC;QACjC,UAAU,EAAE,sBAAsB;QAClC,aAAa,EAAE,CAAC;QAChB,WAAW,EAAE,YAAY;KAC5B,CAAC,CAAC;IAEH,QAAQ,CAAC,YAAY,CAAC;QAClB,MAAM,EAAE,SAAS;QACjB,aAAa,EAAE,sBAAsB;KACxC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE;QACzC,UAAU,EAAE,sBAAsB;QAClC,cAAc,EAAE;YACZ;gBACI,QAAQ,EAAE,6BAAQ,CAAC,MAAM;gBACzB,WAAW,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE;gBACtC,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,QAAQ,EAAE,6BAAQ,CAAC,MAAM;gBACzB,WAAW,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE;gBACvC,IAAI,EAAE,UAAU;aACnB;SACJ;QACD,eAAe,EAAE,EAAE;KACtB,CAAC,CAAC;IAEH,MAAM,CAAC,UAAU,CAAC,CAAC,cAAyB,EAAE,OAAwB,EAAE,QAA4C,EAAE,EAAE;QAEpH,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,mCAAmC,CAAC;QAC/E,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;QAE9C,MAAM,WAAW,GAAG,SAAS,CAAC,YAAY,CAAC,aAAa,CAAC,aAAa,EAAE,SAAS,CAAC,KAAK,CAAE,CAAC;QACzF,OAAO,CAAC,MAAmB,CAAC,UAAU,CAAC,WAAW,EAAE;YACjD,OAAO,EAAE;gBACL,QAAQ,EAAE,6BAAQ,CAAC,aAAa;gBAChC,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;aAC3B;YACD,QAAQ,EAAE;gBACN,QAAQ,EAAE,6BAAQ,CAAC,MAAM;gBACzB,KAAK,EAAE,QAAQ;aAClB;SACJ,CAAC,CAAC;QACH,MAAM,gBAAgB,GAAG;YACrB,eAAe,EAAE,EAAE;YACnB,UAAU,EAAE,oCAAW,CAAC,IAAI;SAC/B,CAAC;QACF,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;AACP,CAAC;AAxDD,4DAwDC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space",
-    "version": "2.111.0",
+    "version": "2.113.0",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/src/index_current.js",
     "types": "./dist/source/index.d.ts",
@@ -16,42 +16,42 @@
         "c": "mocha --version"
     },
     "dependencies": {
-        "@types/lodash": "4.14.197",
+        "@types/lodash": "4.14.198",
         "@types/semver": "^7.5.1",
         "async": "^3.2.4",
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
         "lodash": "4.17.21",
-        "node-opcua-address-space-base": "2.111.0",
+        "node-opcua-address-space-base": "2.113.0",
         "node-opcua-assert": "2.105.0",
-        "node-opcua-basic-types": "2.111.0",
+        "node-opcua-basic-types": "2.113.0",
         "node-opcua-binary-stream": "2.110.0",
-        "node-opcua-client-dynamic-extension-object": "2.111.0",
+        "node-opcua-client-dynamic-extension-object": "2.113.0",
         "node-opcua-constants": "2.98.1",
-        "node-opcua-crypto": "4.3.1",
-        "node-opcua-data-access": "2.111.0",
-        "node-opcua-data-model": "2.111.0",
-        "node-opcua-data-value": "2.111.0",
-        "node-opcua-date-time": "2.111.0",
-        "node-opcua-debug": "2.110.0",
+        "node-opcua-crypto": "4.5.0",
+        "node-opcua-data-access": "2.113.0",
+        "node-opcua-data-model": "2.113.0",
+        "node-opcua-data-value": "2.113.0",
+        "node-opcua-date-time": "2.113.0",
+        "node-opcua-debug": "2.113.0",
         "node-opcua-enum": "2.110.0",
-        "node-opcua-extension-object": "2.111.0",
-        "node-opcua-factory": "2.111.0",
-        "node-opcua-nodeid": "2.110.0",
-        "node-opcua-nodeset-ua": "2.111.0",
-        "node-opcua-numeric-range": "2.111.0",
-        "node-opcua-object-registry": "2.110.0",
-        "node-opcua-pseudo-session": "2.111.0",
-        "node-opcua-service-browse": "2.111.0",
-        "node-opcua-service-call": "2.111.0",
-        "node-opcua-service-history": "2.111.0",
-        "node-opcua-service-translate-browse-path": "2.111.0",
-        "node-opcua-service-write": "2.111.0",
+        "node-opcua-extension-object": "2.113.0",
+        "node-opcua-factory": "2.113.0",
+        "node-opcua-nodeid": "2.113.0",
+        "node-opcua-nodeset-ua": "2.113.0",
+        "node-opcua-numeric-range": "2.113.0",
+        "node-opcua-object-registry": "2.113.0",
+        "node-opcua-pseudo-session": "2.113.0",
+        "node-opcua-service-browse": "2.113.0",
+        "node-opcua-service-call": "2.113.0",
+        "node-opcua-service-history": "2.113.0",
+        "node-opcua-service-translate-browse-path": "2.113.0",
+        "node-opcua-service-write": "2.113.0",
         "node-opcua-status-code": "2.110.0",
-        "node-opcua-types": "2.111.0",
+        "node-opcua-types": "2.113.0",
         "node-opcua-utils": "2.110.0",
-        "node-opcua-variant": "2.111.0",
-        "node-opcua-xml2json": "2.110.0",
+        "node-opcua-variant": "2.113.0",
+        "node-opcua-xml2json": "2.113.0",
         "semver": "^7.5.4",
         "set-prototype-of": "^1.0.0",
         "thenify": "^3.3.1",
@@ -60,11 +60,11 @@
     "devDependencies": {
         "mocha": "^10.2.0",
         "node-opcua-benchmarker": "2.110.0",
-        "node-opcua-leak-detector": "2.110.0",
+        "node-opcua-leak-detector": "2.113.0",
         "node-opcua-nodesets": "2.110.0",
-        "node-opcua-packet-analyzer": "2.111.0",
-        "node-opcua-service-filter": "2.111.0",
-        "node-opcua-test-fixtures": "2.111.0",
+        "node-opcua-packet-analyzer": "2.113.0",
+        "node-opcua-service-filter": "2.113.0",
+        "node-opcua-test-fixtures": "2.113.0",
         "should": "^13.2.3",
         "sinon": "^15.2.0",
         "source-map-support": "^0.5.21"
@@ -84,7 +84,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "94a810c732583bdb401e29a5ac92662c7895caeb",
+    "gitHead": "36db335391fedd39726990a1b37f7768da16466a",
     "files": [
         "dist",
         "distHelpers",

package/source/loader/decode_xml_extension_object.ts

@@ -18,7 +18,6 @@ function encodingNodeIdToDataTypeNode(addressSpace: IAddressSpace, encodingNodeI
     if (!encodingNode) {
         throw new Error("findDataTypeNode:  Cannot find encoding NodeId" + encodingNodeId.toString());
     }
-    // xx console.log("encodingNode", encodingNode.toString());
     const refs = encodingNode.findReferences("HasEncoding", false);
     const dataTypes = refs.map((ref) => addressSpace.findNode(ref.nodeId)).filter((obj: any) => obj !== null);
     // istanbul ignore next
@@ -40,7 +39,6 @@ export function makeDefinitionMap(addressSpace: IAddressSpace): DefinitionMap2 {
                 throw new Error("Expecting a DataType node here");
             }
             const name = dataTypeNode.browseName.name || "";
-            // console.log("yy)=", dataTypeNode.toString());
             if (dataTypeNode.isStructure()) {
                 const definition = dataTypeNode.getStructureDefinition();
                 return { name, definition };

package/source/loader/load_nodeset2.ts

@@ -881,10 +881,12 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
                             break;
                         }
                         let captureXmlBody = this.bodyXML;
+                        // istanbul ignore next
                         if (doDebug) {
                             debugLog("xxxx ", chalk.yellow(captureXmlBody));
                         }
                         // this is a user defined Extension Object
+                        // istanbul ignore next
                         debugLog(
                             "load nodeset2: typeDefinitionId in ExtensionObject Default XML = " + xmlEncodingNodeId.toString()
                         );
@@ -1699,7 +1701,7 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
                     // istanbul ignore next
                     // tslint:disable:no-console
                     if (types.isNativeError(err)) {
-                        console.log(" performPostLoadingTasks Err  => ", err.message, "\n", err);
+                        errorLog(" performPostLoadingTasks Err  => ", err.message, "\n", err);
                     }
                     await task(addressSpace1);
                 }
@@ -1748,7 +1750,7 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
         finalSteps()
             .then(() => callback!())
             .catch((err1: Error) => {
-                console.log("Error ", renderError(err1));
+                errorLog("Error ", renderError(err1));
                 callback!(err1);
             });
     }

package/source/loader/make_xml_extension_object_parser.ts

@@ -210,7 +210,7 @@ const partials: { [key: string]: ReaderStateParserLike } = {
     Variant: {
         finish(this: any) {
             /** to do */
-            console.log(" Missing  Implemntation contact sterfive.com!");
+            warningLog(" Missing  Implemntation contact sterfive.com!");
         }
     },
 
@@ -279,8 +279,6 @@ function _makeTypeReader(
     const { name, definition } = definitionMap.findDefinition(n);
     const dataTypeName = name;
 
-    // console.log("NAME = ", dataTypeNodeId.toString(), name, definition);
-
     let reader: ReaderStateParserLike = readerMap[dataTypeName]!;
 
     if (reader) {
@@ -355,7 +353,6 @@ function _makeTypeReader(
         readerMap[dataTypeName] = reader;
         return { name, parser: reader };
     } else if (definition instanceof EnumDefinition) {
-        //  console.log("xxxx enum found !", definition.toString());
         const turnToInt = (value: any) => {
             // Green_100
             return parseInt(value.split("_")[1], 10);

package/source/loader/namespace_post_step.ts

@@ -43,6 +43,7 @@ export async function promoteObjectAndVariablesInNamespace(namespace: INamespace
 
                     promoter.promoter(a as any);
                     const after = a.constructor.name;
+                    // istanbul ignore next
                     if (doDebug) {
                         debugLog(`promoting ${a.browseName.toString()} from ${before} to ${after}`);
                     }

package/src/address_space.ts

@@ -56,7 +56,7 @@ import {
     ShutdownTask,
     RaiseEventData
 } from "node-opcua-address-space-base";
-import { make_errorLog } from "node-opcua-debug";
+import { make_debugLog, make_errorLog } from "node-opcua-debug";
 
 import { adjustBrowseDirection } from "../source/helpers/adjust_browse_direction";
 import { UARootFolder } from "../source/ua_root_folder";
@@ -79,6 +79,7 @@ import { BaseNodeImpl } from "./base_node_impl";
 
 const doDebug = false;
 const errorLog = make_errorLog(__filename);
+const debugLog = make_debugLog(__filename);
 
 // tslint:disable-next-line:no-var-requires
 const Dequeue = require("dequeue");
@@ -773,17 +774,18 @@ export class AddressSpace implements AddressSpacePrivate {
                 // add a property , but with a null variant
                 eventData._createValue(fullBrowsePath, node, { dataType: DataType.Null });
 
+                // istanbul ignore next
                 if (doDebug) {
                     if (node.modellingRule === "Mandatory") {
                         // tslint:disable:no-console
-                        console.log(
+                        errorLog(
                             chalk.red("ERROR : AddressSpace#constructEventData(eventType,options) " + "cannot find property ") +
                                 self.browseName.toString() +
                                 " => " +
                                 chalk.cyan(lowerName)
                         );
                     } else {
-                        console.log(
+                        errorLog(
                             chalk.yellow(
                                 "Warning : AddressSpace#constructEventData(eventType,options)" + " cannot find property "
                             ) +
@@ -842,18 +844,16 @@ export class AddressSpace implements AddressSpacePrivate {
 
             // istanbul ignore next
             if (doDebug) {
-                console.log(" " + chalk.bgWhite.cyan(self.browseName.toString()));
+                debugLog(" " + chalk.bgWhite.cyan(self.browseName.toString()));
             }
 
             for (const node of children) {
                 // only keep those that have a "HasModellingRule"
                 if (!(node as any).modellingRule) {
-                    // xx console.log(" skipping node without modelling rule", node.browseName.toString());
                     continue;
                 }
                 // ignore also methods
                 if (node.nodeClass === NodeClass.Method) {
-                    // xx console.log(" skipping method ", node.browseName.toString());
                     continue;
                 }
 
@@ -866,8 +866,6 @@ export class AddressSpace implements AddressSpacePrivate {
                 if (children2.length > 0) {
                     const lowerName = lowerFirstLetter(node.browseName.name!);
                     const standardName = node.browseName.toString();
-                    //  console.log(" Children to visit = ",lowerName,
-                    //  children.map(function(a){ return a.browseName.toString();}).join(" "));
                     for (const child2 of children2) {
                         _process_var(self, lowerName + ".", standardName + ".", child2);
                     }
@@ -1027,7 +1025,7 @@ export class AddressSpace implements AddressSpacePrivate {
         // to do verify that dataType is of type "Structure"
         /* istanbul ignore next */
         if (!_dataType.isSubtypeOf(this.findDataType("Structure")!)) {
-            console.log(_dataType.toString());
+            debugLog(_dataType.toString());
         }
         assert(_dataType.isSubtypeOf(this.findDataType("Structure")!));
         if (!_dataType._extensionObjectConstructor) {
@@ -1144,7 +1142,6 @@ export class AddressSpace implements AddressSpacePrivate {
         if (!obj) {
             // Object Not Found
             browseResult.statusCode = StatusCodes.BadNodeIdUnknown;
-            // xx console.log("xxxxxx browsing ",nodeId.toString() , " not found" );
         } else {
             browseResult.statusCode = StatusCodes.Good;
             browseResult.references = obj.browseNode(browseDescription, context);
@@ -1172,7 +1169,6 @@ export class AddressSpace implements AddressSpacePrivate {
      * @private
      */
     public _collectModelChange(view: UAView | null, modelChange: ModelChangeStructureDataType): void {
-        // xx console.log("in _collectModelChange", modelChange.verb, verbFlags.get(modelChange.verb).toString());
         this._modelChanges.push(modelChange);
     }
 
@@ -1253,7 +1249,6 @@ export class AddressSpace implements AddressSpacePrivate {
                 if (this._modelChanges.length === 0) {
                     return; // nothing to do
                 }
-                // xx console.log( "xx dealing with ",this._modelChanges.length);
                 // increase version number of participating nodes
 
                 // https://github.com/you-dont-need/You-Dont-Need-Lodash-Underscore
@@ -1269,7 +1264,6 @@ export class AddressSpace implements AddressSpacePrivate {
                     const eventTypeNode = this.findEventType("GeneralModelChangeEventType");
 
                     if (eventTypeNode) {
-                        // xx console.log("xx raising event on server object");
                         this.rootFolder.objects.server.raiseEvent(eventTypeNode, {
                             // Part 5 - 6.4.32 GeneralModelChangeEventType
                             changes: {
@@ -1421,7 +1415,6 @@ export class AddressSpace implements AddressSpacePrivate {
             const typeDefinitionNode = this.findNode(typeDefinition)!;
             typeDefinition = typeDefinitionNode.nodeId;
         }
-        // xx console.log("typeDefinition = ",typeDefinition);
         assert(typeDefinition instanceof NodeId);
         return typeDefinition;
     }
@@ -1573,6 +1566,5 @@ function _increase_version_number(node: BaseNode | null) {
             dataType: DataType.String,
             value: (previousValue + 1).toString()
         });
-        // xx console.log("xxx increasing version number of node ", node.browseName.toString(),previousValue);
     }
 }

package/src/alarms_and_conditions/condition_snapshot_impl.ts

@@ -222,7 +222,7 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
     public _get_var(varName: string): any {
         const c = this.condition as UAConditionImpl;
         if (!c.getEnabledState() && !Object.prototype.hasOwnProperty.call(_varTable, varName)) {
-            // xx console.log("ConditionSnapshot#_get_var condition enabled =", self.condition.getEnabledState());
+            // xx debuglog("ConditionSnapshot#_get_var condition enabled =", self.condition.getEnabledState());
             return disabledVar;
         }
 
@@ -238,6 +238,7 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
         const key = normalizeName(varName);
         // istanbul ignore next
         if (!Object.prototype.hasOwnProperty.call(this._map, key)) {
+            // istanbul ignore next
             if (doDebug) {
                 debugLog(" cannot find node " + varName);
                 debugLog("  map=", Object.keys(this._map).join(" "));
@@ -310,9 +311,6 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
         const eventId = addressSpace.generateEventId();
         const ret = this._set_var("EventId", DataType.ByteString, eventId.value);
 
-        // xx var branch = self; console.log("MMMMMMMMrenewEventId branch  " +
-        // branch.getBranchId().toString() + " eventId = " + branch.getEventId().toString("hex"));
-
         return ret;
     }
 
@@ -736,8 +734,6 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
         if (this.isCurrentBranch()) {
             assert(twoStateNode instanceof UATwoStateVariableImpl);
             twoStateNode.setValue(value as boolean);
-            // xx console.log("Is current branch", twoStateNode.toString(),variant.toString());
-            // xx console.log("  = ",twoStateNode.getValue());
         }
         this.emit("value_changed", node, variant);
     }

package/src/alarms_and_conditions/ua_acknowledgeable_condition_impl.ts

@@ -9,6 +9,7 @@ import { CallbackT, StatusCode, StatusCodes } from "node-opcua-status-code";
 import { DataType, VariantLike, VariantOptions } from "node-opcua-variant";
 import { INamespace, RaiseEventData, ISessionContext, UAEventType, UAMethod } from "node-opcua-address-space-base";
 import { CallMethodResultOptions } from "node-opcua-service-call";
+import { make_debugLog } from "node-opcua-debug";
 
 import { AddressSpacePrivate } from "../address_space_private";
 import { _install_TwoStateVariable_machinery } from "../state_machine/ua_two_state_variable";
@@ -20,7 +21,8 @@ import { _setAckedState } from "./condition";
 import { ConditionSnapshotImpl } from "./condition_snapshot_impl";
 import {  UAConditionImpl } from "./ua_condition_impl";
 
-
+const debugLog = make_debugLog(__filename);
+const doDebug = false;;
 export declare interface UAAcknowledgeableConditionImpl extends UAAcknowledgeableConditionEx, UAConditionImpl {
     on(eventName: string, eventHandler: any): this;
 }
@@ -258,8 +260,9 @@ export class UAAcknowledgeableConditionImpl extends UAConditionImpl implements U
         }
         assert(!branch.getConfirmedState(), "already confirmed ?");
         const conditionEventId = branch.getEventId();
-        // tslint:disable-next-line:no-console
-        console.log("autoConfirmBranch getAckedState ", branch.getAckedState());
+
+        // istanbul ignore next
+        doDebug && debugLog("autoConfirmBranch getAckedState ", branch.getAckedState());
         this._confirm_branch(conditionEventId, comment, branch, "Server/Confirm");
     }
 

package/src/alarms_and_conditions/ua_alarm_condition_impl.ts

@@ -9,7 +9,7 @@ import { DataValue } from "node-opcua-data-value";
 import { NodeId, sameNodeId } from "node-opcua-nodeid";
 import { StatusCodes } from "node-opcua-status-code";
 import { DataType, VariantOptions } from "node-opcua-variant";
-import { UAShelvedStateMachine } from "node-opcua-nodeset-ua";
+import { make_debugLog } from "node-opcua-debug";
 import { BaseNode, INamespace, UAEventType, UAVariable } from "node-opcua-address-space-base";
 
 import { _install_TwoStateVariable_machinery } from "../state_machine/ua_two_state_variable";
@@ -22,6 +22,8 @@ import { InstantiateAlarmConditionOptions } from "../../source/interfaces/alarms
 import { ConditionInfoImpl } from "./condition_info_impl";
 import { UAAcknowledgeableConditionImpl } from "./ua_acknowledgeable_condition_impl";
 
+const debugLog = make_debugLog(__filename);
+
 function _update_suppressedOrShelved(alarmNode: UAAlarmConditionImpl) {
     alarmNode.suppressedOrShelved.setValueFromSource({
         dataType: DataType.Boolean,
@@ -226,9 +228,7 @@ export class UAAlarmConditionImpl extends UAAcknowledgeableConditionImpl impleme
             if (shelvedValue && shelvedValue.text !== "Unshelved") {
                 shelved = true;
             }
-            // console.log("shelved = shelved",shelvedValue,shelved);
         }
-        // xx console.log(" isSuppressedOrShelved ",suppressed,shelved);
         return suppressed || shelved;
     }
 
@@ -339,8 +339,7 @@ export class UAAlarmConditionImpl extends UAAcknowledgeableConditionImpl impleme
 
             const _node = addressSpace._coerceNode(inputNode);
             if (_node === null) {
-                // tslint:disable-next-line:no-console
-                console.log(" cannot find nodeId ", inputNode);
+                debugLog(" cannot find nodeId ", inputNode);
             } else {
                 assert(_node, "Expecting a valid input node");
                 this.inputNode.setValueFromSource({
@@ -451,7 +450,8 @@ export class UAAlarmConditionImpl extends UAAcknowledgeableConditionImpl impleme
         // detect potential internal bugs due to misused of _signalNewCondition
         if (isEqual(oldConditionInfo, newConditionInfo)) {
             // tslint:disable-next-line:no-console
-            console.log(oldConditionInfo);
+            debugLog("oldConditionInfo", oldConditionInfo);
+            debugLog("oldConditionInfo", newConditionInfo);
             throw new Error(
                 "condition values have not change, shall we really raise an event ? alarm " + this.browseName.toString()
             );

package/src/alarms_and_conditions/ua_certificate_expiration_alarm_impl.ts

@@ -72,7 +72,6 @@ class UACertificateExpirationAlarmImpl extends UASystemOffNormalAlarmImpl implem
     }
 
     public updateAlarmState2(isActive: boolean, severity: number, message: string) {
-        //xx console.log(`${message} ${severity} ${d(new Date())}`);
         isActive ? this.activateAlarm() : this.deactivateAlarm();
 
         this.raiseNewCondition({

package/src/alarms_and_conditions/ua_condition_impl.ts

@@ -143,7 +143,6 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
     ): void {
         const conditionNode = context.object;
 
-        // xx console.log(inputArguments.map(function(a){return a.toString()}));
         if (!(conditionNode instanceof UAConditionImpl)) {
             callback(null, {
                 statusCode: StatusCodes.BadNodeIdInvalid
@@ -426,7 +425,6 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
             branch.renewEventId();
         }
 
-        // xx console.log("MMMMMMMM%%%%%%%%%%%%%%%%%%%%% branch  " +
         // branch.getBranchId().toString() + " eventId = " + branch.getEventId().toString("hex"));
 
         assert(branch instanceof ConditionSnapshotImpl);
@@ -462,7 +460,6 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
                 "therefore event cannot bubble-up to the server object"
             );
         }
-        // xx console.log("MMMMMMMM%%%%%%%%%%%%%%%%%%%%% branch  " +
         // branch.getBranchId().toString() + " eventId = " + branch.getEventId().toString("hex"));
     }
 
@@ -536,7 +533,6 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
         this.raiseConditionEvent(branch, true);
 
         if (!sameNodeId(branch.getBranchId(), NodeId.nullNodeId) && !branch.getRetain()) {
-            // xx console.log(" Deleting not longer needed branch ", branch.getBranchId().toString());
             // branch can be deleted
             this.deleteBranch(branch);
         }
@@ -854,8 +850,7 @@ function UACondition_instantiate(
     if (options.conditionSource) {
         options.conditionSource = addressSpace._coerceNode(options.conditionSource)!;
         if (options.conditionSource.nodeClass !== NodeClass.Object && options.conditionSource.nodeClass !== NodeClass.Variable) {
-            // tslint:disable:no-console
-            console.log(options.conditionSource);
+            debugLog(options.conditionSource);
             throw new Error("Expecting condition source to be NodeClass.Object or Variable");
         }
 
@@ -1013,7 +1008,7 @@ function _disable_method(inputArguments: VariantLike[], context: ISessionContext
 
     // istanbul ignore next
     if (!(conditionNode instanceof UAConditionImpl)) {
-        console.log("conditionNode is not a UACondition ", conditionNode?.toString());
+        debugLog("conditionNode is not a UACondition ", conditionNode?.toString());
         return callback(null, {
             statusCode: StatusCodes.BadNodeIdInvalid
         });
@@ -1048,6 +1043,7 @@ function _condition_refresh_method(
     // arguments : IntegerId SubscriptionId
     assert(inputArguments.length === 1);
     const addressSpace = context.object!.addressSpace as AddressSpacePrivate;
+    // istanbul ignore next
     if (doDebug) {
         debugLog(chalk.red(" ConditionType.ConditionRefresh ! subscriptionId ="), inputArguments[0].toString());
     }

package/src/base_node_impl.ts

@@ -38,7 +38,7 @@ import {
     AccessRestrictionsFlag
 } from "node-opcua-data-model";
 import { DataValue } from "node-opcua-data-value";
-import { dumpIf, make_warningLog, make_errorLog } from "node-opcua-debug";
+import { dumpIf, make_debugLog,  make_warningLog, make_errorLog } from "node-opcua-debug";
 import { coerceNodeId, makeNodeId, NodeId, NodeIdLike, resolveNodeId, sameNodeId } from "node-opcua-nodeid";
 import { NumericRange } from "node-opcua-numeric-range";
 import { ReferenceDescription } from "node-opcua-service-browse";
@@ -85,6 +85,8 @@ import { coerceRolePermissions } from "./role_permissions";
 const doDebug = false;
 const warningLog = make_warningLog(__filename);
 const errorLog = make_errorLog(__filename);
+const debugLog = make_debugLog(__filename);
+
 
 function defaultBrowseFilterFunc(context?: ISessionContext): boolean {
     return true;
@@ -867,7 +869,7 @@ export class BaseNodeImpl extends EventEmitter implements BaseNode {
 
         /* istanbul ignore next */
         if (do_debug) {
-            console.log("all references :", this.nodeId.toString(), this.browseName.toString());
+            debugLog("all references :", this.nodeId.toString(), this.browseName.toString());
             dumpReferences(addressSpace, (Object as any).values(_private._referenceIdx));
         }
 
@@ -940,7 +942,7 @@ export class BaseNodeImpl extends EventEmitter implements BaseNode {
 
         // istanbul ignore next
         if (!addressSpace) {
-            console.log(" Where is addressSpace ?");
+            debugLog("Where is addressSpace ?");
         }
         const reference = addressSpace.normalizeReferenceTypes([referenceOpts!])![0];
         const h = (<ReferenceImpl>reference).hash;
@@ -1021,7 +1023,7 @@ export class BaseNodeImpl extends EventEmitter implements BaseNode {
             // istanbul ignore next
             if (doDebug) {
                 // tslint:disable-next-line:no-console
-                console.log(chalk.bgWhite.red("Ignoring reserved keyword                                     " + name));
+                debugLog(chalk.bgWhite.red("Ignoring reserved keyword                                     " + name));
             }
             return;
         }
@@ -1508,9 +1510,8 @@ function _asObject<T extends BaseNode>(references: UAReference[], addressSpace:
     function toObject(reference: UAReference): T {
         const obj = resolveReferenceNode(addressSpace, reference);
         // istanbul ignore next
-        if (false && !obj) {
-            // tslint:disable-next-line:no-console
-            console.log(
+        if (doDebug&& !obj) {
+            debugLog(
                 chalk.red(" Warning :  object with nodeId ") +
                 chalk.cyan(reference.nodeId.toString()) +
                 chalk.red(" cannot be found in the address space !")
@@ -1584,16 +1585,7 @@ function _propagate_ref(this: BaseNode, addressSpace: MinimalistAddressSpace, re
                 displayWarningReferencePointingToItSelf = false;
             }
         }
-        // xx ignore this assert(reference.nodeId.toString() !== this.nodeId.toString());
-        // function w(s,l) { return (s+"                                                          ").substring(0,l);}
-        // if (reference.isForward) {
-        //    console.log("  CHILD => ",w(related_node.browseName   + " " + related_node.nodeId.toString(),30),
-        //    "  PARENT   ",w(this.browseName + " " + this.nodeId.toString(),30) , reference.toString());
-        // } else {
-        //    console.log("  CHILD => ",w(this.browseName   + " " + this.nodeId.toString(),30),
-        //   "  PARENT   ",w(related_node.browseName + " " + related_node.nodeId.toString(),30) , reference.toString());
-        //
-        // }
+
         (related_node as BaseNodeImpl)._add_backward_reference(
             new ReferenceImpl({
                 _referenceType: getReferenceType(reference),
@@ -1630,7 +1622,7 @@ function normalize_referenceTypeId(addressSpace: IAddressSpace, referenceTypeId?
     try {
         nodeId = addressSpace.resolveNodeId(referenceTypeId);
     } catch (err) {
-        console.log("cannot normalize_referenceTypeId", referenceTypeId);
+        errorLog("cannot normalize_referenceTypeId", referenceTypeId);
         throw err;
     }
     assert(nodeId);
@@ -1790,14 +1782,14 @@ function install_components_as_object_properties(parentObj: BaseNode) {
         if (Object.prototype.hasOwnProperty.call(reservedNames, name)) {
             // ignore reserved names
             if (doDebug) {
-                console.log(chalk.bgWhite.red("Ignoring reserved keyword                                               " + name));
+                debugLog(chalk.bgWhite.red("Ignoring reserved keyword                                               " + name));
             }
             continue;
         }
 
         // ignore reserved names
         if (doDebug) {
-            console.log("Installing property " + name, " on ", parentObj.browseName.toString());
+            debugLog("Installing property " + name, " on ", parentObj.browseName.toString());
         }
 
         /* istanbul ignore next */