Add initial core:layout-flow action

This reverts commit be49e1d383.

.github/ISSUE_TEMPLATE.md

@@ -28,7 +28,7 @@ To help us understand the issue, please fill-in as much of the following informa
 ### Please tell us about your environment:
 
 - [ ] Node-RED version:
-- [ ] node.js version:
+- [ ] Node.js version:
 - [ ] npm version:
 - [ ] Platform/OS:
 - [ ] Browser:

.github/ISSUE_TEMPLATE/--bug_report.md

@@ -33,7 +33,7 @@ To help us understand the issue, please fill-in as much of the following informa
 ### Please tell us about your environment:
 
 - [ ] Node-RED version:
-- [ ] node.js version:
+- [ ] Node.js version:
 - [ ] npm version:
 - [ ] Platform/OS:
 - [ ] Browser:

.travis.yml

@@ -9,5 +9,3 @@ matrix:
       before_script:
         - npm install -g istanbul coveralls
     - node_js: "8"
-  allow_failures:
-    - node_js: "12"

CHANGELOG.md

@@ -46,8 +46,24 @@ Nodes
  - Add expand editor button to Template node
  - Update catch/status nodes to use selectNodes api and treeList
 
+#### 0.20.7: Maintenance Release
 
+ - Update jsonata to 1.6.5 which should fix #2183
+ - Ensure the subflow stop promise is waiting for before restarting
+ - Properly escape node types in palette
 
+#### 0.20.6: Maintenance Release
+
+ - Revealing node position needs to account for zoom level Fixes #2172
+ - stop join tripping up if last message of buffer is blank.
+ - Improve handling of file upload in request node
+ - Handle subflow internal node wired to a non-existant node Fixes #2202
+ - Do not save subflow env vars with blank names
+ - Don't allow a link node virtual wire to connect to normal port
+ - Clear HTTP Request node authType when auth disabled Fixes #2215
+ - Fix parsing of content-type header Fixes #2216
+ - Fix join node reset issue with merging objects
+ - Copy data-i18n attribute on TypedInput Fixes #2211
 
 #### 0.20.5: Maintenance Release
 
