node-opcua-client-proxy 2.56.2 → 2.60.0

package/LICENSE

@@ -1,20 +1,20 @@
-The MIT License (MIT)
-
-Copyright (c) 2014-2021 Etienne Rossignon
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2014-2021 Etienne Rossignon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/dist/object_explorer.js

@@ -11,12 +11,13 @@ const node_opcua_service_call_1 = require("node-opcua-service-call");
 const node_opcua_status_code_1 = require("node-opcua-status-code");
 const node_opcua_utils_1 = require("node-opcua-utils");
 const node_opcua_variant_1 = require("node-opcua-variant");
+const node_opcua_debug_1 = require("node-opcua-debug");
 const proxy_1 = require("./proxy");
 const proxy_variable_1 = require("./proxy_variable");
+const doDebug = false;
+const errorLog = (0, node_opcua_debug_1.make_errorLog)("Proxy");
+const debugLog = (0, node_opcua_debug_1.make_debugLog)("Proxy");
 const resultMask = (0, node_opcua_data_model_1.makeResultMask)("ReferenceType | IsForward | BrowseName | NodeClass | TypeDefinition");
-function convertNodeIdToDataType(dataTypeId) {
-    return dataTypeId._dataType;
-}
 /**
  * @method convertNodeIdToDataTypeAsync
  *
@@ -97,36 +98,38 @@ function convertNodeIdToDataTypeAsync(session, dataTypeId, callback) {
         });
     });
 }
-/**
- * @method add_method
- * @private
- */
-function add_method(proxyManager, obj, reference, outerCallback) {
-    const session = proxyManager.session;
-    const name = (0, node_opcua_utils_1.lowerFirstLetter)(reference.browseName.name);
-    obj[name] = function functionCaller(inputArgs, callback) {
+function convertToVariant(value, arg, propName) {
+    const dataType = arg._basicDataType || node_opcua_variant_1.DataType.Null;
+    const arrayType = arg.valueRank === 1 ? node_opcua_variant_1.VariantArrayType.Array : arg.valueRank === -1 ? node_opcua_variant_1.VariantArrayType.Scalar : node_opcua_variant_1.VariantArrayType.Matrix;
+    if (value === undefined) {
+        throw new Error("expecting input argument ");
+    }
+    if (arrayType === node_opcua_variant_1.VariantArrayType.Array) {
+        if (!Array.isArray(value)) {
+            throw new Error("expecting value to be an Array or a TypedArray");
+        }
+    }
+    return new node_opcua_variant_1.Variant({ arrayType, dataType, value });
+}
+function convertToVariantArray(inputArgsDef, inputArgs) {
+    const inputArguments = inputArgsDef.map((arg) => {
+        const propName = (0, node_opcua_utils_1.lowerFirstLetter)(arg.name || "");
+        const value = inputArgs[propName];
+        return convertToVariant(value, arg, propName);
+    });
+    return inputArguments;
+}
+function makeFunction(obj, methodName) {
+    return function functionCaller(inputArgs, callback) {
+        const session = this.proxyManager.session;
         (0, node_opcua_assert_1.assert)(typeof callback === "function");
+        const methodDef = this.$methods[methodName];
         // convert input arguments into Variants
-        const inputArgsDef = obj[name].inputArguments || [];
-        const inputArguments = inputArgsDef.map((arg) => {
-            const dataType = convertNodeIdToDataType(arg.dataType);
-            const arrayType = arg.valueRank === 1 ? node_opcua_variant_1.VariantArrayType.Array : node_opcua_variant_1.VariantArrayType.Scalar;
-            // xx console.log("xxx ",arg.toString());
-            const propName = (0, node_opcua_utils_1.lowerFirstLetter)(arg.name);
-            const value = inputArgs[propName];
-            if (value === undefined) {
-                throw new Error("expecting input argument " + propName);
-            }
-            if (arrayType === node_opcua_variant_1.VariantArrayType.Array) {
-                if (!Array.isArray(value)) {
-                    throw new Error("expecting value to be an Array or a TypedArray");
-                }
-            }
-            return new node_opcua_variant_1.Variant({ arrayType, dataType, value });
-        });
+        const inputArgsDef = methodDef.inputArguments || [];
+        const inputArguments = convertToVariantArray(inputArgsDef, inputArgs);
         const methodToCall = new node_opcua_service_call_1.CallMethodRequest({
             inputArguments,
-            methodId: reference.nodeId,
+            methodId: methodDef.nodeId,
             objectId: obj.nodeId
         });
         session.call(methodToCall, (err, callResult) => {
@@ -139,73 +142,89 @@ function add_method(proxyManager, obj, reference, outerCallback) {
                 return callback(new Error("Error " + callResult.statusCode.toString()));
             }
             callResult.outputArguments = callResult.outputArguments || [];
-            obj[name].outputArguments = obj[name].outputArguments || [];
-            if (callResult.outputArguments.length !== obj[name].outputArguments.length) {
+            if (callResult.outputArguments.length !== methodDef.outputArguments.length) {
                 return callback(new Error("Internal error callResult.outputArguments.length " +
                     callResult.outputArguments.length +
                     " " +
-                    obj[name].outputArguments.length));
+                    obj[methodName].outputArguments.length));
             }
-            const outputArgs = {};
-            const outputArgsDef = obj[name].outputArguments;
-            outputArgsDef.map((arg, index) => {
+            const output = {};
+            methodDef.outputArguments.map((arg, index) => {
                 const variant = callResult.outputArguments[index];
                 const propName = (0, node_opcua_utils_1.lowerFirstLetter)(arg.name);
-                outputArgs[propName] = variant.value;
+                output[propName] = variant.value;
             });
-            callback(err, outputArgs);
+            callback(err, output);
         });
     };
-    function extractDataType(arg, callback) {
-        if (arg.dataType && arg.dataType._dataType) {
-            setImmediate(callback); // already converted
-            return;
-        }
-        convertNodeIdToDataTypeAsync(session, arg.dataType, (err, dataType) => {
-            if (!err) {
-                arg.dataType._dataType = dataType;
-            }
-            callback(err);
-        });
+}
+function extractDataType(session, arg, callback) {
+    if (arg.dataType && arg._basicDataType) {
+        setImmediate(callback); // already converted
+        return;
     }
-    const methodObj = {
-        browseName: name,
-        executableFlag: false,
-        func: obj[name],
-        nodeId: reference.nodeId
-    };
-    obj.$methods[name] = methodObj;
+    convertNodeIdToDataTypeAsync(session, arg.dataType, (err, dataType) => {
+        if (!err) {
+            arg._basicDataType = dataType;
+        }
+        callback(err || undefined);
+    });
+}
+/**
+ * @method add_method
+ * @private
+ */
+function add_method(proxyManager, obj, reference, outerCallback) {
+    const session = proxyManager.session;
+    const methodName = (0, node_opcua_utils_1.lowerFirstLetter)(reference.browseName.name);
+    let inputArguments = [];
+    let outputArguments = [];
     // tslint:disable:no-shadowed-variable
     async.series([
         (callback) => {
-            session.getArgumentDefinition(reference.nodeId, (err, args) => {
+            session.getArgumentDefinition(reference.nodeId, (err, argumentDefinition) => {
                 // istanbul ignore next
                 if (err) {
-                    setImmediate(() => {
-                        callback(err);
-                    });
-                    return;
+                    errorLog("getArgumentDefinition failed ", err);
+                    return callback(err);
+                }
+                // istanbul ignore next
+                if (!argumentDefinition) {
+                    return callback(new Error("Internal Error"));
                 }
-                const inputArguments = args.inputArguments;
-                const outputArguments = args.outputArguments;
-                obj[name].inputArguments = inputArguments;
-                obj[name].outputArguments = outputArguments;
+                inputArguments = argumentDefinition.inputArguments || [];
+                outputArguments = argumentDefinition.outputArguments || [];
+                const _extractDataType = extractDataType.bind(null, session);
                 async.series([
-                    (callback) => {
-                        async.eachSeries(obj[name].inputArguments, extractDataType, (err) => callback(err));
-                    },
-                    (callback) => {
-                        async.eachSeries(obj[name].outputArguments, extractDataType, (err) => callback(err));
-                    }
+                    (innerCallback) => async.eachSeries(inputArguments, _extractDataType, innerCallback),
+                    (innerCallback) => async.eachSeries(outputArguments, _extractDataType, innerCallback)
                 ], (err) => callback(err));
             });
         },
         (callback) => {
+            const methodObj = {
+                browseName: methodName,
+                executableFlag: false,
+                func: makeFunction(obj, methodName),
+                nodeId: reference.nodeId,
+                inputArguments,
+                outputArguments
+            };
+            obj.$methods[methodName] = methodObj;
+            obj[methodName] = methodObj.func;
+            obj[methodName].inputArguments = inputArguments;
+            obj[methodName].outputArguments = outputArguments;
+            doDebug && debugLog("installing method name", methodName);
             proxyManager._monitor_execution_flag(methodObj, () => {
                 callback();
             });
         }
-    ], (err) => outerCallback(err));
+    ], (err) => {
+        if (err) {
+            errorLog("Error =>", err);
+        }
+        outerCallback(err);
+    });
 }
 function add_component(proxyManager, obj, reference, callback) {
     const session = proxyManager.session;
@@ -252,7 +271,6 @@ function add_typeDefinition(proxyManager, obj, references, callback) {
     const session = proxyManager.session;
     references = references || [];
     if (references.length !== 1) {
-        // xx console.log(" cannot find type definition", references.length);
         setImmediate(callback);
         return;
     }
@@ -299,6 +317,11 @@ class ObjectExplorer {
     }
 }
 exports.ObjectExplorer = ObjectExplorer;
+function t(references) {
+    if (!references)
+        return "";
+    return references.map((r) => r.browseName.name + " " + r.nodeId.toString());
+}
 function readUAStructure(proxyManager, obj, callback) {
     const session = proxyManager.session;
     //   0   Object
@@ -374,27 +397,26 @@ function readUAStructure(proxyManager, obj, callback) {
         }
     ];
     session.browse(nodesToBrowse, (err, browseResults) => {
-        function t(references) {
-            return references.map((r) => r.browseName.name + " " + r.nodeId.toString());
-        }
         browseResults = browseResults || [];
         // istanbul ignore next
         if (err) {
             return callback(err);
         }
-        // xx console.log("Components", t(results[0].references));
-        // xx console.log("Properties", t(results[1].references));
-        // xx console.log("Methods", t(results[2].references));
+        if (doDebug) {
+            debugLog("Components", t(browseResults[0].references));
+            debugLog("Properties", t(browseResults[1].references));
+            debugLog("Methods", t(browseResults[2].references));
+        }
         async.series([
             (callback) => {
-                async.mapSeries(browseResults[0].references, (reference, callback) => add_component(proxyManager, obj, reference, callback), (err) => callback(err));
+                async.mapSeries(browseResults[0].references, (reference, innerCallback) => add_component(proxyManager, obj, reference, innerCallback), (err) => callback(err));
             },
             (callback) => {
-                async.mapSeries(browseResults[1].references, (reference, callback) => add_property(proxyManager, obj, reference, callback), (err) => callback(err));
+                async.mapSeries(browseResults[1].references, (reference, innerCallback) => add_property(proxyManager, obj, reference, innerCallback), (err) => callback(err));
             },
             // now enrich our object with nice callable async methods
             (callback) => {
-                async.mapSeries(browseResults[2].references, (reference, callback) => add_method(proxyManager, obj, reference, callback), (err) => callback(err));
+                async.mapSeries(browseResults[2].references, (reference, innerCallback) => add_method(proxyManager, obj, reference, innerCallback), (err) => callback(err));
             },
             // now set typeDefinition
             (callback) => {

package/dist/object_explorer.js.map

@@ -1 +1 @@
-{"version":3,"file":"object_explorer.js","sourceRoot":"","sources":["../source/object_explorer.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,+BAA+B;AAE/B,yDAA2C;AAE3C,iEAAyG;AAKzG,qEAA8E;AAC9E,mEAAqD;AACrD,uDAAoD;AACpD,2DAAyE;AAEzE,mCAAoC;AAEpC,qDAAiD;AASjD,MAAM,UAAU,GAAG,IAAA,sCAAc,EAAC,qEAAqE,CAAC,CAAC;AAEzG,SAAS,uBAAuB,CAAC,UAAkB;IAC/C,OAAQ,UAAkB,CAAC,SAAqB,CAAC;AACrD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,SAAS,4BAA4B,CAAC,OAAsB,EAAE,UAAkB,EAAE,QAA4B;IAC1G,MAAM,UAAU,GAAG;QACf,WAAW,EAAE,oCAAY,CAAC,UAAU;QACpC,MAAM,EAAE,UAAU;KACrB,CAAC;IAEF,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,GAAiB,EAAE,SAAqB,EAAE,EAAE;QAClE,uBAAuB;QACvB,IAAI,GAAG,EAAE;YACL,YAAY,CAAC,GAAG,EAAE;gBACd,QAAQ,CAAC,GAAG,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;YACH,OAAO;SACV;QAED,SAAS,GAAG,SAAU,CAAC;QAEvB,IAAI,QAAkB,CAAC;QACvB,uBAAuB;QACvB,IAAI,SAAS,CAAC,UAAU,KAAK,oCAAW,CAAC,IAAI,EAAE;YAC3C,QAAQ,GAAG,6BAAQ,CAAC,IAAI,CAAC;YACzB,YAAY,CAAC,GAAG,EAAE;gBACd,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC7B,CAAC,CAAC,CAAC;YACH,OAAO;SACV;QAED,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC;QAE3C,IAAI,UAAU,CAAC,SAAS,KAAK,CAAC,IAAI,6BAAQ,CAAC,UAAU,CAAC,KAAe,CAAC,EAAE;YACpE,QAAQ,GAAI,6BAAgB,CAAC,UAAU,CAAC,KAAe,CAAa,CAAC;YACrE,YAAY,CAAC,GAAG,EAAE;gBACd,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC7B,CAAC,CAAC,CAAC;YACH,OAAO;SACV;QAED,gDAAgD;QAChD,iBAAiB;QACjB,MAAM,YAAY,GAAG;YACjB,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,KAAK;YACtB,MAAM,EAAE,UAAU;YAClB,oBAAoB;YACpB,eAAe,EAAE,IAAA,iBAAS,EAAC,YAAY,CAAC;YACxC,qDAAqD;YACrD,UAAU;SACb,CAAC;QACF,sCAAsC;QACtC,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,GAAiB,EAAE,YAA2B,EAAE,EAAE;YAC5E,uBAAuB;YACvB,IAAI,GAAG,EAAE;gBACL,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;aACxB;YAED,MAAM,UAAU,GAAG,YAAa,CAAC,UAAU,CAAC;YAE5C,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;gBACxC,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,2BAA2B,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;aACrF;YACD,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YACpC,OAAO,4BAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED;;;GAGG;AACH,SAAS,UAAU,CAAC,YAA4B,EAAE,GAAQ,EAAE,SAA+B,EAAE,aAAoC;IAC7H,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;IAErC,MAAM,IAAI,GAAG,IAAA,mCAAgB,EAAC,SAAS,CAAC,UAAU,CAAC,IAAK,CAAC,CAAC;IAE1D,GAAG,CAAC,IAAI,CAAC,GAAG,SAAS,cAAc,CAAC,SAAc,EAAE,QAAmD;QACnG,IAAA,0BAAM,EAAC,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC;QACvC,wCAAwC;QACxC,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,cAAc,IAAI,EAAE,CAAC;QAEpD,MAAM,cAAc,GAAc,YAAY,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,EAAE;YAC5D,MAAM,QAAQ,GAAG,uBAAuB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAEvD,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,qCAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,qCAAgB,CAAC,MAAM,CAAC;YAEzF,yCAAyC;YACzC,MAAM,QAAQ,GAAG,IAAA,mCAAgB,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAE5C,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;YAClC,IAAI,KAAK,KAAK,SAAS,EAAE;gBACrB,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,QAAQ,CAAC,CAAC;aAC3D;YACD,IAAI,SAAS,KAAK,qCAAgB,CAAC,KAAK,EAAE;gBACtC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBACvB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;iBACrE;aACJ;YACD,OAAO,IAAI,4BAAO,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,IAAI,2CAAiB,CAAC;YACvC,cAAc;YACd,QAAQ,EAAE,SAAS,CAAC,MAAM;YAC1B,QAAQ,EAAE,GAAG,CAAC,MAAM;SACvB,CAAC,CAAC;QAEH,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,GAAiB,EAAE,UAA6B,EAAE,EAAE;YAC5E,uBAAuB;YACvB,IAAI,GAAG,EAAE;gBACL,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;aACxB;YAED,UAAU,GAAG,UAAW,CAAC;YAEzB,IAAI,UAAU,CAAC,UAAU,KAAK,oCAAW,CAAC,IAAI,EAAE;gBAC5C,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,QAAQ,GAAG,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;aAC3E;YAED,UAAU,CAAC,eAAe,GAAG,UAAU,CAAC,eAAe,IAAI,EAAE,CAAC;YAE9D,GAAG,CAAC,IAAI,CAAC,CAAC,eAAe,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,eAAe,IAAI,EAAE,CAAC;YAE5D,IAAI,UAAU,CAAC,eAAe,CAAC,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE;gBACxE,OAAO,QAAQ,CACX,IAAI,KAAK,CACL,mDAAmD;oBAC/C,UAAU,CAAC,eAAe,CAAC,MAAM;oBACjC,GAAG;oBACH,GAAG,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,MAAM,CACvC,CACJ,CAAC;aACL;YAED,MAAM,UAAU,GAAQ,EAAE,CAAC;YAE3B,MAAM,aAAa,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC;YAChD,aAAa,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,KAAa,EAAE,EAAE;gBAC1C,MAAM,OAAO,GAAG,UAAW,CAAC,eAAgB,CAAC,KAAK,CAAC,CAAC;gBACpD,MAAM,QAAQ,GAAG,IAAA,mCAAgB,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC5C,UAAU,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;YACzC,CAAC,CAAC,CAAC;YAEH,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,SAAS,eAAe,CAAC,GAAQ,EAAE,QAAa;QAC5C,IAAI,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,EAAE;YACxC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,oBAAoB;YAC5C,OAAO;SACV;QAED,4BAA4B,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAiB,EAAE,QAAmB,EAAE,EAAE;YAC3F,IAAI,CAAC,GAAG,EAAE;gBACN,GAAG,CAAC,QAAQ,CAAC,SAAS,GAAG,QAAQ,CAAC;aACrC;YACD,QAAQ,CAAC,GAAG,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM,SAAS,GAAG;QACd,UAAU,EAAE,IAAI;QAChB,cAAc,EAAE,KAAK;QACrB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC;QACf,MAAM,EAAE,SAAS,CAAC,MAAM;KAC3B,CAAC;IACF,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAE/B,sCAAsC;IACtC,KAAK,CAAC,MAAM,CACR;QACI,CAAC,QAAuB,EAAE,EAAE;YACxB,OAAO,CAAC,qBAAqB,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,GAAiB,EAAE,IAAU,EAAE,EAAE;gBAC9E,uBAAuB;gBACvB,IAAI,GAAG,EAAE;oBACL,YAAY,CAAC,GAAG,EAAE;wBACd,QAAQ,CAAC,GAAG,CAAC,CAAC;oBAClB,CAAC,CAAC,CAAC;oBACH,OAAO;iBACV;gBACD,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;gBAC3C,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;gBAE7C,GAAG,CAAC,IAAI,CAAC,CAAC,cAAc,GAAG,cAAc,CAAC;gBAC1C,GAAG,CAAC,IAAI,CAAC,CAAC,eAAe,GAAG,eAAe,CAAC;gBAE5C,KAAK,CAAC,MAAM,CACR;oBACI,CAAC,QAAuB,EAAE,EAAE;wBACxB,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,eAAe,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAI,CAAC,CAAC,CAAC;oBACzF,CAAC;oBACD,CAAC,QAAuB,EAAE,EAAE;wBACxB,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,eAAe,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAI,CAAC,CAAC,CAAC;oBAC1F,CAAC;iBACJ,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAI,CAAC,CAC1B,CAAC;YACN,CAAC,CAAC,CAAC;QACP,CAAC;QAED,CAAC,QAAuB,EAAE,EAAE;YACxB,YAAY,CAAC,uBAAuB,CAAC,SAAS,EAAE,GAAG,EAAE;gBACjD,QAAQ,EAAE,CAAC;YACf,CAAC,CAAC,CAAC;QACP,CAAC;KACJ,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,aAAa,CAAC,GAAI,CAAC,CAC/B,CAAC;AACN,CAAC;AAED,SAAS,aAAa,CAAC,YAA4B,EAAE,GAAQ,EAAE,SAA+B,EAAE,QAA+B;IAC3H,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;IAErC,MAAM,IAAI,GAAG,IAAA,mCAAgB,EAAC,SAAS,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IAE/D,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,GAAkB,EAAE,QAAc,EAAE,EAAE;QAC5E,uBAAuB;QACvB,IAAI,CAAC,GAAG,EAAE;YACN,QAAQ,GAAG,IAAI,cAAc,CAAC;gBAC1B,IAAI;gBACJ,MAAM,EAAE,SAAS,CAAC,MAAM;gBACxB,MAAM,EAAE,GAAG;gBACX,YAAY;aACf,CAAC,CAAC;YACH,GAAG,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;YACrB,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAE/B,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;SAC/B;aAAM;YACH,QAAQ,CAAC,GAAG,CAAC,CAAC;SACjB;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,gBAAgB,CACrB,YAA4B,EAC5B,GAAQ,EACR,SAA+B,EAC/B,QAA+B;IAE/B,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;IAErC,MAAM,IAAI,GAAG,IAAA,mCAAgB,EAAC,SAAS,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IAE/D,MAAM,QAAQ,GAAG,IAAI,cAAc,CAAC;QAChC,IAAI;QACJ,MAAM,EAAE,SAAS,CAAC,MAAM;QACxB,MAAM,EAAE,GAAG;QACX,YAAY;KACf,CAAC,CAAC;IAEH,GAAG,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;IACrB,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9B,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,YAAY,CAAC,YAA4B,EAAE,GAAQ,EAAE,SAA+B,EAAE,QAA+B;IAC1H,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;IAErC,MAAM,IAAI,GAAG,IAAA,mCAAgB,EAAC,SAAS,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IAE/D,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,8BAAa,CAAC,YAAY,EAAE,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACzE,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;IAElC,YAAY,CAAC,QAAQ,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,kBAAkB,CACvB,YAA4B,EAC5B,GAAQ,EACR,UAAkC,EAClC,QAA+B;IAE/B,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;IACrC,UAAU,GAAG,UAAU,IAAI,EAAE,CAAC;IAC9B,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QACzB,qEAAqE;QACrE,YAAY,CAAC,QAAQ,CAAC,CAAC;QACvB,OAAO;KACV;IACD,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAChC,IAAA,0BAAM,EAAC,CAAC,GAAG,CAAC,cAAc,EAAE,sCAAsC,CAAC,CAAC;IACpE,GAAG,CAAC,cAAc,GAAG,SAAS,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC;IACrD,YAAY,CAAC,QAAQ,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,YAAY,CAAC,YAA4B,EAAE,GAAQ,EAAE,SAA+B,EAAE,QAA+B;IAC1H,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,GAAiB,EAAE,QAAa,EAAE,EAAE;QAC1E,IAAI,GAAG,EAAE;YACL,QAAQ,CAAC,GAAG,CAAC,CAAC;SACjB;QACD,GAAG,CAAC,UAAU,GAAG,QAAQ,CAAC;QAC1B,QAAQ,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,UAAU,CAAC,YAA4B,EAAE,GAAQ,EAAE,SAA+B,EAAE,QAA+B;IACxH,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,GAAiB,EAAE,QAAa,EAAE,EAAE;QAC1E,IAAI,GAAG,EAAE;YACL,QAAQ,CAAC,GAAG,CAAC,CAAC;SACjB;QACD,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACxB,QAAQ,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAa,cAAc;IAMvB,YAAY,OAA8B;QACtC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IACjC,CAAC;IAEM,QAAQ,CAAC,QAA+B;QAC3C,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,GAAiB,EAAE,QAAa,EAAE,EAAE;YAC1E,uBAAuB;YACvB,IAAI,GAAG,EAAE;gBACL,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;aACxB;YAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAEvC,QAAQ,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AA1BD,wCA0BC;AAED,SAAgB,eAAe,CAAC,YAA4B,EAAE,GAAuB,EAAE,QAAuB;IAC1G,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;IAErC,eAAe;IACf,iBAAiB;IACjB,eAAe;IACf,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,MAAM,aAAa,GAAG;QAClB,8BAA8B;QAC9B;YACI,oBAAoB;YACpB,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,IAAI;YACrB,aAAa,EAAE,IAAA,yCAAiB,EAAC,mBAAmB,CAAC;YACrD,MAAM;YACN,eAAe,EAAE,IAAA,iBAAS,EAAC,cAAc,CAAC;YAC1C,UAAU;SACb;QACD,aAAa;QACb;YACI,oBAAoB;YACpB,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,IAAI;YACrB,gDAAgD;YAChD,MAAM;YACN,eAAe,EAAE,IAAA,iBAAS,EAAC,aAAa,CAAC;YACzC,UAAU;SACb;QAED,UAAU;QACV;YACI,oBAAoB;YACpB,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,IAAI;YACrB,aAAa,EAAE,IAAA,yCAAiB,EAAC,QAAQ,CAAC;YAC1C,MAAM;YACN,eAAe,EAAE,IAAA,iBAAS,EAAC,cAAc,CAAC;YAC1C,UAAU;SACb;QACD,iBAAiB;QACjB;YACI,oBAAoB;YACpB,eAAe,EAAE,uCAAe,CAAC,IAAI;YACrC,eAAe,EAAE,IAAI;YACrB,MAAM;YACN,eAAe,EAAE,IAAA,iBAAS,EAAC,mBAAmB,CAAC;YAC/C,UAAU;SACb;QACD,YAAY;QACZ;YACI,oBAAoB;YACpB,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,IAAI;YACrB,MAAM;YACN,eAAe,EAAE,IAAA,iBAAS,EAAC,WAAW,CAAC;YACvC,UAAU;SACb;QACD,UAAU;QACV;YACI,oBAAoB;YACpB,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,IAAI;YACrB,MAAM;YACN,eAAe,EAAE,IAAA,iBAAS,EAAC,SAAS,CAAC;YACrC,UAAU;SACb;QACD,2BAA2B;QAC3B;YACI,oBAAoB;YACpB,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,IAAI;YACrB,MAAM;YACN,eAAe,EAAE,IAAA,iBAAS,EAAC,WAAW,CAAC;YACvC,UAAU;SACb;KACJ,CAAC;IACF,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,GAAiB,EAAE,aAA8B,EAAE,EAAE;QAChF,SAAS,CAAC,CAAC,UAAkC;YACzC,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,CAAuB,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtG,CAAC;QAED,aAAa,GAAG,aAAa,IAAI,EAAE,CAAC;QAEpC,uBAAuB;QACvB,IAAI,GAAG,EAAE;YACL,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;SACxB;QAED,0DAA0D;QAC1D,0DAA0D;QAC1D,uDAAuD;QACvD,KAAK,CAAC,MAAM,CACR;YACI,CAAC,QAAuB,EAAE,EAAE;gBACxB,KAAK,CAAC,SAAS,CACX,aAAc,CAAC,CAAC,CAAC,CAAC,UAAW,EAC7B,CAAC,SAA+B,EAAE,QAAuB,EAAE,EAAE,CACzD,aAAa,CAAC,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,CAAC,EACzD,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAI,CAAC,CAC1B,CAAC;YACN,CAAC;YAED,CAAC,QAAuB,EAAE,EAAE;gBACxB,KAAK,CAAC,SAAS,CACX,aAAc,CAAC,CAAC,CAAC,CAAC,UAAW,EAC7B,CAAC,SAA+B,EAAE,QAAuB,EAAE,EAAE,CACzD,YAAY,CAAC,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,CAAC,EACxD,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAI,CAAC,CAC1B,CAAC;YACN,CAAC;YAED,yDAAyD;YACzD,CAAC,QAAuB,EAAE,EAAE;gBACxB,KAAK,CAAC,SAAS,CACX,aAAc,CAAC,CAAC,CAAC,CAAC,UAAW,EAC7B,CAAC,SAA+B,EAAE,QAAuB,EAAE,EAAE,CACzD,UAAU,CAAC,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,CAAC,EACtD,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAI,CAAC,CAC1B,CAAC;YACN,CAAC;YAED,yBAAyB;YACzB,CAAC,QAAuB,EAAE,EAAE;gBACxB,kBAAkB,CAAC,YAAY,EAAE,GAAG,EAAE,aAAc,CAAC,CAAC,CAAC,CAAC,UAAW,EAAE,QAAQ,CAAC,CAAC;YACnF,CAAC;YAED,YAAY;YACZ,CAAC,QAAuB,EAAE,EAAE;gBACxB,YAAY;gBACZ,MAAM,SAAS,GAAG,aAAc,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,aAAc,CAAC,CAAC,CAAC,CAAC,UAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBACzF,YAAY;gBACZ,IAAI,SAAS,EAAE;oBACX,OAAO,YAAY,CAAC,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;iBAC/D;gBACD,QAAQ,EAAE,CAAC;YACf,CAAC;YAED,UAAU;YACV,CAAC,QAAuB,EAAE,EAAE;gBACxB,MAAM,SAAS,GAAG,aAAc,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,aAAc,CAAC,CAAC,CAAC,CAAC,UAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBACzF,YAAY;gBACZ,IAAI,SAAS,EAAE;oBACX,OAAO,UAAU,CAAC,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;iBAC7D;gBACD,QAAQ,EAAE,CAAC;YACf,CAAC;YAED,YAAY;YACZ,CAAC,QAAuB,EAAE,EAAE;gBACxB,KAAK,CAAC,SAAS,CACX,aAAc,CAAC,CAAC,CAAC,CAAC,UAAW,EAC7B,CAAC,SAA+B,EAAE,QAAuB,EAAE,EAAE,CACzD,gBAAgB,CAAC,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,CAAC,EAC5D,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAI,CAAC,CAC1B,CAAC;YACN,CAAC;SACJ,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAI,CAAC,CAC1B,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC;AAhKD,0CAgKC"}
+{"version":3,"file":"object_explorer.js","sourceRoot":"","sources":["../source/object_explorer.ts"],"names":[],"mappings":"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"}

package/dist/proxy_base_node.d.ts

@@ -6,8 +6,20 @@ import { EventEmitter } from "events";
 import { NodeClass } from "node-opcua-data-model";
 import { DataValue } from "node-opcua-data-value";
 import { NodeId } from "node-opcua-nodeid";
-import { Variant } from "node-opcua-variant";
+import { Argument } from "node-opcua-service-call";
+import { DataType, Variant } from "node-opcua-variant";
 import { UAProxyManager } from "./proxy_manager";
+export interface ArgumentEx extends Argument {
+    _basicDataType: DataType;
+}
+export interface MethodDescription {
+    browseName: string;
+    executableFlag: boolean;
+    func: (input: Record<string, unknown>, callback: (err: Error | null, output?: Record<string, unknown>) => void) => void;
+    nodeId: NodeId;
+    inputArguments: ArgumentEx[];
+    outputArguments: ArgumentEx[];
+}
 export declare class ProxyBaseNode extends EventEmitter {
     /**
      * the object nodeId
@@ -32,7 +44,7 @@ export declare class ProxyBaseNode extends EventEmitter {
      * @property $methods
      * @type {Array<ProxyBaseNode>}
      */
-    $methods: any[];
+    $methods: MethodDescription[];
     /**
      * the Folder's elements
      * @property $organizes

package/dist/proxy_base_node.js.map

@@ -1 +1 @@
-{"version":3,"file":"proxy_base_node.js","sourceRoot":"","sources":["../source/proxy_base_node.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"proxy_base_node.js","sourceRoot":"","sources":["../source/proxy_base_node.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-client-proxy",
-    "version": "2.56.2",
+    "version": "2.60.0",
     "description": "pure nodejs OPCUA SDK - module -client-proxy",
     "scripts": {
         "clean": "node -e \"require('rimraf').sync('dist');\"",
@@ -12,22 +12,23 @@
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "dependencies": {
-        "async": "^3.2.1",
-        "node-opcua-address-space": "2.56.2",
+        "async": "^3.2.2",
+        "node-opcua-address-space": "2.60.0",
         "node-opcua-assert": "2.55.0",
         "node-opcua-constants": "2.52.0",
-        "node-opcua-data-model": "2.56.0",
-        "node-opcua-data-value": "2.56.0",
-        "node-opcua-nodeid": "2.55.0",
-        "node-opcua-pseudo-session": "2.56.2",
-        "node-opcua-service-browse": "2.56.2",
-        "node-opcua-service-call": "2.56.2",
-        "node-opcua-service-read": "2.56.2",
-        "node-opcua-service-subscription": "2.56.2",
-        "node-opcua-service-write": "2.56.2",
+        "node-opcua-data-model": "2.60.0",
+        "node-opcua-data-value": "2.60.0",
+        "node-opcua-debug": "2.60.0",
+        "node-opcua-nodeid": "2.60.0",
+        "node-opcua-pseudo-session": "2.60.0",
+        "node-opcua-service-browse": "2.60.0",
+        "node-opcua-service-call": "2.60.0",
+        "node-opcua-service-read": "2.60.0",
+        "node-opcua-service-subscription": "2.60.0",
+        "node-opcua-service-write": "2.60.0",
         "node-opcua-status-code": "2.56.0",
-        "node-opcua-utils": "2.56.0",
-        "node-opcua-variant": "2.56.0"
+        "node-opcua-utils": "2.60.0",
+        "node-opcua-variant": "2.60.0"
     },
     "author": "Etienne Rossignon",
     "license": "MIT",
@@ -44,5 +45,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "45dbf2f65d96a91fae6e884bb5006af4249cf1fa"
+    "gitHead": "56dc8584b9118ee2f3bfb0b2e9d456b609ccbac8"
 }

package/source/common.ts

@@ -1,3 +1,3 @@
-/**
- * @module node-opcua-client-proxy
- */
+/**
+ * @module node-opcua-client-proxy
+ */

package/source/index.ts

@@ -1,6 +1,6 @@
-/**
- * @module node-opcua-client-proxy
- */
-export * from "./proxy_manager";
-export * from "./proxy";
-export * from "./state_machine_proxy";
+/**
+ * @module node-opcua-client-proxy
+ */
+export * from "./proxy_manager";
+export * from "./proxy";
+export * from "./state_machine_proxy";

package/source/object_explorer.ts

@@ -8,16 +8,22 @@ import { Callback, ErrorCallback } from "node-opcua-status-code";
 import { AttributeIds, BrowseDirection, makeNodeClassMask, makeResultMask } from "node-opcua-data-model";
 import { DataValue } from "node-opcua-data-value";
 import { NodeId } from "node-opcua-nodeid";
-import { IBasicSession } from "node-opcua-pseudo-session";
+import { IBasicSession, ArgumentDefinition } from "node-opcua-pseudo-session";
 import { BrowseResult, ReferenceDescription } from "node-opcua-service-browse";
-import { CallMethodRequest, CallMethodResult } from "node-opcua-service-call";
+import { CallMethodRequest, CallMethodResult, Argument } from "node-opcua-service-call";
 import { StatusCodes } from "node-opcua-status-code";
 import { lowerFirstLetter } from "node-opcua-utils";
-import { DataType, Variant, VariantArrayType } from "node-opcua-variant";
+import { DataType, Variant, VariantArrayType, VariantLike } from "node-opcua-variant";
+import { make_errorLog, make_debugLog } from "node-opcua-debug";
 
 import { makeRefId } from "./proxy";
 import { UAProxyManager } from "./proxy_manager";
 import { ProxyVariable } from "./proxy_variable";
+import { MethodDescription, ArgumentEx } from "./proxy_base_node";
+
+const doDebug = false;
+const errorLog = make_errorLog("Proxy");
+const debugLog = make_debugLog("Proxy");
 
 export interface ObjectExplorerOptions {
     proxyManager: UAProxyManager;
@@ -28,10 +34,6 @@ export interface ObjectExplorerOptions {
 
 const resultMask = makeResultMask("ReferenceType | IsForward | BrowseName | NodeClass | TypeDefinition");
 
-function convertNodeIdToDataType(dataTypeId: NodeId): DataType {
-    return (dataTypeId as any)._dataType as DataType;
-}
-
 /**
  * @method convertNodeIdToDataTypeAsync
  *
@@ -121,43 +123,50 @@ function convertNodeIdToDataTypeAsync(session: IBasicSession, dataTypeId: NodeId
     });
 }
 
-/**
- * @method add_method
- * @private
- */
-function add_method(proxyManager: UAProxyManager, obj: any, reference: ReferenceDescription, outerCallback: (err?: Error) => void) {
-    const session = proxyManager.session;
+function convertToVariant(value: unknown, arg: ArgumentEx, propName: string): Variant {
+    const dataType = arg._basicDataType || DataType.Null;
+    const arrayType =
+        arg.valueRank === 1 ? VariantArrayType.Array : arg.valueRank === -1 ? VariantArrayType.Scalar : VariantArrayType.Matrix;
 
-    const name = lowerFirstLetter(reference.browseName.name!);
+    if (value === undefined) {
+        throw new Error("expecting input argument ");
+    }
+    if (arrayType === VariantArrayType.Array) {
+        if (!Array.isArray(value)) {
+            throw new Error("expecting value to be an Array or a TypedArray");
+        }
+    }
+    return new Variant({ arrayType, dataType, value });
+}
 
-    obj[name] = function functionCaller(inputArgs: any, callback: (err: Error | null, args?: any[]) => void) {
-        assert(typeof callback === "function");
-        // convert input arguments into Variants
-        const inputArgsDef = obj[name].inputArguments || [];
+function convertToVariantArray(inputArgsDef: ArgumentEx[], inputArgs: Record<string, unknown>): Variant[] {
+    const inputArguments: Variant[] = inputArgsDef.map((arg: ArgumentEx) => {
+        const propName = lowerFirstLetter(arg.name || "");
+        const value = inputArgs[propName];
+        return convertToVariant(value, arg, propName);
+    });
+    return inputArguments;
+}
 
-        const inputArguments: Variant[] = inputArgsDef.map((arg: any) => {
-            const dataType = convertNodeIdToDataType(arg.dataType);
+function makeFunction(obj: any, methodName: string) {
+    return function functionCaller(
+        this: any,
+        inputArgs: Record<string, unknown>,
+        callback: (err: Error | null, output?: Record<string, unknown>) => void
+    ) {
+        const session = this.proxyManager.session;
 
-            const arrayType = arg.valueRank === 1 ? VariantArrayType.Array : VariantArrayType.Scalar;
+        assert(typeof callback === "function");
 
-            // xx console.log("xxx ",arg.toString());
-            const propName = lowerFirstLetter(arg.name);
+        const methodDef = this.$methods[methodName];
+        // convert input arguments into Variants
+        const inputArgsDef = methodDef.inputArguments || [];
 
-            const value = inputArgs[propName];
-            if (value === undefined) {
-                throw new Error("expecting input argument " + propName);
-            }
-            if (arrayType === VariantArrayType.Array) {
-                if (!Array.isArray(value)) {
-                    throw new Error("expecting value to be an Array or a TypedArray");
-                }
-            }
-            return new Variant({ arrayType, dataType, value });
-        });
+        const inputArguments: Variant[] = convertToVariantArray(inputArgsDef, inputArgs);
 
         const methodToCall = new CallMethodRequest({
             inputArguments,
-            methodId: reference.nodeId,
+            methodId: methodDef.nodeId,
             objectId: obj.nodeId
         });
 
@@ -175,80 +184,75 @@ function add_method(proxyManager: UAProxyManager, obj: any, reference: Reference
 
             callResult.outputArguments = callResult.outputArguments || [];
 
-            obj[name].outputArguments = obj[name].outputArguments || [];
-
-            if (callResult.outputArguments.length !== obj[name].outputArguments.length) {
+            if (callResult.outputArguments.length !== methodDef.outputArguments.length) {
                 return callback(
                     new Error(
                         "Internal error callResult.outputArguments.length " +
                             callResult.outputArguments.length +
                             " " +
-                            obj[name].outputArguments.length
+                            obj[methodName].outputArguments.length
                     )
                 );
             }
-
-            const outputArgs: any = {};
-
-            const outputArgsDef = obj[name].outputArguments;
-            outputArgsDef.map((arg: any, index: number) => {
+            const output: Record<string, unknown> = {};
+            methodDef.outputArguments.map((arg: Argument, index: number) => {
                 const variant = callResult!.outputArguments![index];
-                const propName = lowerFirstLetter(arg.name);
-                outputArgs[propName] = variant.value;
+                const propName = lowerFirstLetter(arg.name!);
+                output[propName] = variant.value;
             });
 
-            callback(err, outputArgs);
+            callback(err, output);
         });
     };
+}
 
-    function extractDataType(arg: any, callback: any): void {
-        if (arg.dataType && arg.dataType._dataType) {
-            setImmediate(callback); // already converted
-            return;
+function extractDataType(session: IBasicSession, arg: ArgumentEx, callback: ErrorCallback): void {
+    if (arg.dataType && arg._basicDataType) {
+        setImmediate(callback); // already converted
+        return;
+    }
+
+    convertNodeIdToDataTypeAsync(session, arg.dataType, (err?: Error | null, dataType?: DataType) => {
+        if (!err) {
+            arg._basicDataType = dataType!;
         }
+        callback(err || undefined);
+    });
+}
+/**
+ * @method add_method
+ * @private
+ */
+function add_method(proxyManager: UAProxyManager, obj: any, reference: ReferenceDescription, outerCallback: (err?: Error) => void) {
+    const session = proxyManager.session;
 
-        convertNodeIdToDataTypeAsync(session, arg.dataType, (err: Error | null, dataType?: DataType) => {
-            if (!err) {
-                arg.dataType._dataType = dataType;
-            }
-            callback(err);
-        });
-    }
+    const methodName = lowerFirstLetter(reference.browseName.name!);
 
-    const methodObj = {
-        browseName: name,
-        executableFlag: false,
-        func: obj[name],
-        nodeId: reference.nodeId
-    };
-    obj.$methods[name] = methodObj;
+    let inputArguments: ArgumentEx[] = [];
+    let outputArguments: ArgumentEx[] = [];
 
     // tslint:disable:no-shadowed-variable
     async.series(
         [
             (callback: ErrorCallback) => {
-                session.getArgumentDefinition(reference.nodeId, (err: Error | null, args?: any) => {
+                session.getArgumentDefinition(reference.nodeId, (err, argumentDefinition) => {
                     // istanbul ignore next
                     if (err) {
-                        setImmediate(() => {
-                            callback(err);
-                        });
-                        return;
+                        errorLog("getArgumentDefinition failed ", err);
+                        return callback(err);
                     }
-                    const inputArguments = args.inputArguments;
-                    const outputArguments = args.outputArguments;
-
-                    obj[name].inputArguments = inputArguments;
-                    obj[name].outputArguments = outputArguments;
+                    // istanbul ignore next
+                    if (!argumentDefinition) {
+                        return callback(new Error("Internal Error"));
+                    }
+                    inputArguments = (argumentDefinition.inputArguments as ArgumentEx[]) || [];
+                    outputArguments = (argumentDefinition.outputArguments as ArgumentEx[]) || [];
 
+                    const _extractDataType = extractDataType.bind(null, session);
                     async.series(
                         [
-                            (callback: ErrorCallback) => {
-                                async.eachSeries(obj[name].inputArguments, extractDataType, (err) => callback(err!));
-                            },
-                            (callback: ErrorCallback) => {
-                                async.eachSeries(obj[name].outputArguments, extractDataType, (err) => callback(err!));
-                            }
+                            (innerCallback) => async.eachSeries(inputArguments, _extractDataType, innerCallback),
+                            (innerCallback) => async.eachSeries(outputArguments, _extractDataType, innerCallback)
                         ],
                         (err) => callback(err!)
                     );
@@ -256,12 +260,33 @@ function add_method(proxyManager: UAProxyManager, obj: any, reference: Reference
             },
 
             (callback: ErrorCallback) => {
+                
+                const methodObj: MethodDescription = {
+                    browseName: methodName,
+                    executableFlag: false,
+                    func: makeFunction(obj, methodName),
+                    nodeId: reference.nodeId,
+                    inputArguments,
+                    outputArguments
+                };
+                obj.$methods[methodName] = methodObj;
+                obj[methodName] = methodObj.func;
+
+                obj[methodName].inputArguments = inputArguments;
+                obj[methodName].outputArguments = outputArguments;
+
+                doDebug && debugLog("installing method name", methodName);
                 proxyManager._monitor_execution_flag(methodObj, () => {
                     callback();
                 });
             }
         ],
-        (err) => outerCallback(err!)
+        (err) => {
+            if (err) {
+                errorLog("Error =>",err);
+            }
+            outerCallback(err!)
+        }
     );
 }
 
@@ -331,7 +356,6 @@ function add_typeDefinition(
     const session = proxyManager.session;
     references = references || [];
     if (references.length !== 1) {
-        // xx console.log(" cannot find type definition", references.length);
         setImmediate(callback);
         return;
     }
@@ -388,6 +412,10 @@ export class ObjectExplorer {
         });
     }
 }
+function t(references: ReferenceDescription[] | null) {
+    if (!references) return "";
+    return references.map((r: ReferenceDescription) => r.browseName.name + " " + r.nodeId.toString());
+}
 
 export function readUAStructure(proxyManager: UAProxyManager, obj: { nodeId: NodeId }, callback: ErrorCallback): void {
     const session = proxyManager.session;
@@ -466,10 +494,6 @@ export function readUAStructure(proxyManager: UAProxyManager, obj: { nodeId: Nod
         }
     ];
     session.browse(nodesToBrowse, (err: Error | null, browseResults?: BrowseResult[]) => {
-        function t(references: ReferenceDescription[]) {
-            return references.map((r: ReferenceDescription) => r.browseName.name + " " + r.nodeId.toString());
-        }
-
         browseResults = browseResults || [];
 
         // istanbul ignore next
@@ -477,16 +501,17 @@ export function readUAStructure(proxyManager: UAProxyManager, obj: { nodeId: Nod
             return callback(err);
         }
 
-        // xx console.log("Components", t(results[0].references));
-        // xx console.log("Properties", t(results[1].references));
-        // xx console.log("Methods", t(results[2].references));
+        if (doDebug) {
+            debugLog("Components", t(browseResults[0].references));
+            debugLog("Properties", t(browseResults[1].references));
+            debugLog("Methods", t(browseResults[2].references));
+        }
         async.series(
             [
                 (callback: ErrorCallback) => {
                     async.mapSeries(
                         browseResults![0].references!,
-                        (reference: ReferenceDescription, callback: ErrorCallback) =>
-                            add_component(proxyManager, obj, reference, callback),
+                        (reference, innerCallback) => add_component(proxyManager, obj, reference, innerCallback),
                         (err) => callback(err!)
                     );
                 },
@@ -494,8 +519,7 @@ export function readUAStructure(proxyManager: UAProxyManager, obj: { nodeId: Nod
                 (callback: ErrorCallback) => {
                     async.mapSeries(
                         browseResults![1].references!,
-                        (reference: ReferenceDescription, callback: ErrorCallback) =>
-                            add_property(proxyManager, obj, reference, callback),
+                        (reference, innerCallback) => add_property(proxyManager, obj, reference, innerCallback),
                         (err) => callback(err!)
                     );
                 },
@@ -504,8 +528,7 @@ export function readUAStructure(proxyManager: UAProxyManager, obj: { nodeId: Nod
                 (callback: ErrorCallback) => {
                     async.mapSeries(
                         browseResults![2].references!,
-                        (reference: ReferenceDescription, callback: ErrorCallback) =>
-                            add_method(proxyManager, obj, reference, callback),
+                        (reference, innerCallback) => add_method(proxyManager, obj, reference, innerCallback),
                         (err) => callback(err!)
                     );
                 },

package/source/proxy_base_node.ts

@@ -6,11 +6,24 @@ import { assert } from "node-opcua-assert";
 import { AttributeIds, NodeClass } from "node-opcua-data-model";
 import { DataValue } from "node-opcua-data-value";
 import { NodeId } from "node-opcua-nodeid";
+import { Argument } from "node-opcua-service-call";
 import { WriteValueOptions } from "node-opcua-service-write";
 import { StatusCode, StatusCodes } from "node-opcua-status-code";
-import { Variant } from "node-opcua-variant";
+import { DataType, Variant } from "node-opcua-variant";
 import { UAProxyManager } from "./proxy_manager";
 
+export interface ArgumentEx extends Argument {
+    _basicDataType: DataType;
+}
+export interface MethodDescription {
+    browseName: string;
+    executableFlag: boolean;
+    func: (input: Record<string, unknown>, callback: (err: Error | null, output?: Record<string, unknown>) => void) => void;
+    nodeId: NodeId; // the method NodeId
+    inputArguments: ArgumentEx[];
+    outputArguments: ArgumentEx[];
+}
+
 export class ProxyBaseNode extends EventEmitter {
     /**
      * the object nodeId
@@ -35,7 +48,7 @@ export class ProxyBaseNode extends EventEmitter {
      * @property $methods
      * @type {Array<ProxyBaseNode>}
      */
-    public $methods: any[];
+    public $methods: MethodDescription[];
     /**
      * the Folder's elements
      * @property $organizes