@gregoriusrippenstein/node-red-contrib-introspection 0.4.0 → 0.4.1

package/README.md

@@ -91,14 +91,15 @@ Send a flow to another Node-RED instance. This will replace **any existing** flo
 
 ### ClientCode
 
-ClientCode is a node for executing client side, i.e., in the editor, Javascript code triggered by a server side event. Any code that can be executed in the browseer console can be executed in the ClientCode node. It replaces the TriggerImport node by being more generic, TriggerImport executed very specific code for a server side event, ClientCode can emulate that behaviour.
+ClientCode is a node for executing client side, i.e., in the editor, Javascript code triggered by a server side event. Any code that can be executed in the browseer console can be executed in the ClientCode node. A ClientCode node can also send a message back to the server using `node.send(...)` which becomes the server side output of the node.
 
-The context for code execution includes the following:
+The context in which the code is exected includes:
 
 - `payload` which is the the `msg.payload` value
 - `topic` which is the `msg.topic` value
+- `node.send(payload)` where `payload` becomes the output the node on the server side
+- `node.error("msg")` where msg is shown as a notification within the editor
 
-For more details, [client side code](https://github.com/gorenje/node-red-contrib-introspection/blob/2f5aca9374b28fcb6890c312f943f913ecb4cfce/nodes/60-client-code.html#L3-L8) with the context and [server side code](https://github.com/gorenje/node-red-contrib-introspection/blob/2f5aca9374b28fcb6890c312f943f913ecb4cfce/nodes/60-client-code.js#L13-L22).
 
 ## Node-RED Versions
 

package/nodes/60-client-code.html

@@ -2,7 +2,51 @@
 
  RED.comms.subscribe('introspect:client-code-perform', (event,data) => {
    if ( data.msg == "execfunc" ) {
+
+     var doSend = (data, nodeid) => {
+       $.ajax({
+         url:         "ClientCode/" + nodeid,
+         type:        "POST",
+         contentType: "application/json; charset=utf-8",
+         data: JSON.stringify(data),
+
+         success: function (resp) {
+         },
+
+         error: function (jqXHR, textStatus, errorThrown) {
+           RED.notify("ClientCode Communcation Failure: " +
+                      nodeid + ": " + textStatus, {
+             type: "error",
+             id: nodeid,
+             timeout: 3000
+           });
+         }
+       });
+     };
+
+     var doError = (msg,nodeid) => {
+       RED.notify("ClientCode Failed: " + nodeid + ": " + msg, {
+         type: "error",
+         id: nodeid,
+         timeout: 3000
+       });
+       console.log( "ClientCode: Error with node: " + nodeid +": " +msg);
+     };
+
+     var nodeid = data.nodeid;
+
+     var node = {
+       send: (dt) => {
+         doSend(dt, nodeid)
+       },
+       error: (mg) => {
+         doError(mg, nodeid)
+       }
+     };
+
      var payload = data.payload;
+     var topic = data.topic;
+
      eval( data.func );
    }
  });

package/nodes/60-client-code.js

@@ -20,9 +20,30 @@ module.exports = function(RED) {
           nodeid:  node.id
         })
       );
-
-      send(msg);
     });
   }
   RED.nodes.registerType("ClientCode", ClientCodeFunctionality);
+
+  RED.httpAdmin.post("/ClientCode/:id",
+                     RED.auth.needsPermission("ClientCode.write"),
+                     (req,res) => {
+                       var node = RED.nodes.getNode(req.params.id);
+                       if (node != null) {
+                         try {
+                           if (req.body && node.type == "ClientCode" ) {
+                             node.send(req.body);
+                             res.sendStatus(200);
+                           } else {
+                             res.sendStatus(404);
+                           }
+                         } catch(err) {
+                           res.sendStatus(500);
+                           node.error("ClientCode: Submission failed: " +
+                                      err.toString())
+                         }
+                       } else {
+                         res.sendStatus(404);
+                       }
+                     });
+
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gregoriusrippenstein/node-red-contrib-introspection",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "dependencies": {
     "got": "latest"
   },