From 50e2dcbcd5530ff9b5a65b6c834b429d4a2b78f8 Mon Sep 17 00:00:00 2001
From: Hideki Nakamura <hideki.nakamura@hal.hitachi.com>
Date: Thu, 5 Jul 2018 18:58:02 -0700
Subject: [PATCH 01/38] Add a processing to check specified API Access Tokens

---
 red/api/auth/api-access-tokens.js | 36 +++++++++++++++++++++++++++++++
 red/api/auth/index.js             |  2 ++
 red/api/auth/strategies.js        | 25 +++++++++++++--------
 3 files changed, 54 insertions(+), 9 deletions(-)
 create mode 100644 red/api/auth/api-access-tokens.js

diff --git a/red/api/auth/api-access-tokens.js b/red/api/auth/api-access-tokens.js
new file mode 100644
index 000000000..bf61516b3
--- /dev/null
+++ b/red/api/auth/api-access-tokens.js
@@ -0,0 +1,36 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+var generatedTokens;
+
+module.exports = {
+    init: function(apiAccessTokensSettings) {
+        generatedTokens = {};
+        if ( Array.isArray(apiAccessTokensSettings) ) {
+            generatedTokens = apiAccessTokensSettings.reduce(function(prev, current) {
+                prev[current.token] = {
+                    username: current.username,
+                    scope: current.permissions
+                };
+                return prev;
+            }, {});
+        }
+        return Promise.resolve();
+    },
+    get: function(token) {
+        var info = generatedTokens[token] || null;
+        return Promise.resolve(info);
+    }
+}
diff --git a/red/api/auth/index.js b/red/api/auth/index.js
index 211a712a7..3e3a28bfa 100644
--- a/red/api/auth/index.js
+++ b/red/api/auth/index.js
@@ -19,6 +19,7 @@ var oauth2orize = require("oauth2orize");
 
 var strategies = require("./strategies");
 var Tokens = require("./tokens");
+var apiAccessTokens = require("./api-access-tokens");
 var Users = require("./users");
 var permissions = require("./permissions");
 
@@ -42,6 +43,7 @@ function init(runtime) {
     if (settings.adminAuth) {
         Users.init(settings.adminAuth);
         Tokens.init(settings.adminAuth,runtime.storage);
+        apiAccessTokens.init(settings.apiAccessTokens);
         strategies.init(runtime);
     }
 }
diff --git a/red/api/auth/strategies.js b/red/api/auth/strategies.js
index 0f5b554e4..5d3124497 100644
--- a/red/api/auth/strategies.js
+++ b/red/api/auth/strategies.js
@@ -22,6 +22,7 @@ var crypto = require("crypto");
 var util = require("util");
 
 var Tokens = require("./tokens");
+var apiAccessTokens = require("./api-access-tokens");
 var Users = require("./users");
 var Clients = require("./clients");
 var permissions = require("./permissions");
