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

package/nodes/60-client-code.html

@@ -3,7 +3,14 @@
  RED.comms.subscribe('introspect:client-code-perform', (event,data) => {
    if ( data.msg == "execfunc" ) {
 
-     var doSend = (data, nodeid) => {
+     var doSend = (data, nodeid, _msg) => {
+       if ( typeof data == "object" ) {
+         data = {
+           ..._msg,
+           ...data
+         };
+       }
+
        $.ajax({
          url:         "ClientCode/" + nodeid,
          type:        "POST",
@@ -24,24 +31,27 @@
        });
      };
 
-     var doError = (msg,nodeid) => {
+     var doError = (msg, nodeid, _msg) => {
        RED.notify("ClientCode Failed: " + nodeid + ": " + msg, {
          type: "error",
          id: nodeid,
          timeout: 3000
        });
-       console.log( "ClientCode: Error with node: " + nodeid +": " +msg);
+
+       console.log( "ClientCode: Error with node: " + nodeid + ": " + msg);
      };
 
      var nodeid = data.nodeid;
+     var _msg = data._msg;
 
      var node = {
        send: (dt) => {
-         doSend(dt, nodeid)
+         doSend(dt, nodeid, _msg)
        },
        error: (mg) => {
-         doError(mg, nodeid)
-       }
+         doError(mg, nodeid, _msg)
+       },
+       id: data.nodeid
      };
 
      var payload = data.payload;
@@ -64,7 +74,7 @@
         value: ""
       },
       format: {
-        value: ""
+        value: "javascript"
       }
     },
     inputs:1,
@@ -95,13 +105,11 @@
 
       this.editor = RED.editor.createEditor({
         id: 'node-input-clientcode-editor',
-        mode: 'ace/mode/html',
+        mode: 'ace/mode/javascript',
         stateId: stateId,
-        value: $("#node-input-screenshot").val()
+        value: $("#node-input-clientcode").val()
       });
 
-      this.editor.setValue( that.clientcode );
-
       $("#node-input-format").on("change", function() {
         var mod = "ace/mode/"+$("#node-input-format").val();
         that.editor.getSession().setMode({
@@ -160,7 +168,6 @@
       <label for="node-input-clientcode">
           <i class="fa fa-file-code-o"></i> Client Code
       </label>
-      <input type="hidden" id="node-input-clientcode" autofocus="autofocus">
 
       <div style="position: absolute; right:0;display:inline-block; text-align: right; font-size: 0.8em;">
           Syntax:
@@ -189,7 +196,8 @@
            class="node-text-editor"
            id="node-input-clientcode-editor" ></div>
   </div>
- <input type="hidden" id="node-input-clientcode">
+
+  <input type="hidden" id="node-input-clientcode" autofocus="autofocus">
 </script>
 
 <script type="text/html" data-help-name="ClientCode">

package/nodes/60-client-code.js

@@ -17,7 +17,8 @@ module.exports = function(RED) {
           payload: msg.payload,
           topic:   msg.topic,
           func:    cfg.clientcode,
-          nodeid:  node.id
+          nodeid:  node.id,
+          _msg:    msg
         })
       );
     });

package/package.json

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

package/nodes/__55-trigger-import.html

@@ -1,158 +0,0 @@
-<script type="text/javascript">
-
- /*
-   * How to connect nodes:
-    var namesToId = {}
-
-    RED.nodes.eachNode((n) => {
-    if ( n._def.category == "rssfeeds") {
-      namesToId[n.name] = n.id
-    }
-    })
-
-    RED.nodes.eachNode((n) => {
-      if ( n._def.category == "rssfeeds" && n._def.label() == "Hacker News: New Comments") {
-          var title = n.name.match(/^New[ ]+comment[ ]+by.+\"(.*)\"/)[1];
-          var tgtId = namesToId[title];
-          if ( tgtId ) {
-              var t = RED.nodes.node(tgtId);
-             RED.nodes.addLink( { source: n, sourcePort: 0, target: t});
-             RED.view.select([t,n])
-          }
-       }
-     })
-
-    * How to move
-
-    var t = RED.nodes.node("23e18922a0b896f1")
-    t.x = XXXX;
-    t.y = YYYY;
-    t.dirty = true;
-    RED.view.redraw(true)
-
-  */
-
- RED.comms.subscribe('introspect:trigger-import-delete', (event,data) => {
-   if ( data.msg == "delete-old-nodes" ) {
-     RED.view.select(false)
-
-     // close any dialog that explains that there are duplicates and therefore
-     // only a copy can be imported, hit the cancel button on that one.
-     // Five clicks should do the job ...
-     for ( var idx = 0 ; idx < 5; idx++ ) {
-       $($('.ui-dialog-buttonset').find("button")[0]).trigger('click')
-     }
-
-     var allSelectNodes = [];
-
-     RED.nodes.eachNode( function(e) {
-       if ( e._def && e.env && e.env[1] &&
-            e._def.category == data.payload.category &&
-            (Date.parse(e.env[1].value) <
-               (new Date().getTime() - parseInt(data.payload.old_than_ms))) ) {
-         allSelectNodes.push(e)
-       }
-     });
-
-     RED.view.select({ nodes: allSelectNodes })
-     setTimeout( () => {
-       RED.actions.invoke("core:delete-selection")
-     }, 1500);
-   }
- });
-
- RED.comms.subscribe('introspect:trigger-import-tripped', (event,data) => {
-    if ( data.msg == "import-flow" ) {
-      var content = data.flowContent;
-
-      if ( data.removeduplicates ) {
-        content = content.filter( (elem) => {
-          return RED.nodes.node(elem.id) == undefined
-        });
-      }
-
-      if ( content.length == 0 ) {
-        RED.notify("No new content", {
-          type: "ok",
-          id: "TriggerImport",
-          timeout: 2000
-        });
-        return;
-      }
-      RED.clipboard.import();
-
-      setTimeout( () => {
-        $('#red-ui-clipboard-dialog-import-text').val(
-          JSON.stringify(content)
-        ).trigger("paste");
-
-        if ( data.autoimport ) {
-          setTimeout( () => {
-            $('#red-ui-clipboard-dialog-ok').trigger('click');
-          }, 435);
-        }
-      }, 300);
-    }
-  });
-
-  RED.nodes.registerType('TriggerImport',{
-    color: '#e5e4ef',
-    icon: "icons/subflow.svg",
-    category: 'introspection',
-    paletteLabel: "TriggerImport",
-    defaults: {
-      name: {
-        value:"",
-      },
-      autoimport: {
-        value: false
-      },
-      removeduplicates: {
-        value: false
-      },
-    },
-    inputs:1,
-    outputs:1,
-
-    label: function() {
-      return (this.name || this._def.paletteLabel);
-    },
-
-    labelStyle: function() {
-      return this.name?"node_label_italic":"";
-    },
-  });
-</script>
-
-<script type="text/html" data-template-name="TriggerImport">
-  <div class="form-row">
-      <label for="node-input-name">
-          <i class="fa fa-tag"></i>
-          <span data-i18n="common.label.name">Name</span>
-      </label>
-      <input type="text" id="node-input-name" placeholder="Name">
-  </div>
-
-  <div class="form-row">
-      <label for="node-input-autoimport" style="width: 150px !important;">
-        <span>Automatic Import?</span>
-      </label>
-      <input type="checkbox"
-             id="node-input-autoimport"
-             style="display:inline-block; width:15px; vertical-align:baseline;">
-  </div>
-
-  <div class="form-row">
-      <label for="node-input-removeduplicates" style="width: 150px !important;">
-        <span>Remove duplicates?</span>
-      </label>
-      <input type="checkbox"
-             id="node-input-removeduplicates"
-             style="display:inline-block; width:15px; vertical-align:baseline;">
-  </div>
-
-</script>
-
-<script type="text/html" data-help-name="TriggerImport">
-  <p>Trigger import opens the flow import dialog with data that came from the server.</p>
-</script>