@node-red/util 2.2.0 → 3.0.0-beta.1

package/lib/hooks.js

@@ -67,8 +67,25 @@ function add(hookId, callback) {
         throw new Error("Hook "+hookId+" already registered")
     }
     // Get location of calling code
+    let callModule;
     const stack = new Error().stack;
-    const callModule = stack.split("\n")[2].split("(")[1].slice(0,-1);
+    const stackEntries = stack.split("\n").slice(1);//drop 1st line (error message)
+    const stackEntry2 = stackEntries[1];//get 2nd stack entry
+    if (stackEntry2) {
+        try {
+            if (stackEntry2.indexOf(" (") >= 0) {
+                callModule = stackEntry2.split("(")[1].slice(0, -1);
+            } else {
+                callModule = stackEntry2.split(" ").slice(-1)[0];
+            }
+        } catch (error) {
+            Log.debug(`Unable to determined module when adding hook '${hookId}'. Stack:\n${stackEntries.join("\n")}`);
+            callModule = "unknown:0:0";
+        }
+    } else {
+        Log.debug(`Unable to determined module when adding hook '${hookId}'. Stack:\n${stackEntries.join("\n")}`);
+        callModule = "unknown:0:0";
+    }
     Log.debug(`Adding hook '${hookId}' from ${callModule}`);
 
     const hookItem = {cb:callback, location: callModule, previousHook: null, nextHook: null }

package/lib/util.js

@@ -24,6 +24,17 @@ const jsonata = require("jsonata");
 const moment = require("moment-timezone");
 const safeJSONStringify = require("json-stringify-safe");
 const util = require("util");
+const { hasOwnProperty } = Object.prototype;
+
+/**
+ * Safely returns the object construtor name.
+ * @return {String} the name of the object constructor if it exists, empty string otherwise.
+ */
+function constructorName(obj) {
+    // Note: This function could be replaced by optional chaining in Node.js 14+:
+    // obj?.constructor?.name
+    return obj && obj.constructor ? obj.constructor.name : '';
+}
 
 /**
  * Generates a psuedo-unique-random id.
@@ -171,7 +182,7 @@ function compareObjects(obj1,obj2) {
     }
     for (var k in obj1) {
         /* istanbul ignore else */