@@ -30,21 +31,27 @@ var log;
 
 var bearerStrategy = function (accessToken, done) {
     // is this a valid token?
-    Tokens.get(accessToken).then(function(token) {
-        if (token) {
-            Users.get(token.user).then(function(user) {
-                if (user) {
-                    done(null,user,{scope:token.scope});
+    apiAccessTokens.get(accessToken).then(function(tokenInfo) {
+        if (tokenInfo && tokenInfo.username && tokenInfo.scope) {
+            done(null, tokenInfo.username,{scope:tokenInfo.scope});
+        } else {
+            Tokens.get(accessToken).then(function(token) {
+                if (token) {
+                    Users.get(token.user).then(function(user) {
+                        if (user) {
+                            done(null,user,{scope:token.scope});
+                        } else {
+                            log.audit({event: "auth.invalid-token"});
+                            done(null,false);
+                        }
+                    });
                 } else {
                     log.audit({event: "auth.invalid-token"});
                     done(null,false);
                 }
             });
-        } else {
-            log.audit({event: "auth.invalid-token"});
-            done(null,false);
         }
-    });
+    })
 }
 bearerStrategy.BearerStrategy = new BearerStrategy(bearerStrategy);
 

From b14a0e0dde4c2892acd9a5e557fdea523e6d8064 Mon Sep 17 00:00:00 2001
From: Hideki Nakamura <hideki.nakamura@hal.hitachi.com>
Date: Tue, 10 Jul 2018 17:25:01 -0700
Subject: [PATCH 02/38] Merge the logic for api access token to tokens.js so as
 not to change strategies.js

---
 red/api/auth/api-access-tokens.js | 36 -------------------------------
 red/api/auth/index.js             |  6 ++----
 red/api/auth/strategies.js        | 25 ++++++++-------------
 red/api/auth/tokens.js            | 29 ++++++++++++++++++++-----
 red/api/auth/users.js             | 23 +++++++++++++++++---
 5 files changed, 55 insertions(+), 64 deletions(-)
 delete mode 100644 red/api/auth/api-access-tokens.js

diff --git a/red/api/auth/api-access-tokens.js b/red/api/auth/api-access-tokens.js
deleted file mode 100644
index bf61516b3..000000000
--- a/red/api/auth/api-access-tokens.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright JS Foundation and other contributors, http://js.foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-var generatedTokens;
-
-module.exports = {
-    init: function(apiAccessTokensSettings) {
-        generatedTokens = {};
-        if ( Array.isArray(apiAccessTokensSettings) ) {
-            generatedTokens = apiAccessTokensSettings.reduce(function(prev, current) {
-                prev[current.token] = {
-                    username: current.username,
-                    scope: current.permissions
-                };
-                return prev;
-            }, {});
-        }
-        return Promise.resolve();
-    },
-    get: function(token) {
-        var info = generatedTokens[token] || null;
-        return Promise.resolve(info);
-    }
-}
diff --git a/red/api/auth/index.js b/red/api/auth/index.js
index 3e3a28bfa..c89c8d240 100644
--- a/red/api/auth/index.js
+++ b/red/api/auth/index.js
@@ -19,7 +19,6 @@ var oauth2orize = require("oauth2orize");
 
 var strategies = require("./strategies");
 var Tokens = require("./tokens");
-var apiAccessTokens = require("./api-access-tokens");
 var Users = require("./users");
 var permissions = require("./permissions");
 
@@ -41,9 +40,8 @@ function init(runtime) {
     settings = runtime.settings;
     log = runtime.log;
     if (settings.adminAuth) {
-        Users.init(settings.adminAuth);
-        Tokens.init(settings.adminAuth,runtime.storage);
-        apiAccessTokens.init(settings.apiAccessTokens);
+        Users.init(settings.adminAuth,settings.apiAccessTokens);
+        Tokens.init(settings.adminAuth,runtime.storage,settings.apiAccessTokens);
         strategies.init(runtime);
     }
 }
diff --git a/red/api/auth/strategies.js b/red/api/auth/strategies.js
index 5d3124497..0f5b554e4 100644
--- a/red/api/auth/strategies.js
+++ b/red/api/auth/strategies.js
@@ -22,7 +22,6 @@ var crypto = require("crypto");
 var util = require("util");
 
 var Tokens = require("./tokens");
-var apiAccessTokens = require("./api-access-tokens");
 var Users = require("./users");
 var Clients = require("./clients");
 var permissions = require("./permissions");
@@ -31,27 +30,21 @@ var log;
 
 var bearerStrategy = function (accessToken, done) {
     // is this a valid token?
-    apiAccessTokens.get(accessToken).then(function(tokenInfo) {
-        if (tokenInfo && tokenInfo.username && tokenInfo.scope) {
-            done(null, tokenInfo.username,{scope:tokenInfo.scope});
-        } else {
-            Tokens.get(accessToken).then(function(token) {
-                if (token) {
-                    Users.get(token.user).then(function(user) {
-                        if (user) {
-                            done(null,user,{scope:token.scope});
-                        } else {
-                            log.audit({event: "auth.invalid-token"});
-                            done(null,false);
-                        }
-                    });
+    Tokens.get(accessToken).then(function(token) {
+        if (token) {
+            Users.get(token.user).then(function(user) {
+                if (user) {
+                    done(null,user,{scope:token.scope});
                 } else {
                     log.audit({event: "auth.invalid-token"});
                     done(null,false);
                 }
             });
+        } else {
+            log.audit({event: "auth.invalid-token"});
+            done(null,false);
         }
-    })
+    });
 }
 bearerStrategy.BearerStrategy = new BearerStrategy(bearerStrategy);
 
diff --git a/red/api/auth/tokens.js b/red/api/auth/tokens.js
index 620cd6a12..054234215 100644
--- a/red/api/auth/tokens.js
+++ b/red/api/auth/tokens.js
@@ -32,6 +32,8 @@ var sessions = {};
 
 var loadedSessions = null;
 
+var apiAccessTokens;
+
 function expireSessions() {
     var now = Date.now();
     var modified = false;
@@ -61,22 +63,39 @@ function loadSessions() {
 }
 
 module.exports = {
-    init: function(adminAuthSettings, _storage) {
+    init: function(adminAuthSettings, _storage, apiAccessTokensSettings) {
         storage = _storage;
         sessionExpiryTime = adminAuthSettings.sessionExpiryTime || 604800; // 1 week in seconds
         // At this point, storage will not have been initialised, so defer loading
         // the sessions until there's a request for them.
         loadedSessions = null;
+
+        apiAccessTokens = {};
+        if ( Array.isArray(apiAccessTokensSettings) ) {
+            apiAccessTokens = apiAccessTokensSettings.reduce(function(prev, current) {
+                prev[current.token] = {
+                    user: current.username,
+                    scope: current.permissions
+                };
+                return prev;
+            }, {});
+        }
         return Promise.resolve();
     },
     get: function(token) {
         return loadSessions().then(function() {
-            if (sessions[token]) {
-                if (sessions[token].expires < Date.now()) {
-                    return expireSessions().then(function() { return null });
+            var info = apiAccessTokens[token] || null;
+
+            if (info) {
+                return Promise.resolve(info);
+            } else {
+                if (sessions[token]) {
+                    if (sessions[token].expires < Date.now()) {
+                        return expireSessions().then(function() { return null });
+                    }
                 }
+                return Promise.resolve(sessions[token]);
             }
-            return Promise.resolve(sessions[token]);
         });
     },
     create: function(user,client,scope) {
diff --git a/red/api/auth/users.js b/red/api/auth/users.js
index 24a762958..4c2aaaf09 100644
--- a/red/api/auth/users.js
+++ b/red/api/auth/users.js
@@ -57,18 +57,35 @@ function getDefaultUser() {
 }
 
 var api = {
-    get: get,
+    get: wrapperGetUserFromSettings(get),
     authenticate: authenticate,
     default: getDefaultUser
 }
 
-function init(config) {
+var apiAccessUsers = {};
+function wrapperGetUserFromSettings (getFunc) {
+    return function (username) {
+        if (apiAccessUsers[username]) {
+            return Promise.resolve(apiAccessUsers[username]);
+        } else {
+            return getFunc(username);
+        }
+    };
+}
+
+function init(config, apiAccessTokensSettings) {
     users = {};
     defaultUser = null;
+    apiAccessUsers = apiAccessTokensSettings.reduce(function (prev, current) {
+        if (current.username) {
+            prev[current.username] = current.username;
+        }
+        return prev;
+    }, {});
     if (config.type == "credentials" || config.type == "strategy") {
         if (config.users) {
             if (typeof config.users === "function") {
-                api.get = config.users;
+                api.get = wrapperGetUserFromSettings(config.users);
             } else {
                 var us = config.users;
                 /* istanbul ignore else */

From cb0e631b853ac68ac8814a3db31caf4bc87b0e1d Mon Sep 17 00:00:00 2001
From: Hideki Nakamura <hideki.nakamura@hal.hitachi.com>
Date: Tue, 11 Sep 2018 09:44:18 -0700
Subject: [PATCH 03/38] Update the implementation according to the Design notes

---
 red/api/auth/index.js  | 20 +++++++++++---------
 red/api/auth/tokens.js | 10 +++++-----
 red/api/auth/users.js  | 23 +++--------------------
 settings.js            | 19 +++++++++++++++++++
 4 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/red/api/auth/index.js b/red/api/auth/index.js
index c89c8d240..ae7f55818 100644
--- a/red/api/auth/index.js
+++ b/red/api/auth/index.js
@@ -40,8 +40,9 @@ function init(runtime) {
     settings = runtime.settings;
     log = runtime.log;
     if (settings.adminAuth) {
-        Users.init(settings.adminAuth,settings.apiAccessTokens);
-        Tokens.init(settings.adminAuth,runtime.storage,settings.apiAccessTokens);
+        var mergedAdminAuth = Object.assign(settings.adminAuth, settings.adminAuth.module);
+        Users.init(mergedAdminAuth);
+        Tokens.init(mergedAdminAuth,runtime.storage);
         strategies.init(runtime);
     }
 }
@@ -81,23 +82,24 @@ function getToken(req,res,next) {
 function login(req,res) {
     var response = {};
     if (settings.adminAuth) {
-        if (settings.adminAuth.type === "credentials") {
+        var mergedAdminAuth = Object.assign(settings.adminAuth, settings.adminAuth.module);
+        if (mergedAdminAuth.type === "credentials") {
             response = {
                 "type":"credentials",
                 "prompts":[{id:"username",type:"text",label:"user.username"},{id:"password",type:"password",label:"user.password"}]
             }
-        } else if (settings.adminAuth.type === "strategy") {
+        } else if (mergedAdminAuth.type === "strategy") {
 
             var urlPrefix = (settings.httpAdminRoot==='/')?"":settings.httpAdminRoot;
             response = {
                 "type":"strategy",
-                "prompts":[{type:"button",label:settings.adminAuth.strategy.label, url: urlPrefix + "auth/strategy"}]
+                "prompts":[{type:"button",label:mergedAdminAuth.strategy.label, url: urlPrefix + "auth/strategy"}]
             }
-            if (settings.adminAuth.strategy.icon) {
-                response.prompts[0].icon = settings.adminAuth.strategy.icon;
+            if (mergedAdminAuth.strategy.icon) {
+                response.prompts[0].icon = mergedAdminAuth.strategy.icon;
             }
-            if (settings.adminAuth.strategy.image) {
-                response.prompts[0].image = theme.serveFile('/login/',settings.adminAuth.strategy.image);
+            if (mergedAdminAuth.strategy.image) {
+                response.prompts[0].image = theme.serveFile('/login/',mergedAdminAuth.strategy.image);
             }
         }
         if (theme.context().login && theme.context().login.image) {
diff --git a/red/api/auth/tokens.js b/red/api/auth/tokens.js
index 054234215..daa058787 100644
--- a/red/api/auth/tokens.js
+++ b/red/api/auth/tokens.js
@@ -63,7 +63,7 @@ function loadSessions() {
 }
 
 module.exports = {
-    init: function(adminAuthSettings, _storage, apiAccessTokensSettings) {
+    init: function(adminAuthSettings, _storage) {
         storage = _storage;
         sessionExpiryTime = adminAuthSettings.sessionExpiryTime || 604800; // 1 week in seconds
         // At this point, storage will not have been initialised, so defer loading
@@ -71,11 +71,11 @@ module.exports = {
         loadedSessions = null;
 
         apiAccessTokens = {};
-        if ( Array.isArray(apiAccessTokensSettings) ) {
-            apiAccessTokens = apiAccessTokensSettings.reduce(function(prev, current) {
+        if ( Array.isArray(adminAuthSettings.tokens) ) {
+            apiAccessTokens = adminAuthSettings.tokens.reduce(function(prev, current) {
                 prev[current.token] = {
-                    user: current.username,
-                    scope: current.permissions
+                    user: current.user,
+                    scope: current.scope
                 };
                 return prev;
             }, {});
diff --git a/red/api/auth/users.js b/red/api/auth/users.js
index 4c2aaaf09..24a762958 100644
--- a/red/api/auth/users.js
+++ b/red/api/auth/users.js
@@ -57,35 +57,18 @@ function getDefaultUser() {
 }
 
 var api = {
-    get: wrapperGetUserFromSettings(get),
+    get: get,
     authenticate: authenticate,
     default: getDefaultUser
 }
 
-var apiAccessUsers = {};
-function wrapperGetUserFromSettings (getFunc) {
-    return function (username) {
-        if (apiAccessUsers[username]) {
-            return Promise.resolve(apiAccessUsers[username]);
-        } else {
-            return getFunc(username);
-        }
-    };
-}
-
-function init(config, apiAccessTokensSettings) {
+function init(config) {
     users = {};
     defaultUser = null;
-    apiAccessUsers = apiAccessTokensSettings.reduce(function (prev, current) {
-        if (current.username) {
-            prev[current.username] = current.username;
-        }
-        return prev;
-    }, {});
     if (config.type == "credentials" || config.type == "strategy") {
         if (config.users) {
             if (typeof config.users === "function") {
-                api.get = wrapperGetUserFromSettings(config.users);
+                api.get = config.users;
             } else {
                 var us = config.users;
                 /* istanbul ignore else */
diff --git a/settings.js b/settings.js
index dc79223fe..90151d32a 100644
--- a/settings.js
+++ b/settings.js
@@ -124,6 +124,25 @@ module.exports = {
     //    }]
     //},
 
+    // If you would like to use not only this access token feature but also a Node-RED
+    // plugin module for authenticatiing users such as node-red-auth-github,
+    // you can define the module in adminAuth.module property.
+    //adminAuth: {
+    //    module: require('node-red-auth-github')({
+    //        clientID: GITHUB_CLIENT_ID,
+    //        clientSecret: GITHUB_CLIENT_SECRET,
+    //        baseURL: "http://localhost:1880/",
+    //        users: [
+    //            { username: "knolleary",permissions: ["*"]}
+    //        ]
+    //    })
+    //    tokens: [{
+    //        token: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ",
+    //        user: "knolleary",
+    //        scope: ["*"]
+    //    }]
+    //},
+
     // To password protect the node-defined HTTP endpoints (httpNodeRoot), or
     // the static content (httpStatic), the following properties can be used.
     // The pass field is a bcrypt hash of the password.

From c102828a998fd4513cc3cf3aba6cdfa5cae00a0a Mon Sep 17 00:00:00 2001
From: Hideki Nakamura <hideki.nakamura@hal.hitachi.com>
Date: Tue, 11 Sep 2018 10:36:54 -0700
Subject: [PATCH 04/38] Add some test cases

---
 test/red/api/auth/index_spec.js  | 168 +++++++++++++++++++++++++++++++
 test/red/api/auth/tokens_spec.js |  23 +++++
 2 files changed, 191 insertions(+)

diff --git a/test/red/api/auth/index_spec.js b/test/red/api/auth/index_spec.js
index 9849b602c..a27cf7c29 100644
--- a/test/red/api/auth/index_spec.js
+++ b/test/red/api/auth/index_spec.js
@@ -114,6 +114,174 @@ describe("api/auth/index",function() {
             }});
         });
 
+        it("returns login details - strategy - merged a adminAuth.module object to a adminAuth object", function(done) {
+            auth.init({
+                settings: {
+                    adminAuth: {
+                        type: "strategy",
+                        strategy:{
+                            label:"test-strategy",
+                            icon:"test-icon"
+                        },
+                        tokens: [{
+                            token: "test-token",
+                            user: "test-user",
+                            scope: ["*"]
+                        }]
+                    }
+                },
+                log:{audit:function(){}}
+            });
+            auth.login(null,{json: function(resp) {
+                resp.should.have.a.property("type","strategy");
+                resp.should.have.a.property("prompts");
+                resp.prompts.should.have.a.lengthOf(1);
+                resp.prompts[0].should.have.a.property("type","button");
+                resp.prompts[0].should.have.a.property("label","test-strategy");
+                resp.prompts[0].should.have.a.property("icon","test-icon");
+
+                done();
+            }});
+        });
+
+    });
+
+    describe("init", function() {
+        var spyTokensInit;
+        var spyUsersInit;
+        beforeEach(function() {
+            spyTokensInit = sinon.spy(Tokens,"init");
+            spyUsersInit = sinon.spy(Users,"init");
+        });
+        this.afterEach(function() {
+            spyTokensInit.restore();
+            spyUsersInit.restore();
+        });
+        it("merges an adminAuth object and an adminAuth.module object - module object is null", function(done) {
+            auth.init({
+                settings: {
+                    adminAuth: {
+                        type: "strategy",
+                        strategy:{
+                            label:"test-strategy",
+                            icon:"test-icon"
+                        },
+                        tokens: [{
+                            token: "test-token",
+                            user: "test-user",
+                            scope: ["*"]
+                        }]
+                    }
+                },
+                log:{audit:function(){}}
+            });
+            spyTokensInit.args[0][0].should.have.a.property("type","strategy");
+            spyTokensInit.args[0][0].should.have.a.property("strategy");
+            spyTokensInit.args[0][0].strategy.should.have.a.property("label","test-strategy");
+            spyTokensInit.args[0][0].strategy.should.have.a.property("icon","test-icon");
+            spyTokensInit.args[0][0].should.have.a.property("tokens");
+            spyTokensInit.args[0][0].tokens.should.have.a.lengthOf(1);
+            spyTokensInit.args[0][0].tokens[0].should.have.a.property("token","test-token");
+            spyTokensInit.args[0][0].tokens[0].should.have.a.property("user","test-user");
+            spyTokensInit.args[0][0].tokens[0].should.have.a.property("scope");
+            spyTokensInit.args[0][0].tokens[0].scope.should.have.a.lengthOf(1);
+            spyUsersInit.args[0][0].should.have.a.property("type","strategy");
+            spyUsersInit.args[0][0].should.have.a.property("strategy");
+            spyUsersInit.args[0][0].strategy.should.have.a.property("label","test-strategy");
+            spyUsersInit.args[0][0].strategy.should.have.a.property("icon","test-icon");
+            spyUsersInit.args[0][0].should.have.a.property("tokens");
+            spyUsersInit.args[0][0].tokens.should.have.a.lengthOf(1);
+            spyUsersInit.args[0][0].tokens[0].should.have.a.property("token","test-token");
+            spyUsersInit.args[0][0].tokens[0].should.have.a.property("user","test-user");
+            spyUsersInit.args[0][0].tokens[0].should.have.a.property("scope");
+            spyUsersInit.args[0][0].tokens[0].scope.should.have.a.lengthOf(1);
+            done();
+        });
+        it("merges an adminAuth object and an adminAuth.module object - not conflict", function(done) {
+            auth.init({
+                settings: {
+                    adminAuth: {
+                        module: {
+                            type: "strategy",
+                            strategy:{
+                                label:"test-strategy",
+                                icon:"test-icon"
+                            }
+                        },
+                        tokens: [{
+                            token: "test-token",
+                            user: "test-user",
+                            scope: ["*"]
+                        }]
+                    }
+                },
+                log:{audit:function(){}}
+            });
+            spyTokensInit.args[0][0].should.have.a.property("type","strategy");
+            spyTokensInit.args[0][0].should.have.a.property("strategy");
+            spyTokensInit.args[0][0].strategy.should.have.a.property("label","test-strategy");
+            spyTokensInit.args[0][0].strategy.should.have.a.property("icon","test-icon");
+            spyTokensInit.args[0][0].should.have.a.property("tokens");
+            spyTokensInit.args[0][0].tokens.should.have.a.lengthOf(1);
+            spyTokensInit.args[0][0].tokens[0].should.have.a.property("token","test-token");
+            spyTokensInit.args[0][0].tokens[0].should.have.a.property("user","test-user");
+            spyTokensInit.args[0][0].tokens[0].should.have.a.property("scope");
+            spyTokensInit.args[0][0].tokens[0].scope.should.have.a.lengthOf(1);
+            spyUsersInit.args[0][0].should.have.a.property("type","strategy");
+            spyUsersInit.args[0][0].should.have.a.property("strategy");
+            spyUsersInit.args[0][0].strategy.should.have.a.property("label","test-strategy");
+            spyUsersInit.args[0][0].strategy.should.have.a.property("icon","test-icon");
+            spyUsersInit.args[0][0].should.have.a.property("tokens");
+            spyUsersInit.args[0][0].tokens.should.have.a.lengthOf(1);
+            spyUsersInit.args[0][0].tokens[0].should.have.a.property("token","test-token");
+            spyUsersInit.args[0][0].tokens[0].should.have.a.property("user","test-user");
+            spyUsersInit.args[0][0].tokens[0].should.have.a.property("scope");
+            spyUsersInit.args[0][0].tokens[0].scope.should.have.a.lengthOf(1);
+            done();
+        });
+        it("merges an adminAuth object and an adminAuth.module object - conflict", function(done) {
+            auth.init({
+                settings: {
+                    adminAuth: {
+                        module: {
+                            type: "strategy",
+                            strategy:{
+                                label:"test-strategy",
+                                icon:"test-icon"
+                            }
+                        },
+                        type: "credentials",
+                        tokens: [{
+                            token: "test-token",
+                            user: "test-user",
+                            scope: ["*"]
+                        }]
+                    }
+                },
+                log:{audit:function(){}}
+            });
+            spyTokensInit.args[0][0].should.have.a.property("type","strategy");
+            spyTokensInit.args[0][0].should.have.a.property("strategy");
+            spyTokensInit.args[0][0].strategy.should.have.a.property("label","test-strategy");
+            spyTokensInit.args[0][0].strategy.should.have.a.property("icon","test-icon");
+            spyTokensInit.args[0][0].should.have.a.property("tokens");
+            spyTokensInit.args[0][0].tokens.should.have.a.lengthOf(1);
+            spyTokensInit.args[0][0].tokens[0].should.have.a.property("token","test-token");
+            spyTokensInit.args[0][0].tokens[0].should.have.a.property("user","test-user");
+            spyTokensInit.args[0][0].tokens[0].should.have.a.property("scope");
+            spyTokensInit.args[0][0].tokens[0].scope.should.have.a.lengthOf(1);
+            spyUsersInit.args[0][0].should.have.a.property("type","strategy");
+            spyUsersInit.args[0][0].should.have.a.property("strategy");
+            spyUsersInit.args[0][0].strategy.should.have.a.property("label","test-strategy");
+            spyUsersInit.args[0][0].strategy.should.have.a.property("icon","test-icon");
+            spyUsersInit.args[0][0].should.have.a.property("tokens");
+            spyUsersInit.args[0][0].tokens.should.have.a.lengthOf(1);
+            spyUsersInit.args[0][0].tokens[0].should.have.a.property("token","test-token");
+            spyUsersInit.args[0][0].tokens[0].should.have.a.property("user","test-user");
+            spyUsersInit.args[0][0].tokens[0].should.have.a.property("scope");
+            spyUsersInit.args[0][0].tokens[0].scope.should.have.a.lengthOf(1);
+            done();
+        });
     });
 
 });
diff --git a/test/red/api/auth/tokens_spec.js b/test/red/api/auth/tokens_spec.js
index a9c5a7831..fa17391c4 100644
--- a/test/red/api/auth/tokens_spec.js
+++ b/test/red/api/auth/tokens_spec.js
@@ -92,6 +92,29 @@ describe("api/auth/tokens", function() {
                 });
             });
         });
+
+        it('returns a valid api token', function(done) {
+            Tokens.init({
+                tokens: [{
+                    token: "1234",
+                    user: "fred",
+                }]    
+            },{
+                getSessions:function() {
+                    return when.resolve({});
+                }
+            }).then(function() {
+                Tokens.get("1234").then(function(token) {
+                    try {
+                        token.should.have.a.property("user","fred");
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
+            });
+
+        });
     });
 
     describe("#create",function() {

From 716aa740049b6b9ad3d7d4924d18f756b98f9918 Mon Sep 17 00:00:00 2001
From: Hideki Nakamura <hideki.nakamura@hal.hitachi.com>
Date: Mon, 17 Sep 2018 10:18:36 -0700
Subject: [PATCH 05/38] Fix code not to change settings.adminAuth

---
 red/api/auth/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/red/api/auth/index.js b/red/api/auth/index.js
index ae7f55818..1a82ad1eb 100644
--- a/red/api/auth/index.js
+++ b/red/api/auth/index.js
@@ -40,7 +40,7 @@ function init(runtime) {
     settings = runtime.settings;
     log = runtime.log;
     if (settings.adminAuth) {
-        var mergedAdminAuth = Object.assign(settings.adminAuth, settings.adminAuth.module);
+        var mergedAdminAuth = Object.assign({}, settings.adminAuth, settings.adminAuth.module);
         Users.init(mergedAdminAuth);
         Tokens.init(mergedAdminAuth,runtime.storage);
         strategies.init(runtime);
@@ -82,7 +82,7 @@ function getToken(req,res,next) {
 function login(req,res) {
     var response = {};
     if (settings.adminAuth) {
-        var mergedAdminAuth = Object.assign(settings.adminAuth, settings.adminAuth.module);
+        var mergedAdminAuth = Object.assign({}, settings.adminAuth, settings.adminAuth.module);
         if (mergedAdminAuth.type === "credentials") {
             response = {
                 "type":"credentials",

From 1a226c4dc6a6da2ee91ee3d6fbedbb8d98110ada Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Fri, 21 Sep 2018 21:07:44 +0900
Subject: [PATCH 06/38] fix multiple input message processing of file node

---
 nodes/core/storage/50-file.js           | 32 ++++++++++++++++--
 test/nodes/core/storage/50-file_spec.js | 43 +++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/nodes/core/storage/50-file.js b/nodes/core/storage/50-file.js
index 76cedb136..abe591c9d 100644
--- a/nodes/core/storage/50-file.js
+++ b/nodes/core/storage/50-file.js
@@ -29,8 +29,9 @@ module.exports = function(RED) {
         var node = this;
         node.wstream = null;
         node.data = [];
+        node.msgQueue = [];
 
-        this.on("input",function(msg) {
+        function processMsg(msg, done) {
             var filename = node.filename || msg.filename || "";
             if ((!node.filename) && (!node.tout)) {
                 node.tout = setTimeout(function() {
@@ -41,6 +42,7 @@ module.exports = function(RED) {
             }
             if (filename === "") {
                 node.warn(RED._("file.errors.nofilename"));
+                done();
             } else if (node.overwriteFile === "delete") {
                 fs.unlink(filename, function (err) {
                     if (err) {
@@ -51,6 +53,7 @@ module.exports = function(RED) {
                         }
                         node.send(msg);
                     }
+                    done();
                 });
             } else if (msg.hasOwnProperty("payload") && (typeof msg.payload !== "undefined")) {
                 var dir = path.dirname(filename);
@@ -59,6 +62,7 @@ module.exports = function(RED) {
                         fs.ensureDirSync(dir);
                     } catch(err) {
                         node.error(RED._("file.errors.createfail",{error:err.toString()}),msg);
+                        done();
                         return;
                     }
                 }
@@ -82,6 +86,7 @@ module.exports = function(RED) {
                             node.wstream.on("open", function() {
                                 node.wstream.end(packet.data, function() {
                                     node.send(packet.msg);
+                                    done();
                                 });
                             })
                         })(node.data.shift());
@@ -130,6 +135,7 @@ module.exports = function(RED) {
                             var packet = node.data.shift()
                             node.wstream.write(packet.data, function() {
                                 node.send(packet.msg);
+                                done();
                             });
 
                         } else {
@@ -137,14 +143,34 @@ module.exports = function(RED) {
                             var packet = node.data.shift()
                             node.wstream.end(packet.data, function() {
                                 node.send(packet.msg);
+                                delete node.wstream;
+                                delete node.wstreamIno;
+                                done();
                             });
-                            delete node.wstream;
-                            delete node.wstreamIno;
                         }
                     }
                 }
             }
+        }
+
+        this.on("input", function(msg) {
+            var msgQueue = node.msgQueue;
+            function processQ() {
+                var msg = msgQueue[0];
+                processMsg(msg, function() {
+                    msgQueue.shift();
+                    if (msgQueue.length > 0) {
+                        processQ();
+                    }
+                });
+            }
+            if (msgQueue.push(msg) > 1) {
+                // pending write exists
+                return;
+            }
+            processQ();
         });
+
         this.on('close', function() {
             if (node.wstream) { node.wstream.end(); }
             if (node.tout) { clearTimeout(node.tout); }
diff --git a/test/nodes/core/storage/50-file_spec.js b/test/nodes/core/storage/50-file_spec.js
index e61c3fb68..cba22cd54 100644
--- a/test/nodes/core/storage/50-file_spec.js
+++ b/test/nodes/core/storage/50-file_spec.js
@@ -540,6 +540,49 @@ describe('file Nodes', function() {
             });
         });
 
+        it('should write to multiple files', function(done) {
+            var flow = [{id:"fileNode1", type:"file", name: "fileNode", "appendNewline":true, "overwriteFile":true, "createDir":true, wires: [["helperNode1"]]},
+                        {id:"helperNode1", type:"helper"}];
+            var tmp_path = path.join(resourcesDir, "tmp");
+            var len = 1024*1024*10;
+            var file_count = 5;
+            helper.load(fileNode, flow, function() {
+                var n1 = helper.getNode("fileNode1");
+                var n2 = helper.getNode("helperNode1");
+                var count = 0;
+                n2.on("input", function(msg) {
+		    try {
+                        count++;
+                        if (count == file_count) {
+                            for(var i = 0; i < file_count; i++) {
+                                var name = path.join(tmp_path, String(i));
+			        var f = fs.readFileSync(name);
+			        f.should.have.length(len);
+                                f[0].should.have.equal(i);
+                            }
+                            fs.removeSync(tmp_path);
+			    done();
+                        }
+		    }
+		    catch (e) {
+                        try {
+                            fs.removeSync(tmp_path);
+                        }
+                        catch (e1) {
+                        }
+			done(e);
+		    }
+                });
+                for(var i = 0; i < file_count; i++) {
+                    var data = new Buffer(len);
+                    data.fill(i);
+                    var name = path.join(tmp_path, String(i));
+                    var msg = {payload:data, filename:name};
+                    n1.receive(msg);
+                }
+            });
+        });
+
     });
 
 

From 61681bb1d613e1913986cdc591c7816fcfc600d9 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Fri, 21 Sep 2018 23:02:45 +0900
Subject: [PATCH 07/38] lift processQ function

---
 nodes/core/storage/50-file.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/nodes/core/storage/50-file.js b/nodes/core/storage/50-file.js
index abe591c9d..70d9984af 100644
--- a/nodes/core/storage/50-file.js
+++ b/nodes/core/storage/50-file.js
@@ -153,22 +153,23 @@ module.exports = function(RED) {
             }
         }
 
+        function processQ(queue) {
+            var msg = queue[0];
+            processMsg(msg, function() {
+                queue.shift();
+                if (queue.length > 0) {
+                    processQ(queue);
+                }
+            });
+        }
+
         this.on("input", function(msg) {
             var msgQueue = node.msgQueue;
-            function processQ() {
-                var msg = msgQueue[0];
-                processMsg(msg, function() {
-                    msgQueue.shift();
-                    if (msgQueue.length > 0) {
-                        processQ();
-                    }
-                });
-            }
             if (msgQueue.push(msg) > 1) {
                 // pending write exists
                 return;
             }
-            processQ();
+            processQ(msgQueue);
         });
 
         this.on('close', function() {

From a345089c8b5c8c0016952150523bfbfb55bee5cf Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Wed, 26 Sep 2018 12:39:12 +0900
Subject: [PATCH 08/38] wait closing while penging messages exist

---
 nodes/core/storage/50-file.js           |  22 ++-
 test/nodes/core/storage/50-file_spec.js | 202 +++++++++++++++---------
 2 files changed, 144 insertions(+), 80 deletions(-)

diff --git a/nodes/core/storage/50-file.js b/nodes/core/storage/50-file.js
index 70d9984af..853f93186 100644
--- a/nodes/core/storage/50-file.js
+++ b/nodes/core/storage/50-file.js
@@ -30,6 +30,7 @@ module.exports = function(RED) {
         node.wstream = null;
         node.data = [];
         node.msgQueue = [];
+        node.closing = false;
 
         function processMsg(msg, done) {
             var filename = node.filename || msg.filename || "";
@@ -170,12 +171,31 @@ module.exports = function(RED) {
                 return;
             }
             processQ(msgQueue);
+            if (node.closing) {
+                closeNode();
+            }
         });
 
-        this.on('close', function() {
+        function closeNode() {
             if (node.wstream) { node.wstream.end(); }
             if (node.tout) { clearTimeout(node.tout); }
             node.status({});
+            node.closing = false;
+        }
+
+        this.on('close', function() {
+            if (node.closing) {
+                // already closing
+                return;
+            }
+            node.closing = true;
+            if (node.msgQueue.length > 0) {
+                // close after queue processed
+                return;
+            }
+            else {
+                closeNode();
+            }
         });
     }
     RED.nodes.registerType("file",FileNode);
diff --git a/test/nodes/core/storage/50-file_spec.js b/test/nodes/core/storage/50-file_spec.js
index cba22cd54..b60933649 100644
--- a/test/nodes/core/storage/50-file_spec.js
+++ b/test/nodes/core/storage/50-file_spec.js
@@ -46,14 +46,14 @@ describe('file Nodes', function() {
         it('should be loaded', function(done) {
             var flow = [{id:"fileNode1", type:"file", name: "fileNode", "filename":fileToTest, "appendNewline":true, "overwriteFile":true}];
             helper.load(fileNode, flow, function() {
-		try {
+                try {
                     var fileNode1 = helper.getNode("fileNode1");
                     fileNode1.should.have.property('name', 'fileNode');
                     done();
-		}
-		catch (e) {
-		    done(e);
-		}
+                }
+                catch (e) {
+                    done(e);
+                }
             });
         });
 
@@ -64,16 +64,16 @@ describe('file Nodes', function() {
                 var n1 = helper.getNode("fileNode1");
                 var n2 = helper.getNode("helperNode1");
                 n2.on("input", function(msg) {
-		    try {
-			var f = fs.readFileSync(fileToTest);
-			f.should.have.length(4);
-			fs.unlinkSync(fileToTest);
-			msg.should.have.property("payload", "test");
-			done();
-		    }
-		    catch (e) {
-			done(e);
-		    }
+                    try {
+                        var f = fs.readFileSync(fileToTest);
+                        f.should.have.length(4);
+                        fs.unlinkSync(fileToTest);
+                        msg.should.have.property("payload", "test");
+                        done();
+                    }
+                    catch (e) {
+                        done(e);
+                    }
                 });
                 n1.receive({payload:"test"});
             });
@@ -93,26 +93,26 @@ describe('file Nodes', function() {
                 var data = ["test2", true, 999, [2]];
 
                 n2.on("input", function (msg) {
-		    try {
-			msg.should.have.property("payload");
-			data.should.containDeep([msg.payload]);
-			if (count === 3) {
+                    try {
+                        msg.should.have.property("payload");
+                        data.should.containDeep([msg.payload]);
+                        if (count === 3) {
                             var f = fs.readFileSync(fileToTest).toString();
                             if (os.type() !== "Windows_NT") {
-				f.should.have.length(19);
-				f.should.equal("test2\ntrue\n999\n[2]\n");
+                                f.should.have.length(19);
+                                f.should.equal("test2\ntrue\n999\n[2]\n");
                             }
                             else {
-				f.should.have.length(23);
-				f.should.equal("test2\r\ntrue\r\n999\r\n[2]\r\n");
+                                f.should.have.length(23);
+                                f.should.equal("test2\r\ntrue\r\n999\r\n[2]\r\n");
                             }
                             done();
-			}
-			count++;
-		    }
-		    catch (e) {
-			done(e);
-		    }
+                        }
+                        count++;
+                    }
+                    catch (e) {
+                        done(e);
+                    }
                 });
 
                 n1.receive({payload:"test2"});    // string
@@ -142,37 +142,37 @@ describe('file Nodes', function() {
                 var count = 0;
                 
                 n2.on("input", function (msg) {
-		    try {
-			msg.should.have.property("payload");
-			data.should.containDeep([msg.payload]);
-			try {
+                    try {
+                        msg.should.have.property("payload");
+                        data.should.containDeep([msg.payload]);
+                        try {
                             if (count === 1) {
-				// Check they got appended as expected
-				var f = fs.readFileSync(fileToTest).toString();
-				f.should.equal("onetwo");
+                                // Check they got appended as expected
+                                var f = fs.readFileSync(fileToTest).toString();
+                                f.should.equal("onetwo");
 
-				// Delete the file
-				fs.unlinkSync(fileToTest);
-				setTimeout(function() {
+                                // Delete the file
+                                fs.unlinkSync(fileToTest);
+                                setTimeout(function() {
                                     // Send two more messages to the file
                                     n1.receive({payload:"three"});
                                     n1.receive({payload:"four"});
-				}, wait);
+                                }, wait);
                             }
                             if (count === 3) {
-				var f = fs.readFileSync(fileToTest).toString();
-				f.should.equal("threefour");
-				fs.unlinkSync(fileToTest);
-				done();
+                                var f = fs.readFileSync(fileToTest).toString();
+                                f.should.equal("threefour");
+                                fs.unlinkSync(fileToTest);
+                                done();
                             }
-			} catch(err) {
+                        } catch(err) {
                             done(err);
-			}
-			count++;
-		    }
-		    catch (e) {
-			done(e);
-		    }
+                        }
+                        count++;
+                    }
+                    catch (e) {
+                        done(e);
+                    }
                 });
                 
                 // Send two messages to the file
@@ -197,7 +197,7 @@ describe('file Nodes', function() {
                 n2.on("input", function (msg) {
                     try {
                         msg.should.have.property("payload");
-			data.should.containDeep([msg.payload]);
+                        data.should.containDeep([msg.payload]);
                         if (count == 1) {
                             // Check they got appended as expected
                             var f = fs.readFileSync(fileToTest).toString();
@@ -256,25 +256,25 @@ describe('file Nodes', function() {
                 var n2 = helper.getNode("helperNode1");
                 
                 n2.on("input", function (msg) {
-		    try {
-			msg.should.have.property("payload", "fine");
-			msg.should.have.property("filename", fileToTest);
+                    try {
+                        msg.should.have.property("payload", "fine");
+                        msg.should.have.property("filename", fileToTest);
 
-			var f = fs.readFileSync(fileToTest).toString();
-			if (os.type() !== "Windows_NT") {
+                        var f = fs.readFileSync(fileToTest).toString();
+                        if (os.type() !== "Windows_NT") {
                             f.should.have.length(5);
                             f.should.equal("fine\n");
-			}
-			else {
+                        }
+                        else {
                             f.should.have.length(6);
                             f.should.equal("fine\r\n");
-			}
-			done();
-		    }
-		    catch (e) {
-			done(e);
-		    }
-		});
+                        }
+                        done();
+                    }
+                    catch (e) {
+                        done(e);
+                    }
+                });
 
                 n1.receive({payload:"fine", filename:fileToTest});
             });
@@ -551,27 +551,27 @@ describe('file Nodes', function() {
                 var n2 = helper.getNode("helperNode1");
                 var count = 0;
                 n2.on("input", function(msg) {
-		    try {
+                    try {
                         count++;
                         if (count == file_count) {
                             for(var i = 0; i < file_count; i++) {
                                 var name = path.join(tmp_path, String(i));
-			        var f = fs.readFileSync(name);
-			        f.should.have.length(len);
+                                var f = fs.readFileSync(name);
+                                f.should.have.length(len);
                                 f[0].should.have.equal(i);
                             }
                             fs.removeSync(tmp_path);
-			    done();
+                            done();
                         }
-		    }
-		    catch (e) {
+                    }
+                    catch (e) {
                         try {
                             fs.removeSync(tmp_path);
                         }
                         catch (e1) {
                         }
-			done(e);
-		    }
+                        done(e);
+                    }
                 });
                 for(var i = 0; i < file_count; i++) {
                     var data = new Buffer(len);
@@ -583,6 +583,50 @@ describe('file Nodes', function() {
             });
         });
 
+        it('should write to multiple files if node is closed', function(done) {
+            var flow = [{id:"fileNode1", type:"file", name: "fileNode", "appendNewline":true, "overwriteFile":true, "createDir":true, wires: [["helperNode1"]]},
+                        {id:"helperNode1", type:"helper"}];
+            var tmp_path = path.join(resourcesDir, "tmp");
+            var len = 1024*1024*10;
+            var file_count = 5;
+            helper.load(fileNode, flow, function() {
+                var n1 = helper.getNode("fileNode1");
+                var n2 = helper.getNode("helperNode1");
+                var count = 0;
+                n2.on("input", function(msg) {
+                    try {
+                        count++;
+                        if (count == file_count) {
+                            for(var i = 0; i < file_count; i++) {
+                                var name = path.join(tmp_path, String(i));
+                                var f = fs.readFileSync(name);
+                                f.should.have.length(len);
+                                f[0].should.have.equal(i);
+                            }
+                            fs.removeSync(tmp_path);
+                            done();
+                        }
+                    }
+                    catch (e) {
+                        try {
+                            fs.removeSync(tmp_path);
+                        }
+                        catch (e1) {
+                        }
+                        done(e);
+                    }
+                });
+                for(var i = 0; i < file_count; i++) {
+                    var data = new Buffer(len);
+                    data.fill(i);
+                    var name = path.join(tmp_path, String(i));
+                    var msg = {payload:data, filename:name};
+                    n1.receive(msg);
+                }
+                n1.close();
+            });
+        });
+
     });
 
 
@@ -615,7 +659,7 @@ describe('file Nodes', function() {
 
         it('should read in a file and output a buffer', function(done) {
             var flow = [{id:"fileInNode1", type:"file in", name:"fileInNode", "filename":fileToTest, "format":"", wires:[["n2"]]},
-                    {id:"n2", type:"helper"}];
+                        {id:"n2", type:"helper"}];
             helper.load(fileNode, flow, function() {
                 var n1 = helper.getNode("fileInNode1");
                 var n2 = helper.getNode("n2");
@@ -632,7 +676,7 @@ describe('file Nodes', function() {
 
         it('should read in a file and output a utf8 string', function(done) {
             var flow = [{id:"fileInNode1", type:"file in", name: "fileInNode", "filename":fileToTest, "format":"utf8", wires:[["n2"]]},
-                {id:"n2", type:"helper"}];
+                        {id:"n2", type:"helper"}];
             helper.load(fileNode, flow, function() {
                 var n1 = helper.getNode("fileInNode1");
                 var n2 = helper.getNode("n2");
@@ -653,7 +697,7 @@ describe('file Nodes', function() {
 
         it('should read in a file and output split lines with parts', function(done) {
             var flow = [{id:"fileInNode1", type:"file in", name: "fileInNode", filename:fileToTest, format:"lines", wires:[["n2"]]},
-                {id:"n2", type:"helper"}];
+                        {id:"n2", type:"helper"}];
             helper.load(fileNode, flow, function() {
                 var n1 = helper.getNode("fileInNode1");
                 var n2 = helper.getNode("n2");
@@ -691,7 +735,7 @@ describe('file Nodes', function() {
             var line = data.join("\n");
             fs.writeFileSync(fileToTest, line);
             var flow = [{id:"fileInNode1", type:"file in", name: "fileInNode", filename:fileToTest, format:"lines", wires:[["n2"]]},
-                {id:"n2", type:"helper"}];
+                        {id:"n2", type:"helper"}];
             helper.load(fileNode, flow, function() {
                 var n1 = helper.getNode("fileInNode1");
                 var n2 = helper.getNode("n2");
@@ -724,7 +768,7 @@ describe('file Nodes', function() {
 
         it('should read in a file and output a buffer with parts', function(done) {
             var flow = [{id:"fileInNode1", type:"file in", name: "fileInNode", filename:fileToTest, format:"stream", wires:[["n2"]]},
-                {id:"n2", type:"helper"}];
+                        {id:"n2", type:"helper"}];
             helper.load(fileNode, flow, function() {
                 var n1 = helper.getNode("fileInNode1");
                 var n2 = helper.getNode("n2");

From 7cec7ae60805aeb453da2259e76904e980260907 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Sun, 30 Sep 2018 22:30:19 +0900
Subject: [PATCH 09/38] invoke callbacks if async handler is specified

---
 nodes/core/storage/50-file.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/nodes/core/storage/50-file.js b/nodes/core/storage/50-file.js
index 853f93186..51ffb3e58 100644
--- a/nodes/core/storage/50-file.js
+++ b/nodes/core/storage/50-file.js
@@ -31,6 +31,7 @@ module.exports = function(RED) {
         node.data = [];
         node.msgQueue = [];
         node.closing = false;
+        node.closeCallbacks = [];
 
         function processMsg(msg, done) {
             var filename = node.filename || msg.filename || "";
@@ -180,10 +181,19 @@ module.exports = function(RED) {
             if (node.wstream) { node.wstream.end(); }
             if (node.tout) { clearTimeout(node.tout); }
             node.status({});
+            var callbacks = node.closeCallbacks;
+            node.closeCallbacks = [];
             node.closing = false;
+            for (cb in callbacks) {
+                cb();
+            }
         }
 
-        this.on('close', function() {
+        this.on('close', function(arg1, arg2) {
+            var cb  = arg2 ? arg2 : arg1;
+            if (cb) {
+                node.closeCallbacks.push(done);
+            }
             if (node.closing) {
                 // already closing
                 return;

From 58c8311d56142ee4faff84f74953349399204777 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Tue, 2 Oct 2018 20:37:30 +0900
Subject: [PATCH 10/38] make close handler argument only one

---
 nodes/core/storage/50-file.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nodes/core/storage/50-file.js b/nodes/core/storage/50-file.js
index 51ffb3e58..43195901f 100644
--- a/nodes/core/storage/50-file.js
+++ b/nodes/core/storage/50-file.js
@@ -189,8 +189,7 @@ module.exports = function(RED) {
             }
         }
 
-        this.on('close', function(arg1, arg2) {
-            var cb  = arg2 ? arg2 : arg1;
+        this.on('close', function(cb) {
             if (cb) {
                 node.closeCallbacks.push(done);
             }

From 3d70bc722ae270a85cc74d8b14955beeea203a76 Mon Sep 17 00:00:00 2001
From: Osamu Katada <osamu.katada.hj@hitachi-solutions.com>
Date: Wed, 3 Oct 2018 09:58:25 +0900
Subject: [PATCH 11/38] Add http-proxy for http-request node.

---
 .../@node-red/nodes/core/io/06-httpproxy.html | 136 ++++++++++++++++++
 .../@node-red/nodes/core/io/06-httpproxy.js   |  33 +++++
 .../nodes/core/io/21-httprequest.html         |  33 ++++-
 .../@node-red/nodes/core/io/21-httprequest.js |  17 +++
 .../nodes/locales/en-US/messages.json         |   4 +
 .../nodes/locales/ja/io/06-httpproxy.html     |  22 +++
 .../nodes/locales/ja/io/21-httprequest.html   |   2 +-
 .../@node-red/nodes/locales/ja/messages.json  |   4 +
 test/nodes/core/io/21-httprequest_spec.js     | 132 +++++++++++++++++
 9 files changed, 380 insertions(+), 3 deletions(-)
 create mode 100644 packages/node_modules/@node-red/nodes/core/io/06-httpproxy.html
 create mode 100644 packages/node_modules/@node-red/nodes/core/io/06-httpproxy.js
 create mode 100644 packages/node_modules/@node-red/nodes/locales/ja/io/06-httpproxy.html

diff --git a/packages/node_modules/@node-red/nodes/core/io/06-httpproxy.html b/packages/node_modules/@node-red/nodes/core/io/06-httpproxy.html
new file mode 100644
index 000000000..e4d03d1db
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/core/io/06-httpproxy.html
@@ -0,0 +1,136 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="http proxy">
+    <div class="form-row">
+        <label for="node-config-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
+        <input type="text" id="node-config-input-name">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-url"><i class="fa fa-globe"></i> <span data-i18n="httpin.label.url"></span></label>
+        <input type="text" id="node-config-input-url" placeholder="http://hostname:port">
+    </div>
+    <div class="form-row">
+        <input type="checkbox" id="node-config-input-useAuth" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-config-input-useAuth" style="width: 70%;"><span data-i18n="httpin.use-proxyauth"></span></label>
+        <div style="margin-left: 20px" class="node-config-input-useAuth-row hide">
+            <div class="form-row">
+                <label for="node-config-input-username"><i class="fa fa-user"></i> <span data-i18n="common.label.username"></span></label>
+                <input type="text" id="node-config-input-username">
+            </div>
+            <div class="form-row">
+                <label for="node-config-input-password"><i class="fa fa-lock"></i> <span data-i18n="common.label.password"></span></label>
+                <input type="password" id="node-config-input-password">
+            </div>
+        </div>
+    </div>
+    <div class="form-row" style="margin-bottom:0;">
+        <label><i class="fa fa-list"></i> <span data-i18n="httpin.noproxy-hosts"></span></label>
+    </div>
+    <div class="form-row node-config-input-noproxy-container-row">
+        <ol id="node-config-input-noproxy-container"></ol>
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="http proxy">
+    <p>Configuration options for HTTP proxy.</p>
+
+    <h3>Details</h3>
+    <p>When accessing to the host in the ignored host list, no proxy will be used.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('http proxy', {
+        category: 'config',
+        defaults: {
+            name: {value:''},
+            url: {value:'',validate:function(v) { return (v && (v.indexOf('://') !== -1) && (v.trim().indexOf('http') === 0)); }},
+            noproxy: {value:[]}
+        },
+        credentials: {
+            username: {type:'text'},
+            password: {type:'password'}
+        },
+        label: function() {
+            return this.name || this.url || ('http proxy:' + this.id);
+        },
+        oneditprepare: function() {
+            $('#node-config-input-useAuth').change(function() {
+                if ($(this).is(":checked")) {
+                    $('.node-config-input-useAuth-row').show();
+                } else {
+                    $('.node-config-input-useAuth-row').hide();
+                    $('#node-config-input-username').val('');
+                    $('#node-config-input-password').val('');
+                }
+            });
+            if (this.credentials.username || this.credentials.has_password) {
+                $('#node-config-input-useAuth').prop('checked', true);
+            } else {
+                $('#node-config-input-useAuth').prop('checked', false);
+            }
+            $('#node-config-input-useAuth').change();
+
+            var hostList = $('#node-config-input-noproxy-container')
+                .css({'min-height':'150px','min-width':'450px'})
+                .editableList({
+                    addItem: function(container, index, data) {
+                        var row = $('<div/>')
+                            .css({overflow: 'hidden',whiteSpace: 'nowrap'})
+                            .appendTo(container);
+
+                        var hostField = $('<input/>',{class:'node-config-input-host',type:'text',placeholder:'hostname'})
+                            .css({width:'100%'})
+                            .appendTo(row);
+                        if (data.host) {
+                            hostField.val(data.host);
+                        }
+                    },
+                    removable: true
+                });
+            if (this.noproxy) {
+                for (var i in this.noproxy) {
+                    hostList.editableList('addItem', {host:this.noproxy[i]});
+                }
+            }
+            if (hostList.editableList('items').length == 0) {
+                hostList.editableList('addItem', {host:''});
+            }
+        },
+        oneditsave: function() {
+            var hosts = $('#node-config-input-noproxy-container').editableList('items');
+            var node = this;
+            node.noproxy = [];
+            hosts.each(function(i) {
+                var host = $(this).find('.node-config-input-host').val().trim();
+                if (host) {
+                    node.noproxy.push(host);
+                }
+            });
+        },
+        oneditresize: function(size) {
+            var rows = $('#node-config-dialog-edit-form>div:not(.node-config-input-noproxy-container-row)');
+            var height = size.height;
+            for (var i = 0; i < rows.size(); i++) {
+                height -= $(rows[i]).outerHeight(true);
+            }
+
+            var editorRow = $('#node-config-dialog-edit-form>div.node-config-input-noproxy-container-row');
+            height -= (parseInt(editorRow.css('margin-top')) + parseInt(editorRow.css('margin-bottom')));
+            $('#node-config-input-noproxy-container').editableList('height',height);
+        }
+    });
+</script>
diff --git a/packages/node_modules/@node-red/nodes/core/io/06-httpproxy.js b/packages/node_modules/@node-red/nodes/core/io/06-httpproxy.js
new file mode 100644
index 000000000..abcee66f6
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/core/io/06-httpproxy.js
@@ -0,0 +1,33 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    'use strict';
+
+    function HTTPProxyConfig(n) {
+        RED.nodes.createNode(this, n);
+        this.name = n.name;
+        this.url = n.url;
+        this.noproxy = n.noproxy;
+    };
+
+    RED.nodes.registerType('http proxy', HTTPProxyConfig, {
+        credentials: {
+            username: {type:'text'},
+            password: {type:'password'}
+        }
+    });
+};
diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
index f3c4c0228..e0d1f5ba2 100644
--- a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
@@ -53,6 +53,13 @@
         </div>
     </div>
 
+    <div class="form-row">
+        <input type="checkbox" id="node-input-useProxy" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-useProxy" style="width: auto;"><span data-i18n="httpin.use-proxy"></span></label>
+        <div id="node-input-useProxy-row" class="hide">
+            <label style="width: auto; margin-left: 20px; margin-right: 10px;" for="node-input-proxy"><i class="fa fa-globe"></i> <span data-i18n="httpin.proxy-config"></span></label><input type="text" style="width: 270px" id="node-input-proxy">
+        </div>
+    </div>
 
     <div class="form-row">
         <label for="node-input-ret"><i class="fa fa-arrow-left"></i> <span data-i18n="httpin.label.return"></span></label>
@@ -112,7 +119,7 @@
     url to be constructed using values of the incoming message. For example, if the url is set to
     <code>example.com/{{{topic}}}</code>, it will have the value of <code>msg.topic</code> automatically inserted.
     Using {{{...}}} prevents mustache from escaping characters like / & etc.</p>
-    <p><b>Note</b>: If running behind a proxy, the standard <code>http_proxy=...</code> environment variable should be set and Node-RED restarted.</p>
+    <p><b>Note</b>: If running behind a proxy, the standard <code>http_proxy=...</code> environment variable should be set and Node-RED restarted, or use Proxy Configuration. If Proxy Configuration was set, the configuration take precedence over environment variable.</p>
     <h4>Using multiple HTTP Request nodes</h4>
     <p>In order to use more than one of these nodes in the same flow, care must be taken with
     the <code>msg.headers</code> property. The first node will set this property with
@@ -141,7 +148,8 @@
             method:{value:"GET"},
             ret: {value:"txt"},
             url:{value:"",validate:function(v) { return (v.trim().length === 0) || (v.indexOf("://") === -1) || (v.trim().indexOf("http") === 0)} },
-            tls: {type:"tls-config",required: false}
+            tls: {type:"tls-config",required: false},
+            proxy: {type:"http proxy",required: false}
         },
         credentials: {
             user: {type:"text"},
@@ -192,6 +200,24 @@
             $("#node-input-usetls").on("click",function() {
                 updateTLSOptions();
             });
+
+            function updateProxyOptions() {
+                if ($("#node-input-useProxy").is(":checked")) {
+                    $("#node-input-useProxy-row").show();
+                } else {
+                    $("#node-input-useProxy-row").hide();
+                }
+            }
+            if (this.proxy) {
+                $("#node-input-useProxy").prop("checked", true);
+            } else {
+                $("#node-input-useProxy").prop("checked", false);
+            }
+            updateProxyOptions();
+            $("#node-input-useProxy").on("click", function() {
+                updateProxyOptions();
+            });
+
             $("#node-input-ret").change(function() {
                 if ($("#node-input-ret").val() === "obj") {
                     $("#tip-json").show();
@@ -204,6 +230,9 @@
             if (!$("#node-input-usetls").is(':checked')) {
                 $("#node-input-tls").val("_ADD_");
             }
+            if (!$("#node-input-useProxy").is(":checked")) {
+                $("#node-input-proxy").val("_ADD_");
+            }
         }
     });
 </script>
diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js
index 28d67d077..59f4f8fdc 100644
--- a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js
+++ b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js
@@ -41,6 +41,13 @@ module.exports = function(RED) {
         if (process.env.no_proxy != null) { noprox = process.env.no_proxy.split(","); }
         if (process.env.NO_PROXY != null) { noprox = process.env.NO_PROXY.split(","); }
 
+        var proxyConfig = null;
+        if (n.proxy) {
+            proxyConfig = RED.nodes.getNode(n.proxy);
+            prox = proxyConfig.url;
+            noprox = proxyConfig.noproxy;
+        }
+
         this.on("input",function(msg) {
             var preRequestTimestamp = process.hrtime();
             node.status({fill:"blue",shape:"dot",text:"httpin.status.requesting"});
@@ -84,6 +91,7 @@ module.exports = function(RED) {
             opts.encoding = null;  // Force NodeJs to return a Buffer (instead of a string)
             opts.maxRedirects = 21;
             opts.jar = request.jar();
+            opts.proxy = null;
             var ctSet = "Content-Type"; // set default camel case
             var clSet = "Content-Length";
             if (msg.headers) {
@@ -206,6 +214,15 @@ module.exports = function(RED) {
                     opts.proxy = null;
                 }
             }
+            if (proxyConfig && proxyConfig.credentials && opts.proxy == proxyConfig.url) {
+                var proxyUsername = proxyConfig.credentials.username || '';
+                var proxyPassword = proxyConfig.credentials.password || '';
+                if (proxyUsername || proxyPassword) {
+                    opts.headers['proxy-authorization'] =
+                        'Basic ' +
+                        Buffer.from(proxyUsername + ':' + proxyPassword).toString('base64');
+                }
+            }
             if (tlsNode) {
                 tlsNode.addTLSOptions(opts);
             } else {
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index a8f9490f0..65894d80c 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -383,6 +383,10 @@
         "basicauth": "Use basic authentication",
         "use-tls": "Enable secure (SSL/TLS) connection",
         "tls-config":"TLS Configuration",
+        "use-proxy": "Use proxy",
+        "proxy-config": "Proxy Configuration",
+        "use-proxyauth": "Use proxy authentication",
+        "noproxy-hosts": "Ignore hosts",
         "utf8": "a UTF-8 string",
         "binary": "a binary buffer",
         "json": "a parsed JSON object",
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/io/06-httpproxy.html b/packages/node_modules/@node-red/nodes/locales/ja/io/06-httpproxy.html
new file mode 100644
index 000000000..03beddb8d
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/ja/io/06-httpproxy.html
@@ -0,0 +1,22 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="http proxy">
+    <p>プロキシのためのオプション設定</p>
+
+    <h3>詳細</h3>
+    <p>例外ホストに設定したホストにアクセスする際には、プロキシを使用しません。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/io/21-httprequest.html b/packages/node_modules/@node-red/nodes/locales/ja/io/21-httprequest.html
index 662367343..a22be8f3d 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/io/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/io/21-httprequest.html
@@ -49,7 +49,7 @@
     </dl>
     <h3>詳細</h3>
     <p>ノードの設定でurlプロパティを指定する場合、<a href="http://mustache.github.io/mustache.5.html" target="_blank">mustache形式</a>のタグを含めることができます。これにより、URLを入力メッセージの値から構成することができます。例えば、urlが<code>example.com/{{{topic}}}</code>の場合、<code>msg.topic</code>の値による置き換えを自動的に行います。{{{...}}}表記を使うと、/、&といった文字をmustacheがエスケープするのを抑止できます。</p>
-    <p><b>注</b>: proxyサーバを利用している場合、環境変数<code>http_proxy=...</code>を設定して、Node-REDを再起動してください。</p>
+    <p><b>注</b>: proxyサーバを利用している場合、環境変数<code>http_proxy=...</code>を設定して、Node-REDを再起動するか、あるいはプロキシ設定をしてください。</p>
     <h4>複数のHTTPリクエストノードの利用</h4>
     <p>同一フローで本ノードを複数利用するためには、<code>msg.headers</code>プロパティの扱いに注意しなくてはなりません。例えば、最初のノードがレスポンスヘッダにこのプロパティを設定し、次のノードがこのプロパティをリクエストヘッダに利用するというのは一般的には期待する動作ではありません。<code>msg.headers</code>プロパティをノード間で変更しないままとすると、2つ目のノードで無視されることになります。カスタムヘッダを設定するためには、<code>msg.headers</code>をまず削除もしくは空のオブジェクト<code>{}</code>にリセットします。
     <h4>クッキーの扱い</h4>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/messages.json b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
index f160164d3..9f5102eb3 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
@@ -383,6 +383,10 @@
         "basicauth": "ベーシック認証を使用",
         "use-tls": "SSL/TLS接続を有効化",
         "tls-config": "TLS設定",
+        "use-proxy": "プロキシを使用",
+        "proxy-config": "プロキシ設定",
+        "use-proxyauth": "プロキシ認証を使用",
+        "noproxy-hosts": "例外ホスト",
         "utf8": "文字列",
         "binary": "バイナリバッファ",
         "json": "JSON",
diff --git a/test/nodes/core/io/21-httprequest_spec.js b/test/nodes/core/io/21-httprequest_spec.js
index e7e8625b3..1633d6c38 100644
--- a/test/nodes/core/io/21-httprequest_spec.js
+++ b/test/nodes/core/io/21-httprequest_spec.js
@@ -24,6 +24,7 @@ var stoppable = require('stoppable');
 var helper = require("node-red-node-test-helper");
 var httpRequestNode = require("nr-test-utils").require("@node-red/nodes/core/io/21-httprequest.js");
 var tlsNode = require("nr-test-utils").require("@node-red/nodes/core/io/05-tls.js");
+var httpProxyNode = require("nr-test-utils").require("@node-red/nodes/core/io/06-httpproxy.js");
 var hashSum = require("hash-sum");
 var httpProxy = require('http-proxy');
 var cookieParser = require('cookie-parser');
@@ -1194,6 +1195,80 @@ describe('HTTP Request Node', function() {
                 n1.receive({payload:"foo"});
             });
         });
+
+        it('should use http-proxy-config', function(done) {
+            var flow = [
+                {id:"n1",type:"http request",wires:[["n2"]],method:"POST",ret:"obj",url:getTestURL('/postInspect'),proxy:"n3"},
+                {id:"n2",type:"helper"},
+                {id:"n3",type:"http proxy",url:"http://localhost:" + testProxyPort}
+            ];
+            var testNode = [ httpRequestNode, httpProxyNode ];
+            deleteProxySetting();
+            helper.load(testNode, flow, function() {
+                var n1 = helper.getNode("n1");
+                var n2 = helper.getNode("n2");
+                n2.on("input", function(msg) {
+                    try {
+                        msg.should.have.property('statusCode',200);
+                        msg.payload.should.have.property('headers');
+                        msg.payload.headers.should.have.property('x-testproxy-header','foobar');
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
+                n1.receive({payload:"foo"});
+            });
+        });
+
+        it('should not use http-proxy-config when invalid url is specified', function(done) {
+            var flow = [
+                {id:"n1",type:"http request",wires:[["n2"]],method:"POST",ret:"obj",url:getTestURL('/postInspect'),proxy:"n3"},
+                {id:"n2", type:"helper"},
+                {id:"n3",type:"http proxy",url:"invalidvalue"}
+            ];
+            var testNode = [ httpRequestNode, httpProxyNode ];
+            deleteProxySetting();
+            helper.load(testNode, flow, function() {
+                var n1 = helper.getNode("n1");
+                var n2 = helper.getNode("n2");
+                n2.on("input", function(msg) {
+                    try {
+                        msg.should.have.property('statusCode',200);
+                        msg.payload.should.have.property('headers');
+                        msg.payload.headers.should.not.have.property('x-testproxy-header','foobar');
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
+                n1.receive({payload:"foo"});
+            });
+        });
+
+        it('should use http-proxy-config when valid noproxy is specified', function(done) {
+            var flow = [
+                {id:"n1",type:"http request",wires:[["n2"]],method:"POST",ret:"obj",url:getTestURL('/postInspect'),proxy:"n3"},
+                {id:"n2", type:"helper"},
+                {id:"n3",type:"http proxy",url:"http://localhost:" + testProxyPort,noproxy:["foo","localhost"]}
+            ];
+            var testNode = [ httpRequestNode, httpProxyNode ];
+            deleteProxySetting();
+            helper.load(testNode, flow, function() {
+                var n1 = helper.getNode("n1");
+                var n2 = helper.getNode("n2");
+                n2.on("input", function(msg) {
+                    try {
+                        msg.should.have.property('statusCode',200);
+                        msg.payload.headers.should.not.have.property('x-testproxy-header','foobar');
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
+                n1.receive({payload:"foo"});
+            });
+        });
     });
 
     describe('authentication', function() {
@@ -1264,6 +1339,63 @@ describe('HTTP Request Node', function() {
                 n1.receive({payload:"foo"});
             });
         });
+
+        it('should authenticate on proxy server(http-proxy-config)', function(done) {
+            var flow = [
+                {id:"n1",type:"http request", wires:[["n2"]],method:"GET",ret:"obj",url:getTestURL('/proxyAuthenticate'),proxy:"n3"},
+                {id:"n2", type:"helper"},
+                {id:"n3",type:"http proxy",url:"http://localhost:" + testProxyPort}
+            ];
+            var testNode = [ httpRequestNode, httpProxyNode ];
+            deleteProxySetting();
+            helper.load(testNode, flow, function() {
+                var n1 = helper.getNode("n1");
+                var n2 = helper.getNode("n2");
+                var n3 = helper.getNode("n3");
+                n3.credentials = {username:'foouser', password:'barpassword'};
+                n2.on("input", function(msg) {
+                    try {
+                        msg.should.have.property('statusCode',200);
+                        msg.payload.should.have.property('user', 'foouser');
+                        msg.payload.should.have.property('pass', 'barpassword');
+                        msg.payload.should.have.property('headers');
+                        msg.payload.headers.should.have.property('x-testproxy-header','foobar');
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
+                n1.receive({payload:"foo"});
+            });
+        });
+
+        it('should output an error when proxy authentication was failed(http-proxy-config)', function(done) {
+            var flow = [
+                {id:"n1",type:"http request", wires:[["n2"]],method:"GET",ret:"obj",url:getTestURL('/proxyAuthenticate'),proxy:"n3"},
+                {id:"n2", type:"helper"},
+                {id:"n3",type:"http proxy",url:"http://@localhost:" + testProxyPort}
+            ];
+            var testNode = [ httpRequestNode, httpProxyNode ];
+            deleteProxySetting();
+            helper.load(testNode, flow, function() {
+                var n1 = helper.getNode("n1");
+                var n2 = helper.getNode("n2");
+                var n3 = helper.getNode("n3");
+                n3.credentials = {username:'xxxuser', password:'barpassword'};
+                n2.on("input", function(msg) {
+                    try {
+                        msg.should.have.property('statusCode',407);
+                        msg.headers.should.have.property('proxy-authenticate', 'BASIC realm="test"');
+                        msg.payload.should.have.property('headers');
+                        msg.payload.headers.should.have.property('x-testproxy-header','foobar');
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
+                n1.receive({payload:"foo"});
+            });
+        });
     });
 
     describe('redirect-cookie', function() {

From 71403e5acd33e86d4a73f241cc8eb2c740014479 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Wed, 3 Oct 2018 13:39:11 +0900
Subject: [PATCH 12/38] Update test cases in theme_spec.js

---
 .../editor-api/lib/editor/theme_spec.js       | 70 ++++++++++++++-----
 1 file changed, 52 insertions(+), 18 deletions(-)

diff --git a/test/unit/@node-red/editor-api/lib/editor/theme_spec.js b/test/unit/@node-red/editor-api/lib/editor/theme_spec.js
index 62d2b10fd..b7f3e62ec 100644
--- a/test/unit/@node-red/editor-api/lib/editor/theme_spec.js
+++ b/test/unit/@node-red/editor-api/lib/editor/theme_spec.js
@@ -26,46 +26,52 @@ var NR_TEST_UTILS = require("nr-test-utils");
 
 var theme = NR_TEST_UTILS.require("@node-red/editor-api/lib/editor/theme");
 
-describe("api/editor/theme", function() {
-    beforeEach(function() {
-        sinon.stub(fs,"statSync",function() { return true; });
+describe("api/editor/theme", function () {
+    beforeEach(function () {
+        sinon.stub(fs, "statSync", function () { return true; });
     });
-    afterEach(function() {
-        theme.init({settings:{}});
+    afterEach(function () {
+        theme.init({settings: {}});
         fs.statSync.restore();
     });
-    it("applies the default theme", function() {
+    it("applies the default theme", function () {
         var result = theme.init({});
         should.not.exist(result);
 
         var context = theme.context();
         context.should.have.a.property("page");
-        context.page.should.have.a.property("title","Node-RED");
-        context.page.should.have.a.property("favicon","favicon.ico");
+        context.page.should.have.a.property("title", "Node-RED");
+        context.page.should.have.a.property("favicon", "favicon.ico");
+        context.page.should.have.a.property("tabicon", "red/images/node-red-icon-black.svg");
         context.should.have.a.property("header");
-        context.header.should.have.a.property("title","Node-RED");
-        context.header.should.have.a.property("image","red/images/node-red.png");
+        context.header.should.have.a.property("title", "Node-RED");
+        context.header.should.have.a.property("image", "red/images/node-red.png");
+        context.should.have.a.property("asset");
+        context.asset.should.have.a.property("red", "red/red.min.js");
+        context.asset.should.have.a.property("main", "red/main.min.js");
 
         should.not.exist(theme.settings());
     });
 
-    it("picks up custom theme", function() {
+    it("picks up custom theme", function () {
         theme.init({
             editorTheme: {
                 page: {
                     title: "Test Page Title",
-                    favicon: "/absolute/path/to/theme/icon",
+                    favicon: "/absolute/path/to/theme/favicon",
+                    tabicon: "/absolute/path/to/theme/tabicon",
                     css: "/absolute/path/to/custom/css/file.css",
                     scripts: "/absolute/path/to/script.js"
                 },
                 header: {
                     title: "Test Header Title",
+                    url: "http://nodered.org",
                     image: "/absolute/path/to/header/image" // or null to remove image
                 },
 
                 deployButton: {
-                    type:"simple",
-                    label:"Save",
+                    type: "simple",
+                    label: "Save",
                     icon: "/absolute/path/to/deploy/button/image" // or null to remove image
                 },
 
@@ -83,6 +89,16 @@ describe("api/editor/theme", function() {
 
                 login: {
                     image: "/absolute/path/to/login/page/big/image" // a 256x256 image
+                },
+
+                palette: {
+                    editable: true,
+                    catalogues: ['https://catalogue.nodered.org/catalogue.json'],
+                    theme: [{ category: ".*", type: ".*", color: "#f0f" }]
+                },
+
+                projects: {
+                    enabled: false
                 }
             }
         });
@@ -91,22 +107,40 @@ describe("api/editor/theme", function() {
 
         var context = theme.context();
         context.should.have.a.property("page");
-        context.page.should.have.a.property("title","Test Page Title");
+        context.page.should.have.a.property("title", "Test Page Title");
+        context.page.should.have.a.property("favicon", "theme/favicon/favicon");
+        context.page.should.have.a.property("tabicon", "theme/tabicon/tabicon");
         context.should.have.a.property("header");
-        context.header.should.have.a.property("title","Test Header Title");
+        context.header.should.have.a.property("title", "Test Header Title");
+        context.header.should.have.a.property("url", "http://nodered.org");
+        context.header.should.have.a.property("image", "theme/header/image");
         context.page.should.have.a.property("css");
         context.page.css.should.have.lengthOf(1);
         context.page.css[0].should.eql('theme/css/file.css');
-
         context.page.should.have.a.property("scripts");
         context.page.scripts.should.have.lengthOf(1);
         context.page.scripts[0].should.eql('theme/scripts/script.js');
+        context.should.have.a.property("login");
+        context.login.should.have.a.property("image", "theme/login/image");
 
         var settings = theme.settings();
         settings.should.have.a.property("deployButton");
+        settings.deployButton.should.have.a.property("type", "simple");
+        settings.deployButton.should.have.a.property("label", "Save");
+        settings.deployButton.should.have.a.property("icon", "theme/deploy/image");
         settings.should.have.a.property("userMenu");
+        settings.userMenu.should.be.eql(false);
         settings.should.have.a.property("menu");
-
+        settings.menu.should.have.a.property("menu-item-import-library", false);
+        settings.menu.should.have.a.property("menu-item-export-library", false);
+        settings.menu.should.have.a.property("menu-item-keyboard-shortcuts", false);
+        settings.menu.should.have.a.property("menu-item-help", { label: "Alternative Help Link Text", url: "http://example.com" });
+        settings.should.have.a.property("palette");
+        settings.palette.should.have.a.property("editable", true);
+        settings.palette.should.have.a.property("catalogues", ['https://catalogue.nodered.org/catalogue.json']);
+        settings.palette.should.have.a.property("theme", [{ category: ".*", type: ".*", color: "#f0f" }]);
+        settings.should.have.a.property("projects");
+        settings.projects.should.have.a.property("enabled", false);
     });
 
 });

From 144104245818679711f0a1509cc4dccd450e39a7 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Wed, 3 Oct 2018 21:29:28 +0900
Subject: [PATCH 13/38] update close & input handling of File node

---
 nodes/core/storage/50-file.js | 166 ++++++++++++++++++----------------
 1 file changed, 86 insertions(+), 80 deletions(-)

diff --git a/nodes/core/storage/50-file.js b/nodes/core/storage/50-file.js
index 43195901f..936e2f84f 100644
--- a/nodes/core/storage/50-file.js
+++ b/nodes/core/storage/50-file.js
@@ -28,10 +28,9 @@ module.exports = function(RED) {
         this.createDir = n.createDir || false;
         var node = this;
         node.wstream = null;
-        node.data = [];
         node.msgQueue = [];
         node.closing = false;
-        node.closeCallbacks = [];
+        node.closeCallback = null;
 
         function processMsg(msg, done) {
             var filename = node.filename || msg.filename || "";
@@ -76,83 +75,81 @@ module.exports = function(RED) {
                 if (typeof data === "boolean") { data = data.toString(); }
                 if (typeof data === "number") { data = data.toString(); }
                 if ((node.appendNewline) && (!Buffer.isBuffer(data))) { data += os.EOL; }
-                node.data.push({msg:msg,data:Buffer.from(data)});
-
-                while (node.data.length > 0) {
-                    if (node.overwriteFile === "true") {
-                        (function(packet) {
-                            node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'w', autoClose:true });
-                            node.wstream.on("error", function(err) {
-                                node.error(RED._("file.errors.writefail",{error:err.toString()}),msg);
-                            });
-                            node.wstream.on("open", function() {
-                                node.wstream.end(packet.data, function() {
-                                    node.send(packet.msg);
-                                    done();
-                                });
-                            })
-                        })(node.data.shift());
-                    }
-                    else {
-                        // Append mode
-                        var recreateStream = !node.wstream || !node.filename;
-                        if (node.wstream && node.wstreamIno) {
-                            // There is already a stream open and we have the inode
-                            // of the file. Check the file hasn't been deleted
-                            // or deleted and recreated.
-                            try {
-                                var stat = fs.statSync(filename);
-                                // File exists - check the inode matches
-                                if (stat.ino !== node.wstreamIno) {
-                                    // The file has been recreated. Close the current
-                                    // stream and recreate it
-                                    recreateStream = true;
-                                    node.wstream.end();
-                                    delete node.wstream;
-                                    delete node.wstreamIno;
-                                }
-                            } catch(err) {
-                                // File does not exist
+                if (node.overwriteFile === "true") {
+                    var wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'w', autoClose:true });
+                    node.wstream = wstream;
+                    wstream.on("error", function(err) {
+                        node.error(RED._("file.errors.writefail",{error:err.toString()}),msg);
+                        done();
+                    });
+                    wstream.on("open", function() {
+                        wstream.end(data, function() {
+                            node.send(msg);
+                            done();
+                        });
+                    })
+                    return;
+                }
+                else {
+                    // Append mode
+                    var recreateStream = !node.wstream || !node.filename;
+                    if (node.wstream && node.wstreamIno) {
+                        // There is already a stream open and we have the inode
+                        // of the file. Check the file hasn't been deleted
+                        // or deleted and recreated.
+                        try {
+                            var stat = fs.statSync(filename);
+                            // File exists - check the inode matches
+                            if (stat.ino !== node.wstreamIno) {
+                                // The file has been recreated. Close the current
+                                // stream and recreate it
                                 recreateStream = true;
                                 node.wstream.end();
                                 delete node.wstream;
                                 delete node.wstreamIno;
                             }
-                        }
-                        if (recreateStream) {
-                            node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'a', autoClose:true });
-                            node.wstream.on("open", function(fd) {
-                                try {
-                                    var stat = fs.statSync(filename);
-                                    node.wstreamIno = stat.ino;
-                                } catch(err) {
-                                }
-                            });
-                            node.wstream.on("error", function(err) {
-                                node.error(RED._("file.errors.appendfail",{error:err.toString()}),msg);
-                            });
-                        }
-                        if (node.filename) {
-                            // Static filename - write and reuse the stream next time
-                            var packet = node.data.shift()
-                            node.wstream.write(packet.data, function() {
-                                node.send(packet.msg);
-                                done();
-                            });
-
-                        } else {
-                            // Dynamic filename - write and close the stream
-                            var packet = node.data.shift()
-                            node.wstream.end(packet.data, function() {
-                                node.send(packet.msg);
-                                delete node.wstream;
-                                delete node.wstreamIno;
-                                done();
-                            });
+                        } catch(err) {
+                            // File does not exist
+                            recreateStream = true;
+                            node.wstream.end();
+                            delete node.wstream;
+                            delete node.wstreamIno;
                         }
                     }
+                    if (recreateStream) {
+                        node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'a', autoClose:true });
+                        node.wstream.on("open", function(fd) {
+                            try {
+                                var stat = fs.statSync(filename);
+                                node.wstreamIno = stat.ino;
+                            } catch(err) {
+                            }
+                        });
+                        node.wstream.on("error", function(err) {
+                            node.error(RED._("file.errors.appendfail",{error:err.toString()}),msg);
+                            done();
+                        });
+                    }
+                    if (node.filename) {
+                        // Static filename - write and reuse the stream next time
+                        node.wstream.write(data, function() {
+                            node.send(msg);
+                            done();
+                        });
+                    } else {
+                        // Dynamic filename - write and close the stream
+                        node.wstream.end(data, function() {
+                            node.send(msg);
+                            delete node.wstream;
+                            delete node.wstreamIno;
+                            done();
+                        });
+                    }
                 }
             }
+            else {
+                done();
+            }
         }
 
         function processQ(queue) {
@@ -162,6 +159,9 @@ module.exports = function(RED) {
                 if (queue.length > 0) {
                     processQ(queue);
                 }
+                else if (node.closing) {
+                    closeNode();
+                }
             });
         }
 
@@ -171,9 +171,15 @@ module.exports = function(RED) {
                 // pending write exists
                 return;
             }
-            processQ(msgQueue);
-            if (node.closing) {
-                closeNode();
+            try {
+                processQ(msgQueue);
+            }
+            catch (e) {
+                node.msgQueue = [];
+                if (node.closing) {
+                    closeNode();
+                }
+                throw e;
             }
         });
 
@@ -181,23 +187,23 @@ module.exports = function(RED) {
             if (node.wstream) { node.wstream.end(); }
             if (node.tout) { clearTimeout(node.tout); }
             node.status({});
-            var callbacks = node.closeCallbacks;
-            node.closeCallbacks = [];
+            var cb = node.closeCallback;
+            node.closeCallback = null;
             node.closing = false;
-            for (cb in callbacks) {
+            if (cb) {
                 cb();
             }
         }
 
-        this.on('close', function(cb) {
-            if (cb) {
-                node.closeCallbacks.push(done);
-            }
+        this.on('close', function(done) {
             if (node.closing) {
                 // already closing
                 return;
             }
             node.closing = true;
+            if (done) {
+                node.closeCallback = done;
+            }
             if (node.msgQueue.length > 0) {
                 // close after queue processed
                 return;

From 14435c24acec74d770fb589b91ddfaac1c90b558 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Fri, 5 Oct 2018 21:16:57 +0900
Subject: [PATCH 14/38] fix i18n handling for ja-JP locale on Safari/MacOS

---
 .../editor-api/lib/editor/locales.js          | 14 ++++++++++-
 .../editor-api/lib/editor/locales_spec.js     | 24 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/locales.js b/packages/node_modules/@node-red/editor-api/lib/editor/locales.js
index ecf21d1ff..5e10647e7 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/locales.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/locales.js
@@ -21,6 +21,18 @@ var i18n = require("@node-red/util").i18n; // TODO: separate module
 
 var runtimeAPI;
 
+function loadResource(lang, namespace) {
+    var catalog = i18n.i.getResourceBundle(lang, namespace);
+    if (!catalog) {
+        var parts = lang.split("-");
+        if (parts.length == 2) {
+            var new_lang = parts[0];
+            return i18n.i.getResourceBundle(new_lang, namespace);
+        }
+    }
+    return catalog;
+}
+
 module.exports = {
     init: function(_runtimeAPI) {
         runtimeAPI = _runtimeAPI;
@@ -33,7 +45,7 @@ module.exports = {
         var prevLang = i18n.i.language;
         // Trigger a load from disk of the language if it is not the default
         i18n.i.changeLanguage(lang, function(){
-            var catalog = i18n.i.getResourceBundle(lang, namespace);
+            var catalog = loadResource(lang, namespace);
             res.json(catalog||{});
         });
         i18n.i.changeLanguage(prevLang);
diff --git a/test/unit/@node-red/editor-api/lib/editor/locales_spec.js b/test/unit/@node-red/editor-api/lib/editor/locales_spec.js
index d9cb1c600..2de9d4799 100644
--- a/test/unit/@node-red/editor-api/lib/editor/locales_spec.js
+++ b/test/unit/@node-red/editor-api/lib/editor/locales_spec.js
@@ -91,6 +91,30 @@ describe("api/editor/locales", function() {
                     done();
                 });
         });
+
+        it('returns for locale defined only with primary tag ', function(done) {
+            var orig = i18n.i.getResourceBundle;
+            i18n.i.getResourceBundle = function (lang, ns) {
+                if (lang === "ja-JP") {
+                    return undefined;
+                }
+                return orig(lang, ns);
+            };
+            request(app)
+                 // returns `ja` instead of `ja-JP`
+                .get("/locales/message-catalog?lng=ja-JP")
+                .expect(200)
+                .end(function(err,res) {
+                    i18n.i.getResourceBundle = orig;
+                    if (err) {
+                        return done(err);
+                    }
+                    res.body.should.have.property('namespace','message-catalog');
+                    res.body.should.have.property('lang','ja');
+                    done();
+                });
+        });
+
     });
 
     // describe('get all node resource catalogs',function() {

From 8235b7b96d1e8a437afde5b3da5fb53647521363 Mon Sep 17 00:00:00 2001
From: Yuma Matsuura <yuma.matsuura.uj@hitachi-solutions.com>
Date: Thu, 11 Oct 2018 18:16:08 +0900
Subject: [PATCH 15/38] Followed runtime-editor split

---
 package.json                                              | 1 +
 test/editor/editor_helper.js                              | 2 +-
 test/editor/pageobjects/editor/workspace_page.js          | 2 +-
 test/editor/pageobjects/nodes/core/core/58-debug_page.js  | 2 +-
 .../editor/pageobjects/nodes/core/logic/15-change_page.js | 8 ++++----
 test/editor/specs/scenario/cookbook_endpoint_uispec.js    | 5 +++--
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index b5d15970d..570173117 100644
--- a/package.json
+++ b/package.json
@@ -99,6 +99,7 @@
         "istanbul": "0.4.5",
         "minami": "1.2.3",
         "mocha": "^5.2.0",
+        "mosca": "^2.8.3",
         "should": "^8.4.0",
         "sinon": "1.17.7",
         "stoppable": "^1.0.6",
diff --git a/test/editor/editor_helper.js b/test/editor/editor_helper.js
index 281988484..656ebe5c7 100644
--- a/test/editor/editor_helper.js
+++ b/test/editor/editor_helper.js
@@ -21,7 +21,7 @@ var fs = require('fs-extra');
 var path = require('path');
 var app = express();
 
-var RED = require("../../red/red.js");
+var RED = require("../../packages/node_modules/node-red/lib/red.js");
 
 var utilPage = require("./pageobjects/util/util_page");
 
diff --git a/test/editor/pageobjects/editor/workspace_page.js b/test/editor/pageobjects/editor/workspace_page.js
index e62eb686f..7eca9d25a 100644
--- a/test/editor/pageobjects/editor/workspace_page.js
+++ b/test/editor/pageobjects/editor/workspace_page.js
@@ -16,7 +16,7 @@
 
  var when = require("when");
 
-var events = require("../../../../red/runtime/events.js");
+var events = require("../../../../packages/node_modules/@node-red/runtime/lib/events.js");
 
 var palette = require("./palette_page");
 var nodeFactory = require("../nodes/nodefactory_page");
diff --git a/test/editor/pageobjects/nodes/core/core/58-debug_page.js b/test/editor/pageobjects/nodes/core/core/58-debug_page.js
index c8c1d8871..0dc4c298e 100644
--- a/test/editor/pageobjects/nodes/core/core/58-debug_page.js
+++ b/test/editor/pageobjects/nodes/core/core/58-debug_page.js
@@ -29,7 +29,7 @@ debugNode.prototype.setOutput = function(complete) {
     browser.clickWithWait('//*[contains(@class, "red-ui-typedInput-container")]/button');
     if (complete !== 'true') {
         // Select the "msg" type.
-        browser.clickWithWait('/html/body/div[11]/a[1]');
+        browser.clickWithWait('//div[@class="red-ui-typedInput-options"][1]/a[1]');
         // Input the path in msg.
         browser.clickWithWait('//*[contains(@class, "red-ui-typedInput-input")]/input');
         browser.keys(['Control', 'a', 'Control']);
diff --git a/test/editor/pageobjects/nodes/core/logic/15-change_page.js b/test/editor/pageobjects/nodes/core/logic/15-change_page.js
index 1336e8069..51589f7b5 100644
--- a/test/editor/pageobjects/nodes/core/logic/15-change_page.js
+++ b/test/editor/pageobjects/nodes/core/logic/15-change_page.js
@@ -54,8 +54,8 @@ changeNode.prototype.ruleSet = function(p, pt, to, tot, index) {
     setT("set", index);
     if (pt) {
         browser.clickWithWait('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[1]/div/button[1]');
-        var num = 5 * index + 6;
-        var ptXPath = '/html/body/div[' + num + ']/a[' + ptType[pt] + ']';
+        var num = 5 * (index - 1) + 1;
+        var ptXPath = '//div[@class="red-ui-typedInput-options"][' + num + ']/a[' + ptType[pt] + ']';
         browser.clickWithWait(ptXPath);
     }
     if (p) {
@@ -63,8 +63,8 @@ changeNode.prototype.ruleSet = function(p, pt, to, tot, index) {
     }
     if (tot) {
         browser.clickWithWait('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[2]/div[2]/button[1]');
-        var num = 5 * index + 7;
-        var totXPath = '/html/body/div[' + num + ']/a[' + totType[tot] + ']';
+        var num = 5 * (index - 1) + 2;
+        var totXPath = '//div[@class="red-ui-typedInput-options"][' + num + ']/a[' + totType[tot] + ']';
         browser.clickWithWait(totXPath);
     }
     if (to) {
diff --git a/test/editor/specs/scenario/cookbook_endpoint_uispec.js b/test/editor/specs/scenario/cookbook_endpoint_uispec.js
index bb54da557..da672a747 100644
--- a/test/editor/specs/scenario/cookbook_endpoint_uispec.js
+++ b/test/editor/specs/scenario/cookbook_endpoint_uispec.js
@@ -315,8 +315,9 @@ describe('cookbook', function() {
             debugTab.open();
             debugTab.clearMessage();
             injectNode.clickLeftButton();
-            var message = debugTab.getMessage();
-            message[1].indexOf('application/json').should.not.eql(-1);
+            var messages = debugTab.getMessage();
+            var contents = messages.join([separator = ""]);
+            contents.indexOf('application/json').should.not.eql(-1);
         });
 
         it('serve a local file', function () {

From 925ebcc06e365288493f5946a0a02a94c53af6db Mon Sep 17 00:00:00 2001
From: YuLun Shih <shih@yulun.me>
Date: Fri, 12 Oct 2018 14:50:45 -0700
Subject: [PATCH 16/38] Add missing comma

---
 settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.js b/settings.js
index 6d6c6948b..641c56498 100644
--- a/settings.js
+++ b/settings.js
@@ -148,7 +148,7 @@ module.exports = {
 
     // The following property can be used to cause insecure HTTP connections to
     // be redirected to HTTPS.
-    //requireHttps: true
+    //requireHttps: true,
 
     // The following property can be used to disable the editor. The admin API
     // is not affected by this option. To disable both the editor and the admin

From f204c77ba3614970313e54ac00bb22f3750ea11e Mon Sep 17 00:00:00 2001
From: Yuma Matsuura <yuma.matsuura.uj@hitachi-solutions.com>
Date: Tue, 16 Oct 2018 10:29:58 +0900
Subject: [PATCH 17/38] Modify require paths

---
 test/editor/editor_helper.js                     | 2 +-
 test/editor/pageobjects/editor/workspace_page.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/editor/editor_helper.js b/test/editor/editor_helper.js
index 656ebe5c7..2cf103188 100644
--- a/test/editor/editor_helper.js
+++ b/test/editor/editor_helper.js
@@ -21,7 +21,7 @@ var fs = require('fs-extra');
 var path = require('path');
 var app = express();
 
-var RED = require("../../packages/node_modules/node-red/lib/red.js");
+var RED = require("nr-test-utils").require("node-red/lib/red.js");
 
 var utilPage = require("./pageobjects/util/util_page");
 
diff --git a/test/editor/pageobjects/editor/workspace_page.js b/test/editor/pageobjects/editor/workspace_page.js
index 7eca9d25a..e1a57d86d 100644
--- a/test/editor/pageobjects/editor/workspace_page.js
+++ b/test/editor/pageobjects/editor/workspace_page.js
@@ -16,7 +16,7 @@
 
  var when = require("when");
 
-var events = require("../../../../packages/node_modules/@node-red/runtime/lib/events.js");
+var events = require("nr-test-utils").require("@node-red/runtime/lib/events.js");
 
 var palette = require("./palette_page");
 var nodeFactory = require("../nodes/nodefactory_page");

From fc8c4063f22fa4dae450665eb9b8eb3677e55835 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 16 Oct 2018 11:36:24 +0100
Subject: [PATCH 18/38] Add markdown toolbar to flow description editor

---
 .../src/js/ui/editors/markdown.js             |  3 ++
 .../editor-client/src/js/ui/workspaces.js     | 28 ++++++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
index dd020e780..e75e1b617 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
@@ -199,6 +199,9 @@ RED.editor.types._markdown = (function() {
                         }
                     } else {
                         editor.session.replace(editor.selection.getRange(), (style.before||"")+current+(style.after||""));
+                        if (current === "") {
+                            editor.gotoLine(range.start.row+1,range.start.column+(style.before||"").length,false);
+                        }
                     }
                     editor.focus();
                 });
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
index 284bd6243..bb8fac23b 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
@@ -150,13 +150,14 @@ RED.workspaces = (function() {
 
                 $('<div class="form-row">'+
                     '<label for="node-input-disabled-btn" data-i18n="editor:workspace.status"></label>'+
-                    '<button id="node-input-disabled-btn" class="editor-button"><i class="fa fa-toggle-on"></i> <span id="node-input-disabled-label"></span></button> '+
+                    '<button type="button" id="node-input-disabled-btn" class="editor-button"><i class="fa fa-toggle-on"></i> <span id="node-input-disabled-label"></span></button> '+
                     '<input type="checkbox" id="node-input-disabled" style="display: none;"/>'+
                 '</div>').appendTo(dialogForm);
 
-                $('<div class="form-row node-text-editor-row">'+
+                var row = $('<div class="form-row node-text-editor-row">'+
                     '<label for="node-input-info" data-i18n="editor:workspace.info" style="width:300px;"></label>'+
-                    '<div style="height:250px;" class="node-text-editor" id="node-input-info"></div>'+
+                    '<div class="node-text-editor-toolbar"></div>'+
+                    '<div style="min-height:250px;" class="node-text-editor" id="node-input-info"></div>'+
                 '</div>').appendTo(dialogForm);
                 tabflowEditor = RED.editor.createEditor({
                     id: 'node-input-info',
@@ -164,7 +165,26 @@ RED.workspaces = (function() {
                     value: ""
                 });
 
-                $('<div class="form-tips" data-i18n="editor:workspace.tip"></div>').appendTo(dialogForm);
+                var toolbar = RED.editor.types._markdown.buildToolbar(row.find(".node-text-editor-toolbar"),tabflowEditor);
+
+                $('<button id="node-info-input-info-expand" class="editor-button" style="float: right;"><i class="fa fa-expand"></i></button>').appendTo(toolbar);
+
+                $('#node-info-input-info-expand').click(function(e) {
+                    e.preventDefault();
+                    var value = tabflowEditor.getValue();
+                    RED.editor.editMarkdown({
+                        value: value,
+                        width: "Infinity",
+                        cursor: tabflowEditor.getCursorPosition(),
+                        complete: function(v,cursor) {
+                            tabflowEditor.setValue(v, -1);
+                            tabflowEditor.gotoLine(cursor.row+1,cursor.column,false);
+                            setTimeout(function() {
+                                tabflowEditor.focus();
+                            },300);
+                        }
+                    })
+                });
 
                 dialogForm.find('#node-input-disabled-btn').on("click",function(e) {
                     var i = $(this).find("i");

From d40aa7260f405dc2d449891d08f496c444692431 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 16 Oct 2018 11:36:46 +0100
Subject: [PATCH 19/38] Mark all newly imported nodes as changed

---
 packages/node_modules/@node-red/editor-client/src/js/ui/view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 9746f5e68..ece448c64 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -2747,7 +2747,7 @@ RED.view = (function() {
                     RED.workspaces.show(new_default_workspace.id);
                 }
                 var new_ms = new_nodes.filter(function(n) { return n.hasOwnProperty("x") && n.hasOwnProperty("y") && n.z == RED.workspaces.active() }).map(function(n) { return {n:n};});
-                var new_node_ids = new_nodes.map(function(n){ return n.id; });
+                var new_node_ids = new_nodes.map(function(n){ n.changed = true; return n.id; });
 
                 // TODO: pick a more sensible root node
                 if (new_ms.length > 0) {

From 51a352183421a3a23079b766fad03bc7f9d93436 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Tue, 16 Oct 2018 19:48:50 +0900
Subject: [PATCH 20/38] Fix that unnecessary optionMenu remains

---
 editor/js/ui/common/typedInput.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/editor/js/ui/common/typedInput.js b/editor/js/ui/common/typedInput.js
index 6aab0bf53..5f78a2c74 100644
--- a/editor/js/ui/common/typedInput.js
+++ b/editor/js/ui/common/typedInput.js
@@ -537,6 +537,10 @@
                     } else {
                         this.selectLabel.text(opt.label);
                     }
+                    if (this.optionMenu) {
+                        this.optionMenu.remove();
+                        this.optionMenu = null;
+                    }
                     if (opt.options) {
                         if (this.optionExpandButton) {
                             this.optionExpandButton.hide();
@@ -627,10 +631,6 @@
                             }
                         }
                     } else {
-                        if (this.optionMenu) {
-                            this.optionMenu.remove();
-                            this.optionMenu = null;
-                        }
                         if (this.optionSelectTrigger) {
                             this.optionSelectTrigger.hide();
                         }

From dc3128fb3e02a2e308764b7eef6b2e39d1510918 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 16 Oct 2018 14:05:23 +0100
Subject: [PATCH 21/38] Add node module into to sidebar and palette popover

---
 .../editor-client/locales/en-US/editor.json   |  1 +
 .../editor-client/src/js/ui/palette.js        | 23 +++++++++++++++----
 .../editor-client/src/js/ui/tab-info.js       | 13 +++++++----
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index 84b4f025b..46523bc65 100644
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -440,6 +440,7 @@
             "label": "info",
             "node": "Node",
             "type": "Type",
+            "module": "Module",
             "id": "ID",
             "status": "Status",
             "enabled": "Enabled",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 6d5f0315f..3fbb77545 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -110,13 +110,26 @@ RED.palette = (function() {
         var popOverContent;
         try {
             var l = "<p><b>"+RED.text.bidi.enforceTextDirectionWithUCC(label)+"</b></p>";
-            if (label != type) {
-                l = "<p><b>"+RED.text.bidi.enforceTextDirectionWithUCC(label)+"</b><br/><i>"+type+"</i></p>";
-            }
-            popOverContent = $(l+(info?info:$("script[data-help-name='"+type+"']").html()||"<p>"+RED._("palette.noInfo")+"</p>").trim())
+            popOverContent = $('<div></div>').append($(l+(info?info:$("script[data-help-name='"+type+"']").html()||"<p>"+RED._("palette.noInfo")+"</p>").trim())
                                 .filter(function(n) {
                                     return (this.nodeType == 1 && this.nodeName == "P") || (this.nodeType == 3 && this.textContent.trim().length > 0)
-                                }).slice(0,2);
+                                }).slice(0,2));
+            popOverContent.find("a").each(function(){
+                var linkText = $(this).text();
+                $(this).before(linkText);
+                $(this).remove();
+            });
+
+            var typeInfo = RED.nodes.getType(type);
+
+            if (typeInfo) {
+                var metaData = "";
+                if (typeInfo && !/^subflow:/.test(type)) {
+                    metaData = typeInfo.set.module+" : ";
+                }
+                metaData += type;
+                $('<p>',{style:"font-size: 0.8em"}).text(metaData).appendTo(popOverContent);
+            }
         } catch(err) {
             // Malformed HTML may cause errors. TODO: need to understand what can break
             // NON-NLS: internal debug
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
index cc834475f..834eb40ec 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
@@ -207,6 +207,7 @@ RED.sidebar.info = (function() {
                         $('<span style="float: right; font-size: 0.8em"><i class="fa fa-warning"></i></span>').prependTo($(propRow.children()[1]))
                     }
                 }
+                var count = 0;
                 if (!m && node.type != "subflow") {
                     var defaults;
                     if (node.type === 'unknown') {
@@ -218,9 +219,13 @@ RED.sidebar.info = (function() {
                         })
                     } else if (node._def) {
                         defaults = node._def.defaults;
+                        propRow = $('<tr class="node-info-property-row'+(expandedSections.property?"":" hide")+'"><td>'+RED._("sidebar.info.module")+"</td><td></td></tr>").appendTo(tableBody);
+                        $(propRow.children()[1]).text(RED.nodes.getType(node.type).set.module);
+                        count++;
                     }
+                    $('<tr class="node-info-property-expand node-info-property-row blank'+(expandedSections.property?"":" hide")+'"><td colspan="2"></td></tr>').appendTo(tableBody);
+
                     if (defaults) {
-                        var count = 0;
                         for (var n in defaults) {
                             if (n != "name" && n != "info" && defaults.hasOwnProperty(n)) {
                                 var val = node[n];
@@ -254,9 +259,9 @@ RED.sidebar.info = (function() {
                                 }
                             }
                         }
-                        if (count > 0) {
-                            $('<tr class="node-info-property-expand blank"><td colspan="2"><a href="#" class=" node-info-property-header'+(expandedSections.property?" expanded":"")+'"><span class="node-info-property-show-more">'+RED._("sidebar.info.showMore")+'</span><span class="node-info-property-show-less">'+RED._("sidebar.info.showLess")+'</span> <i class="fa fa-caret-down"></i></a></td></tr>').appendTo(tableBody);
-                        }
+                    }
+                    if (count > 0) {
+                        $('<tr class="node-info-property-expand blank"><td colspan="2"><a href="#" class=" node-info-property-header'+(expandedSections.property?" expanded":"")+'"><span class="node-info-property-show-more">'+RED._("sidebar.info.showMore")+'</span><span class="node-info-property-show-less">'+RED._("sidebar.info.showLess")+'</span> <i class="fa fa-caret-down"></i></a></td></tr>').appendTo(tableBody);
                     }
                 }
                 if (node.type !== 'tab') {

From 1064e531f0322115713d2af2821da6c4611f3371 Mon Sep 17 00:00:00 2001
From: nakanishi <kazuki.nakanishi.vr@hitachi-solutions.com>
Date: Wed, 17 Oct 2018 10:31:47 +0900
Subject: [PATCH 22/38] Adjust the fa icon position for the node with height

---
 packages/node_modules/@node-red/editor-client/src/js/ui/view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index ece448c64..a97f9fd17 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -1913,7 +1913,6 @@ RED.view = (function() {
                 .attr("xlink:href",iconUrl)
                 .attr("class","fa-lg")
                 .attr("x",15)
-                .attr("y",21)
                 .attr("stroke","none")
                 .attr("fill","#ffffff")
                 .attr("text-anchor","middle")
@@ -2414,6 +2413,7 @@ RED.view = (function() {
                             thisNode.selectAll(".node_icon").attr("y",function(d){return (d.h-d3.select(this).attr("height"))/2;});
                             thisNode.selectAll(".node_icon_shade").attr("height",function(d){return d.h;});
                             thisNode.selectAll(".node_icon_shade_border").attr("d",function(d){ return "M "+(("right" == d._def.align) ?0:30)+" 1 l 0 "+(d.h-2)});
+                            thisNode.selectAll(".fa-lg").attr("y",function(d){return (d.h+13)/2;});
 
                             thisNode.selectAll(".node_button").attr("opacity",function(d) {
                                 return (activeSubflow||!isButtonEnabled(d))?0.4:1

From ce014044ea02570d9781d9acec4c22f81aa87e16 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Wed, 17 Oct 2018 15:43:09 +0900
Subject: [PATCH 23/38] Fix reference bug in message catalog

---
 .../runtime/lib/nodes/context/index.js        |  4 +--
 .../runtime/locales/en-US/runtime.json        |  7 ++--
 .../@node-red/runtime/locales/ja/runtime.json | 35 +++++++++----------
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/context/index.js b/packages/node_modules/@node-red/runtime/lib/nodes/context/index.js
index 6f63344e3..2716d2ad8 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/context/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/context/index.js
@@ -104,7 +104,7 @@ function load() {
                             try {
                                 plugin = require("./"+plugins[pluginName].module);
                             } catch(err) {
-                                return reject(new Error(log._("context.error-loading-module", {module:plugins[pluginName].module,message:err.toString()})));
+                                return reject(new Error(log._("context.error-loading-module2", {module:plugins[pluginName].module,message:err.toString()})));
                             }
                         } else {
                             // Assume `module` is an already-required module we can use
@@ -123,7 +123,7 @@ function load() {
                             }
                             log.info(log._("context.log-store-init", {name:pluginName, info:"module="+moduleInfo}));
                         } catch(err) {
-                            return reject(new Error(log._("context.error-loading-module",{module:pluginName,message:err.toString()})));
+                            return reject(new Error(log._("context.error-loading-module2",{module:pluginName,message:err.toString()})));
                         }
                     } else {
                         // Plugin does not specify a 'module'
diff --git a/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json b/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
index 2a328c0bb..8d47d8215 100644
--- a/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
+++ b/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
@@ -30,11 +30,10 @@
             "installed": "Installed module: __name__",
             "install-failed": "Install failed",
             "install-failed-long": "Installation of module __name__ failed:",
-            "install-failed-not-found": "$t(install-failed-long) module not found",
+            "install-failed-not-found": "$t(server.install.install-failed-long) module not found",
             "upgrading": "Upgrading module: __name__ to version: __version__",
             "upgraded": "Upgraded module: __name__. Restart Node-RED to use the new version",
             "upgrade-failed-not-found": "$t(server.install.install-failed-long) version not found",
-            "install-failed-not-found": "$t(server.install.install-failed-long) module not found",
             "uninstalling": "Uninstalling module: __name__",
             "uninstall-failed": "Uninstall failed",
             "uninstall-failed-long": "Uninstall of module __name__ failed:",
@@ -160,12 +159,12 @@
 
     "context": {
         "log-store-init": "Context store  : '__name__' [__info__]",
-        "error-loading-module": "Error loading context store '__module__': __message__ ",
+        "error-loading-module": "Error loading context store: __message__",
+        "error-loading-module2": "Error loading context store '__module__': __message__",
         "error-module-not-defined": "Context store '__storage__' missing 'module' option",
         "error-invalid-module-name": "Invalid context store name: '__name__'",
         "error-invalid-default-module": "Default context store unknown: '__storage__'",
         "unknown-store": "Unknown context store '__name__' specified. Using default store.",
-        "error-loading-module": "Error loading context store: __message__",
         "localfilesystem": {
             "error-circular": "Context __scope__ contains a circular reference that cannot be persisted",
             "error-write": "Error writing context: __message__"
diff --git a/packages/node_modules/@node-red/runtime/locales/ja/runtime.json b/packages/node_modules/@node-red/runtime/locales/ja/runtime.json
index 9eee93651..916519351 100644
--- a/packages/node_modules/@node-red/runtime/locales/ja/runtime.json
+++ b/packages/node_modules/@node-red/runtime/locales/ja/runtime.json
@@ -8,7 +8,6 @@
             "httpStatic": "HTTP Static    : __path__"
         }
     },
-
     "server": {
         "loading": "パレットノードのロード",
         "palette-editor": {
@@ -30,11 +29,10 @@
             "installed": "モジュール __name__ をインストールしました",
             "install-failed": "インストールに失敗しました",
             "install-failed-long": "モジュール __name__ のインストールに失敗しました:",
-            "install-failed-not-found": "$t(install-failed-long) モジュールが見つかりません",
+            "install-failed-not-found": "$t(server.install.install-failed-long) モジュールが見つかりません",
             "upgrading": "モジュール __name__ をバージョン __version__ に更新します",
             "upgraded": "モジュール __name__ を更新しました。新しいバージョンを使うには、Node-REDを再起動してください。",
             "upgrade-failed-not-found": "$t(server.install.install-failed-long) バージョンが見つかりません",
-            "install-failed-not-found": "$t(server.install.install-failed-long) モジュールが見つかりません",
             "uninstalling": "モジュールをアンインストールします: __name__",
             "uninstall-failed": "アンインストールに失敗しました",
             "uninstall-failed-long": "モジュール __name__ のアンインストールに失敗しました:",
@@ -49,7 +47,6 @@
         "headless-mode": "ヘッドレスモードで実行中です",
         "httpadminauth-deprecated": "httpAdminAuthは非推奨です。代わりに adminAuth を使用してください"
     },
-
     "api": {
         "flows": {
             "error-save": "フローの保存エラー: __message__",
@@ -67,27 +64,25 @@
             "error-enable": "ノードの有効化に失敗しました:"
         }
     },
-
     "comms": {
         "error": "通信チャネルエラー: __message__",
         "error-server": "サーバエラー: __message__",
         "error-send": "送信エラー: __message__"
     },
-
     "settings": {
         "user-not-available": "ユーザ設定を保存できません: __message__",
         "not-available": "設定が利用できません",
         "property-read-only": "プロパティ '__prop__' は読み出し専用です"
     },
-
     "nodes": {
         "credentials": {
-            "error":"クレデンシャルの読み込みエラー: __message__",
-            "error-saving":"クレデンシャルの保存エラー: __message__",
+            "error": "クレデンシャルの読み込みエラー: __message__",
+            "error-saving": "クレデンシャルの保存エラー: __message__",
             "not-registered": "クレデンシャル '__type__' は登録されていません",
             "system-key-warning": "\n\n---------------------------------------------------------------------\nフローのクレデンシャルファイルはシステム生成キーで暗号化されています。\n\nシステム生成キーを何らかの理由で失った場合、クレデンシャルファイルを\n復元することはできません。その場合、ファイルを削除してクレデンシャルを\n再入力しなければなりません。\n\n設定ファイル内で 'credentialSecret' オプションを使って独自キーを設定\nします。変更を次にデプロイする際、Node-REDは選択したキーを用いてクレ\nデンシャルを再暗号化します。 \n\n---------------------------------------------------------------------\n"
         },
         "flows": {
+            "safe-mode": "セーフモードでフローを停止しました。開始するためにはデプロイしてください",
             "registered-missing": "欠落しているノードを登録します: __type__",
             "error": "フローの読み込みエラー: __message__",
             "starting-modified-nodes": "更新されたノードを開始します",
@@ -128,7 +123,6 @@
             }
         }
     },
-    
     "storage": {
         "index": {
             "forbidden-flow-name": "不正なフロー名"
@@ -156,14 +150,17 @@
             }
         }
     },
-
     "context": {
-        "log-store-init": "コンテクストストア : '__name__' [__info__]",
-        "error-loading-module": "コンテクストストア '__module__' のロードでエラーが発生しました: __message__ ",
-        "error-module-not-defined": "コンテクストストア '__storage__' に 'module' オプションが指定されていません",
-        "error-invalid-module-name": "不正なコンテクストストア名: '__name__'",
-        "error-invalid-default-module": "デフォルトコンテクストストアが不明: '__storage__'",
-        "unknown-store": "不明なコンテクストストア '__name__' が指定されました。デフォルトストアを使用します。"        
-      }
-
+        "log-store-init": "コンテキストストア : '__name__' [__info__]",
+        "error-loading-module": "コンテキストストアのロードでエラーが発生しました: __message__",
+        "error-loading-module2": "コンテキストストア '__module__' のロードでエラーが発生しました: __message__",
+        "error-module-not-defined": "コンテキストストア '__storage__' に 'module' オプションが指定されていません",
+        "error-invalid-module-name": "不正なコンテキストストア名: '__name__'",
+        "error-invalid-default-module": "デフォルトコンテキストストアが不明: '__storage__'",
+        "unknown-store": "不明なコンテキストストア '__name__' が指定されました。デフォルトストアを使用します。",
+        "localfilesystem": {
+            "error-circular": "コンテキスト __scope__ は永続化できない循環参照を含んでいます",
+            "error-write": "コンテキスト書込みエラー: __message__"
+        }
+    }
 }

From 0f793ebd65c8feeada9c00f84b12fdc1c8097e7e Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Wed, 17 Oct 2018 18:03:21 +0900
Subject: [PATCH 24/38] Update Japanese message catalog

---
 .../editor-client/locales/ja/editor.json         | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
index 3a7570784..eb1ae260e 100644
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -78,6 +78,12 @@
             "projects-settings": "設定"
         }
     },
+    "actions": {
+        "toggle-navigator": "ナビゲータの表示/非表示を切替",
+        "zoom-out": "縮小",
+        "zoom-reset": "拡大/縮小を初期化",
+        "zoom-in": "拡大"
+    },
     "user": {
         "loggedInAs": "__name__ としてログインしました",
         "username": "ユーザ名",
@@ -334,6 +340,10 @@
             "analysis": "分析",
             "advanced": "その他"
         },
+        "actions": {
+            "collapse-all": "全カテゴリを折畳む",
+            "expand-all": "全カテゴリを展開"
+        },
         "event": {
             "nodeAdded": "ノードをパレットへ追加しました:",
             "nodeAdded_plural": "ノードをパレットへ追加しました",
@@ -486,7 +496,9 @@
             "editDescription": "プロジェクトの詳細を編集",
             "editDependencies": "プロジェクトの依存関係を編集",
             "editReadme": "README.mdを編集",
+            "showProjectSettings": "プロジェクト設定を表示",
             "projectSettings": {
+                "title": "プロジェクト設定",
                 "edit": "編集",
                 "none": "なし",
                 "install": "インストール",
@@ -726,7 +738,7 @@
             "repo-not-found": "リポジトリが見つかりません"
         },
         "default-files": {
-            "create": "プロジェクト関連ファアイルの作成",
+            "create": "プロジェクト関連ファイルの作成",
             "desc0": "プロジェクトはフローファイル、README、package.jsonを含みます。",
             "desc1": "その他、Gitリポジトリで管理したいファイルを含めても構いません。",
             "desc2": "既存のフローと認証情報ファイルをプロジェクトにコピーします。",
@@ -742,7 +754,7 @@
             "desc4": "認証情報を公開Gitリポジトリに保存する際には、秘密キーフレーズによって暗号化します。",
             "desc5": "フロー認証情報ファイルはsettingsファイルのcredentialSecretプロパティで暗号化されています。",
             "desc6": "フロー認証情報ファイルはシステムが生成したキーによって暗号化されています。このプロジェクト用に新しい秘密キーを指定してください。",
-            "desc7": "キーはプロジェクトファイルとば別に保存されます。他のNode-REDでこのプロジェクトを利用するには、このプロジェクトのキーが必要です。",
+            "desc7": "キーはプロジェクトファイルとは別に保存されます。他のNode-REDでこのプロジェクトを利用するには、このプロジェクトのキーが必要です。",
             "credentials": "認証情報",
             "enable": "暗号化を有効にする",
             "disable": "暗号化を無効にする",

From 289583325d3e74f9916034cab049b6ecc16b3666 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 17 Oct 2018 11:03:09 +0100
Subject: [PATCH 25/38] Allow palette to be hidden

---
 .../editor-client/locales/en-US/editor.json   |  3 ++
 .../editor-client/src/js/keymap.json          |  1 +
 .../@node-red/editor-client/src/js/red.js     |  1 +
 .../editor-client/src/js/ui/palette.js        | 36 ++++++++++++++++++-
 .../editor-client/src/js/ui/sidebar.js        | 25 +++++++++++++
 .../editor-client/src/js/ui/tab-info.js       | 15 ++++++++
 .../editor-client/src/sass/palette.scss       |  8 +++++
 .../editor-client/src/sass/sidebar.scss       | 27 ++++++++++++++
 .../editor-client/src/sass/workspace.scss     |  6 +++-
 9 files changed, 120 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index 46523bc65..9a8800df5 100644
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -46,6 +46,9 @@
             "sidebar": {
                 "show": "Show sidebar"
             },
+            "palette": {
+                "show": "Show palette"
+            },
             "settings": "Settings",
             "userSettings": "User Settings",
             "nodes": "Nodes",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/keymap.json b/packages/node_modules/@node-red/editor-client/src/js/keymap.json
index dc37232e2..5b7a94f1f 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/keymap.json
+++ b/packages/node_modules/@node-red/editor-client/src/js/keymap.json
@@ -14,6 +14,7 @@
         "ctrl-e": "core:show-export-dialog",
         "ctrl-i": "core:show-import-dialog",
         "ctrl-space": "core:toggle-sidebar",
+        "ctrl-p": "core:toggle-palette",
         "ctrl-,": "core:show-user-settings",
         "ctrl-alt-r": "core:show-remote-diff",
         "ctrl-alt-n": "core:new-project",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/red.js b/packages/node_modules/@node-red/editor-client/src/js/red.js
index d294c8376..4d8012cf4 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -434,6 +434,7 @@ var RED = (function() {
             //     {id:"menu-item-bidi-auto",toggle:"text-direction",label:RED._("menu.label.view.auto"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("auto")}}}
             // ]},
             // null,
+            {id:"menu-item-palette",label:RED._("menu.label.palette.show"),toggle:true,onselect:"core:toggle-palette", selected: true},
             {id:"menu-item-sidebar",label:RED._("menu.label.sidebar.show"),toggle:true,onselect:"core:toggle-sidebar", selected: true},
             null
         ]});
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 3fbb77545..4740ada58 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -20,7 +20,7 @@ RED.palette = (function() {
     var coreCategories = ['subflows', 'input', 'output', 'function', 'social', 'mobile', 'storage', 'analysis', 'advanced'];
 
     var categoryContainers = {};
-
+    var sidebarControls;
 
     function createCategory(originalCategory,rootCategory,category,ns) {
         if ($("#palette-base-category-"+rootCategory).length === 0) {
@@ -502,6 +502,20 @@ RED.palette = (function() {
             }
         })
 
+        sidebarControls = $('<div class="sidebar-control-left"><i class="fa fa-chevron-left"</div>').appendTo($("#palette"));
+        sidebarControls.click(function() {
+            RED.menu.toggleSelected("menu-item-palette");
+        })
+        $("#palette").on("mouseenter", function() {
+            sidebarControls.toggle("slide", { direction: "left" }, 100);
+        })
+        $("#palette").on("mouseleave", function() {
+            sidebarControls.hide();
+        })
+
+
+
+
         var categoryList = coreCategories;
         if (RED.settings.paletteCategories) {
             categoryList = RED.settings.paletteCategories;
@@ -534,7 +548,27 @@ RED.palette = (function() {
             }
         });
         RED.popover.tooltip($("#palette-expand-all"),RED._('palette.actions.expand-all'));
+
+        RED.actions.add("core:toggle-palette", function(state) {
+            if (state === undefined) {
+                RED.menu.toggleSelected("menu-item-palette");
+            } else {
+                togglePalette(state);
+            }
+        });
     }
+    function togglePalette(state) {
+        if (!state) {
+            $("#main-container").addClass("palette-closed");
+            sidebarControls.find("i").addClass("fa-chevron-right").removeClass("fa-chevron-left");
+        } else {
+            $("#main-container").removeClass("palette-closed");
+            sidebarControls.find("i").removeClass("fa-chevron-right").addClass("fa-chevron-left");
+        }
+        setTimeout(function() { $(window).resize(); } ,200);
+    }
+
+
     function getCategories() {
         var categories = [];
         $("#palette-container .palette-category").each(function(i,d) {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js b/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
index fe5c0f98e..63f726154 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
@@ -105,6 +105,8 @@ RED.sidebar = (function() {
     }
 
     var sidebarSeparator =  {};
+    sidebarSeparator.dragging = false;
+
     $("#sidebar-separator").draggable({
             axis: "x",
             start:function(event,ui) {
@@ -114,6 +116,7 @@ RED.sidebar = (function() {
                 sidebarSeparator.start = ui.position.left;
                 sidebarSeparator.chartWidth = $("#workspace").width();
                 sidebarSeparator.chartRight = winWidth-$("#workspace").width()-$("#workspace").offset().left-2;
+                sidebarSeparator.dragging = true;
 
                 if (!RED.menu.isSelected("menu-item-sidebar")) {
                     sidebarSeparator.opening = true;
@@ -166,6 +169,7 @@ RED.sidebar = (function() {
                 RED.events.emit("sidebar:resize");
             },
             stop:function(event,ui) {
+                sidebarSeparator.dragging = false;
                 if (sidebarSeparator.closing) {
                     $("#sidebar").removeClass("closing");
                     RED.menu.setSelected("menu-item-sidebar",false);
@@ -181,6 +185,27 @@ RED.sidebar = (function() {
             }
     });
 
+    var sidebarControls = $('<div class="sidebar-control-right"><i class="fa fa-chevron-right"</div>').appendTo($("#sidebar-separator"));
+    sidebarControls.click(function() {
+        sidebarControls.hide();
+        RED.menu.toggleSelected("menu-item-sidebar");
+    })
+    $("#sidebar-separator").on("mouseenter", function() {
+        if (!sidebarSeparator.dragging) {
+            if (RED.menu.isSelected("menu-item-sidebar")) {
+                sidebarControls.find("i").addClass("fa-chevron-right").removeClass("fa-chevron-left");
+            } else {
+                sidebarControls.find("i").removeClass("fa-chevron-right").addClass("fa-chevron-left");
+            }
+            sidebarControls.toggle("slide", { direction: "right" }, 100);
+        }
+    })
+    $("#sidebar-separator").on("mouseleave", function() {
+        if (!sidebarSeparator.dragging) {
+            sidebarControls.hide();
+        }
+    })
+
     function toggleSidebar(state) {
         if (!state) {
             $("#main-container").addClass("sidebar-closed");
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
index 834eb40ec..c7094095b 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
@@ -133,6 +133,7 @@ RED.sidebar.info = (function() {
 
         var table = $('<table class="node-info"></table>').appendTo(propertiesSection.content);
         var tableBody = $('<tbody>').appendTo(table);
+
         var subflowNode;
         var subflowUserCount;
 
@@ -313,6 +314,20 @@ RED.sidebar.info = (function() {
                 $(".node-info-property-row").toggle(expandedSections["property"]);
             });
         }
+
+
+        $('<tr class="blank"><th colspan="2"></th></tr>').appendTo(tableBody);
+        propRow = $('<tr class="node-info-node-row"><td>Actions</td><td></td></tr>').appendTo(tableBody);
+        var actionBar = $(propRow.children()[1]);
+
+        // var actionBar = $('<div>',{style:"background: #fefefe; padding: 3px;"}).appendTo(propertiesSection.content);
+        $('<button type="button" class="editor-button"><i class="fa fa-code"></i></button>').appendTo(actionBar);
+        $('<button type="button" class="editor-button"><i class="fa fa-code"></i></button>').appendTo(actionBar);
+        $('<button type="button" class="editor-button"><i class="fa fa-code"></i></button>').appendTo(actionBar);
+        $('<button type="button" class="editor-button"><i class="fa fa-code"></i></button>').appendTo(actionBar);
+
+
+
     }
     function setInfoText(infoText,target) {
         var info = addTargetToExternalLinks($('<div class="node-help"><span class="bidiAware" dir=\"'+RED.text.bidi.resolveBaseTextDir(infoText)+'">'+infoText+'</span></div>')).appendTo(target);
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/palette.scss b/packages/node_modules/@node-red/editor-client/src/sass/palette.scss
index e74c5c77b..d656fe4bb 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/palette.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/palette.scss
@@ -28,6 +28,14 @@
     transition: width 0.2s ease-in-out;
 }
 
+.palette-closed {
+    #palette { width: 8px; }
+    #palette-search { display: none; }
+    #palette-container { display: none; }
+    #palette-collapse-all { display: none; }
+    #palette-expand-all { display: none; }
+}
+
 .palette-expanded {
     & #palette {
         width: 380px;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/sidebar.scss b/packages/node_modules/@node-red/editor-client/src/sass/sidebar.scss
index 4c8192bf8..d06b3d3cc 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/sidebar.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/sidebar.scss
@@ -103,3 +103,30 @@
 .sidebar-shade {
     @include shade;
 }
+
+
+@mixin sidebar-control {
+    display: none;
+    position: absolute;
+    top: calc(50% - 26px);
+
+    padding:15px 8px;
+    border:1px solid #ccc;
+    background:#f9f9f9;
+    color: #999;
+    text-align: center;
+    cursor: pointer;
+}
+
+.sidebar-control-right {
+    @include sidebar-control;
+    right: calc(100%);
+    border-top-left-radius: 5px;
+    border-bottom-left-radius: 5px;
+}
+.sidebar-control-left {
+    @include sidebar-control;
+    left: calc(100%);
+    border-top-right-radius: 5px;
+    border-bottom-right-radius: 5px;
+}
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/workspace.scss b/packages/node_modules/@node-red/editor-client/src/sass/workspace.scss
index 14b6eebb0..726c67dee 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/workspace.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/workspace.scss
@@ -40,10 +40,14 @@
     right: 322px;
     overflow: hidden;
     @include component-border;
-    transition: left 0.2s ease-in-out;
+    transition: left 0.1s ease-in-out;
 
 }
 
+.palette-closed  #workspace {
+    left: 7px;
+}
+
 .workspace-footer-button {
     @include component-footer-button;
 }

From 242398c7243c9eba3037e12fe60a013b8f027e9e Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 17 Oct 2018 13:18:08 +0100
Subject: [PATCH 26/38] Slow down sidebar control appearance

Also hides WIP action info panel buttons
---
 .../editor-client/src/js/ui/palette.js         |  3 ++-
 .../editor-client/src/js/ui/sidebar.js         |  2 +-
 .../editor-client/src/js/ui/tab-info.js        | 18 +++++++++---------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 4740ada58..121c53994 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -507,7 +507,7 @@ RED.palette = (function() {
             RED.menu.toggleSelected("menu-item-palette");
         })
         $("#palette").on("mouseenter", function() {
-            sidebarControls.toggle("slide", { direction: "left" }, 100);
+            sidebarControls.toggle("slide", { direction: "left" }, 200);
         })
         $("#palette").on("mouseleave", function() {
             sidebarControls.hide();
@@ -560,6 +560,7 @@ RED.palette = (function() {
     function togglePalette(state) {
         if (!state) {
             $("#main-container").addClass("palette-closed");
+            sidebarControls.hide();
             sidebarControls.find("i").addClass("fa-chevron-right").removeClass("fa-chevron-left");
         } else {
             $("#main-container").removeClass("palette-closed");
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js b/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
index 63f726154..d068e9625 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
@@ -197,7 +197,7 @@ RED.sidebar = (function() {
             } else {
                 sidebarControls.find("i").removeClass("fa-chevron-right").addClass("fa-chevron-left");
             }
-            sidebarControls.toggle("slide", { direction: "right" }, 100);
+            sidebarControls.toggle("slide", { direction: "right" }, 200);
         }
     })
     $("#sidebar-separator").on("mouseleave", function() {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
index c7094095b..d2534538a 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
@@ -316,15 +316,15 @@ RED.sidebar.info = (function() {
         }
 
 
-        $('<tr class="blank"><th colspan="2"></th></tr>').appendTo(tableBody);
-        propRow = $('<tr class="node-info-node-row"><td>Actions</td><td></td></tr>').appendTo(tableBody);
-        var actionBar = $(propRow.children()[1]);
-
-        // var actionBar = $('<div>',{style:"background: #fefefe; padding: 3px;"}).appendTo(propertiesSection.content);
-        $('<button type="button" class="editor-button"><i class="fa fa-code"></i></button>').appendTo(actionBar);
-        $('<button type="button" class="editor-button"><i class="fa fa-code"></i></button>').appendTo(actionBar);
-        $('<button type="button" class="editor-button"><i class="fa fa-code"></i></button>').appendTo(actionBar);
-        $('<button type="button" class="editor-button"><i class="fa fa-code"></i></button>').appendTo(actionBar);
+        // $('<tr class="blank"><th colspan="2"></th></tr>').appendTo(tableBody);
+        // propRow = $('<tr class="node-info-node-row"><td>Actions</td><td></td></tr>').appendTo(tableBody);
+        // var actionBar = $(propRow.children()[1]);
+        //
+        // // var actionBar = $('<div>',{style:"background: #fefefe; padding: 3px;"}).appendTo(propertiesSection.content);
+        // $('<button type="button" class="editor-button"><i class="fa fa-code"></i></button>').appendTo(actionBar);
+        // $('<button type="button" class="editor-button"><i class="fa fa-code"></i></button>').appendTo(actionBar);
+        // $('<button type="button" class="editor-button"><i class="fa fa-code"></i></button>').appendTo(actionBar);
+        // $('<button type="button" class="editor-button"><i class="fa fa-code"></i></button>').appendTo(actionBar);
 
 
 

From 2816b3edaebe5b0c39d591daa80e503a6dc7cbff Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 17 Oct 2018 13:45:57 +0100
Subject: [PATCH 27/38] Add tooltip to flow add button

---
 .../editor-client/locales/en-US/editor.json      |  1 +
 .../editor-client/src/js/ui/common/tabs.js       | 16 +++++++++++++---
 .../editor-client/src/js/ui/workspaces.js        | 11 +++++------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index 9a8800df5..304b9436d 100644
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -23,6 +23,7 @@
         "confirmDelete": "Confirm delete",
         "delete": "Are you sure you want to delete '__label__'?",
         "dropFlowHere": "Drop the flow here",
+        "addFlow": "Add Flow",
         "status": "Status",
         "enabled": "Enabled",
         "disabled":"Disabled",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
index 7252d0998..02736a9b4 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
@@ -34,14 +34,24 @@ RED.tabs = (function() {
         if (options.vertical) {
             wrapper.addClass("red-ui-tabs-vertical");
         }
-        if (options.addButton && typeof options.addButton === 'function') {
+        if (options.addButton) {
             wrapper.addClass("red-ui-tabs-add");
             var addButton = $('<div class="red-ui-tab-button"><a href="#"><i class="fa fa-plus"></i></a></div>').appendTo(wrapper);
             addButton.find('a').click(function(evt) {
                 evt.preventDefault();
-                options.addButton();
+                if (typeof options.addButton === 'function') {
+                    options.addButton();
+                } else if (typeof options.addButton === 'string') {
+                    RED.actions.invoke(options.addButton);
+                }
             })
-
+            if (typeof options.addButton === 'string') {
+                var l = options.addButton;
+                if (options.addButtonCaption) {
+                    l = options.addButtonCaption
+                }
+                RED.popover.tooltip(addButton,l,options.addButton);
+            }
         }
         var scrollLeft;
         var scrollRight;
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
index bb8fac23b..b6b2898f2 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
@@ -289,9 +289,8 @@ RED.workspaces = (function() {
             },
             minimumActiveTabWidth: 150,
             scrollable: true,
-            addButton: function() {
-                addWorkspace();
-            }
+            addButton: "core:add-flow",
+            addButtonCaption: RED._("workspace.addFlow")
         });
         workspaceTabCount = 0;
     }
@@ -339,9 +338,9 @@ RED.workspaces = (function() {
             if (workspace_tabs.contains(ws.id)) {
                 workspace_tabs.removeTab(ws.id);
             }
-        }
-        if (ws.id === activeWorkspace) {
-            activeWorkspace = 0;
+            if (ws.id === activeWorkspace) {
+                activeWorkspace = 0;
+            }
         }
     }
 

From b2516117f51817983be1b9a4b598f03d695c6fc5 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 18 Oct 2018 23:49:47 +0100
Subject: [PATCH 28/38] Add event log to editor

Shows output from git pull/push and npm install in the editor
---
 Gruntfile.js                                  |   1 +
 .../editor-client/locales/en-US/editor.json   |   4 +
 .../editor-client/src/js/keymap.json          |   3 +-
 .../@node-red/editor-client/src/js/red.js     |   6 +
 .../editor-client/src/js/ui/event-log.js      | 121 +++++++++++++++
 .../editor-client/src/js/ui/palette-editor.js |  80 +++++++++-
 .../src/js/ui/projects/tab-versionControl.js  |  12 ++
 .../@node-red/editor-client/src/sass/ace.scss |  13 ++
 .../@node-red/registry/lib/installer.js       | 110 ++++++--------
 .../@node-red/runtime/lib/api/comms.js        |  17 +++
 .../@node-red/runtime/lib/exec.js             |  69 +++++++++
 .../@node-red/runtime/lib/index.js            |   3 +
 .../localfilesystem/projects/git/index.js     | 140 ++++++++----------
 packages/node_modules/@node-red/util/index.js |   5 +-
 packages/node_modules/node-red/lib/red.js     |  13 --
 .../@node-red/registry/lib/installer_spec.js  | 140 +++++++++---------
 test/unit/@node-red/runtime/lib/exec_spec.js  |  22 +++
 17 files changed, 535 insertions(+), 224 deletions(-)
 create mode 100644 packages/node_modules/@node-red/editor-client/src/js/ui/event-log.js
 create mode 100644 packages/node_modules/@node-red/runtime/lib/exec.js
 create mode 100644 test/unit/@node-red/runtime/lib/exec_spec.js

diff --git a/Gruntfile.js b/Gruntfile.js
index 272290495..411b6305f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -156,6 +156,7 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/editor.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/editors/*.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/event-log.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/tray.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/library.js",
diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index 304b9436d..9e0dcab33 100644
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -215,6 +215,10 @@
             "plusNMore": "+ __count__ more"
         }
     },
+    "eventLog": {
+        "title": "Event log",
+        "view": "View log"
+    },
     "diff": {
         "unresolvedCount": "__count__ unresolved conflict",
         "unresolvedCount_plural": "__count__ unresolved conflicts",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/keymap.json b/packages/node_modules/@node-red/editor-client/src/js/keymap.json
index 5b7a94f1f..b94290862 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/keymap.json
+++ b/packages/node_modules/@node-red/editor-client/src/js/keymap.json
@@ -19,7 +19,8 @@
         "ctrl-alt-r": "core:show-remote-diff",
         "ctrl-alt-n": "core:new-project",
         "ctrl-alt-o": "core:open-project",
-        "ctrl-g v": "core:show-version-control-tab"
+        "ctrl-g v": "core:show-version-control-tab",
+        "ctrl-shift-l": "core:show-event-log"
     },
     "workspace": {
         "backspace": "core:delete-selection",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/red.js b/packages/node_modules/@node-red/editor-client/src/js/red.js
index 4d8012cf4..7c5bd3dda 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -398,6 +398,10 @@ var RED = (function() {
             // Refresh flow library to ensure any examples are updated
             RED.library.loadFlowLibrary();
         });
+        RED.comms.subscribe("event-log/#", function(topic,payload) {
+            var id = topic.substring(9);
+            RED.eventLog.log(id,payload);
+        });
     }
 
     function showAbout() {
@@ -436,6 +440,7 @@ var RED = (function() {
             // null,
             {id:"menu-item-palette",label:RED._("menu.label.palette.show"),toggle:true,onselect:"core:toggle-palette", selected: true},
             {id:"menu-item-sidebar",label:RED._("menu.label.sidebar.show"),toggle:true,onselect:"core:toggle-sidebar", selected: true},
+            {id:"menu-item-event-log",label:RED._("eventLog.title"),onselect:"core:show-event-log"},
             null
         ]});
         menuOptions.push(null);
@@ -483,6 +488,7 @@ var RED = (function() {
         RED.library.init();
         RED.keyboard.init();
         RED.palette.init();
+        RED.eventLog.init();
         if (RED.settings.theme('palette.editable') !== false) {
             RED.palette.editor.init();
         } else {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/event-log.js b/packages/node_modules/@node-red/editor-client/src/js/ui/event-log.js
new file mode 100644
index 000000000..c024b06fe
--- /dev/null
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/event-log.js
@@ -0,0 +1,121 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+RED.eventLog = (function() {
+
+    var template = '<script type="text/x-red" data-template-name="_eventLog"><div class="form-row node-text-editor-row"><div style="height: 100%;min-height: 150px;" class="node-text-editor" id="event-log-editor"></div></div></script>';
+
+    var eventLogEditor;
+    var backlog = [];
+    var shown = false;
+
+    function appendLogLine(line) {
+        backlog.push(line);
+        if (backlog.length > 500) {
+            backlog = backlog.slice(-500);
+        }
+        if (eventLogEditor) {
+            eventLogEditor.getSession().insert({
+                row: eventLogEditor.getSession().getLength(),
+                column: 0
+            }, "\n" + line);
+            eventLogEditor.scrollToLine(eventLogEditor.getSession().getLength());
+        }
+    }
+    return {
+        init: function() {
+            $(template).appendTo(document.body);
+            RED.actions.add("core:show-event-log",RED.eventLog.show);
+        },
+        show: function() {
+            if (shown) {
+                return;
+            }
+            shown = true;
+            var type = "_eventLog"
+
+            var trayOptions = {
+                title: RED._("eventLog.title"),
+                width: Infinity,
+                buttons: [
+                    {
+                        id: "node-dialog-close",
+                        text: RED._("common.label.close"),
+                        click: function() {
+                            RED.tray.close();
+                        }
+                    }
+                ],
+                resize: function(dimensions) {
+                    var rows = $("#dialog-form>div:not(.node-text-editor-row)");
+                    var editorRow = $("#dialog-form>div.node-text-editor-row");
+                    var height = $("#dialog-form").height();
+                    for (var i=0;i<rows.size();i++) {
+                        height -= $(rows[i]).outerHeight(true);
+                    }
+                    height -= (parseInt($("#dialog-form").css("marginTop"))+parseInt($("#dialog-form").css("marginBottom")));
+                    $(".node-text-editor").css("height",height+"px");
+                    eventLogEditor.resize();
+                },
+                open: function(tray) {
+                    var trayBody = tray.find('.editor-tray-body');
+                    var dialogForm = RED.editor.buildEditForm(tray.find('.editor-tray-body'),'dialog-form',type,'editor');
+                    eventLogEditor = RED.editor.createEditor({
+                        id: 'event-log-editor',
+                        value: backlog.join("\n"),
+                        lineNumbers: false,
+                        readOnly: true,
+                        options: {
+                            showPrintMargin: false
+                        }
+                    });
+                    setTimeout(function() {
+                        eventLogEditor.scrollToLine(eventLogEditor.getSession().getLength());
+                    },200);
+                    dialogForm.i18n();
+                },
+                close: function() {
+                    eventLogEditor.destroy();
+                    eventLogEditor = null;
+                    shown = false;
+                },
+                show: function() {}
+            }
+            RED.tray.show(trayOptions);
+        },
+        log: function(id,payload) {
+            var ts = (new Date(payload.ts)).toISOString()+" ";
+            if (payload.type) {
+                ts += "["+payload.type+"] "
+            }
+            if (payload.data) {
+                var data = payload.data;
+                if (data.endsWith('\n')) {
+                    data = data.substring(0,data.length-1);
+                }
+                var lines = data.split(/\n/);
+                lines.forEach(function(line) {
+                    appendLogLine(ts+line);
+                })
+            }
+        },
+        startEvent: function(name) {
+            backlog.push("");
+            backlog.push("-----------------------------------------------------------");
+            backlog.push((new Date()).toISOString()+" "+name);
+            backlog.push("");
+        }
+    }
+})();
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
index 90afe0aab..12febdcf2 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
@@ -863,11 +863,35 @@ RED.palette.editor = (function() {
                     class: "primary palette-module-install-confirm-button-update",
                     click: function() {
                         var spinner = RED.utils.addSpinnerOverlay(container, true);
+                        var buttonRow = $('<div style="position: relative;bottom: calc(50% + 17px); padding-right: 10px;text-align: right;"></div>').appendTo(spinner);
+                        $('<button class="editor-button"></button>').text(RED._("eventLog.view")).appendTo(buttonRow).click(function(evt) {
+                            evt.preventDefault();
+                            RED.actions.invoke("core:show-event-log");
+                        });
+                        RED.eventLog.startEvent(RED._("palette.editor.confirm.button.install")+" : "+entry.name+" "+version);
                         installNodeModule(entry.name,version,function(xhr) {
                             spinner.remove();
                             if (xhr) {
                                 if (xhr.responseJSON) {
-                                    RED.notify(RED._('palette.editor.errors.updateFailed',{module: entry.name,message:xhr.responseJSON.message}));
+                                    var notification = RED.notify(RED._('palette.editor.errors.updateFailed',{module: entry.name,message:xhr.responseJSON.message}),{
+                                        type: 'error',
+                                        modal: true,
+                                        fixed: true,
+                                        buttons: [
+                                            {
+                                                text: RED._("common.label.close"),
+                                                click: function() {
+                                                    notification.close();
+                                                }
+                                            },{
+                                                text: RED._("eventLog.view"),
+                                                click: function() {
+                                                    notification.close();
+                                                    RED.actions.invoke("core:show-event-log");
+                                                }
+                                            }
+                                        ]
+                                    });
                                 }
                             }
                             done(xhr);
@@ -898,12 +922,35 @@ RED.palette.editor = (function() {
                     class: "primary palette-module-install-confirm-button-remove",
                     click: function() {
                         var spinner = RED.utils.addSpinnerOverlay(container, true);
+                        var buttonRow = $('<div style="position: relative;bottom: calc(50% + 17px); padding-right: 10px;text-align: right;"></div>').appendTo(spinner);
+                        $('<button class="editor-button"></button>').text(RED._("eventLog.view")).appendTo(buttonRow).click(function(evt) {
+                            evt.preventDefault();
+                            RED.actions.invoke("core:show-event-log");
+                        });
+                        RED.eventLog.startEvent(RED._("palette.editor.confirm.button.remove")+" : "+entry.name);
                         removeNodeModule(entry.name, function(xhr) {
                             spinner.remove();
                             if (xhr) {
                                 if (xhr.responseJSON) {
-                                    RED.notify(RED._('palette.editor.errors.removeFailed',{module: entry.name,message:xhr.responseJSON.message}));
-                                }
+                                    var notification = RED.notify(RED._('palette.editor.errors.removeFailed',{module: entry.name,message:xhr.responseJSON.message}),{
+                                        type: 'error',
+                                        modal: true,
+                                        fixed: true,
+                                        buttons: [
+                                            {
+                                                text: RED._("common.label.close"),
+                                                click: function() {
+                                                    notification.close();
+                                                }
+                                            },{
+                                                text: RED._("eventLog.view"),
+                                                click: function() {
+                                                    notification.close();
+                                                    RED.actions.invoke("core:show-event-log");
+                                                }
+                                            }
+                                        ]
+                                    });                                }
                             }
                         })
                         notification.close();
@@ -940,11 +987,36 @@ RED.palette.editor = (function() {
             class: "primary palette-module-install-confirm-button-install",
             click: function() {
                 var spinner = RED.utils.addSpinnerOverlay(container, true);
+
+                var buttonRow = $('<div style="position: relative;bottom: calc(50% + 17px); padding-right: 10px;text-align: right;"></div>').appendTo(spinner);
+                $('<button class="editor-button"></button>').text(RED._("eventLog.view")).appendTo(buttonRow).click(function(evt) {
+                    evt.preventDefault();
+                    RED.actions.invoke("core:show-event-log");
+                });
+                RED.eventLog.startEvent(RED._("palette.editor.confirm.button.install")+" : "+entry.id+" "+entry.version);
                 installNodeModule(entry.id,entry.version,function(xhr) {
                     spinner.remove();
                      if (xhr) {
                          if (xhr.responseJSON) {
-                             RED.notify(RED._('palette.editor.errors.installFailed',{module: entry.id,message:xhr.responseJSON.message}));
+                             var notification = RED.notify(RED._('palette.editor.errors.installFailed',{module: entry.id,message:xhr.responseJSON.message}),{
+                                 type: 'error',
+                                 modal: true,
+                                 fixed: true,
+                                 buttons: [
+                                     {
+                                         text: RED._("common.label.close"),
+                                         click: function() {
+                                             notification.close();
+                                         }
+                                     },{
+                                         text: RED._("eventLog.view"),
+                                         click: function() {
+                                             notification.close();
+                                             RED.actions.invoke("core:show-event-log");
+                                         }
+                                     }
+                                 ]
+                             });
                          }
                      }
                      done(xhr);
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js
index 22fbc12f3..a153fe4da 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js
@@ -870,7 +870,13 @@ RED.sidebar.versionControl = (function() {
             .click(function(e) {
                 e.preventDefault();
                 var spinner = utils.addSpinnerOverlay(remoteBox).addClass("projects-dialog-spinner-contain");
+                var buttonRow = $('<div style="position: relative; bottom: 60px;"></div>').appendTo(spinner);
+                $('<button class="editor-button"></button>').text(RED._("eventLog.view")).appendTo(buttonRow).click(function(evt) {
+                    evt.preventDefault();
+                    RED.actions.invoke("core:show-event-log");
+                });
                 var activeProject = RED.projects.getActiveProject();
+                RED.eventLog.startEvent("Push changes"+(activeProject.git.branches.remoteAlt?(" : "+activeProject.git.branches.remoteAlt):""));
                 var url = "projects/"+activeProject.name+"/push";
                 if (activeProject.git.branches.remoteAlt) {
                     url+="/"+activeProject.git.branches.remoteAlt;
@@ -914,7 +920,13 @@ RED.sidebar.versionControl = (function() {
         var pullRemote = function(options) {
             options = options || {};
             var spinner = utils.addSpinnerOverlay(remoteBox).addClass("projects-dialog-spinner-contain");
+            var buttonRow = $('<div style="position: relative; bottom: 60px;"></div>').appendTo(spinner);
+            $('<button class="editor-button"></button>').text(RED._("eventLog.view")).appendTo(buttonRow).click(function(evt) {
+                evt.preventDefault();
+                RED.actions.invoke("core:show-event-log");
+            });
             var activeProject = RED.projects.getActiveProject();
+            RED.eventLog.startEvent("Pull changes"+(activeProject.git.branches.remoteAlt?(" : "+activeProject.git.branches.remoteAlt):""));
             var url = "projects/"+activeProject.name+"/pull";
             if (activeProject.git.branches.remoteAlt) {
                 url+="/"+activeProject.git.branches.remoteAlt;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/ace.scss b/packages/node_modules/@node-red/editor-client/src/sass/ace.scss
index 9425c356c..c5f85badc 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/ace.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/ace.scss
@@ -6,3 +6,16 @@
     border-top-right-radius: 4px;
     border-bottom-right-radius: 4px;
 }
+
+#event-log-editor {
+    .ace_scroller {
+        background: #444;
+        color: #dd9;
+    }
+    .ace_active-line {
+        background: #666 !important;
+    }
+    .ace_selection {
+        background: #999 !important;
+    }
+}
diff --git a/packages/node_modules/@node-red/registry/lib/installer.js b/packages/node_modules/@node-red/registry/lib/installer.js
index 9ec84a2f3..66768a620 100644
--- a/packages/node_modules/@node-red/registry/lib/installer.js
+++ b/packages/node_modules/@node-red/registry/lib/installer.js
@@ -21,6 +21,7 @@ var fs = require("fs");
 var registry = require("./registry");
 var library = require("./library");
 var log;
+var exec;
 
 var events;
 
@@ -36,6 +37,7 @@ function init(runtime) {
     events = runtime.events;
     settings = runtime.settings;
     log = runtime.log;
+    exec = runtime.exec;
 }
 
 var activePromise = Promise.resolve();
@@ -104,50 +106,40 @@ function installModule(module,version) {
             var installDir = settings.userDir || process.env.NODE_RED_HOME || ".";
             var args = ['install','--save','--save-prefix="~"','--production',installName];
             log.trace(npmCommand + JSON.stringify(args));
-            var child = child_process.spawn(npmCommand,args,{
-                cwd: installDir,
-                shell: true
-            });
-            var output = "";
-            child.stdout.on('data', (data) => {
-                output += data;
-            });
-            child.stderr.on('data', (data) => {
-                output += data;
-            });
-            child.on('close', (code) => {
-                if (code !== 0) {
-                    var e;
-                    var lookFor404 = new RegExp(" 404 .*"+module,"m");
-                    var lookForVersionNotFound = new RegExp("version not found: "+module+"@"+version,"m");
-                    if (lookFor404.test(output)) {
-                        log.warn(log._("server.install.install-failed-not-found",{name:module}));
-                        e = new Error("Module not found");
-                        e.code = 404;
-                        reject(e);
-                    } else if (isUpgrade && lookForVersionNotFound.test(output)) {
-                        log.warn(log._("server.install.upgrade-failed-not-found",{name:module}));
-                        e = new Error("Module not found");
-                        e.code = 404;
-                        reject(e);
-                    } else {
-                        log.warn(log._("server.install.install-failed-long",{name:module}));
-                        log.warn("------------------------------------------");
-                        log.warn(output);
-                        log.warn("------------------------------------------");
-                        reject(new Error(log._("server.install.install-failed")));
-                    }
+            exec.run(npmCommand,args,{
+                cwd: installDir
+            }, true).then(result => {
+                if (!isUpgrade) {
+                    log.info(log._("server.install.installed",{name:module}));
+                    resolve(require("./index").addModule(module).then(reportAddedModules));
                 } else {
-                    if (!isUpgrade) {
-                        log.info(log._("server.install.installed",{name:module}));
-                        resolve(require("./index").addModule(module).then(reportAddedModules));
-                    } else {
-                        log.info(log._("server.install.upgraded",{name:module, version:version}));
-                        events.emit("runtime-event",{id:"restart-required",payload:{type:"warning",text:"notification.warnings.restartRequired"},retain:true});
-                        resolve(require("./registry").setModulePendingUpdated(module,version));
-                    }
+                    log.info(log._("server.install.upgraded",{name:module, version:version}));
+                    events.emit("runtime-event",{id:"restart-required",payload:{type:"warning",text:"notification.warnings.restartRequired"},retain:true});
+                    resolve(require("./registry").setModulePendingUpdated(module,version));
                 }
-            });
+            }).catch(result => {
+                var output = result.stderr;
+                var e;
+                var lookFor404 = new RegExp(" 404 .*"+module,"m");
+                var lookForVersionNotFound = new RegExp("version not found: "+module+"@"+version,"m");
+                if (lookFor404.test(output)) {
+                    log.warn(log._("server.install.install-failed-not-found",{name:module}));
+                    e = new Error("Module not found");
+                    e.code = 404;
+                    reject(e);
+                } else if (isUpgrade && lookForVersionNotFound.test(output)) {
+                    log.warn(log._("server.install.upgrade-failed-not-found",{name:module}));
+                    e = new Error("Module not found");
+                    e.code = 404;
+                    reject(e);
+                } else {
+                    log.warn(log._("server.install.install-failed-long",{name:module}));
+                    log.warn("------------------------------------------");
+                    log.warn(output);
+                    log.warn("------------------------------------------");
+                    reject(new Error(log._("server.install.install-failed")));
+                }
+            })
         });
     }).catch(err => {
         // In case of error, reset activePromise to be resolvable
@@ -208,25 +200,21 @@ function uninstallModule(module) {
             var args = ['remove','--save',module];
             log.trace(npmCommand + JSON.stringify(args));
 
-            var child = child_process.execFile(npmCommand,args,
-                {
-                    cwd: installDir
-                },
-                function(err, stdin, stdout) {
-                    if (err) {
-                        log.warn(log._("server.install.uninstall-failed-long",{name:module}));
-                        log.warn("------------------------------------------");
-                        log.warn(err.toString());
-                        log.warn("------------------------------------------");
-                        reject(new Error(log._("server.install.uninstall-failed",{name:module})));
-                    } else {
-                        log.info(log._("server.install.uninstalled",{name:module}));
-                        reportRemovedModules(list);
-                        library.removeExamplesDir(module);
-                        resolve(list);
-                    }
-                }
-            );
+            exec.run(npmCommand,args,{
+                cwd: installDir,
+            },true).then(result => {
+                log.info(log._("server.install.uninstalled",{name:module}));
+                reportRemovedModules(list);
+                library.removeExamplesDir(module);
+                resolve(list);
+            }).catch(result => {
+                var output = result.stderr;
+                log.warn(log._("server.install.uninstall-failed-long",{name:module}));
+                log.warn("------------------------------------------");
+                log.warn(output.toString());
+                log.warn("------------------------------------------");
+                reject(new Error(log._("server.install.uninstall-failed",{name:module})));
+            });
         });
     }).catch(err => {
         // In case of error, reset activePromise to be resolvable
diff --git a/packages/node_modules/@node-red/runtime/lib/api/comms.js b/packages/node_modules/@node-red/runtime/lib/api/comms.js
index 3ab361f3d..7713fd3dc 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/comms.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/comms.js
@@ -42,6 +42,21 @@ function handleRuntimeEvent(event) {
     runtime.log.trace("runtime event: "+JSON.stringify(event));
     publish("notification/"+event.id,event.payload||{},event.retain);
 }
+function handleEventLog(event) {
+    var type = event.payload.type;
+    var id = event.id;
+    if (event.payload.data) {
+        var data = event.payload.data;
+        if (data.endsWith('\n')) {
+            data = data.substring(0,data.length-1);
+        }
+        var lines = data.split(/\n/);
+        lines.forEach(line => {
+            runtime.log.debug((type?("["+type+"] "):"")+line)
+        })
+    }
+    publish("event-log/"+event.id,event.payload||{});
+}
 
 function publish(topic,data,retain) {
     if (retain) {
@@ -64,6 +79,8 @@ var api = module.exports = {
         runtime.events.on("runtime-event",handleRuntimeEvent);
         runtime.events.removeListener("comms",handleCommsEvent);
         runtime.events.on("comms",handleCommsEvent);
+        runtime.events.removeListener("event-log",handleEventLog);
+        runtime.events.on("event-log",handleEventLog);
     },
 
     /**
diff --git a/packages/node_modules/@node-red/runtime/lib/exec.js b/packages/node_modules/@node-red/runtime/lib/exec.js
new file mode 100644
index 000000000..0ef3c069c
--- /dev/null
+++ b/packages/node_modules/@node-red/runtime/lib/exec.js
@@ -0,0 +1,69 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+const child_process = require('child_process');
+const { util } = require('@node-red/util');
+
+var events;
+
+function logLines(id,type,data) {
+    events.emit("event-log", {id:id,payload:{ts: Date.now(),data:data,type:type}});
+}
+
+module.exports = {
+    init: function(_runtime) {
+        events = _runtime.events;
+    },
+    run: function(command,args,options,emit) {
+        var invocationId = util.generateId();
+
+        emit && events.emit("event-log", {ts: Date.now(),id:invocationId,payload:{ts: Date.now(),data:command+" "+args.join(" ")}});
+
+        return new Promise((resolve, reject) => {
+            let stdout = "";
+            let stderr = "";
+            const child = child_process.spawn(command,args,options);
+            child.stdout.on('data', (data) => {
+                const str = ""+data;
+                stdout += str;
+                emit && logLines(invocationId,"out",str);
+            });
+            child.stderr.on('data', (data) => {
+                const str = ""+data;
+                stderr += str;
+                emit && logLines(invocationId,"err",str);
+            });
+            child.on('error', function(err) {
+                stderr = err.toString();
+                emit && logLines(invocationId,"err",stderr);
+            })
+            child.on('close', (code) => {
+                let result = {
+                    code: code,
+                    stdout: stdout,
+                    stderr: stderr
+                }
+                emit && events.emit("event-log", {id:invocationId,payload:{ts: Date.now(),data:"rc="+code}});
+
+                if (code === 0) {
+                    resolve(result)
+                } else {
+                    reject(result);
+                }
+            });
+        })
+    }
+}
diff --git a/packages/node_modules/@node-red/runtime/lib/index.js b/packages/node_modules/@node-red/runtime/lib/index.js
index fb4e74b93..fd6e59794 100644
--- a/packages/node_modules/@node-red/runtime/lib/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/index.js
@@ -23,6 +23,7 @@ var storage = require("./storage");
 var library = require("./library");
 var events = require("./events");
 var settings = require("./settings");
+var exec = require("./exec");
 
 var express = require("express");
 var path = require('path');
@@ -71,6 +72,7 @@ function init(userSettings,_redUtil,_adminApi) {
     redNodes.init(runtime);
     library.init(runtime);
     externalAPI.init(runtime);
+    exec.init(runtime);
 }
 
 var version;
@@ -248,6 +250,7 @@ var runtime = {
     events: events,
     nodes: redNodes,
     library: library,
+    exec: exec,
     util: require("@node-red/util").util,
     get adminApi() { return adminApi },
     get nodeApp() { return nodeApp },
diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
index b6f3fa61a..d5c23ccb6 100644
--- a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
@@ -15,8 +15,9 @@
  **/
 
 var when = require('when');
-var exec = require('child_process').exec;
-var spawn = require('child_process').spawn;
+
+var exec = require("../../../../exec");
+
 var authResponseServer = require('./authServer').ResponseServer;
 var sshResponseServer = require('./authServer').ResponseSSHServer;
 var clone = require('clone');
@@ -26,83 +27,70 @@ var gitCommand = "git";
 var gitVersion;
 var log;
 
-function runGitCommand(args,cwd,env) {
+function runGitCommand(args,cwd,env,emit) {
     log.trace(gitCommand + JSON.stringify(args));
-    return when.promise(function(resolve,reject) {
-        args.unshift("credential.helper=")
-        args.unshift("-c");
-        var child = spawn(gitCommand, args, {cwd:cwd, detached:true, env:env});
-        var stdout = "";
-        var stderr = "";
-        child.stdout.on('data', function(data) {
-            stdout += data;
-        });
-        child.stderr.on('data', function(data) {
-            stderr += data;
-        });
-        child.on('error', function(err) {
-            stderr = err.toString();
-        })
-        child.on('close', function(code) {
-            if (code !== 0) {
-                var err = new Error(stderr);
-                err.stdout = stdout;
-                err.stderr = stderr;
-                if (/Connection refused/i.test(stderr)) {
-                    err.code = "git_connection_failed";
-                } else if (/Connection timed out/i.test(stderr)) {
-                    err.code = "git_connection_failed";
-                } else if (/fatal: could not read/i.test(stderr)) {
-                    // Username/Password
-                    err.code = "git_auth_failed";
-                } else if(/HTTP Basic: Access denied/i.test(stderr)) {
-                    err.code = "git_auth_failed";
-                } else if(/Permission denied \(publickey\)/i.test(stderr)) {
-                    err.code = "git_auth_failed";
-                } else if(/Host key verification failed/i.test(stderr)) {
-                    // TODO: handle host key verification errors separately
-                    err.code = "git_auth_failed";
-                } else if (/commit your changes or stash/i.test(stderr)) {
-                    err.code = "git_local_overwrite";
-                } else if (/CONFLICT/.test(err.stdout)) {
-                    err.code = "git_pull_merge_conflict";
-                } else if (/not fully merged/i.test(stderr)) {
-                    err.code = "git_delete_branch_unmerged";
-                } else if (/remote .* already exists/i.test(stderr)) {
-                    err.code = "git_remote_already_exists";
-                } else if (/does not appear to be a git repository/i.test(stderr)) {
-                    err.code = "git_not_a_repository";
-                } else if (/Repository not found/i.test(stderr)) {
-                    err.code = "git_repository_not_found";
-                } else if (/repository '.*' does not exist/i.test(stderr)) {
-                    err.code = "git_repository_not_found";
-                } else if (/refusing to merge unrelated histories/i.test(stderr)) {
-                    err.code = "git_pull_unrelated_history"
-                } else if (/Please tell me who you are/i.test(stderr)) {
-                    err.code = "git_missing_user";
-                } else if (/name consists only of disallowed characters/i.test(stderr)) {
-                    err.code = "git_missing_user";
-                }
-                return reject(err);
-            }
-            resolve(stdout);
-        });
-    });
+    args.unshift("credential.helper=")
+    args.unshift("-c");
+    return exec.run(gitCommand, args, {cwd:cwd, env:env}, emit).then(result => {
+        return result.stdout;
+    }).catch(result => {
+        var err = new Error(stderr);
+        var stdout = result.stdout;
+        var stderr = result.stderr;
+        err.stdout = stdout;
+        err.stderr = stderr;
+        if (/Connection refused/i.test(stderr)) {
+            err.code = "git_connection_failed";
+        } else if (/Connection timed out/i.test(stderr)) {
+            err.code = "git_connection_failed";
+        } else if (/fatal: could not read/i.test(stderr)) {
+            // Username/Password
+            err.code = "git_auth_failed";
+        } else if(/HTTP Basic: Access denied/i.test(stderr)) {
+            err.code = "git_auth_failed";
+        } else if(/Permission denied \(publickey\)/i.test(stderr)) {
+            err.code = "git_auth_failed";
+        } else if(/Host key verification failed/i.test(stderr)) {
+            // TODO: handle host key verification errors separately
+            err.code = "git_auth_failed";
+        } else if (/commit your changes or stash/i.test(stderr)) {
+            err.code = "git_local_overwrite";
+        } else if (/CONFLICT/.test(err.stdout)) {
+            err.code = "git_pull_merge_conflict";
+        } else if (/not fully merged/i.test(stderr)) {
+            err.code = "git_delete_branch_unmerged";
+        } else if (/remote .* already exists/i.test(stderr)) {
+            err.code = "git_remote_already_exists";
+        } else if (/does not appear to be a git repository/i.test(stderr)) {
+            err.code = "git_not_a_repository";
+        } else if (/Repository not found/i.test(stderr)) {
+            err.code = "git_repository_not_found";
+        } else if (/repository '.*' does not exist/i.test(stderr)) {
+            err.code = "git_repository_not_found";
+        } else if (/refusing to merge unrelated histories/i.test(stderr)) {
+            err.code = "git_pull_unrelated_history"
+        } else if (/Please tell me who you are/i.test(stderr)) {
+            err.code = "git_missing_user";
+        } else if (/name consists only of disallowed characters/i.test(stderr)) {
+            err.code = "git_missing_user";
+        }
+        throw err;
+    })
 }
-function runGitCommandWithAuth(args,cwd,auth) {
+function runGitCommandWithAuth(args,cwd,auth,emit) {
     return authResponseServer(auth).then(function(rs) {
         var commandEnv = clone(process.env);
         commandEnv.GIT_ASKPASS = path.join(__dirname,"node-red-ask-pass.sh");
         commandEnv.NODE_RED_GIT_NODE_PATH = process.execPath;
         commandEnv.NODE_RED_GIT_SOCK_PATH = rs.path;
         commandEnv.NODE_RED_GIT_ASKPASS_PATH = path.join(__dirname,"authWriter.js");
-        return runGitCommand(args,cwd,commandEnv).finally(function() {
+        return runGitCommand(args,cwd,commandEnv,emit).finally(function() {
             rs.close();
         });
     })
 }
 
-function runGitCommandWithSSHCommand(args,cwd,auth) {
+function runGitCommandWithSSHCommand(args,cwd,auth,emit) {
     return sshResponseServer(auth).then(function(rs) {
         var commandEnv = clone(process.env);
         commandEnv.SSH_ASKPASS = path.join(__dirname,"node-red-ask-pass.sh");
@@ -116,7 +104,7 @@ function runGitCommandWithSSHCommand(args,cwd,auth) {
         // GIT_SSH_COMMAND - added in git 2.3.0
         commandEnv.GIT_SSH_COMMAND = "ssh -i " + auth.key_path + " -F /dev/null";
         // console.log('commandEnv:', commandEnv);
-        return runGitCommand(args,cwd,commandEnv).finally(function() {
+        return runGitCommand(args,cwd,commandEnv,emit).finally(function() {
             rs.close();
         });
     })
@@ -448,13 +436,13 @@ module.exports = {
         var promise;
         if (auth) {
             if ( auth.key_path ) {
-                promise = runGitCommandWithSSHCommand(args,cwd,auth);
+                promise = runGitCommandWithSSHCommand(args,cwd,auth,true);
             }
             else {
-                promise = runGitCommandWithAuth(args,cwd,auth);
+                promise = runGitCommandWithAuth(args,cwd,auth,true);
             }
         } else {
-            promise = runGitCommand(args,cwd)
+            promise = runGitCommand(args,cwd,undefined,true)
         }
         return promise;
         // .catch(function(err) {
@@ -485,13 +473,13 @@ module.exports = {
         var promise;
         if (auth) {
             if ( auth.key_path ) {
-                promise = runGitCommandWithSSHCommand(args,cwd,auth);
+                promise = runGitCommandWithSSHCommand(args,cwd,auth,true);
             }
             else {
-                promise = runGitCommandWithAuth(args,cwd,auth);
+                promise = runGitCommandWithAuth(args,cwd,auth,true);
             }
         } else {
-            promise = runGitCommand(args,cwd)
+            promise = runGitCommand(args,cwd,undefined,true)
         }
         return promise.catch(function(err) {
             if (err.code === 'git_error') {
@@ -517,13 +505,13 @@ module.exports = {
         args.push(".");
         if (auth) {
             if ( auth.key_path ) {
-                return runGitCommandWithSSHCommand(args,cwd,auth);
+                return runGitCommandWithSSHCommand(args,cwd,auth,true);
             }
             else {
-                return runGitCommandWithAuth(args,cwd,auth);
+                return runGitCommandWithAuth(args,cwd,auth,true);
             }
         } else {
-            return runGitCommand(args,cwd);
+            return runGitCommand(args,cwd,undefined,true);
         }
     },
     getStatus: getStatus,
diff --git a/packages/node_modules/@node-red/util/index.js b/packages/node_modules/@node-red/util/index.js
index 7fa63fc7d..cc7f502f8 100644
--- a/packages/node_modules/@node-red/util/index.js
+++ b/packages/node_modules/@node-red/util/index.js
@@ -30,19 +30,22 @@ module.exports = {
         log.init(settings);
         i18n.init();
     },
+
     /**
     * Logging utilities
     * @see module:@node-red/util.module:log
     */
     log: log,
+
     /**
     * Internationalization utilities
     * @see module:@node-red/util.module:i18n
     */
     i18n: i18n,
+
     /**
     * General utilities
     * @see module:@node-red/util.module:util
     */
-    util: util
+    util: util,
 }
diff --git a/packages/node_modules/node-red/lib/red.js b/packages/node_modules/node-red/lib/red.js
index b6eed50ac..a25b30fd3 100644
--- a/packages/node_modules/node-red/lib/red.js
+++ b/packages/node_modules/node-red/lib/red.js
@@ -38,18 +38,6 @@ function checkVersion(userSettings) {
     }
 }
 
-function checkBuild() {
-    console.log("Skipping red.js/checkBuild");
-    // var editorFile = path.resolve(path.join(__dirname,"..","..","..","..","public","red","red.min.js"));
-    // try {
-    //     var stats = fs.statSync(editorFile);
-    // } catch(err) {
-    //     var e = new Error("Node-RED not built");
-    //     e.code = "not_built";
-    //     throw e;
-    // }
-}
-
 module.exports = {
     init: function(httpServer,userSettings) {
         if (!userSettings) {
@@ -59,7 +47,6 @@ module.exports = {
 
         if (!userSettings.SKIP_BUILD_CHECK) {
             checkVersion(userSettings);
-            checkBuild();
         }
 
         if (!userSettings.coreNodesDir) {
diff --git a/test/unit/@node-red/registry/lib/installer_spec.js b/test/unit/@node-red/registry/lib/installer_spec.js
index 65747d185..f3bae8b3a 100644
--- a/test/unit/@node-red/registry/lib/installer_spec.js
+++ b/test/unit/@node-red/registry/lib/installer_spec.js
@@ -21,9 +21,6 @@ var path = require("path");
 var fs = require('fs');
 var EventEmitter = require('events');
 
-var child_process = require('child_process');
-
-
 var NR_TEST_UTILS = require("nr-test-utils");
 
 var installer = NR_TEST_UTILS.require("@node-red/registry/lib/installer");
@@ -42,16 +39,21 @@ describe('nodes/registry/installer', function() {
         _: function() { return "abc"}
     }
 
-    before(function() {
-        installer.init({log:mockLog, settings:{}, events: new EventEmitter()});
+    beforeEach(function() {
+        installer.init({log:mockLog, settings:{}, events: new EventEmitter(), exec: {
+            run: function() {
+                return Promise.resolve("");
+            }
+        }});
     });
+    function initInstaller(execResult) {
+        installer.init({log:mockLog, settings:{}, events: new EventEmitter(), exec: {
+            run: function() {
+                return execResult;
+            }
+        }});
+    }
     afterEach(function() {
-        if (child_process.spawn.restore) {
-            child_process.spawn.restore();
-        }
-        if (child_process.execFile.restore) {
-            child_process.execFile.restore();
-        }
         if (registry.addModule.restore) {
             registry.addModule.restore();
         }
@@ -76,39 +78,33 @@ describe('nodes/registry/installer', function() {
 
     describe("installs module", function() {
         it("rejects when npm returns a 404", function(done) {
-            sinon.stub(child_process,"spawn",function(cmd,args,opt) {
-                var ee = new EventEmitter();
-                ee.stdout = new EventEmitter();
-                ee.stderr = new EventEmitter();
-                setTimeout(function() {
-                    ee.stderr.emit('data'," 404  this_wont_exist");
-                    ee.emit('close',1);
-                },10)
-                return ee;
-            });
-
+            var res = {
+                code: 1,
+                stdout:"",
+                stderr:" 404  this_wont_exist"
+            }
+            var p = Promise.reject(res);
+            p.catch((err)=>{});
+            initInstaller(p)
             installer.installModule("this_wont_exist").catch(function(err) {
                 err.should.have.property("code",404);
                 done();
             });
         });
         it("rejects when npm does not find specified version", function(done) {
-            sinon.stub(child_process,"spawn",function(cmd,args,opt) {
-                var ee = new EventEmitter();
-                ee.stdout = new EventEmitter();
-                ee.stderr = new EventEmitter();
-                setTimeout(function() {
-                    ee.stderr.emit('data'," version not found: this_wont_exist@0.1.2");
-                    ee.emit('close',1);
-                },10)
-                return ee;
-            });
+            var res = {
+                code: 1,
+                stdout:"",
+                stderr:" version not found: this_wont_exist@0.1.2"
+            }
+            var p = Promise.reject(res);
+            p.catch((err)=>{});
+            initInstaller(p)
             sinon.stub(typeRegistry,"getModuleInfo", function() {
                 return {
                     version: "0.1.1"
                 }
             });
-
             installer.installModule("this_wont_exist","0.1.2").catch(function(err) {
                 err.code.should.be.eql(404);
                 done();
@@ -126,17 +122,14 @@ describe('nodes/registry/installer', function() {
             });
         });
         it("rejects with generic error", function(done) {
-            sinon.stub(child_process,"spawn",function(cmd,args,opt,cb) {
-                var ee = new EventEmitter();
-                ee.stdout = new EventEmitter();
-                ee.stderr = new EventEmitter();
-                setTimeout(function() {
-                    ee.stderr.emit('data'," kaboom!");
-                    ee.emit('close',1);
-                },10)
-                return ee;
-            });
-
+            var res = {
+                code: 1,
+                stdout:"",
+                stderr:" kaboom!"
+            }
+            var p = Promise.reject(res);
+            p.catch((err)=>{});
+            initInstaller(p)
             installer.installModule("this_wont_exist").then(function() {
                 done(new Error("Unexpected success"));
             }).catch(function(err) {
@@ -145,15 +138,16 @@ describe('nodes/registry/installer', function() {
         });
         it("succeeds when module is found", function(done) {
             var nodeInfo = {nodes:{module:"foo",types:["a"]}};
-            sinon.stub(child_process,"spawn",function(cmd,args,opt) {
-                var ee = new EventEmitter();
-                ee.stdout = new EventEmitter();
-                ee.stderr = new EventEmitter();
-                setTimeout(function() {
-                    ee.emit('close',0);
-                },10)
-                return ee;
-            });
+
+            var res = {
+                code: 0,
+                stdout:"",
+                stderr:""
+            }
+            var p = Promise.resolve(res);
+            p.catch((err)=>{});
+            initInstaller(p)
+
             var addModule = sinon.stub(registry,"addModule",function(md) {
                 return when.resolve(nodeInfo);
             });
@@ -191,15 +185,15 @@ describe('nodes/registry/installer', function() {
                 return when.resolve(nodeInfo);
             });
             var resourcesDir = path.resolve(path.join(__dirname,"resources","local","TestNodeModule","node_modules","TestNodeModule"));
-            sinon.stub(child_process,"spawn",function(cmd,args,opt) {
-                var ee = new EventEmitter();
-                ee.stdout = new EventEmitter();
-                ee.stderr = new EventEmitter();
-                setTimeout(function() {
-                    ee.emit('close',0);
-                },10)
-                return ee;
-            });
+
+            var res = {
+                code: 0,
+                stdout:"",
+                stderr:""
+            }
+            var p = Promise.resolve(res);
+            p.catch((err)=>{});
+            initInstaller(p)
             installer.installModule(resourcesDir).then(function(info) {
                 info.should.eql(nodeInfo);
                 done();
@@ -226,9 +220,14 @@ describe('nodes/registry/installer', function() {
             var removeModule = sinon.stub(registry,"removeModule",function(md) {
                 return when.resolve(nodeInfo);
             });
-            sinon.stub(child_process,"execFile",function(cmd,args,opt,cb) {
-                cb(new Error("test_error"),"","");
-            });
+            var res = {
+                code: 1,
+                stdout:"",
+                stderr:"error"
+            }
+            var p = Promise.reject(res);
+            p.catch((err)=>{});
+            initInstaller(p)
 
             installer.uninstallModule("this_wont_exist").then(function() {
                 done(new Error("Unexpected success"));
@@ -244,9 +243,14 @@ describe('nodes/registry/installer', function() {
             var getModuleInfo = sinon.stub(registry,"getModuleInfo",function(md) {
                 return {nodes:[]};
             });
-            sinon.stub(child_process,"execFile",function(cmd,args,opt,cb) {
-                cb(null,"","");
-            });
+            var res = {
+                code: 0,
+                stdout:"",
+                stderr:""
+            }
+            var p = Promise.resolve(res);
+            p.catch((err)=>{});
+            initInstaller(p)
 
             sinon.stub(fs,"statSync", function(fn) { return {}; });
 
diff --git a/test/unit/@node-red/runtime/lib/exec_spec.js b/test/unit/@node-red/runtime/lib/exec_spec.js
new file mode 100644
index 000000000..e0369e07c
--- /dev/null
+++ b/test/unit/@node-red/runtime/lib/exec_spec.js
@@ -0,0 +1,22 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+var should = require("should");
+var sinon = require("sinon");
+var path = require("path");
+
+var NR_TEST_UTILS = require("nr-test-utils");
+
+var exec = NR_TEST_UTILS.require("@node-red/runtime/lib/exec");

From 97510898073a311d2de0fff102057cf1c54f6620 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 19 Oct 2018 10:42:39 +0100
Subject: [PATCH 29/38] Tidy up ace tooltip styling

---
 .../@node-red/editor-client/src/js/ui/editor.js           | 3 ++-
 .../@node-red/editor-client/src/sass/ace.scss             | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 3fc0bfedf..0006f955d 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -2151,7 +2151,8 @@ RED.editor = (function() {
             } else {
                 editor.setOptions({
                     enableBasicAutocompletion:true,
-                    enableSnippets:true
+                    enableSnippets:true,
+                    tooltipFollowsMouse: false
                 });
             }
             if (options.readOnly) {
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/ace.scss b/packages/node_modules/@node-red/editor-client/src/sass/ace.scss
index c5f85badc..b29b3ce2e 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/ace.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/ace.scss
@@ -19,3 +19,11 @@
         background: #999 !important;
     }
 }
+
+.ace_tooltip {
+    background-image: none;
+    background: #fcffdc;
+    border-radius: 4px;
+    @include component-shadow;
+    border-color: $primary-border-color;
+}

From f22960ad5925300fedd14143fae5f4adbb72ceb3 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 19 Oct 2018 14:03:22 +0100
Subject: [PATCH 30/38] Avoid http redirects as Safari doesn't reuse Auth
 header Fixes #1903

---
 .../editor-api/lib/editor/projects.js         | 128 +++++++++---------
 1 file changed, 66 insertions(+), 62 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/projects.js b/packages/node_modules/@node-red/editor-api/lib/editor/projects.js
index 468580459..ff7fc5e85 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/projects.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/projects.js
@@ -20,6 +20,58 @@ var apiUtils = require("../util");
 var runtimeAPI;
 var needsPermission = require("../auth").needsPermission;
 
+function listProjects(req,res) {
+    var opts = {
+        user: req.user
+    }
+    runtimeAPI.projects.listProjects(opts).then(function(result) {
+        res.json(result);
+    }).catch(function(err) {
+        apiUtils.rejectHandler(req,res,err);
+    });
+}
+function getProject(req,res) {
+    var opts = {
+        user: req.user,
+        id: req.params.id
+    }
+    runtimeAPI.projects.getProject(opts).then(function(data) {
+        if (data) {
+            res.json(data);
+        } else {
+            res.status(404).end();
+        }
+    }).catch(function(err) {
+        apiUtils.rejectHandler(req,res,err);
+    })
+}
+function getProjectStatus(req,res) {
+    var opts = {
+        user: req.user,
+        id: req.params.id,
+        remote: req.query.remote
+    }
+    runtimeAPI.projects.getStatus(opts).then(function(data){
+        if (data) {
+            res.json(data);
+        } else {
+            res.status(404).end();
+        }
+    }).catch(function(err) {
+        apiUtils.rejectHandler(req,res,err);
+    })
+}
+function getProjectRemotes(req,res) {
+    var opts = {
+        user: req.user,
+        id: req.params.id
+    }
+    runtimeAPI.projects.getRemotes(opts).then(function(data) {
+        res.json(data);
+    }).catch(function(err) {
+        apiUtils.rejectHandler(req,res,err);
+    })
+}
 module.exports = {
     init: function(_runtimeAPI) {
         runtimeAPI = _runtimeAPI;
@@ -40,16 +92,7 @@ module.exports = {
         // Projects
 
         // List all projects
-        app.get("/", needsPermission("projects.read"), function(req,res) {
-            var opts = {
-                user: req.user
-            }
-            runtimeAPI.projects.listProjects(opts).then(function(result) {
-                res.json(result);
-            }).catch(function(err) {
-                apiUtils.rejectHandler(req,res,err);
-            });
-        });
+        app.get("/", needsPermission("projects.read"),listProjects);
 
         // Create project
         app.post("/", needsPermission("projects.write"), function(req,res) {
@@ -74,13 +117,13 @@ module.exports = {
 
             if (req.body.active) {
                 runtimeAPI.projects.setActiveProject(opts).then(function() {
-                    res.redirect(303,req.baseUrl + '/');
+                    listProjects(req,res);
                 }).catch(function(err) {
                     apiUtils.rejectHandler(req,res,err);
                 })
             } else if (req.body.initialise) {
                 runtimeAPI.projects.initialiseProject(opts).then(function() {
-                    res.redirect(303,req.baseUrl + '/'+ req.params.id);
+                    getProject(req,res);
                 }).catch(function(err) {
                     apiUtils.rejectHandler(req,res,err);
                 })
@@ -91,7 +134,7 @@ module.exports = {
                        req.body.hasOwnProperty('files') ||
                         req.body.hasOwnProperty('git')) {
                 runtimeAPI.projects.updateProject(opts).then(function() {
-                    res.redirect(303,req.baseUrl + '/'+ req.params.id);
+                    getProject(req,res);
                 }).catch(function(err) {
                     apiUtils.rejectHandler(req,res,err);
                 })
@@ -101,21 +144,7 @@ module.exports = {
         });
 
         // Get project metadata
-        app.get("/:id", needsPermission("projects.read"), function(req,res) {
-            var opts = {
-                user: req.user,
-                id: req.params.id
-            }
-            runtimeAPI.projects.getProject(opts).then(function(data) {
-                if (data) {
-                    res.json(data);
-                } else {
-                    res.status(404).end();
-                }
-            }).catch(function(err) {
-                apiUtils.rejectHandler(req,res,err);
-            })
-        });
+        app.get("/:id", needsPermission("projects.read"), getProject);
 
         // Delete project
         app.delete("/:id", needsPermission("projects.write"), function(req,res) {
@@ -132,22 +161,7 @@ module.exports = {
 
 
         // Get project status - files, commit counts, branch info
-        app.get("/:id/status", needsPermission("projects.read"), function(req,res) {
-            var opts = {
-                user: req.user,
-                id: req.params.id,
-                remote: req.query.remote
-            }
-            runtimeAPI.projects.getStatus(opts).then(function(data){
-                if (data) {
-                    res.json(data);
-                } else {
-                    res.status(404).end();
-                }
-            }).catch(function(err) {
-                apiUtils.rejectHandler(req,res,err);
-            })
-        });
+        app.get("/:id/status", needsPermission("projects.read"), getProjectStatus);
 
 
         // Project file listing
@@ -203,7 +217,7 @@ module.exports = {
                 path: req.params[0]
             }
             runtimeAPI.projects.stageFile(opts).then(function() {
-                res.redirect(303,req.baseUrl+"/"+opts.id+"/status");
+                getProjectStatus(req,res);
             }).catch(function(err) {
                 apiUtils.rejectHandler(req,res,err);
             })
@@ -217,7 +231,7 @@ module.exports = {
                 path: req.body.files
             }
             runtimeAPI.projects.stageFile(opts).then(function() {
-                res.redirect(303,req.baseUrl+"/"+opts.id+"/status");
+                getProjectStatus(req,res);
             }).catch(function(err) {
                 apiUtils.rejectHandler(req,res,err);
             })
@@ -231,7 +245,7 @@ module.exports = {
                 message: req.body.message
             }
             runtimeAPI.projects.commit(opts).then(function() {
-                res.redirect(303,req.baseUrl+"/"+opts.id+"/status");
+                getProjectStatus(req,res);
             }).catch(function(err) {
                 apiUtils.rejectHandler(req,res,err);
             })
@@ -245,7 +259,7 @@ module.exports = {
                 path: req.params[0]
             }
             runtimeAPI.projects.unstageFile(opts).then(function() {
-                res.redirect(303,req.baseUrl+"/"+opts.id+"/status");
+                getProjectStatus(req,res);
             }).catch(function(err) {
                 apiUtils.rejectHandler(req,res,err);
             })
@@ -258,7 +272,7 @@ module.exports = {
                 id: req.params.id
             }
             runtimeAPI.projects.unstageFile(opts).then(function() {
-                res.redirect(303,req.baseUrl+"/"+opts.id+"/status");
+                getProjectStatus(req,res);
             }).catch(function(err) {
                 apiUtils.rejectHandler(req,res,err);
             })
@@ -442,17 +456,7 @@ module.exports = {
         });
 
         // Get a list of remotes
-        app.get("/:id/remotes", needsPermission("projects.read"), function(req, res) {
-            var opts = {
-                user: req.user,
-                id: req.params.id
-            }
-            runtimeAPI.projects.getRemotes(opts).then(function(data) {
-                res.json(data);
-            }).catch(function(err) {
-                apiUtils.rejectHandler(req,res,err);
-            })
-        });
+        app.get("/:id/remotes", needsPermission("projects.read"), getProjectRemotes);
 
         // Add a remote
         app.post("/:id/remotes", needsPermission("projects.write"), function(req,res) {
@@ -466,7 +470,7 @@ module.exports = {
                 return;
             }
             runtimeAPI.projects.addRemote(opts).then(function(data) {
-                res.redirect(303,req.baseUrl+"/"+opts.id+"/remotes");
+                getProjectRemotes(req,res);
             }).catch(function(err) {
                 apiUtils.rejectHandler(req,res,err);
             })
@@ -480,7 +484,7 @@ module.exports = {
                 remote: req.params.remoteName
             }
             runtimeAPI.projects.removeRemote(opts).then(function(data) {
-                res.redirect(303,req.baseUrl+"/"+opts.id+"/remotes");
+                getProjectRemotes(req,res);
             }).catch(function(err) {
                 apiUtils.rejectHandler(req,res,err);
             })

From 371d357218884a94702f74919d5c8b8ab90d6b92 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Mon, 22 Oct 2018 18:21:51 +0900
Subject: [PATCH 31/38] Fix typo in English messages

---
 packages/node_modules/@node-red/nodes/core/core/89-trigger.html | 2 +-
 .../node_modules/@node-red/nodes/locales/en-US/messages.json    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/core/89-trigger.html b/packages/node_modules/@node-red/nodes/core/core/89-trigger.html
index 3bbdfe603..18debbf5b 100644
--- a/packages/node_modules/@node-red/nodes/core/core/89-trigger.html
+++ b/packages/node_modules/@node-red/nodes/core/core/89-trigger.html
@@ -83,7 +83,7 @@
     <p>This node can be used to create a timeout within a flow. By default, when
     it receives a message, it sends on a message with a <code>payload</code> of <code>1</code>.
     It then waits 250ms before sending a second message with a <code>payload</code> of <code>0</code>.
-    This could be used, for example, to blink an LED attached to a Raspberry PI GPIO pin.</p>
+    This could be used, for example, to blink an LED attached to a Raspberry Pi GPIO pin.</p>
     <p>The payloads of each message sent can be configured to a variety of values, including
     the option to not send anything. For example, setting the initial message to <i>nothing</i> and
     selecting the option to extend the timer with each received message, the node will
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 5f22cb64a..13521d53f 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -311,7 +311,7 @@
             "title": "Title",
             "body": "Body"
         },
-        "tip": "Tip: The body text can be styled as <a href=\"https://help.github.com/articles/markdown-basics/\" target=\"_blank\">Github flavoured Markdown</a>"
+        "tip": "Tip: The body text can be styled as <a href=\"https://help.github.com/articles/markdown-basics/\" target=\"_blank\">GitHub flavoured Markdown</a>"
     },
     "unknown": {
         "label": {

From 5590d313369a05ecece40aa53b92a5ab721c5e0a Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Mon, 22 Oct 2018 18:52:34 +0900
Subject: [PATCH 32/38] Fix typo

---
 .../@node-red/nodes/locales/ja/core/89-trigger.html           | 4 ++--
 .../node_modules/@node-red/nodes/locales/ja/io/21-httpin.html | 2 +-
 .../node_modules/@node-red/nodes/locales/ja/io/23-watch.html  | 2 +-
 .../node_modules/@node-red/nodes/locales/ja/messages.json     | 4 ++--
 .../node_modules/@node-red/nodes/locales/zh-CN/messages.json  | 2 +-
 .../node_modules/@node-red/runtime/locales/ja/runtime.json    | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/ja/core/89-trigger.html
index 28ce551aa..51ab465f9 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/core/89-trigger.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/core/89-trigger.html
@@ -15,7 +15,7 @@
 -->
 
 <script type="text/x-red" data-help-name="trigger">
-    <p>メッセージの受信すると、別のメッセージの送信を行います。延長もしくは初期化が指定されていない場合には、2つ目のメッセージを送信することもできます。</p>
+    <p>メッセージを受信すると、別のメッセージの送信を行います。延長もしくは初期化が指定されていない場合には、2つ目のメッセージを送信することもできます。</p>
 
     <h3>入力</h3>
     <dl class="message-properties">
@@ -24,7 +24,7 @@
     </dl>
 
     <h3>詳細</h3>
-    <p>フロー内でタイムアウトを作成するのに利用します。メッセージを受け取ると、デフォルトでは<code>payload</code>に<code>1</code>を設定して送信します。送信後250ms待機し、<code>payload</code>を<code>0</code>に設定した2つ目のメッセージを送信します。この機能は、例えばRaspberry PIのGPIOピンに接続したLEDを点滅させるために活用できます。</p>
+    <p>フロー内でタイムアウトを作成するのに利用します。メッセージを受け取ると、デフォルトでは<code>payload</code>に<code>1</code>を設定して送信します。送信後250ms待機し、<code>payload</code>を<code>0</code>に設定した2つ目のメッセージを送信します。この機能は、例えばRaspberry PiのGPIOピンに接続したLEDを点滅させるために活用できます。</p>
     <p>各送信メッセージのペイロードはさまざまな種類の値に設定できます。再送信データなしとすることも可能です。例えば、再送信データを「<i>なし</i>」とし、メッセージを受け取った時に遅延を延長することを選択した場合、triggerノードは監視タイマとして動作します。すなわち、指定間隔内にメッセージを受信しない場合にメッセージを送信します。</p>
     <p>ペイロードに<i>文字列</i>を指定する場合、mustache形式のテンプレートが利用できます。</p>
     <p><code>reset</code>プロパティを持つメッセージを受信した場合、もしくは、<code>payload</code>が設定した値にマッチする場合、仕掛かり中の待機や繰り返しをクリアしメッセージの送信は行いません。</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/io/21-httpin.html b/packages/node_modules/@node-red/nodes/locales/ja/io/21-httpin.html
index 881088bed..8ffc5f95c 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/io/21-httpin.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/io/21-httpin.html
@@ -59,7 +59,7 @@
     <p><code>statusCode</code>と<code>headers</code>はノードの設定で指定することも可能です。ノードの設定でプロパティを指定した場合には、対応するメッセージプロパティは使用しません。</p>
     <h4>クッキーの処理</h4>
     <p><code>cookies</code>はキー/値の組からなるオブジェクトとします。値にはデフォルトオプションを使ってクッキーの値として設定する文字列、もしくは、オプションを含むオブジェクトを指定できます。<p>
-    <p>以下の例では2つのクッキーを設定しています。1つ目は<code>name</code>でその値は<code>nick</code>、2つ目は<code>session</code>で値は<code>1234,</code>、有効期限として15分を指定しています。</p>
+    <p>以下の例では2つのクッキーを設定しています。1つ目は<code>name</code>でその値は<code>nick</code>、2つ目は<code>session</code>で値は<code>1234</code>、有効期限として15分を指定しています。</p>
     <pre>
 msg.cookies = {
     name: 'nick',
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/io/23-watch.html b/packages/node_modules/@node-red/nodes/locales/ja/io/23-watch.html
index 18ba9d5ec..45f658c05 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/io/23-watch.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/io/23-watch.html
@@ -19,7 +19,7 @@
     <p>カンマ区切りでディレクトリおよびファイルのリストを指定します。空白を含む場合は、引用符で"..."のように囲んでください。</p>
     <p>Windowsでは、2重バックスラッシュ\\をディレクトリ名に使用します。</p>
     <p>実際に変化したファイルのフルパス名を<code>msg.payload</code>に、検知対象リストの文字列を<code>msg.topic</code>に返します。</p>
-    <p><code>msg.file</code>は変化したファイルのファイル名表します。<code>msg.type</code>は変化した対象の種別(<i>file</i>もしくは<i>directory</i>)を、<code>msg.size</code>はファイルサイズ(バイト数)を表します。</p>
+    <p><code>msg.file</code>は変化したファイルのファイル名を表します。<code>msg.type</code>は変化した対象の種別(<i>file</i>もしくは<i>directory</i>)を、<code>msg.size</code>はファイルサイズ(バイト数)を表します。</p>
     <p>Linuxではファイルとして表されるもの<i>全て</i>が、検知対象にできます。</p>
     <p><b>注: </b>検知対象のディレクトリもしくはファイルは存在していなくてはなりません。対象ファイルもしくはディレクトリが削除された場合、再作成されても検知対象から外れたままです。</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/messages.json b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
index d3c0c5f83..624c59c0e 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
@@ -311,13 +311,13 @@
             "title": "タイトル",
             "body": "本文"
         },
-        "tip": "注釈: 本文は<a href=\"https://help.github.com/articles/markdown-basics/\" target=\"_blank\">GithubのMarkdown形式</a>として整形されます。"
+        "tip": "注釈: 本文は<a href=\"https://help.github.com/articles/markdown-basics/\" target=\"_blank\">GitHubのMarkdown形式</a>として整形されます。"
     },
     "unknown": {
         "label": {
             "unknown": "unknown"
         },
-        "tip": "<p>現在のNode-RED環境では、本ノードの型が不明です。</p><p><i>現在の状態でに本ノードをデプロイすると設定は保存されますが、不明なノードがインストールされるまでフローは実行されません。</i></p><p>詳細はノードの「情報」を参照してください。</p>"
+        "tip": "<p>現在のNode-RED環境では、本ノードの型が不明です。</p><p><i>現在の状態で本ノードをデプロイすると設定は保存されますが、不明なノードがインストールされるまでフローは実行されません。</i></p><p>詳細はノードの「情報」を参照してください。</p>"
     },
     "mqtt": {
         "label": {
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json b/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json
index dfa120b53..d58d2a413 100644
--- a/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json
@@ -301,7 +301,7 @@
             "title": "标题",
             "body": "主体"
         },
-        "tip": "提示: 主题内容可被格式化为 <a href=\"https://help.github.com/articles/markdown-basics/\" target=\"_blank\">Github风格的Markdown</a>"
+        "tip": "提示: 主题内容可被格式化为 <a href=\"https://help.github.com/articles/markdown-basics/\" target=\"_blank\">GitHub风格的Markdown</a>"
     },
     "unknown": {
         "label": {
diff --git a/packages/node_modules/@node-red/runtime/locales/ja/runtime.json b/packages/node_modules/@node-red/runtime/locales/ja/runtime.json
index 916519351..e4f4f7baf 100644
--- a/packages/node_modules/@node-red/runtime/locales/ja/runtime.json
+++ b/packages/node_modules/@node-red/runtime/locales/ja/runtime.json
@@ -25,7 +25,7 @@
         "removed-types": "削除したノード:",
         "install": {
             "invalid": "不正なモジュール名",
-            "installing": "モジュール__name__, バージョン: __version__をインスートールします",
+            "installing": "モジュール__name__, バージョン: __version__ をインストールします",
             "installed": "モジュール __name__ をインストールしました",
             "install-failed": "インストールに失敗しました",
             "install-failed-long": "モジュール __name__ のインストールに失敗しました:",

From dabb2790c97af064e4f7549eedbf096162e19c1a Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 22 Oct 2018 16:21:02 +0100
Subject: [PATCH 33/38] Fix up merge of auth token handling

---
 packages/node_modules/@node-red/editor-api/lib/auth/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-api/lib/auth/index.js b/packages/node_modules/@node-red/editor-api/lib/auth/index.js
index 58221a132..158d0f77a 100644
--- a/packages/node_modules/@node-red/editor-api/lib/auth/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/auth/index.js
@@ -41,7 +41,7 @@ function init(_settings,storage) {
     if (settings.adminAuth) {
         var mergedAdminAuth = Object.assign({}, settings.adminAuth, settings.adminAuth.module);
         Users.init(mergedAdminAuth);
-        Tokens.init(mergedAdminAuth,runtime.storage);
+        Tokens.init(mergedAdminAuth,storage);
     }
 }
 

From 6c01d0f9d88e64417afc2e24da236d89ace3461d Mon Sep 17 00:00:00 2001
From: Akash Mugu <akashmugu@gmail.com>
Date: Wed, 17 Oct 2018 23:20:52 +0530
Subject: [PATCH 34/38] Exec: Preserve existing properties on msg object

---
 packages/node_modules/@node-red/nodes/core/core/75-exec.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/core/75-exec.js b/packages/node_modules/@node-red/nodes/core/core/75-exec.js
index 2638dd1da..09e54decc 100644
--- a/packages/node_modules/@node-red/nodes/core/core/75-exec.js
+++ b/packages/node_modules/@node-red/nodes/core/core/75-exec.js
@@ -138,14 +138,16 @@ module.exports = function(RED) {
                         //console.log('[exec] stdout: ' + stdout);
                         //console.log('[exec] stderr: ' + stderr);
                         if (error !== null) {
-                            msg3 = {payload:{code:error.code, message:error.message}};
+                            msg3 = RED.util.cloneMessage(msg);
+                            msg3.payload = {code:error.code, message:error.message};
                             if (error.signal) { msg3.payload.signal = error.signal; }
                             if (error.code === null) { node.status({fill:"red",shape:"dot",text:"killed"}); }
                             else { node.status({fill:"red",shape:"dot",text:"error:"+error.code}); }
                             node.log('error:' + error);
                         }
                         else if (node.oldrc === "false") {
-                            msg3 = {payload:{code:0}};
+                            msg3 = RED.util.cloneMessage(msg);
+                            msg3.payload = {code:0};
                         }
                         if (!msg3) { node.status({}); }
                         else {

From 7a9dd9ad9ca7d4d29b07a20f0c4cfa51d5ceefe9 Mon Sep 17 00:00:00 2001
From: Akash Mugu <akashmugu@gmail.com>
Date: Mon, 22 Oct 2018 12:48:21 +0530
Subject: [PATCH 35/38] Exec: Add unit tests - Preserve existing properties on
 msg object

---
 test/nodes/core/core/75-exec_spec.js | 243 +++++++++++++++++++++++++++
 1 file changed, 243 insertions(+)

diff --git a/test/nodes/core/core/75-exec_spec.js b/test/nodes/core/core/75-exec_spec.js
index 113e84292..0f588e204 100644
--- a/test/nodes/core/core/75-exec_spec.js
+++ b/test/nodes/core/core/75-exec_spec.js
@@ -365,6 +365,138 @@ describe('exec node', function() {
             });
         });
 
+        it('should preserve existing properties on msg object', function(done) {
+            var flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"echo", addpay:false, append:"", oldrc:"false"},
+                        {id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}];
+            var spy = sinon.stub(child_process, 'exec',
+            function(arg1, arg2, arg3, arg4) {
+                // arg3(error,stdout,stderr);
+                arg3(null,arg1,arg1.toUpperCase());
+            });
+
+            helper.load(execNode, flow, function() {
+                var n1 = helper.getNode("n1");
+                var n2 = helper.getNode("n2");
+                var n3 = helper.getNode("n3");
+                var n4 = helper.getNode("n4");
+                var received = 0;
+                var messages = [null,null,null];
+                var completeTest = function() {
+                    received = received + 1;
+                    if (received < 3) {
+                        return;
+                    }
+                    try {
+                        var msg = messages[0];
+                        msg.should.have.property("payload");
+                        msg.payload.should.be.a.String();
+                        msg.payload.should.equal("echo");
+                        msg.should.have.property("rc");
+                        msg.rc.should.have.property("code",0);
+                        msg.should.have.property("foo","bar");
+
+                        msg = messages[1];
+                        msg.should.have.property("payload");
+                        msg.payload.should.be.a.String();
+                        msg.payload.should.equal("ECHO");
+                        msg.should.have.property("rc");
+                        msg.rc.should.have.property("code",0);
+                        msg.should.have.property("foo","bar");
+
+                        msg = messages[2];
+                        msg.should.have.property("payload");
+                        msg.payload.should.have.property("code",0);
+                        msg.should.have.property("foo","bar");
+
+                        child_process.exec.restore();
+                        done();
+                    }
+                    catch(err) {
+                        child_process.exec.restore();
+                        done(err);
+                    }
+                };
+                n2.on("input", function(msg) {
+                    messages[0] = msg;
+                    completeTest();
+                });
+                n3.on("input", function(msg) {
+                    messages[1] = msg;
+                    completeTest();
+                });
+                n4.on("input", function(msg) {
+                    messages[2] = msg;
+                    completeTest();
+                });
+                n1.receive({payload:"and", foo:"bar"});
+            });
+        });
+
+        it('should preserve existing properties on msg object for a failing command', function(done) {
+            var flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"error", addpay:false, append:"", oldrc:"false"},
+                        {id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}];
+            var spy = sinon.stub(child_process, 'exec',
+            function(arg1, arg2, arg3, arg4) {
+                // arg3(error,stdout,stderr);
+                arg3({code: 1},arg1,arg1.toUpperCase());
+            });
+            helper.load(execNode, flow, function() {
+                var n1 = helper.getNode("n1");
+                var n2 = helper.getNode("n2");
+                var n3 = helper.getNode("n3");
+                var n4 = helper.getNode("n4");
+                var received = 0;
+                var messages = [null,null,null];
+                var completeTest = function() {
+                    received++;
+                    if (received < 3) {
+                        return;
+                    }
+                    try {
+                        var msg = messages[0];
+                        msg.should.have.property("payload");
+                        msg.payload.should.be.a.String();
+                        msg.payload.should.equal("error");
+                        msg.should.have.property("rc");
+                        msg.rc.should.have.property("code",1);
+                        msg.rc.should.have.property("message",undefined);
+                        msg.should.have.property("foo",null);
+
+                        msg = messages[1];
+                        msg.should.have.property("payload");
+                        msg.payload.should.be.a.String();
+                        msg.payload.should.equal("ERROR");
+                        msg.should.have.property("foo",null);
+
+                        msg = messages[2];
+                        msg.should.have.property("payload");
+                        msg.payload.should.have.property("code",1);
+                        msg.should.have.property("foo",null);
+
+                        child_process.exec.restore();
+                        done();
+                    }
+                    catch(err) {
+                        child_process.exec.restore();
+                        done(err);
+                    }
+                };
+                n2.on("input", function(msg) {
+                    messages[0] = msg;
+                    completeTest();
+                });
+                n3.on("input", function(msg) {
+                    messages[1] = msg;
+                    completeTest();
+                });
+                n4.on("input", function(msg) {
+                    messages[2] = msg;
+                    completeTest();
+                });
+                n1.receive({payload:"and", foo:null});
+            });
+        });
+
     });
 
     describe('calling spawn', function() {
@@ -672,5 +804,116 @@ describe('exec node', function() {
             });
         });
 
+        it('should preserve existing properties on msg object', function(done) {
+            var flow;
+            var expected;
+            if (osType === "Windows_NT") {
+                flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"cmd /C echo this now works", addpay:false, append:"", useSpawn:"true", oldrc:"false"},
+                        {id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}];
+                expected = "this now works\r\n";
+            } else {
+                flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"echo this now works", addpay:false, append:"", useSpawn:"true", oldrc:"false"},
+                        {id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}];
+                expected = "this now works\n";
+            }
+            helper.load(execNode, flow, function() {
+                var n1 = helper.getNode("n1");
+                var n2 = helper.getNode("n2");
+                var n3 = helper.getNode("n3");
+                var n4 = helper.getNode("n4");
+                var received = 0;
+                var messages = [null,null];
+                var completeTest = function() {
+                    received++;
+                    if (received < 2) {
+                        return;
+                    }
+                    try {
+                        var msg = messages[0];
+                        msg.should.have.property("payload");
+                        msg.payload.should.be.a.String();
+                        msg.payload.should.equal(expected);
+                        msg.should.have.property("foo",123);
+
+                        msg = messages[1];
+                        msg.should.have.property("payload");
+                        should.exist(msg.payload);
+                        msg.payload.should.have.property("code",0);
+                        msg.should.have.property("foo",123);
+
+                        done();
+                    }
+                    catch(err) {
+                        done(err);
+                    }
+                };
+
+                n2.on("input", function(msg) {
+                    messages[0] = msg;
+                    completeTest();
+                });
+                n4.on("input", function(msg) {
+                    messages[1] = msg;
+                    completeTest();
+                });
+                n1.receive({payload:null,foo:123});
+            });
+        });
+
+        it('should preserve existing properties on msg object for a failing command', function(done) {
+            var flow;
+            var expected;
+            if (osType === "Windows_NT") {
+                // Cannot use mkdir because Windows mkdir command automatically creates non-existent directories.
+                flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"ping /foo/bar/doo/dah", addpay:false, append:"", useSpawn:"true", oldrc:"false"},
+                            {id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}];
+                expected = "IP address must be specified.";
+            } else {
+                flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"mkdir /foo/bar/doo/dah", addpay:false, append:"", useSpawn:"true", oldrc:"false"},
+                            {id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}];
+                expected = ' directory';
+            }
+            helper.load(execNode, flow, function() {
+                var n1 = helper.getNode("n1");
+                var n2 = helper.getNode("n2");
+                var n3 = helper.getNode("n3");
+                var n4 = helper.getNode("n4");
+                var received = 0;
+                var messages = [null,null];
+                var completeTest = function() {
+                    received++;
+                    if (received < 2) {
+                        return;
+                    }
+                    try {
+                        var msg = messages[0];
+                        msg.should.have.property("payload");
+                        msg.payload.should.be.a.String();
+                        msg.should.have.property("foo","baz");
+
+                        msg = messages[1];
+                        msg.should.have.property("payload");
+                        msg.payload.should.have.property("code",1);
+                        msg.should.have.property("foo","baz");
+
+                        done();
+                    }
+                    catch(err) {
+                        done(err);
+                    }
+                };
+
+                n3.on("input", function(msg) {
+                    messages[0] = msg;
+                    completeTest();
+                });
+                n4.on("input", function(msg) {
+                    messages[1] = msg;
+                    completeTest();
+                });
+                n1.receive({payload:null,foo:"baz"});
+            });
+        });
+
     });
 });

From 8a68a3e86195e042ecdca472b92c59f3128eed87 Mon Sep 17 00:00:00 2001
From: TJKoury <TJKoury@gmail.com>
Date: Thu, 4 Oct 2018 10:17:04 -0400
Subject: [PATCH 36/38] Update editor options

http://expressjs.com/en/api.html#app.settings.table

Allow for setting individual options on the editor express app.  This app is not available through the embedded interface when using Node-RED within another application.

Update settings with editor options

Allow editor express app options to be set in settings.js

Update settings.js

formatting

Update settings.js

Co-Authored-By: TJKoury <TJKoury@gmail.com>

editorOptions -> httpServerOptions
---
 .../@node-red/editor-api/lib/editor/index.js   |  5 +++++
 packages/node_modules/node-red/settings.js     | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/index.js b/packages/node_modules/@node-red/editor-api/lib/editor/index.js
index 596fba67e..dbf4c18f2 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/index.js
@@ -64,6 +64,11 @@ module.exports = {
                     }
                 });
             }
+            if (settings.httpServerOptions) {
+                for (var eOption in settings.httpServerOptions) {
+                    editorApp.set(eOption, settings.httpServerOptions[eOption]);
+                }
+            }
             editorApp.get("/",ensureRuntimeStarted,ui.ensureSlash,ui.editor);
 
             editorApp.get("/icons",needsPermission("nodes.read"),nodes.getIcons,apiUtil.errorHandler);
diff --git a/packages/node_modules/node-red/settings.js b/packages/node_modules/node-red/settings.js
index 641c56498..0bee5308c 100644
--- a/packages/node_modules/node-red/settings.js
+++ b/packages/node_modules/node-red/settings.js
@@ -257,4 +257,22 @@ module.exports = {
             enabled: false
         }
     },
+    // http://expressjs.com/en/api.html#app.settings.table
+    //httpServerOptions: {
+    //  'case sensitive routing': false,
+    //  'env': false,
+    //  'etag': false,
+    //  'jsonp callback name': false,
+    //  'json escape': false,
+    //  'json replacer': false,
+    //  'json spaces': false,
+    //  'query parser': false,
+    //  'strict routing': false,
+    //  'subdomain offset': false,
+    //  'trust proxy': false,
+    //  'views': false,
+    //  'view cache': false,
+    //  'view engine': false,
+    //  'x-powered-by': false
+    //}
 }

From 4a081bf125e351759c0ff1337923d64d4c0d8b63 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 22 Oct 2018 23:00:00 +0100
Subject: [PATCH 37/38] Update httpServerOptions doc in settings.js

---
 packages/node_modules/node-red/settings.js | 25 ++++++----------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/packages/node_modules/node-red/settings.js b/packages/node_modules/node-red/settings.js
index 0bee5308c..724cb5a28 100644
--- a/packages/node_modules/node-red/settings.js
+++ b/packages/node_modules/node-red/settings.js
@@ -181,6 +181,11 @@ module.exports = {
     //    next();
     //},
 
+    // The following property can be used to pass custom options to the Express.js
+    // server used by Node-RED. For a full list of available options, refer
+    // to http://expressjs.com/en/api.html#app.settings.table
+    //httpServerOptions: { },
+
     // The following property can be used to verify websocket connection attempts.
     // This allows, for example, the HTTP request headers to be checked to ensure
     // they include valid authentication information.
@@ -256,23 +261,5 @@ module.exports = {
             // To enable the Projects feature, set this value to true
             enabled: false
         }
-    },
-    // http://expressjs.com/en/api.html#app.settings.table
-    //httpServerOptions: {
-    //  'case sensitive routing': false,
-    //  'env': false,
-    //  'etag': false,
-    //  'jsonp callback name': false,
-    //  'json escape': false,
-    //  'json replacer': false,
-    //  'json spaces': false,
-    //  'query parser': false,
-    //  'strict routing': false,
-    //  'subdomain offset': false,
-    //  'trust proxy': false,
-    //  'views': false,
-    //  'view cache': false,
-    //  'view engine': false,
-    //  'x-powered-by': false
-    //}
+    }
 }

From c9db74ebca0777e342c036d7d7ca43cf332a121b Mon Sep 17 00:00:00 2001
From: nakanishi <kazuki.nakanishi.vr@hitachi-solutions.com>
Date: Tue, 23 Oct 2018 16:30:56 +0900
Subject: [PATCH 38/38] Show default icon when non-existent font-awesome icon
 was specified

---
 .../@node-red/editor-client/src/js/ui/diff.js |  2 +-
 .../editor-client/src/js/ui/editor.js         |  7 ++--
 .../editor-client/src/js/ui/palette.js        |  6 +--
 .../editor-client/src/js/ui/search.js         |  2 +-
 .../editor-client/src/js/ui/typeSearch.js     |  2 +-
 .../editor-client/src/js/ui/utils.js          | 40 +++++++++++++------
 6 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
index 37315974e..c1255137c 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
@@ -498,7 +498,7 @@ RED.diff = (function() {
         nodeDiv.css('backgroundColor',colour);
 
         var iconContainer = $('<div/>',{class:"palette_icon_container"}).appendTo(nodeDiv);
-        RED.utils.createIconElement(icon_url, iconContainer, false);
+        RED.utils.createIconElement(icon_url, iconContainer, false, def, node);
 
         return nodeDiv;
     }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 0006f955d..443e9d768 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -808,6 +808,7 @@ RED.editor = (function() {
             buildLabelRow().appendTo(outputsDiv);
         }
 
+        // 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"))) {
             $('<hr>').appendTo(dialogForm);
             var iconRow = $('<div class="form-row"></div>').appendTo(dialogForm);
@@ -820,7 +821,7 @@ RED.editor = (function() {
             var icon_url = RED.utils.getNodeIcon(node._def,node);
             nodeDiv.css('backgroundColor',colour);
             var iconContainer = $('<div/>',{class:"palette_icon_container"}).appendTo(nodeDiv);
-            RED.utils.createIconElement(icon_url, iconContainer, true);
+            RED.utils.createIconElement(icon_url, iconContainer, true, node._def, node);
 
             iconButton.click(function(e) {
                 e.preventDefault();
@@ -834,9 +835,9 @@ RED.editor = (function() {
                 showIconPicker(iconRow,node,iconPath,function(newIcon) {
                     $("#node-settings-icon").text(newIcon||"");
                     var icon_url = RED.utils.getNodeIcon(node._def,{type:node.type,icon:newIcon});
-                    RED.utils.createIconElement(icon_url, iconContainer, true);
+                    RED.utils.createIconElement(icon_url, iconContainer, true, node._def, node);
                 });
-            })
+            });
             $('<div class="uneditable-input" id="node-settings-icon">').text(node.icon).appendTo(iconRow);
         }
     }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 121c53994..a0f8ce0fc 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -142,9 +142,9 @@ RED.palette = (function() {
     }
 
     function setIcon(element,sf) {
-        var icon_url = RED.utils.getNodeIcon(sf._def,sf);
+        var icon_url = RED.utils.getNodeIcon(sf._def);
         var iconContainer = element.find(".palette_icon_container");
-        RED.utils.createIconElement(icon_url, iconContainer, true);
+        RED.utils.createIconElement(icon_url, iconContainer, true, sf._def);
     }
 
     function escapeNodeType(nt) {
@@ -182,7 +182,7 @@ RED.palette = (function() {
             if (def.icon) {
                 var icon_url = RED.utils.getNodeIcon(def);
                 var iconContainer = $('<div/>',{class:"palette_icon_container"+(def.align=="right"?" palette_icon_container_right":"")}).appendTo(d);
-                RED.utils.createIconElement(icon_url, iconContainer, true);
+                RED.utils.createIconElement(icon_url, iconContainer, true, def);
             }
 
             d.style.backgroundColor = RED.utils.getNodeColor(nt,def);
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js
index cce7dddf3..e5fa59914 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js
@@ -203,7 +203,7 @@ RED.search = (function() {
                     nodeDiv.css('backgroundColor',colour);
 
                     var iconContainer = $('<div/>',{class:"palette_icon_container"}).appendTo(nodeDiv);
-                    RED.utils.createIconElement(icon_url, iconContainer, true);
+                    RED.utils.createIconElement(icon_url, iconContainer, true, node._def, node);
 
                     var contentDiv = $('<div>',{class:"red-ui-search-result-description"}).appendTo(div);
                     if (node.z) {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js b/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
index 0e0ce98b3..a99d90b58 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
@@ -133,7 +133,7 @@ RED.typeSearch = (function() {
                 nodeDiv.css('backgroundColor',colour);
 
                 var iconContainer = $('<div/>',{class:"palette_icon_container"}).appendTo(nodeDiv);
-                RED.utils.createIconElement(icon_url, iconContainer, false);
+                RED.utils.createIconElement(icon_url, iconContainer, false, def);
 
                 if (def.inputs > 0) {
                     $('<div/>',{class:"red-ui-search-result-node-port"}).appendTo(nodeDiv);
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
index 7c4647045..77faf60ab 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
@@ -767,10 +767,12 @@ RED.utils = (function() {
             return RED.settings.apiRootUrl+"icons/node-red/alert.png"
         } else if (node && node.icon) {
             var iconPath = separateIconPath(node.icon);
-            if (iconPath.module === "font-awesome") {
-                return node.icon;
-            } else if (isIconExists(iconPath)) {
-                return RED.settings.apiRootUrl+"icons/" + node.icon;
+            if (isIconExists(iconPath)) {
+                if (iconPath.module === "font-awesome") {
+                    return node.icon;
+                } else {
+                    return RED.settings.apiRootUrl+"icons/" + node.icon;
+                }
             }
         }
 
@@ -895,10 +897,12 @@ RED.utils = (function() {
      /**
       * Create or update an icon element and append it to iconContainer.
       * @param iconUrl - Url of icon.
-      * @param iconContainer - icon container element with palette_icon_container class.
-      * @param isLarge - whether the icon size is large.
+      * @param iconContainer - Icon container element with palette_icon_container class.
+      * @param isLarge - Whether the icon size is large.
+      * @param def - Default definition of a node.
+      * @param node - If the icon is a specific node instance, this parameter must be specified. If it is icon template such as an icon on the palette, this must be omitted.
       */
-    function createIconElement(iconUrl, iconContainer, isLarge) {
+    function createIconElement(iconUrl, iconContainer, isLarge, def, node) {
         // Removes the previous icon when icon was changed.
         var iconElement = iconContainer.find(".palette_icon");
         if (iconElement.length !== 0) {
@@ -912,13 +916,23 @@ RED.utils = (function() {
         // Show either icon image or font-awesome icon
         var iconPath = separateIconPath(iconUrl);
         if (iconPath.module === "font-awesome") {
-            var faIconElement = $('<i/>').appendTo(iconContainer);
-            var faLarge = isLarge ? "fa-lg " : "";
-            faIconElement.addClass("palette_icon_fa fa fa-fw " + faLarge + iconPath.file);
-        } else {
-            var imageIconElement = $('<div/>',{class:"palette_icon"}).appendTo(iconContainer);
-            imageIconElement.css("backgroundImage", "url("+iconUrl+")");
+            var fontAwesomeUnicode = RED.nodes.fontAwesome.getIconUnicode(iconPath.file);
+            if (fontAwesomeUnicode) {
+                var faIconElement = $('<i/>').appendTo(iconContainer);
+                var faLarge = isLarge ? "fa-lg " : "";
+                faIconElement.addClass("palette_icon_fa fa fa-fw " + faLarge + iconPath.file);
+                return;
+            }
+            // If the specified name is not defined in font-awesome, show the default icon.
+            if (def) {
+                var iconPath = RED.utils.getDefaultNodeIcon(def, node);
+                iconUrl = RED.settings.apiRootUrl+"icons/"+iconPath.module+"/"+iconPath.file;
+            } else {
+                iconUrl = RED.settings.apiRootUrl+"icons/node-red/arrow-in.png"
+            }
         }
+        var imageIconElement = $('<div/>',{class:"palette_icon"}).appendTo(iconContainer);
+        imageIconElement.css("backgroundImage", "url("+iconUrl+")");
     }
 
     return {