@gregoriusrippenstein/node-red-contrib-nodedev 0.4.4 → 0.4.5

package/nodes/05-node-dev-ops.html

@@ -56,6 +56,8 @@
       noderedinstall: { value: false },
       randompackagename: { value: false },
 
+      nodered_uninstall: { value: false },
+
       ignore_package_check: { value: false },
 
       gitcommit:         { value: false },
@@ -90,9 +92,15 @@
     },
 
     oneditprepare: function() {
+     $('#node-input-nodered_uninstall').on('change', () => {
+        if ( $('#node-input-nodered_uninstall').is(":checked") ) {
+           $('#node-input-noderedinstall').prop('checked',false).trigger('change')
+        }
+     })
 
      $('#node-input-noderedinstall').on('change', () => {
           if ( $('#node-input-noderedinstall').is(":checked") ) {
+              $('#node-input-nodered_uninstall').prop('checked',false).trigger('change')
               $("#noderedinstall-options").animate({opacity: 'show', height: 'show'}, 450);
           } else {
               $("#noderedinstall-options").animate({opacity: 'hide', height: 'hide'}, 450);
@@ -266,6 +274,13 @@
     </div>
   </div>
 
+  <div class="form-row">
+    <label for="node-input-nodered_uninstall" style="min-width: 120px;">
+                <span>Uninstall package?</span>
+            </label>
+    <input type="checkbox" id="node-input-nodered_uninstall" style="display:inline-block; width:15px; vertical-align:baseline;">
+  </div>
+
   <hr/>
   <div class="form-row">
     <label for="node-input-npmpublish" style="min-width: 120px;">

package/nodes/10-node-factory.html

@@ -67,17 +67,24 @@
         </div>
     </div>
 
+    <div class="form-row">
+        <label for="node-input-isrealplugin" style="min-width: 250px;">
+           <span>Plugin?</span>
+        </label>
+        <input type="checkbox" id="node-input-isrealplugin" style="display:inline-block; width:15px; vertical-align:baseline;">
+    </div>
+
     <div class="form-row">
         <label for="node-input-isplugin" style="min-width: 250px;">
-                    <span>Plugin: Sidebar + Config?</span>
-                </label>
+            <span>Sidebar + Config?</span>
+        </label>
         <input type="checkbox" id="node-input-isplugin" style="display:inline-block; width:15px; vertical-align:baseline;">
     </div>
     
     <div class="form-row">
         <label for="node-input-frt2bakcomm" style="min-width: 250px;">
-                <span>Frontend to Backend communication?</span>
-            </label>
+           <span>Frontend to Backend communication?</span>
+        </label>
         <input type="checkbox" id="node-input-frt2bakcomm" style="display:inline-block; width:15px; vertical-align:baseline;">
     </div>
 
@@ -198,7 +205,15 @@
         data["bak2frtcomm"]    = $('#node-input-bak2frtcomm').is(":checked");
         data["frt2bakcomm"]    = $('#node-input-frt2bakcomm').is(":checked");
         data["createmanifest"] = $('#node-input-createmanifest').is(":checked");
+        
+        /*
+            Argh! This is a mess but I can't change it because isplugin is used
+            in the wild. isplugin is actually a sidebar + config node, while
+            isrealplugin is a plugin in the true sense of Node-RED. This was
+            done due to lack-of-knowledge on the part of the author.
+        */
         data["isplugin"]       = $('#node-input-isplugin').is(":checked");
+        data["isrealplugin"]   = $('#node-input-isrealplugin').is(":checked");
 
         data["__task"]      = "generate_from_templates";
 
@@ -239,6 +254,7 @@
             bak2frtcomm:    { value: false },
             createmanifest: { value: false },
             isplugin:       { value: false },
+            isrealplugin:   { value: false },
         },
         inputs: 1,
         outputs: 1,
@@ -292,6 +308,20 @@
                 sortPalette: function (a, b) { return a.l - b.l; }
             }).appendTo("#node-input-row-style-colour");
 
+            $("#node-input-isrealplugin").on('change', function(ev) {
+                if ( $('#node-input-isrealplugin').is(":checked") ) {
+                    $('#node-input-isplugin').prop('checked',false).trigger('change')
+                    $('#node-input-frt2bakcomm').prop('checked',false).trigger('change')
+                    $('#node-input-bak2frtcomm').prop('checked',false).trigger('change')
+                }
+            })
+
+            $("#node-input-isplugin").on('change', function(ev) {
+                if ( $('#node-input-isplugin').is(":checked") ) {
+                    $('#node-input-isrealplugin').prop('checked',false).trigger('change')
+                }
+            })
+
             $("#node-input-colour").on('change', function(ev) {
                 var colour = $(this).val();
                 var nodeDiv = $('.red-ui-search-result-node')

package/nodes/10-node-factory.js

@@ -223,6 +223,31 @@ module.exports = function (RED) {
         })
     }
 
+    function createRealPluginNodeDefintions(msg,node) {
+        var pluginJsPath = path.join(__dirname, 'templates', 'tmplplugin.js');
+        var content = {};
+
+        var promises = [
+            handleTemplate(msg, node, fs.readFileSync(pluginJsPath, 'utf8')).then((c) => { content["jsac"] = c }),
+        ];
+
+        return Promise.all(promises).then(() => {
+            return [{
+                id: RED.util.generateId(),
+                type: "PkgFile",
+                name: msg.node.name + "Plugin.js",
+                filename: "plugins/" + msg.node.namelwr + ".js",
+                template: content["jsac"],
+                syntax: "mustache",
+                format: "javascript",
+                output: "str",
+                x: 100,
+                y: 50,
+                wires: [[]]
+            }]
+        })
+    }
+
     function createSimpleNodeDefintions(msg,node) {
         var htmlPath = path.join(__dirname, 'templates', 'tmpl.html');
         var htmlJsPath = path.join(__dirname, 'templates', 'tmpl.html.js');
@@ -322,6 +347,8 @@ module.exports = function (RED) {
     function createNodeDefintions(msg, node) {
         if ( msg.node.isplugin ) {
             return createPluginNodeDefintions(msg, node)
+        } else if (msg.node.isrealplugin ) {
+            return createRealPluginNodeDefintions(msg, node)
         } else {
             return createSimpleNodeDefintions(msg, node)
         }
@@ -339,6 +366,9 @@ module.exports = function (RED) {
         if ( msg.node.isplugin ) {
             spcRepDict["pluginstanza"] = " \"sidebar-plugin\": \"" + nodeDefinitions[1].filename + "\""
         }
+        if (msg.node.isrealplugin) {
+            spcRepDict["pluginstanza"] = " \"" + msg.node.namelwr + "\": \"" + nodeDefinitions[0].filename + "\""
+        }
 
         var content = {};
 

package/nodes/templates/tmpllicense

@@ -1,4 +1,17 @@
-# LICENSE
+## LICENSE - DON'T DO EVIL
 
-License texts comes here.
+**The do not do evil license**
 
+Adapted from JSON.org, http://www.json.org/license.html
+
+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 shall be used for Good, not Evil.
+
+Remember the curse of the evil-doer upon whose blood the devil does drink and upon whose flesh the devil does feast. For eternity will the evil-doer bear this Sisyphean burden, only to be relieved of their suffering upon the apocalyptic end of it all including the foundations of the internet, computers, technology and mice. Only after the last AI enters the blue-screen-of-death modus, only then will the evil-doer be freed of their rightful and justified punishment for doing evil.
+
+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 CURSE IS PROVIDED "AS IS" OR "WORSE", NO SOFTENING OF ANY KIND IS HEREBY EXPRESSED, IMPLIED OR OFFERED. MAY ALL EVIL-DOERS SUFFER IN ETERNITY.

package/nodes/templates/tmplpackage.json

@@ -21,11 +21,25 @@
     {{#node.isplugin}}
     "plugins": {
        {{{__.pluginstanza}}}
-     },
+    },
+    "nodes": {
+      {{{__.nodestanza}}}
+    }
     {{/node.isplugin}}
+
+    {{#node.isrealplugin}}
+    "plugins": {
+       {{{__.pluginstanza}}}
+    }
+    {{/node.isrealplugin}}
+
+    {{^node.isplugin}}
+    {{^node.isrealplugin}}
     "nodes": {
       {{{__.nodestanza}}}
     }
+    {{/node.isrealplugin}}
+    {{/node.isplugin}}
   },
 
   "repository": {

package/nodes/templates/tmplplugin.js

@@ -0,0 +1,29 @@
+module.exports = function (RED) {
+  const OnReceiveHookName = "onReceive.{{ node.name }}"
+  const OnPreuninstallHookName = "preUninstall.{{ node.name }}"
+
+  function {{ node.name }}OnReceiveHook(evnt) {
+    try {
+      let nde = RED.nodes.getNode(evnt.destination.id)
+      nde.status({ fill: "green", shape: "ring", text: "msg received" })
+      setTimeout(() => { nde.status({}) }, 1000)
+    } catch (ex) {
+      console.error(ex)
+    }
+  }
+
+  RED.plugins.registerPlugin("msg-tracer-plugin", {
+    onadd: () => {
+      RED.hooks.add(OnReceiveHookName, {{ node.name }}OnReceiveHook)
+
+      // add hook to uninstall package so that the hook for this
+      // plugin are removed.
+      RED.hooks.add(OnPreuninstallHookName, (evnt) => {
+        if (evnt.module == "{{__.ocb3}} pname {{__.ccb3}}") {
+          RED.hooks.remove(OnReceiveHookName)
+          RED.hooks.remove(OnPreuninstallHookName)
+        }
+      })
+    }
+  })
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name" : "@gregoriusrippenstein/node-red-contrib-nodedev",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "dependencies": {
     "pako":          "^2.1.0",
     "tar-stream":    "^3.1.6",