@@ -709,7 +725,7 @@ Nodes
  - Initial support of sequence rules for SWITCH node (#1545)
  - initial support of SORT node (#1500)
  - Inject node - let once delay be editable (#1541)
- - Introduce `nodeMaxMessageBufferLength` setting for msg sequence nodes
+ - Introduce `nodeMessageBufferMaxLength` setting for msg sequence nodes
  - Let CSV correct parts if we remove header row.
  - let default apply if msg.delay not set in override mode. (#1397)
  - let trigger node be reset by boolean message (#1554)

CONTRIBUTING.md

@@ -26,7 +26,7 @@ relevant nodes, press Ctrl-E and copy the flow data from the Export dialog.
 At a minimum, please include:
 
  - Version of Node-RED - either release number if you downloaded a zip, or the first few lines of `git log` if you are cloning the repository directly.
- - Version of node.js - what does `node -v` say?
+ - Version of Node.js - what does `node -v` say?
 
 ## Feature requests
 

Gruntfile.js

@@ -496,7 +496,9 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-chmod');
     grunt.loadNpmTasks('grunt-jsonlint');
     grunt.loadNpmTasks('grunt-mocha-istanbul');
-    grunt.loadNpmTasks('grunt-webdriver');
+    if (fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
+        grunt.loadNpmTasks('grunt-webdriver');
+    }
     grunt.loadNpmTasks('grunt-jsdoc');
     grunt.loadNpmTasks('grunt-jsdoc-to-markdown');
     grunt.loadNpmTasks('grunt-npm-command');
@@ -555,8 +557,8 @@ module.exports = function(grunt) {
     });
 
     grunt.registerTask('verifyUiTestDependencies', function() {
-        if (!fs.existsSync(path.join("node_modules", "chromedriver"))) {
-            grunt.fail.fatal('You need to run "npm install chromedriver@2" before running UI test.');
+        if (!fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
+            grunt.fail.fatal('You need to install the UI test dependencies first.\nUse the script in "scripts/install-ui-test-dependencies.sh"');
             return false;
         }
     });
@@ -579,9 +581,15 @@ module.exports = function(grunt) {
         'Runs code style check on editor code',
         ['jshint:editor']);
 
-    grunt.registerTask('test-ui',
-        'Builds editor content then runs unit tests on editor ui',
-        ['verifyUiTestDependencies','build','jshint:editor','webdriver:all']);
+    if (!fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
+        grunt.registerTask('test-ui',
+            'Builds editor content then runs unit tests on editor ui',
+            ['verifyUiTestDependencies']);
+    } else {
+        grunt.registerTask('test-ui',
+            'Builds editor content then runs unit tests on editor ui',
+            ['verifyUiTestDependencies','build','jshint:editor','webdriver:all']);
+    }
 
     grunt.registerTask('test-nodes',
         'Runs unit tests on core nodes',

package.json

@@ -36,39 +36,37 @@
         "cors": "2.8.5",
         "cron": "1.7.1",
         "denque": "1.4.1",
-        "express": "4.17.0",
-        "express-session": "1.16.1",
-        "fs-extra": "8.0.1",
+        "express": "4.17.1",
+        "express-session": "1.16.2",
+        "fs-extra": "8.1.0",
         "fs.notify": "0.0.4",
-        "hash-sum": "1.0.2",
+        "hash-sum": "2.0.0",
         "https-proxy-agent": "2.2.1",
         "i18next": "15.1.2",
-        "iconv-lite": "0.4.24",
+        "iconv-lite": "0.5.0",
         "is-utf8": "0.2.1",
         "js-yaml": "3.13.1",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.6.4",
+        "jsonata": "1.6.5",
+        "media-typer": "1.1.0",
         "memorystore": "1.6.1",
-        "mime": "2.4.3",
+        "mime": "2.4.4",
         "mqtt": "2.18.8",
         "multer": "1.4.1",
         "mustache": "3.0.1",
-        "node-red-node-email": "^1.4.0",
-        "node-red-node-feedparser": "^0.1.14",
         "node-red-node-rbe": "^0.2.4",
         "node-red-node-sentiment": "^0.1.3",
         "node-red-node-tail": "^0.0.2",
-        "node-red-node-twitter": "^1.1.4",
         "nopt": "4.0.1",
         "oauth2orize": "1.11.0",
         "on-headers": "1.0.2",
         "passport": "0.4.0",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
-        "raw-body": "2.4.0",
+        "raw-body": "2.4.1",
         "request": "2.88.0",
-        "semver": "6.0.0",
-        "uglify-js": "3.5.15",
+        "semver": "6.2.0",
+        "uglify-js": "3.6.0",
         "when": "3.7.8",
         "ws": "6.2.1",
         "xml2js": "0.4.19"
@@ -77,7 +75,7 @@
         "bcrypt": "3.0.6"
     },
     "devDependencies": {
-        "grunt": "~1.0.3",
+        "grunt": "~1.0.4",
         "grunt-chmod": "~1.1.1",
         "grunt-cli": "~1.3.2",
         "grunt-concurrent": "~2.3.1",
@@ -97,7 +95,6 @@
         "grunt-npm-command": "~0.1.2",
         "grunt-sass": "~2.0.0",
         "grunt-simple-mocha": "~0.4.1",
-        "grunt-webdriver": "^2.0.3",
         "http-proxy": "^1.16.2",
         "istanbul": "0.4.5",
         "minami": "1.2.3",
@@ -107,11 +104,7 @@
         "sinon": "1.17.7",
         "stoppable": "^1.1.0",
         "supertest": "3.4.2",
-        "wdio-chromedriver-service": "^0.1.5",
-        "wdio-mocha-framework": "^0.6.4",
-        "wdio-spec-reporter": "^0.1.5",
-        "webdriverio": "^4.14.1",
-        "node-red-node-test-helper": "^0.2.2",
+        "node-red-node-test-helper": "^0.2.3",
         "jsdoc-nr-template": "node-red/jsdoc-nr-template"
     },
     "engines": {

packages/node_modules/@node-red/editor-api/lib/admin/context.js

@@ -30,7 +30,8 @@ module.exports = {
             scope: req.params.scope,
             id: req.params.id,
             key: req.params[0],
-            store: req.query['store']
+            store: req.query['store'],
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.context.getValue(opts).then(function(result) {
             res.json(result);
@@ -45,7 +46,8 @@ module.exports = {
             scope: req.params.scope,
             id: req.params.id,
             key: req.params[0],
-            store: req.query['store']
+            store: req.query['store'],
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.context.delete(opts).then(function(result) {
             res.status(204).end();

packages/node_modules/@node-red/editor-api/lib/admin/flow.js

@@ -24,7 +24,8 @@ module.exports = {
     get: function(req,res) {
         var opts = {
             user: req.user,
-            id: req.params.id
+            id: req.params.id,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.flows.getFlow(opts).then(function(result) {
             return res.json(result);
@@ -35,7 +36,8 @@ module.exports = {
     post: function(req,res) {
         var opts = {
             user: req.user,
-            flow: req.body
+            flow: req.body,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.flows.addFlow(opts).then(function(id) {
             return res.json({id:id});
@@ -47,7 +49,8 @@ module.exports = {
         var opts = {
             user: req.user,
             id: req.params.id,
-            flow: req.body
+            flow: req.body,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.flows.updateFlow(opts).then(function(id) {
             return res.json({id:id});
@@ -58,7 +61,8 @@ module.exports = {
     delete: function(req,res) {
         var opts = {
             user: req.user,
-            id: req.params.id
+            id: req.params.id,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.flows.deleteFlow(opts).then(function() {
             res.status(204).end();

packages/node_modules/@node-red/editor-api/lib/admin/flows.js

@@ -27,7 +27,8 @@ module.exports = {
             return res.status(400).json({code:"invalid_api_version", message:"Invalid API Version requested"});
         }
         var opts = {
-            user: req.user
+            user: req.user,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.flows.getFlows(opts).then(function(result) {
             if (version === "v1") {
@@ -46,7 +47,8 @@ module.exports = {
         }
         var opts = {
             user: req.user,
-            deploymentType: req.get("Node-RED-Deployment-Type")||"full"
+            deploymentType: req.get("Node-RED-Deployment-Type")||"full",
+            req: apiUtils.getRequestLogObject(req)
         }
 
         if (opts.deploymentType !== 'reload') {

packages/node_modules/@node-red/editor-api/lib/admin/index.js

@@ -48,13 +48,13 @@ module.exports = {
         // Nodes
         adminApp.get("/nodes",needsPermission("nodes.read"),nodes.getAll,apiUtil.errorHandler);
         adminApp.post("/nodes",needsPermission("nodes.write"),nodes.post,apiUtil.errorHandler);
-        adminApp.get(/\/nodes\/messages/,needsPermission("nodes.read"),nodes.getModuleCatalogs,apiUtil.errorHandler);
-        adminApp.get(/\/nodes\/((@[^\/]+\/)?[^\/]+\/[^\/]+)\/messages/,needsPermission("nodes.read"),nodes.getModuleCatalog,apiUtil.errorHandler);
-        adminApp.get(/\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.read"),nodes.getModule,apiUtil.errorHandler);
-        adminApp.put(/\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.write"),nodes.putModule,apiUtil.errorHandler);
-        adminApp.delete(/\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.write"),nodes.delete,apiUtil.errorHandler);
-        adminApp.get(/\/nodes\/((@[^\/]+\/)?[^\/]+)\/([^\/]+)$/,needsPermission("nodes.read"),nodes.getSet,apiUtil.errorHandler);
-        adminApp.put(/\/nodes\/((@[^\/]+\/)?[^\/]+)\/([^\/]+)$/,needsPermission("nodes.write"),nodes.putSet,apiUtil.errorHandler);
+        adminApp.get(/^\/nodes\/messages/,needsPermission("nodes.read"),nodes.getModuleCatalogs,apiUtil.errorHandler);
+        adminApp.get(/^\/nodes\/((@[^\/]+\/)?[^\/]+\/[^\/]+)\/messages/,needsPermission("nodes.read"),nodes.getModuleCatalog,apiUtil.errorHandler);
+        adminApp.get(/^\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.read"),nodes.getModule,apiUtil.errorHandler);
+        adminApp.put(/^\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.write"),nodes.putModule,apiUtil.errorHandler);
+        adminApp.delete(/^\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.write"),nodes.delete,apiUtil.errorHandler);
+        adminApp.get(/^\/nodes\/((@[^\/]+\/)?[^\/]+)\/([^\/]+)$/,needsPermission("nodes.read"),nodes.getSet,apiUtil.errorHandler);
+        adminApp.put(/^\/nodes\/((@[^\/]+\/)?[^\/]+)\/([^\/]+)$/,needsPermission("nodes.write"),nodes.putSet,apiUtil.errorHandler);
 
         // Context
         adminApp.get("/context/:scope(global)",needsPermission("context.read"),context.get,apiUtil.errorHandler);

packages/node_modules/@node-red/editor-api/lib/admin/nodes.js

@@ -24,7 +24,8 @@ module.exports = {
     },
     getAll: function(req,res) {
         var opts = {
-            user: req.user
+            user: req.user,
+            req: apiUtils.getRequestLogObject(req)
         }
         if (req.get("accept") == "application/json") {
             runtimeAPI.nodes.getNodeList(opts).then(function(list) {
@@ -42,7 +43,8 @@ module.exports = {
         var opts = {
             user: req.user,
             module: req.body.module,
-            version: req.body.version
+            version: req.body.version,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.addModule(opts).then(function(info) {
             res.json(info);
@@ -54,7 +56,8 @@ module.exports = {
     delete: function(req,res) {
         var opts = {
             user: req.user,
-            module: req.params[0]
+            module: req.params[0],
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.removeModule(opts).then(function() {
             res.status(204).end();
@@ -66,7 +69,8 @@ module.exports = {
     getSet: function(req,res) {
         var opts = {
             user: req.user,
-            id: req.params[0] + "/" + req.params[2]
+            id: req.params[0] + "/" + req.params[2],
+            req: apiUtils.getRequestLogObject(req)
         }
         if (req.get("accept") === "application/json") {
             runtimeAPI.nodes.getNodeInfo(opts).then(function(result) {
@@ -87,7 +91,8 @@ module.exports = {
     getModule: function(req,res) {
         var opts = {
             user: req.user,
-            module: req.params[0]
+            module: req.params[0],
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.getModuleInfo(opts).then(function(result) {
             res.send(result);
@@ -106,7 +111,8 @@ module.exports = {
         var opts = {
             user: req.user,
             id: req.params[0] + "/" + req.params[2],
-            enabled: body.enabled
+            enabled: body.enabled,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.setNodeSetState(opts).then(function(result) {
             res.send(result);
@@ -125,7 +131,8 @@ module.exports = {
         var opts = {
             user: req.user,
             module: req.params[0],
-            enabled: body.enabled
+            enabled: body.enabled,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.setModuleState(opts).then(function(result) {
             res.send(result);
@@ -139,7 +146,8 @@ module.exports = {
         var opts = {
             user: req.user,
             module: req.params[0],
-            lang: req.query.lng
+            lang: req.query.lng,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.getModuleCatalog(opts).then(function(result) {
             res.json(result);
@@ -152,7 +160,8 @@ module.exports = {
     getModuleCatalogs: function(req,res) {
         var opts = {
             user: req.user,
-            lang: req.query.lng
+            lang: req.query.lng,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.getModuleCatalogs(opts).then(function(result) {
             res.json(result);
@@ -164,7 +173,8 @@ module.exports = {
 
     getIcons: function(req,res) {
         var opts = {
-            user: req.user
+            user: req.user,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.getIconList(opts).then(function(list) {
             res.json(list);

packages/node_modules/@node-red/editor-api/lib/auth/tokens.js

@@ -56,7 +56,7 @@ function expireSessions() {
     }
     if (nextExpiry < Number.MAX_SAFE_INTEGER) {
         // Allow 5 seconds grace
-        expiryTimeout = setTimeout(expireSessions,(nextExpiry - Date.now()) + 5000)
+        expiryTimeout = setTimeout(expireSessions,Math.min(2147483647,(nextExpiry - Date.now()) + 5000))
     }
     if (modified) {
         return storage.saveSessions(sessions);
@@ -129,7 +129,7 @@ module.exports = {
             sessions[accessToken] = session;
 
             if (!expiryTimeout) {
-                expiryTimeout = setTimeout(expireSessions,(accessTokenExpiresAt - Date.now()) + 5000)
+                expiryTimeout = setTimeout(expireSessions,Math.min(2147483647,(accessTokenExpiresAt - Date.now()) + 5000))
             }
 
             return storage.saveSessions(sessions).then(function() {

packages/node_modules/@node-red/editor-api/lib/editor/projects.js

@@ -22,7 +22,8 @@ var needsPermission = require("../auth").needsPermission;
 
 function listProjects(req,res) {
     var opts = {
-        user: req.user
+        user: req.user,
+        req: apiUtils.getRequestLogObject(req)
     }
     runtimeAPI.projects.listProjects(opts).then(function(result) {
         res.json(result);
@@ -33,7 +34,8 @@ function listProjects(req,res) {
 function getProject(req,res) {
     var opts = {
         user: req.user,
-        id: req.params.id
+        id: req.params.id,
+        req: apiUtils.getRequestLogObject(req)
     }
     runtimeAPI.projects.getProject(opts).then(function(data) {
         if (data) {
@@ -49,7 +51,8 @@ function getProjectStatus(req,res) {
     var opts = {
         user: req.user,
         id: req.params.id,
-        remote: req.query.remote
+        remote: req.query.remote,
+        req: apiUtils.getRequestLogObject(req)
     }
     runtimeAPI.projects.getStatus(opts).then(function(data){
         if (data) {
@@ -64,7 +67,8 @@ function getProjectStatus(req,res) {
 function getProjectRemotes(req,res) {
     var opts = {
         user: req.user,
-        id: req.params.id
+        id: req.params.id,
+        req: apiUtils.getRequestLogObject(req)
     }
     runtimeAPI.projects.getRemotes(opts).then(function(data) {
         res.json(data);
@@ -98,7 +102,8 @@ module.exports = {
         app.post("/", needsPermission("projects.write"), function(req,res) {
             var opts = {
                 user: req.user,
-                project: req.body
+                project: req.body,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.createProject(opts).then(function(result) {
                 res.json(result);
@@ -112,7 +117,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                project: req.body
+                project: req.body,
+                req: apiUtils.getRequestLogObject(req)
             }
 
             if (req.body.active) {
@@ -150,7 +156,8 @@ module.exports = {
         app.delete("/:id", needsPermission("projects.write"), function(req,res) {
             var opts = {
                 user: req.user,
-                id: req.params.id
+                id: req.params.id,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.deleteProject(opts).then(function() {
                 res.status(204).end();
@@ -168,7 +175,8 @@ module.exports = {
         app.get("/:id/files", needsPermission("projects.read"), function(req,res) {
             var opts = {
                 user: req.user,
-                id: req.params.id
+                id: req.params.id,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getFiles(opts).then(function(data) {
                 res.json(data);
@@ -185,7 +193,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 path: req.params[0],
-                tree: req.params.treeish
+                tree: req.params.treeish,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getFile(opts).then(function(data) {
                 res.json({content:data});
@@ -199,7 +208,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                path: req.params[0]
+                path: req.params[0],
+                req: apiUtils.getRequestLogObject(req)
             }
 
             runtimeAPI.projects.revertFile(opts).then(function() {
@@ -214,7 +224,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                path: req.params[0]
+                path: req.params[0],
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.stageFile(opts).then(function() {
                 getProjectStatus(req,res);
@@ -228,7 +239,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                path: req.body.files
+                path: req.body.files,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.stageFile(opts).then(function() {
                 getProjectStatus(req,res);
@@ -242,7 +254,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                message: req.body.message
+                message: req.body.message,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.commit(opts).then(function() {
                 getProjectStatus(req,res);
@@ -256,7 +269,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                path: req.params[0]
+                path: req.params[0],
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.unstageFile(opts).then(function() {
                 getProjectStatus(req,res);
@@ -269,7 +283,8 @@ module.exports = {
         app.delete("/:id/stage", needsPermission("projects.write"), function(req, res) {
             var opts = {
                 user: req.user,
-                id: req.params.id
+                id: req.params.id,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.unstageFile(opts).then(function() {
                 getProjectStatus(req,res);
@@ -284,7 +299,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 path: req.params[0],
-                type: req.params.type
+                type: req.params.type,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getFileDiff(opts).then(function(data) {
                 res.json({
@@ -301,7 +317,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 limit: req.query.limit || 20,
-                before: req.query.before
+                before: req.query.before,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getCommits(opts).then(function(data) {
                 res.json(data);
@@ -315,7 +332,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                sha: req.params.sha
+                sha: req.params.sha,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getCommit(opts).then(function(data) {
                 res.json({commit:data});
@@ -330,7 +348,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 remote: req.params[0],
-                track: req.query.u
+                track: req.query.u,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.push(opts).then(function(data) {
                 res.status(204).end();
@@ -346,7 +365,8 @@ module.exports = {
                 id: req.params.id,
                 remote: req.params[0],
                 track: req.query.setUpstream,
-                allowUnrelatedHistories: req.query.allowUnrelatedHistories
+                allowUnrelatedHistories: req.query.allowUnrelatedHistories,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.pull(opts).then(function(data) {
                 res.status(204).end();
@@ -359,7 +379,8 @@ module.exports = {
         app.delete("/:id/merge", needsPermission("projects.write"), function(req, res) {
             var opts = {
                 user: req.user,
-                id: req.params.id
+                id: req.params.id,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.abortMerge(opts).then(function() {
                 res.status(204).end();
@@ -374,7 +395,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 path: req.params[0],
-                resolution: req.body.resolutions
+                resolution: req.body.resolutions,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.resolveMerge(opts).then(function() {
                 res.status(204).end();
@@ -388,7 +410,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                remote: false
+                remote: false,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getBranches(opts).then(function(data) {
                 res.json(data);
@@ -403,7 +426,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 branch: req.params.branchName,
-                force: !!req.query.force
+                force: !!req.query.force,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.deleteBranch(opts).then(function(data) {
                 res.status(204).end();
@@ -417,7 +441,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                remote: true
+                remote: true,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getBranches(opts).then(function(data) {
                 res.json(data);
@@ -431,7 +456,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                branch: req.params[0]
+                branch: req.params[0],
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getBranchStatus(opts).then(function(data) {
                 res.json(data);
@@ -446,7 +472,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 branch: req.body.name,
-                create: req.body.create
+                create: req.body.create,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.setBranch(opts).then(function(data) {
                 res.json(data);
@@ -463,7 +490,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                remote: req.body
+                remote: req.body,
+                req: apiUtils.getRequestLogObject(req)
             }
             if (/^https?:\/\/[^/]+@/i.test(req.body.url)) {
                 res.status(400).json({error:"unexpected_error", message:"Git http url must not include username/password"});
@@ -481,7 +509,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                remote: req.params.remoteName
+                remote: req.params.remoteName,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.removeRemote(opts).then(function(data) {
                 getProjectRemotes(req,res);
@@ -497,7 +526,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                remote: remote
+                remote: remote,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.updateRemote(opts).then(function() {
                 res.status(204).end();

packages/node_modules/@node-red/editor-api/lib/editor/theme.js

@@ -28,7 +28,7 @@ var defaultContext = {
     },
     header: {
         title: "Node-RED",
-        image: "red/images/node-red.png"
+        image: "red/images/node-red.svg"
     },
     asset: {
         red: (process.env.NODE_ENV == "development")? "red/red.js":"red/red.min.js",

packages/node_modules/@node-red/editor-api/lib/editor/ui.js

@@ -25,7 +25,7 @@ var theme = require("./theme");
 
 var runtimeAPI;
 var editorClientDir = path.dirname(require.resolve("@node-red/editor-client"));
-var defaultNodeIcon = path.join(editorClientDir,"public","red","images","icons","arrow-in.png");
+var defaultNodeIcon = path.join(editorClientDir,"public","red","images","icons","arrow-in.svg");
 var editorTemplatePath = path.join(editorClientDir,"templates","index.mst");
 var editorTemplate;
 

packages/node_modules/@node-red/editor-api/lib/util.js

@@ -47,5 +47,12 @@ module.exports = {
             code: err.code||"unexpected_error",
             message: err.message||err.toString()
         });
+    },
+    getRequestLogObject: function(req) {
+        return {
+            user: req.user,
+            path: req.path,
+            ip: (req.headers && req.headers['x-forwarded-for']) || (req.connection && req.connection.remoteAddress) || undefined
+        }
     }
 }

packages/node_modules/@node-red/editor-api/package.json

@@ -22,10 +22,10 @@
         "body-parser": "1.19.0",
         "clone": "2.1.2",
         "cors": "2.8.5",
-        "express-session": "1.16.1",
-        "express": "4.17.0",
+        "express-session": "1.16.2",
+        "express": "4.17.1",
         "memorystore": "1.6.1",
-        "mime": "2.4.3",
+        "mime": "2.4.4",
         "mustache": "3.0.1",
         "oauth2orize": "1.11.0",
         "passport-http-bearer": "1.0.1",
@@ -35,6 +35,6 @@
         "ws": "6.2.1"
     },
     "optionalDependencies": {
-        "bcrypt": "3.0.5"
+        "bcrypt": "3.0.6"
     }
 }

packages/node_modules/@node-red/editor-client/locales/en-US/editor.json

@@ -310,6 +310,7 @@
         "addNewType": "Add new __type__...",
         "nodeProperties": "node properties",
         "label": "Label",
+        "color": "Color",
         "portLabels": "Port labels",
         "labelInputs": "Inputs",
         "labelOutputs": "Outputs",
@@ -321,6 +322,31 @@
         "description": "Description",
         "show": "Show",
         "hide": "Hide",
+        "locale": "Select UI Language",
+        "icon": "Icon",
+        "inputType": "Input type",
+        "previewUI": "Preview UI",
+        "previewOK": "Preview OK",
+        "types": {
+            "str": "string",
+            "num": "number",
+            "bool": "bool",
+            "json": "json",
+            "bin": "buffer",
+            "env": "env var",
+            "no-value": "no value"
+        },
+        "menu": {
+            "input": "input",
+            "select": "select",
+            "checkbox": "checkbox",
+            "spinner": "spinner",
+            "hidden": "label only"
+        },
+        "spinner": {
+            "min": "min",
+            "max": "max"
+        },
         "errors": {
             "scopeChange": "Changing the scope will make it unavailable to nodes in other flows that use it",
             "invalidProperties": "Invalid properties:"
@@ -939,9 +965,11 @@
     },
     "editor-tab": {
         "properties": "Properties",
+        "envProperties": "Environment Variables",
         "description": "Description",
         "appearance": "Appearance",
-        "env": "Environment Variables"
+        "preview": "UI Preview",
+        "defaultValue": "Default value"
     },
     "languages" : {
         "de": "German",

packages/node_modules/@node-red/editor-client/locales/ja/editor.json

@@ -80,7 +80,7 @@
             "projects-new": "新規",
             "projects-open": "開く",
             "projects-settings": "設定",
-            "showNodeLabelDefault": "追加したノードのラベルを表示する"
+            "showNodeLabelDefault": "追加したノードのラベルを表示"
         }
     },
     "actions": {
@@ -310,6 +310,7 @@
         "addNewType": "新規に __type__ を追加...",
         "nodeProperties": "プロパティ",
         "label": "ラベル",
+        "color": "色",
         "portLabels": "ポートラベル",
         "labelInputs": "入力",
         "labelOutputs": "出力",
@@ -321,6 +322,31 @@
         "description": "詳細",
         "show": "表示",
         "hide": "非表示",
+        "locale": "UI言語の選択",
+        "icon": "記号",
+        "inputType": "入力形式",
+        "previewUI": "UI確認",
+        "previewOK": "確認OK",
+        "types": {
+            "str": "文字列",
+            "num": "数値",
+            "bool": "真偽",
+            "json": "JSON",
+            "bin": "バッファ",
+            "env": "環境変数",
+            "no-value": "値無し"
+        },
+        "menu": {
+            "input": "入力",
+            "select": "選択",
+            "checkbox": "チェックボックス",
+            "spinner": "数値",
+            "hidden": "ラベルのみ"
+        },
+        "spinner": {
+            "min": "最小",
+            "max": "最大"
+        },
         "errors": {
             "scopeChange": "スコープの変更は、他のフローで使われているノードを無効にします",
             "invalidProperties": "プロパティが不正です:"
@@ -351,7 +377,8 @@
         "pasteNode": "ノードを貼り付け",
         "undoChange": "変更操作を戻す",
         "searchBox": "ノードを検索",
-        "managePalette": "パレットの管理"
+        "managePalette": "パレットの管理",
+        "actionList": "動作一覧"
     },
     "library": {
         "library": "ライブラリ",
@@ -527,11 +554,13 @@
             "none": "選択されていません",
             "refresh": "読み込みのため更新してください",
             "empty": "データが存在しません",
-            "node": "Node",
-            "flow": "Flow",
-            "global": "Global",
+            "node": "ノード",
+            "flow": "フロー",
+            "global": "グローバル",
             "deleteConfirm": "データを削除しても良いですか?",
-            "autoRefresh": "自動更新"
+            "autoRefresh": "自動更新",
+            "refrsh": "更新",
+            "delete": "削除"
         },
         "palette": {
             "name": "パレットの管理",
@@ -736,7 +765,16 @@
     },
     "jsonEditor": {
         "title": "JSONエディタ",
-        "format": "JSONフォーマット"
+        "format": "JSONフォーマット",
+        "rawMode": "JSONを編集",
+        "uiMode": "ビジュアルエディタ",
+        "insertAbove": "上に挿入",
+        "insertBelow": "下に挿入",
+        "addItem": "要素を追加",
+        "copyPath": "要素のパスをコピー",
+        "expandItems": "要素を展開",
+        "collapseItems": "要素を折り畳む",
+        "duplicate": "複製"
     },
     "markdownEditor": {
         "title": "マークダウンエディタ",
@@ -928,9 +966,9 @@
         "properties": "プロパティ",
         "description": "説明",
         "appearance": "外観",
-        "env": "環境変数"
+        "env": "サブフロープロパティ"
     },
-    "languages" : {
+    "languages": {
         "de": "ドイツ語",
         "en-US": "英語",
         "ja": "日本語",

packages/node_modules/@node-red/editor-client/src/images/deploy-flows-o.svg

@@ -0,0 +1 @@
+<svg width="27" height="18" xmlns="http://www.w3.org/2000/svg"><g color="#000"><path fill="#fff" d="M0 5.002h10v5H0zM17 .002h10v5H17z"/><path d="M17 13.002h10v5H17z"/></g><path d="M9.5 7.502h2l4-5h2" fill="none" stroke="#fff" stroke-width="1.5"/></svg>

packages/node_modules/@node-red/editor-client/src/images/deploy-flows.svg

@@ -0,0 +1 @@
+<svg width="32" height="32" xmlns="http://www.w3.org/2000/svg"><path color="#000" fill="#8c101c" d="M0 .002h32v32H0z"/><g color="#000"><path fill="#fff" d="M2 13.002h10v5H2zM19 8.002h10v5H19z"/><path d="M19 21.002h10v5H19z"/></g><path d="M11.5 15.502h2l4-5h2" fill="none" stroke="#fff" stroke-width="1.5"/></svg>

packages/node_modules/@node-red/editor-client/src/images/deploy-full-o.svg

@@ -0,0 +1 @@
+<svg width="27" height="18" xmlns="http://www.w3.org/2000/svg"><g fill="#fff" color="#000"><path d="M0 5h10v5H0zM17 0h10v5H17zM17 13h10v5H17z"/></g><path d="M9.5 7.5h2l4-5h2" fill="none" stroke="#fff" stroke-width="1.5"/></svg>

packages/node_modules/@node-red/editor-client/src/images/deploy-full.svg

@@ -0,0 +1 @@
+<svg width="32" height="32" xmlns="http://www.w3.org/2000/svg"><path color="#000" fill="#8c101c" d="M0 0h32v32H0z"/><g fill="#fff" color="#000"><path d="M2 13h10v5H2zM19 8h10v5H19zM19 21h10v5H19z"/></g><path d="M11.5 15.5h2l4-5h2" fill="none" stroke="#fff" stroke-width="1.5"/></svg>

packages/node_modules/@node-red/editor-client/src/images/deploy-nodes-o.svg

@@ -0,0 +1 @@
+<svg width="27" height="18" xmlns="http://www.w3.org/2000/svg"><path color="#000" d="M0 5.002h10v5H0zM17 13.002h10v5H17z"/><path d="M9.5 7.502h2l4-5h2" fill="none" stroke="#000" stroke-width="1.5"/><path color="#000" fill="#fff" d="M17 .002h10v5H17z"/></svg>

packages/node_modules/@node-red/editor-client/src/images/deploy-nodes.svg

@@ -0,0 +1 @@
+<svg width="32" height="32" xmlns="http://www.w3.org/2000/svg"><path color="#000" fill="#8c101c" d="M0 .002h32v32H0z"/><path color="#000" d="M2 13.002h10v5H2zM19 21.002h10v5H19z"/><path d="M11.5 15.502h2l4-5h2" fill="none" stroke="#000" stroke-width="1.5"/><path color="#000" fill="#fff" d="M19 8.002h10v5H19z"/></svg>

packages/node_modules/@node-red/editor-client/src/images/deploy-reload.svg

@@ -0,0 +1 @@
+<svg width="32" height="32" xmlns="http://www.w3.org/2000/svg"><g color="#000"><path fill="#8c101c" d="M0 .006h32v32H0z"/><path d="M11.81 25.429a10.02 10.02 0 0 0 4.19.914c5.562 0 10.107-4.545 10.107-10.106S21.562 6.131 16 6.131 5.895 10.676 5.895 16.237h3.368c0-3.74 2.997-6.737 6.738-6.737s6.737 2.996 6.737 6.737-2.996 6.738-6.737 6.738a6.775 6.775 0 0 1-2.533-.486l1.43-3.48-6.947 1.317 2.13 8.485z" fill="#fff" style="isolation:auto;mix-blend-mode:normal;text-decoration-color:#000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-transform:none;white-space:normal"/></g></svg>

packages/node_modules/@node-red/editor-client/src/images/icons/arrow-in.svg

@@ -0,0 +1 @@
+<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M18 5v12H7v26h11v12l14-25z" fill="#fff"/></svg>

packages/node_modules/@node-red/editor-client/src/images/node-red.svg

@@ -0,0 +1 @@
+<svg width="46.994" height="18.006" xmlns="http://www.w3.org/2000/svg"><g stroke="#d6d6d6"><g fill="#9e3131" stroke-linejoin="round" stroke-width="3.847" transform="matrix(.25848 0 0 .2614 -63.87 -108.483)"><rect x="249.04" y="435.92" width="50.294" height="22.953" ry="6.608"/><rect x="345.63" y="416.93" width="50.294" height="22.953" ry="6.608"/><rect x="376.71" y="459.01" width="50.294" height="22.953" ry="6.608"/></g><path d="M301.04 447.43c24.406.184 7.107-18.84 42.708-19.03M374.82 470.48c-46.966.538-28.989-22.664-73.619-22.944" fill="none" stroke-width="5.771" transform="matrix(.25848 0 0 .2614 -63.87 -108.483)"/></g></svg>

packages/node_modules/@node-red/editor-client/src/images/subflow_tab.svg

@@ -0,0 +1 @@
+<svg width="40" height="40" xmlns="http://www.w3.org/2000/svg"><path d="M25 16h7c.58 0 1-.42 1-1v-2c0-.58-.42-1-1-1h-7c-.58 0-1 .42-1 1v2c0 .58.42 1 1 1zM8 28h7c.58 0 1-.42 1-1v-2c0-.58-.42-1-1-1H8c-.58 0-1 .42-1 1v2c0 .58.42 1 1 1zm-.416 11C5.624 39 4 37.375 4 35.416V4.582C4 2.622 5.625 1 7.584 1h24.832C34.376 1 36 2.623 36 4.582v30.834C36 37.376 34.375 39 32.416 39zM32 27H19c0 2.19-1.81 4-4 4H7v4.416c0 .35.235.584.584.584h24.832c.35 0 .584-.235.584-.584v-8.417zm1-2v-6h-8c-2.19 0-4-1.81-4-4h-1c-4.333-.002-8.667.004-13 0v6h8c2.19 0 4 1.81 4 4h13zm0-16V4.582c0-.35-.235-.582-.584-.582H7.584C7.234 4 7 4.233 7 4.582v8.417c4.333.002 8.667.001 13 .001h1c0-2.19 1.81-4 4-4z" color="#000" fill="#333"/></svg>

packages/node_modules/@node-red/editor-client/src/images/typedInput/09.svg

@@ -0,0 +1 @@
+<svg width="26" height="36" xmlns="http://www.w3.org/2000/svg"><path d="M14.16 27.38l1.555-.144c.132.731.383 1.261.755 1.591.371.33.848.494 1.429.494.497 0 .931-.114 1.303-.341.377-.228.686-.53.926-.908.24-.383.44-.899.602-1.546a8.122 8.122 0 0 0 .233-2.3 3.732 3.732 0 0 1-1.33 1.258 3.605 3.605 0 0 1-1.815.476c-1.09 0-2.013-.395-2.768-1.186s-1.133-1.834-1.133-3.128c0-1.336.393-2.411 1.178-3.226.79-.815 1.78-1.223 2.966-1.223.856 0 1.638.231 2.345.692.713.462 1.253 1.12 1.618 1.978.372.85.557 2.085.557 3.702 0 1.684-.182 3.026-.548 4.027-.365.994-.91 1.752-1.636 2.274-.719.52-1.563.781-2.534.781-1.03 0-1.872-.284-2.525-.853-.654-.576-1.046-1.381-1.178-2.418zm6.624-5.815c0-.928-.249-1.666-.746-2.21-.492-.546-1.085-.819-1.78-.819-.719 0-1.345.294-1.878.881s-.8 1.348-.8 2.283c0 .839.252 1.522.755 2.05.51.52 1.135.781 1.878.781.75 0 1.363-.26 1.843-.782.485-.527.728-1.255.728-2.184zM4.858 10.466c0-1.558.158-2.81.476-3.757.324-.952.8-1.686 1.429-2.201.635-.516 1.432-.773 2.39-.773.708 0 1.328.143 1.861.431.533.282.974.692 1.321 1.231.348.534.62 1.187.818 1.96.198.767.297 1.803.297 3.11 0 1.545-.16 2.794-.477 3.747-.317.947-.794 1.68-1.429 2.202-.629.515-1.426.773-2.39.773-1.27 0-2.268-.456-2.993-1.366-.869-1.097-1.303-2.882-1.303-5.357zm1.662 0c0 2.163.252 3.604.755 4.323.51.713 1.136 1.07 1.879 1.07.743 0 1.366-.36 1.87-1.079.508-.719.763-2.157.763-4.314 0-2.169-.255-3.61-.764-4.323-.503-.713-1.132-1.07-1.887-1.07-.743 0-1.336.315-1.78.944-.557.803-.836 2.286-.836 4.45z" fill="#444"/></svg>

packages/node_modules/@node-red/editor-client/src/images/typedInput/az.svg

@@ -0,0 +1 @@
+<svg width="26" height="36" xmlns="http://www.w3.org/2000/svg"><path d="M13.27 29.15l6.733-8.143h-6.235V19.3h8.8v1.559l-6.69 8.09h6.892v1.707h-9.5zm4.909-10.125zM6.577 12.58q0 .827.604 1.304.605.478 1.432.478 1.007 0 1.95-.467 1.59-.774 1.59-2.534V9.824q-.349.222-.9.37-.552.15-1.082.213l-1.155.148q-1.04.138-1.56.435-.88.498-.88 1.59zM11.2 8.721q.657-.085.88-.551.127-.255.127-.732 0-.975-.7-1.41-.689-.445-1.983-.445-1.495 0-2.12.805-.35.446-.456 1.326H5.167q.053-2.1 1.357-2.916 1.315-.827 3.043-.827 2.004 0 3.255.763 1.24.764 1.24 2.375v6.542q0 .297.117.477.127.18.52.18.127 0 .286-.01.159-.021.34-.053v1.41q-.446.127-.68.16-.233.031-.636.031-.986 0-1.43-.7-.234-.37-.33-1.05-.583.764-1.675 1.326t-2.407.562q-1.58 0-2.587-.954-.996-.965-.996-2.407 0-1.58.986-2.45.986-.869 2.587-1.07zm-1.58-4.75z" fill="#444"/></svg>

packages/node_modules/@node-red/editor-client/src/images/typedInput/bin.svg

@@ -0,0 +1 @@
+<svg width="26" height="36" xmlns="http://www.w3.org/2000/svg"><path d="M18.8 33.9c3.328 0 4.776-2.603 4.776-7.066s-1.448-7.066-4.776-7.066-4.776 2.603-4.776 7.066S15.473 33.9 18.8 33.9zm0-1.429c-2.192 0-3.073-1.781-3.073-4.522v-2.23c0-2.741.88-4.523 3.073-4.523s3.073 1.782 3.073 4.522v2.231c0 2.74-.88 4.522-3.073 4.522zm-6.306 1.194v-1.429H8.892V20.002H6.328l-3.621 3.386.959 1.038 3.445-3.21h.137v11.02H3.333v1.429zm11.2-17.7v-1.429h-3.602V2.302h-2.564l-3.621 3.386.959 1.038 3.445-3.21h.137v11.02h-3.915v1.429zM7.5 16.2c3.327 0 4.776-2.603 4.776-7.066S10.828 2.068 7.5 2.068 2.725 4.67 2.725 9.134 4.173 16.2 7.5 16.2zm0-1.429c-2.193 0-3.074-1.781-3.074-4.522V8.02c0-2.741.881-4.523 3.074-4.523s3.073 1.782 3.073 4.522v2.231c0 2.74-.881 4.522-3.073 4.522z" fill="#444"/></svg>

packages/node_modules/@node-red/editor-client/src/images/typedInput/bool.svg

@@ -0,0 +1 @@
+<svg width="26" height="36" xmlns="http://www.w3.org/2000/svg"><path d="M9.96 21.98a5 5 0 1 1 6.11-7.917zm3.035-13.973c-5.512 0-10 4.488-10 10s4.488 9.998 10 9.998 10-4.486 10-9.998-4.488-10-10-10zm0 1.816c4.53 0 8.182 3.655 8.182 8.184s-3.652 8.182-8.182 8.182-8.181-3.653-8.181-8.182 3.652-8.184 8.181-8.184z" color="#000" fill="#444"/></svg>

packages/node_modules/@node-red/editor-client/src/images/typedInput/env.svg

@@ -0,0 +1 @@
+<svg width="26" height="36" xmlns="http://www.w3.org/2000/svg"><path d="M14.33 27.19q2.916-.136 4.024-2.131.58-1.024.58-2.37 0-2.132-1.569-3.24-.904-.648-3.035-1.228zM8.55 10.736q0 1.688 1.108 2.643 1.125.955 3.018 1.33V6.695q-2.234.085-3.189 1.364-.937 1.279-.937 2.677zm-3.07.205q0-2.592 1.893-4.672 1.91-2.08 5.337-2.115V1.887h1.62V4.12q3.393.239 5.2 2.012 1.825 1.757 1.91 4.655h-2.984q-.119-1.296-.699-2.233-1.074-1.723-3.427-1.808v8.287q3.956 1.108 5.371 2.08 2.302 1.603 2.302 4.74 0 4.536-2.95 6.446-1.637 1.057-4.723 1.398v3.308h-1.62v-3.308q-4.962-.324-6.735-3.513-.972-1.722-.972-4.655h3.018q.136 2.336.733 3.41 1.057 1.927 3.922 2.166v-9.293q-3.683-.699-5.44-2.336Q5.48 13.84 5.48 10.941z" fill="#444"/></svg>

packages/node_modules/@node-red/editor-client/src/images/typedInput/expr.svg

@@ -0,0 +1 @@
+<svg width="26" height="36" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-337.103 -913.25) scale(1.2585)" fill="#444" stroke-width=".795"><circle cx="284.36" cy="733.68" r="1.5" color="#000" style="isolation:auto;mix-blend-mode:normal"/><circle cx="284.33" cy="740.74" r="1.5" color="#000" style="isolation:auto;mix-blend-mode:normal"/><path d="M276.18 727.78l4.396-1.565v18.515c-.711 2.606-2.922 4.394-5.812 5.812l-4.135 1.974-.559-1.192 3.353-1.639c1.459-.724 2.689-1.87 2.869-4.955z" fill-rule="evenodd"/></g></svg>

packages/node_modules/@node-red/editor-client/src/images/typedInput/json.svg

@@ -0,0 +1 @@
+<svg width="26" height="36" xmlns="http://www.w3.org/2000/svg"><path d="M15 5.225v-1.92h2.24q.608 0 1.216.288.608.256 1.12.8.48.512.8 1.312.32.768.32 1.792v5.824q0 .832.224 1.536t.608 1.216q.352.48.832.768.48.256.992.256v2.176q-.512 0-.992.256t-.832.736q-.384.48-.608 1.184t-.224 1.568v5.792q0 1.024-.32 1.792-.32.8-.8 1.312-.512.544-1.12.8-.608.288-1.216.288H15v-1.92h1.6q.48 0 .768-.256.288-.224.48-.64.16-.384.224-.896.064-.48.064-.96v-5.824q0-1.216.352-2.016.32-.8.768-1.28.448-.512.928-.736.448-.224.736-.256v-.096q-.288-.064-.736-.32-.48-.256-.928-.768t-.768-1.28q-.352-.8-.352-1.92V7.977q0-.512-.064-.992-.064-.512-.224-.896-.192-.384-.48-.608-.288-.256-.768-.256zm-3.648 0v-1.92h-2.24q-.608 0-1.216.288-.608.256-1.12.8-.48.512-.8 1.312-.32.768-.32 1.792v5.824q0 .832-.224 1.536t-.608 1.216q-.352.48-.832.768-.48.256-.992.256v2.176q.512 0 .992.256t.832.736q.384.48.608 1.184t.224 1.568v5.792q0 1.024.32 1.792.32.8.8 1.312.512.544 1.12.8.608.288 1.216.288h2.24v-1.92h-1.6q-.48 0-.768-.256-.288-.224-.48-.64-.16-.384-.224-.896-.064-.48-.064-.96v-5.824q0-1.216-.352-2.016-.32-.8-.768-1.28-.448-.512-.928-.736-.448-.224-.736-.256v-.096q.288-.064.736-.32.48-.256.928-.768t.768-1.28q.352-.8.352-1.92V7.977q0-.512.064-.992.064-.512.224-.896.192-.384.48-.608.288-.256.768-.256z" fill="#444"/></svg>

packages/node_modules/@node-red/editor-client/src/images/typedInput/re.svg

@@ -0,0 +1 @@
+<svg width="26" height="36" xmlns="http://www.w3.org/2000/svg"><path d="M2 19h5v5H2zm16.099-3.304v-5.659h-2.654v5.66l-5.309-2.004-.901 2.404L14.543 18l-3.255 4.557 2.254 1.553 3.255-4.808 3.455 4.808 2.054-1.553L19 18l5.46-1.903-1.002-2.404z" color="#000" fill="#444444"/></svg>

packages/node_modules/@node-red/editor-client/src/images/typedInput/target.svg

@@ -0,0 +1 @@
+<svg width="26" height="36" xmlns="http://www.w3.org/2000/svg"><path d="M11 5v5.77a7.542 7.542 0 0 0-5.234 5.25L1 16c-1.432 1.397-1.232 2.722 0 4l4.75-.078a7.542 7.542 0 0 0 5.22 5.297L11 31c1.316 1.303 2.649 1.363 4 0l.009-5.775A7.542 7.542 0 0 0 20.228 20H25c1.261-1.294 1.404-2.623 0-4l-4.774-.01a7.542 7.542 0 0 0-5.23-5.22L15 5c-1.3-1.273-2.63-1.393-4 0zm2 7.499c3.05 0 5.5 2.45 5.5 5.5s-2.45 5.5-5.5 5.5-5.5-2.45-5.5-5.5 2.45-5.5 5.5-5.5z" color="#000" fill="#444"/></svg>

packages/node_modules/@node-red/editor-client/src/js/history.js

@@ -14,7 +14,8 @@
  * limitations under the License.
  **/
 RED.history = (function() {
-    var undo_history = [];
+    var undoHistory = [];
+    var redoHistory = [];
 
     function undoEvent(ev) {
         var i;
@@ -22,52 +23,81 @@ RED.history = (function() {
         var node;
         var subflow;
         var modifiedTabs = {};
+        var inverseEv;
         if (ev) {
             if (ev.t == 'multi') {
+                inverseEv = {
+                    t: 'multi',
+                    events: []
+                };
                 len = ev.events.length;
                 for (i=len-1;i>=0;i--) {
-                    undoEvent(ev.events[i]);
+                    var r = undoEvent(ev.events[i]);
+                    inverseEv.events.push(r);
                 }
             } else if (ev.t == 'replace') {
+                inverseEv = {
+                    t: 'replace',
+                    config: RED.nodes.createCompleteNodeSet(),
+                    changed: [],
+                    rev: RED.nodes.version()
+                };
                 RED.nodes.clear();
                 var imported = RED.nodes.import(ev.config);
                 imported[0].forEach(function(n) {
                     if (ev.changed[n.id]) {
                         n.changed = true;
+                        inverseEv.changed[n.id] = true;
                     }
                 })
 
                 RED.nodes.version(ev.rev);
             } else if (ev.t == 'add') {
+                inverseEv = {
+                    t: "delete",
+                };
                 if (ev.nodes) {
+                    inverseEv.nodes = [];
                     for (i=0;i<ev.nodes.length;i++) {
                         node = RED.nodes.node(ev.nodes[i]);
                         if (node.z) {
                             modifiedTabs[node.z] = true;
                         }
+                        inverseEv.nodes.push(node);
                         RED.nodes.remove(ev.nodes[i]);
                     }
                 }
                 if (ev.links) {
+                    inverseEv.links = [];
                     for (i=0;i<ev.links.length;i++) {
+                        inverseEv.links.push(ev.links[i]);
                         RED.nodes.removeLink(ev.links[i]);
                     }
                 }
                 if (ev.workspaces) {
+                    inverseEv.workspaces = [];
                     for (i=0;i<ev.workspaces.length;i++) {
+                        var workspaceOrder = RED.nodes.getWorkspaceOrder();
+                        ev.workspaces[i]._index = workspaceOrder.indexOf(ev.workspaces[i].id);
+                        inverseEv.workspaces.push(ev.workspaces[i]);
                         RED.nodes.removeWorkspace(ev.workspaces[i].id);
                         RED.workspaces.remove(ev.workspaces[i]);
                     }
                 }
                 if (ev.subflows) {
+                    inverseEv.subflows = [];
                     for (i=0;i<ev.subflows.length;i++) {
+                        inverseEv.subflows.push(ev.subflows[i]);
                         RED.nodes.removeSubflow(ev.subflows[i]);
                         RED.workspaces.remove(ev.subflows[i]);
                     }
                 }
                 if (ev.subflow) {
+                    inverseEv.subflow = {};
                     if (ev.subflow.instances) {
+                        inverseEv.subflow.instances = [];
                         ev.subflow.instances.forEach(function(n) {
+                            inverseEv.subflow.instances.push(n);
                             var node = RED.nodes.node(n.id);
                             if (node) {
                                 node.changed = n.changed;
@@ -83,21 +113,30 @@ RED.history = (function() {
                     }
                 }
                 if (ev.removedLinks) {
+                    inverseEv.createdLinks = [];
                     for (i=0;i<ev.removedLinks.length;i++) {
+                        inverseEv.createdLinks.push(ev.removedLinks[i]);
                         RED.nodes.addLink(ev.removedLinks[i]);
                     }
                 }
 
             } else if (ev.t == "delete") {
+                inverseEv = {
+                    t: "add"
+                };
                 if (ev.workspaces) {
+                    inverseEv.workspaces = [];
                     for (i=0;i<ev.workspaces.length;i++) {
+                        inverseEv.workspaces.push(ev.workspaces[i]);
                         RED.nodes.addWorkspace(ev.workspaces[i],ev.workspaces[i]._index);
                         RED.workspaces.add(ev.workspaces[i],undefined,ev.workspaces[i]._index);
                         delete ev.workspaces[i]._index;
                     }
                 }
                 if (ev.subflows) {
+                    inverseEv.subflows = [];
                     for (i=0;i<ev.subflows.length;i++) {
+                        inverseEv.subflows.push(ev.subflows[i]);
                         RED.nodes.addSubflow(ev.subflows[i]);
                     }
                 }
@@ -126,8 +165,11 @@ RED.history = (function() {
                     }
                 }
                 if (ev.subflow) {
+                    inverseEv.subflow = {};
                     if (ev.subflow.hasOwnProperty('instances')) {
+                        inverseEv.subflow.instances = [];
                         ev.subflow.instances.forEach(function(n) {
+                            inverseEv.subflow.instances.push(n);
                             var node = RED.nodes.node(n.id);
                             if (node) {
                                 node.changed = n.changed;
@@ -152,14 +194,25 @@ RED.history = (function() {
                     });
                 }
                 if (ev.nodes) {
+                    inverseEv.nodes = [];
                     for (i=0;i<ev.nodes.length;i++) {
                         RED.nodes.add(ev.nodes[i]);
                         modifiedTabs[ev.nodes[i].z] = true;
+                        inverseEv.nodes.push(ev.nodes[i].id);
                     }
                 }
                 if (ev.links) {
+                    inverseEv.links = [];
                     for (i=0;i<ev.links.length;i++) {
                         RED.nodes.addLink(ev.links[i]);
+                        inverseEv.links.push(ev.links[i]);
+                    }
+                }
+                if (ev.createdLinks) {
+                    inverseEv.removedLinks = [];
+                    for (i=0;i<ev.createdLinks.length;i++) {
+                        inverseEv.removedLinks.push(ev.createdLinks[i]);
+                        RED.nodes.removeLink(ev.createdLinks[i]);
                     }
                 }
                 if (ev.changes) {
@@ -179,8 +232,14 @@ RED.history = (function() {
 
                 }
             } else if (ev.t == "move") {
+                inverseEv = {
+                    t: 'move',
+                    nodes: []
+                };
                 for (i=0;i<ev.nodes.length;i++) {
                     var n = ev.nodes[i];
+                    var rn = {n: n.n, ox: n.n.x, oy: n.n.y, dirty: true, moved: n.moved};
+                    inverseEv.nodes.push(rn);
                     n.n.x = n.ox;
                     n.n.y = n.oy;
                     n.n.dirty = true;
@@ -188,18 +247,28 @@ RED.history = (function() {
                 }
                 // A move could have caused a link splice
                 if (ev.links) {
+                    inverseEv.removedLinks = [];
                     for (i=0;i<ev.links.length;i++) {
+                        inverseEv.removedLinks.push(ev.links[i]);
                         RED.nodes.removeLink(ev.links[i]);
                     }
                 }
                 if (ev.removedLinks) {
+                    inverseEv.links = [];
                     for (i=0;i<ev.removedLinks.length;i++) {
+                        inverseEv.links.push(ev.removedLinks[i]);
                         RED.nodes.addLink(ev.removedLinks[i]);
                     }
                 }
             } else if (ev.t == "edit") {
+                inverseEv = {
+                    t: "edit",
+                    changes: {}
+                };
+                inverseEv.node = ev.node;
                 for (i in ev.changes) {
                     if (ev.changes.hasOwnProperty(i)) {
+                        inverseEv.changes[i] = ev.node[i];
                         if (ev.node._def.defaults && ev.node._def.defaults[i] && ev.node._def.defaults[i].type) {
                             // This is a config node property
                             var currentConfigNode = RED.nodes.node(ev.node[i]);
@@ -219,22 +288,29 @@ RED.history = (function() {
                     $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!ev.node.disabled);
                 }
                 if (ev.subflow) {
+                    inverseEv.subflow = {};
                     if (ev.subflow.hasOwnProperty('inputCount')) {
+                        inverseEv.subflow.inputCount = ev.node.in.length;
                         if (ev.node.in.length > ev.subflow.inputCount) {
+                            inverseEv.subflow.inputs = ev.node.in.slice(ev.subflow.inputCount);
                             ev.node.in.splice(ev.subflow.inputCount);
                         } else if (ev.subflow.inputs.length > 0) {
                             ev.node.in = ev.node.in.concat(ev.subflow.inputs);
                         }
                     }
                     if (ev.subflow.hasOwnProperty('outputCount')) {
+                        inverseEv.subflow.outputCount = ev.node.out.length;
                         if (ev.node.out.length > ev.subflow.outputCount) {
+                            inverseEv.subflow.outputs = ev.node.out.slice(ev.subflow.outputCount);
                             ev.node.out.splice(ev.subflow.outputCount);
                         } else if (ev.subflow.outputs.length > 0) {
                             ev.node.out = ev.node.out.concat(ev.subflow.outputs);
                         }
                     }
                     if (ev.subflow.hasOwnProperty('instances')) {
+                        inverseEv.subflow.instances = [];
                         ev.subflow.instances.forEach(function(n) {
+                            inverseEv.subflow.instances.push(n);
                             var node = RED.nodes.node(n.id);
                             if (node) {
                                 node.changed = n.changed;
@@ -258,9 +334,11 @@ RED.history = (function() {
                     var outputMap;
                     if (ev.outputMap) {
                         outputMap = {};
+                        inverseEv.outputMap = {};
                         for (var port in ev.outputMap) {
                             if (ev.outputMap.hasOwnProperty(port) && ev.outputMap[port] !== "-1") {
                                 outputMap[ev.outputMap[port]] = port;
+                                inverseEv.outputMap[ev.outputMap[port]] = port;
                             }
                         }
                     }
@@ -268,39 +346,107 @@ RED.history = (function() {
                     RED.editor.validateNode(ev.node);
                 }
                 if (ev.links) {
+                    inverseEv.createdLinks = [];
                     for (i=0;i<ev.links.length;i++) {
                         RED.nodes.addLink(ev.links[i]);
+                        inverseEv.createdLinks.push(ev.links[i]);
+                    }
+                }
+                if (ev.createdLinks) {
+                    inverseEv.links = [];
+                    for (i=0;i<ev.createdLinks.length;i++) {
+                        RED.nodes.removeLink(ev.createdLinks[i]);
+                        inverseEv.links.push(ev.createdLinks[i]);
                     }
                 }
                 ev.node.dirty = true;
                 ev.node.changed = ev.changed;
             } else if (ev.t == "createSubflow") {
+                inverseEv = {
+                    t: "deleteSubflow",
+                    activeWorkspace: ev.activeWorkspace,
+                    dirty: RED.nodes.dirty()
+                };
                 if (ev.nodes) {
+                    inverseEv.movedNodes = [];
+                    var z = ev.activeWorkspace;
                     RED.nodes.filterNodes({z:ev.subflow.subflow.id}).forEach(function(n) {
                         n.x += ev.subflow.offsetX;
                         n.y += ev.subflow.offsetY;
-                        n.z = ev.activeWorkspace;
                         n.dirty = true;
+                        inverseEv.movedNodes.push(n.id);
+                        RED.nodes.moveNodeToTab(n, z);
                     });
+                    inverseEv.subflows = [];
                     for (i=0;i<ev.nodes.length;i++) {
+                        inverseEv.subflows.push(RED.nodes.node(ev.nodes[i]));
                         RED.nodes.remove(ev.nodes[i]);
                     }
                 }
                 if (ev.links) {
+                    inverseEv.links = [];
                     for (i=0;i<ev.links.length;i++) {
+                        inverseEv.links.push(ev.links[i]);
                         RED.nodes.removeLink(ev.links[i]);
                     }
                 }
 
+                inverseEv.subflow = ev.subflow;
                 RED.nodes.removeSubflow(ev.subflow.subflow);
                 RED.workspaces.remove(ev.subflow.subflow);
 
                 if (ev.removedLinks) {
+                    inverseEv.createdLinks = [];
                     for (i=0;i<ev.removedLinks.length;i++) {
+                        inverseEv.createdLinks.push(ev.removedLinks[i]);
                         RED.nodes.addLink(ev.removedLinks[i]);
                     }
                 }
+            } else if (ev.t == "deleteSubflow") {
+                inverseEv = {
+                    t: "createSubflow",
+                    activeWorkspace: ev.activeWorkspace,
+                    dirty: RED.nodes.dirty(),
+                };
+                if (ev.subflow) {
+                    RED.nodes.addSubflow(ev.subflow.subflow);
+                    inverseEv.subflow = ev.subflow;
+                }
+                if (ev.subflows) {
+                    inverseEv.nodes = [];
+                    for (i=0;i<ev.subflows.length;i++) {
+                        RED.nodes.add(ev.subflows[i]);
+                        inverseEv.nodes.push(ev.subflows[i].id);
+                    }
+                }
+                if (ev.movedNodes) {
+                    ev.movedNodes.forEach(function(nid) {
+                        nn = RED.nodes.node(nid);
+                        nn.x -= ev.subflow.offsetX;
+                        nn.y -= ev.subflow.offsetY;
+                        nn.dirty = true;
+                        RED.nodes.moveNodeToTab(nn, ev.subflow.subflow.id);
+                    });
+                }
+                if (ev.links) {
+                    inverseEv.links = [];
+                    for (i=0;i<ev.links.length;i++) {
+                        inverseEv.links.push(ev.links[i]);
+                        RED.nodes.addLink(ev.links[i]);
+                    }
+                }
+                if  (ev.createdLinks) {
+                    inverseEv.removedLinks = [];
+                    for (i=0;i<ev.createdLinks.length;i++) {
+                        inverseEv.removedLinks.push(ev.createdLinks[i]);
+                        RED.nodes.removeLink(ev.createdLinks[i]);
+                    }
+                }
             } else if (ev.t == "reorder") {
+                inverseEv = {
+                    t: 'reorder',
+                    order: RED.nodes.getWorkspaceOrder()
+                };
                 if (ev.order) {
                     RED.workspaces.order(ev.order);
                 }
@@ -320,6 +466,8 @@ RED.history = (function() {
             RED.workspaces.refresh();
             RED.sidebar.config.refresh();
             RED.subflow.refresh();
+
+            return inverseEv;
         }
 
     }
@@ -327,28 +475,42 @@ RED.history = (function() {
     return {
         //TODO: this function is a placeholder until there is a 'save' event that can be listened to
         markAllDirty: function() {
-            for (var i=0;i<undo_history.length;i++) {
-                undo_history[i].dirty = true;
+            for (var i=0;i<undoHistory.length;i++) {
+                undoHistory[i].dirty = true;
             }
         },
         list: function() {
-            return undo_history
+            return undoHistory;
         },
         depth: function() {
-            return undo_history.length;
+            return undoHistory.length;
         },
         push: function(ev) {
-            undo_history.push(ev);
+            undoHistory.push(ev);
+            redoHistory = [];
         },
         pop: function() {
-            var ev = undo_history.pop();
-            undoEvent(ev);
+            var ev = undoHistory.pop();
+            var rev = undoEvent(ev);
+            if (rev) {
+                redoHistory.push(rev);
+            }
         },
         peek: function() {
-            return undo_history[undo_history.length-1];
+            return undoHistory[undoHistory.length-1];
         },
         clear: function() {
-            undo_history = [];
+            undoHistory = [];
+            redoHistory = [];
+        },
+        redo: function() {
+            var ev = redoHistory.pop();
+            if (ev) {
+                var uev = undoEvent(ev);
+                if (uev) {
+                    undoHistory.push(uev);
+                }
+            }
         }
     }
 

packages/node_modules/@node-red/editor-client/src/js/i18n.js

@@ -50,6 +50,19 @@ RED.i18n = (function() {
             }
 
         },
+        lang: function() {
+            // Gets the active message catalog language. This is based on what
+            // locale the editor is using and what languages are available.
+            //
+            var preferredLangs = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
+            var knownLangs = RED.settings.theme("languages")||["en-US"];
+            for (var i=0;i<preferredLangs.length;i++) {
+                if (knownLangs.indexOf(preferredLangs[i]) > -1) {
+                    return preferredLangs[i]
+                }
+            }
+            return 'end-US'
+        },
         loadNodeCatalog: function(namespace,done) {
             var languageList = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
             var toLoad = languageList.length;

packages/node_modules/@node-red/editor-client/src/js/keymap.json

@@ -8,6 +8,7 @@
         "ctrl-0": "core:zoom-reset",
         "ctrl-enter": "core:confirm-edit-tray",
         "ctrl-escape": "core:cancel-edit-tray",
+        "ctrl-d": "core:deploy-flows",
         "ctrl-g i": "core:show-info-tab",
         "ctrl-g d": "core:show-debug-tab",
         "ctrl-g c": "core:show-config-tab",
@@ -29,7 +30,8 @@
         "backspace": "core:delete-config-selection",
         "delete": "core:delete-config-selection",
         "ctrl-a": "core:select-all-config-nodes",
-        "ctrl-z": "core:undo"
+        "ctrl-z": "core:undo",
+        "ctrl-y": "core:redo"
     },
     "red-ui-workspace": {
         "backspace": "core:delete-selection",
@@ -39,6 +41,7 @@
         "ctrl-x": "core:cut-selection-to-internal-clipboard",
         "ctrl-v": "core:paste-from-internal-clipboard",
         "ctrl-z": "core:undo",
+        "ctrl-y": "core:redo",
         "ctrl-a": "core:select-all-nodes",
         "shift-?": "core:show-help",
         "up": "core:move-selection-up",

packages/node_modules/@node-red/editor-client/src/js/nodes.js

@@ -17,6 +17,8 @@ RED.nodes = (function() {
 
     var node_defs = {};
     var nodes = [];
+    var nodeTabMap = {};
+
     var configNodes = {};
     var links = [];
     var defaultWorkspace;
@@ -213,6 +215,11 @@ RED.nodes = (function() {
                 n.i = nextId+1;
             }
             nodes.push(n);
+            if (nodeTabMap[n.z]) {
+                nodeTabMap[n.z][n.id] = n;
+            } else {
+                console.warn("Node added to unknown tab/subflow:",n);
+            }
         }
         RED.events.emit('nodes:add',n);
     }
@@ -246,6 +253,9 @@ RED.nodes = (function() {
             node = getNode(id);
             if (node) {
                 nodes.splice(nodes.indexOf(node),1);
+                if (nodeTabMap[node.z]) {
+                    delete nodeTabMap[node.z][node.id];
+                }
                 removedLinks = links.filter(function(l) { return (l.source === node) || (l.target === node); });
                 removedLinks.forEach(function(l) {links.splice(links.indexOf(l), 1); });
                 var updatedConfigNode = false;
@@ -291,6 +301,17 @@ RED.nodes = (function() {
         return {links:removedLinks,nodes:removedNodes};
     }
 
+    function moveNodeToTab(node, z) {
+        if (nodeTabMap[node.z]) {
+            delete nodeTabMap[node.z][node.id];
+        }
+        if (!nodeTabMap[z]) {
+            nodeTabMap[z] = {};
+        }
+        nodeTabMap[z][node.id] = node;
+        node.z = z;
+    }
+    
     function removeLink(l) {
         var index = links.indexOf(l);
         if (index != -1) {
@@ -300,6 +321,8 @@ RED.nodes = (function() {
 
     function addWorkspace(ws,targetIndex) {
         workspaces[ws.id] = ws;
+        nodeTabMap[ws.id] = {};
+
         ws._def = RED.nodes.getType('tab');
         if (targetIndex === undefined) {
             workspacesOrder.push(ws.id);
@@ -312,6 +335,7 @@ RED.nodes = (function() {
     }
     function removeWorkspace(id) {
         delete workspaces[id];
+        delete nodeTabMap[id];
         workspacesOrder.splice(workspacesOrder.indexOf(id),1);
 
         var removedNodes = [];
@@ -357,30 +381,32 @@ RED.nodes = (function() {
             sf.name = subflowName;
         }
         subflows[sf.id] = sf;
+        nodeTabMap[sf.id] = {};
+
         RED.nodes.registerType("subflow:"+sf.id, {
             defaults:{
                 name:{value:""},
                 env:{value:[]}
             },
-            icon: function() { return sf.icon||"subflow.png" },
+            icon: function() { return sf.icon||"subflow.svg" },
             category: sf.category || "subflows",
             inputs: sf.in.length,
             outputs: sf.out.length,
-            color: "#da9",
+            color: sf.color || "#da9",
             label: function() { return this.name||RED.nodes.subflow(sf.id).name },
             labelStyle: function() { return this.name?"red-ui-flow-node-label-italic":""; },
             paletteLabel: function() { return RED.nodes.subflow(sf.id).name },
             inputLabels: function(i) { return sf.inputLabels?sf.inputLabels[i]:null },
             outputLabels: function(i) { return sf.outputLabels?sf.outputLabels[i]:null },
             oneditresize: function(size) {
-                var rows = $("#dialog-form>div:not(.node-input-env-container-row)");
+                // var rows = $(".dialog-form>div:not(.node-input-env-container-row)");
                 var height = size.height;
-                for (var i=0; i<rows.size(); i++) {
-                    height -= $(rows[i]).outerHeight(true);
-                }
-                var editorRow = $("#dialog-form>div.node-input-env-container-row");
-                height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
-                $("#node-input-env-container").editableList('height',height-80);
+                // for (var i=0; i<rows.size(); i++) {
+                //     height -= $(rows[i]).outerHeight(true);
+                // }
+                // var editorRow = $("#dialog-form>div.node-input-env-container-row");
+                // height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
+                $("ol.red-ui-editor-subflow-env-list").editableList('height',height);
             },
             set:{
                 module: "node-red"
@@ -393,6 +419,7 @@ RED.nodes = (function() {
     }
     function removeSubflow(sf) {
         delete subflows[sf.id];
+        delete nodeTabMap[sf.id];
         registry.removeNodeType("subflow:"+sf.id);
     }
 
@@ -551,6 +578,7 @@ RED.nodes = (function() {
         node.in = [];
         node.out = [];
         node.env = n.env;
+        node.color = n.color;
 
         n.in.forEach(function(p) {
             var nIn = {x:p.x,y:p.y,wires:[]};
@@ -583,7 +611,7 @@ RED.nodes = (function() {
             node.outputLabels = n.outputLabels.slice();
         }
         if (n.icon) {
-            if (n.icon !== "node-red/subflow.png") {
+            if (n.icon !== "node-red/subflow.svg") {
                 node.icon = n.icon;
             }
         }
@@ -1266,12 +1294,13 @@ RED.nodes = (function() {
     // TODO: supports filter.z|type
     function filterNodes(filter) {
         var result = [];
+        var searchSet = nodes;
+        if (filter.hasOwnProperty("z") && Object.hasOwnProperty("values") && nodeTabMap.hasOwnProperty(filter.z) ) {
+            searchSet = Object.values(nodeTabMap[filter.z]);
+        }
 
-        for (var n=0;n<nodes.length;n++) {
-            var node = nodes[n];
-            if (filter.hasOwnProperty("z") && node.z !== filter.z) {
-                continue;
-            }
+        for (var n=0;n<searchSet.length;n++) {
+            var node = searchSet[n];
             if (filter.hasOwnProperty("type") && node.type !== filter.type) {
                 continue;
             }
@@ -1339,6 +1368,7 @@ RED.nodes = (function() {
     function clear() {
         nodes = [];
         links = [];
+        nodeTabMap = {};
         configNodes = {};
         workspacesOrder = [];
         var subflowIds = Object.keys(subflows);
@@ -1448,6 +1478,8 @@ RED.nodes = (function() {
         remove: removeNode,
         clear: clear,
 
+        moveNodeToTab: moveNodeToTab,
+        
         addLink: addLink,
         removeLink: removeLink,
 

packages/node_modules/@node-red/editor-client/src/js/ui/actionList.js

@@ -23,6 +23,7 @@ RED.actionList = (function() {
     var visible = false;
 
     var filterTerm = "";
+    var filterTerms = [];
     var previousActiveElement;
 
     function ensureSelectedIsVisible() {
@@ -46,9 +47,14 @@ RED.actionList = (function() {
         var searchDiv = $("<div>",{class:"red-ui-search-container"}).appendTo(dialog);
         searchInput = $('<input type="text" data-i18n="[placeholder]keyboard.filterActions">').appendTo(searchDiv).searchBox({
             change: function() {
-                filterTerm = $(this).val();
+                filterTerm = $(this).val().trim();
+                filterTerms = filterTerm.split(" ");
                 searchResults.editableList('filter');
                 searchResults.find("li.selected").removeClass("selected");
+                var children = searchResults.children(":visible");
+                if (children.length) {
+                    $(children[0]).addClass('selected');
+                }
             }
         });
 
@@ -61,7 +67,6 @@ RED.actionList = (function() {
                     var children = searchResults.children(":visible");
                     if (children.length) {
                         $(children[0]).addClass('selected');
-                        RED.a = children[0];
                     }
                 } else {
                     var nextChild = selectedChild.nextAll(":visible").first();
@@ -115,8 +120,17 @@ RED.actionList = (function() {
             },
             scrollOnAdd: false,
             filter: function(item) {
-                if (filterTerm !== "" && item.label.toLowerCase().indexOf(filterTerm) === -1) {
-                    return false;
+                if (filterTerm !== "") {
+                    var pos=0;
+                    for (var i=0;i<filterTerms.length;i++) {
+                        var j = item._label.indexOf(filterTerms[i],pos);
+                        if (j > -1) {
+                            pos = j;
+                        } else {
+                            return false;
+                        }
+                    }
+                    return true;
                 }
                 return true;
             }
@@ -156,12 +170,17 @@ RED.actionList = (function() {
             });
             actions.forEach(function(action) {
                 action.label = action.id.replace(/:/,": ").replace(/-/g," ").replace(/(^| )./g,function() { return arguments[0].toUpperCase()});
+                action._label = action.label.toLowerCase();
                 searchResults.editableList('addItem',action)
             })
             RED.events.emit("actionList:open");
             visible = true;
         }
         searchInput.trigger("focus");
+        var children = searchResults.children(":visible");
+        if (children.length) {
+            $(children[0]).addClass('selected');
+        }
     }
 
     function hide() {

packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js

@@ -34,6 +34,8 @@
  *   - addItem(itemData)
  *   - insertItemAt : function(data,index) - add an item at the specified index
  *   - removeItem(itemData)
+ *   - getItemAt(index)
+ *   - indexOf(itemData)
  *   - width(width)
  *   - height(height)
  *   - items()
@@ -186,7 +188,11 @@
             }
         },
         _destroy: function() {
-            this.topContainer.remove();
+            if (this.topContainer) {
+                var tc = this.topContainer;
+                delete this.topContainer;
+                tc.remove();
+            }
         },
         _refreshFilter: function() {
             var that = this;
@@ -232,6 +238,23 @@
             this.uiHeight = desiredHeight;
             this._resize();
         },
+        getItemAt: function(index) {
+            var items = this.items();
+            if (index >= 0 && index < items.length) {
+                return $(items[index]).data('data');
+            } else {
+                return;
+            }
+        },
+        indexOf: function(data) {
+            var items = this.items();
+            for (var i=0;i<items.length;i++) {
+                if ($(items[i]).data('data') === data) {
+                    return i
+                }
+            }
+            return -1
+        },
         insertItemAt: function(data,index) {
             var that = this;
             data = data || {};

packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js

@@ -71,7 +71,7 @@ RED.menu = (function() {
 
             }
             if (opt.icon !== undefined) {
-                if (/\.png/.test(opt.icon)) {
+                if (/\.(png|svg)/.test(opt.icon)) {
                     linkContent += '<img src="'+opt.icon+'"/> ';
                 } else {
                     linkContent += '<i class="'+(opt.icon?opt.icon:'" style="display: inline-block;"')+'"></i> ';
@@ -225,7 +225,7 @@ RED.menu = (function() {
                 triggerAction(opt.id,state);
             }
         }
-        if (!alreadySet) {
+        if (!opt.local && !alreadySet) {
             RED.settings.set(opt.setting||("menu-"+opt.id), state);
         }
     }

packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js

@@ -253,6 +253,71 @@ RED.popover = (function() {
                 content: label,
                 delay: { show: 750, hide: 50 }
             });
+        },
+        panel: function(content) {
+            var panel = $('<div class="red-ui-editor-dialog red-ui-popover-panel"></div>');
+            panel.css({ display: "none" });
+            panel.appendTo(document.body);
+            content.appendTo(panel);
+            var closeCallback;
+
+            function hide() {
+                $(document).off("mousedown.red-ui-popover-panel-close");
+                panel.hide();
+                panel.css({
+                    height: "auto"
+                });
+                panel.remove();
+            }
+            function show(options) {
+                var closeCallback = options.onclose;
+                var target = options.target;
+                var align = options.align || "left";
+
+                var pos = target.offset();
+                var targetWidth = target.width();
+                var targetHeight = target.height();
+                var panelHeight = panel.height();
+                var panelWidth = panel.width();
+
+                var top = (targetHeight+pos.top);
+                if (top+panelHeight > $(window).height()) {
+                    top -= (top+panelHeight)-$(window).height() + 5;
+                }
+                if (top < 0) {
+                    panelHeight.height(panelHeight+top)
+                    top = 0;
+                }
+                if (align === "left") {
+                    panel.css({
+                        top: top+"px",
+                        left: (pos.left)+"px",
+                    });
+                } else if(align === "right") {
+                    panel.css({
+                        top: top+"px",
+                        left: (pos.left-panelWidth)+"px",
+                    });
+                }
+                panel.slideDown(100);
+
+                $(document).on("mousedown.red-ui-popover-panel-close", function(event) {
+                    if(!$(event.target).closest(panel).length && !$(event.target).closest(".red-ui-editor-dialog").length) {
+                        if (closeCallback) {
+                            closeCallback();
+                        }
+                        hide();
+                    }
+                    // if ($(event.target).closest(target).length) {
+                    //     event.preventDefault();
+                    // }
+                })
+            }
+            return  {
+                container: panel,
+                show:show,
+                hide:hide
+            }
         }
     }
 

packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js

@@ -32,6 +32,12 @@
             return v;
         }
     }
+    var mapDeprecatedIcon = function(icon) {
+        if (/^red\/images\/typedInput\/.+\.png$/.test(icon)) {
+            icon = icon.replace(/.png$/,".svg");
+        }
+        return icon;
+    }
     var allOptions = {
         msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression},
         flow: {value:"flow",label:"flow.",hasValue:true,
@@ -46,13 +52,13 @@
             parse: contextParse,
             export: contextExport
         },
-        str: {value:"str",label:"string",icon:"red/images/typedInput/az.png"},
-        num: {value:"num",label:"number",icon:"red/images/typedInput/09.png",validate:/^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$/},
-        bool: {value:"bool",label:"boolean",icon:"red/images/typedInput/bool.png",options:["true","false"]},
+        str: {value:"str",label:"string",icon:"red/images/typedInput/az.svg"},
+        num: {value:"num",label:"number",icon:"red/images/typedInput/09.svg",validate:/^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$/},
+        bool: {value:"bool",label:"boolean",icon:"red/images/typedInput/bool.svg",options:["true","false"]},
         json: {
             value:"json",
             label:"JSON",
-            icon:"red/images/typedInput/json.png",
+            icon:"red/images/typedInput/json.svg",
             validate: function(v) { try{JSON.parse(v);return true;}catch(e){return false;}},
             expand: function() {
                 var that = this;
@@ -74,12 +80,12 @@
                 })
             }
         },
-        re: {value:"re",label:"regular expression",icon:"red/images/typedInput/re.png"},
-        date: {value:"date",label:"timestamp",hasValue:false},
+        re: {value:"re",label:"regular expression",icon:"red/images/typedInput/re.svg"},
+        date: {value:"date",label:"timestamp",icon:"fa fa-clock-o",hasValue:false},
         jsonata: {
             value: "jsonata",
             label: "expression",
-            icon: "red/images/typedInput/expr.png",
+            icon: "red/images/typedInput/expr.svg",
             validate: function(v) { try{jsonata(v);return true;}catch(e){return false;}},
             expand:function() {
                 var that = this;
@@ -94,7 +100,7 @@
         bin: {
             value: "bin",
             label: "buffer",
-            icon: "red/images/typedInput/bin.png",
+            icon: "red/images/typedInput/bin.svg",
             expand: function() {
                 var that = this;
                 RED.editor.editBuffer({
@@ -108,12 +114,12 @@
         env: {
             value: "env",
             label: "env variable",
-            icon: "red/images/typedInput/env.png"
+            icon: "red/images/typedInput/env.svg"
         },
         node: {
             value: "node",
             label: "node",
-            icon: "red/images/typedInput/target.png",
+            icon: "red/images/typedInput/target.svg",
             valueLabel: function(container,value) {
                 var node = RED.nodes.node(value);
                 var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).css({
@@ -209,7 +215,7 @@
                 that.input.css("margin"+d,0);
             });
 
-            ["type","placeholder","autocomplete"].forEach(function(d) {
+            ["type","placeholder","autocomplete","data-i18n"].forEach(function(d) {
                 var m = that.element.attr(d);
                 that.input.attr(d,m);
             });
@@ -292,7 +298,8 @@
                 that.uiSelect.addClass('red-ui-typedInput-focus');
             });
 
-            this.optionExpandButton = $('<button tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"><i class="red-ui-typedInput-icon fa fa-ellipsis-h"></i></button>').appendTo(this.uiSelect);
+            this.optionExpandButton = $('<button tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"></button>').appendTo(this.uiSelect);
+            this.optionExpandButtonIcon = $('<i class="red-ui-typedInput-icon fa fa-ellipsis-h"></i>').appendTo(this.optionExpandButton);
             this.type(this.options.default||this.typeList[0].value);
         }catch(err) {
             console.log(err.stack);
@@ -330,6 +337,17 @@
             menu.css({
                 height: "auto"
             });
+
+            if (menu.opts.multiple) {
+                var selected = [];
+                menu.find('input[type="checkbox"]').each(function() {
+                    if ($(this).prop("checked")) {
+                        selected.push($(this).data('value'))
+                    }
+                })
+                menu.callback(selected);
+            }
+
             if (this.elementDiv.is(":visible")) {
                 this.input.trigger("focus");
             } else if (this.optionSelectTrigger.is(":visible")){
@@ -338,10 +356,12 @@
                 this.selectTrigger.trigger("focus");
             }
         },
-        _createMenu: function(opts,callback) {
+        _createMenu: function(menuOptions,opts,callback) {
             var that = this;
-            var menu = $("<div>").addClass("red-ui-typedInput-options");
-            opts.forEach(function(opt) {
+            var menu = $("<div>").addClass("red-ui-typedInput-options red-ui-editor-dialog");
+            menu.opts = opts;
+            menu.callback = callback;
+            menuOptions.forEach(function(opt) {
                 if (typeof opt === 'string') {
                     opt = {value:opt,label:opt};
                 }
@@ -353,7 +373,7 @@
                     if (opt.icon.indexOf("<") === 0) {
                         $(opt.icon).prependTo(op);
                     } else if (opt.icon.indexOf("/") !== -1) {
-                        $('<img>',{src:opt.icon,style:"margin-right: 4px; height: 18px;"}).prependTo(op);
+                        $('<img>',{src:mapDeprecatedIcon(opt.icon),style:"margin-right: 4px; height: 18px;"}).prependTo(op);
                     } else {
                         $('<i>',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(op);
                     }
@@ -363,12 +383,20 @@
                 if (!opt.icon && !opt.label) {
                     op.text(opt.value);
                 }
+                var cb;
+                if (opts.multiple) {
+                    cb = $('<input type="checkbox">').css("pointer-events","none").data('value',opt.value).prependTo(op).on("mousedown", function(evt) { evt.preventDefault() });
+                }
 
                 op.on("click", function(event) {
                     event.preventDefault();
                     event.stopPropagation();
-                    callback(opt.value);
-                    that._hideMenu(menu);
+                    if (!opts.multiple) {
+                        callback(opt.value);
+                        that._hideMenu(menu);
+                    } else {
+                        cb.prop("checked",!cb.prop("checked"));
+                    }
                 });
             });
             menu.css({
@@ -392,9 +420,6 @@
                 }
                 evt.stopPropagation();
             })
-
-
-
             return menu;
 
         },
@@ -403,11 +428,22 @@
                 this.disarmClick = false;
                 return
             }
+            if (menu.opts.multiple) {
+                var selected = {};
+                 this.value().split(",").forEach(function(f) {
+                     selected[f] = true;
+                 })
+                menu.find('input[type="checkbox"]').each(function() {
+                    $(this).prop("checked",selected[$(this).data('value')])
+                })
+            }
+
+
             var that = this;
             var pos = relativeTo.offset();
             var height = relativeTo.height();
             var menuHeight = menu.height();
-            var top = (height+pos.top-3);
+            var top = (height+pos.top);
             if (top+menuHeight > $(window).height()) {
                 top -= (top+menuHeight)-$(window).height()+5;
             }
@@ -417,7 +453,7 @@
             }
             menu.css({
                 top: top+"px",
-                left: (2+pos.left)+"px",
+                left: (pos.left)+"px",
             });
             menu.slideDown(100);
             this._delay(function() {
@@ -433,21 +469,27 @@
                 })
             });
         },
-        _getLabelWidth: function(label) {
+        _getLabelWidth: function(label, done) {
             var labelWidth = label.outerWidth();
             if (labelWidth === 0) {
-                var container = $('<div class="red-ui-typedInput-container"></div>').css({
+                var wrapper = $('<div class="red-ui-editor"></div>').css({
                     position:"absolute",
                     "white-space": "nowrap",
-                    top:0
+                    top:-2000
                 }).appendTo(document.body);
+                var container = $('<div class="red-ui-typedInput-container"></div>').appendTo(wrapper);
                 var newTrigger = label.clone().appendTo(container);
-                labelWidth = newTrigger.outerWidth();
-                container.remove();
+                setTimeout(function() {
+                    labelWidth = newTrigger.outerWidth();
+                    wrapper.remove();
+                    done(labelWidth);
+                },50)
+            } else {
+                done(labelWidth);
             }
-            return labelWidth;
         },
         _resize: function() {
+            var that = this;
             if (this.uiWidth !== null) {
                 this.uiSelect.width(this.uiWidth);
             }
@@ -456,71 +498,78 @@
                 this.selectTrigger.addClass("red-ui-typedInput-full-width");
             } else {
                 this.selectTrigger.removeClass("red-ui-typedInput-full-width");
-                var labelWidth = this._getLabelWidth(this.selectTrigger);
-                this.elementDiv.css('left',labelWidth+"px");
-                this.valueLabelContainer.css('left',labelWidth+"px");
-                if (this.optionExpandButton.is(":visible")) {
-                    this.elementDiv.css('right',"22px");
-                    this.valueLabelContainer.css('right',"22px");
-                } else {
-                    this.elementDiv.css('right','0');
-                    this.valueLabelContainer.css('right','0');
-                    this.input.css({
-                        'border-top-right-radius': '4px',
-                        'border-bottom-right-radius': '4px'
-                    });
-                }
-
-                // if (this.optionSelectTrigger) {
-                //     this.optionSelectTrigger.css({'left':(labelWidth)+"px",'width':'calc( 100% - '+labelWidth+'px )'});
-                // }
-
-                if (this.optionSelectTrigger) {
-                    if (type && type.options && type.hasValue === true) {
-                        this.optionSelectLabel.css({'left':'auto'})
-                        var lw = this._getLabelWidth(this.optionSelectLabel);
-                        this.optionSelectTrigger.css({'width':(23+lw)+"px"});
-                        this.elementDiv.css('right',(23+lw)+"px");
-                        this.input.css({
-                            'border-top-right-radius': 0,
-                            'border-bottom-right-radius': 0
-                        });
+                this._getLabelWidth(this.selectTrigger, function(labelWidth) {
+                    that.elementDiv.css('left',labelWidth+"px");
+                    that.valueLabelContainer.css('left',labelWidth+"px");
+                    if (that.optionExpandButton.shown) {
+                        that.elementDiv.css('right',"22px");
+                        that.valueLabelContainer.css('right',"22px");
                     } else {
-                        this.optionSelectLabel.css({'left':'0'})
-                        this.optionSelectTrigger.css({'width':'calc( 100% - '+labelWidth+'px )'});
-                        if (!this.optionExpandButton.is(":visible")) {
-                            this.elementDiv.css({'right':0});
-                            this.input.css({
-                                'border-top-right-radius': '4px',
-                                'border-bottom-right-radius': '4px'
+                        that.elementDiv.css('right','0');
+                        that.valueLabelContainer.css('right','0');
+                        that.input.css({
+                            'border-top-right-radius': '4px',
+                            'border-bottom-right-radius': '4px'
+                        });
+                    }
+                    if (that.optionSelectTrigger) {
+                        if (type && type.options && type.hasValue === true) {
+                            that.optionSelectLabel.css({'left':'auto'})
+                            that._getLabelWidth(that.optionSelectLabel, function(lw) {
+                                that.optionSelectTrigger.css({'width':(23+lw)+"px"});
+                                that.elementDiv.css('right',(23+lw)+"px");
+                                that.input.css({
+                                    'border-top-right-radius': 0,
+                                    'border-bottom-right-radius': 0
+                                });
                             });
+                        } else {
+                            that.optionSelectLabel.css({'left':'0'})
+                            that.optionSelectTrigger.css({'width':'calc( 100% - '+labelWidth+'px )'});
+                            if (!that.optionExpandButton.shown) {
+                                that.elementDiv.css({'right':0});
+                                that.input.css({
+                                    'border-top-right-radius': '4px',
+                                    'border-bottom-right-radius': '4px'
+                                });
+                            }
                         }
                     }
-                }
+                });
             }
         },
         _updateOptionSelectLabel: function(o) {
             var opt = this.typeMap[this.propertyType];
             this.optionSelectLabel.empty();
-            if (o.icon) {
-                if (o.icon.indexOf("<") === 0) {
-                    $(o.icon).prependTo(this.optionSelectLabel);
-                } else if (o.icon.indexOf("/") !== -1) {
-                    // url
-                    $('<img>',{src:o.icon,style:"height: 18px;"}).prependTo(this.optionSelectLabel);
+            if (this.typeMap[this.propertyType].valueLabel) {
+                if (opt.multiple) {
+                    this.typeMap[this.propertyType].valueLabel.call(this,this.optionSelectLabel,o);
                 } else {
-                    // icon class
-                    $('<i>',{class:"red-ui-typedInput-icon "+o.icon}).prependTo(this.optionSelectLabel);
+                    this.typeMap[this.propertyType].valueLabel.call(this,this.optionSelectLabel,o.value);
+                }
+            } else if (!opt.multiple) {
+                if (o.icon) {
+                    if (o.icon.indexOf("<") === 0) {
+                        $(o.icon).prependTo(this.optionSelectLabel);
+                    } else if (o.icon.indexOf("/") !== -1) {
+                        // url
+                        $('<img>',{src:mapDeprecatedIcon(o.icon),style:"height: 18px;"}).prependTo(this.optionSelectLabel);
+                    } else {
+                        // icon class
+                        $('<i>',{class:"red-ui-typedInput-icon "+o.icon}).prependTo(this.optionSelectLabel);
+                    }
+                } else if (o.label) {
+                    this.optionSelectLabel.text(o.label);
+                } else {
+                    this.optionSelectLabel.text(o.value);
+                }
+                if (opt.hasValue) {
+                    this.optionValue = o.value;
+                    this._resize();
+                    this.input.trigger('change',this.propertyType,this.value());
                 }
-            } else if (o.label) {
-                this.optionSelectLabel.text(o.label);
             } else {
-                this.optionSelectLabel.text(o.value);
-            }
-            if (opt.hasValue) {
-                this.optionValue = o.value;
-                this._resize();
-                this.input.trigger('change',this.propertyType,this.value());
+                this.optionSelectLabel.text(o.length+" selected");
             }
         },
         _destroy: function() {
@@ -549,7 +598,7 @@
             if (this.menu) {
                 this.menu.remove();
             }
-            this.menu = this._createMenu(this.typeList, function(v) { that.type(v) });
+            this.menu = this._createMenu(this.typeList,{},function(v) { that.type(v) });
             if (currentType && !this.typeMap.hasOwnProperty(currentType)) {
                 this.type(this.typeList[0].value);
             } else {
@@ -563,38 +612,51 @@
             this._resize();
         },
         value: function(value) {
+            var that = this;
+            var opt = this.typeMap[this.propertyType];
             if (!arguments.length) {
                 var v = this.input.val();
-                if (this.typeMap[this.propertyType].export) {
-                    v = this.typeMap[this.propertyType].export(v,this.optionValue)
+                if (opt.export) {
+                    v = opt.export(v,this.optionValue)
                 }
                 return v;
             } else {
-                var selectedOption;
-                if (this.typeMap[this.propertyType].options) {
-                    for (var i=0;i<this.typeMap[this.propertyType].options.length;i++) {
-                        var op = this.typeMap[this.propertyType].options[i];
-                        if (typeof op === "string") {
-                            if (op === value) {
-                                selectedOption = this.activeOptions[op];
+                var selectedOption = [];
+                if (opt.options) {
+                    var checkValues = [value];
+                    if (opt.multiple) {
+                        selectedOption = [];
+                        checkValues = value.split(",");
+                    }
+                    checkValues.forEach(function(value) {
+                        for (var i=0;i<opt.options.length;i++) {
+                            var op = opt.options[i];
+                            if (typeof op === "string") {
+                                if (op === value) {
+                                    selectedOption.push(that.activeOptions[op]);
+                                    break;
+                                }
+                            } else if (op.value === value) {
+                                selectedOption.push(op);
                                 break;
                             }
-                        } else if (op.value === value) {
-                            selectedOption = op;
-                            break;
                         }
-                    }
-                    if (!selectedOption) {
-                        selectedOption = {value:""}
-                    }
+                    })
                     this.input.val(value);
-                    this._updateOptionSelectLabel(selectedOption)
+                    if (!opt.multiple) {
+                        if (!selectedOption.length === 0) {
+                            selectedOption = [{value:""}];
+                        }
+                        this._updateOptionSelectLabel(selectedOption[0])
+                    } else {
+                        this._updateOptionSelectLabel(selectedOption)
+                    }
                 } else {
                     this.input.val(value);
-                }
-                if (this.typeMap[this.propertyType].valueLabel) {
-                    this.valueLabelContainer.empty();
-                    this.typeMap[this.propertyType].valueLabel.call(this,this.valueLabelContainer,value);
+                    if (opt.valueLabel) {
+                        this.valueLabelContainer.empty();
+                        opt.valueLabel.call(this,this.valueLabelContainer,value);
+                    }
                 }
                 this.input.trigger('change',this.type(),value);
             }
@@ -612,20 +674,23 @@
                     }
                     this.selectLabel.empty();
                     var image;
-                    if (opt.icon) {
+                    if (opt.icon && opt.showLabel !== false) {
                         if (opt.icon.indexOf("<") === 0) {
                             $(opt.icon).prependTo(this.selectLabel);
                         }
                         else if (opt.icon.indexOf("/") !== -1) {
                             image = new Image();
+                            image.onload = function() { that._resize(); }
+                            image.onerror = function() { that._resize(); }
                             image.name = opt.icon;
-                            image.src = opt.icon;
-                            $('<img>',{src:opt.icon,style:"margin-right: 4px;height: 18px;"}).prependTo(this.selectLabel);
+                            image.src = mapDeprecatedIcon(opt.icon);
+                            $('<img>',{src:mapDeprecatedIcon(opt.icon),style:"margin-right: 4px;height: 18px;"}).prependTo(this.selectLabel);
                         }
                         else {
                             $('<i>',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(this.selectLabel);
                         }
-                    } else {
+                    }
+                    if (opt.hasValue === false || (opt.showLabel !== false && !opt.icon)) {
                         this.selectLabel.text(opt.label);
                     }
                     if (this.optionMenu) {
@@ -635,6 +700,7 @@
                     if (opt.options) {
                         if (this.optionExpandButton) {
                             this.optionExpandButton.hide();
+                            this.optionExpandButton.shown = false;
                         }
                         if (this.optionSelectTrigger) {
                             this.optionSelectTrigger.show();
@@ -657,36 +723,50 @@
                             if (!that.activeOptions.hasOwnProperty(that.optionValue)) {
                                 that.optionValue = null;
                             }
-                            this.optionMenu = this._createMenu(opt.options,function(v){
-                                that._updateOptionSelectLabel(that.activeOptions[v]);
-                                if (!opt.hasValue) {
-                                    that.value(that.activeOptions[v].value)
-                                }
-                            });
+
                             var op;
                             if (!opt.hasValue) {
-                                var currentVal = this.input.val();
                                 var validValue = false;
-                                for (var i=0;i<opt.options.length;i++) {
-                                    op = opt.options[i];
-                                    if (typeof op === "string" && op === currentVal) {
-                                        that._updateOptionSelectLabel({value:currentVal});
-                                        validValue = true;
-                                        break;
-                                    } else if (op.value === currentVal) {
-                                        that._updateOptionSelectLabel(op);
-                                        validValue = true;
-                                        break;
+                                var currentVal = this.input.val();
+                                if (!opt.multiple) {
+                                    for (var i=0;i<opt.options.length;i++) {
+                                        op = opt.options[i];
+                                        if (typeof op === "string" && op === currentVal) {
+                                            that._updateOptionSelectLabel({value:currentVal});
+                                            validValue = true;
+                                            break;
+                                        } else if (op.value === currentVal) {
+                                            that._updateOptionSelectLabel(op);
+                                            validValue = true;
+                                            break;
+                                        }
                                     }
-                                }
-                                if (!validValue) {
-                                    op = opt.options[0];
-                                    if (typeof op === "string") {
-                                        this.value(op);
-                                        that._updateOptionSelectLabel({value:op});
-                                    } else {
-                                        this.value(op.value);
-                                        that._updateOptionSelectLabel(op);
+                                    if (!validValue) {
+                                        op = opt.options[0];
+                                        if (typeof op === "string") {
+                                            this.value(op);
+                                            that._updateOptionSelectLabel({value:op});
+                                        } else {
+                                            this.value(op.value);
+                                            that._updateOptionSelectLabel(op);
+                                        }
+                                    }
+                                } else {
+                                    // Check to see if value is a valid csv of
+                                    // options.
+                                    var currentValues = {};
+                                    currentVal.split(",").forEach(function(v) {
+                                        if (v) {
+                                            currentValues[v] = true;
+                                        }
+                                    });
+                                    for (var i=0;i<opt.options.length;i++) {
+                                        op = opt.options[i];
+                                        delete currentValues[op.value||op];
+                                    }
+                                    if (!$.isEmptyObject(currentValues)) {
+                                        // Invalid, set to default/empty
+                                        this.value((opt.default||[]).join(","));
                                     }
                                 }
                             } else {
@@ -722,7 +802,21 @@
                                     this.optionSelectTrigger.hide();
                                 }
                             }
+                            this.optionMenu = this._createMenu(opt.options,opt,function(v){
+                                if (!opt.multiple) {
+                                    that._updateOptionSelectLabel(that.activeOptions[v]);
+                                    if (!opt.hasValue) {
+                                        that.value(that.activeOptions[v].value)
+                                    }
+                                } else {
+                                    that._updateOptionSelectLabel(v);
+                                    if (!opt.hasValue) {
+                                        that.value(v.join(","))
+                                    }
+                                }
+                            });
                         }
+                        this._trigger("typechange",null,this.propertyType);
                         this.input.trigger('change',this.propertyType,this.value());
                     } else {
                         if (this.optionSelectTrigger) {
@@ -747,23 +841,47 @@
                             this.elementDiv.show();
                         }
                         if (this.optionExpandButton) {
-                            if (opt.expand && typeof opt.expand === 'function') {
+                            if (opt.expand) {
+                                if (opt.expand.icon) {
+                                    this.optionExpandButtonIcon.removeClass().addClass("red-ui-typedInput-icon fa "+opt.expand.icon)
+                                } else {
+                                    this.optionExpandButtonIcon.removeClass().addClass("red-ui-typedInput-icon fa fa-ellipsis-h")
+                                }
+                                this.optionExpandButton.shown = true;
                                 this.optionExpandButton.show();
                                 this.optionExpandButton.off('click');
                                 this.optionExpandButton.on('click',function(evt) {
                                     evt.preventDefault();
-                                    opt.expand.call(that);
+                                    if (typeof opt.expand === 'function') {
+                                        opt.expand.call(that);
+                                    } else {
+                                        var container = $('<div>');
+                                        var content = opt.expand.content.call(that,container);
+                                        var panel = RED.popover.panel(container);
+                                        panel.container.css({
+                                            width:that.valueLabelContainer.width()
+                                        });
+                                        if (opt.expand.minWidth) {
+                                            panel.container.css({
+                                                minWidth: opt.expand.minWidth+"px"
+                                            });
+                                        }
+                                        panel.show({
+                                            target:that.optionExpandButton,
+                                            onclose:content.onclose,
+                                            align: "right"
+                                        });
+                                    }
                                 })
                             } else {
+                                this.optionExpandButton.shown = false;
                                 this.optionExpandButton.hide();
                             }
                         }
+                        this._trigger("typechange",null,this.propertyType);
                         this.input.trigger('change',this.propertyType,this.value());
                     }
-                    if (image) {
-                        image.onload = function() { that._resize(); }
-                        image.onerror = function() { that._resize(); }
-                    } else {
+                    if (!image) {
                         this._resize();
                     }
                 }

packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js

@@ -17,9 +17,9 @@
 RED.deploy = (function() {
 
     var deploymentTypes = {
-        "full":{img:"red/images/deploy-full-o.png"},
-        "nodes":{img:"red/images/deploy-nodes-o.png"},
-        "flows":{img:"red/images/deploy-flows-o.png"}
+        "full":{img:"red/images/deploy-full-o.svg"},
+        "nodes":{img:"red/images/deploy-nodes-o.svg"},
+        "flows":{img:"red/images/deploy-flows-o.svg"}
     }
 
     var ignoreDeployWarnings = {
@@ -44,7 +44,7 @@ RED.deploy = (function() {
      *   type: "default" - Button with drop-down options - no further customisation available
      *   type: "simple"  - Button without dropdown. Customisations:
      *      label: the text to display - default: "Deploy"
-     *      icon : the icon to use. Null removes the icon. default: "red/images/deploy-full-o.png"
+     *      icon : the icon to use. Null removes the icon. default: "red/images/deploy-full-o.svg"
      */
     function init(options) {
         options = options || {};
@@ -54,7 +54,7 @@ RED.deploy = (function() {
             $('<li><span class="red-ui-deploy-button-group button-group">'+
               '<a id="red-ui-header-button-deploy" class="red-ui-deploy-button disabled" href="#">'+
                 '<span class="red-ui-deploy-button-content">'+
-                 '<img id="red-ui-header-button-deploy-icon" src="red/images/deploy-full-o.png"> '+
+                 '<img id="red-ui-header-button-deploy-icon" src="red/images/deploy-full-o.svg"> '+
                  '<span>'+RED._("deploy.deploy")+'</span>'+
                 '</span>'+
                 '<span class="red-ui-deploy-button-spinner hide">'+
@@ -65,17 +65,17 @@ RED.deploy = (function() {
               '</span></li>').prependTo(".red-ui-header-toolbar");
               RED.menu.init({id:"red-ui-header-button-deploy-options",
                   options: [
-                      {id:"deploymenu-item-full",toggle:"deploy-type",icon:"red/images/deploy-full.png",label:RED._("deploy.full"),sublabel:RED._("deploy.fullDesc"),selected: true, onselect:function(s) { if(s){changeDeploymentType("full")}}},
-                      {id:"deploymenu-item-flow",toggle:"deploy-type",icon:"red/images/deploy-flows.png",label:RED._("deploy.modifiedFlows"),sublabel:RED._("deploy.modifiedFlowsDesc"), onselect:function(s) {if(s){changeDeploymentType("flows")}}},
-                      {id:"deploymenu-item-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.png",label:RED._("deploy.modifiedNodes"),sublabel:RED._("deploy.modifiedNodesDesc"),onselect:function(s) { if(s){changeDeploymentType("nodes")}}},
+                      {id:"deploymenu-item-full",toggle:"deploy-type",icon:"red/images/deploy-full.svg",label:RED._("deploy.full"),sublabel:RED._("deploy.fullDesc"),selected: true, onselect:function(s) { if(s){changeDeploymentType("full")}}},
+                      {id:"deploymenu-item-flow",toggle:"deploy-type",icon:"red/images/deploy-flows.svg",label:RED._("deploy.modifiedFlows"),sublabel:RED._("deploy.modifiedFlowsDesc"), onselect:function(s) {if(s){changeDeploymentType("flows")}}},
+                      {id:"deploymenu-item-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.svg",label:RED._("deploy.modifiedNodes"),sublabel:RED._("deploy.modifiedNodesDesc"),onselect:function(s) { if(s){changeDeploymentType("nodes")}}},
                       null,
-                      {id:"deploymenu-item-reload", icon:"red/images/deploy-reload.png",label:RED._("deploy.restartFlows"),sublabel:RED._("deploy.restartFlowsDesc"),onselect:"core:restart-flows"},
+                      {id:"deploymenu-item-reload", icon:"red/images/deploy-reload.svg",label:RED._("deploy.restartFlows"),sublabel:RED._("deploy.restartFlowsDesc"),onselect:"core:restart-flows"},
 
                   ]
               });
         } else if (type == "simple") {
             var label = options.label || RED._("deploy.deploy");
-            var icon = 'red/images/deploy-full-o.png';
+            var icon = 'red/images/deploy-full-o.svg';
             if (options.hasOwnProperty('icon')) {
                 icon = options.icon;
             }

packages/node_modules/@node-red/editor-client/src/js/ui/diff.js

@@ -399,7 +399,7 @@ RED.diff = (function() {
                             diff: localDiff,
                             def: {
                                 defaults:{},
-                                icon:"subflow.png",
+                                icon:"subflow.svg",
                                 category: "subflows",
                                 color: "#da9"
                             },
@@ -422,7 +422,7 @@ RED.diff = (function() {
                             diff: localDiff,
                             def: {
                                 defaults:{},
-                                icon:"subflow.png",
+                                icon:"subflow.svg",
                                 category: "subflows",
                                 color: "#da9"
                             },
@@ -443,7 +443,7 @@ RED.diff = (function() {
                                 remoteDiff: remoteDiff,
                                 def: {
                                     defaults:{},
-                                    icon:"subflow.png",
+                                    icon:"subflow.svg",
                                     category: "subflows",
                                     color: "#da9"
                                 },
@@ -549,7 +549,7 @@ RED.diff = (function() {
         if (def === undefined) {
             if (/^subflow:/.test(node.type)) {
                 def = {
-                    icon:"subflow.png",
+                    icon:"subflow.svg",
                     category: "subflows",
                     color: "#da9",
                     defaults:{name:{value:""}}

packages/node_modules/@node-red/editor-client/src/js/ui/editor.js

@@ -19,7 +19,6 @@
  */
 RED.editor = (function() {
 
-
     var editStack = [];
     var editing_node = null;
     var editing_config_node = null;
@@ -526,7 +525,7 @@ RED.editor = (function() {
             } else if (node.type.indexOf("subflow:")===0) {
                 var subflow = RED.nodes.subflow(node.type.substring(8));
                 label = RED._("subflow.editSubflowInstance",{name:RED.utils.sanitize(subflow.name)})
-            } else {
+            } else if (node._def !== undefined) {
                 if (typeof node._def.paletteLabel !== "undefined") {
                     try {
                         label = RED.utils.sanitize((typeof node._def.paletteLabel === "function" ? node._def.paletteLabel.call(node._def) : node._def.paletteLabel)||"");
@@ -546,148 +545,7 @@ RED.editor = (function() {
         return label;
     }
 
-    function buildEnvForm(container, node) {
-        var env_container = $('#node-input-env-container');
-        env_container
-            .css({
-                'min-height':'150px',
-                'min-width':'450px'
-            })
-            .editableList({
-                addItem: function(container, i, opt) {
-                    var row = $('<div/>').appendTo(container);
-                    if (opt.parent) {
-                        $('<div/>', {
-                            class:"uneditable-input",
-                            style: "margin-left: 5px; width: calc(40% - 8px)",
-                        }).appendTo(row).text(opt.name);
-                    } else {
-                        $('<input/>', {
-                            class: "node-input-env-name",
-                            type: "text",
-                            style: "margin-left: 5px; width: calc(40% - 8px)",
-                            placeholder: RED._("common.label.name")
-                        }).attr("autocomplete","disable").appendTo(row).val(opt.name);
-                    }
-                    var valueField = $('<input/>',{
-                        class: "node-input-env-value",
-                        type: "text",
-                        style: "margin-left: 5px; width: calc(60% - 8px)"
-                    }).attr("autocomplete","disable").appendTo(row)
-
-                    valueField.typedInput({default:'str',
-                                           types:['str','num','bool','json','bin','env']
-                                          });
-
-                    valueField.typedInput('type', opt.parent?(opt.type||opt.parent.type):opt.type);
-                    valueField.typedInput('value', opt.parent?((opt.value !== undefined)?opt.value:opt.parent.value):opt.value);
-
-                    var actionButton = $('<a/>',{href:"#",class:"red-ui-editableList-item-remove red-ui-button red-ui-button-small"}).appendTo(container);
-                    $('<i/>',{class:"fa "+(opt.parent?"fa-reply":"fa-remove")}).appendTo(actionButton);
-                    container.parent().addClass("red-ui-editableList-item-removable");
-                    if (opt.parent) {
-                        if ((opt.value !== undefined) && (opt.value !== opt.parent.value || opt.type !== opt.parent.type)) {
-                            actionButton.show();
-                        } else {
-                            actionButton.hide();
-                        }
-                        var restoreTip = RED.popover.tooltip(actionButton,RED._("subflow.env.restore"));
-                        valueField.on("change", function(evt) {
-                            var newType = valueField.typedInput('type');
-                            var newValue = valueField.typedInput('value');
-                            if (newType === opt.parent.type && newValue === opt.parent.value) {
-                                actionButton.hide();
-                            } else {
-                                actionButton.show();
-                            }
-                        })
-                        actionButton.on("click", function(evt) {
-                            evt.preventDefault();
-                            restoreTip.close();
-                            valueField.typedInput('type', opt.parent.type);
-                            valueField.typedInput('value', opt.parent.value);
-                        })
-                    } else {
-                        var removeTip = RED.popover.tooltip(actionButton,RED._("subflow.env.remove"));
-                        actionButton.on("click", function(evt) {
-                            evt.preventDefault();
-                            removeTip.close();
-                            container.parent().addClass("red-ui-editableList-item-deleting")
-                            container.fadeOut(300, function() {
-                                env_container.editableList('removeItem',opt);
-                            });
-                        });
-                    }
-                },
-                sortable: false,
-                removable: false
-            });
-        var parentEnv = {};
-        var envList = [];
-        if (/^subflow:/.test(node.type)) {
-            var subflowDef = RED.nodes.subflow(node.type.substring(8));
-            if (subflowDef.env) {
-                subflowDef.env.forEach(function(env) {
-                    var item = {
-                        name:env.name,
-                        parent: {
-                            type: env.type,
-                            value: env.value
-                        }
-                    }
-                    envList.push(item);
-                    parentEnv[env.name] = item;
-                })
-            }
-        }
-
-        if (node.env) {
-            for (var i = 0; i < node.env.length; i++) {
-                var env = node.env[i];
-                if (parentEnv.hasOwnProperty(env.name)) {
-                    parentEnv[env.name].type = env.type;
-                    parentEnv[env.name].value = env.value;
-                } else {
-                    envList.push({
-                        name: env.name,
-                        type: env.type,
-                        value: env.value
-                    });
-                }
-            }
-        }
-        envList.forEach(function(env) {
-            env_container.editableList('addItem', env);
-        })
-    }
-
-    function exportEnvList(list) {
-        if (list) {
-            var env = [];
-            list.each(function(i) {
-                var entry = $(this);
-                var item = entry.data('data');
-                var name = (item.parent?item.name:entry.find(".node-input-env-name").val()).trim();
-                if (name !== "") {
-                    var valueInput = entry.find(".node-input-env-value");
-                    var value = valueInput.typedInput("value");
-                    var type = valueInput.typedInput("type");
-                    if (!item.parent || (item.parent.value !== value || item.parent.type !== type)) {
-                        var item = {
-                            name: name,
-                            type: type,
-                            value: value
-                        };
-                        env.push(item);
-                    }
-                }
-            });
-            return env;
-        }
-        return null;
-    }
-
-    function isSameEnv(env0, env1) {
+    function isSameObj(env0, env1) {
         return (JSON.stringify(env0) === JSON.stringify(env1));
     }
 
@@ -713,8 +571,8 @@ RED.editor = (function() {
             $(this).attr("data-i18n",keys.join(";"));
         });
 
-        if ((type === "subflow") || (type === "subflow-template")) {
-            buildEnvForm(dialogForm, node);
+        if (type === "subflow-template" || type === "subflow") {
+            RED.subflow.buildEditForm(dialogForm,type,node);
         }
 
         // Add dummy fields to prevent 'Enter' submitting the form in some
@@ -857,30 +715,8 @@ RED.editor = (function() {
         }
         return result;
     }
-    function showIconPicker(container, node, iconPath, done) {
-        var containerPos = container.offset();
-        var pickerBackground = $('<div>').css({
-            position: "absolute",top:0,bottom:0,left:0,right:0,zIndex:20
-        }).appendTo("body");
-
-        var top = containerPos.top - 30;
-
-        if (top+280 > $( window ).height()) {
-            top = $( window ).height() - 280;
-        }
-        var picker = $('<div class="red-ui-icon-picker">').css({
-            top: top+"px",
-            left: containerPos.left+"px",
-        }).appendTo("#red-ui-editor");
-
-        var hide = function() {
-            pickerBackground.remove();
-            picker.remove();
-            RED.keyboard.remove("escape");
-        }
-        RED.keyboard.add("*","escape",function(){hide()});
-        pickerBackground.on("mousedown", hide);
-
+    function showIconPicker(container, backgroundColor, iconPath, faOnly, done) {
+        var picker = $('<div class="red-ui-icon-picker">');
         var searchDiv = $("<div>",{class:"red-ui-search-container"}).appendTo(picker);
         searchInput = $('<input type="text">').attr("placeholder",RED._("editor.searchIcons")).appendTo(searchDiv).searchBox({
             delay: 50,
@@ -908,53 +744,223 @@ RED.editor = (function() {
         var summary = $('<span>').appendTo(metaRow);
         var resetButton = $('<button type="button" class="red-ui-button red-ui-button-small">'+RED._("editor.useDefault")+'</button>').appendTo(metaRow).on("click", function(e) {
             e.preventDefault();
-            hide();
+            iconPanel.hide();
             done(null);
         });
-        var iconSets = RED.nodes.getIconSets();
-        Object.keys(iconSets).forEach(function(moduleName) {
-            var icons = iconSets[moduleName];
-            if (icons.length > 0) {
-                // selectIconModule.append($("<option></option>").val(moduleName).text(moduleName));
-                var header = $('<div class="red-ui-icon-list-module"></div>').text(moduleName).appendTo(iconList);
-                $('<i class="fa fa-cube"></i>').prependTo(header);
-                icons.forEach(function(icon) {
-                    var iconDiv = $('<div>',{class:"red-ui-icon-list-icon"}).appendTo(iconList);
-                    var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(iconDiv);
-                    var colour = RED.utils.getNodeColor(node.type, node._def);
-                    var icon_url = RED.settings.apiRootUrl+"icons/"+moduleName+"/"+icon;
-                    iconDiv.data('icon',icon_url);
-                    nodeDiv.css('backgroundColor',colour);
-                    var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
-                    RED.utils.createIconElement(icon_url, iconContainer, true);
+        if (!backgroundColor && faOnly) {
+            iconList.addClass("red-ui-icon-list-dark");
+        }
+        setTimeout(function() {
+            var iconSets = RED.nodes.getIconSets();
+            Object.keys(iconSets).forEach(function(moduleName) {
+                if (faOnly && (moduleName !== "font-awesome")) {
+                    return;
+                }
+                var icons = iconSets[moduleName];
+                if (icons.length > 0) {
+                    // selectIconModule.append($("<option></option>").val(moduleName).text(moduleName));
+                    var header = $('<div class="red-ui-icon-list-module"></div>').text(moduleName).appendTo(iconList);
+                    $('<i class="fa fa-cube"></i>').prependTo(header);
+                    icons.forEach(function(icon) {
+                        var iconDiv = $('<div>',{class:"red-ui-icon-list-icon"}).appendTo(iconList);
+                        var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(iconDiv);
+                        var icon_url = RED.settings.apiRootUrl+"icons/"+moduleName+"/"+icon;
+                        iconDiv.data('icon',icon_url);
+                        if (backgroundColor) {
+                            nodeDiv.css({
+                                'backgroundColor': backgroundColor
+                            });
+                        }
+                        var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
+                        RED.utils.createIconElement(icon_url, iconContainer, true);
 
-                    if (iconPath.module === moduleName && iconPath.file === icon) {
-                        iconDiv.addClass("selected");
-                    }
-                    iconDiv.on("mouseover", function() {
-                        summary.text(icon);
+                        if (iconPath.module === moduleName && iconPath.file === icon) {
+                            iconDiv.addClass("selected");
+                        }
+                        iconDiv.on("mouseover", function() {
+                            summary.text(icon);
+                        })
+                        iconDiv.on("mouseout", function() {
+                            summary.html("&nbsp;");
+                        })
+                        iconDiv.on("click", function() {
+                            iconPanel.hide();
+                            done(moduleName+"/"+icon);
+                        })
                     })
-                    iconDiv.on("mouseout", function() {
-                        summary.html("&nbsp;");
-                    })
-                    iconDiv.on("click", function() {
-                        hide();
-                        done(moduleName+"/"+icon);
-                    })
-                })
-            }
-        });
+                }
+            });
+            setTimeout(function() {
+                spinner.remove();
+            },50);
+        },300);
+        var spinner = RED.utils.addSpinnerOverlay(iconList,true);
+        var iconPanel = RED.popover.panel(picker);
+        iconPanel.show({
+            target: container
+        })
+
+
         picker.slideDown(100);
         searchInput.trigger("focus");
     }
 
+    function createColorPicker(colorRow, color) {
+
+        var colorButton = $('<button type="button" class="red-ui-button red-ui-editor-node-appearance-button">').appendTo(colorRow);
+        $('<i class="fa fa-caret-down"></i>').appendTo(colorButton);
+
+        var colorDisp = $('<div>',{class:"red-ui-search-result-node"}).appendTo(colorButton);
+
+        var selector = $("<input/>", {
+            id: "red-ui-editor-node-color",
+            type: "text",
+            value: color
+        }).css({
+            marginLeft: "10px",
+            width: "150px",
+        }).appendTo(colorRow);
+
+        selector.on("change", function (e) {
+            var color = selector.val();
+            $(".red-ui-editor-node-appearance-button .red-ui-search-result-node").css({
+                "background-color": color
+            });
+        });
+        selector.trigger("change");
+        colorButton.on("click", function (e) {
+            var recommendedColors = [
+                "#3FADB5", "#87A980", "#A6BBCF",
+                "#AAAA66", "#C0C0C0", "#C0DEED",
+                "#C7E9C0", "#D7D7A0", "#D8BFD8",
+                "#DAC4B4", "#DEB887", "#DEBD5C",
+                "#E2D96E", "#E6E0F8", "#E7E7AE",
+                "#E9967A", "#F3B567", "#FDD0A2",
+                "#FDF0C2", "#FFAAAA", "#FFCC66",
+                "#FFF0F0", "#FFFFFF"
+            ].map(function(c) {
+                var r = parseInt(c.substring(1, 3), 16) / 255;
+                var g = parseInt(c.substring(3, 5), 16) / 255;
+                var b = parseInt(c.substring(5, 7), 16) / 255;
+                return {
+                    hex: c,
+                    r: r,
+                    g: g,
+                    b: b,
+                    l: 0.3 * r + 0.59 * g + 0.11 * b
+                }
+            });
+            // Sort by luminosity.
+            recommendedColors.sort(function (a, b) {
+                return a.l - b.l;
+            });
+
+            var numColors = recommendedColors.length;
+            var width = 30;
+            var height = 30;
+            var margin = 2;
+            var perRow = 6;
+            var picker = $("<div/>", {
+                class: "red-ui-color-picker"
+            }).css({
+                width: ((width+margin+margin)*perRow)+"px",
+                height: Math.ceil(numColors/perRow)*(height+margin+margin)+"+px"
+            });
+            var count = 0;
+            var row = null;
+            recommendedColors.forEach(function (col) {
+                if ((count % perRow) == 0) {
+                    row = $("<div/>").appendTo(picker);
+                }
+                var button = $("<button/>", {
+                }).css({
+                    width: width+"px",
+                    height: height+"px",
+                    margin: margin+"px",
+                    backgroundColor: col.hex,
+                    "border-style": "solid",
+                    "border-width": "1px",
+                    "border-color": col.luma<0.92?col.hex:'#ccc'
+                }).appendTo(row);
+                button.on("click",  function (e) {
+                    e.preventDefault();
+                    colorPanel.hide();
+                    selector.val(col.hex);
+                    selector.trigger("change");
+                });
+                count++;
+            });
+            var colorPanel = RED.popover.panel(picker);
+            colorPanel.show({
+                target: colorButton
+            })
+        });
+    }
+
     function buildAppearanceForm(container,node) {
         var dialogForm = $('<form class="dialog-form form-horizontal" autocomplete="off"></form>').appendTo(container);
 
         var i,row;
 
+        if (node.type === "subflow") {
+            var categoryRow = $("<div/>", {
+                class: "form-row"
+            }).appendTo(dialogForm);
+            $("<label/>", {
+                for: "subflow-appearance-input-category",
+                "data-i18n": "editor:subflow.category"
+            }).appendTo(categoryRow);
+            var categorySelector = $("<select/>", {
+                id: "subflow-appearance-input-category"
+            }).css({
+                width: "250px"
+            }).appendTo(categoryRow);
+            $("<input/>", {
+                type: "text",
+                id: "subflow-appearance-input-custom-category"
+            }).css({
+                display: "none",
+                "margin-left": "10px",
+                width: "calc(100% - 250px)"
+            }).appendTo(categoryRow);
+
+            var categories = RED.palette.getCategories();
+            categories.sort(function(A,B) {
+                return A.label.localeCompare(B.label);
+            })
+            categories.forEach(function(cat) {
+                categorySelector.append($("<option/>").val(cat.id).text(cat.label));
+            })
+            categorySelector.append($("<option/>").attr('disabled',true).text("---"));
+            categorySelector.append($("<option/>").val("_custom_").text(RED._("palette.addCategory")));
+
+            $("#subflow-appearance-input-category").on("change", function() {
+                var val = $(this).val();
+                if (val === "_custom_") {
+                    $("#subflow-appearance-input-category").width(120);
+                    $("#subflow-appearance-input-custom-category").show();
+                } else {
+                    $("#subflow-appearance-input-category").width(250);
+                    $("#subflow-appearance-input-custom-category").hide();
+                }
+            })
+
+            $("#subflow-appearance-input-category").val(node.category||"subflows");
+            var userCount = 0;
+            var subflowType = "subflow:"+node.id;
+
+            RED.nodes.eachNode(function(n) {
+                if (n.type === subflowType) {
+                    userCount++;
+                }
+            });
+            $("#red-ui-editor-subflow-user-count")
+                .text(RED._("subflow.subflowInstances", {count:userCount})).show();
+        }
+
         $('<div class="form-row">'+
             '<label for="node-input-show-label-btn" data-i18n="editor.label"></label>'+
+            '<span style="margin-right: 2px;"/>'+
             '<input type="checkbox" id="node-input-show-label"/>'+
         '</div>').appendTo(dialogForm);
 
@@ -969,13 +975,24 @@ RED.editor = (function() {
         }
         $("#node-input-show-label").prop("checked",node.l).trigger("change");
 
+        if (node.type === "subflow") {
+            // subflow template can select its color
+            var color = node.color ? node.color : "#da9";
+            var colorRow = $("<div/>", {
+                class: "form-row"
+            }).appendTo(dialogForm);
+            $("<label/>").text(RED._("editor.color")).appendTo(colorRow);
+            createColorPicker(colorRow, color);
+        }
+
+
         // If a node has icon property in defaults, the icon of the node cannot be modified. (e.g, ui_button node in dashboard)
         if ((!node._def.defaults || !node._def.defaults.hasOwnProperty("icon"))) {
             var iconRow = $('<div class="form-row"></div>').appendTo(dialogForm);
             $('<label data-i18n="editor.settingIcon">').appendTo(iconRow);
 
-            var iconButton = $('<button type="button" class="red-ui-button" id="red-ui-editor-node-icon-button">').appendTo(iconRow);
-
+            var iconButton = $('<button type="button" class="red-ui-button red-ui-editor-node-appearance-button">').appendTo(iconRow);
+            $('<i class="fa fa-caret-down"></i>').appendTo(iconButton);
             var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(iconButton);
             var colour = RED.utils.getNodeColor(node.type, node._def);
             var icon_url = RED.utils.getNodeIcon(node._def,node);
@@ -986,21 +1003,30 @@ RED.editor = (function() {
             iconButton.on("click", function(e) {
                 e.preventDefault();
                 var iconPath;
-                var icon = $("#red-ui-editor-node-icon").text()||"";
+                var icon = $("#red-ui-editor-node-icon").val()||"";
                 if (icon) {
                     iconPath = RED.utils.separateIconPath(icon);
                 } else {
                     iconPath = RED.utils.getDefaultNodeIcon(node._def, node);
                 }
-                showIconPicker(iconRow,node,iconPath,function(newIcon) {
-                    $("#red-ui-editor-node-icon").text(newIcon||"");
+                var backgroundColor = RED.utils.getNodeColor(node.type, node._def);
+                if (node.type === "subflow") {
+                    backgroundColor = $("#red-ui-editor-node-color").val();
+                }
+                showIconPicker(iconButton,backgroundColor,iconPath,false,function(newIcon) {
+                    $("#red-ui-editor-node-icon").val(newIcon||"");
                     var icon_url = RED.utils.getNodeIcon(node._def,{type:node.type,icon:newIcon});
                     RED.utils.createIconElement(icon_url, iconContainer, true);
                 });
             });
-            $('<div id="red-ui-editor-node-icon">').text(node.icon).appendTo(iconButton);
+
+            RED.popover.tooltip(iconButton, function() {
+                return $("#red-ui-editor-node-icon").val()||"default";
+            })
+            $('<input type="hidden" id="red-ui-editor-node-icon">').val(node.icon).appendTo(iconRow);
         }
 
+
         $('<div class="form-row"><span data-i18n="editor.portLabels"></span></div>').appendTo(dialogForm);
 
         var inputCount = node.inputs || node._def.inputs || 0;
@@ -1036,6 +1062,7 @@ RED.editor = (function() {
         }
     }
 
+
     function updateLabels(editing_node, changes, outputMap) {
         var inputLabels = $("#red-ui-editor-node-label-form-inputs").children().find("input");
         var outputLabels = $("#red-ui-editor-node-label-form-outputs").children().find("input");
@@ -1323,7 +1350,7 @@ RED.editor = (function() {
                         }
 
                         if (!editing_node._def.defaults || !editing_node._def.defaults.hasOwnProperty("icon")) {
-                            var icon = $("#red-ui-editor-node-icon").text()||""
+                            var icon = $("#red-ui-editor-node-icon").val()||""
                             if (!isDefaultIcon) {
                                 if (icon !== editing_node.icon) {
                                     changes.icon = editing_node.icon;
@@ -1426,13 +1453,13 @@ RED.editor = (function() {
 
                         if (type === "subflow") {
                             var old_env = editing_node.env;
-                            var new_env = exportEnvList($("#node-input-env-container").editableList("items"));
-                            if (!isSameEnv(old_env, new_env)) {
+                            var new_env = RED.subflow.exportSubflowInstanceEnv(editing_node);
+                            if (!isSameObj(old_env, new_env)) {
                                 editing_node.env = new_env;
                                 changes.env = editing_node.env;
                                 changed = true;
                             }
-                        }
+                         }
 
                         if (changed) {
                             var wasChanged = editing_node.changed;
@@ -1550,6 +1577,19 @@ RED.editor = (function() {
                 buildEditForm(nodePropertiesTab.content,"dialog-form",type,ns,node);
                 editorTabs.addTab(nodePropertiesTab);
 
+                if (/^subflow:/.test(node.type)) {
+                    var subflowPropertiesTab = {
+                        id: "editor-subflow-envProperties",
+                        label: RED._("editor-tab.envProperties"),
+                        name: RED._("editor-tab.envProperties"),
+                        content: $('<div>', {class:"red-ui-tray-content"}).appendTo(editorContent).hide(),
+                        iconClass: "fa fa-list"
+                    };
+
+                    RED.subflow.buildPropertiesForm(subflowPropertiesTab.content,node);
+                    editorTabs.addTab(subflowPropertiesTab);
+                }
+
                 if (!node._def.defaults || !node._def.defaults.hasOwnProperty('info'))  {
                     var descriptionTab = {
                         id: "editor-tab-description",
@@ -1818,7 +1858,6 @@ RED.editor = (function() {
                     var configId = editing_config_node.id;
                     var configAdding = adding;
                     var configTypeDef = RED.nodes.getType(configType);
-
                     if (configTypeDef.oneditcancel) {
                         // TODO: what to pass as this to call
                         if (configTypeDef.oneditcancel) {
@@ -2155,16 +2194,16 @@ RED.editor = (function() {
                         if (updateLabels(editing_node, changes, null)) {
                             changed = true;
                         }
-                        var icon = $("#red-ui-editor-node-icon").text()||"";
-                        if ((editing_node.icon === undefined && icon !== "node-red/subflow.png") ||
+                        var icon = $("#red-ui-editor-node-icon").val()||"";
+                        if ((editing_node.icon === undefined && icon !== "node-red/subflow.svg") ||
                             (editing_node.icon !== undefined && editing_node.icon !== icon)) {
                             changes.icon = editing_node.icon;
                             editing_node.icon = icon;
                             changed = true;
                         }
-                        var newCategory = $("#subflow-input-category").val().trim();
+                        var newCategory = $("#subflow-appearance-input-category").val().trim();
                         if (newCategory === "_custom_") {
-                            newCategory = $("#subflow-input-custom-category").val().trim();
+                            newCategory = $("#subflow-appearance-input-custom-category").val().trim();
                             if (newCategory === "") {
                                 newCategory = editing_node.category;
                             }
@@ -2178,14 +2217,22 @@ RED.editor = (function() {
                             changed = true;
                         }
 
+                        var oldColor = editing_node.color;
+                        var newColor =  $("#red-ui-editor-node-color").val();
+                        if (oldColor !== newColor) {
+                            editing_node.color = newColor;
+                            changes.color = newColor;
+                            changed = true;
+                            RED.utils.clearNodeColorCache();
+                        }
+
                         var old_env = editing_node.env;
-                        var new_env = exportEnvList($("#node-input-env-container").editableList("items"));
-                        if (!isSameEnv(old_env, new_env)) {
+                        var new_env = RED.subflow.exportSubflowTemplateEnv($("#node-input-env-container").editableList("items"));
+                        if (!isSameObj(old_env, new_env)) {
                             editing_node.env = new_env;
                             changes.env = editing_node.env;
                             changed = true;
                         }
-
                         RED.palette.refresh();
 
                         if (changed) {
@@ -2199,6 +2246,7 @@ RED.editor = (function() {
                                         id:n.id,
                                         changed:n.changed
                                     })
+                                    n._def.color = editing_node.color;
                                     n.changed = true;
                                     n.dirty = true;
                                     updateNodeProperties(n);
@@ -2226,21 +2274,39 @@ RED.editor = (function() {
             ],
             resize: function(size) {
                 $(".red-ui-tray-content").height(size.height - 50);
-                // var form = $(".red-ui-tray-content form").height(size.height - 50 - 40);
-                var rows = $("#dialog-form>div:not(.node-input-env-container-row)");
-                var height = size.height;
-                for (var i=0; i<rows.size(); i++) {
-                    height -= $(rows[i]).outerHeight(true);
+                var envContainer = $("#node-input-env-container");
+                if (envContainer.length) {
+                    // var form = $(".red-ui-tray-content form").height(size.height - 50 - 40);
+                    var rows = $("#dialog-form>div:not(#subflow-env-tabs-content)");
+                    var height = size.height;
+                    for (var i=0; i<rows.size(); i++) {
+                        height -= $(rows[i]).outerHeight(true);
+                    }
+                    // var editorRow = $("#dialog-form>div.node-input-env-container-row");
+                    // height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
+                    $("#node-input-env-container").editableList('height',height-95);
                 }
-                var editorRow = $("#dialog-form>div.node-input-env-container-row");
-                height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
-                $("#node-input-env-container").editableList('height',height-80);
             },
             open: function(tray) {
                 var trayFooter = tray.find(".red-ui-tray-footer");
+                var trayFooterLeft = $("<div/>", {
+                    class: "red-ui-tray-footer-left"
+                }).appendTo(trayFooter)
                 var trayBody = tray.find('.red-ui-tray-body');
                 trayBody.parent().css('overflow','hidden');
 
+                if (editing_node.type === "subflow") {
+                    var span = $("<span/>").css({
+                        "margin-left": "10px"
+                    }).appendTo(trayFooterLeft);
+                    $("<i/>", {
+                        class: "fa fa-info-circle"
+                    }).appendTo(span);
+                    $("<span/>").text(" ").appendTo(span);
+                    $("<i/>", {
+                        id: "red-ui-editor-subflow-user-count"
+                    }).appendTo(span);
+                }
 
                 if (editing_node) {
                     RED.sidebar.info.refresh(editing_node);
@@ -2300,46 +2366,9 @@ RED.editor = (function() {
                 buildAppearanceForm(appearanceTab.content,editing_node);
                 editorTabs.addTab(appearanceTab);
 
-
-
-
                 $("#subflow-input-name").val(subflow.name);
                 RED.text.bidi.prepareInput($("#subflow-input-name"));
 
-                $("#subflow-input-category").empty();
-                var categories = RED.palette.getCategories();
-                categories.sort(function(A,B) {
-                    return A.label.localeCompare(B.label);
-                })
-                categories.forEach(function(cat) {
-                    $("#subflow-input-category").append($("<option></option>").val(cat.id).text(cat.label));
-                })
-                $("#subflow-input-category").append($("<option></option>").attr('disabled',true).text("---"));
-                $("#subflow-input-category").append($("<option></option>").val("_custom_").text(RED._("palette.addCategory")));
-
-
-                $("#subflow-input-category").on("change", function() {
-                    var val = $(this).val();
-                    if (val === "_custom_") {
-                        $("#subflow-input-category").width(120);
-                        $("#subflow-input-custom-category").show();
-                    } else {
-                        $("#subflow-input-category").width(250);
-                        $("#subflow-input-custom-category").hide();
-                    }
-                })
-
-                $("#subflow-input-category").val(subflow.category||"subflows");
-                var userCount = 0;
-                var subflowType = "subflow:"+editing_node.id;
-
-                RED.nodes.eachNode(function(n) {
-                    if (n.type === subflowType) {
-                        userCount++;
-                    }
-                });
-                $("#subflow-dialog-user-count").text(RED._("subflow.subflowInstances", {count:userCount})).show();
-
                 trayBody.i18n();
                 finishedBuilding = true;
             },
@@ -2492,6 +2521,8 @@ RED.editor = (function() {
         validateNode: validateNode,
         updateNodeProperties: updateNodeProperties, // TODO: only exposed for edit-undo
 
+        showIconPicker:showIconPicker,
+
         /**
          * Show a type editor.
          * @param {string} type - the type to display

packages/node_modules/@node-red/editor-client/src/js/ui/palette.js

@@ -152,6 +152,7 @@ RED.palette = (function() {
     function getPaletteNode(type) {
         return $(".red-ui-palette-node[data-palette-type='"+type+"']");
     }
+
     function addNodeType(nt,def) {
         if (getPaletteNode(nt).length) {
             return;
@@ -240,7 +241,6 @@ RED.palette = (function() {
                 RED.sidebar.info.set(helpText,RED._("sidebar.info.nodeHelp"));
             });
             var chart = $("#red-ui-workspace-chart");
-            var chartOffset = chart.offset();
             var chartSVG = $("#red-ui-workspace-chart>svg").get(0);
             var activeSpliceLink;
             var mouseX;
@@ -264,8 +264,8 @@ RED.palette = (function() {
                     ui.originalPosition.left = $('#' + e.target.id).offset().left;
 
                     if (def.inputs > 0 && def.outputs > 0) {
-                        mouseX = ui.position.left-paletteWidth+(ui.helper.width()/2) - chartOffset.left + chart.scrollLeft();
-                        mouseY = ui.position.top-paletteTop+(ui.helper.height()/2) - chartOffset.top + chart.scrollTop();
+                        mouseX = ui.position.left - paletteWidth + (ui.helper.width()/2) + chart.scrollLeft();
+                        mouseY = ui.position.top - paletteTop + (ui.helper.height()/2) + chart.scrollTop();
                         if (!spliceTimer) {
                             spliceTimer = setTimeout(function() {
                                 var nodes = [];
@@ -415,7 +415,7 @@ RED.palette = (function() {
                 createCategory(newCategory,category,category,"node-red");
 
                 var currentCategoryNode = paletteNode.closest(".red-ui-palette-category");
-                var newCategoryNode = $("#palette-"+category);
+                var newCategoryNode = $("#red-ui-palette-"+category);
                 newCategoryNode.append(paletteNode);
                 if (newCategoryNode.find(".red-ui-palette-node").length === 1) {
                     categoryContainers[category].open();
@@ -428,10 +428,9 @@ RED.palette = (function() {
                         currentCategoryNode.find("i").toggleClass("expanded");
                     }
                 }
-
-
-
             }
+
+            paletteNode.css("backgroundColor", sf.color);
         });
     }
 
@@ -592,7 +591,6 @@ RED.palette = (function() {
         setTimeout(function() { $(window).trigger("resize"); } ,200);
     }
 
-
     function getCategories() {
         var categories = [];
         $("#red-ui-palette-container .red-ui-palette-category").each(function(i,d) {

packages/node_modules/@node-red/editor-client/src/js/ui/utils.js

@@ -802,13 +802,13 @@ RED.utils = (function() {
     function getDefaultNodeIcon(def,node) {
         var icon_url;
         if (node && node.type === "subflow") {
-            icon_url = "node-red/subflow.png";
+            icon_url = "node-red/subflow.svg";
         } else if (typeof def.icon === "function") {
             try {
                 icon_url = def.icon.call(node);
             } catch(err) {
                 console.log("Definition error: "+def.type+".icon",err);
-                icon_url = "arrow-in.png";
+                icon_url = "arrow-in.svg";
             }
         } else {
             icon_url = def.icon;
@@ -838,11 +838,11 @@ RED.utils = (function() {
 
     function getNodeIcon(def,node) {
         if (def.category === 'config') {
-            return RED.settings.apiRootUrl+"icons/node-red/cog.png"
+            return RED.settings.apiRootUrl+"icons/node-red/cog.svg"
         } else if (node && node.type === 'tab') {
-            return RED.settings.apiRootUrl+"icons/node-red/subflow.png"
+            return RED.settings.apiRootUrl+"icons/node-red/subflow.svg"
         } else if (node && node.type === 'unknown') {
-            return RED.settings.apiRootUrl+"icons/node-red/alert.png"
+            return RED.settings.apiRootUrl+"icons/node-red/alert.svg"
         } else if (node && node.icon) {
             var iconPath = separateIconPath(node.icon);
             if (isIconExists(iconPath)) {
@@ -851,6 +851,11 @@ RED.utils = (function() {
                 } else {
                     return RED.settings.apiRootUrl+"icons/" + node.icon;
                 }
+            } else if (iconPath.module !== "font-awesome" && /.png$/i.test(iconPath.file)) {
+                iconPath.file = iconPath.file.replace(/.png$/,".svg");
+                if (isIconExists(iconPath)) {
+                    return RED.settings.apiRootUrl+"icons/" + node.icon.replace(/.png$/,".svg");
+                }
             }
         }
 
@@ -861,17 +866,32 @@ RED.utils = (function() {
             } else {
                 return RED.settings.apiRootUrl+"icons/"+iconPath.module+"/"+iconPath.file;
             }
-        } else {
-            // This could be a non-core node trying to use a core icon.
-            iconPath.module = 'node-red';
+        }
+
+        if (/.png$/i.test(iconPath.file)) {
+            var originalFile = iconPath.file;
+            iconPath.file = iconPath.file.replace(/.png$/,".svg");
+            if (isIconExists(iconPath)) {
+                return RED.settings.apiRootUrl+"icons/"+iconPath.module+"/"+iconPath.file;
+            }
+            iconPath.file = originalFile;
+        }
+
+        // This could be a non-core node trying to use a core icon.
+        iconPath.module = 'node-red';
+        if (isIconExists(iconPath)) {
+            return RED.settings.apiRootUrl+"icons/"+iconPath.module+"/"+iconPath.file;
+        }
+        if (/.png$/i.test(iconPath.file)) {
+            iconPath.file = iconPath.file.replace(/.png$/,".svg");
             if (isIconExists(iconPath)) {
                 return RED.settings.apiRootUrl+"icons/"+iconPath.module+"/"+iconPath.file;
-            } else if (def.category === 'subflows') {
-                return RED.settings.apiRootUrl+"icons/node-red/subflow.png";
-            } else {
-                return RED.settings.apiRootUrl+"icons/node-red/arrow-in.png";
             }
         }
+        if (def.category === 'subflows') {
+            return RED.settings.apiRootUrl+"icons/node-red/subflow.svg";
+        }
+        return RED.settings.apiRootUrl+"icons/node-red/arrow-in.svg";
     }
 
     function getNodeLabel(node,defaultLabel) {
@@ -892,6 +912,10 @@ RED.utils = (function() {
     }
 
     var nodeColorCache = {};
+    function clearNodeColorCache() {
+        nodeColorCache = {};
+    }
+
     function getNodeColor(type, def) {
         var result = def.color;
         var paletteTheme = RED.settings.theme('palette.theme') || [];
@@ -1007,7 +1031,7 @@ RED.utils = (function() {
                 return;
             }
             // If the specified name is not defined in font-awesome, show arrow-in icon.
-            iconUrl = RED.settings.apiRootUrl+"icons/node-red/arrow-in.png"
+            iconUrl = RED.settings.apiRootUrl+"icons/node-red/arrow-in.svg"
         }
         var imageIconElement = $('<div/>',{class:"red-ui-palette-icon"}).appendTo(iconContainer);
         imageIconElement.css("backgroundImage", "url("+iconUrl+")");
@@ -1024,6 +1048,7 @@ RED.utils = (function() {
         getNodeIcon: getNodeIcon,
         getNodeLabel: getNodeLabel,
         getNodeColor: getNodeColor,
+        clearNodeColorCache: clearNodeColorCache,
         addSpinnerOverlay: addSpinnerOverlay,
         decodeObject: decodeObject,
         parseContextKey: parseContextKey,

packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js

@@ -108,6 +108,168 @@ RED.view.tools = (function() {
         }
     }
 
+    function layoutFlow() {
+
+        var selection = RED.view.selection();
+        if (!selection.nodes || selection.nodes.length !== 1) {
+            RED.notify("Select exactly one node");
+            return;
+        }
+        var ns = RED.nodes.getAllFlowNodes(selection.nodes[0]);
+
+        // Find Input node
+
+        var nodes = {};
+        var minRank = 0;
+        var stack = [];
+        var candidateInputs = {};
+        var candidateOutputs = {};
+        ns.forEach(function(n) {
+            candidateInputs[n.id] = n;
+            candidateOutputs[n.id] = n;
+            nodes[n.id] = {
+                n:n,
+                i:[],
+                o:[],
+                d:-1, // depth from start
+                r:-1, // rank order at that depth
+                downstream: 0
+            }
+        });
+        RED.nodes.eachLink(function(link) {
+            if (nodes[link.source.id] || nodes[link.target.id]) {
+                nodes[link.source.id].o.push(link.target.id);
+                nodes[link.target.id].i.push(link.source.id);
+                delete candidateInputs[link.target.id]
+                delete candidateOutputs[link.source.id]
+            }
+        })
+
+        var inputs = Object.keys(candidateInputs);
+        var outputs = Object.keys(candidateOutputs);
+
+        if (inputs.length > 1) {
+            RED.notify("Multiple start points - bailing")
+            return;
+        }
+
+       if (outputs.length === 0) {
+           RED.notify("No outputs - is this a big loop? Bailing");
+           return;
+       }
+
+        function applyDepth(id,d) {
+            if (nodes[id].d < d) {
+                nodes[id].d = d;
+                nodes[id].o.forEach(function(nid) {
+                    applyDepth(nid,d+1);
+                })
+            }
+        }
+        applyDepth(inputs[0],0)
+
+        function calculateDownstream(id,downstream) {
+            nodes[id].downstream += downstream;
+            nodes[id].i.forEach(function(nid) {
+                calculateDownstream(nid, nodes[id].downstream+1);
+            })
+        }
+        outputs.forEach(function(id) {
+            calculateDownstream(id, 0)
+        })
+
+        var ranks = {};
+        function rankNodes(node) {
+            if (node.r === -1) {
+                ranks[node.d] = ranks[node.d] || [];
+                node.r = ranks[node.d].length;
+                ranks[node.d].push(node);
+                node.o.sort(function(a,b) {
+                    return nodes[b].downstream - nodes[a].downstream
+                })
+                node.o.forEach(function(nid) {
+                    rankNodes(nodes[nid])
+                })
+            }
+        }
+        rankNodes(nodes[inputs[0]]);
+        function shuffleRanks(node) {
+            var pushed = false;
+            if (node.o.length > 1) {
+                var outputs = node.o.slice(0);
+                outputs.sort(function(a,b) {
+                    if (nodes[a].d === nodes[b].d) {
+                        return nodes[a].r - nodes[b].r;
+                    } else {
+                        return nodes[b].d - nodes[a].d;
+                    }
+                })
+                // outputs.forEach(function(o,i) { console.log(" ",i," + "+nodes[o].n.type," d:",nodes[o].d," r:",nodes[o].r)});
+                var rank = nodes[outputs[0]].r;
+                var depth = nodes[outputs[0]].d;
+                for (var i=1;i<outputs.length;i++) {
+                    // console.log(outputs[i]);
+                    var n = nodes[outputs[i]];
+                    if (n.d !== depth && n.r === rank) {
+                        // need to move n down one.
+                        var r = n.r;
+                        ns.forEach(function(_n) {
+                            var nn = nodes[_n.id];
+                            if (nn.d >= n.d && nn.d < depth && nn.r >= r) {
+                                pushed = true;
+                                nn.r++;
+                            }
+                        })
+                    }
+                    depth = n.d;
+                    rank = n.r;
+                }
+            }
+            node.o.forEach(function(n) {
+                pushed = pushed || shuffleRanks(nodes[n])
+            })
+            return pushed;
+        }
+        var shuffle = function() {
+            if (shuffleRanks(nodes[inputs[0]])) {
+                shuffle();
+            }
+        }
+        shuffle();
+
+
+        var x = nodes[inputs[0]].n.x;
+        var y = nodes[inputs[0]].n.y;
+        var changedNodes = [];
+        ns.forEach(function(n) {
+            var d = nodes[n.id].d;
+            var r = nodes[n.id].r;
+
+            changedNodes.push({
+                n:n,
+                ox: n.x,
+                oy: n.y,
+                moved: n.moved
+            });
+
+            n.x = x + d*200;
+            n.y = y + r*50;
+            n.dirty = true;
+            // n.dirtyStatus = true;
+            // n.status = {
+            //     text:"d"+d+" : r"+r+" : ds"+nodes[n.id].downstream
+            // }
+        });
+
+        if (changedNodes.length > 0) {
+            RED.history.push({t:"move",nodes:changedNodes,dirty:RED.nodes.dirty()});
+            RED.nodes.dirty(true);
+            RED.view.redraw(true);
+        }
+
+    }
+
+
     return {
         init: function() {
             RED.actions.add("core:align-selection-to-grid", alignToGrid);
@@ -121,6 +283,8 @@ RED.view.tools = (function() {
             RED.actions.add("core:step-selection-right", function() { moveSelection(RED.view.gridSize(),0);});
             RED.actions.add("core:step-selection-down", function() { moveSelection(0,RED.view.gridSize());});
             RED.actions.add("core:step-selection-left", function() { moveSelection(-RED.view.gridSize(),0);});
+
+            RED.actions.add("core:layout-flow", function() { layoutFlow() })
         },
         /**
          * Aligns all selected nodes to the current grid

packages/node_modules/@node-red/editor-client/src/js/ui/view.js

@@ -358,7 +358,7 @@ RED.view = (function() {
 
                 var spliceLink = $(ui.helper).data("splice");
                 if (spliceLink) {
-                    // TODO: DRY - droppable/nodeMouseDown/canvasMouseUp
+                    // TODO: DRY - droppable/nodeMouseDown/canvasMouseUp/showQuickAddDialog
                     RED.nodes.removeLink(spliceLink);
                     var link1 = {
                         source:spliceLink.source,
@@ -406,6 +406,7 @@ RED.view = (function() {
         RED.actions.add("core:delete-selection",deleteSelection);
         RED.actions.add("core:edit-selected-node",editSelection);
         RED.actions.add("core:undo",RED.history.pop);
+        RED.actions.add("core:redo",RED.history.redo);
         RED.actions.add("core:select-all-nodes",selectAll);
         RED.actions.add("core:zoom-in",zoomIn);
         RED.actions.add("core:zoom-out",zoomOut);
@@ -694,280 +695,8 @@ RED.view = (function() {
         }
         if (mouse_mode === 0 || mouse_mode === RED.state.QUICK_JOINING) {
             if (d3.event.metaKey || d3.event.ctrlKey) {
-                point = d3.mouse(this);
-                var ox = point[0];
-                var oy = point[1];
-
-                if (RED.settings.get("editor").view['view-snap-grid']) {
-                    // eventLayer.append("circle").attr("cx",point[0]).attr("cy",point[1]).attr("r","2").attr('fill','red')
-                    point[0] = Math.round(point[0] / gridSize) * gridSize;
-                    point[1] = Math.round(point[1] / gridSize) * gridSize;
-                    // eventLayer.append("circle").attr("cx",point[0]).attr("cy",point[1]).attr("r","2").attr('fill','blue')
-                }
-
                 d3.event.stopPropagation();
-                var mainPos = $("#red-ui-main-container").position();
-
-                if (mouse_mode !== RED.state.QUICK_JOINING) {
-                    mouse_mode = RED.state.QUICK_JOINING;
-                    $(window).on('keyup',disableQuickJoinEventHandler);
-                }
-                quickAddActive = true;
-
-                if (ghostNode) {
-                    ghostNode.remove();
-                }
-                ghostNode = eventLayer.append("g").attr('transform','translate('+(point[0] - node_width/2)+','+(point[1] - node_height/2)+')');
-                ghostNode.append("rect")
-                    .attr("class","red-ui-flow-node-placeholder")
-                    .attr("rx", 5)
-                    .attr("ry", 5)
-                    .attr("width",node_width)
-                    .attr("height",node_height)
-                    .attr("fill","none")
-                // var ghostLink = ghostNode.append("svg:path")
-                //     .attr("class","red-ui-flow-link-link")
-                //     .attr("d","M 0 "+(node_height/2)+" H "+(gridSize * -2))
-                //     .attr("opacity",0);
-
-                var filter = undefined;
-                if (drag_lines.length > 0) {
-                    if (drag_lines[0].virtualLink) {
-                        filter = {type:drag_lines[0].node.type === 'link in'?'link out':'link in'}
-                    } else if (drag_lines[0].portType === PORT_TYPE_OUTPUT) {
-                        filter = {input:true}
-                    } else {
-                        filter = {output:true}
-                    }
-
-                    quickAddLink = {
-                        node: drag_lines[0].node,
-                        port: drag_lines[0].port,
-                        portType: drag_lines[0].portType,
-                    }
-                    if (drag_lines[0].virtualLink) {
-                        quickAddLink.virtualLink = true;
-                    }
-                    hideDragLines();
-                }
-                var rebuildQuickAddLink = function() {
-                    if (!quickAddLink) {
-                        return;
-                    }
-                    if (!quickAddLink.el) {
-                        quickAddLink.el = dragGroupLayer.append("svg:path").attr("class", "red-ui-flow-drag-line");
-                    }
-                    var numOutputs = (quickAddLink.portType === PORT_TYPE_OUTPUT)?(quickAddLink.node.outputs || 1):1;
-                    var sourcePort = quickAddLink.port;
-                    var portY = -((numOutputs-1)/2)*13 +13*sourcePort;
-                    var sc = (quickAddLink.portType === PORT_TYPE_OUTPUT)?1:-1;
-                    quickAddLink.el.attr("d",generateLinkPath(quickAddLink.node.x+sc*quickAddLink.node.w/2,quickAddLink.node.y+portY,point[0]-sc*node_width/2,point[1],sc));
-                }
-                if (quickAddLink) {
-                    rebuildQuickAddLink();
-                }
-
-
-                var lastAddedX;
-                var lastAddedWidth;
-
-                RED.typeSearch.show({
-                    x:d3.event.clientX-mainPos.left-node_width/2 - (ox-point[0]),
-                    y:d3.event.clientY-mainPos.top+ node_height/2 + 5 - (oy-point[1]),
-                    filter: filter,
-                    move: function(dx,dy) {
-                        if (ghostNode) {
-                            var pos = d3.transform(ghostNode.attr("transform")).translate;
-                            ghostNode.attr("transform","translate("+(pos[0]+dx)+","+(pos[1]+dy)+")")
-                            point[0] += dx;
-                            point[1] += dy;
-                            rebuildQuickAddLink();
-                        }
-                    },
-                    cancel: function() {
-                        if (quickAddLink) {
-                            if (quickAddLink.el) {
-                                quickAddLink.el.remove();
-                            }
-                            quickAddLink = null;
-                        }
-                        quickAddActive = false;
-                        if (ghostNode) {
-                            ghostNode.remove();
-                        }
-                        resetMouseVars();
-                        updateSelection();
-                        hideDragLines();
-                        redraw();
-                    },
-                    add: function(type,keepAdding) {
-                        var result = addNode(type);
-                        if (!result) {
-                            return;
-                        }
-                        if (keepAdding) {
-                            mouse_mode = RED.state.QUICK_JOINING;
-                        }
-
-                        var nn = result.node;
-                        var historyEvent = result.historyEvent;
-                        nn.x = point[0];
-                        nn.y = point[1];
-                        var showLabel = RED.utils.getMessageProperty(RED.settings.get('editor'),"view.view-node-show-label");
-                        if (showLabel !== undefined && !/^link (in|out)$/.test(nn._def.type) && !nn._def.defaults.hasOwnProperty("l")) {
-                            nn.l = showLabel;
-                        }
-                        if (quickAddLink) {
-                            var drag_line = quickAddLink;
-                            var src = null,dst,src_port;
-                            if (drag_line.portType === PORT_TYPE_OUTPUT && (nn.inputs > 0 || drag_line.virtualLink) ) {
-                                src = drag_line.node;
-                                src_port = drag_line.port;
-                                dst = nn;
-                            } else if (drag_line.portType === PORT_TYPE_INPUT && (nn.outputs > 0 || drag_line.virtualLink)) {
-                                src = nn;
-                                dst = drag_line.node;
-                                src_port = 0;
-                            }
-
-                            if (src !== null) {
-                                // Joining link nodes via virual wires. Need to update
-                                // the src and dst links property
-                                if (drag_line.virtualLink) {
-                                    historyEvent = {
-                                        t:'multi',
-                                        events: [historyEvent]
-                                    }
-                                    var oldSrcLinks = $.extend(true,{},{v:src.links}).v
-                                    var oldDstLinks = $.extend(true,{},{v:dst.links}).v
-                                    src.links.push(dst.id);
-                                    dst.links.push(src.id);
-                                    src.dirty = true;
-                                    dst.dirty = true;
-
-                                    historyEvent.events.push({
-                                        t:'edit',
-                                        node: src,
-                                        dirty: RED.nodes.dirty(),
-                                        changed: src.changed,
-                                        changes: {
-                                            links:oldSrcLinks
-                                        }
-                                    });
-                                    historyEvent.events.push({
-                                        t:'edit',
-                                        node: dst,
-                                        dirty: RED.nodes.dirty(),
-                                        changed: dst.changed,
-                                        changes: {
-                                            links:oldDstLinks
-                                        }
-                                    });
-                                    src.changed = true;
-                                    dst.changed = true;
-                                } else {
-                                    var link = {source: src, sourcePort:src_port, target: dst};
-                                    RED.nodes.addLink(link);
-                                    historyEvent.links = [link];
-                                }
-                                if (!keepAdding) {
-                                    quickAddLink.el.remove();
-                                    quickAddLink = null;
-                                    if (mouse_mode === RED.state.QUICK_JOINING) {
-                                        if (drag_line.portType === PORT_TYPE_OUTPUT && nn.outputs > 0) {
-                                            showDragLines([{node:nn,port:0,portType:PORT_TYPE_OUTPUT}]);
-                                        } else if (!quickAddLink && drag_line.portType === PORT_TYPE_INPUT && nn.inputs > 0) {
-                                            showDragLines([{node:nn,port:0,portType:PORT_TYPE_INPUT}]);
-                                        } else {
-                                            resetMouseVars();
-                                        }
-                                    }
-                                } else {
-                                    quickAddLink.node = nn;
-                                    quickAddLink.port = 0;
-                                }
-                            } else {
-                                hideDragLines();
-                                resetMouseVars();
-                            }
-                        } else {
-                            if (!keepAdding) {
-                                if (mouse_mode === RED.state.QUICK_JOINING) {
-                                    if (nn.outputs > 0) {
-                                        showDragLines([{node:nn,port:0,portType:PORT_TYPE_OUTPUT}]);
-                                    } else if (nn.inputs > 0) {
-                                        showDragLines([{node:nn,port:0,portType:PORT_TYPE_INPUT}]);
-                                    } else {
-                                        resetMouseVars();
-                                    }
-                                }
-                            } else {
-                                if (nn.outputs > 0) {
-                                    quickAddLink = {
-                                        node: nn,
-                                        port: 0,
-                                        portType: PORT_TYPE_OUTPUT
-                                    }
-                                } else if (nn.inputs > 0) {
-                                    quickAddLink = {
-                                        node: nn,
-                                        port: 0,
-                                        portType: PORT_TYPE_INPUT
-                                    }
-                                } else {
-                                    resetMouseVars();
-                                }
-                            }
-                        }
-
-                        RED.history.push(historyEvent);
-                        RED.nodes.add(nn);
-                        RED.editor.validateNode(nn);
-                        RED.nodes.dirty(true);
-                        // auto select dropped node - so info shows (if visible)
-                        clearSelection();
-                        nn.selected = true;
-                        moving_set.push({n:nn});
-                        updateActiveNodes();
-                        updateSelection();
-                        redraw();
-                        // At this point the newly added node will have a real width,
-                        // so check if the position needs nudging
-                        if (lastAddedX !== undefined) {
-                            var lastNodeRHEdge = lastAddedX + lastAddedWidth/2;
-                            var thisNodeLHEdge = nn.x - nn.w/2;
-                            var gap = thisNodeLHEdge - lastNodeRHEdge;
-                            if (gap != gridSize *2) {
-                                nn.x = nn.x + gridSize * 2 - gap;
-                                nn.dirty = true;
-                                nn.x = Math.ceil(nn.x / gridSize) * gridSize;
-                                redraw();
-                            }
-                        }
-                        if (keepAdding) {
-                            if (lastAddedX === undefined) {
-                                // ghostLink.attr("opacity",1);
-                                setTimeout(function() {
-                                    RED.typeSearch.refresh({filter:{input:true}});
-                                },100);
-                            }
-
-                            lastAddedX = nn.x;
-                            lastAddedWidth = nn.w;
-
-                            point[0] = nn.x + nn.w/2 + node_width/2 + gridSize * 2;
-                            ghostNode.attr('transform','translate('+(point[0] - node_width/2)+','+(point[1] - node_height/2)+')');
-                            rebuildQuickAddLink();
-                        } else {
-                            quickAddActive = false;
-                            ghostNode.remove();
-                        }
-                    }
-                });
-
-                updateActiveNodes();
-                updateSelection();
-                redraw();
+                showQuickAddDialog(d3.mouse(this));
             }
         }
         if (mouse_mode === 0 && !(d3.event.metaKey || d3.event.ctrlKey)) {
@@ -988,6 +717,302 @@ RED.view = (function() {
         }
     }
 
+    function showQuickAddDialog(point,spliceLink) {
+        var ox = point[0];
+        var oy = point[1];
+
+        if (RED.settings.get("editor").view['view-snap-grid']) {
+            // eventLayer.append("circle").attr("cx",point[0]).attr("cy",point[1]).attr("r","2").attr('fill','red')
+            point[0] = Math.round(point[0] / gridSize) * gridSize;
+            point[1] = Math.round(point[1] / gridSize) * gridSize;
+            // eventLayer.append("circle").attr("cx",point[0]).attr("cy",point[1]).attr("r","2").attr('fill','blue')
+        }
+
+        var mainPos = $("#red-ui-main-container").position();
+
+        if (mouse_mode !== RED.state.QUICK_JOINING) {
+            mouse_mode = RED.state.QUICK_JOINING;
+            $(window).on('keyup',disableQuickJoinEventHandler);
+        }
+        quickAddActive = true;
+
+        if (ghostNode) {
+            ghostNode.remove();
+        }
+        ghostNode = eventLayer.append("g").attr('transform','translate('+(point[0] - node_width/2)+','+(point[1] - node_height/2)+')');
+        ghostNode.append("rect")
+            .attr("class","red-ui-flow-node-placeholder")
+            .attr("rx", 5)
+            .attr("ry", 5)
+            .attr("width",node_width)
+            .attr("height",node_height)
+            .attr("fill","none")
+        // var ghostLink = ghostNode.append("svg:path")
+        //     .attr("class","red-ui-flow-link-link")
+        //     .attr("d","M 0 "+(node_height/2)+" H "+(gridSize * -2))
+        //     .attr("opacity",0);
+
+        var filter = undefined;
+        if (drag_lines.length > 0) {
+            if (drag_lines[0].virtualLink) {
+                filter = {type:drag_lines[0].node.type === 'link in'?'link out':'link in'}
+            } else if (drag_lines[0].portType === PORT_TYPE_OUTPUT) {
+                filter = {input:true}
+            } else {
+                filter = {output:true}
+            }
+
+            quickAddLink = {
+                node: drag_lines[0].node,
+                port: drag_lines[0].port,
+                portType: drag_lines[0].portType,
+            }
+            if (drag_lines[0].virtualLink) {
+                quickAddLink.virtualLink = true;
+            }
+            hideDragLines();
+        } else if (spliceLink) {
+            filter = {input:true, output:true}
+        }
+        var rebuildQuickAddLink = function() {
+            if (!quickAddLink) {
+                return;
+            }
+            if (!quickAddLink.el) {
+                quickAddLink.el = dragGroupLayer.append("svg:path").attr("class", "red-ui-flow-drag-line");
+            }
+            var numOutputs = (quickAddLink.portType === PORT_TYPE_OUTPUT)?(quickAddLink.node.outputs || 1):1;
+            var sourcePort = quickAddLink.port;
+            var portY = -((numOutputs-1)/2)*13 +13*sourcePort;
+            var sc = (quickAddLink.portType === PORT_TYPE_OUTPUT)?1:-1;
+            quickAddLink.el.attr("d",generateLinkPath(quickAddLink.node.x+sc*quickAddLink.node.w/2,quickAddLink.node.y+portY,point[0]-sc*node_width/2,point[1],sc));
+        }
+        if (quickAddLink) {
+            rebuildQuickAddLink();
+        }
+
+
+        var lastAddedX;
+        var lastAddedWidth;
+
+        RED.typeSearch.show({
+            x:d3.event.clientX-mainPos.left-node_width/2 - (ox-point[0]),
+            y:d3.event.clientY-mainPos.top+ node_height/2 + 5 - (oy-point[1]),
+            filter: filter,
+            move: function(dx,dy) {
+                if (ghostNode) {
+                    var pos = d3.transform(ghostNode.attr("transform")).translate;
+                    ghostNode.attr("transform","translate("+(pos[0]+dx)+","+(pos[1]+dy)+")")
+                    point[0] += dx;
+                    point[1] += dy;
+                    rebuildQuickAddLink();
+                }
+            },
+            cancel: function() {
+                if (quickAddLink) {
+                    if (quickAddLink.el) {
+                        quickAddLink.el.remove();
+                    }
+                    quickAddLink = null;
+                }
+                quickAddActive = false;
+                if (ghostNode) {
+                    ghostNode.remove();
+                }
+                resetMouseVars();
+                updateSelection();
+                hideDragLines();
+                redraw();
+            },
+            add: function(type,keepAdding) {
+                var result = addNode(type);
+                if (!result) {
+                    return;
+                }
+                if (keepAdding) {
+                    mouse_mode = RED.state.QUICK_JOINING;
+                }
+
+                var nn = result.node;
+                var historyEvent = result.historyEvent;
+                nn.x = point[0];
+                nn.y = point[1];
+                var showLabel = RED.utils.getMessageProperty(RED.settings.get('editor'),"view.view-node-show-label");
+                if (showLabel !== undefined && !/^link (in|out)$/.test(nn._def.type) && !nn._def.defaults.hasOwnProperty("l")) {
+                    nn.l = showLabel;
+                }
+                if (!spliceLink) {
+                    if (quickAddLink) {
+                        var drag_line = quickAddLink;
+                        var src = null,dst,src_port;
+                        if (drag_line.portType === PORT_TYPE_OUTPUT && (nn.inputs > 0 || drag_line.virtualLink) ) {
+                            src = drag_line.node;
+                            src_port = drag_line.port;
+                            dst = nn;
+                        } else if (drag_line.portType === PORT_TYPE_INPUT && (nn.outputs > 0 || drag_line.virtualLink)) {
+                            src = nn;
+                            dst = drag_line.node;
+                            src_port = 0;
+                        }
+
+                        if (src !== null) {
+                            // Joining link nodes via virual wires. Need to update
+                            // the src and dst links property
+                            if (drag_line.virtualLink) {
+                                historyEvent = {
+                                    t:'multi',
+                                    events: [historyEvent]
+                                }
+                                var oldSrcLinks = $.extend(true,{},{v:src.links}).v
+                                var oldDstLinks = $.extend(true,{},{v:dst.links}).v
+                                src.links.push(dst.id);
+                                dst.links.push(src.id);
+                                src.dirty = true;
+                                dst.dirty = true;
+
+                                historyEvent.events.push({
+                                    t:'edit',
+                                    node: src,
+                                    dirty: RED.nodes.dirty(),
+                                    changed: src.changed,
+                                    changes: {
+                                        links:oldSrcLinks
+                                    }
+                                });
+                                historyEvent.events.push({
+                                    t:'edit',
+                                    node: dst,
+                                    dirty: RED.nodes.dirty(),
+                                    changed: dst.changed,
+                                    changes: {
+                                        links:oldDstLinks
+                                    }
+                                });
+                                src.changed = true;
+                                dst.changed = true;
+                            } else {
+                                var link = {source: src, sourcePort:src_port, target: dst};
+                                RED.nodes.addLink(link);
+                                historyEvent.links = [link];
+                            }
+                            if (!keepAdding) {
+                                quickAddLink.el.remove();
+                                quickAddLink = null;
+                                if (mouse_mode === RED.state.QUICK_JOINING) {
+                                    if (drag_line.portType === PORT_TYPE_OUTPUT && nn.outputs > 0) {
+                                        showDragLines([{node:nn,port:0,portType:PORT_TYPE_OUTPUT}]);
+                                    } else if (!quickAddLink && drag_line.portType === PORT_TYPE_INPUT && nn.inputs > 0) {
+                                        showDragLines([{node:nn,port:0,portType:PORT_TYPE_INPUT}]);
+                                    } else {
+                                        resetMouseVars();
+                                    }
+                                }
+                            } else {
+                                quickAddLink.node = nn;
+                                quickAddLink.port = 0;
+                            }
+                        } else {
+                            hideDragLines();
+                            resetMouseVars();
+                        }
+                    } else {
+                        if (!keepAdding) {
+                            if (mouse_mode === RED.state.QUICK_JOINING) {
+                                if (nn.outputs > 0) {
+                                    showDragLines([{node:nn,port:0,portType:PORT_TYPE_OUTPUT}]);
+                                } else if (nn.inputs > 0) {
+                                    showDragLines([{node:nn,port:0,portType:PORT_TYPE_INPUT}]);
+                                } else {
+                                    resetMouseVars();
+                                }
+                            }
+                        } else {
+                            if (nn.outputs > 0) {
+                                quickAddLink = {
+                                    node: nn,
+                                    port: 0,
+                                    portType: PORT_TYPE_OUTPUT
+                                }
+                            } else if (nn.inputs > 0) {
+                                quickAddLink = {
+                                    node: nn,
+                                    port: 0,
+                                    portType: PORT_TYPE_INPUT
+                                }
+                            } else {
+                                resetMouseVars();
+                            }
+                        }
+                    }
+                } else {
+                    resetMouseVars();
+                    // TODO: DRY - droppable/nodeMouseDown/canvasMouseUp/showQuickAddDialog
+                    RED.nodes.removeLink(spliceLink);
+                    var link1 = {
+                        source:spliceLink.source,
+                        sourcePort:spliceLink.sourcePort,
+                        target: nn
+                    };
+                    var link2 = {
+                        source:nn,
+                        sourcePort:0,
+                        target: spliceLink.target
+                    };
+                    RED.nodes.addLink(link1);
+                    RED.nodes.addLink(link2);
+                    historyEvent.links = [link1,link2];
+                    historyEvent.removedLinks = [spliceLink];
+                }
+                RED.history.push(historyEvent);
+                RED.nodes.add(nn);
+                RED.editor.validateNode(nn);
+                RED.nodes.dirty(true);
+                // auto select dropped node - so info shows (if visible)
+                clearSelection();
+                nn.selected = true;
+                moving_set.push({n:nn});
+                updateActiveNodes();
+                updateSelection();
+                redraw();
+                // At this point the newly added node will have a real width,
+                // so check if the position needs nudging
+                if (lastAddedX !== undefined) {
+                    var lastNodeRHEdge = lastAddedX + lastAddedWidth/2;
+                    var thisNodeLHEdge = nn.x - nn.w/2;
+                    var gap = thisNodeLHEdge - lastNodeRHEdge;
+                    if (gap != gridSize *2) {
+                        nn.x = nn.x + gridSize * 2 - gap;
+                        nn.dirty = true;
+                        nn.x = Math.ceil(nn.x / gridSize) * gridSize;
+                        redraw();
+                    }
+                }
+                if (keepAdding) {
+                    if (lastAddedX === undefined) {
+                        // ghostLink.attr("opacity",1);
+                        setTimeout(function() {
+                            RED.typeSearch.refresh({filter:{input:true}});
+                        },100);
+                    }
+
+                    lastAddedX = nn.x;
+                    lastAddedWidth = nn.w;
+
+                    point[0] = nn.x + nn.w/2 + node_width/2 + gridSize * 2;
+                    ghostNode.attr('transform','translate('+(point[0] - node_width/2)+','+(point[1] - node_height/2)+')');
+                    rebuildQuickAddLink();
+                } else {
+                    quickAddActive = false;
+                    ghostNode.remove();
+                }
+            }
+        });
+
+        updateActiveNodes();
+        updateSelection();
+        redraw();
+    }
+
     function canvasMouseMove() {
         var i;
         var node;
@@ -2463,14 +2488,22 @@ RED.view = (function() {
                 .attr("class","red-ui-flow-node-icon")
                 .attr("x",0)
                 .attr("width","30")
-                .attr("height","30");
+                .attr("height","30")
+                .style("display","none");
 
             var img = new Image();
             img.src = iconUrl;
             img.onload = function() {
-                icon.attr("width",Math.min(img.width,30));
-                icon.attr("height",Math.min(img.height,30));
-                icon.attr("x",15-Math.min(img.width,30)/2);
+                var largestEdge = Math.max(img.width,img.height);
+                var scaleFactor = 1;
+                if (largestEdge > 30) {
+                    scaleFactor = 30/largestEdge;
+                }
+                var width = img.width * scaleFactor;
+                var height = img.height * scaleFactor;
+                icon.attr("width",width);
+                icon.attr("height",height);
+                icon.attr("x",15-width/2);
                 icon.attr("xlink:href",iconUrl);
                 icon.style("display",null);
                 //if ("right" == d._def.align) {
@@ -3158,7 +3191,7 @@ RED.view = (function() {
                                     var statusClass = "red-ui-flow-node-status-"+(d.status.shape||"dot")+"-"+d.status.fill;
                                     thisNode.selectAll(".red-ui-flow-node-status").style("display","inline").attr("class","red-ui-flow-node-status "+statusClass);
                                 }
-                                if (d.status.text) {
+                                if (d.status.hasOwnProperty('text')) {
                                     thisNode.selectAll(".red-ui-flow-node-status-label").text(d.status.text);
                                 } else {
                                     thisNode.selectAll(".red-ui-flow-node-status-label").text("");
@@ -3196,6 +3229,10 @@ RED.view = (function() {
                         redraw();
                         focusView();
                         d3.event.stopPropagation();
+                        if (d3.event.metaKey || d3.event.ctrlKey) {
+                            l.classed("red-ui-flow-link-splice",true);
+                            showQuickAddDialog(d3.mouse(this), selected_link);
+                        }
                     })
                     .on("touchstart",function(d) {
                         if (mouse_mode === RED.state.SELECTING_NODE) {

packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js

@@ -439,7 +439,7 @@ RED.workspaces = (function() {
             if (!workspace_tabs.contains(id)) {
                 var sf = RED.nodes.subflow(id);
                 if (sf) {
-                    addWorkspace({type:"subflow",id:id,icon:"red/images/subflow_tab.png",label:sf.name, closeable: true});
+                    addWorkspace({type:"subflow",id:id,icon:"red/images/subflow_tab.svg",label:sf.name, closeable: true});
                 } else {
                     return;
                 }

packages/node_modules/@node-red/editor-client/src/sass/base.scss

@@ -60,10 +60,12 @@
 .red-ui-icon-picker {
     a {
         text-decoration: none;
+        color: $primary-text-color;
     }
     a:hover,
     a:focus {
         text-decoration: none;
+        color: $primary-text-color;
     }
 
     p {

packages/node_modules/@node-red/editor-client/src/sass/dropdownMenu.scss

@@ -79,6 +79,9 @@
     }
 
     a {
+        img {
+            max-width: 14px;
+        }
         .fa {
             width: 20px;
             margin-left: -25px;

packages/node_modules/@node-red/editor-client/src/sass/editor.scss

@@ -190,6 +190,10 @@ button.red-ui-tray-resize-button {
         border-color: $form-input-border-error-color !important;
     }
 
+    .input-updated {
+        border-color: $node-selected-color !important;
+    }
+
     .form-row {
         clear: both;
         color: $form-text-color;
@@ -388,28 +392,26 @@ button.red-ui-button-small
     }
 }
 
-
-#red-ui-editor-node-icon-button {
+button.red-ui-button.red-ui-editor-node-appearance-button {
     position: relative;
-    padding-left: 30px;
-    width: calc(100% - 150px);
+    height: 35px !important;
+    text-align: left;
+    padding: 0 6px  0 3px;
+    >i {
+        width: 15px;
+        vertical-align: middle;
+        padding-left: 2px;
+    }
     .red-ui-search-result-node {
-        position: absolute;
-        top: 2px;
-        left: 2px;
+        vertical-align: middle;
+        float: none;
+        position: relative;
+        top: -1px;
+
     }
 }
-#red-ui-editor-node-icon {
-    margin-left: 10px;
-    width: calc(100% - 163px);
-}
+
 .red-ui-icon-picker {
-    position: absolute;
-    border: 1px solid $primary-border-color;
-    box-shadow: 0 1px 6px -3px black;
-    background: $secondary-background;
-    z-Index: 21;
-    display: none;
     select {
         box-sizing: border-box;
         margin: 3px;
@@ -421,6 +423,16 @@ button.red-ui-button-small
     height: 200px;
     overflow-y: scroll;
     line-height: 0px;
+    position: relative;
+    &.red-ui-icon-list-dark {
+        .red-ui-palette-icon-fa {
+            color: $secondary-text-color;
+        }
+        .red-ui-palette-icon-container {
+            background: $secondary-background;
+            border-radius: 4px;
+        }
+    }
 }
 .red-ui-icon-list-icon {
     display: inline-block;
@@ -428,6 +440,7 @@ button.red-ui-button-small
     padding: 4px;
     cursor: pointer;
     border-radius: 4px;
+
     &:hover {
         background: $list-item-background-hover;
     }
@@ -579,3 +592,406 @@ button.red-ui-button-small
 button.red-ui-toggleButton.toggle {
     text-align: left;
 }
+
+
+.red-ui-editor-subflow-env-ui-row {
+    margin-right: 3px;
+    >div {
+        display: grid;
+        grid-template-columns: 16px 40px 35% auto;
+    }
+    >div:first-child {
+        font-size: 0.9em;
+        color: $tertiary-text-color;
+        margin: 3px 0 -4px;
+        >div {
+            padding-left: 3px;
+        }
+    }
+    >div:last-child {
+        >div {
+            height: 40px;
+            line-height: 30px;
+            display: inline-block;
+            box-sizing: border-box;
+            // border-left: 2px dashed $secondary-border-color;
+            // border-bottom: 2px dashed $secondary-border-color;
+            // border: 1px dashed $secondary-border-color;
+            border-right: none;
+            &:not(:first-child) {
+                padding: 3px;
+            }
+            // &:last-child {
+            //     border-right: 1px dashed $secondary-border-color;
+            // }
+            .placeholder-input {
+                position: relative;
+                padding: 0 3px;
+                line-height: 24px;
+                opacity: 0.8
+            }
+            .red-ui-typedInput-value-label,.red-ui-typedInput-option-label {
+                select,.placeholder-input  {
+                    margin: 3px;
+                    height: 26px;
+                    width: calc(100% - 10px);
+                    padding-left: 3px;
+                }
+                .placeholder-input {
+                    span:first-child {
+                        display:inline-block;
+                        height: 100%;
+                        width: 20px;
+                        text-align:center;
+                        border-right: 1px solid $secondary-border-color;
+                        background: $tertiary-background;
+                    }
+                }
+                input[type="checkbox"] {
+                    margin-left: 8px;
+                    margin-top: 0;
+                    height: 100%;
+                }
+            }
+        }
+        >div:nth-child(1) {
+            border: none;
+            padding: 2px;
+            .red-ui-editableList-item-handle {
+                position:relative;
+                top: 0px;
+                color: $tertiary-text-color;
+            }
+        }
+        >div:nth-child(2) {
+            margin: 4px;
+            height: 32px;
+            border: 1px dashed $secondary-border-color;
+            text-align: center;
+            a {
+                display: block;
+                width: 100%;
+                height: 100%;
+                line-height: 32px;
+                &:hover {
+                    background: $secondary-background-hover;
+                }
+                i {
+                    height: 100%;
+                    vertical-align: middle;
+                }
+            }
+        }
+        >div:nth-child(3) {
+            position: relative;
+            input {
+                width: 100%;
+            }
+        }
+    }
+}
+
+span.red-ui-editor-subflow-env-lang-icon {
+    position: absolute;
+    display: inline-block;
+    background: $secondary-background;
+    opacity: 0.8;
+    width: 20px;
+    line-height: 32px;
+    height: 32px;
+    text-align: center;
+    top: 4px;
+    right: 4px;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+
+}
+// .red-ui-editor-subflow-ui-grid {
+//     width: 100%;
+//     .red-ui-editableList-container {
+//         border: none;
+//         border-radius: 0;
+//     }
+//     .red-ui-editableList-container li {
+//         border: none;
+//         padding: 0;
+//         &:not(:first-child) .red-ui-editableList-item-content >div:first-child >div {
+//             border-top: none;
+//         }
+//         &.ui-sortable-helper {
+//             border: 2px dashed $secondary-border-color;
+//             .red-ui-editableList-item-content {
+//                 >div {
+//                     border: none;
+//                     opacity: 0.7
+//                 }
+//
+//             }
+//         }
+//     }
+//
+//     .red-ui-editableList-item-content {
+//         >div>div {
+//             display: inline-block;
+//             box-sizing: border-box;
+//             border-left: 1px dashed $secondary-border-color;
+//             border-bottom: 1px dashed $secondary-border-color;
+//         }
+//         >div:first-child {
+//             font-size: 0.9em;
+//             display: grid;
+//             grid-template-columns: 25px auto 20px;
+//             >div {
+//                 border-top: 1px dashed $secondary-border-color;
+//                 padding: 1px;
+//             }
+//             >div:nth-child(3) {
+//                 border-top: none;
+//                 border-bottom: none;
+//                 // width: 20px;
+//             }
+//         }
+//         >div:last-child {
+//             display: grid;
+//             grid-template-columns: 25px 140px auto 20px;
+//             >div {
+//                 height: 48px;
+//                 line-height: 30px;
+//                 // display: inline-block;
+//                 // height: 48px;
+//                 // line-height: 30px;
+//                 // box-sizing: border-box;
+//                 //
+//                 // border-left: 2px dashed $secondary-border-color;
+//                 border-top: none;
+//                 // border-bottom: 2px dashed $secondary-border-color;
+//                 &:not(:first-child) {
+//                     padding: 6px 3px;
+//                 }
+//                 .placeholder-input {
+//                     position: relative;
+//                     padding: 0 3px;
+//                     line-height: 24px;
+//                     opacity: 0.8
+//                 }
+//                 .red-ui-typedInput-value-label,.red-ui-typedInput-option-label {
+//                     select,.placeholder-input  {
+//                         margin: 3px;
+//                         height: 26px;
+//                         width: calc(100% - 10px);
+//                         padding-left: 3px;
+//                     }
+//                     input[type="checkbox"] {
+//                         margin-left: 8px;
+//                         margin-top: 0;
+//                         height: 100%;
+//                     }
+//                 }
+//             }
+//             >div:nth-child(1) {
+//                 text-align: center;
+//                 a {
+//                     display: block;
+//                     width: 100%;
+//                     height: 100%;
+//                     line-height: 45px;
+//                     &:hover {
+//                         background: $secondary-background-hover;
+//                     }
+//                 }
+//             }
+//             >div:nth-child(2) {
+//                 input {
+//                     width: 100%;
+//                 }
+//                 // width: 140px;
+//             }
+//             >div:nth-child(3) {
+//                 position: relative;
+//                 .options-button {
+//                     position: absolute;
+//                     top: calc(50% - 10px);
+//                     margin-right: 2px;
+//                     right: 2px;
+//                 }
+//             }
+//             >div:nth-child(4) {
+//                 border-top: none;
+//                 border-bottom: none;
+//                 // width: 20px;
+//             }
+//
+//         }
+//     }
+// }
+.red-ui-editor-subflow-ui-edit-panel {
+    padding-bottom: 3px;
+    background: $primary-background;
+    .red-ui-editableList-border {
+        border: none;
+        border-radius: 0;
+        border-bottom: 1px solid $secondary-border-color;
+    }
+    .red-ui-editableList-container {
+    }
+    .red-ui-editableList-addButton {
+        margin-left: 2px;
+    }
+    .red-ui-editableList-header {
+        background: $primary-background;
+        display: grid;
+        grid-template-columns: 50% 50%;
+        color: $secondary-text-color;
+        div:first-child {
+            padding-left: 23px;
+        }
+        div:last-child {
+            padding-left: 3px;
+        }
+    }
+    .red-ui-editableList-container {
+        padding: 0 1px;
+        li {
+            background: $secondary-background;
+            // border-bottom: none;
+            padding: 0;
+            .red-ui-editableList-item-content {
+                display: grid;
+                grid-template-columns: 50% 50%;
+                >div {
+                    position:relative;
+
+                }
+            }
+            input {
+                margin-bottom: 0;
+                border:none;
+                width: 100%;
+                border-right: 1px solid $secondary-border-color;
+
+                border-radius: 0;
+                &:focus {
+                    box-shadow: 0 0 0 1px inset $form-input-focus-color;
+                }
+                &:first-child {
+                    border-left: 1px solid $secondary-border-color;
+                }
+            }
+            button.red-ui-typedInput-type-select, button.red-ui-typedInput-option-expand, button.red-ui-typedInput-option-trigger {
+                border-radius: 0;
+                height: 34px;
+            }
+            .red-ui-typedInput-container {
+                border-radius: 0;
+                border: none;
+                input.red-ui-typedInput-input  {
+                    height: 34px;
+                    border-right: none;
+                }
+            }
+
+            .red-ui-editor-subflow-env-lang-icon {
+                top: 1px;
+                right: 1px;
+                border-top-right-radius:0;
+                border-bottom-right-radius:0;
+            }
+            .red-ui-editableList-item-remove {
+                right: 3px;
+            }
+        }
+    }
+}
+
+.node-input-env-locales-row {
+    position: relative;
+    top: -20px;
+    float: right;
+    select {
+        width: 160px;
+        height: 20px;
+        min-width: 20px;
+        line-height: 18px;
+        font-size: 10px;
+    }
+}
+.node-input-env-container-row {
+    min-width: 470px;
+    position: relative;
+    .red-ui-editableList-item-content {
+        label {
+            margin-bottom: 0;
+            line-height: 32px;
+            span {
+                display: inline-block;
+                width: 20px;
+                text-align: center;
+            }
+        }
+        >div:first-child {
+            display: grid;
+            padding-left: 5px;
+            grid-template-columns: 40% auto 37px;
+            > :first-child {
+                width: calc(100% - 5px);
+            }
+            input {
+                width: calc(100% - 5px);
+            }
+        }
+        &.red-ui-editor-subflow-env-editable {
+            >div:first-child {
+                padding-left: 0;
+                grid-template-columns: 24px 40% auto 37px;
+                > a:first-child {
+                    text-align: center;
+                    line-height: 32px;
+                    i.fa-angle-right {
+                        transition: all 0.2s linear;
+                    }
+                    &.expanded {
+                        i.fa-angle-right {
+                            transform: rotate(90deg);
+                        }
+                    }
+                }
+
+            }
+        }
+    }
+    .red-ui-editableList-border .red-ui-editableList-header {
+        border-top-left-radius: 4px;
+        border-top-right-radius: 4px;
+
+        background: $tertiary-background;
+        padding: 0;
+        >div {
+            display: grid;
+            grid-template-columns: 24px 40% auto 37px;
+            >div {
+                display: inline-block;
+            }
+        }
+    }
+    .red-ui-editableList-container {
+        padding: 0;
+        .red-ui-editableList-item-handle {
+            top: 25px;
+        }
+        .red-ui-editableList-item-remove {
+            top: 25px;
+            right: 5px;
+        }
+    }
+}
+#subflow-input-ui {
+    // .form-row {
+    //     display: grid;
+    //     grid-template-columns: 120px auto;
+    //     label span {
+    //         display: inline-block;
+    //         width: 20px;
+    //         text-align: center;
+    //     }
+    // }
+}

packages/node_modules/@node-red/editor-client/src/sass/forms.scss

@@ -150,7 +150,8 @@
     input[type="tel"],
     input[type="color"],
     div[contenteditable="true"],
-    .uneditable-input {
+    .uneditable-input,
+    .placeholder-input {
         box-sizing: border-box;
         display: inline-block;
         height: 34px;
@@ -190,7 +191,8 @@
     input[type="tel"],
     input[type="color"],
     div[contenteditable="true"],
-    .uneditable-input {
+    .uneditable-input,
+    .placeholder-input {
         background-color: $form-input-background;
         border: 1px solid $form-input-border-color;
     }

packages/node_modules/@node-red/editor-client/src/sass/header.scss

@@ -192,6 +192,7 @@
             color: $header-menu-color;
             padding: 3px 40px;
             img {
+                max-width: 100%;
                 margin-right: 10px;
                 padding: 4px;
                 border: 3px solid transparent;

packages/node_modules/@node-red/editor-client/src/sass/popover.scss

@@ -162,3 +162,15 @@
     background: none;
     color: $tertiary-text-color;
 }
+
+
+.red-ui-popover-panel {
+    @include component-shadow;
+    font-family: $primary-font;
+    font-size: $primary-font-size;
+    position: absolute;
+    box-sizing: border-box;
+    border: 1px solid $primary-border-color;
+    background: $secondary-background;
+    z-index: 2000;
+}

packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss

@@ -58,115 +58,6 @@
         text-overflow: ellipsis;
 
     }
-    button.red-ui-typedInput-type-select,
-    button.red-ui-typedInput-option-expand,
-    button.red-ui-typedInput-option-trigger
-     {
-        text-align: left;
-        border: none;
-        position: absolute;
-        box-sizing: border-box;
-        border-top-left-radius: 4px;
-        border-bottom-left-radius: 4px;
-        padding: 0 1px 0 5px;
-        display:inline-block;
-        background: $form-button-background;
-        height: 32px;
-        line-height: 32px;
-        vertical-align: middle;
-        color: $form-text-color;
-        i.red-ui-typedInput-icon {
-            margin-left: 1px;
-            margin-right: 2px;
-            vertical-align: middle;
-        }
-        &.disabled {
-            cursor: default;
-            i.red-ui-typedInput-icon {
-                color: $secondary-text-color-disabled;
-            }
-        }
-        .red-ui-typedInput-type-label,.red-ui-typedInput-option-label {
-            display: inline-block;
-            height: 100%;
-            padding: 0 1px 0 5px;
-        }
-
-        &:not(.disabled):hover {
-            text-decoration: none;
-            background: $workspace-button-background-hover;
-        }
-        &:focus {
-            text-decoration: none;
-            outline: none;
-            box-shadow: inset 0 0 0 1px $form-input-focus-color;
-        }
-        &:not(.disabled):active {
-            background: $workspace-button-background-active;
-            text-decoration: none;
-        }
-        &.red-ui-typedInput-full-width {
-            width: 100%;
-            border-top-right-radius: 4px;
-            border-bottom-right-radius: 4px;
-        }
-        &:before {
-            content:'';
-            display: inline-block;
-            height: 100%;
-            vertical-align: middle;
-        }
-    }
-
-    button.red-ui-typedInput-option-expand {
-        border-top-right-radius: 4px;
-        border-bottom-right-radius: 4px;
-        border-top-left-radius: 0;
-        border-bottom-left-radius: 0;
-        right: 0;
-    }
-
-    button.red-ui-typedInput-option-trigger {
-        border-top-left-radius: 0px;
-        border-bottom-left-radius: 0px;
-        border-top-right-radius: 4px;
-        border-bottom-right-radius: 4px;
-        padding: 0 0 0 0;
-        position:absolute;
-        right: 0;
-        .red-ui-typedInput-option-label {
-            background:$form-button-background;
-            color: $form-text-color;
-            position:absolute;
-            left:0;
-            right:23px;
-            top: 0;
-            padding: 0 5px 0 8px;
-            i.red-ui-typedInput-icon {
-                margin-right: 4px;
-            }
-        }
-        .red-ui-typedInput-option-caret {
-            top: 0;
-            position: absolute;
-            right: 0;
-            bottom: 0;
-            width: 17px;
-            padding-left: 6px;
-            &:before {
-                content:'';
-                display: inline-block;
-                height: 100%;
-                vertical-align: middle;
-            }
-        }
-        &:focus {
-            box-shadow: none;
-        }
-        &:focus .red-ui-typedInput-option-caret {
-            box-shadow: inset 0 0 0 1px $form-input-focus-color;
-        }
-    }
 }
 .red-ui-typedInput-options {
     @include component-shadow;
@@ -177,6 +68,7 @@
     max-height: 350px;
     overflow-y: auto;
     border: 1px solid $primary-border-color;
+    box-sizing: border-box;
     background: $secondary-background;
     z-index: 2000;
     a {
@@ -197,8 +89,124 @@
             text-decoration: none;
             background: $workspace-button-background-active;
         }
+        input[type="checkbox"] {
+            margin-right: 6px;
+        }
     }
     .red-ui-typedInput-icon {
-        margin-right: 4px;
+        margin-right: 6px;
+    }
+}
+button.red-ui-typedInput-type-select,
+button.red-ui-typedInput-option-expand,
+button.red-ui-typedInput-option-trigger
+ {
+    text-align: left;
+    border: none;
+    position: absolute;
+    box-sizing: border-box;
+    border-top-left-radius: 4px;
+    border-bottom-left-radius: 4px;
+    padding: 0 1px 0 5px;
+    display:inline-block;
+    background: $form-button-background;
+    height: 32px;
+    line-height: 30px;
+    min-width: 23px;
+    vertical-align: middle;
+    color: $form-text-color;
+    i.red-ui-typedInput-icon {
+        margin-left: 1px;
+        margin-right: 2px;
+        vertical-align: middle;
+    }
+    &.disabled {
+        cursor: default;
+        i.red-ui-typedInput-icon {
+            color: $secondary-text-color-disabled;
+        }
+    }
+    .red-ui-typedInput-type-label,.red-ui-typedInput-option-label {
+        display: inline-block;
+        vertical-align: middle;
+        height: 100%;
+        padding: 0 1px 0 5px;
+        img {
+            max-width: none;
+        }
+    }
+
+    &:not(.disabled):hover {
+        text-decoration: none;
+        background: $workspace-button-background-hover;
+    }
+    &:focus {
+        text-decoration: none;
+        outline: none;
+        box-shadow: inset 0 0 0 1px $form-input-focus-color;
+    }
+    &:not(.disabled):active {
+        background: $workspace-button-background-active;
+        text-decoration: none;
+    }
+    &.red-ui-typedInput-full-width {
+        width: 100%;
+        border-top-right-radius: 4px;
+        border-bottom-right-radius: 4px;
+    }
+    &:before {
+        content:'';
+        display: inline-block;
+        height: 100%;
+        vertical-align: middle;
+    }
+}
+button.red-ui-typedInput-option-expand {
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    right: 0;
+}
+
+button.red-ui-typedInput-option-trigger {
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+    padding: 0 0 0 0;
+    position:absolute;
+    right: 0;
+    .red-ui-typedInput-option-label {
+        background:$form-button-background;
+        color: $form-text-color;
+        position:absolute;
+        left:0;
+        right:23px;
+        top: 0;
+        padding: 0 5px 0 8px;
+        i.red-ui-typedInput-icon {
+            margin-right: 4px;
+        }
+    }
+    .red-ui-typedInput-option-caret {
+        top: 0;
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        width: 17px;
+        padding-left: 5px;
+        &:before {
+            content:'';
+            display: inline-block;
+            height: 100%;
+            vertical-align: middle;
+        }
+    }
+    &:focus {
+        box-shadow: none;
+    }
+    &:focus .red-ui-typedInput-option-caret {
+        box-shadow: inset 0 0 0 1px $form-input-focus-color;
     }
 }

packages/node_modules/@node-red/nodes/core/core/20-inject.html

@@ -168,7 +168,7 @@
             once: {value:false},
             onceDelay: {value:0.1}
         },
-        icon: "inject.png",
+        icon: "inject.svg",
         inputs:0,
         outputs:1,
         outputLabels: function(index) {

packages/node_modules/@node-red/nodes/core/core/25-catch.html

@@ -34,7 +34,7 @@
         },
         inputs:0,
         outputs:1,
-        icon: "alert.png",
+        icon: "alert.svg",
         label: function() {
             if (this.name) {
                 return this.name;

packages/node_modules/@node-red/nodes/core/core/25-status.html

@@ -22,14 +22,14 @@
 <script type="text/javascript">
     RED.nodes.registerType('status',{
         category: 'input',
-        color:"#c0edc0",
+        color:"#d9f4fd",
         defaults: {
             name: {value:""},
             scope: {value:null}
         },
         inputs:0,
         outputs:1,
-        icon: "alert.png",
+        icon: "alert.svg",
         label: function() {
             return this.name||(this.scope?this._("status.statusNodes",{number:this.scope.length}):this._("status.status"));
         },

packages/node_modules/@node-red/nodes/core/core/58-debug.html

@@ -65,7 +65,7 @@
         color:"#87a980",
         inputs:1,
         outputs:0,
-        icon: "debug.png",
+        icon: "debug.svg",
         align: "right",
         button: {
             toggle: "active",

packages/node_modules/@node-red/nodes/core/core/60-link.html

@@ -170,7 +170,7 @@
         },
         inputs:0,
         outputs:1,
-        icon: "link-out.png",
+        icon: "link-out.svg",
         outputLabels: function(i) {
             return this.name||this._("link.linkIn");
         },
@@ -200,7 +200,7 @@
         align:"right",
         inputs:1,
         outputs:0,
-        icon: "link-out.png",
+        icon: "link-out.svg",
         inputLabels: function(i) {
             return this.name||this._("link.linkOut");
         },

packages/node_modules/@node-red/nodes/core/core/75-exec.html

@@ -73,7 +73,7 @@
                 this._("exec.label.retcode")
             ][i];
         },
-        icon: "arrow-in.png",
+        icon: "arrow-in.svg",
         align: "right",
         label: function() {
             return this.name||this.command||(this.useSpawn=="true"?this._("exec.spawn"):this._("exec.exec"));

packages/node_modules/@node-red/nodes/core/core/80-function.html

@@ -31,7 +31,7 @@
         },
         inputs:1,
         outputs:1,
-        icon: "function.png",
+        icon: "function.svg",
         label: function() {
             return this.name||this._("function.function");
         },

packages/node_modules/@node-red/nodes/core/core/80-template.html

@@ -63,7 +63,7 @@
         },
         inputs:1,
         outputs:1,
-        icon: "template.png",
+        icon: "template.svg",
         label: function() {
             return this.name||this._("template.template");;
         },

packages/node_modules/@node-red/nodes/core/core/89-delay.html

@@ -114,7 +114,7 @@
         },
         inputs:1,
         outputs:1,
-        icon: "timer.png",
+        icon: "timer.svg",
         label: function() {
             if (this.name) {
                 return this.name;

packages/node_modules/@node-red/nodes/core/core/89-trigger.html

@@ -87,7 +87,7 @@
         },
         inputs:1,
         outputs:1,
-        icon: "trigger.png",
+        icon: "trigger.svg",
         label: function() {
             if (this.duration > 0) {
                 return this.name|| this._("trigger.label.trigger")+" "+this.duration+this.units;

packages/node_modules/@node-red/nodes/core/core/90-comment.html

@@ -20,7 +20,7 @@
         },
         inputs:0,
         outputs:0,
-        icon: "comment.png",
+        icon: "comment.svg",
         label: function() {
             return this.name||this._("comment.comment");
         },

packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js

@@ -42,14 +42,14 @@ RED.debug = (function() {
         var content = $("<div>").css({"position":"relative","height":"100%"});
         var toolbar = $('<div class="red-ui-sidebar-header">'+
             '<span class="button-group"><a id="red-ui-sidebar-debug-filter" class="red-ui-sidebar-header-button" href="#"><i class="fa fa-filter"></i> <span></span></a></span>'+
-            '<span class="button-group"><a id="red-ui-sidebar-debug-clear" class="red-ui-sidebar-header-button" href="#" data-i18n="[title]node-red:debug.sidebar.clearLog"><i class="fa fa-trash"></i></a></span></div>').appendTo(content);
+            '<span class="button-group"><a id="red-ui-sidebar-debug-clear" class="red-ui-sidebar-header-button" href="#"><i class="fa fa-trash"></i></a></span></div>').appendTo(content);
 
         var footerToolbar = $('<div>'+
             // '<span class="button-group">'+
             //     '<a class="red-ui-footer-button-toggle text-button selected" id="red-ui-sidebar-debug-view-list" href="#"><span data-i18n="">list</span></a>'+
             //     '<a class="red-ui-footer-button-toggle text-button" id="red-ui-sidebar-debug-view-table" href="#"><span data-i18n="">table</span></a> '+
             // '</span>'+
-            '<span class="button-group"><a id="red-ui-sidebar-debug-open" class="red-ui-footer-button" href="#" data-i18n="[title]node-red:debug.sidebar.openWindow"><i class="fa fa-desktop"></i></a></span> ' +
+            '<span class="button-group"><a id="red-ui-sidebar-debug-open" class="red-ui-footer-button" href="#"><i class="fa fa-desktop"></i></a></span> ' +
             '</div>');
 
         messageList = $('<div class="red-ui-debug-content red-ui-debug-content-list"/>').appendTo(content);

packages/node_modules/@node-red/nodes/core/hardware/36-rpi-gpio.html

@@ -1,544 +0,0 @@
-<style>
-    .rpi-gpio-pinTable {
-        width: 340px;
-        display: inline-table;
-        font-size: 13px;
-        height: 380px;
-        min-height: 380px;
-        max-height: 380px;
-    }
-    .rpi-gpio-pinTable input[type="radio"] {
-        width: auto;
-        margin: 2px 2px;
-    }
-    .rpi-gpio-pinTable label {
-        width: auto;
-        margin: 0;
-        display: block;
-    }
-    .rpi-gpio-pinTable .pinTableBody {
-        width: 340px;
-        display: table-row-group;
-        line-height: 12px;
-    }
-    .rpi-gpio-pinTable .pinTableRow {
-        width: 340px;
-        display: table-row;
-        height: 14px;
-    }
-    .rpi-gpio-pinTable .pinTableCellL {
-        width: 170px;
-        display: table-cell;
-        text-align: right;
-        padding-right: 4px;
-        vertical-align: top;
-        border: 1px solid #444;
-    }
-    .rpi-gpio-pinTable .pinTableCellR {
-        width: 170px;
-        display: table-cell;
-        text-align: left;
-        padding-left: 4px;
-        vertical-align: top;
-        border: 1px solid #000;
-    }
-    .rpi-gpio-pinTable .pinColorPower {
-        background-color:#FECBCE;
-    }
-    .rpi-gpio-pinTable .pinColorGround {
-        background-color:#DDDDDD;
-    }
-    .rpi-gpio-pinTable .pinColorGPIO {
-        background-color:#BFEBBF;
-    }
-    .rpi-gpio-pinTable .pinColorDual {
-        background-color:#D0E6F4;
-    }
-    .rpi-gpio-pinTable .pinColorSD {
-        background-color:#FFFDD0;
-    }
-</style>
-<script type="text/x-red" data-template-name="rpi-gpio in">
-
-    <div class="form-row" style="min-width: 540px">
-        <label><i class="fa fa-circle"></i> <span data-i18n="rpi-gpio.pinname"></span></label>
-        <input type="text" id="node-input-pin" style="display:none;">
-        <div class="rpi-gpio-pinTable">
-            <div class="pinTableBody" id="pinform">
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorPower"><label>3.3V Power - 1 <input disabled type="radio" name="pins" value=""></label></div>
-                    <div class="pinTableCellR pinColorPower"><label><input disabled type="radio" name="pins" value=""> 2 - 5V Power</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorDual"><label for="pinTable-pin-3">SDA1 - GPIO02 - 3 <input id="pinTable-pin-3" type="radio" name="pins" value="3"></label></div>
-                    <div class="pinTableCellR pinColorPower"><label><input disabled type="radio" name="pins" value=""> 4 - 5V Power</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorDual"><label for="pinTable-pin-5">SCL1 - GPIO03 - 5 <input id="pinTable-pin-5" type="radio" name="pins" value="5"></label></div>
-                    <div class="pinTableCellR pinColorGround"><label><input disabled type="radio" name="pins" value=""> 6 - Ground</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGPIO"><label for="pinTable-pin-7">GPIO04 - 7 <input id="pinTable-pin-7" type="radio" name="pins" value="7"></label></div>
-                    <div class="pinTableCellR pinColorDual"><label for="pinTable-pin-8"><input id="pinTable-pin-8" type="radio" name="pins" value="8"> 8 - GPIO14 - TxD</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGround"><label>Ground - 9 <input disabled type="radio" name="pins" value=""></label></div>
-                    <div class="pinTableCellR pinColorDual"><label for="pinTable-pin-10"><input id="pinTable-pin-10" type="radio" name="pins" value="10"> 10 - GPIO15 - RxD</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGPIO"><label for="pinTable-pin-11">GPIO17 - 11 <input id="pinTable-pin-11" type="radio" name="pins" value="11"></label></div>
-                    <div class="pinTableCellR pinColorGPIO"><label for="pinTable-pin-12"><input id="pinTable-pin-12" type="radio" name="pins" value="12"> 12 - GPIO18</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGPIO"><label for="pinTable-pin-13">GPIO27 - 13 <input id="pinTable-pin-13" type="radio" name="pins" value="13"></label></div>
-                    <div class="pinTableCellR pinColorGround"><label><input disabled type="radio" name="pins" value=""> 14 - Ground</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGPIO"><label for="pinTable-pin-15">GPIO22 - 15 <input id="pinTable-pin-15" type="radio" name="pins" value="15"></label></div>
-                    <div class="pinTableCellR pinColorGPIO"><label for="pinTable-pin-16"><input id="pinTable-pin-16" type="radio" name="pins" value="16"> 16 - GPIO23</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorPower"><label>3.3V Power - 17 <input disabled type="radio" name="pins" value=""></label></div>
-                    <div class="pinTableCellR pinColorGPIO"><label for="pinTable-pin-18"><input id="pinTable-pin-18" type="radio" name="pins" value="18"> 18 - GPIO24</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorDual"><label for="pinTable-pin-19">MOSI - GPIO10 - 19 <input id="pinTable-pin-19" type="radio" name="pins" value="19"></label></div>
-                    <div class="pinTableCellR pinColorGround"><label><input disabled type="radio" name="pins" value=""> 20 - Ground</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorDual"><label for="pinTable-pin-21">MISO - GPIO09 - 21 <input id="pinTable-pin-21" type="radio" name="pins" value="21"></label></div>
-                    <div class="pinTableCellR pinColorGPIO"><label for="pinTable-pin-22"><input id="pinTable-pin-22" type="radio" name="pins" value="22"> 22 - GPIO25</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorDual"><label for="pinTable-pin-23">SCLK - GPIO11 - 23 <input id="pinTable-pin-23" type="radio" name="pins" value="23"></label></div>
-                    <div class="pinTableCellR pinColorDual"><label for="pinTable-pin-24"><input id="pinTable-pin-24" type="radio" name="pins" value="24"> 24 - GPIO8 - CE0</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGround"><label>Ground - 25 <input disabled type="radio" name="pins" value=""></label></div>
-                    <div class="pinTableCellR pinColorDual"><label for="pinTable-pin-26"><input id="pinTable-pin-26" type="radio" name="pins" value="26"> 26 - GPIO7 - CE1</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorSD"><label>SD - 27 <input disabled type="radio" name="pins" value=""></label></div>
-                    <div class="pinTableCellR pinColorSD"><label><input disabled type="radio" name="pins" value=""> 28 - SC</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGPIO"><label for="pinTable-pin-29">GPIO05 - 29 <input id="pinTable-pin-29" type="radio" name="pins" value="29"></label></div>
-                    <div class="pinTableCellR pinColorGround"><label><input disabled type="radio" name="pins" value=""> 30 - Ground</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGPIO"><label for="pinTable-pin-31">GPIO06 - 31 <input id="pinTable-pin-31" type="radio" name="pins" value="31"></label></div>
-                    <div class="pinTableCellR pinColorGPIO"><label for="pinTable-pin-32"><input id="pinTable-pin-32" type="radio" name="pins" value="32"> 32 - GPIO12</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGPIO"><label for="pinTable-pin-33">GPIO13 - 33 <input id="pinTable-pin-33" type="radio" name="pins" value="33"></label></div>
-                    <div class="pinTableCellR pinColorGround"><label><input disabled type="radio" name="pins" value=""> 34 - Ground</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGPIO"><label for="pinTable-pin-35">GPIO19 - 35 <input id="pinTable-pin-35" type="radio" name="pins" value="35"></label></div>
-                    <div class="pinTableCellR pinColorGPIO"><label for="pinTable-pin-36"><input id="pinTable-pin-36" type="radio" name="pins" value="36"> 36 - GPIO16</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGPIO"><label for="pinTable-pin-37">GPIO26 - 37 <input id="pinTable-pin-37" type="radio" name="pins" value="37"></label></div>
-                    <div class="pinTableCellR pinColorGPIO"><label for="pinTable-pin-38"><input id="pinTable-pin-38" type="radio" name="pins" value="38"> 38 - GPIO20</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGround"><label>Ground - 39 <input disabled type="radio" name="pins" value=""></label></div>
-                    <div class="pinTableCellR pinColorGPIO"><label for="pinTable-pin-40"><input id="pinTable-pin-40" type="radio" name="pins" value="40"> 40 - GPIO21</label></div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="form-row">
-        <label for="node-input-intype"><i class="fa fa-level-up"></i> <span data-i18n="rpi-gpio.label.resistor"></span></label>
-        <select type="text" id="node-input-intype" style="width:100px;">
-        <option value="tri" data-i18n="rpi-gpio.resistor.none"></option>
-        <option value="up" data-i18n="rpi-gpio.resistor.pullup"></option>
-        <option value="down" data-i18n="rpi-gpio.resistor.pulldown"></option>
-        </select>
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span data-i18n="rpi-gpio.label.debounce"></span>
-        <input type="text" id="node-input-debounce" style="width:47px; text-align:right"/>&nbsp;mS
-    </div>
-    <div class="form-row">
-        <label>&nbsp;</label>
-        <input type="checkbox" id="node-input-read" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-read" style="width:70%;"><span data-i18n="rpi-gpio.label.readinitial"></span></label>
-    </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
-    </div>
-    <div class="form-tips" id="pin-tip"><span data-i18n="[html]rpi-gpio.tip.pin"></span></div>
-    <div class="form-tips"><span data-i18n="[html]rpi-gpio.tip.in"></span></div>
-</script>
-
-<script type="text/javascript">
-    var bcm2pin = {
-        "2":"3", "3":"5", "4":"7", "14":"8", "15":"10", "17":"11", "18":"12", "27":"13", "22":"15",
-        "23":"16", "24":"18", "10":"19", "9":"21", "25":"22", "11":"23", "8":"24", "7":"26",
-        "5":"29", "6":"31", "12":"32", "13":"33", "19":"35", "16":"36", "26":"37", "20":"38", "21":"40"
-    };
-    var pinsInUse = {};
-    RED.nodes.registerType('rpi-gpio in',{
-        category: 'Raspberry Pi',
-        color:"#c6dbef",
-        defaults: {
-            name: { value:"" },
-            pin: { value:"tri",required:true,validate:RED.validators.number() },
-            intype: { value:"tri" },
-            debounce: { value:"25" },
-            read: { value:false }
-        },
-        inputs:0,
-        outputs:1,
-        icon: "rpi.png",
-        info: function() {
-            if ( Object.keys(pinsInUse).length !== 0 ) {
-                return "**Pins in use** : "+Object.keys(pinsInUse);
-            }
-            else { return ""; }
-        },
-        label: function() {
-            var suf = "";
-            if (this.intype === "up") { suf = "↑ "}
-            if (this.intype === "down") { suf = "↓ "}
-            return this.name || "PIN: "+suf+this.pin ;
-        },
-        labelStyle: function() {
-            return this.name?"node_label_italic":"";
-        },
-        outputLabels: function() { return "GPIO"+this.pin; },
-        oneditprepare: function() {
-            var pinnow = this.pin;
-            var pintip = this._("rpi-gpio.tip.pin");
-            var pinname = this._("rpi-gpio.pinname");
-            var alreadyuse = this._("rpi-gpio.alreadyuse");
-            var alreadyset = this._("rpi-gpio.alreadyset");
-
-            $.getJSON('rpi-pins/'+this.id,function(data) {
-                pinsInUse = data || {};
-                $('#pin-tip').html(pintip + Object.keys(data));
-            });
-            $("#node-input-pin").on("change", function() {
-                if ($("#node-input-pin").val()) {
-                    $("#pinform input[value="+$("#node-input-pin").val()+"]").prop('checked', true);
-                }
-                var pinnew = $("#node-input-pin").val();
-                if ((pinnew) && (pinnew !== pinnow)) {
-                    if (pinsInUse.hasOwnProperty(pinnew)) {
-                        RED.notify(pinname+" "+pinnew+" "+alreadyuse,"warn");
-                    }
-                    pinnow = pinnew;
-                }
-            });
-            $("#node-input-intype").on("change", function() {
-                var newtype = $("#node-input-intype").val();
-                if ((pinsInUse.hasOwnProperty(pinnow)) && (pinsInUse[pinnow] !== newtype)) {
-                    RED.notify(pinname+" "+pinnow+" "+alreadyset+" "+pinsInUse[pinnow],"error");
-                }
-            });
-            $('#pinform input').on('change', function() {
-                this.pin = $("#pinform input[type='radio']:checked").val();
-                $("#node-input-pin").val(this.pin);
-            });
-        }
-    });
-</script>
-
-<script type="text/x-red" data-template-name="rpi-gpio out">
-    <div class="form-row" style="min-width: 540px">
-        <label><i class="fa fa-circle"></i> <span data-i18n="rpi-gpio.pinname"></span></label>
-        <input type="text" id="node-input-pin" style="display:none;">
-        <div class="rpi-gpio-pinTable">
-            <div class="pinTableBody" id="pinform">
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorPower"><label>3.3V Power - 1 <input disabled type="radio" name="pins" value=""></label></div>
-                    <div class="pinTableCellR pinColorPower"><label><input disabled type="radio" name="pins" value=""> 2 - 5V Power</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorDual"><label for="pinTable-pin-3">SDA1 - GPIO02 - 3 <input id="pinTable-pin-3" type="radio" name="pins" value="3"></label></div>
-                    <div class="pinTableCellR pinColorPower"><label><input disabled type="radio" name="pins" value=""> 4 - 5V Power</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorDual"><label for="pinTable-pin-5">SCL1 - GPIO03 - 5 <input id="pinTable-pin-5" type="radio" name="pins" value="5"></label></div>
-                    <div class="pinTableCellR pinColorGround"><label><input disabled type="radio" name="pins" value=""> 6 - Ground</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGPIO"><label for="pinTable-pin-7">GPIO04 - 7 <input id="pinTable-pin-7" type="radio" name="pins" value="7"></label></div>
-                    <div class="pinTableCellR pinColorDual"><label for="pinTable-pin-8"><input id="pinTable-pin-8" type="radio" name="pins" value="8"> 8 - GPIO14 - TxD</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGround"><label>Ground - 9 <input disabled type="radio" name="pins" value=""></label></div>
-                    <div class="pinTableCellR pinColorDual"><label for="pinTable-pin-10"><input id="pinTable-pin-10" type="radio" name="pins" value="10"> 10 - GPIO15 - RxD</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGPIO"><label for="pinTable-pin-11">GPIO17 - 11 <input id="pinTable-pin-11" type="radio" name="pins" value="11"></label></div>
-                    <div class="pinTableCellR pinColorGPIO"><label for="pinTable-pin-12"><input id="pinTable-pin-12" type="radio" name="pins" value="12"> 12 - GPIO18</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGPIO"><label for="pinTable-pin-13">GPIO27 - 13 <input id="pinTable-pin-13" type="radio" name="pins" value="13"></label></div>
-                    <div class="pinTableCellR pinColorGround"><label><input disabled type="radio" name="pins" value=""> 14 - Ground</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGPIO"><label for="pinTable-pin-15">GPIO22 - 15 <input id="pinTable-pin-15" type="radio" name="pins" value="15"></label></div>
-                    <div class="pinTableCellR pinColorGPIO"><label for="pinTable-pin-16"><input id="pinTable-pin-16" type="radio" name="pins" value="16"> 16 - GPIO23</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorPower"><label>3.3V Power - 17 <input disabled type="radio" name="pins" value=""></label></div>
-                    <div class="pinTableCellR pinColorGPIO"><label for="pinTable-pin-18"><input id="pinTable-pin-18" type="radio" name="pins" value="18"> 18 - GPIO24</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorDual"><label for="pinTable-pin-19">MOSI - GPIO10 - 19 <input id="pinTable-pin-19" type="radio" name="pins" value="19"></label></div>
-                    <div class="pinTableCellR pinColorGround"><label><input disabled type="radio" name="pins" value=""> 20 - Ground</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorDual"><label for="pinTable-pin-21">MISO - GPIO09 - 21 <input id="pinTable-pin-21" type="radio" name="pins" value="21"></label></div>
-                    <div class="pinTableCellR pinColorGPIO"><label for="pinTable-pin-22"><input id="pinTable-pin-22" type="radio" name="pins" value="22"> 22 - GPIO25</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorDual"><label for="pinTable-pin-23">SCLK - GPIO11 - 23 <input id="pinTable-pin-23" type="radio" name="pins" value="23"></label></div>
-                    <div class="pinTableCellR pinColorDual"><label for="pinTable-pin-24"><input id="pinTable-pin-24" type="radio" name="pins" value="24"> 24 - GPIO8 - CE0</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGround"><label>Ground - 25 <input disabled type="radio" name="pins" value=""></label></div>
-                    <div class="pinTableCellR pinColorDual"><label for="pinTable-pin-26"><input id="pinTable-pin-26" type="radio" name="pins" value="26"> 26 - GPIO7 - CE1</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorSD"><label>SD - 27 <input disabled type="radio" name="pins" value=""></label></div>
-                    <div class="pinTableCellR pinColorSD"><label><input disabled type="radio" name="pins" value=""> 28 - SC</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGPIO"><label for="pinTable-pin-29">GPIO05 - 29 <input id="pinTable-pin-29" type="radio" name="pins" value="29"></label></div>
-                    <div class="pinTableCellR pinColorGround"><label><input disabled type="radio" name="pins" value=""> 30 - Ground</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGPIO"><label for="pinTable-pin-31">GPIO06 - 31 <input id="pinTable-pin-31" type="radio" name="pins" value="31"></label></div>
-                    <div class="pinTableCellR pinColorGPIO"><label for="pinTable-pin-32"><input id="pinTable-pin-32" type="radio" name="pins" value="32"> 32 - GPIO12</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGPIO"><label for="pinTable-pin-33">GPIO13 - 33 <input id="pinTable-pin-33" type="radio" name="pins" value="33"></label></div>
-                    <div class="pinTableCellR pinColorGround"><label><input disabled type="radio" name="pins" value=""> 34 - Ground</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGPIO"><label for="pinTable-pin-35">GPIO19 - 35 <input id="pinTable-pin-35" type="radio" name="pins" value="35"></label></div>
-                    <div class="pinTableCellR pinColorGPIO"><label for="pinTable-pin-36"><input id="pinTable-pin-36" type="radio" name="pins" value="36"> 36 - GPIO16</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGPIO"><label for="pinTable-pin-37">GPIO26 - 37 <input id="pinTable-pin-37" type="radio" name="pins" value="37"></label></div>
-                    <div class="pinTableCellR pinColorGPIO"><label for="pinTable-pin-38"><input id="pinTable-pin-38" type="radio" name="pins" value="38"> 38 - GPIO20</label></div>
-                </div>
-                <div class="pinTableRow">
-                    <div class="pinTableCellL pinColorGround"><label>Ground - 39 <input disabled type="radio" name="pins" value=""></label></div>
-                    <div class="pinTableCellR pinColorGPIO"><label for="pinTable-pin-40"><input id="pinTable-pin-40" type="radio" name="pins" value="40"> 40 - GPIO21</label></div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="form-row" id="node-set-pwm">
-        <label>&nbsp;&nbsp;&nbsp;&nbsp;<span data-i18n="rpi-gpio.label.type"></span></label>
-        <select id="node-input-out" style="width: 250px;">
-            <option value="out" data-i18n="rpi-gpio.digout"></option>
-            <option value="pwm" data-i18n="rpi-gpio.pwmout"></option>
-        </select>
-    </div>
-    <div class="form-row" id="node-set-tick">
-        <label>&nbsp;</label>
-        <input type="checkbox" id="node-input-set" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-set" style="width: 70%;"><span data-i18n="rpi-gpio.label.initpin"></span></label>
-    </div>
-    <div class="form-row" id="node-set-state">
-        <label for="node-input-level">&nbsp;</label>
-        <select id="node-input-level" style="width: 250px;">
-            <option value="0" data-i18n="rpi-gpio.initpin0"></option>
-            <option value="1" data-i18n="rpi-gpio.initpin1"></option>
-        </select>
-    </div>
-    <div class="form-row" id="node-set-freq">
-        <label for="node-input-freq"> <span data-i18n="rpi-gpio.label.freq"></span></label>
-        <input type="text" id="node-input-freq" placeholder="100"> Hz
-    </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
-    </div>
-    <div class="form-tips" id="pin-tip"><span data-i18n="[html]rpi-gpio.tip.pin"></span></div>
-    <div class="form-tips" id="dig-tip"><span data-i18n="[html]rpi-gpio.tip.dig"></span></div>
-    <div class="form-tips" id="pwm-tip"><span data-i18n="[html]rpi-gpio.tip.pwm"></span></div>
-</script>
-
-<script type="text/javascript">
-    var bcm2pin = {
-        "2":"3", "3":"5", "4":"7", "14":"8", "15":"10", "17":"11", "18":"12", "27":"13", "22":"15",
-        "23":"16", "24":"18", "10":"19", "9":"21", "25":"22", "11":"23", "8":"24", "7":"26",
-        "5":"29", "6":"31", "12":"32", "13":"33", "19":"35", "16":"36", "26":"37", "20":"38", "21":"40"
-    };
-    var pinsInUse = {};
-    RED.nodes.registerType('rpi-gpio out',{
-        category: 'Raspberry Pi',
-        color:"#c6dbef",
-        defaults: {
-            name: { value:"" },
-            pin: { value:"",required:true,validate:RED.validators.number() },
-            set: { value:"" },
-            level: { value:"0" },
-            freq: {value:""},
-            out: { value:"out" }
-        },
-        inputs:1,
-        outputs:0,
-        icon: "rpi.png",
-        info: function() {
-            if ( Object.keys(pinsInUse).length !== 0 ) {
-                return "**Pins in use** : "+Object.keys(pinsInUse);
-            }
-            else { return ""; }
-        },
-        align: "right",
-        label: function() {
-            if (this.out === "pwm") { return this.name || "PWM: "+this.pin; }
-            else if (this.out === "ser") { return this.name || "Servo: "+this.pin; }
-            else {
-                var suf = "";
-                if (this.set == true) { suf = (this.level === "1") ? " ¹" : " ₀"; }
-                return this.name||"PIN: "+ this.pin + suf ;
-            }
-        },
-        labelStyle: function() {
-            return this.name?"node_label_italic":"";
-        },
-        inputLabels: function() { return "GPIO"+this.pin; },
-        oneditprepare: function() {
-            var pinnow = this.pin;
-            var pintip = this._("rpi-gpio.tip.pin");
-            var pinname = this._("rpi-gpio.pinname");
-            var alreadyuse = this._("rpi-gpio.alreadyuse");
-            var alreadyset = this._("rpi-gpio.alreadyset");
-            if (!$("#node-input-out").val()) { $("#node-input-out").val("out"); }
-
-            $.getJSON('rpi-pins/'+this.id,function(data) {
-                pinsInUse = data || {};
-                $('#pin-tip').html(pintip + Object.keys(data));
-            });
-
-            $("#node-input-pin").on("change", function() {
-                if ($("#node-input-pin").val()) {
-                    $("#pinform input[value="+$("#node-input-pin").val()+"]").prop('checked', true);
-                }
-                var pinnew = $("#node-input-pin").val();
-                if ((pinnew) && (pinnew !== pinnow)) {
-                    if (pinsInUse.hasOwnProperty(pinnew)) {
-                        RED.notify(pinname+" "+pinnew+" "+alreadyuse,"warn");
-                    }
-                    pinnow = pinnew;
-                }
-            });
-
-            $("#node-input-out").on("change", function() {
-                var newtype = $("#node-input-out").val();
-                if ((pinsInUse.hasOwnProperty(pinnow)) && (pinsInUse[pinnow] !== newtype)) {
-                    RED.notify(pinname+" "+pinnow+" "+alreadyset+" "+pinsInUse[pinnow],"error");
-                }
-            });
-
-            var hidestate = function () {
-                if ($("#node-input-out").val() === "pwm") {
-                    $('#node-set-tick').hide();
-                    $('#node-set-state').hide();
-                    $('#node-input-set').prop('checked', false);
-                    $("#dig-tip").hide();
-                    $("#pwm-tip").show();
-                    $('#node-set-freq').show();
-                }
-                else {
-                    $('#node-set-tick').show();
-                    $("#dig-tip").show();
-                    $("#pwm-tip").hide();
-                    $('#node-set-freq').hide();
-                }
-            };
-            $("#node-input-out").on("change", function () { hidestate(); });
-            hidestate();
-
-            var setstate = function () {
-                if ($('#node-input-set').is(":checked")) {
-                    $("#node-set-state").show();
-                } else {
-                    $("#node-set-state").hide();
-                }
-            };
-            $("#node-input-set").on("change", function () { setstate(); });
-            setstate();
-
-            $('#pinform input').on('change', function() {
-                this.pin = $("#pinform input[type='radio']:checked").val();
-                $("#node-input-pin").val(this.pin);
-            });
-        }
-    });
-</script>
-
-<script type="text/x-red" data-template-name="rpi-mouse">
-    <div class="form-row">
-        <label for="node-input-butt"><i class="fa fa-circle"></i> <span data-i18n="rpi-gpio.label.button"></span></label>
-        <select type="text" id="node-input-butt" style="width: 250px;">
-            <option value="1" data-i18n="rpi-gpio.left"></option>
-            <option value="2" data-i18n="rpi-gpio.right"></option>
-            <option value="4" data-i18n="rpi-gpio.middle"></option>
-            <option value="7" data-i18n="rpi-gpio.any"></option>
-         </select>
-    </div>
-    <br/>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
-    </div>
-</script>
-
-<script type="text/javascript">
-    RED.nodes.registerType('rpi-mouse',{
-        category: 'Raspberry Pi',
-        color:"#c6dbef",
-        defaults: {
-            name: { value:"" },
-            butt: { value:"1",required:true }
-        },
-        inputs:0,
-        outputs:1,
-        icon: "rpi.png",
-        label: function() {
-            var na = this._("rpi-gpio.label.pimouse");
-            if (this.butt === "1") { na += " "+this._("rpi-gpio.label.left"); }
-            if (this.butt === "2") { na += " "+this._("rpi-gpio.label.right"); }
-            if (this.butt === "4") { na += " "+this._("rpi-gpio.label.middle"); }
-            return this.name||na;
-        },
-        labelStyle: function() {
-            return this.name?"node_label_italic":"";
-        }
-    });
-</script>
-
-<script type="text/x-red" data-template-name="rpi-keyboard">
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
-    </div>
-</script>
-
-<script type="text/javascript">
-    RED.nodes.registerType('rpi-keyboard',{
-        category: 'Raspberry Pi',
-        color:"#c6dbef",
-        defaults: {
-            name: { value:"" }
-        },
-        inputs:0,
-        outputs:1,
-        icon: "rpi.png",
-        label: function() {
-            return this.name || this._("rpi-gpio.label.pikeyboard");
-        },
-        labelStyle: function() {
-            return this.name?"node_label_italic":"";
-        }
-    });
-</script>

packages/node_modules/@node-red/nodes/core/hardware/36-rpi-gpio.js

@@ -1,371 +0,0 @@
-
-module.exports = function(RED) {
-    "use strict";
-    var exec = require('child_process').exec;
-    var spawn = require('child_process').spawn;
-    var fs = require('fs');
-
-    var gpioCommand = __dirname+'/nrgpio';
-    var allOK = true;
-
-    try {
-        var cpuinfo = fs.readFileSync("/proc/cpuinfo").toString();
-        if (cpuinfo.indexOf(": BCM") === -1) {
-            allOK = false;
-            RED.log.warn("rpi-gpio : "+RED._("rpi-gpio.errors.ignorenode"));
-        }
-        try {
-            fs.statSync("/usr/share/doc/python-rpi.gpio"); // test on Raspbian
-            // /usr/lib/python2.7/dist-packages/RPi/GPIO
-        } catch(err) {
-            try {
-                fs.statSync("/usr/lib/python2.7/site-packages/RPi/GPIO"); // test on Arch
-            } catch(err) {
-                try {
-                    fs.statSync("/usr/lib/python2.7/dist-packages/RPi/GPIO"); // test on Hypriot
-                } catch(err) {
-                    try {
-                        fs.statSync("/usr/local/lib/python2.7/dist-packages/RPi/GPIO"); // installed with pip
-                    } catch(err) {
-                        RED.log.warn("rpi-gpio : "+RED._("rpi-gpio.errors.libnotfound"));
-                        allOK = false;
-                    }
-                }
-            }
-        }
-        if ( !(1 & parseInt((fs.statSync(gpioCommand).mode & parseInt("777", 8)).toString(8)[0]) )) {
-            RED.log.warn("rpi-gpio : "+RED._("rpi-gpio.errors.needtobeexecutable",{command:gpioCommand}));
-            allOK = false;
-        }
-    } catch(err) {
-        allOK = false;
-        RED.log.warn("rpi-gpio : "+RED._("rpi-gpio.errors.ignorenode"));
-    }
-
-    // the magic to make python print stuff immediately
-    process.env.PYTHONUNBUFFERED = 1;
-
-    var pinsInUse = {};
-    var pinTypes = {"out":RED._("rpi-gpio.types.digout"), "tri":RED._("rpi-gpio.types.input"), "up":RED._("rpi-gpio.types.pullup"), "down":RED._("rpi-gpio.types.pulldown"), "pwm":RED._("rpi-gpio.types.pwmout")};
-
-    function GPIOInNode(n) {
-        RED.nodes.createNode(this,n);
-        this.buttonState = -1;
-        this.pin = n.pin;
-        this.intype = n.intype;
-        this.read = n.read || false;
-        this.debounce = Number(n.debounce || 25);
-        if (this.read) { this.buttonState = -2; }
-        var node = this;
-        if (!pinsInUse.hasOwnProperty(this.pin)) {
-            pinsInUse[this.pin] = this.intype;
-        }
-        else {
-            if ((pinsInUse[this.pin] !== this.intype)||(pinsInUse[this.pin] === "pwm")) {
-                node.warn(RED._("rpi-gpio.errors.alreadyset",{pin:this.pin,type:pinTypes[pinsInUse[this.pin]]}));
-            }
-        }
-
-        if (allOK === true) {
-            if (node.pin !== undefined) {
-                node.child = spawn(gpioCommand, ["in",node.pin,node.intype,node.debounce]);
-                node.running = true;
-                node.status({fill:"green",shape:"dot",text:"common.status.ok"});
-
-                node.child.stdout.on('data', function (data) {
-                    var d = data.toString().trim().split("\n");
-                    for (var i = 0; i < d.length; i++) {
-                        if (d[i] === '') { return; }
-                        if (node.running && node.buttonState !== -1 && !isNaN(Number(d[i])) && node.buttonState !== d[i]) {
-                            node.send({ topic:"pi/"+node.pin, payload:Number(d[i]) });
-                        }
-                        node.buttonState = d[i];
-                        node.status({fill:"green",shape:"dot",text:d[i]});
-                        if (RED.settings.verbose) { node.log("out: "+d[i]+" :"); }
-                    }
-                });
-
-                node.child.stderr.on('data', function (data) {
-                    if (RED.settings.verbose) { node.log("err: "+data+" :"); }
-                });
-
-                node.child.on('close', function (code) {
-                    node.running = false;
-                    node.child = null;
-                    if (RED.settings.verbose) { node.log(RED._("rpi-gpio.status.closed")); }
-                    if (node.done) {
-                        node.status({fill:"grey",shape:"ring",text:"rpi-gpio.status.closed"});
-                        node.done();
-                    }
-                    else { node.status({fill:"red",shape:"ring",text:"rpi-gpio.status.stopped"}); }
-                });
-
-                node.child.on('error', function (err) {
-                    if (err.errno === "ENOENT") { node.error(RED._("rpi-gpio.errors.commandnotfound")); }
-                    else if (err.errno === "EACCES") { node.error(RED._("rpi-gpio.errors.commandnotexecutable")); }
-                    else { node.error(RED._("rpi-gpio.errors.error",{error:err.errno})) }
-                });
-
-            }
-            else {
-                node.warn(RED._("rpi-gpio.errors.invalidpin")+": "+node.pin);
-            }
-        }
-        else {
-            node.status({fill:"grey",shape:"dot",text:"node-red:rpi-gpio.status.not-available"});
-            if (node.read === true) {
-                var val;
-                if (node.intype == "up") { val = 1; }
-                if (node.intype == "down") { val = 0; }
-                setTimeout(function(){
-                    node.send({ topic:"pi/"+node.pin, payload:val });
-                    node.status({fill:"grey",shape:"dot",text:RED._("rpi-gpio.status.na",{value:val})});
-                },250);
-            }
-        }
-
-        node.on("close", function(done) {
-            node.status({fill:"grey",shape:"ring",text:"rpi-gpio.status.closed"});
-            delete pinsInUse[node.pin];
-            if (node.child != null) {
-                node.done = done;
-                node.child.stdin.write("close "+node.pin);
-                node.child.kill('SIGKILL');
-            }
-            else { done(); }
-        });
-    }
-    RED.nodes.registerType("rpi-gpio in",GPIOInNode);
-
-    function GPIOOutNode(n) {
-        RED.nodes.createNode(this,n);
-        this.pin = n.pin;
-        this.set = n.set || false;
-        this.level = n.level || 0;
-        this.freq = n.freq || 100;
-        this.out = n.out || "out";
-        var node = this;
-        if (!pinsInUse.hasOwnProperty(this.pin)) {
-            pinsInUse[this.pin] = this.out;
-        }
-        else {
-            if ((pinsInUse[this.pin] !== this.out)||(pinsInUse[this.pin] === "pwm")) {
-                node.warn(RED._("rpi-gpio.errors.alreadyset",{pin:this.pin,type:pinTypes[pinsInUse[this.pin]]}));
-            }
-        }
-
-        function inputlistener(msg) {
-            if (msg.payload === "true") { msg.payload = true; }
-            if (msg.payload === "false") { msg.payload = false; }
-            var out = Number(msg.payload);
-            var limit = 1;
-            if (node.out === "pwm") { limit = 100; }
-            if ((out >= 0) && (out <= limit)) {
-                if (RED.settings.verbose) { node.log("out: "+out); }
-                if (node.child !== null) {
-                    node.child.stdin.write(out+"\n");
-                    node.status({fill:"green",shape:"dot",text:msg.payload.toString()});
-                }
-                else {
-                    node.error(RED._("rpi-gpio.errors.pythoncommandnotfound"),msg);
-                    node.status({fill:"red",shape:"ring",text:"rpi-gpio.status.not-running"});
-                }
-            }
-            else { node.warn(RED._("rpi-gpio.errors.invalidinput")+": "+out); }
-        }
-
-        if (allOK === true) {
-            if (node.pin !== undefined) {
-                if (node.set && (node.out === "out")) {
-                    node.child = spawn(gpioCommand, [node.out,node.pin,node.level]);
-                    node.status({fill:"green",shape:"dot",text:node.level});
-                } else {
-                    node.child = spawn(gpioCommand, [node.out,node.pin,node.freq]);
-                    node.status({fill:"green",shape:"dot",text:"common.status.ok"});
-                }
-                node.running = true;
-
-                node.on("input", inputlistener);
-
-                node.child.stdout.on('data', function (data) {
-                    if (RED.settings.verbose) { node.log("out: "+data+" :"); }
-                });
-
-                node.child.stderr.on('data', function (data) {
-                    if (RED.settings.verbose) { node.log("err: "+data+" :"); }
-                });
-
-                node.child.on('close', function (code) {
-                    node.child = null;
-                    node.running = false;
-                    if (RED.settings.verbose) { node.log(RED._("rpi-gpio.status.closed")); }
-                    if (node.done) {
-                        node.status({fill:"grey",shape:"ring",text:"rpi-gpio.status.closed"});
-                        node.done();
-                    }
-                    else { node.status({fill:"red",shape:"ring",text:"rpi-gpio.status.stopped"}); }
-                });
-
-                node.child.on('error', function (err) {
-                    if (err.errno === "ENOENT") { node.error(RED._("rpi-gpio.errors.commandnotfound")); }
-                    else if (err.errno === "EACCES") { node.error(RED._("rpi-gpio.errors.commandnotexecutable")); }
-                    else { node.error(RED._("rpi-gpio.errors.error")+': ' + err.errno); }
-                });
-
-            }
-            else {
-                node.warn(RED._("rpi-gpio.errors.invalidpin")+": "+node.pin);
-            }
-        }
-        else {
-            node.status({fill:"grey",shape:"dot",text:"node-red:rpi-gpio.status.not-available"});
-            node.on("input", function(msg){
-                node.status({fill:"grey",shape:"dot",text:RED._("rpi-gpio.status.na",{value:msg.payload.toString()})});
-            });
-        }
-
-        node.on("close", function(done) {
-            node.status({fill:"grey",shape:"ring",text:"rpi-gpio.status.closed"});
-            delete pinsInUse[node.pin];
-            if (node.child != null) {
-                node.done = done;
-                node.child.stdin.write("close "+node.pin);
-                node.child.kill('SIGKILL');
-            }
-            else { done(); }
-        });
-
-    }
-    RED.nodes.registerType("rpi-gpio out",GPIOOutNode);
-
-    function PiMouseNode(n) {
-        RED.nodes.createNode(this,n);
-        this.butt = n.butt || 7;
-        var node = this;
-
-        if (allOK === true) {
-            node.child = spawn(gpioCommand+".py", ["mouse",node.butt]);
-            node.status({fill:"green",shape:"dot",text:"common.status.ok"});
-
-            node.child.stdout.on('data', function (data) {
-                data = Number(data);
-                if (data !== 0) { node.send({ topic:"pi/mouse", button:data, payload:1 }); }
-                else { node.send({ topic:"pi/mouse", button:data, payload:0 }); }
-            });
-
-            node.child.stderr.on('data', function (data) {
-                if (RED.settings.verbose) { node.log("err: "+data+" :"); }
-            });
-
-            node.child.on('close', function (code) {
-                node.child = null;
-                node.running = false;
-                if (RED.settings.verbose) { node.log(RED._("rpi-gpio.status.closed")); }
-                if (node.done) {
-                    node.status({fill:"grey",shape:"ring",text:"rpi-gpio.status.closed"});
-                    node.done();
-                }
-                else { node.status({fill:"red",shape:"ring",text:"rpi-gpio.status.stopped"}); }
-            });
-
-            node.child.on('error', function (err) {
-                if (err.errno === "ENOENT") { node.error(RED._("rpi-gpio.errors.commandnotfound")); }
-                else if (err.errno === "EACCES") { node.error(RED._("rpi-gpio.errors.commandnotexecutable")); }
-                else { node.error(RED._("rpi-gpio.errors.error")+': ' + err.errno); }
-            });
-
-            node.on("close", function(done) {
-                node.status({fill:"grey",shape:"ring",text:"rpi-gpio.status.closed"});
-                if (node.child != null) {
-                    node.done = done;
-                    node.child.kill('SIGINT');
-                    node.child = null;
-                }
-                else { done(); }
-            });
-        }
-        else {
-            node.status({fill:"grey",shape:"dot",text:"node-red:rpi-gpio.status.not-available"});
-        }
-    }
-    RED.nodes.registerType("rpi-mouse",PiMouseNode);
-
-    function PiKeyboardNode(n) {
-        RED.nodes.createNode(this,n);
-        var node = this;
-
-        if (allOK === true) {
-            node.child = spawn(gpioCommand+".py", ["kbd","0"]);
-            node.status({fill:"green",shape:"dot",text:"common.status.ok"});
-
-            node.child.stdout.on('data', function (data) {
-                var b = data.toString().trim().split(",");
-                var act = "up";
-                if (b[1] === "1") { act = "down"; }
-                if (b[1] === "2") { act = "repeat"; }
-                node.send({ topic:"pi/key", payload:Number(b[0]), action:act });
-            });
-
-            node.child.stderr.on('data', function (data) {
-                if (RED.settings.verbose) { node.log("err: "+data+" :"); }
-            });
-
-            node.child.on('close', function (code) {
-                node.running = false;
-                node.child = null;
-                if (RED.settings.verbose) { node.log(RED._("rpi-gpio.status.closed")); }
-                if (node.done) {
-                    node.status({fill:"grey",shape:"ring",text:"rpi-gpio.status.closed"});
-                    node.done();
-                }
-                else { node.status({fill:"red",shape:"ring",text:"rpi-gpio.status.stopped"}); }
-            });
-
-            node.child.on('error', function (err) {
-                if (err.errno === "ENOENT") { node.error(RED._("rpi-gpio.errors.commandnotfound")); }
-                else if (err.errno === "EACCES") { node.error(RED._("rpi-gpio.errors.commandnotexecutable")); }
-                else { node.error(RED._("rpi-gpio.errors.error")+': ' + err.errno); }
-            });
-
-            node.on("close", function(done) {
-            node.status({});
-            if (node.child != null) {
-                node.done = done;
-                node.child.kill('SIGINT');
-                node.child = null;
-            }
-            else { done(); }
-        });
-        }
-        else {
-            node.status({fill:"grey",shape:"dot",text:"node-red:rpi-gpio.status.not-available"});
-        }
-    }
-    RED.nodes.registerType("rpi-keyboard",PiKeyboardNode);
-
-    var pitype = { type:"" };
-    if (allOK === true) {
-        exec(gpioCommand+" info", function(err,stdout,stderr) {
-            if (err) {
-                RED.log.info(RED._("rpi-gpio.errors.version"));
-            }
-            else {
-                try {
-                    var info = JSON.parse( stdout.trim().replace(/\'/g,"\"") );
-                    pitype.type = info["TYPE"];
-                }
-                catch(e) {
-                    RED.log.info(RED._("rpi-gpio.errors.sawpitype"),stdout.trim());
-                }
-            }
-        });
-    }
-
-    RED.httpAdmin.get('/rpi-gpio/:id', RED.auth.needsPermission('rpi-gpio.read'), function(req,res) {
-        res.json(pitype);
-    });
-
-    RED.httpAdmin.get('/rpi-pins/:id', RED.auth.needsPermission('rpi-gpio.read'), function(req,res) {
-        res.json(pinsInUse);
-    });
-}