node-opcua-address-space 2.111.0 → 2.113.0

package/src/namespace_impl.ts

@@ -1709,7 +1709,7 @@ export class NamespaceImpl implements NamespacePrivate {
                 break;
             default:
                 // tslint:disable-next-line:no-console
-                console.log("Invalid class Name", node.nodeClass);
+                errorLog("Invalid class Name", node.nodeClass);
                 throw new Error("Invalid class name specified");
         }
     }
@@ -1733,13 +1733,13 @@ export class NamespaceImpl implements NamespacePrivate {
             if (match) {
                 const correctedName = match[1];
                 // the application is using an old scheme
-                console.log(
+                warningLog(
                     chalk.green(
                         "Warning : since node-opcua 0.4.2 " + "namespace index should not be prepended to the browse name anymore"
                     )
                 );
-                console.log("   ", options.browseName, " will be replaced with ", correctedName);
-                console.log(" Please update your code");
+                warningLog("   ", options.browseName, " will be replaced with ", correctedName);
+                warningLog(" Please update your code");
 
                 const indexVerify = parseInt(match[0], 10);
                 if (indexVerify !== this.index) {
@@ -1819,7 +1819,7 @@ export class NamespaceImpl implements NamespacePrivate {
                 break;
             default:
                 // tslint:disable:no-console
-                console.log("Invalid class Name", node.nodeClass);
+                warningLog("Invalid class Name", node.nodeClass);
                 throw new Error("Invalid class name specified");
         }
         const deleted = this._nodeid_index.delete(hashKey);
@@ -2234,7 +2234,6 @@ function _create_node_version_if_needed(node: BaseNode, options: { nodeVersion:
             propertyOf: node
         });
         const initialValue = typeof options.nodeVersion === "string" ? options.nodeVersion : "0";
-        // xx console.log(" init value =",initialValue);
         nodeVersion.setValueFromSource({ dataType: "String", value: initialValue });
     }
 }

package/src/nodeset_tools/construct_namespace_dependency.ts

@@ -1,11 +1,12 @@
 import { INamespace, UADataType, UAVariable, UAVariableType } from "node-opcua-address-space-base";
 import { NodeClass } from "node-opcua-data-model";
 import { StructureField } from "node-opcua-types";
-import { make_warningLog } from "node-opcua-debug";
+import { make_debugLog, make_warningLog } from "node-opcua-debug";
 import { NamespacePrivate } from "../namespace_private";
 import { BaseNodeImpl, getReferenceType } from "../base_node_impl";
 
 const warningLog = make_warningLog(__filename);
+const debugLog = make_debugLog(__filename);
 
 function _constructNamespaceDependency(
     namespace: INamespace,
@@ -71,7 +72,7 @@ function _constructNamespaceDependency(
             } else {
                 // istanbul ignore next
                 if (dataTypeNodeId.value != 0) {
-                    console.log("Internal error: Cannot find dataType", dataTypeNodeId.toString());
+                    warningLog("Warning: Cannot find dataType", dataTypeNodeId.toString());
                 }
             }
         }
@@ -151,12 +152,16 @@ export function constructNamespaceDependency(namespace: INamespace, priorityTabl
 
     _constructNamespaceDependency(namespace, dependency, depMap, _visitedDataType, priorityTable);
 
-    doDebug && console.log("namespace : ", namespace.index, namespace.namespaceUri);
-    doDebug && console.log("   ", dependency.map((d)=>d.index + " " + d.namespaceUri).join("\n   "));
+    // istanbul ignore next
+    doDebug && debugLog("namespace : ", namespace.index, namespace.namespaceUri);
+    // istanbul ignore next
+    doDebug && debugLog("   ", dependency.map((d) => d.index + " " + d.namespaceUri).join("\n   "));
 
-    const sorted = dependency.sort((a, b) => priorityTable![a.index] < priorityTable![b.index] ? -1 : 1);
-    doDebug && console.log("sorted:")
-    doDebug && console.log("   ", sorted.map((d)=>d.index + " " + d.namespaceUri).join("\n   "));
+    const sorted = dependency.sort((a, b) => (priorityTable![a.index] < priorityTable![b.index] ? -1 : 1));
+    // istanbul ignore next
+    doDebug && debugLog("sorted:");
+    // istanbul ignore next
+    doDebug && debugLog("   ", sorted.map((d) => d.index + " " + d.namespaceUri).join("\n   "));
 
     return sorted;
 }

package/src/nodeset_tools/nodeset_to_xml.ts

@@ -48,6 +48,7 @@ import { UAMethodImpl } from "../ua_method_impl";
 import { UADataTypeImpl } from "../ua_data_type_impl";
 import { UAVariableTypeImpl } from "../ua_variable_type_impl";
 import { SessionContext } from "../index_current";
+import { UAViewImpl } from "../ua_view_impl";
 
 import { DefinitionMap2, TypeInfo } from "../../source/loader/make_xml_extension_object_parser";
 import { makeDefinitionMap } from "../../source/loader/decode_xml_extension_object";
@@ -56,7 +57,6 @@ import {
     constructNamespacePriorityTable,
     hasHigherPriorityThan
 } from "./construct_namespace_dependency";
-import { UAViewImpl } from "../ua_view_impl";
 
 // tslint:disable:no-var-requires
 const XMLWriter = require("xml-writer");
@@ -141,7 +141,6 @@ function _dumpReferences(xw: XmlWriter, node: BaseNode) {
             if (reference.nodeId.namespace !== node.nodeId.namespace) {
                 // todo: may be check that reference.nodeId.namespace is one of the namespace
                 // on which our namespace is build and not a derived one !
-                // xx console.log("xxxxxxxxxxxxxx Keeping => ", referenceType.toString(), reference.node?.nodeId.toString());
                 return true;
             }
         }
@@ -374,8 +373,8 @@ function _dumpVariantInnerExtensionObject(
                 if (types.isNativeError(err)) {
                     errorLog("Error in _dumpVariantExtensionObjectValue_Body !!!", err.message);
                 }
-                console.log(name);
-                console.log(field);
+                debugLog(name);
+                debugLog(field);
                 // throw err;
             }
             restoreDefaultNamespace(xw);
@@ -616,7 +615,7 @@ function _dumpValue(xw: XmlWriter, node: UAVariable | UAVariableType, value: Var
 
     const dataTypeNode = addressSpace.findDataType(node.dataType);
     if (!dataTypeNode) {
-        console.log("Cannot find dataType:", node.dataType);
+        debugLog("Cannot find dataType:", node.dataType);
         return;
     }
     const dataTypeName = dataTypeNode.browseName.name!.toString();
@@ -764,7 +763,7 @@ function dumpReferencedNodes(xw: XmlWriter, node: BaseNode, forward: boolean) {
             assert(nodeChild instanceof BaseNodeImpl);
             if (nodeChild.nodeId.namespace === node.nodeId.namespace) {
                 if (!xw.visitedNode[_hash(nodeChild)]) {
-                    console.log(
+                    debugLog(
                         node.nodeId.toString(),
                         " dumping child ",
                         nodeChild.browseName.toString(),
@@ -1053,7 +1052,7 @@ function dumpUAVariableType(xw: XmlWriter, node: UAVariableType) {
         const dataTypeNode = addressSpace.findNode(node.dataType);
         if (!dataTypeNode) {
             // throw new Error(" cannot find datatype " + node.dataType);
-            console.log(
+            debugLog(
                 " cannot find datatype " +
                 node.dataType +
                 " for node " +
@@ -1418,8 +1417,8 @@ NamespaceImpl.prototype.toNodeset2XML = function (this: NamespaceImpl) {
     // let's sort the dependencies in the same order as the translation table
     const sortedDependencies = dependency.sort((a, b) => translationTable[a.index] > translationTable[b.index] ? 1 : -1);
 
-    doDebug && console.log(sortedDependencies.map((a) => a.index + " + " + a.namespaceUri).join("\n"));
-    doDebug && console.log("translation table ", translationTable);
+    doDebug && debugLog(sortedDependencies.map((a) => a.index + " + " + a.namespaceUri).join("\n"));
+    doDebug && debugLog("translation table ", translationTable);
 
     for (const depend of sortedDependencies) {
         if (depend.index === 0) {

package/src/reference_impl.ts

@@ -78,7 +78,7 @@ export function resolveReferenceType(addressSpace: MinimalistAddressSpace, refer
     const _reference = reference as ReferenceImpl;
     if (!_reference._referenceType) {
         if (!_reference.referenceType) {
-            console.log(chalk.red("ERROR MISSING reference"), reference);
+            errorLog(chalk.red("ERROR MISSING reference"), reference);
         }
         _reference._referenceType = addressSpace.findReferenceType(reference.referenceType)!;
     }
@@ -169,3 +169,7 @@ export class ReferenceImpl implements UAReference {
         */
     }
 }
+function errorLog(arg0: string, reference: UAReference) {
+    throw new Error("Function not implemented.");
+}
+

package/src/state_machine/finite_state_machine.ts

@@ -14,7 +14,7 @@ import {
     QualifiedName
 } from "node-opcua-data-model";
 import { AttributeIds } from "node-opcua-data-model";
-import { make_warningLog } from "node-opcua-debug";
+import { make_debugLog, make_warningLog } from "node-opcua-debug";
 import { NodeId, sameNodeId } from "node-opcua-nodeid";
 import { StatusCodes } from "node-opcua-status-code";
 import { DataType, Variant, VariantArrayType } from "node-opcua-variant";
@@ -35,6 +35,7 @@ import { UAObjectTypeImpl } from "../ua_object_type_impl";
 const warningLog = make_warningLog(__filename);
 
 const doDebug = false;
+const debugLog = make_debugLog(__filename);
 
 export declare interface UATransitionImpl extends UATransition, UATransitionEx {}
 export class UATransitionImpl implements UATransition, UATransitionEx {}
@@ -217,8 +218,7 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
         if (!transition) {
             // istanbul ignore next
             if (doDebug) {
-                // tslint:disable-next-line: no-console
-                console.log(" No transition from ", this.currentStateNode.browseName.toString(), " to ", toStateNode.toString());
+                debugLog(" No transition from ", this.currentStateNode.browseName.toString(), " to ", toStateNode.toString());
             }
             return false;
         }
@@ -522,7 +522,6 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
                 }
             };
             applyLastTransitionOptionalProps();
-            // xx console.log("transitionNode ",transitionNode.toString());
             // The inherited Property SourceNode shall be filled with the NodeId of the StateMachine instance where the
             // Transition occurs. If the Transition occurs in a SubStateMachine, then the NodeId of the SubStateMachine
             // has to be used. If the Transition occurs between a StateMachine and a SubStateMachine, then the NodeId of

package/src/state_machine/ua_shelving_state_machine_ex.ts

@@ -125,7 +125,6 @@ function _unshelve_method(inputArguments: VariantLike[], context: ISessionContex
 export function _clear_timer_if_any(shelvingState: UAShelvedStateMachineExImpl): void {
     if (shelvingState._timer) {
         clearTimeout(shelvingState._timer);
-        // xx console.log("_clear_timer_if_any shelvingState = ",shelvingState._timer,shelvingState.constructor.name);
         shelvingState._timer = null;
     }
 }
@@ -134,6 +133,7 @@ function _automatically_unshelve(shelvingState: UAShelvedStateMachineExImpl) {
     assert(shelvingState._timer, "expecting timerId to be set");
     shelvingState._timer = null;
 
+    // istanbul ignore next
     if (doDebug) {
         debugLog("Automatically unshelving variable ", shelvingState.browseName.toString());
     }
@@ -157,6 +157,7 @@ function _start_timer_for_automatic_unshelve(shelvingState: UAShelvedStateMachin
     shelvingState._sheveldTime = new Date(); // now
     shelvingState._duration = duration;
 
+    // istanbul ignore next
     if (doDebug) {
         debugLog("shelvingState._duration", shelvingState._duration);
     }
@@ -217,8 +218,6 @@ function _timedShelve_method(
     assert(inputArguments[0].dataType === DataType.Double); // Duration
     assert(inputArguments[0] instanceof Variant);
 
-    // xx console.log("inputArguments",inputArguments[0].toString());
-
     const proposedDuration = inputArguments[0].value; // as double (milliseconds)
     if (proposedDuration > maxTimeShelved) {
         return callback(null, {

package/src/state_machine/ua_two_state_variable.ts

@@ -63,7 +63,6 @@ function _updateTransitionTime(node: UATwoStateVariableEx, _subState?: UAVariabl
 
 function _updateEffectiveTransitionTime(node: UATwoStateVariableImpl) {
     if (node.effectiveTransitionTime) {
-        // xx console.log("xxxx _updateEffectiveTransitionTime
         // because subStateNode ",subStateNode.browseName.toString());
         node.effectiveTransitionTime.setValueFromSource({
             dataType: DataType.DateTime,

package/src/ua_data_type_impl.ts

@@ -431,27 +431,3 @@ function makeStructureDefinition(
     });
     return sd;
 }
-
-/*
-function lockReadOnlyWithWriteDetection<T>(obj: T): T {
-    if (obj instanceof Array) {
-        return obj.map(lockReadOnlyWithWriteDetection) as unknown as T;
-    }
-    if (obj instanceof Object) {
-        const _org = obj;
-        for (const [key, value] of Object.entries(obj)) {
-            lockReadOnlyWithWriteDetection(value);
-        }
-        obj = new Proxy(obj, {
-            get: (target: any, prop: string) => {
-                return target[prop];
-            },
-            set: (target: any, prop: string | symbol, value: any, receiver: any) => {
-                console.log("QQQQQ Cannot modify stuff ");
-                throw new Error("Invalid");
-            }
-        });
-    }
-    return obj;
-}
-*/