@gregoriusrippenstein/node-red-contrib-nodedev 0.3.8 → 0.4.0

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

@@ -66,6 +66,7 @@
       githubauthor:      { value: ""},
       githubauthoremail: { value: "" },
       githubmessage:     { value: "" },
+      githubgettar:      { value: false },
 
       npmpublish: { value: false },
       npmunpublish: { value: false },
@@ -124,6 +125,16 @@
           }
      });
 
+     $('#node-input-githubgettar').on('change', () => {
+          if ( $('#node-input-githubgettar').is(":checked") ) {
+              $("#github-options").animate({opacity: 'show', height: 'show'}, 450);
+          } else {
+             if ( !$('#node-input-gitcheckforchange').is(":checked") && !$('#node-input-gitcommit').is(":checked") ) {
+              $("#github-options").animate({opacity: 'hide', height: 'hide'}, 450);
+            }
+          }
+     });
+
      $('#node-input-npmpublish').on('change', () => {
           if ( $('#node-input-npmpublish').is(":checked") ) {
               $("#npmpublish-options").animate({opacity: 'show', height: 'show'}, 450);
@@ -279,12 +290,17 @@
                <span>GitHub: Commit?</span>
       </label>
     <input type="checkbox" id="node-input-gitcommit" style="display:inline-block; width:15px; vertical-align:baseline;">
+
     <label for="node-input-gitcheckforchange" style="margin-left: 30px; min-width: 100px;">
                 <span>What changed?</span>
      </label>
      <input type="checkbox" id="node-input-gitcheckforchange" style="display:inline-block; width:15px; vertical-align:baseline;">
-  </div>
 
+    <label for="node-input-githubgettar" style="margin-left: 15px; min-width: 100px;">
+                <span>Get Repo?</span>
+     </label>
+     <input type="checkbox" id="node-input-githubgettar" style="display:inline-block; width:15px; vertical-align:baseline;">
+  </div>
 
   <div id="github-options">
     <div class="form-row">

package/nodes/lib/tarhelpers.js

@@ -4,6 +4,7 @@ module.exports = (function () {
     var streamx = require('streamx');
     var pakoGzip = require('pako');
     let pathUtil = require('path')
+    const buffer = require('buffer')
 
     /*
      * there is no indication in a tar file of whether a file is binary or textual.
@@ -98,10 +99,34 @@ module.exports = (function () {
         })
 
         extract.on('error', onError );
-        var stream = streamx.Readable.from(Buffer.from(pakoGzip.inflate(new Uint8Array(tgzData))))
-        stream.pipe(extract);
-    }
 
+        try {
+            if (buffer.Buffer.isBuffer(tgzData)) {
+                import('file-type').then(module => {
+                    module.fileTypeFromBuffer(tgzData).then(filetype => {
+                        if ( filetype && filetype.ext == "tar") {
+                            var stream = streamx.Readable.from(tgzData)
+                            stream.pipe(extract);
+                        } else {
+                            var stream = streamx.Readable.from(Buffer.from(pakoGzip.inflate(new Uint8Array(tgzData))))
+                            stream.pipe(extract);
+                        }
+                    }).catch(err => {
+                        var stream = streamx.Readable.from(Buffer.from(pakoGzip.inflate(new Uint8Array(tgzData))))
+                        stream.pipe(extract);
+                    })
+                }).catch( e => {
+                    var stream = streamx.Readable.from(Buffer.from(pakoGzip.inflate(new Uint8Array(tgzData))))
+                    stream.pipe(extract);
+                })
+            } else {
+                var stream = streamx.Readable.from(Buffer.from(pakoGzip.inflate(new Uint8Array(tgzData))))
+                stream.pipe(extract);
+            }
+        } catch (ex) {
+            onError(ex)
+        }
+    }
 
     let exports = {
         computeFormat: computeFormat,

package/nodes/node-factory-sidebar-cfg.js

@@ -2,6 +2,64 @@ module.exports = function (RED) {
     let pacote = require('pacote');
     let tarHelpers = require('./lib/tarhelpers.js');
     
+    let dirGrpColours = (dirname) => {
+
+        dirname = (dirname.startsWith("dist/") || dirname == "dist") ? "dist" : dirname
+        dirname = (dirname.startsWith("nodes/locales/") || dirname == "nodes/locales" ) ? "nodes/locales" : dirname
+        dirname = (dirname.startsWith("locales/") || dirname == "locales") ? "nodes/locales" : dirname
+        dirname = (dirname.startsWith("samples/") || dirname == "samples") ? "examples" : dirname
+        dirname = (dirname != "." && dirname.startsWith(".")) ? ".dir" : dirname
+        
+        let lookup = {
+            ".dir": {
+                "stroke": "#dbcbe7",
+                "fill": "#dbcbe7",
+            },
+            ".": {
+                "stroke": "#ffefbf",
+                "fill": "#ffefbf",
+            },
+            "examples": {
+                "stroke": "#addb7b",
+                "fill": "#addb7b",
+            },
+            "nodes": {
+                "stroke": "#c8e7a7",
+                "fill": "#c8e7a7",
+            },
+            "plugins": {
+                "stroke": "#92d04f",
+                "fill": "#92d04f",
+            },
+            "nodes/lib": {
+                "stroke": "#e3f3d3",
+                "fill": "#e3f3d3",
+            },
+            "assets": {
+                "stroke": "#0070c0",
+                "fill": "#0070c0",
+            },
+            "icons": {
+                "stroke": "#3f93cf",
+                "fill": "#3f93cf",
+            },
+            "nodes/icons": {
+                "stroke": "#3f93cf",
+                "fill": "#3f93cf",
+            },
+            "dist": {
+                "stroke": "#ffbfbf",
+                "fill": "#ffbfbf"                
+            },
+            "nodes/locales": {
+                "stroke": "#bfdbef",
+                "fill": "#bfdbef",               
+            }
+        }
+
+        return lookup[dirname] || {}
+    }
+
     function ConfigNodeFactorySidebarFunctionality(config) {
         RED.nodes.createNode(this, config)
     }
@@ -67,14 +125,18 @@ module.exports = function (RED) {
     }
 
     function createGroupForDirectory(dirname, allIds) {
+        // no label position means that the label goes top-left.
         return {
             "id": RED.util.generateId(),
             "type": "group",
             "name": `Dir: ${dirname}`,
             "style": {
                 "label": true,
-                "label-position": "ne",
-                "color": "#001f60"
+                // "label-position": "ne",
+                "color": "#001f60",
+                "stroke-opacity": "0.75",
+                "fill-opacity": "0.5",
+                ...dirGrpColours(dirname)
             },
             "nodes": allIds
         }
@@ -170,7 +232,6 @@ module.exports = function (RED) {
 
                             lastNode.wires[0].push(tarballNode.id)
 
-
                             /* group by dirname */
                             let groupByDirectory = {}
                             let dirGroups = []
@@ -190,9 +251,7 @@ module.exports = function (RED) {
 
                             allFiles = [
                                 createGroup(msg.pkgname, nodeDevOp.pversion || msg.pkgversion, dirGroups.concat(nodeDevNodes))
-// @ts-ignore
-                            ].concat(dirGroups).concat(nodeDevNodes).concat(allFiles);   
-
+                            ].concat(dirGroups).concat(nodeDevNodes).concat(allFiles)
 
                             RED.comms.publish(
                                 "nodedev:perform-autoimport-nodes",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name" : "@gregoriusrippenstein/node-red-contrib-nodedev",
-  "version": "0.3.8",
+  "version": "0.4.0",
   "dependencies": {
     "pako":          "^2.1.0",
     "tar-stream":    "^3.1.6",
@@ -9,7 +9,8 @@
     "streamx":       "^2.15.5",
     "got":           "^13",
     "pacote":        "^17.0.4",
-    "otpauth":       "^5.0.8"
+    "otpauth":       "^5.0.8",
+    "file-type":     ">=18.7.0"
   },
 
   "keywords": [