@ralphwetzel/node-red-context-monitor 1.1.0 → 1.2.1

package/README.md

@@ -1,7 +1,7 @@
 # @ralphwetzel/node-red-context-monitor
 
 <img alt="flow" src="https://raw.githubusercontent.com/ralphwetzel/node-red-context-monitor/main/resources/preview.png"
-    style="min-width: 250px; width: 250px; align: center; border: 1px solid lightgray;"/>
+    style="min-width: 212px; width: 212px; align: center; border: 1px solid lightgray;"/>
 
 A [Node-RED](https://www.nodered.org) node to monitor a [context](https://nodered.org/docs/user-guide/context).
 

package/lib/monitor.js

@@ -76,13 +76,13 @@ let create_wrapper = function(node_id, flow_id, ctx, root_id) {
                 }
                 return create_wrapper('global', undefined, global_context, node_id);
             }
-            return Reflect.get(context, propertyKey, receiver);
+            return Reflect.get(context, propertyKey);
         },
         getOwnPropertyDescriptor: function (target, propertyKey) {
             return Reflect.getOwnPropertyDescriptor(context, propertyKey);
         },
         getPrototypeOf: function (target){
-            Reflect.getPrototypeOf(context);
+            return Reflect.getPrototypeOf(context);
         },
         has: function (target, propertyKey){
             return Reflect.has(context, propertyKey);
@@ -97,7 +97,7 @@ let create_wrapper = function(node_id, flow_id, ctx, root_id) {
             return Reflect.preventExtensions(context);
         },
         set: function (target, propertyKey, value, receiver) {
-            return Reflect.set(context, propertyKey, value, receiver);
+            return Reflect.set(context, propertyKey, value);
         },
         setPrototypeOf: function (target, prototype) {
             return Reflect.setPrototypeOf(context, prototype)
@@ -112,7 +112,7 @@ let create_wrapper = function(node_id, flow_id, ctx, root_id) {
 
                     let handler = {
                         get: (target, property, receiver) => {
-                            let getted = Reflect.get(target, property, receiver);
+                            let getted = Reflect.get(object, property);
 
                             // if getted is an object, wrap this (again) 
                             // to ensure monitoring in case of direct reference access
@@ -131,8 +131,8 @@ let create_wrapper = function(node_id, flow_id, ctx, root_id) {
                         },
                         set: function(target, propertyKey, value, receiver) {
                             // this is the monitoring function!
-                            let previous_value = Reflect.get(target, propertyKey, receiver);
-                            res = Reflect.set(target, propertyKey, value, receiver);
+                            let previous_value = Reflect.get(object, propertyKey);
+                            res = Reflect.set(object, propertyKey, value);
 
                             let prop_chain = propertyKey;
                             if (getter_key?.length) {
@@ -152,7 +152,7 @@ let create_wrapper = function(node_id, flow_id, ctx, root_id) {
 
                     let handler = {
                         get: (target, property, receiver) => {
-                            let getted = Reflect.get(target, property, receiver);
+                            let getted = Reflect.get(object, property);
 
                             if (
                                 typeof getted === 'object' &&
@@ -168,8 +168,8 @@ let create_wrapper = function(node_id, flow_id, ctx, root_id) {
                         },
                         set: function(target, propertyKey, value, receiver) {
                             // this is the monitoring function!
-                            let previous_value = Reflect.get(target, propertyKey, receiver);
-                            res = Reflect.set(target, propertyKey, value, receiver);
+                            let previous_value = Reflect.get(object, propertyKey);
+                            res = Reflect.set(object, propertyKey, value);
 
                             let prop_chain = propertyKey;
                             if (getter_key?.length) {

package/monitor.html

@@ -45,27 +45,30 @@
                     }
                     return true;
                 }
+            },
+            tostatus: {
+                value: false
             }
         },
         inputs: 0,
         outputs: 2,
         outputLabels: ["context set", "context changed"],
-        icon: "font-awesome/fa-dot-circle-o",
+        icon: "font-awesome/fa-copyright",
         label: function() {
             if (this.name) {
                 return this.name;
             }
             let l = this.monitoring.length;
             if (l > 1) {
-                return `${l} context keys`;
+                return `context: ${l}`;
             }
             let key = this.monitoring[0]?.key;
             if (key && key.length > 0) {
                 return key;
             }
-            return "ctx monitor";
+            return "context: 0";
         },
-        paletteLabel: "ctx monitor",
+        paletteLabel: "context",
         oneditprepare: function() {
 
             let node = this;
@@ -127,7 +130,7 @@
                     $(`<input type="text" id="context-scope-nodes-${index}" placeholder="Nodes">`).appendTo(line_node);
                     line_node.appendTo(fragment);
 
-                    let line_key = $('<div class="form-row" style="margin-bottom: 0px">');
+                    let line_key = $('<div class="form-row" style="margin-bottom: 6px">');
                     // $(`<label for="context-scope-key-${index}"" style="margin-left:10px; width: 90px"><i class="fa fa-tag"></i> Key</label>`).appendTo(line_key);
                     $(`<label for="context-scope-key-${index}" style="margin-left:10px; width: 90px">Key: </label>`).appendTo(line_key);
                     $(`<input type="text" id="context-scope-key-${index}" placeholder="Context Variable Key">`).appendTo(line_key);
@@ -390,6 +393,9 @@
             let top = el.position().top;
             el.height(size.height - top);
 
+            let bottom = top + el.height();
+            let right = el.position().left + el.width();
+
             let ti = $('[id*=context-scope-flows]:first');
             let width;
             if (ti.length > 0) {
@@ -398,6 +404,13 @@
             if (width) {
                 $('[id*=context-scope-key]').outerWidth(width);
             }
+
+            el = $('#tostatus-row');
+            let list = el.prev();
+            let add = list.find('.red-ui-editableList-addButton');
+            el.css("top" , add.position().top);
+            el.css("left", right - el.width());
+
         },
         oneditsave: function () {
             let node = this;
@@ -445,11 +458,17 @@
         <input type="text" id="node-input-monitoring" placeholder="Context">
     </div> -->
     <div class="form-row" style="margin-bottom:0;">
-        <label style="min-width:200px;"><i class="fa fa-dot-circle-o"></i> <span>Monitoring context definition</span></label>
+        <label style="min-width:200px;"><i class="fa fa-copyright"></i> <span>Monitoring context definition</span></label>
     </div>
     <div class="form-row node-input-context-def-row">
         <ol id="node-input-context-container"></ol>
     </div>
+    <div id ="tostatus-row" style="position: absolute">
+        <label for="node-input-tostatus" style="margin-top: 4px">
+            <input type="checkbox" id="node-input-tostatus" style="display:inline-block; width:22px; vertical-align:top;" autocomplete="off">
+            <span>Show incoming data in node status</span>
+        </label>
+    </div>
 </script>
 
 <script type="text/markdown" data-help-name="context-monitor">

package/monitor.js

@@ -25,7 +25,7 @@ function scan_for_require_path(req_path) {
 
     if (process.env.NODE_RED_HOME) {
         found = path.join(process.env.NODE_RED_HOME, "..", req_path);
-        console.log("@f", found);
+        // console.log("@f", found);
         if (fs.existsSync(found)) {
             return found;
         }
@@ -64,7 +64,7 @@ function scan_for_require_path(req_path) {
         }
     }
 
-    console.log(found);
+    // console.log(found);
     return found;
 }
 
@@ -175,6 +175,9 @@ module.exports = function(RED) {
 
         node.on("input", function(msg, send, done) {
             
+            let node = this;
+            let timeout;
+
             // unfold & check if changed
             let prev = msg.previous;
             let changed = msg.changed;
@@ -192,6 +195,24 @@ module.exports = function(RED) {
                 send([msg, null]);
             }
 
+            if (config.tostatus) {
+
+                if (timeout) {
+                    clearTimeout(timeout);
+                }
+    
+                node.status({
+                    fill: "blue",
+                    shape: changed ? "dot" : "ring", 
+                    text: msg.topic + ": " + JSON.stringify(msg.payload)
+                });
+    
+                timeout = setTimeout(function() {
+                    node.status({});
+                    timeout = undefined;
+                }, 2500);    
+            }
+
             done();
         });
         node.on("close",function() {
@@ -207,6 +228,11 @@ module.exports = function(RED) {
                     }
                 }
             })
+
+            if (timeout) {
+                clearTimeout(timeout);
+                timeout = undefined;
+            }
         });
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ralphwetzel/node-red-context-monitor",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "A Node-RED node to monitor a context.",
   "main": "monitor.js",
   "scripts": {
@@ -27,15 +27,15 @@
   },
   "homepage": "https://github.com/ralphwetzel/node-red-context-monitor#readme",
   "dependencies": {
-    "fs-extra": "^11.1.1",
-    "node-red": "^3.1.0"
+    "fs-extra": "^11.1.1"
   },
   "engines": {
     "node": ">=14.0.0"
   },
   "devDependencies": {
     "mocha": "^10.2.0",
-    "node-red-node-test-helper": "^0.3.2"
+    "node-red-node-test-helper": "^0.3.2",
+    "node-red": "^3.1.0"
   },
   "files": [
     "/examples",