-        if (obj1.hasOwnProperty(k)) {
+        if (hasOwnProperty.call(obj1, k)) {
             if (!compareObjects(obj1[k],obj2[k])) {
                 return false;
             }
@@ -462,7 +473,7 @@ function setObjectProperty(msg,prop,value,createMissing) {
     for (var i=0;i<length-1;i++) {
         key = msgPropParts[i];
         if (typeof key === 'string' || (typeof key === 'number' && !Array.isArray(obj))) {
-            if (obj.hasOwnProperty(key)) {
+            if (hasOwnProperty.call(obj, key)) {
                 if (length > 1 && ((typeof obj[key] !== "object" && typeof obj[key] !== "function") || obj[key] === null)) {
                     // Break out early as we cannot create a property beneath
                     // this type of value
@@ -561,7 +572,7 @@ function getSetting(node, name, flow_) {
  * @memberof @node-red/util_util
  */
 function evaluateEnvProperty(value, node) {
-    var flow = (node && node.hasOwnProperty("_flow")) ? node._flow : null;
+    var flow = (node && hasOwnProperty.call(node, "_flow")) ? node._flow : null;
     var result;
     if (/^\${[^}]+}$/.test(value)) {
         // ${ENV_VAR}
@@ -785,7 +796,7 @@ function normaliseNodeTypeName(name) {
 function encodeObject(msg,opts) {
     try {
         var debuglength = 1000;
-        if (opts && opts.hasOwnProperty('maxLength')) {
+        if (opts && hasOwnProperty.call(opts, 'maxLength')) {
             debuglength = opts.maxLength;
         }
         var msgType = typeof msg.msg;
@@ -795,7 +806,7 @@ function encodeObject(msg,opts) {
             if (msg.msg.name) {
                 errorMsg.name = msg.msg.name;
             }
-            if (msg.msg.hasOwnProperty('message')) {
+            if (hasOwnProperty.call(msg.msg, 'message')) {
                 errorMsg.message = msg.msg.message;
             } else {
                 errorMsg.message = msg.msg.toString();
@@ -809,7 +820,7 @@ function encodeObject(msg,opts) {
             }
         } else if (msg.msg && msgType === 'object') {
             try {
-                msg.format = msg.msg.constructor.name || "Object";
+                msg.format = constructorName(msg.msg) || "Object";
                 // Handle special case of msg.req/res objects from HTTP In node
                 if (msg.format === "IncomingMessage" || msg.format === "ServerResponse") {
                     msg.format = "Object";
@@ -836,7 +847,7 @@ function encodeObject(msg,opts) {
                             length: msg.msg.length
                         }
                     }
-                } else if (msg.msg && msg.msg.constructor.name === "Set") {
+                } else if (constructorName(msg.msg) === "Set") {
                     msg.format = "set["+msg.msg.size+"]";
                     msg.msg = {
                         __enc__: true,
@@ -845,7 +856,7 @@ function encodeObject(msg,opts) {
                         length: msg.msg.size
                     }
                     needsStringify = true;
-                } else if (msg.msg && msg.msg.constructor.name === "Map") {
+                } else if (constructorName(msg.msg) === "Map") {
                     msg.format = "map";
                     msg.msg = {
                         __enc__: true,
@@ -854,7 +865,7 @@ function encodeObject(msg,opts) {
                         length: msg.msg.size
                     }
                     needsStringify = true;
-                } else if (msg.msg && msg.msg.constructor.name === "RegExp") {
+                } else if (constructorName(msg.msg) === "RegExp") {
                     msg.format = 'regexp';
                     msg.msg = msg.msg.toString();
                 }
@@ -904,25 +915,25 @@ function encodeObject(msg,opts) {
                                 if (value.length > debuglength) {
                                     value.data = value.data.slice(0,debuglength);
                                 }
-                            } else if (value.constructor.name === "ServerResponse") {
+                            } else if (constructorName(value) === "ServerResponse") {
                                 value = "[internal]"
-                            } else if (value.constructor.name === "Socket") {
+                            } else if (constructorName(value) === "Socket") {
                                 value = "[internal]"
-                            } else if (value.constructor.name === "Set") {
+                            } else if (constructorName(value) === "Set") {
                                 value = {
                                     __enc__: true,
                                     type: "set",
                                     data: Array.from(value).slice(0,debuglength),
                                     length: value.size
                                 }
-                            } else if (value.constructor.name === "Map") {
+                            } else if (constructorName(value) === "Map") {
                                 value = {
                                     __enc__: true,
                                     type: "map",
                                     data: Object.fromEntries(Array.from(value.entries()).slice(0,debuglength)),
                                     length: value.size
                                 }
-                            } else if (value.constructor.name === "RegExp") {
+                            } else if (constructorName(value) === "RegExp") {
                                 value = {
                                     __enc__: true,
                                     type: "regexp",
@@ -974,7 +985,7 @@ function encodeObject(msg,opts) {
         if (e.name) {
             errorMsg.name = e.name;
         }
-        if (e.hasOwnProperty('message')) {
+        if (hasOwnProperty.call(e, 'message')) {
             errorMsg.message = 'encodeObject Error: ['+e.message + '] Value: '+util.inspect(msg.msg);
         } else {
             errorMsg.message = 'encodeObject Error: ['+e.toString() + '] Value: '+util.inspect(msg.msg);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "2.2.0",
+    "version": "3.0.0-beta.1",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -15,11 +15,12 @@
         }
     ],
     "dependencies": {
-        "fs-extra": "10.0.0",
-        "i18next": "21.6.10",
+        "fs-extra": "10.1.0",
+        "i18next": "21.6.16",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.8.5",
+        "jsonata": "1.8.6",
         "lodash.clonedeep": "^4.5.0",
+        "moment": "2.29.3",
         "moment-timezone": "0.5.34"
     }
 }