From af1ea610ea4eafb825d2521b1270aefa264843a5 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Mon, 21 May 2018 19:34:56 +0900
Subject: [PATCH 001/113] allow id and name reference in function node code
 (#1731)

---
 nodes/core/core/80-function.html         |  6 +++++
 nodes/core/core/80-function.js           |  4 ++++
 test/nodes/core/core/80-function_spec.js | 28 ++++++++++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/nodes/core/core/80-function.html b/nodes/core/core/80-function.html
index 4d5131df8..61af46d36 100644
--- a/nodes/core/core/80-function.html
+++ b/nodes/core/core/80-function.html
@@ -52,6 +52,12 @@
     <p>The Catch node can also be used to handle errors. To invoke a Catch node,
     pass <code>msg</code> as a second argument to <code>node.error</code>:</p>
     <pre>node.error("Error",msg);</pre>
+    <h4>Referring Node Information</h4>
+    <p>In the function block, id and name of the node can be referenced using the following properties:</p>
+    <ul>
+        <li><code>node.id</code> - id of the node</li>
+        <li><code>node.name</code> - name of the node</li>
+    </ul>
 </script>
 
 <script type="text/javascript">
diff --git a/nodes/core/core/80-function.js b/nodes/core/core/80-function.js
index 8aa95e4fc..a76e1eead 100644
--- a/nodes/core/core/80-function.js
+++ b/nodes/core/core/80-function.js
@@ -62,6 +62,8 @@ module.exports = function(RED) {
                            "results = (function(msg){ "+
                               "var __msgid__ = msg._msgid;"+
                               "var node = {"+
+                                 "id:__node__.id,"+
+                                 "name:__node__.name,"+
                                  "log:__node__.log,"+
                                  "error:__node__.error,"+
                                  "warn:__node__.warn,"+
@@ -84,6 +86,8 @@ module.exports = function(RED) {
                 util: RED.util
             },
             __node__: {
+                id: node.id,
+                name: node.name,
                 log: function() {
                     node.log.apply(node, arguments);
                 },
diff --git a/test/nodes/core/core/80-function_spec.js b/test/nodes/core/core/80-function_spec.js
index b96588b5b..0e94f97af 100644
--- a/test/nodes/core/core/80-function_spec.js
+++ b/test/nodes/core/core/80-function_spec.js
@@ -508,6 +508,34 @@ describe('function node', function() {
         });
     });
 
+    it('should allow accessing node.id', function(done) {
+        var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"msg.payload = node.id; return msg;"},
+                    {id:"n2", type:"helper"}];
+        helper.load(functionNode, flow, function() {
+            var n1 = helper.getNode("n1");
+            var n2 = helper.getNode("n2");
+            n2.on("input", function(msg) {
+                msg.should.have.property('payload', n1.id);
+                done();
+            });
+            n1.receive({payload:"foo",topicb: "bar"});
+        });
+    });
+
+    it('should allow accessing node.name', function(done) {
+        var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"msg.payload = node.name; return msg;", "name":"name of node"},
+                    {id:"n2", type:"helper"}];
+        helper.load(functionNode, flow, function() {
+            var n1 = helper.getNode("n1");
+            var n2 = helper.getNode("n2");
+            n2.on("input", function(msg) {
+                msg.should.have.property('payload', n1.name);
+                done();
+            });
+            n1.receive({payload:"foo",topicb: "bar"});
+        });
+    });
+
     describe('Logger', function () {
         it('should log an Info Message', function (done) {
             var flow = [{id: "n1", type: "function", wires: [["n2"]], func: "node.log('test');"}];

From eb6d093e56ee2c8122ee0b08ca8bdfb41824cd7f Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 21 May 2018 15:10:06 +0100
Subject: [PATCH 002/113] Add env-var support to TypedInput

---
 editor/images/typedInput/env.png        | Bin 0 -> 809 bytes
 editor/js/ui/common/typedInput.js       |   5 +++
 nodes/core/core/20-inject.html          |   2 +-
 nodes/core/logic/10-switch.html         |   8 ++--
 nodes/core/logic/15-change.html         |   6 +--
 nodes/core/logic/15-change.js           |   2 +
 red/runtime/util.js                     |  19 ++++++++
 test/nodes/core/logic/15-change_spec.js |  56 +++++++++++++++++++++++-
 test/red/runtime/util_spec.js           |  32 ++++++++++++++
 9 files changed, 121 insertions(+), 9 deletions(-)
 create mode 100644 editor/images/typedInput/env.png

diff --git a/editor/images/typedInput/env.png b/editor/images/typedInput/env.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ea51da0023ac14d71b8c2c32bc976f01116cc0b
GIT binary patch
literal 809
zcmV+^1J?YBP)<h;3K|Lk000e1NJLTq000~S001Tk1^@s6*X;XW00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4`BcR4`BhQKc{H`000McNliru;sq58Coe@lSSbJi0=7v+
zK~z}7?U!F@j&T&nKYPvm8Dc$2SW}zMW~rf+Tv#b>rcp@khRiULR=6-%Tr4HYQq=sp
z5tBbH%b${^T&!FeQBEr^q@+D9n&nU1>*lCmZ_oSg`MvKeCFknAr}KNi&pFTU`#tA@
zf88ee9uSd|AP8;+K~Nfo;Zxu9i7Xy+B~TCS&!)nJXLZFuh5ei=BIP1d;PW2^F+j?I
zgTOkVD&irBfhWLmRehclpor`RP6N|o7H|=0Rn?!~mqtVm0Ox?o77Br0;2BT@d<Hs!
z8NfWtSq_v3LC_P1VKVkR6p;$xloPrFELPQRK)1z4RP_k33}^wyE#3s|@x3&=fg<xC
z1I?;B9F?f5NmcCvjyd7OB2wrBxYqGIRCPSY`#TGKF@F)T!Uu4^<G+k^TU7O{RXJi^
z8Hma&Omp77WwU@!F+n@+B6$=4t>drHr<SGz>~Z`PB2t?#z;rFWVCqt4E$tJL8^FzM
z1V5J2h)5N1-$0{m6lez?0&i3`nX{IfShoX*9L0&U_f~zUs=mufybX8(umNZ=j!w^T
zyE{zC$Fc@Y0j~${nU-F*DY7Ib?Gmsns?FI9;H0CaZK_%gtO6c6IXi*Id`<i)!uJDp
zDRkQR#{dm<%x33rs}+&NggmsQjlf*ss;Z87;J$GDB4Ccq(Tv333S2k85@_=P{059U
z;*f~b(!lX|h{zNVz)A<~J1`Unup9Vc{%l~o2Vkq?_r;=xsty6SozNK(Su+7Q3q+(P
zWwq#vO?(k4wE<e<gs<5WH4``wd;~VxWN!jiJGs3;V^oEi#JdK#3oP_x$OB-rs*ZZ`
zP*n#20ggJmN+uh$?X4jln2&fD1J%G%Q<N<>o=yU<fmgs_oMkH;@vgHu`9W2E+nqmY
n%XP)bWc|P$`+)gxf8TxqZ@9_UWYdY)00000NkvXXu0mjf=#yn@

literal 0
HcmV?d00001

diff --git a/editor/js/ui/common/typedInput.js b/editor/js/ui/common/typedInput.js
index 3b5a0d62c..f5227fd68 100644
--- a/editor/js/ui/common/typedInput.js
+++ b/editor/js/ui/common/typedInput.js
@@ -76,6 +76,11 @@
                     }
                 })
             }
+        },
+        env: {
+            value: "env",
+            label: "env variable",
+            icon: "red/images/typedInput/env.png"
         }
     };
     var nlsd = false;
diff --git a/nodes/core/core/20-inject.html b/nodes/core/core/20-inject.html
index 4090fdbbd..6f8ebcf69 100644
--- a/nodes/core/core/20-inject.html
+++ b/nodes/core/core/20-inject.html
@@ -263,7 +263,7 @@ If you want every 20 minutes from now - use the <i>"interval"</i> option.</p>
             $("#node-input-payload").typedInput({
                 default: 'str',
                 typeField: $("#node-input-payloadType"),
-                types:['flow','global','str','num','bool','json','bin','date']
+                types:['flow','global','str','num','bool','json','bin','date','env']
             });
 
             $("#inject-time-type-select").change(function() {
diff --git a/nodes/core/logic/10-switch.html b/nodes/core/logic/10-switch.html
index ffa5a48e5..f4ffc7dea 100644
--- a/nodes/core/logic/10-switch.html
+++ b/nodes/core/logic/10-switch.html
@@ -230,12 +230,12 @@
                             selectField.append($("<option></option>").val(operators[d].v).text(/^switch/.test(operators[d].t)?node._(operators[d].t):operators[d].t));
                         }
                     }
-                    var valueField = $('<input/>',{class:"node-input-rule-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'str',types:['msg','flow','global','str','num','jsonata',previousValueType]});
-                    var numValueField = $('<input/>',{class:"node-input-rule-num-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'num',types:['flow','global','num','jsonata']});
+                    var valueField = $('<input/>',{class:"node-input-rule-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'str',types:['msg','flow','global','str','num','jsonata','env',previousValueType]});
+                    var numValueField = $('<input/>',{class:"node-input-rule-num-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'num',types:['flow','global','num','jsonata','env']});
                     var expValueField = $('<input/>',{class:"node-input-rule-exp-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'jsonata',types:['jsonata']});
-                    var btwnValueField = $('<input/>',{class:"node-input-rule-btwn-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'num',types:['msg','flow','global','str','num','jsonata',previousValueType]});
+                    var btwnValueField = $('<input/>',{class:"node-input-rule-btwn-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'num',types:['msg','flow','global','str','num','jsonata','env',previousValueType]});
                     var btwnAndLabel = $('<span/>',{class:"node-input-rule-btwn-label"}).text(" "+andLabel+" ").appendTo(row3);
-                    var btwnValue2Field = $('<input/>',{class:"node-input-rule-btwn-value2",type:"text",style:"margin-left:2px;"}).appendTo(row3).typedInput({default:'num',types:['msg','flow','global','str','num','jsonata',previousValueType]});
+                    var btwnValue2Field = $('<input/>',{class:"node-input-rule-btwn-value2",type:"text",style:"margin-left:2px;"}).appendTo(row3).typedInput({default:'num',types:['msg','flow','global','str','num','jsonata','env',previousValueType]});
                     var typeValueField = $('<input/>',{class:"node-input-rule-type-value",type:"text",style:"margin-left: 5px;"}).appendTo(row)
                         .typedInput({default:'string',types:[
                             {value:"string",label:"string",hasValue:false},
diff --git a/nodes/core/logic/15-change.html b/nodes/core/logic/15-change.html
index 999c0ed71..83bdecf9e 100644
--- a/nodes/core/logic/15-change.html
+++ b/nodes/core/logic/15-change.html
@@ -146,7 +146,7 @@
                         .appendTo(row2);
                     var propertyValue = $('<input/>',{class:"node-input-rule-property-value",type:"text"})
                         .appendTo(row2)
-                        .typedInput({default:'str',types:['msg','flow','global','str','num','bool','json','bin','date','jsonata']});
+                        .typedInput({default:'str',types:['msg','flow','global','str','num','bool','json','bin','date','jsonata','env']});
 
                     var row3_1 = $('<div/>').appendTo(row3);
                     $('<div/>',{style:"display:inline-block;text-align:right; width:120px; padding-right:10px; box-sizing:border-box;"})
@@ -154,7 +154,7 @@
                         .appendTo(row3_1);
                     var fromValue = $('<input/>',{class:"node-input-rule-property-search-value",type:"text"})
                         .appendTo(row3_1)
-                        .typedInput({default:'str',types:['msg','flow','global','str','re','num','bool']});
+                        .typedInput({default:'str',types:['msg','flow','global','str','re','num','bool','env']});
 
                     var row3_2 = $('<div/>',{style:"margin-top:8px;"}).appendTo(row3);
                     $('<div/>',{style:"display:inline-block;text-align:right; width:120px; padding-right:10px; box-sizing:border-box;"})
@@ -162,7 +162,7 @@
                         .appendTo(row3_2);
                     var toValue = $('<input/>',{class:"node-input-rule-property-replace-value",type:"text"})
                         .appendTo(row3_2)
-                        .typedInput({default:'str',types:['msg','flow','global','str','num','bool','json','bin']});
+                        .typedInput({default:'str',types:['msg','flow','global','str','num','bool','json','bin','env']});
 
                     $('<div/>',{style:"display:inline-block;text-align:right; width:120px; padding-right:10px; box-sizing:border-box;"})
                         .text(to)
diff --git a/nodes/core/logic/15-change.js b/nodes/core/logic/15-change.js
index ae50394ed..c7c05118e 100644
--- a/nodes/core/logic/15-change.js
+++ b/nodes/core/logic/15-change.js
@@ -93,6 +93,8 @@ module.exports = function(RED) {
                     valid = false;
                     this.error(RED._("change.errors.invalid-expr",{error:e.message}));
                 }
+            } else if (rule.tot === 'env') {
+                rule.to = RED.util.evaluateNodeProperty(rule.to,'env');
             }
         }
 
diff --git a/red/runtime/util.js b/red/runtime/util.js
index 88c06a029..1480a841a 100644
--- a/red/runtime/util.js
+++ b/red/runtime/util.js
@@ -303,6 +303,23 @@ function setMessageProperty(msg,prop,value,createMissing) {
     }
 }
 
+function evaluteEnvProperty(value) {
+    if (/^\${[^}]+}$/.test(value)) {
+        // ${ENV_VAR}
+        value = value.substring(2,value.length-1);
+        value = process.env.hasOwnProperty(value)?process.env[value]:""
+    } else if (!/\${\S+}/.test(value)) {
+        // ENV_VAR
+        value = process.env.hasOwnProperty(value)?process.env[value]:""
+    } else {
+        // FOO${ENV_VAR}BAR
+        value = value.replace(/\${([^}]+)}/g, function(match, v) {
+            return process.env.hasOwnProperty(v)?process.env[v]:""
+        });
+    }
+    return value;
+}
+
 function evaluateNodeProperty(value, type, node, msg) {
     if (type === 'str') {
         return ""+value;
@@ -328,6 +345,8 @@ function evaluateNodeProperty(value, type, node, msg) {
     } else if (type === 'jsonata') {
         var expr = prepareJSONataExpression(value,node);
         return evaluateJSONataExpression(expr,msg);
+    } else if (type === 'env') {
+        return evaluteEnvProperty(value);
     }
     return value;
 }
diff --git a/test/nodes/core/logic/15-change_spec.js b/test/nodes/core/logic/15-change_spec.js
index f5ca0f3d2..e444b2663 100644
--- a/test/nodes/core/logic/15-change_spec.js
+++ b/test/nodes/core/logic/15-change_spec.js
@@ -390,7 +390,7 @@ describe('change Node', function() {
                 changeNode1.receive({payload:""});
             });
         });
- 
+
         it('sets the value of the message property to the current timestamp', function(done) {
             var flow = [{"id":"changeNode1","type":"change","rules":[{"t":"set","p":"ts","pt":"msg","to":"","tot":"date"}],"name":"changeNode","wires":[["helperNode1"]]},
                         {id:"helperNode1", type:"helper", wires:[]}];
@@ -409,6 +409,33 @@ describe('change Node', function() {
             });
         });
 
+        describe('env var', function() {
+            before(function() {
+                process.env.NR_TEST_A = 'foo';
+            })
+            after(function() {
+                delete process.env.NR_TEST_A;
+            })
+            it('sets the value using env property', function(done) {
+                var flow = [{"id":"changeNode1","type":"change",rules:[{"t":"set","p":"payload","pt":"msg","to":"NR_TEST_A","tot":"env"}],"name":"changeNode","wires":[["helperNode1"]]},
+                {id:"helperNode1", type:"helper", wires:[]}];
+                helper.load(changeNode, flow, function() {
+                    var changeNode1 = helper.getNode("changeNode1");
+                    var helperNode1 = helper.getNode("helperNode1");
+                    helperNode1.on("input", function(msg) {
+                        try {
+                            msg.payload.should.equal("foo");
+                            done();
+                        } catch(err) {
+                            done(err);
+                        }
+                    });
+                    changeNode1.receive({payload:"123",topic:"ABC"});
+                });
+            });
+        });
+
+
         it('changes the value using jsonata', function(done) {
             var flow = [{"id":"changeNode1","type":"change",rules:[{"t":"set","p":"payload","to":"$length(payload)","tot":"jsonata"}],"name":"changeNode","wires":[["helperNode1"]]},
                         {id:"helperNode1", type:"helper", wires:[]}];
@@ -872,6 +899,33 @@ describe('change Node', function() {
                 changeNode1.receive({payload:""});
             });
         });
+
+        describe('env var', function() {
+            before(function() {
+                process.env.NR_TEST_A = 'foo';
+            })
+            after(function() {
+                delete process.env.NR_TEST_A;
+            })
+            it('changes the value using env property', function(done) {
+                var flow = [{"id":"changeNode1","type":"change",rules:[{"t":"change","p":"payload","from":"topic","to":"NR_TEST_A","fromt":"msg","tot":"env"}],"name":"changeNode","wires":[["helperNode1"]]},
+                {id:"helperNode1", type:"helper", wires:[]}];
+                helper.load(changeNode, flow, function() {
+                    var changeNode1 = helper.getNode("changeNode1");
+                    var helperNode1 = helper.getNode("helperNode1");
+                    helperNode1.on("input", function(msg) {
+                        try {
+                            msg.payload.should.equal("abcfooabc");
+                            done();
+                        } catch(err) {
+                            done(err);
+                        }
+                    });
+                    changeNode1.receive({payload:"abcABCabc",topic:"ABC"});
+                });
+            });
+        });
+
     });
 
     describe("#delete", function() {
diff --git a/test/red/runtime/util_spec.js b/test/red/runtime/util_spec.js
index f542228a2..1b7438efd 100644
--- a/test/red/runtime/util_spec.js
+++ b/test/red/runtime/util_spec.js
@@ -307,6 +307,38 @@ describe("red/util", function() {
             },{});
             result.should.eql("123");
         });
+        describe('environment variable', function() {
+            before(function() {
+                process.env.NR_TEST_A = "foo";
+                process.env.NR_TEST_B = "${NR_TEST_A}";
+            })
+            after(function() {
+                delete process.env.NR_TEST_A;
+                delete process.env.NR_TEST_B;
+            })
+
+            it('returns an environment variable - NR_TEST_A', function() {
+                var result = util.evaluateNodeProperty('NR_TEST_A','env');
+                result.should.eql('foo');
+            });
+            it('returns an environment variable - ${NR_TEST_A}', function() {
+                var result = util.evaluateNodeProperty('${NR_TEST_A}','env');
+                result.should.eql('foo');
+            });
+            it('returns an environment variable - ${NR_TEST_A', function() {
+                var result = util.evaluateNodeProperty('${NR_TEST_A','env');
+                result.should.eql('');
+            });
+            it('returns an environment variable - foo${NR_TEST_A}bar', function() {
+                var result = util.evaluateNodeProperty('123${NR_TEST_A}456','env');
+                result.should.eql('123foo456');
+            });
+            it('returns an environment variable - foo${NR_TEST_B}bar', function() {
+                var result = util.evaluateNodeProperty('123${NR_TEST_B}456','env');
+                result.should.eql('123${NR_TEST_A}456');
+            });
+
+        });
     });
 
     describe('normalisePropertyExpression', function() {

From e13fed9fc652086ace3a80034212bfc36bec282d Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 21 May 2018 15:19:50 +0100
Subject: [PATCH 003/113] Widen support for env var to use ${} or $() syntax

---
 red/runtime/nodes/flows/util.js           | 13 ++++++-------
 test/red/runtime/nodes/flows/util_spec.js | 18 +++++++++++++++++-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/red/runtime/nodes/flows/util.js b/red/runtime/nodes/flows/util.js
index 16b9f461b..e7664715f 100644
--- a/red/runtime/nodes/flows/util.js
+++ b/red/runtime/nodes/flows/util.js
@@ -37,7 +37,8 @@ function diffNodes(oldNode,newNode) {
     return false;
 }
 
-var EnvVarPropertyRE = /^\$\((\S+)\)$/;
+var EnvVarPropertyRE_old = /^\$\((\S+)\)$/;
+var EnvVarPropertyRE = /^\${(\S+)}$/;
 
 function mapEnvVarProperties(obj,prop) {
     if (Buffer.isBuffer(obj[prop])) {
@@ -47,11 +48,9 @@ function mapEnvVarProperties(obj,prop) {
             mapEnvVarProperties(obj[prop],i);
         }
     } else if (typeof obj[prop] === 'string') {
-        var m;
-        if ( (m = EnvVarPropertyRE.exec(obj[prop])) !== null) {
-            if (process.env.hasOwnProperty(m[1])) {
-                obj[prop] = process.env[m[1]];
-            }
+        if (obj[prop][0] === "$" && (EnvVarPropertyRE_old.test(obj[prop]) || EnvVarPropertyRE.test(obj[prop])) ) {
+            var envVar = obj[prop].substring(2,obj[prop].length-1);
+            obj[prop] = process.env.hasOwnProperty(envVar)?process.env[envVar]:obj[prop];
         }
     } else {
         for (var p in obj[prop]) {
@@ -203,7 +202,7 @@ module.exports = {
         var linkMap = {};
 
         var changedTabs = {};
-        
+
         // Look for tabs that have been removed
         for (id in oldConfig.flows) {
             if (oldConfig.flows.hasOwnProperty(id) && (!newConfig.flows.hasOwnProperty(id))) {
diff --git a/test/red/runtime/nodes/flows/util_spec.js b/test/red/runtime/nodes/flows/util_spec.js
index 2cdc72fb3..184aaa70c 100644
--- a/test/red/runtime/nodes/flows/util_spec.js
+++ b/test/red/runtime/nodes/flows/util_spec.js
@@ -35,10 +35,17 @@ describe('flows/util', function() {
     });
 
     describe('#mapEnvVarProperties',function() {
-        it('handles ENV substitutions in an object', function() {
+        before(function() {
             process.env.foo1 = "bar1";
             process.env.foo2 = "bar2";
             process.env.foo3 = "bar3";
+        })
+        after(function() {
+            delete process.env.foo1;
+            delete process.env.foo2;
+            delete process.env.foo3;
+        })
+        it('handles ENV substitutions in an object - $()', function() {
             var foo = {a:"$(foo1)",b:"$(foo2)",c:{d:"$(foo3)"}};
             for (var p in foo) {
                 if (foo.hasOwnProperty(p)) {
@@ -47,6 +54,15 @@ describe('flows/util', function() {
             }
             foo.should.eql({ a: 'bar1', b: 'bar2', c: { d: 'bar3' } } );
         });
+        it('handles ENV substitutions in an object - ${}', function() {
+            var foo = {a:"${foo1}",b:"${foo2}",c:{d:"${foo3}"}};
+            for (var p in foo) {
+                if (foo.hasOwnProperty(p)) {
+                    flowUtil.mapEnvVarProperties(foo,p);
+                }
+            }
+            foo.should.eql({ a: 'bar1', b: 'bar2', c: { d: 'bar3' } } );
+        });
     });
 
     describe('#diffNodes',function() {

From 9ad9c0ec6a9b6d470bb32ba6258d41531f3d1223 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 21 May 2018 15:28:15 +0100
Subject: [PATCH 004/113] Add $env function to JSONata expressions

---
 editor/vendor/jsonata/formatter.js        | 1 +
 red/api/editor/locales/en-US/jsonata.json | 8 ++++++--
 red/runtime/util.js                       | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/editor/vendor/jsonata/formatter.js b/editor/vendor/jsonata/formatter.js
index 9b0f544c8..6ff26accb 100644
--- a/editor/vendor/jsonata/formatter.js
+++ b/editor/vendor/jsonata/formatter.js
@@ -117,6 +117,7 @@
         '$contains':{ args:[ 'str', 'pattern' ]},
         '$count':{ args:[ 'array' ]},
         '$each':{ args:[ 'object', 'function' ]},
+        '$env': { args:[ 'arg' ]},
         '$exists':{ args:[ 'arg' ]},
         '$filter':{ args:[ 'array', 'function' ]},
         '$floor':{ args:[ 'number' ]},
diff --git a/red/api/editor/locales/en-US/jsonata.json b/red/api/editor/locales/en-US/jsonata.json
index 14c7f7cd1..c839c759e 100644
--- a/red/api/editor/locales/en-US/jsonata.json
+++ b/red/api/editor/locales/en-US/jsonata.json
@@ -190,11 +190,11 @@
     },
     "$flowContext": {
         "args": "string",
-        "desc": "Retrieves a flow context property."
+        "desc": "Retrieves a flow context property.\n\nThis is a Node-RED defined function."
     },
     "$globalContext": {
         "args": "string",
-        "desc": "Retrieves a global context property."
+        "desc": "Retrieves a global context property.\n\nThis is a Node-RED defined function."
     },
     "$pad": {
         "args": "string, width [, char]",
@@ -215,5 +215,9 @@
     "$toMillis": {
         "args": "timestamp",
         "desc": "Convert a `timestamp` string in the ISO 8601 format to the number of milliseconds since the Unix Epoch (1 January, 1970 UTC) as a number. An error is thrown if the string is not in the correct format."
+    },
+    "$env": {
+        "args": "arg",
+        "desc": "Returns the value of an environment variable.\n\nThis is a Node-RED defined function."
     }
 }
diff --git a/red/runtime/util.js b/red/runtime/util.js
index 1480a841a..257e87777 100644
--- a/red/runtime/util.js
+++ b/red/runtime/util.js
@@ -359,6 +359,9 @@ function prepareJSONataExpression(value,node) {
     expr.assign('globalContext',function(val) {
         return node.context().global.get(val);
     });
+    expr.assign('env', function(val) {
+        return process.env[val];
+    })
     expr.registerFunction('clone', cloneMessage, '<(oa)-:o>');
     expr._legacyMode = /(^|[^a-zA-Z0-9_'"])msg([^a-zA-Z0-9_'"]|$)/.test(value);
     return expr;

From 626d012775898a2bcf592ffd05c8d57a2958c6c5 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 21 May 2018 16:14:43 +0100
Subject: [PATCH 005/113] Do not disable the export-clipboard menu option with
 empty selection

---
 editor/js/main.js         |  4 ++--
 editor/js/ui/clipboard.js | 12 ------------
 editor/js/ui/library.js   |  4 ----
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/editor/js/main.js b/editor/js/main.js
index cf295e7e7..e65b8f30a 100644
--- a/editor/js/main.js
+++ b/editor/js/main.js
@@ -410,8 +410,8 @@
             {id:"menu-item-import-clipboard",label:RED._("menu.label.clipboard"),onselect:"core:show-import-dialog"},
             {id:"menu-item-import-library",label:RED._("menu.label.library"),options:[]}
         ]});
-        menuOptions.push({id:"menu-item-export",label:RED._("menu.label.export"),disabled:true,options:[
-            {id:"menu-item-export-clipboard",label:RED._("menu.label.clipboard"),disabled:true,onselect:"core:show-export-dialog"},
+        menuOptions.push({id:"menu-item-export",label:RED._("menu.label.export"),options:[
+            {id:"menu-item-export-clipboard",label:RED._("menu.label.clipboard"),onselect:"core:show-export-dialog"},
             {id:"menu-item-export-library",label:RED._("menu.label.library"),disabled:true,onselect:"core:library-export"}
         ]});
         menuOptions.push(null);
diff --git a/editor/js/ui/clipboard.js b/editor/js/ui/clipboard.js
index 2bdd20052..0d7519e10 100644
--- a/editor/js/ui/clipboard.js
+++ b/editor/js/ui/clipboard.js
@@ -309,18 +309,6 @@ RED.clipboard = (function() {
 
             $('<input type="text" id="clipboard-hidden">').appendTo("body");
 
-            RED.events.on("view:selection-changed",function(selection) {
-                if (!selection.nodes) {
-                    RED.menu.setDisabled("menu-item-export",true);
-                    RED.menu.setDisabled("menu-item-export-clipboard",true);
-                    RED.menu.setDisabled("menu-item-export-library",true);
-                } else {
-                    RED.menu.setDisabled("menu-item-export",false);
-                    RED.menu.setDisabled("menu-item-export-clipboard",false);
-                    RED.menu.setDisabled("menu-item-export-library",false);
-                }
-            });
-
             RED.actions.add("core:show-export-dialog",exportNodes);
             RED.actions.add("core:show-import-dialog",importNodes);
 
diff --git a/editor/js/ui/library.js b/editor/js/ui/library.js
index 96aa9efeb..2f78828c3 100644
--- a/editor/js/ui/library.js
+++ b/editor/js/ui/library.js
@@ -414,12 +414,8 @@ RED.library = (function() {
 
             RED.events.on("view:selection-changed",function(selection) {
                 if (!selection.nodes) {
-                    RED.menu.setDisabled("menu-item-export",true);
-                    RED.menu.setDisabled("menu-item-export-clipboard",true);
                     RED.menu.setDisabled("menu-item-export-library",true);
                 } else {
-                    RED.menu.setDisabled("menu-item-export",false);
-                    RED.menu.setDisabled("menu-item-export-clipboard",false);
                     RED.menu.setDisabled("menu-item-export-library",false);
                 }
             });

From f3e1b85d82eaf5ba289c0c2a96d32e3b0101f929 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 21 May 2018 22:08:04 +0100
Subject: [PATCH 006/113] Add RED.require to allow nodes to access other
 modules

---
 red/runtime/nodes/registry/loader.js          |  48 ++-
 red/runtime/nodes/registry/localfilesystem.js |  61 ++--
 red/runtime/nodes/registry/registry.js        |  71 ++---
 .../red/runtime/nodes/registry/loader_spec.js | 295 ++++++++++--------
 .../nodes/registry/localfilesystem_spec.js    |  28 +-
 .../runtime/nodes/registry/registry_spec.js   | 218 +++++++------
 .../NestedNode/icons/arrow-in.png             | Bin 0 -> 393 bytes
 .../NestedNode/icons/file.txt                 |   3 -
 .../TestNodeModule/icons/file.txt             |   3 -
 9 files changed, 438 insertions(+), 289 deletions(-)
 create mode 100644 test/red/runtime/nodes/resources/local/NestedDirectoryNode/NestedNode/icons/arrow-in.png
 delete mode 100644 test/red/runtime/nodes/resources/local/NestedDirectoryNode/NestedNode/icons/file.txt
 delete mode 100644 test/red/runtime/nodes/resources/local/TestNodeModule/node_modules/TestNodeModule/icons/file.txt

diff --git a/red/runtime/nodes/registry/loader.js b/red/runtime/nodes/registry/loader.js
index f88463609..10c37c294 100644
--- a/red/runtime/nodes/registry/loader.js
+++ b/red/runtime/nodes/registry/loader.js
@@ -62,6 +62,17 @@ function copyObjectProperties(src,dst,copyList,blockList) {
         }
     }
 }
+function requireModule(name) {
+    var moduleInfo = registry.getModuleInfo(name);
+    if (moduleInfo && moduleInfo.path) {
+        var relPath = path.relative(__dirname, moduleInfo.path);
+        return require(relPath);
+    } else {
+        var err = new Error(`Cannot find module '${name}'`);
+        err.code = "MODULE_NOT_FOUND";
+        throw err;
+    }
+}
 
 function createNodeApi(node) {
     var red = {
@@ -71,6 +82,7 @@ function createNodeApi(node) {
         events: runtime.events,
         util: runtime.util,
         version: runtime.version,
+        require: requireModule
     }
     copyObjectProperties(runtime.nodes,red.nodes,["createNode","getNode","eachNode","addCredentials","getCredentials","deleteCredentials" ]);
     red.nodes.registerType = function(type,constructor,opts) {
@@ -112,6 +124,7 @@ function createNodeApi(node) {
 
 function loadNodeFiles(nodeFiles) {
     var promises = [];
+    var nodes = [];
     for (var module in nodeFiles) {
         /* istanbul ignore else */
         if (nodeFiles.hasOwnProperty(module)) {
@@ -119,6 +132,7 @@ function loadNodeFiles(nodeFiles) {
                 !semver.satisfies(runtime.version().replace(/(\-[1-9A-Za-z-][0-9A-Za-z-\.]*)?(\+[0-9A-Za-z-\.]+)?$/,""), nodeFiles[module].redVersion)) {
                 //TODO: log it
                 runtime.log.warn("["+module+"] "+runtime.log._("server.node-version-mismatch",{version:nodeFiles[module].redVersion}));
+                nodeFiles[module].err = "version_mismatch";
                 continue;
             }
             if (module == "node-red" || !registry.getModuleInfo(module)) {
@@ -148,7 +162,14 @@ function loadNodeFiles(nodeFiles) {
                         }
 
                         try {
-                            promises.push(loadNodeConfig(nodeFiles[module].nodes[node]))
+                            promises.push(loadNodeConfig(nodeFiles[module].nodes[node]).then((function() {
+                                var m = module;
+                                var n = node;
+                                return function(nodeSet) {
+                                    nodeFiles[m].nodes[n] = nodeSet;
+                                    nodes.push(nodeSet);
+                                }
+                            })()));
                         } catch(err) {
                             //
                         }
@@ -158,16 +179,19 @@ function loadNodeFiles(nodeFiles) {
         }
     }
     return when.settle(promises).then(function(results) {
-        var nodes = results.map(function(r) {
-            registry.addNodeSet(r.value.id,r.value,r.value.version);
-            return r.value;
-        });
+        for (var module in nodeFiles) {
+            if (nodeFiles.hasOwnProperty(module)) {
+                if (!nodeFiles[module].err) {
+                    registry.addModule(nodeFiles[module]);
+                }
+            }
+        }
         return loadNodeSetList(nodes);
     });
 }
 
 function loadNodeConfig(fileInfo) {
-    return when.promise(function(resolve) {
+    return new Promise(function(resolve) {
         var file = fileInfo.file;
         var module = fileInfo.module;
         var name = fileInfo.name;
@@ -292,7 +316,7 @@ function loadNodeSet(node) {
     var nodeDir = path.dirname(node.file);
     var nodeFn = path.basename(node.file);
     if (!node.enabled) {
-        return when.resolve(node);
+        return Promise.resolve(node);
     } else {
     }
     try {
@@ -316,7 +340,7 @@ function loadNodeSet(node) {
         if (loadPromise == null) {
             node.enabled = true;
             node.loaded = true;
-            loadPromise = when.resolve(node);
+            loadPromise = Promise.resolve(node);
         }
         return loadPromise;
     } catch(err) {
@@ -333,7 +357,7 @@ function loadNodeSet(node) {
                 }
             }
         }
-        return when.resolve(node);
+        return Promise.resolve(node);
     }
 }
 
@@ -365,19 +389,19 @@ function addModule(module) {
         // TODO: nls
         var e = new Error("module_already_loaded");
         e.code = "module_already_loaded";
-        return when.reject(e);
+        return Promise.reject(e);
     }
     try {
         var moduleFiles = localfilesystem.getModuleFiles(module);
         return loadNodeFiles(moduleFiles);
     } catch(err) {
-        return when.reject(err);
+        return Promise.reject(err);
     }
 }
 
 function loadNodeHelp(node,lang) {
     var base = path.basename(node.template);
-    var localePath = undefined;
+    var localePath;
     if (node.module === 'node-red') {
         var cat_dir = path.dirname(node.template);
         var cat = path.basename(cat_dir);
diff --git a/red/runtime/nodes/registry/localfilesystem.js b/red/runtime/nodes/registry/localfilesystem.js
index c2f0f9359..b8a516597 100644
--- a/red/runtime/nodes/registry/localfilesystem.js
+++ b/red/runtime/nodes/registry/localfilesystem.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  **/
 
-var when = require("when");
 var fs = require("fs");
 var path = require("path");
 
@@ -85,6 +84,7 @@ function getLocalNodeFiles(dir) {
 
     var result = [];
     var files = [];
+    var icons = [];
     try {
         files = fs.readdirSync(dir);
     } catch(err) {
@@ -103,14 +103,16 @@ function getLocalNodeFiles(dir) {
         } else if (stats.isDirectory()) {
             // Ignore /.dirs/, /lib/ /node_modules/
             if (!/^(\..*|lib|icons|node_modules|test|locales)$/.test(fn)) {
-                result = result.concat(getLocalNodeFiles(path.join(dir,fn)));
+                var subDirResults = getLocalNodeFiles(path.join(dir,fn));
+                result = result.concat(subDirResults.files);
+                icons = icons.concat(subDirResults.icons);
             } else if (fn === "icons") {
                 var iconList = scanIconDir(path.join(dir,fn));
-                events.emit("node-icon-dir",{name:'node-red',path:path.join(dir,fn),icons:iconList});
+                icons.push({path:path.join(dir,fn),icons:iconList});
             }
         }
     });
-    return result;
+    return {files: result, icons: icons}
 }
 
 function scanDirForNodesModules(dir,moduleName) {
@@ -198,7 +200,7 @@ function getModuleNodeFiles(module) {
     var nodes = pkg['node-red'].nodes||{};
     var results = [];
     var iconDirs = [];
-
+    var iconList = [];
     for (var n in nodes) {
         /* istanbul ignore else */
         if (nodes.hasOwnProperty(n)) {
@@ -213,47 +215,54 @@ function getModuleNodeFiles(module) {
             if (iconDirs.indexOf(iconDir) == -1) {
                 try {
                     fs.statSync(iconDir);
-                    var iconList = scanIconDir(iconDir);
-                    events.emit("node-icon-dir",{name:pkg.name,path:iconDir,icons:iconList});
+                    var icons = scanIconDir(iconDir);
+                    iconList.push({path:iconDir,icons:icons});
                     iconDirs.push(iconDir);
                 } catch(err) {
                 }
             }
         }
     }
+    var result = {files:results,icons:iconList};
+
     var examplesDir = path.join(moduleDir,"examples");
     try {
         fs.statSync(examplesDir)
         events.emit("node-examples-dir",{name:pkg.name,path:examplesDir});
     } catch(err) {
     }
-    return results;
+    return result;
 }
 
 function getNodeFiles(disableNodePathScan) {
     var dir;
     // Find all of the nodes to load
     var nodeFiles = [];
+    var results;
 
     var dir = path.resolve(__dirname + '/../../../../public/icons');
-    var iconList = scanIconDir(dir);
-    events.emit("node-icon-dir",{name:'node-red',path:dir,icons:iconList});
+    var iconList = [{path:dir,icons:scanIconDir(dir)}];
 
     if (settings.coreNodesDir) {
-        nodeFiles = getLocalNodeFiles(path.resolve(settings.coreNodesDir));
+        results = getLocalNodeFiles(path.resolve(settings.coreNodesDir));
+        nodeFiles = nodeFiles.concat(results.files);
+        iconList = iconList.concat(results.icons);
+
         var defaultLocalesPath = path.join(settings.coreNodesDir,"core","locales");
         i18n.registerMessageCatalog("node-red",defaultLocalesPath,"messages.json");
     }
 
     if (settings.userDir) {
         dir = path.join(settings.userDir,"lib","icons");
-        iconList = scanIconDir(dir);
-        if (iconList.length > 0) {
-            events.emit("node-icon-dir",{name:'Library',path:dir,icons:iconList});
+        var icons = scanIconDir(dir);
+        if (icons.length > 0) {
+            iconList.push({path:dir,icons:icons});
         }
 
         dir = path.join(settings.userDir,"nodes");
-        nodeFiles = nodeFiles.concat(getLocalNodeFiles(dir));
+        results = getLocalNodeFiles(path.resolve(dir));
+        nodeFiles = nodeFiles.concat(results.files);
+        iconList = iconList.concat(results.icons);
     }
     if (settings.nodesDir) {
         dir = settings.nodesDir;
@@ -261,7 +270,9 @@ function getNodeFiles(disableNodePathScan) {
             dir = [dir];
         }
         for (var i=0;i<dir.length;i++) {
-            nodeFiles = nodeFiles.concat(getLocalNodeFiles(dir[i]));
+            results = getLocalNodeFiles(dir[i]);
+            nodeFiles = nodeFiles.concat(results.files);
+            iconList = iconList.concat(results.icons);
         }
     }
 
@@ -269,7 +280,8 @@ function getNodeFiles(disableNodePathScan) {
         "node-red": {
             name: "node-red",
             version: settings.version,
-            nodes: {}
+            nodes: {},
+            icons: iconList
         }
     }
     nodeFiles.forEach(function(node) {
@@ -283,20 +295,22 @@ function getNodeFiles(disableNodePathScan) {
             nodeList[moduleFile.package.name] = {
                 name: moduleFile.package.name,
                 version: moduleFile.package.version,
+                path: moduleFile.dir,
                 local: moduleFile.local||false,
-                nodes: {}
+                nodes: {},
+                icons: nodeModuleFiles.icons
             };
             if (moduleFile.package['node-red'].version) {
                 nodeList[moduleFile.package.name].redVersion = moduleFile.package['node-red'].version;
             }
-            nodeModuleFiles.forEach(function(node) {
+            nodeModuleFiles.files.forEach(function(node) {
                 node.local = moduleFile.local||false;
                 nodeList[moduleFile.package.name].nodes[node.name] = node;
             });
-            nodeFiles = nodeFiles.concat(nodeModuleFiles);
+            nodeFiles = nodeFiles.concat(nodeModuleFiles.files);
         });
     } else {
-        console.log("node path scan disabled");
+        // console.log("node path scan disabled");
     }
     return nodeList;
 }
@@ -316,12 +330,13 @@ function getModuleFiles(module) {
         nodeList[moduleFile.package.name] = {
             name: moduleFile.package.name,
             version: moduleFile.package.version,
-            nodes: {}
+            nodes: {},
+            icons: nodeModuleFiles.icons
         };
         if (moduleFile.package['node-red'].version) {
             nodeList[moduleFile.package.name].redVersion = moduleFile.package['node-red'].version;
         }
-        nodeModuleFiles.forEach(function(node) {
+        nodeModuleFiles.files.forEach(function(node) {
             nodeList[moduleFile.package.name].nodes[node.name] = node;
             nodeList[moduleFile.package.name].nodes[node.name].local = moduleFile.local || false;
         });
diff --git a/red/runtime/nodes/registry/registry.js b/red/runtime/nodes/registry/registry.js
index 94c0e57d6..5a5760542 100644
--- a/red/runtime/nodes/registry/registry.js
+++ b/red/runtime/nodes/registry/registry.js
@@ -181,46 +181,43 @@ function loadNodeConfigs() {
     }
 }
 
-function addNodeSet(id,set,version) {
-    if (!set.err) {
-        set.types.forEach(function(t) {
-            if (nodeTypeToId.hasOwnProperty(t)) {
-                set.err = new Error("Type already registered");
-                set.err.code = "type_already_registered";
-                set.err.details = {
-                    type: t,
-                    moduleA: getNodeInfo(t).module,
-                    moduleB: set.module
-                }
+function addModule(module) {
+    moduleNodes[module.name] = [];
+    moduleConfigs[module.name] = module;
+    for (var setName in module.nodes) {
+        if (module.nodes.hasOwnProperty(setName)) {
+            var set = module.nodes[setName];
+            moduleNodes[module.name].push(set.name);
+            nodeList.push(set.id);
+            if (!set.err) {
+                set.types.forEach(function(t) {
+                    if (nodeTypeToId.hasOwnProperty(t)) {
+                        set.err = new Error("Type already registered");
+                        set.err.code = "type_already_registered";
+                        set.err.details = {
+                            type: t,
+                            moduleA: getNodeInfo(t).module,
+                            moduleB: set.module
+                        }
 
+                    }
+                });
+                if (!set.err) {
+                    set.types.forEach(function(t) {
+                        nodeTypeToId[t] = set.id;
+                    });
+                }
             }
-        });
-        if (!set.err) {
-            set.types.forEach(function(t) {
-                nodeTypeToId[t] = id;
-            });
         }
     }
-    moduleNodes[set.module] = moduleNodes[set.module]||[];
-    moduleNodes[set.module].push(set.name);
-
-    if (!moduleConfigs[set.module]) {
-        moduleConfigs[set.module] = {
-            name: set.module,
-            nodes: {}
-        };
+    if (module.icons) {
+        icon_paths[module.name] = [];
+        module.icons.forEach(icon=>icon_paths[module.name].push(path.resolve(icon.path)) )
     }
-
-    if (version) {
-        moduleConfigs[set.module].version = version;
-    }
-    moduleConfigs[set.module].local = set.local;
-
-    moduleConfigs[set.module].nodes[set.name] = set;
-    nodeList.push(id);
     nodeConfigCache = null;
 }
 
+
 function removeNode(id) {
     var config = moduleConfigs[getModule(id)].nodes[getNode(id)];
     if (!config) {
@@ -346,6 +343,7 @@ function getModuleInfo(module) {
             name: module,
             version: moduleConfigs[module].version,
             local: moduleConfigs[module].local,
+            path: moduleConfigs[module].path,
             nodes: []
         };
         for (var i = 0; i < nodes.length; ++i) {
@@ -592,6 +590,7 @@ var iconCache = {};
 var defaultIcon = path.resolve(__dirname + '/../../../../public/icons/arrow-in.png');
 
 function nodeIconDir(dir) {
+    return;
     icon_paths[dir.name] = icon_paths[dir.name] || [];
     icon_paths[dir.name].push(path.resolve(dir.path));
 
@@ -647,11 +646,11 @@ function getNodeIcons() {
     for (var module in moduleConfigs) {
         if (moduleConfigs.hasOwnProperty(module)) {
             if (moduleConfigs[module].icons) {
-                iconList[module] = moduleConfigs[module].icons;
+                iconList[module] = [];
+                moduleConfigs[module].icons.forEach(icon=>{ iconList[module] = iconList[module].concat(icon.icons) });
             }
         }
     }
-
     return iconList;
 }
 
@@ -663,7 +662,9 @@ var registry = module.exports = {
     registerNodeConstructor: registerNodeConstructor,
     getNodeConstructor: getNodeConstructor,
 
-    addNodeSet: addNodeSet,
+
+    addModule: addModule,
+
     enableNodeSet: enableNodeSet,
     disableNodeSet: disableNodeSet,
 
diff --git a/test/red/runtime/nodes/registry/loader_spec.js b/test/red/runtime/nodes/registry/loader_spec.js
index 87e1c060b..d34d802a3 100644
--- a/test/red/runtime/nodes/registry/loader_spec.js
+++ b/test/red/runtime/nodes/registry/loader_spec.js
@@ -79,6 +79,7 @@ describe("red/nodes/registry/loader",function() {
                 var result = {};
                 result["node-red"] = {
                     "name": "node-red",
+                    "version": "1.2.3",
                     "nodes": {
                         "TestNode1": {
                             "file": path.join(resourcesDir,"TestNode1","TestNode1.js"),
@@ -91,34 +92,39 @@ describe("red/nodes/registry/loader",function() {
             }));
 
             stubs.push(sinon.stub(registry,"saveNodeList", function(){ return }));
-            stubs.push(sinon.stub(registry,"addNodeSet", function(){ return }));
+            stubs.push(sinon.stub(registry,"addModule", function(){ return }));
             // This module isn't already loaded
             stubs.push(sinon.stub(registry,"getNodeInfo", function(){ return null; }));
 
             stubs.push(sinon.stub(nodes,"registerType"));
             loader.init({nodes:nodes,i18n:{defaultLang:"en-US"},events:{on:function(){},removeListener:function(){}},log:{info:function(){},_:function(){}},settings:{available:function(){return true;}}});
             loader.load().then(function(result) {
-                registry.addNodeSet.called.should.be.true();
-                registry.addNodeSet.lastCall.args[0].should.eql("node-red/TestNode1");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('id',"node-red/TestNode1");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('module',"node-red");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('enabled',true);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('loaded',true);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('version',undefined);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('types');
-                registry.addNodeSet.lastCall.args[1].types.should.have.a.length(1);
-                registry.addNodeSet.lastCall.args[1].types[0].should.eql('test-node-1');
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('config');
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('help');
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('namespace','node-red');
-                registry.addNodeSet.lastCall.args[1].should.not.have.a.property('err');
+                registry.addModule.called.should.be.true();
+                var module = registry.addModule.lastCall.args[0];
+                module.should.have.property("name","node-red");
+                module.should.have.property("version","1.2.3");
+                module.should.have.property("nodes");
+                module.nodes.should.have.property("TestNode1");
+                module.nodes.TestNode1.should.have.property("id","node-red/TestNode1");
+                module.nodes.TestNode1.should.have.property("module","node-red");
+                module.nodes.TestNode1.should.have.property("name","TestNode1");
+                module.nodes.TestNode1.should.have.property("file");
+                module.nodes.TestNode1.should.have.property("template");
+                module.nodes.TestNode1.should.have.property("enabled",true);
+                module.nodes.TestNode1.should.have.property("loaded",true);
+                module.nodes.TestNode1.should.have.property("types");
+                module.nodes.TestNode1.types.should.have.a.length(1);
+                module.nodes.TestNode1.types[0].should.eql('test-node-1');
+                module.nodes.TestNode1.should.have.property("config");
+                module.nodes.TestNode1.should.have.property("help");
+                module.nodes.TestNode1.should.have.property("namespace","node-red");
 
                 nodes.registerType.calledOnce.should.be.true();
                 nodes.registerType.lastCall.args[0].should.eql('node-red/TestNode1');
                 nodes.registerType.lastCall.args[1].should.eql('test-node-1');
 
                 done();
-            }).otherwise(function(err) {
+            }).catch(function(err) {
                 done(err);
             });
         });
@@ -128,6 +134,7 @@ describe("red/nodes/registry/loader",function() {
                 var result = {};
                 result["node-red"] = {
                     "name": "node-red",
+                    "version": "4.5.6",
                     "nodes": {
                         "MultipleNodes1": {
                             "file": path.join(resourcesDir,"MultipleNodes1","MultipleNodes1.js"),
@@ -140,27 +147,33 @@ describe("red/nodes/registry/loader",function() {
             }));
 
             stubs.push(sinon.stub(registry,"saveNodeList", function(){ return }));
-            stubs.push(sinon.stub(registry,"addNodeSet", function(){ return }));
+            stubs.push(sinon.stub(registry,"addModule", function(){ return }));
             // This module isn't already loaded
             stubs.push(sinon.stub(registry,"getNodeInfo", function(){ return null; }));
             stubs.push(sinon.stub(nodes,"registerType"));
             loader.init({nodes:nodes,i18n:{defaultLang:"en-US"},events:{on:function(){},removeListener:function(){}},log:{info:function(){},_:function(){}},settings:{available:function(){return true;}}});
             loader.load().then(function(result) {
-                registry.addNodeSet.called.should.be.true();
-                registry.addNodeSet.lastCall.args[0].should.eql("node-red/MultipleNodes1");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('id',"node-red/MultipleNodes1");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('module',"node-red");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('enabled',true);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('loaded',true);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('version',undefined);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('types');
-                registry.addNodeSet.lastCall.args[1].types.should.have.a.length(2);
-                registry.addNodeSet.lastCall.args[1].types[0].should.eql('test-node-multiple-1a');
-                registry.addNodeSet.lastCall.args[1].types[1].should.eql('test-node-multiple-1b');
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('config');
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('help');
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('namespace','node-red');
-                registry.addNodeSet.lastCall.args[1].should.not.have.a.property('err');
+
+                registry.addModule.called.should.be.true();
+                var module = registry.addModule.lastCall.args[0];
+                module.should.have.property("name","node-red");
+                module.should.have.property("version","4.5.6");
+                module.should.have.property("nodes");
+                module.nodes.should.have.property("MultipleNodes1");
+                module.nodes.MultipleNodes1.should.have.property("id","node-red/MultipleNodes1");
+                module.nodes.MultipleNodes1.should.have.property("module","node-red");
+                module.nodes.MultipleNodes1.should.have.property("name","MultipleNodes1");
+                module.nodes.MultipleNodes1.should.have.property("file");
+                module.nodes.MultipleNodes1.should.have.property("template");
+                module.nodes.MultipleNodes1.should.have.property("enabled",true);
+                module.nodes.MultipleNodes1.should.have.property("loaded",true);
+                module.nodes.MultipleNodes1.should.have.property("types");
+                module.nodes.MultipleNodes1.types.should.have.a.length(2);
+                module.nodes.MultipleNodes1.types[0].should.eql('test-node-multiple-1a');
+                module.nodes.MultipleNodes1.types[1].should.eql('test-node-multiple-1b');
+                module.nodes.MultipleNodes1.should.have.property("config");
+                module.nodes.MultipleNodes1.should.have.property("help");
+                module.nodes.MultipleNodes1.should.have.property("namespace","node-red");
 
                 nodes.registerType.calledTwice.should.be.true();
                 nodes.registerType.firstCall.args[0].should.eql('node-red/MultipleNodes1');
@@ -168,8 +181,9 @@ describe("red/nodes/registry/loader",function() {
                 nodes.registerType.secondCall.args[0].should.eql('node-red/MultipleNodes1');
                 nodes.registerType.secondCall.args[1].should.eql('test-node-multiple-1b');
 
+
                 done();
-            }).otherwise(function(err) {
+            }).catch(function(err) {
                 done(err);
             });
         });
@@ -180,6 +194,7 @@ describe("red/nodes/registry/loader",function() {
                 var result = {};
                 result["node-red"] = {
                     "name": "node-red",
+                    "version":"2.4.6",
                     "nodes": {
                         "TestNode2": {
                             "file": path.join(resourcesDir,"TestNode2","TestNode2.js"),
@@ -192,34 +207,41 @@ describe("red/nodes/registry/loader",function() {
             }));
 
             stubs.push(sinon.stub(registry,"saveNodeList", function(){ return }));
-            stubs.push(sinon.stub(registry,"addNodeSet", function(){ return }));
+            stubs.push(sinon.stub(registry,"addModule", function(){ return }));
             // This module isn't already loaded
             stubs.push(sinon.stub(registry,"getNodeInfo", function(){ return null; }));
 
             stubs.push(sinon.stub(nodes,"registerType"));
             loader.init({nodes:nodes,i18n:{defaultLang:"en-US"},events:{on:function(){},removeListener:function(){}},log:{info:function(){},_:function(){}},settings:{available:function(){return true;}}});
             loader.load().then(function(result) {
-                registry.addNodeSet.called.should.be.true();
-                registry.addNodeSet.lastCall.args[0].should.eql("node-red/TestNode2");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('id',"node-red/TestNode2");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('module',"node-red");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('enabled',true);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('loaded',true);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('version',undefined);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('types');
-                registry.addNodeSet.lastCall.args[1].types.should.have.a.length(1);
-                registry.addNodeSet.lastCall.args[1].types[0].should.eql('test-node-2');
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('config');
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('help');
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('namespace','node-red');
-                registry.addNodeSet.lastCall.args[1].should.not.have.a.property('err');
+
+                registry.addModule.called.should.be.true();
+                var module = registry.addModule.lastCall.args[0];
+                module.should.have.property("name","node-red");
+                module.should.have.property("version","2.4.6");
+                module.should.have.property("nodes");
+                module.nodes.should.have.property("TestNode2");
+                module.nodes.TestNode2.should.have.property("id","node-red/TestNode2");
+                module.nodes.TestNode2.should.have.property("module","node-red");
+                module.nodes.TestNode2.should.have.property("name","TestNode2");
+                module.nodes.TestNode2.should.have.property("file");
+                module.nodes.TestNode2.should.have.property("template");
+                module.nodes.TestNode2.should.have.property("enabled",true);
+                module.nodes.TestNode2.should.have.property("loaded",true);
+                module.nodes.TestNode2.should.have.property("types");
+                module.nodes.TestNode2.types.should.have.a.length(1);
+                module.nodes.TestNode2.types[0].should.eql('test-node-2');
+                module.nodes.TestNode2.should.have.property("config");
+                module.nodes.TestNode2.should.have.property("help");
+                module.nodes.TestNode2.should.have.property("namespace","node-red");
+                module.nodes.TestNode2.should.not.have.property('err');
 
                 nodes.registerType.calledOnce.should.be.true();
                 nodes.registerType.lastCall.args[0].should.eql('node-red/TestNode2');
                 nodes.registerType.lastCall.args[1].should.eql('test-node-2');
 
                 done();
-            }).otherwise(function(err) {
+            }).catch(function(err) {
                 done(err);
             });
         });
@@ -230,6 +252,7 @@ describe("red/nodes/registry/loader",function() {
                 var result = {};
                 result["node-red"] = {
                     "name": "node-red",
+                    "version":"1.2.3",
                     "nodes": {
                         "TestNode3": {
                             "file": path.join(resourcesDir,"TestNode3","TestNode3.js"),
@@ -242,32 +265,38 @@ describe("red/nodes/registry/loader",function() {
             }));
 
             stubs.push(sinon.stub(registry,"saveNodeList", function(){ return }));
-            stubs.push(sinon.stub(registry,"addNodeSet", function(){ return }));
+            stubs.push(sinon.stub(registry,"addModule", function(){ return }));
             // This module isn't already loaded
             stubs.push(sinon.stub(registry,"getNodeInfo", function(){ return null; }));
 
             stubs.push(sinon.stub(nodes,"registerType"));
             loader.init({nodes:nodes,i18n:{defaultLang:"en-US"},events:{on:function(){},removeListener:function(){}},log:{info:function(){},_:function(){}},settings:{available:function(){return true;}}});
             loader.load().then(function(result) {
-                registry.addNodeSet.called.should.be.true();
-                registry.addNodeSet.lastCall.args[0].should.eql("node-red/TestNode3");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('id',"node-red/TestNode3");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('module',"node-red");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('enabled',true);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('loaded',false);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('version',undefined);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('types');
-                registry.addNodeSet.lastCall.args[1].types.should.have.a.length(1);
-                registry.addNodeSet.lastCall.args[1].types[0].should.eql('test-node-3');
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('config');
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('help');
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('namespace','node-red');
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('err','fail');
+                registry.addModule.called.should.be.true();
+                var module = registry.addModule.lastCall.args[0];
+                module.should.have.property("name","node-red");
+                module.should.have.property("version","1.2.3");
+                module.should.have.property("nodes");
+                module.nodes.should.have.property("TestNode3");
+                module.nodes.TestNode3.should.have.property("id","node-red/TestNode3");
+                module.nodes.TestNode3.should.have.property("module","node-red");
+                module.nodes.TestNode3.should.have.property("name","TestNode3");
+                module.nodes.TestNode3.should.have.property("file");
+                module.nodes.TestNode3.should.have.property("template");
+                module.nodes.TestNode3.should.have.property("enabled",true);
+                module.nodes.TestNode3.should.have.property("loaded",false);
+                module.nodes.TestNode3.should.have.property("types");
+                module.nodes.TestNode3.types.should.have.a.length(1);
+                module.nodes.TestNode3.types[0].should.eql('test-node-3');
+                module.nodes.TestNode3.should.have.property("config");
+                module.nodes.TestNode3.should.have.property("help");
+                module.nodes.TestNode3.should.have.property("namespace","node-red");
+                module.nodes.TestNode3.should.have.property('err','fail');
 
-                nodes.registerType.calledOnce.should.be.false();
+                nodes.registerType.called.should.be.false();
 
                 done();
-            }).otherwise(function(err) {
+            }).catch(function(err) {
                 done(err);
             });
         });
@@ -277,6 +306,7 @@ describe("red/nodes/registry/loader",function() {
                 var result = {};
                 result["node-red"] = {
                     "name": "node-red",
+                    "version":"1.2.3",
                     "nodes": {
                         "DoesNotExist": {
                             "file": path.join(resourcesDir,"doesnotexist"),
@@ -289,31 +319,37 @@ describe("red/nodes/registry/loader",function() {
             }));
 
             stubs.push(sinon.stub(registry,"saveNodeList", function(){ return }));
-            stubs.push(sinon.stub(registry,"addNodeSet", function(){ return }));
+            stubs.push(sinon.stub(registry,"addModule", function(){ return }));
             // This module isn't already loaded
             stubs.push(sinon.stub(registry,"getNodeInfo", function(){ return null; }));
 
             stubs.push(sinon.stub(nodes,"registerType"));
             loader.init({nodes:nodes,i18n:{defaultLang:"en-US"},events:{on:function(){},removeListener:function(){}},log:{info:function(){},_:function(){}},settings:{available:function(){return true;}}});
             loader.load().then(function(result) {
-                registry.addNodeSet.called.should.be.true();
-                registry.addNodeSet.lastCall.args[0].should.eql("node-red/DoesNotExist");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('id',"node-red/DoesNotExist");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('module',"node-red");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('enabled',true);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('loaded',false);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('version',undefined);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('types');
-                registry.addNodeSet.lastCall.args[1].types.should.have.a.length(0);
-                registry.addNodeSet.lastCall.args[1].should.not.have.a.property('config');
-                registry.addNodeSet.lastCall.args[1].should.not.have.a.property('help');
-                registry.addNodeSet.lastCall.args[1].should.not.have.a.property('namespace','node-red');
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('err');
+                registry.addModule.called.should.be.true();
+                var module = registry.addModule.lastCall.args[0];
+                module.should.have.property("name","node-red");
+                module.should.have.property("version","1.2.3");
+                module.should.have.property("nodes");
+                module.nodes.should.have.property("DoesNotExist");
+                module.nodes.DoesNotExist.should.have.property("id","node-red/DoesNotExist");
+                module.nodes.DoesNotExist.should.have.property("module","node-red");
+                module.nodes.DoesNotExist.should.have.property("name","DoesNotExist");
+                module.nodes.DoesNotExist.should.have.property("file");
+                module.nodes.DoesNotExist.should.have.property("template");
+                module.nodes.DoesNotExist.should.have.property("enabled",true);
+                module.nodes.DoesNotExist.should.have.property("loaded",false);
+                module.nodes.DoesNotExist.should.have.property("types");
+                module.nodes.DoesNotExist.types.should.have.a.length(0);
+                module.nodes.DoesNotExist.should.not.have.property("config");
+                module.nodes.DoesNotExist.should.not.have.property("help");
+                module.nodes.DoesNotExist.should.not.have.property("namespace","node-red");
+                module.nodes.DoesNotExist.should.have.property('err');
 
-                nodes.registerType.calledOnce.should.be.false();
+                nodes.registerType.called.should.be.false();
 
                 done();
-            }).otherwise(function(err) {
+            }).catch(function(err) {
                 done(err);
             });
         });
@@ -323,6 +359,7 @@ describe("red/nodes/registry/loader",function() {
                 var result = {};
                 result["node-red"] = {
                     "name": "node-red",
+                    "version": "1.2.3",
                     "nodes": {
                         "DuffNode": {
                             "file": path.join(resourcesDir,"DuffNode","DuffNode.js"),
@@ -335,32 +372,39 @@ describe("red/nodes/registry/loader",function() {
             }));
 
             stubs.push(sinon.stub(registry,"saveNodeList", function(){ return }));
-            stubs.push(sinon.stub(registry,"addNodeSet", function(){ return }));
+            stubs.push(sinon.stub(registry,"addModule", function(){ return }));
             // This module isn't already loaded
             stubs.push(sinon.stub(registry,"getNodeInfo", function(){ return null; }));
 
             stubs.push(sinon.stub(nodes,"registerType"));
             loader.init({nodes:nodes,i18n:{defaultLang:"en-US"},events:{on:function(){},removeListener:function(){}},log:{info:function(){},_:function(){}},settings:{available:function(){return true;}}});
             loader.load().then(function(result) {
-                registry.addNodeSet.called.should.be.true();
-                registry.addNodeSet.lastCall.args[0].should.eql("node-red/DuffNode");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('id',"node-red/DuffNode");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('module',"node-red");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('enabled',true);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('loaded',false);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('version',undefined);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('types');
-                registry.addNodeSet.lastCall.args[1].types.should.have.a.length(0);
-                registry.addNodeSet.lastCall.args[1].should.not.have.a.property('config');
-                registry.addNodeSet.lastCall.args[1].should.not.have.a.property('help');
-                registry.addNodeSet.lastCall.args[1].should.not.have.a.property('namespace','node-red');
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('err');
-                registry.addNodeSet.lastCall.args[1].err.should.endWith("DuffNode.html does not exist");
 
-                nodes.registerType.calledOnce.should.be.false();
+                registry.addModule.called.should.be.true();
+                var module = registry.addModule.lastCall.args[0];
+                module.should.have.property("name","node-red");
+                module.should.have.property("version","1.2.3");
+                module.should.have.property("nodes");
+                module.nodes.should.have.property("DuffNode");
+                module.nodes.DuffNode.should.have.property("id","node-red/DuffNode");
+                module.nodes.DuffNode.should.have.property("module","node-red");
+                module.nodes.DuffNode.should.have.property("name","DuffNode");
+                module.nodes.DuffNode.should.have.property("file");
+                module.nodes.DuffNode.should.have.property("template");
+                module.nodes.DuffNode.should.have.property("enabled",true);
+                module.nodes.DuffNode.should.have.property("loaded",false);
+                module.nodes.DuffNode.should.have.property("types");
+                module.nodes.DuffNode.types.should.have.a.length(0);
+                module.nodes.DuffNode.should.not.have.property("config");
+                module.nodes.DuffNode.should.not.have.property("help");
+                module.nodes.DuffNode.should.not.have.property("namespace","node-red");
+                module.nodes.DuffNode.should.have.property('err');
+                module.nodes.DuffNode.err.should.endWith("DuffNode.html does not exist");
+
+                nodes.registerType.called.should.be.false();
 
                 done();
-            }).otherwise(function(err) {
+            }).catch(function(err) {
                 done(err);
             });
         });
@@ -379,7 +423,7 @@ describe("red/nodes/registry/loader",function() {
             stubs.push(sinon.stub(registry,"getModuleInfo",function(){return{}}));
             loader.init({nodes:nodes,i18n:{defaultLang:"en-US"},events:{on:function(){},removeListener:function(){}},log:{info:function(){},_:function(){}},settings:{available:function(){return true;}}});
 
-            loader.addModule("test-module").otherwise(function(err) {
+            loader.addModule("test-module").catch(function(err) {
                 err.code.should.eql("module_already_loaded");
                 done();
             });
@@ -390,7 +434,7 @@ describe("red/nodes/registry/loader",function() {
                 throw new Error("failure");
             }));
             loader.init({nodes:nodes,i18n:{defaultLang:"en-US"},events:{on:function(){},removeListener:function(){}},log:{info:function(){},_:function(){}},settings:{available:function(){return true;}}});
-            loader.addModule("test-module").otherwise(function(err) {
+            loader.addModule("test-module").catch(function(err) {
                 err.message.should.eql("failure");
                 done();
             });
@@ -419,29 +463,36 @@ describe("red/nodes/registry/loader",function() {
             }));
 
             stubs.push(sinon.stub(registry,"saveNodeList", function(){ return "a node list" }));
-            stubs.push(sinon.stub(registry,"addNodeSet", function(){ return }));
+            stubs.push(sinon.stub(registry,"addModule", function(){ return }));
             stubs.push(sinon.stub(nodes,"registerType"));
             loader.init({nodes:nodes,i18n:{defaultLang:"en-US"},events:{on:function(){},removeListener:function(){}},log:{info:function(){},_:function(){}},settings:{available:function(){return true;}}});
             loader.addModule("TestNodeModule").then(function(result) {
                 result.should.eql("a node list");
-                registry.addNodeSet.calledOnce.should.be.true();
-                registry.addNodeSet.lastCall.args[0].should.eql("TestNodeModule/TestNode1");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('id',"TestNodeModule/TestNode1");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('module',"TestNodeModule");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('enabled',true);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('loaded',true);
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('version',"1.2.3");
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('types');
-                registry.addNodeSet.lastCall.args[1].types.should.have.a.length(1);
-                registry.addNodeSet.lastCall.args[1].types[0].should.eql('test-node-mod-1');
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('config');
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('help');
-                registry.addNodeSet.lastCall.args[1].should.have.a.property('namespace','TestNodeModule');
-                registry.addNodeSet.lastCall.args[1].should.not.have.a.property('err');
+
+                registry.addModule.called.should.be.true();
+                var module = registry.addModule.lastCall.args[0];
+                module.should.have.property("name","TestNodeModule");
+                module.should.have.property("version","1.2.3");
+                module.should.have.property("nodes");
+                module.nodes.should.have.property("TestNode1");
+                module.nodes.TestNode1.should.have.property("id","TestNodeModule/TestNode1");
+                module.nodes.TestNode1.should.have.property("module","TestNodeModule");
+                module.nodes.TestNode1.should.have.property("name","TestNode1");
+                module.nodes.TestNode1.should.have.property("file");
+                module.nodes.TestNode1.should.have.property("template");
+                module.nodes.TestNode1.should.have.property("enabled",true);
+                module.nodes.TestNode1.should.have.property("loaded",true);
+                module.nodes.TestNode1.should.have.property("types");
+                module.nodes.TestNode1.types.should.have.a.length(1);
+                module.nodes.TestNode1.types[0].should.eql('test-node-mod-1');
+                module.nodes.TestNode1.should.have.property("config");
+                module.nodes.TestNode1.should.have.property("help");
+                module.nodes.TestNode1.should.have.property("namespace","TestNodeModule");
+                module.nodes.TestNode1.should.not.have.property('err');
 
                 nodes.registerType.calledOnce.should.be.true();
                 done();
-            }).otherwise(function(err) {
+            }).catch(function(err) {
                 done(err);
             });
         });
@@ -469,15 +520,15 @@ describe("red/nodes/registry/loader",function() {
             }));
 
             stubs.push(sinon.stub(registry,"saveNodeList", function(){ return "a node list" }));
-            stubs.push(sinon.stub(registry,"addNodeSet", function(){ return }));
+            stubs.push(sinon.stub(registry,"addModule", function(){ return }));
             stubs.push(sinon.stub(nodes,"registerType"));
             loader.init({log:{"_":function(){},warn:function(){}},nodes:nodes,i18n:{defaultLang:"en-US"},events:{on:function(){},removeListener:function(){}},version: function() { return "0.12.0"}, settings:{available:function(){return true;}}});
             loader.addModule("TestNodeModule").then(function(result) {
                 result.should.eql("a node list");
-                registry.addNodeSet.called.should.be.false();
+                registry.addModule.called.should.be.false();
                 nodes.registerType.called.should.be.false();
                 done();
-            }).otherwise(function(err) {
+            }).catch(function(err) {
                 done(err);
             });
         });
@@ -498,7 +549,7 @@ describe("red/nodes/registry/loader",function() {
                 node.enabled.should.be.false();
                 nodes.registerType.called.should.be.false();
                 done();
-            }).otherwise(function(err) {
+            }).catch(function(err) {
                 done(err);
             });
         });
@@ -517,7 +568,7 @@ describe("red/nodes/registry/loader",function() {
                 node.err.toString().should.eql("Error: fail to require (line:1)");
 
                 done();
-            }).otherwise(function(err) {
+            }).catch(function(err) {
                 done(err);
             });
         });
diff --git a/test/red/runtime/nodes/registry/localfilesystem_spec.js b/test/red/runtime/nodes/registry/localfilesystem_spec.js
index d240e2ca5..2ffc220f4 100644
--- a/test/red/runtime/nodes/registry/localfilesystem_spec.js
+++ b/test/red/runtime/nodes/registry/localfilesystem_spec.js
@@ -166,7 +166,15 @@ describe("red/nodes/registry/localfilesystem",function() {
                 }},
                 settings:{coreNodesDir:resourcesDir}
             });
-            localfilesystem.getNodeFiles(true);
+            var list = localfilesystem.getNodeFiles(true);
+            list.should.have.property("node-red");
+            list["node-red"].should.have.property("icons");
+            list["node-red"].icons.should.have.length(2);
+            //list["node-red"].icons[1].should.have.property("path",path.join(__dirname,"resources/local/NestedDirectoryNode/NestedNode/icons"))
+            list["node-red"].icons[1].should.have.property("icons");
+            list["node-red"].icons[1].icons.should.have.length(1);
+            list["node-red"].icons[1].icons[0].should.eql("arrow-in.png");
+            done();
         });
         it("scans icons dir in library",function(done) {
             var count = 0;
@@ -188,7 +196,15 @@ describe("red/nodes/registry/localfilesystem",function() {
                 }},
                 settings:{userDir:userDir}
             });
-            localfilesystem.getNodeFiles(true);
+            var list = localfilesystem.getNodeFiles(true);
+            list.should.have.property("node-red");
+            list["node-red"].should.have.property("icons");
+            list["node-red"].icons.should.have.length(2);
+            //list["node-red"].icons[1].should.have.property("path",path.join(__dirname,"resources/userDir/lib/icons"))
+            list["node-red"].icons[1].should.have.property("icons");
+            list["node-red"].icons[1].icons.should.have.length(1);
+            list["node-red"].icons[1].icons[0].should.eql("test_icon.png");
+            done();
         });
     });
     describe("#getModuleFiles",function() {
@@ -256,6 +272,14 @@ describe("red/nodes/registry/localfilesystem",function() {
                 settings:{coreNodesDir:moduleDir}
             });
             var nodeModule = localfilesystem.getModuleFiles('TestNodeModule');
+            nodeModule.should.have.property("TestNodeModule");
+            nodeModule.TestNodeModule.should.have.property('icons');
+
+            nodeModule.TestNodeModule.icons.should.have.length(1);
+            nodeModule.TestNodeModule.icons[0].should.have.property("path");
+            nodeModule.TestNodeModule.icons[0].should.have.property("icons");
+            nodeModule.TestNodeModule.icons[0].icons[0].should.eql("arrow-in.png");
+            done();
         });
     });
 });
diff --git a/test/red/runtime/nodes/registry/registry_spec.js b/test/red/runtime/nodes/registry/registry_spec.js
index cdfba8c45..c5b9f6b5a 100644
--- a/test/red/runtime/nodes/registry/registry_spec.js
+++ b/test/red/runtime/nodes/registry/registry_spec.js
@@ -132,7 +132,7 @@ describe("red/nodes/registry/registry",function() {
     });
 
 
-    describe('#addNodeSet', function() {
+    describe.skip('#addNodeSet', function() {
        it('adds a node set for an unknown module', function() {
 
            typeRegistry.init(settings);
@@ -290,29 +290,34 @@ describe("red/nodes/registry/registry",function() {
 
     describe('#saveNodeList',function() {
         it('rejects when settings unavailable',function(done) {
-            typeRegistry.init(stubSettings({},false,{}));
-            typeRegistry.addNodeSet("test-module/test-name",testNodeSet1, "0.0.1");
-            typeRegistry.saveNodeList().otherwise(function(err) {
+            typeRegistry.init(stubSettings({},false,{}),null,events);
+            typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {"test-name":{module:"test-module",name:"test-name",types:[]}}});
+            typeRegistry.saveNodeList().catch(function(err) {
                 done();
             });
         });
         it('saves the list',function(done) {
             var s = stubSettings({},true,{});
             typeRegistry.init(s);
-            typeRegistry.addNodeSet("test-module/test-name",testNodeSet1, "0.0.1");
-            typeRegistry.addNodeSet("test-module/test-name-2",testNodeSet2WithError, "0.0.1");
+            typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {
+                "test-name":testNodeSet1,
+                "test-name-2":testNodeSet2WithError
+            }});
+
             typeRegistry.saveNodeList().then(function() {
                 s.set.called.should.be.true();
                 s.set.lastCall.args[0].should.eql('nodes');
                 var nodes = s.set.lastCall.args[1];
                 nodes.should.have.property('test-module');
                 for (var n in nodes['test-module'].nodes) {
-                    var nn = nodes['test-module'].nodes[n];
-                    nn.should.not.have.property('err');
-                    nn.should.not.have.property('id');
+                    if (nodes['test-module'].nodes.hasOwnProperty(n)) {
+                        var nn = nodes['test-module'].nodes[n];
+                        nn.should.not.have.property('err');
+                        nn.should.not.have.property('id');
+                    }
                 }
                 done();
-            }).otherwise(function(err) {
+            }).catch(function(err) {
                 done(err);
             });
         });
@@ -338,7 +343,9 @@ describe("red/nodes/registry/registry",function() {
         it('removes a known module', function() {
             var s = stubSettings({},true,{});
             typeRegistry.init(s);
-            typeRegistry.addNodeSet("test-module/test-name",testNodeSet1, "0.0.1");
+            typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {
+                "test-name":testNodeSet1
+            }});
             var moduleList = typeRegistry.getModuleList();
             moduleList.should.have.a.property("test-module");
             typeRegistry.getNodeList().should.have.lengthOf(1);
@@ -355,27 +362,28 @@ describe("red/nodes/registry/registry",function() {
             typeRegistry.init(settings,{
                 getNodeHelp: function(config) { return "HE"+config.name+"LP" }
             });
-            typeRegistry.addNodeSet("test-module/test-name",{
-                id: "test-module/test-name",
-                module: "test-module",
-                name: "test-name",
-                enabled: true,
-                loaded: false,
-                config: "configA",
-                types: [ "test-a","test-b"]
-            }, "0.0.1");
-            typeRegistry.getNodeConfig("test-module/test-name").should.eql('<!-- --- [red-module:test-module/test-name] --- -->\nconfigAHEtest-nameLP');
-            typeRegistry.getAllNodeConfigs().should.eql('\n<!-- --- [red-module:test-module/test-name] --- -->\nconfigAHEtest-nameLP');
 
-            typeRegistry.addNodeSet("test-module/test-name-2",{
-                id: "test-module/test-name-2",
-                module: "test-module",
-                name: "test-name-2",
-                enabled: true,
-                loaded: false,
-                config: "configB",
-                types: [ "test-c","test-d"]
-            }, "0.0.1");
+            typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {
+                "test-name":{
+                    id: "test-module/test-name",
+                    module: "test-module",
+                    name: "test-name",
+                    enabled: true,
+                    loaded: false,
+                    config: "configA",
+                    types: [ "test-a","test-b"]
+                },
+                "test-name-2":{
+                    id: "test-module/test-name-2",
+                    module: "test-module",
+                    name: "test-name-2",
+                    enabled: true,
+                    loaded: false,
+                    config: "configB",
+                    types: [ "test-c","test-d"]
+                }
+            }});
+            typeRegistry.getNodeConfig("test-module/test-name").should.eql('<!-- --- [red-module:test-module/test-name] --- -->\nconfigAHEtest-nameLP');
             typeRegistry.getNodeConfig("test-module/test-name-2").should.eql('<!-- --- [red-module:test-module/test-name-2] --- -->\nconfigBHEtest-name-2LP');
             typeRegistry.getAllNodeConfigs().should.eql('\n<!-- --- [red-module:test-module/test-name] --- -->\nconfigAHEtest-nameLP\n<!-- --- [red-module:test-module/test-name-2] --- -->\nconfigBHEtest-name-2LP');
         });
@@ -383,16 +391,18 @@ describe("red/nodes/registry/registry",function() {
     describe('#getModuleInfo', function() {
         it('returns module info', function() {
             typeRegistry.init(settings,{});
-            typeRegistry.addNodeSet("test-module/test-name",{
-                id: "test-module/test-name",
-                module: "test-module",
-                name: "test-name",
-                enabled: true,
-                loaded: false,
-                config: "configA",
-                types: [ "test-a","test-b"],
-                file: "abc"
-            }, "0.0.1");
+            typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {
+                "test-name":{
+                    id: "test-module/test-name",
+                    module: "test-module",
+                    name: "test-name",
+                    enabled: true,
+                    loaded: false,
+                    config: "configA",
+                    types: [ "test-a","test-b"],
+                    file: "abc"
+                }
+            }});
             var moduleInfo = typeRegistry.getModuleInfo("test-module");
             moduleInfo.should.have.a.property('name','test-module');
             moduleInfo.should.have.a.property('version','0.0.1');
@@ -405,16 +415,18 @@ describe("red/nodes/registry/registry",function() {
     describe('#getNodeInfo', function() {
         it('returns node info', function() {
             typeRegistry.init(settings,{});
-            typeRegistry.addNodeSet("test-module/test-name",{
-                id: "test-module/test-name",
-                module: "test-module",
-                name: "test-name",
-                enabled: true,
-                loaded: false,
-                config: "configA",
-                types: [ "test-a","test-b"],
-                file: "abc"
-            }, "0.0.1");
+            typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {
+                "test-name":{
+                    id: "test-module/test-name",
+                    module: "test-module",
+                    name: "test-name",
+                    enabled: true,
+                    loaded: false,
+                    config: "configA",
+                    types: [ "test-a","test-b"],
+                    file: "abc"
+                }
+            }});
             var nodeSetInfo = typeRegistry.getNodeInfo("test-module/test-name");
             nodeSetInfo.should.have.a.property('id',"test-module/test-name");
             nodeSetInfo.should.not.have.a.property('config');
@@ -424,17 +436,19 @@ describe("red/nodes/registry/registry",function() {
     describe('#getFullNodeInfo', function() {
         it('returns node info', function() {
             typeRegistry.init(settings,{});
-            typeRegistry.addNodeSet("test-module/test-name",{
-                id: "test-module/test-name",
-                module: "test-module",
-                name: "test-name",
-                enabled: true,
-                loaded: false,
-                config: "configA",
-                types: [ "test-a","test-b"],
-                file: "abc"
+            typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {
+                "test-name":{
+                    id: "test-module/test-name",
+                    module: "test-module",
+                    name: "test-name",
+                    enabled: true,
+                    loaded: false,
+                    config: "configA",
+                    types: [ "test-a","test-b"],
+                    file: "abc"
 
-            }, "0.0.1");
+                }
+            }});
             var nodeSetInfo = typeRegistry.getFullNodeInfo("test-module/test-name");
             nodeSetInfo.should.have.a.property('id',"test-module/test-name");
             nodeSetInfo.should.have.a.property('config');
@@ -447,26 +461,28 @@ describe("red/nodes/registry/registry",function() {
     describe('#getNodeList', function() {
         it("returns a filtered list", function() {
             typeRegistry.init(settings,{});
-            typeRegistry.addNodeSet("test-module/test-name",{
-                id: "test-module/test-name",
-                module: "test-module",
-                name: "test-name",
-                enabled: true,
-                loaded: false,
-                config: "configA",
-                types: [ "test-a","test-b"],
-                file: "abc"
-            }, "0.0.1");
-            typeRegistry.addNodeSet("test-module/test-name-2",{
-                id: "test-module/test-name-2",
-                module: "test-module",
-                name: "test-name-2",
-                enabled: true,
-                loaded: false,
-                config: "configB",
-                types: [ "test-c","test-d"],
-                file: "def"
-            }, "0.0.1");
+            typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {
+                "test-name":{
+                    id: "test-module/test-name",
+                    module: "test-module",
+                    name: "test-name",
+                    enabled: true,
+                    loaded: false,
+                    config: "configA",
+                    types: [ "test-a","test-b"],
+                    file: "abc"
+                },
+                "test-name-2":{
+                    id: "test-module/test-name-2",
+                    module: "test-module",
+                    name: "test-name-2",
+                    enabled: true,
+                    loaded: false,
+                    config: "configB",
+                    types: [ "test-c","test-d"],
+                    file: "def"
+                }
+            }});
             var filterCallCount = 0;
             var filteredList = typeRegistry.getNodeList(function(n) { filterCallCount++; return n.name === 'test-name-2';});
             filterCallCount.should.eql(2);
@@ -532,10 +548,22 @@ describe("red/nodes/registry/registry",function() {
         });
 
         it('returns a registered icon' , function() {
-            var testIcon = path.resolve(__dirname+'/../../../../resources/icons/test_icon.png');
-            events.emit("node-icon-dir",{name:"test-module", path: path.resolve(__dirname+'/../../../../resources/icons'), icons:[]});
+            var testIcon = path.resolve(__dirname+'/../../../../resources/icons/');
+            typeRegistry.init(settings,{});            
+            typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {
+                "test-name":{
+                    id: "test-module/test-name",
+                    module: "test-module",
+                    name: "test-name",
+                    enabled: true,
+                    loaded: false,
+                    config: "configA",
+                    types: [ "test-a","test-b"],
+                    file: "abc"
+                }
+            },icons: [{path:testIcon,icons:['test_icon.png']}]});
             var iconPath = typeRegistry.getNodeIconPath('test-module','test_icon.png');
-            iconPath.should.eql(testIcon);
+            iconPath.should.eql(testIcon+"/test_icon.png");
         });
 
         it('returns the debug icon when getting an unknown module', function() {
@@ -552,14 +580,26 @@ describe("red/nodes/registry/registry",function() {
         });
 
         it('returns an icon list of registered node module', function() {
-            typeRegistry.addNodeSet("test-module/test-name",testNodeSet1,"0.0.1");
-            events.emit("node-icon-dir",{name:"test-module", path:"",icons:["test_icon1.png"]});
+            var testIcon = path.resolve(__dirname+'/resources/userDir/lib/icons/');
+            typeRegistry.init(settings,{},events);
+            typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {
+                "test-name":{
+                    id: "test-module/test-name",
+                    module: "test-module",
+                    name: "test-name",
+                    enabled: true,
+                    loaded: false,
+                    config: "configA",
+                    types: [ "test-a","test-b"],
+                    file: "abc"
+                }
+            },icons: [{path:testIcon,icons:['test_icon.png']}]});
             var iconList = typeRegistry.getNodeIcons();
-            iconList.should.eql({"test-module":["test_icon1.png"]});
+            iconList.should.eql({"test-module":["test_icon.png"]});
         });
 
-        it('returns an icon list of unregistered node module', function() {
-            events.emit("node-icon-dir",{name:"test-module", path:"", icons:["test_icon1.png", "test_icon2.png"]});
+        it.skip('returns an icon list of unregistered node module', function() {
+            // events.emit("node-icon-dir",{name:"test-module", path:"", icons:["test_icon1.png", "test_icon2.png"]});
             var iconList = typeRegistry.getNodeIcons();
             iconList.should.eql({"test-module":["test_icon1.png","test_icon2.png"]});
         });
diff --git a/test/red/runtime/nodes/resources/local/NestedDirectoryNode/NestedNode/icons/arrow-in.png b/test/red/runtime/nodes/resources/local/NestedDirectoryNode/NestedNode/icons/arrow-in.png
new file mode 100644
index 0000000000000000000000000000000000000000..e38f3914600901b736f5fa18786ee11be6d41c28
GIT binary patch
literal 393
zcmeAS@N?(olHy`uVBq!ia0vp^B0wz1!3HFCgzU0`6icy_X9x!n)NrJ90QsB+9+AZi
z3~X;em{G3O!W1YdS>hT|5}cn_Ql40p%1~Zju9umYU7Va)kgAtols@~NjT8d|Bb%p-
zV~9uR+N-+$hZ97Oeyp#Y$RU!&XX#m>@|$agvYL9Jz$O6}72y^gZVi>ZMeaH^t*Q|!
zLhVk<0xdko8z<P^y<D_DtJuHp<>YVo#8M-LBBd8b>1kw|i?FO)bWqsy_rwQg27N4y
zeX6pqO$_Cex^^A7_NsS@+=bOA<r!)dX0hsRe7#GZAy4IOPJO89?V2014@|D+SZj(;
z`lfVHHbI1wiASYW`Jiut5NFu6`UCP0Y=mmI{FP#@n-r0mdocR8eBcA?g85nh=02@d
z+HQ4!`btYSjiP^5lf+J+7JqQzo6^+WswbPR)@c4n`CS>SA^wN0&GKN(hlAguRU&q-
jTBY?`*L>xN+|S&+7B*edvmQhOgN?z{)z4*}Q$iB}+9!`i

literal 0
HcmV?d00001

diff --git a/test/red/runtime/nodes/resources/local/NestedDirectoryNode/NestedNode/icons/file.txt b/test/red/runtime/nodes/resources/local/NestedDirectoryNode/NestedNode/icons/file.txt
deleted file mode 100644
index 59a29af14..000000000
--- a/test/red/runtime/nodes/resources/local/NestedDirectoryNode/NestedNode/icons/file.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-This file exists just to ensure the 'icons' directory is in the repository.
-TODO: a future test needs to ensure the right icon files are loaded - this
-      directory can be used for that
diff --git a/test/red/runtime/nodes/resources/local/TestNodeModule/node_modules/TestNodeModule/icons/file.txt b/test/red/runtime/nodes/resources/local/TestNodeModule/node_modules/TestNodeModule/icons/file.txt
deleted file mode 100644
index 59a29af14..000000000
--- a/test/red/runtime/nodes/resources/local/TestNodeModule/node_modules/TestNodeModule/icons/file.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-This file exists just to ensure the 'icons' directory is in the repository.
-TODO: a future test needs to ensure the right icon files are loaded - this
-      directory can be used for that

From 184b1b018ce0e4c041370f2aa914663864432b89 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 21 May 2018 22:38:07 +0100
Subject: [PATCH 007/113] Add missing resource file

---
 .../node_modules/TestNodeModule/icons/arrow-in.png             | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 test/red/runtime/nodes/resources/local/TestNodeModule/node_modules/TestNodeModule/icons/arrow-in.png

diff --git a/test/red/runtime/nodes/resources/local/TestNodeModule/node_modules/TestNodeModule/icons/arrow-in.png b/test/red/runtime/nodes/resources/local/TestNodeModule/node_modules/TestNodeModule/icons/arrow-in.png
new file mode 100644
index 000000000..59a29af14
--- /dev/null
+++ b/test/red/runtime/nodes/resources/local/TestNodeModule/node_modules/TestNodeModule/icons/arrow-in.png
@@ -0,0 +1,3 @@
+This file exists just to ensure the 'icons' directory is in the repository.
+TODO: a future test needs to ensure the right icon files are loaded - this
+      directory can be used for that

From 36105412b1b8f27ce9344c62a39d1c40c9bdf184 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 22 May 2018 11:41:22 +0100
Subject: [PATCH 008/113] Add 'private' property to userDir generated
 package.json

This stops the warnings from npm about missing repo and license fields.
As there's no expectation for a user to publish their userDir to npm, then
setting private is entirely appropriate.
---
 red/runtime/storage/localfilesystem/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/red/runtime/storage/localfilesystem/index.js b/red/runtime/storage/localfilesystem/index.js
index 2a57c7323..5a33aaecf 100644
--- a/red/runtime/storage/localfilesystem/index.js
+++ b/red/runtime/storage/localfilesystem/index.js
@@ -72,7 +72,8 @@ var localfilesystem = {
                     var defaultPackage = {
                         "name": "node-red-project",
                         "description": "A Node-RED Project",
-                        "version": "0.0.1"
+                        "version": "0.0.1",
+                        "private": true
                     };
                     return util.writeFile(packageFile,JSON.stringify(defaultPackage,"",4));
                 }

From b761904424fa99300a0259cc6205ff4f2a91c7ba Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Tue, 22 May 2018 15:48:24 +0100
Subject: [PATCH 009/113] let Pi nodes be visible/editable on all platforms

even where they are not physically available.
---
 nodes/core/hardware/36-rpi-gpio.js     | 343 ++++++++++++++-----------
 nodes/core/locales/en-US/messages.json |   2 +-
 2 files changed, 189 insertions(+), 156 deletions(-)

diff --git a/nodes/core/hardware/36-rpi-gpio.js b/nodes/core/hardware/36-rpi-gpio.js
index cc1a8ab2a..40c3d0f9b 100644
--- a/nodes/core/hardware/36-rpi-gpio.js
+++ b/nodes/core/hardware/36-rpi-gpio.js
@@ -6,35 +6,36 @@ module.exports = function(RED) {
     var fs = require('fs');
 
     var gpioCommand = __dirname+'/nrgpio';
+    var allOK = true;
 
     try {
         var cpuinfo = fs.readFileSync("/proc/cpuinfo").toString();
-        if (cpuinfo.indexOf(": BCM") === -1) { throw "Info : "+RED._("rpi-gpio.errors.ignorenode"); }
-    } catch(err) {
-        throw "Info : "+RED._("rpi-gpio.errors.ignorenode");
-    }
-
-    try {
-        fs.statSync("/usr/share/doc/python-rpi.gpio"); // test on Raspbian
-        // /usr/lib/python2.7/dist-packages/RPi/GPIO
-    } catch(err) {
+        if (cpuinfo.indexOf(": BCM") === -1) {
+            allOK = false;
+            RED.log.warn("rpi-gpio : "+RED._("rpi-gpio.errors.ignorenode"));
+        }
         try {
-            fs.statSync("/usr/lib/python2.7/site-packages/RPi/GPIO"); // test on Arch
-        }
-        catch(err) {
+            fs.statSync("/usr/share/doc/python-rpi.gpio"); // test on Raspbian
+            // /usr/lib/python2.7/dist-packages/RPi/GPIO
+        } catch(err) {
             try {
-                fs.statSync("/usr/lib/python2.7/dist-packages/RPi/GPIO"); // test on Hypriot
-            }
-            catch(err) {
-                RED.log.warn(RED._("rpi-gpio.errors.libnotfound"));
-                throw "Warning : "+RED._("rpi-gpio.errors.libnotfound");
+                fs.statSync("/usr/lib/python2.7/site-packages/RPi/GPIO"); // test on Arch
+            } catch(err) {
+                try {
+                    fs.statSync("/usr/lib/python2.7/dist-packages/RPi/GPIO"); // test on Hypriot
+                } catch(err) {
+                    RED.log.warn("rpi-gpio : "+RED._("rpi-gpio.errors.libnotfound"));
+                    allOK = false;
+                }
             }
         }
-    }
-
-    if ( !(1 & parseInt((fs.statSync(gpioCommand).mode & parseInt("777", 8)).toString(8)[0]) )) {
-        RED.log.error(RED._("rpi-gpio.errors.needtobeexecutable",{command:gpioCommand}));
-        throw "Error : "+RED._("rpi-gpio.errors.mustbeexecutable");
+        if ( !(1 & parseInt((fs.statSync(gpioCommand).mode & parseInt("777", 8)).toString(8)[0]) )) {
+            RED.log.warn("rpi-gpio : "+RED._("rpi-gpio.errors.needtobeexecutable",{command:gpioCommand}));
+            allOK = false;
+        }
+    } catch(err) {
+        allOK = false;
+        RED.log.warn("rpi-gpio : "+RED._("rpi-gpio.errors.ignorenode"));
     }
 
     // the magic to make python print stuff immediately
@@ -61,48 +62,62 @@ module.exports = function(RED) {
             }
         }
 
-        if (node.pin !== undefined) {
-            node.child = spawn(gpioCommand, ["in",node.pin,node.intype,node.debounce]);
-            node.running = true;
-            node.status({fill:"green",shape:"dot",text:"common.status.ok"});
+        if (allOK === true) {
+            if (node.pin !== undefined) {
+                node.child = spawn(gpioCommand, ["in",node.pin,node.intype,node.debounce]);
+                node.running = true;
+                node.status({fill:"green",shape:"dot",text:"common.status.ok"});
 
-            node.child.stdout.on('data', function (data) {
-                var d = data.toString().trim().split("\n");
-                for (var i = 0; i < d.length; i++) {
-                    if (d[i] === '') { return; }
-                    if (node.running && node.buttonState !== -1 && !isNaN(Number(d[i])) && node.buttonState !== d[i]) {
-                        node.send({ topic:"pi/"+node.pin, payload:Number(d[i]) });
+                node.child.stdout.on('data', function (data) {
+                    var d = data.toString().trim().split("\n");
+                    for (var i = 0; i < d.length; i++) {
+                        if (d[i] === '') { return; }
+                        if (node.running && node.buttonState !== -1 && !isNaN(Number(d[i])) && node.buttonState !== d[i]) {
+                            node.send({ topic:"pi/"+node.pin, payload:Number(d[i]) });
+                        }
+                        node.buttonState = d[i];
+                        node.status({fill:"green",shape:"dot",text:d[i]});
+                        if (RED.settings.verbose) { node.log("out: "+d[i]+" :"); }
                     }
-                    node.buttonState = d[i];
-                    node.status({fill:"green",shape:"dot",text:d[i]});
-                    if (RED.settings.verbose) { node.log("out: "+d[i]+" :"); }
-                }
-            });
+                });
 
-            node.child.stderr.on('data', function (data) {
-                if (RED.settings.verbose) { node.log("err: "+data+" :"); }
-            });
+                node.child.stderr.on('data', function (data) {
+                    if (RED.settings.verbose) { node.log("err: "+data+" :"); }
+                });
 
-            node.child.on('close', function (code) {
-                node.running = false;
-                node.child = null;
-                if (RED.settings.verbose) { node.log(RED._("rpi-gpio.status.closed")); }
-                if (node.done) {
-                    node.status({fill:"grey",shape:"ring",text:"rpi-gpio.status.closed"});
-                    node.done();
-                }
-                else { node.status({fill:"red",shape:"ring",text:"rpi-gpio.status.stopped"}); }
-            });
+                node.child.on('close', function (code) {
+                    node.running = false;
+                    node.child = null;
+                    if (RED.settings.verbose) { node.log(RED._("rpi-gpio.status.closed")); }
+                    if (node.done) {
+                        node.status({fill:"grey",shape:"ring",text:"rpi-gpio.status.closed"});
+                        node.done();
+                    }
+                    else { node.status({fill:"red",shape:"ring",text:"rpi-gpio.status.stopped"}); }
+                });
 
-            node.child.on('error', function (err) {
-                if (err.errno === "ENOENT") { node.error(RED._("rpi-gpio.errors.commandnotfound")); }
-                else if (err.errno === "EACCES") { node.error(RED._("rpi-gpio.errors.commandnotexecutable")); }
-                else { node.error(RED._("rpi-gpio.errors.error",{error:err.errno})) }
-            });
+                node.child.on('error', function (err) {
+                    if (err.errno === "ENOENT") { node.error(RED._("rpi-gpio.errors.commandnotfound")); }
+                    else if (err.errno === "EACCES") { node.error(RED._("rpi-gpio.errors.commandnotexecutable")); }
+                    else { node.error(RED._("rpi-gpio.errors.error",{error:err.errno})) }
+                });
 
+            }
+            else {
+                node.warn(RED._("rpi-gpio.errors.invalidpin")+": "+node.pin);
+            }
         }
         else {
-            node.warn(RED._("rpi-gpio.errors.invalidpin")+": "+node.pin);
+            node.status({fill:"grey",shape:"dot",text:"node-red:rpi-gpio.status.not-available"});
+            if (node.read === true) {
+                var val;
+                if (node.intype == "up") { val = 1; }
+                if (node.intype == "down") { val = 0; }
+                setTimeout(function(){
+                    node.send({ topic:"pi/"+node.pin, payload:val });
+                    node.status({fill:"grey",shape:"dot",text:RED._("rpi-gpio.status.na",{value:val})});
+                },250);
+            }
         }
 
         node.on("close", function(done) {
@@ -155,20 +170,83 @@ module.exports = function(RED) {
             else { node.warn(RED._("rpi-gpio.errors.invalidinput")+": "+out); }
         }
 
-        if (node.pin !== undefined) {
-            if (node.set && (node.out === "out")) {
-                node.child = spawn(gpioCommand, [node.out,node.pin,node.level]);
-                node.status({fill:"green",shape:"dot",text:node.level});
-            } else {
-                node.child = spawn(gpioCommand, [node.out,node.pin,node.freq]);
-                node.status({fill:"green",shape:"dot",text:"common.status.ok"});
-            }
-            node.running = true;
+        if (allOK === true) {
+            if (node.pin !== undefined) {
+                if (node.set && (node.out === "out")) {
+                    node.child = spawn(gpioCommand, [node.out,node.pin,node.level]);
+                    node.status({fill:"green",shape:"dot",text:node.level});
+                } else {
+                    node.child = spawn(gpioCommand, [node.out,node.pin,node.freq]);
+                    node.status({fill:"green",shape:"dot",text:"common.status.ok"});
+                }
+                node.running = true;
 
-            node.on("input", inputlistener);
+                node.on("input", inputlistener);
+
+                node.child.stdout.on('data', function (data) {
+                    if (RED.settings.verbose) { node.log("out: "+data+" :"); }
+                });
+
+                node.child.stderr.on('data', function (data) {
+                    if (RED.settings.verbose) { node.log("err: "+data+" :"); }
+                });
+
+                node.child.on('close', function (code) {
+                    node.child = null;
+                    node.running = false;
+                    if (RED.settings.verbose) { node.log(RED._("rpi-gpio.status.closed")); }
+                    if (node.done) {
+                        node.status({fill:"grey",shape:"ring",text:"rpi-gpio.status.closed"});
+                        node.done();
+                    }
+                    else { node.status({fill:"red",shape:"ring",text:"rpi-gpio.status.stopped"}); }
+                });
+
+                node.child.on('error', function (err) {
+                    if (err.errno === "ENOENT") { node.error(RED._("rpi-gpio.errors.commandnotfound")); }
+                    else if (err.errno === "EACCES") { node.error(RED._("rpi-gpio.errors.commandnotexecutable")); }
+                    else { node.error(RED._("rpi-gpio.errors.error")+': ' + err.errno); }
+                });
+
+            }
+            else {
+                node.warn(RED._("rpi-gpio.errors.invalidpin")+": "+node.pin);
+            }
+        }
+        else {
+            node.status({fill:"grey",shape:"dot",text:"node-red:rpi-gpio.status.not-available"});
+            node.on("input", function(msg){
+                node.status({fill:"grey",shape:"dot",text:RED._("rpi-gpio.status.na",{value:msg.payload.toString()})});
+            });
+        }
+
+        node.on("close", function(done) {
+            node.status({fill:"grey",shape:"ring",text:"rpi-gpio.status.closed"});
+            delete pinsInUse[node.pin];
+            if (node.child != null) {
+                node.done = done;
+                node.child.stdin.write("close "+node.pin);
+                node.child.kill('SIGKILL');
+            }
+            else { done(); }
+        });
+
+    }
+    RED.nodes.registerType("rpi-gpio out",GPIOOutNode);
+
+    function PiMouseNode(n) {
+        RED.nodes.createNode(this,n);
+        this.butt = n.butt || 7;
+        var node = this;
+
+        if (allOK === true) {
+            node.child = spawn(gpioCommand+".py", ["mouse",node.butt]);
+            node.status({fill:"green",shape:"dot",text:"common.status.ok"});
 
             node.child.stdout.on('data', function (data) {
-                if (RED.settings.verbose) { node.log("out: "+data+" :"); }
+                data = Number(data);
+                if (data !== 0) { node.send({ topic:"pi/mouse", button:data, payload:1 }); }
+                else { node.send({ topic:"pi/mouse", button:data, payload:0 }); }
             });
 
             node.child.stderr.on('data', function (data) {
@@ -192,69 +270,19 @@ module.exports = function(RED) {
                 else { node.error(RED._("rpi-gpio.errors.error")+': ' + err.errno); }
             });
 
+            node.on("close", function(done) {
+                node.status({fill:"grey",shape:"ring",text:"rpi-gpio.status.closed"});
+                if (node.child != null) {
+                    node.done = done;
+                    node.child.kill('SIGINT');
+                    node.child = null;
+                }
+                else { done(); }
+            });
         }
         else {
-            node.warn(RED._("rpi-gpio.errors.invalidpin")+": "+node.pin);
+            node.status({fill:"grey",shape:"dot",text:"node-red:rpi-gpio.status.not-available"});
         }
-
-        node.on("close", function(done) {
-            node.status({fill:"grey",shape:"ring",text:"rpi-gpio.status.closed"});
-            delete pinsInUse[node.pin];
-            if (node.child != null) {
-                node.done = done;
-                node.child.stdin.write("close "+node.pin);
-                node.child.kill('SIGKILL');
-            }
-            else { done(); }
-        });
-
-    }
-    RED.nodes.registerType("rpi-gpio out",GPIOOutNode);
-
-    function PiMouseNode(n) {
-        RED.nodes.createNode(this,n);
-        this.butt = n.butt || 7;
-        var node = this;
-
-        node.child = spawn(gpioCommand+".py", ["mouse",node.butt]);
-        node.status({fill:"green",shape:"dot",text:"common.status.ok"});
-
-        node.child.stdout.on('data', function (data) {
-            data = Number(data);
-            if (data === 1) { node.send({ topic:"pi/mouse", button:data, payload:1 }); }
-            else { node.send({ topic:"pi/mouse", button:data, payload:0 }); }
-        });
-
-        node.child.stderr.on('data', function (data) {
-            if (RED.settings.verbose) { node.log("err: "+data+" :"); }
-        });
-
-        node.child.on('close', function (code) {
-            node.child = null;
-            node.running = false;
-            if (RED.settings.verbose) { node.log(RED._("rpi-gpio.status.closed")); }
-            if (node.done) {
-                node.status({fill:"grey",shape:"ring",text:"rpi-gpio.status.closed"});
-                node.done();
-            }
-            else { node.status({fill:"red",shape:"ring",text:"rpi-gpio.status.stopped"}); }
-        });
-
-        node.child.on('error', function (err) {
-            if (err.errno === "ENOENT") { node.error(RED._("rpi-gpio.errors.commandnotfound")); }
-            else if (err.errno === "EACCES") { node.error(RED._("rpi-gpio.errors.commandnotexecutable")); }
-            else { node.error(RED._("rpi-gpio.errors.error")+': ' + err.errno); }
-        });
-
-        node.on("close", function(done) {
-            node.status({fill:"grey",shape:"ring",text:"rpi-gpio.status.closed"});
-            if (node.child != null) {
-                node.done = done;
-                node.child.kill('SIGINT');
-                node.child = null;
-            }
-            else { done(); }
-        });
     }
     RED.nodes.registerType("rpi-mouse",PiMouseNode);
 
@@ -262,39 +290,40 @@ module.exports = function(RED) {
         RED.nodes.createNode(this,n);
         var node = this;
 
-        node.child = spawn(gpioCommand+".py", ["kbd","0"]);
-        node.status({fill:"green",shape:"dot",text:"common.status.ok"});
+        if (allOK === true) {
+            node.child = spawn(gpioCommand+".py", ["kbd","0"]);
+            node.status({fill:"green",shape:"dot",text:"common.status.ok"});
 
-        node.child.stdout.on('data', function (data) {
-            var b = data.toString().trim().split(",");
-            var act = "up";
-            if (b[1] === "1") { act = "down"; }
-            if (b[1] === "2") { act = "repeat"; }
-            node.send({ topic:"pi/key", payload:Number(b[0]), action:act });
-        });
+            node.child.stdout.on('data', function (data) {
+                var b = data.toString().trim().split(",");
+                var act = "up";
+                if (b[1] === "1") { act = "down"; }
+                if (b[1] === "2") { act = "repeat"; }
+                node.send({ topic:"pi/key", payload:Number(b[0]), action:act });
+            });
 
-        node.child.stderr.on('data', function (data) {
-            if (RED.settings.verbose) { node.log("err: "+data+" :"); }
-        });
+            node.child.stderr.on('data', function (data) {
+                if (RED.settings.verbose) { node.log("err: "+data+" :"); }
+            });
 
-        node.child.on('close', function (code) {
-            node.running = false;
-            node.child = null;
-            if (RED.settings.verbose) { node.log(RED._("rpi-gpio.status.closed")); }
-            if (node.done) {
-                node.status({fill:"grey",shape:"ring",text:"rpi-gpio.status.closed"});
-                node.done();
-            }
-            else { node.status({fill:"red",shape:"ring",text:"rpi-gpio.status.stopped"}); }
-        });
+            node.child.on('close', function (code) {
+                node.running = false;
+                node.child = null;
+                if (RED.settings.verbose) { node.log(RED._("rpi-gpio.status.closed")); }
+                if (node.done) {
+                    node.status({fill:"grey",shape:"ring",text:"rpi-gpio.status.closed"});
+                    node.done();
+                }
+                else { node.status({fill:"red",shape:"ring",text:"rpi-gpio.status.stopped"}); }
+            });
 
-        node.child.on('error', function (err) {
-            if (err.errno === "ENOENT") { node.error(RED._("rpi-gpio.errors.commandnotfound")); }
-            else if (err.errno === "EACCES") { node.error(RED._("rpi-gpio.errors.commandnotexecutable")); }
-            else { node.error(RED._("rpi-gpio.errors.error")+': ' + err.errno); }
-        });
+            node.child.on('error', function (err) {
+                if (err.errno === "ENOENT") { node.error(RED._("rpi-gpio.errors.commandnotfound")); }
+                else if (err.errno === "EACCES") { node.error(RED._("rpi-gpio.errors.commandnotexecutable")); }
+                else { node.error(RED._("rpi-gpio.errors.error")+': ' + err.errno); }
+            });
 
-        node.on("close", function(done) {
+            node.on("close", function(done) {
             node.status({});
             if (node.child != null) {
                 node.done = done;
@@ -303,6 +332,10 @@ module.exports = function(RED) {
             }
             else { done(); }
         });
+        }
+        else {
+            node.status({fill:"grey",shape:"dot",text:"node-red:rpi-gpio.status.not-available"});
+        }
     }
     RED.nodes.registerType("rpi-keyboard",PiKeyboardNode);
 
diff --git a/nodes/core/locales/en-US/messages.json b/nodes/core/locales/en-US/messages.json
index 74ec0bcd4..15d66c9dc 100644
--- a/nodes/core/locales/en-US/messages.json
+++ b/nodes/core/locales/en-US/messages.json
@@ -787,7 +787,7 @@
         },
         "errors": {
             "ignorenode": "Ignoring Raspberry Pi specific node",
-            "version": "Version command failed",
+            "version": "Failed to get version from Pi",
             "sawpitype": "Saw Pi Type",
             "libnotfound": "Cannot find Pi RPi.GPIO python library",
             "alreadyset": "GPIO pin __pin__ already set as type: __type__",

From 7dd329b5ee589f9477e7a2e838e3cdbb066b24a9 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Tue, 22 May 2018 17:26:52 +0100
Subject: [PATCH 010/113] Add basic loading tests for GPIO nodes

---
 nodes/core/hardware/36-rpi-gpio.js           | 26 +++---
 nodes/core/locales/en-US/messages.json       |  2 +-
 test/nodes/core/hardware/36-rpi-gpio_spec.js | 90 ++++++++++++++++++++
 3 files changed, 105 insertions(+), 13 deletions(-)
 create mode 100644 test/nodes/core/hardware/36-rpi-gpio_spec.js

diff --git a/nodes/core/hardware/36-rpi-gpio.js b/nodes/core/hardware/36-rpi-gpio.js
index 40c3d0f9b..0a21f578a 100644
--- a/nodes/core/hardware/36-rpi-gpio.js
+++ b/nodes/core/hardware/36-rpi-gpio.js
@@ -340,20 +340,22 @@ module.exports = function(RED) {
     RED.nodes.registerType("rpi-keyboard",PiKeyboardNode);
 
     var pitype = { type:"" };
-    exec(gpioCommand+" info", function(err,stdout,stderr) {
-        if (err) {
-            RED.log.info(RED._("rpi-gpio.errors.version"));
-        }
-        else {
-            try {
-                var info = JSON.parse( stdout.trim().replace(/\'/g,"\"") );
-                pitype.type = info["TYPE"];
+    if (allOK === true) {
+        exec(gpioCommand+" info", function(err,stdout,stderr) {
+            if (err) {
+                RED.log.info(RED._("rpi-gpio.errors.version"));
             }
-            catch(e) {
-                RED.log.info(RED._("rpi-gpio.errors.sawpitype"),stdout.trim());
+            else {
+                try {
+                    var info = JSON.parse( stdout.trim().replace(/\'/g,"\"") );
+                    pitype.type = info["TYPE"];
+                }
+                catch(e) {
+                    RED.log.info(RED._("rpi-gpio.errors.sawpitype"),stdout.trim());
+                }
             }
-        }
-    });
+        });
+    }
 
     RED.httpAdmin.get('/rpi-gpio/:id', RED.auth.needsPermission('rpi-gpio.read'), function(req,res) {
         res.json(pitype);
diff --git a/nodes/core/locales/en-US/messages.json b/nodes/core/locales/en-US/messages.json
index 15d66c9dc..d59f3d1bf 100644
--- a/nodes/core/locales/en-US/messages.json
+++ b/nodes/core/locales/en-US/messages.json
@@ -786,7 +786,7 @@
             "na": "N/A : __value__"
         },
         "errors": {
-            "ignorenode": "Ignoring Raspberry Pi specific node",
+            "ignorenode": "Raspberry Pi specific node set inactive",
             "version": "Failed to get version from Pi",
             "sawpitype": "Saw Pi Type",
             "libnotfound": "Cannot find Pi RPi.GPIO python library",
diff --git a/test/nodes/core/hardware/36-rpi-gpio_spec.js b/test/nodes/core/hardware/36-rpi-gpio_spec.js
new file mode 100644
index 000000000..3933154c0
--- /dev/null
+++ b/test/nodes/core/hardware/36-rpi-gpio_spec.js
@@ -0,0 +1,90 @@
+/**
+ * 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 rpi = require("../../../../nodes/core/hardware/36-rpi-gpio.js");
+var helper = require("node-red-node-test-helper");
+var fs = require("fs");
+
+describe('RPI GPIO Node', function() {
+
+    before(function(done) {
+        helper.startServer(done);
+    });
+
+    after(function(done) {
+        helper.stopServer(done);
+    });
+
+    afterEach(function() {
+        helper.unload();
+    });
+
+    var checkIgnore = function(done) {
+        setTimeout(function() {
+            try {
+                var logEvents = helper.log().args.filter(function(evt) {
+                    return ((evt[0].level == 30) && (evt[0].msg.indexOf("rpi-gpio")===0));
+                });
+                logEvents.should.have.length(1);
+                logEvents[0][0].should.have.a.property('msg');
+                logEvents[0][0].msg.toString().should.startWith("rpi-gpio : rpi-gpio.errors.ignorenode");
+                done();
+            } catch(err) {
+                done(err);
+            }
+        },25);
+    }
+
+    it('should load Input node', function(done) {
+        var flow = [{id:"n1", type:"rpi-gpio in", name:"rpi-gpio in" }];
+        helper.load(rpi, flow, function() {
+            var n1 = helper.getNode("n1");
+            n1.should.have.property('name', 'rpi-gpio in');
+            try {
+                var cpuinfo = fs.readFileSync("/proc/cpuinfo").toString();
+                if (cpuinfo.indexOf(": BCM") === 1) {
+                    done(); // It's ON a PI ... should really do more tests !
+                } else {
+                    checkIgnore(done);
+                }
+            }
+            catch(e) {
+                checkIgnore(done);
+            }
+        });
+    });
+
+    it('should load Output node', function(done) {
+        var flow = [{id:"n1", type:"rpi-gpio out", name:"rpi-gpio out" }];
+        helper.load(rpi, flow, function() {
+            var n1 = helper.getNode("n1");
+            n1.should.have.property('name', 'rpi-gpio out');
+            try {
+                var cpuinfo = fs.readFileSync("/proc/cpuinfo").toString();
+                if (cpuinfo.indexOf(": BCM") === 1) {
+                    done(); // It's ON a PI ... should really do more tests !
+                } else {
+                    checkIgnore(done);
+                }
+            }
+            catch(e) {
+                checkIgnore(done);
+            }
+        });
+    });
+
+});

From 61f6535be817f9a7b0c1266f11e5cce01fb55c1c Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Wed, 23 May 2018 16:54:03 +0900
Subject: [PATCH 011/113] Add test case for preventing following redirect

---
 test/nodes/core/io/21-httprequest_spec.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/test/nodes/core/io/21-httprequest_spec.js b/test/nodes/core/io/21-httprequest_spec.js
index 43c42c8a4..4a1b513f0 100644
--- a/test/nodes/core/io/21-httprequest_spec.js
+++ b/test/nodes/core/io/21-httprequest_spec.js
@@ -796,6 +796,25 @@ describe('HTTP Request Node', function() {
             });
         });
 
+        it('should prevent following redirect when msg.followRedirects is false', function(done) {
+            var flow = [{id:"n1",type:"http request",wires:[["n2"]],method:"GET",ret:"txt",url:getTestURL('/redirectToText')},
+                {id:"n2", type:"helper"}];
+            helper.load(httpRequestNode, flow, function() {
+                var n1 = helper.getNode("n1");
+                var n2 = helper.getNode("n2");
+                n2.on("input", function(msg) {
+                    try {
+                        msg.should.have.property('statusCode',302);
+                        msg.should.have.property('responseUrl', getTestURL('/redirectToText'));
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
+                n1.receive({payload:"foo",followRedirects:false});
+            });
+        });
+
         it('shuold output an error when request timeout occurred', function(done) {
             var flow = [{id:"n1",type:"http request",wires:[["n2"]],method:"GET",ret:"obj",url:getTestURL('/timeout')},
                 {id:"n2", type:"helper"}];

From 1d05b4c9814c656c2be9683d88eac4efae96eb41 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Wed, 23 May 2018 08:58:04 +0100
Subject: [PATCH 012/113] relax test spec slightly

---
 test/nodes/core/hardware/36-rpi-gpio_spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/nodes/core/hardware/36-rpi-gpio_spec.js b/test/nodes/core/hardware/36-rpi-gpio_spec.js
index 3933154c0..c11ea254c 100644
--- a/test/nodes/core/hardware/36-rpi-gpio_spec.js
+++ b/test/nodes/core/hardware/36-rpi-gpio_spec.js
@@ -39,7 +39,6 @@ describe('RPI GPIO Node', function() {
                 var logEvents = helper.log().args.filter(function(evt) {
                     return ((evt[0].level == 30) && (evt[0].msg.indexOf("rpi-gpio")===0));
                 });
-                logEvents.should.have.length(1);
                 logEvents[0][0].should.have.a.property('msg');
                 logEvents[0][0].msg.toString().should.startWith("rpi-gpio : rpi-gpio.errors.ignorenode");
                 done();

From 9fd5d1db56a6b25a5342b55cd893a5f180e07909 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Wed, 23 May 2018 17:16:20 +0900
Subject: [PATCH 013/113] Move to request module

---
 nodes/core/io/21-httprequest.js           | 146 ++++++++--------------
 package.json                              |   2 +-
 test/nodes/core/io/21-httprequest_spec.js |   8 +-
 3 files changed, 63 insertions(+), 93 deletions(-)

diff --git a/nodes/core/io/21-httprequest.js b/nodes/core/io/21-httprequest.js
index b492fb9dc..4ddb1d3b9 100644
--- a/nodes/core/io/21-httprequest.js
+++ b/nodes/core/io/21-httprequest.js
@@ -16,9 +16,7 @@
 
 module.exports = function(RED) {
     "use strict";
-    var http = require("follow-redirects").http;
-    var https = require("follow-redirects").https;
-    var urllib = require("url");
+    var request = require("request");
     var mustache = require("mustache");
     var querystring = require("querystring");
     var cookie = require("cookie");
@@ -78,9 +76,13 @@ module.exports = function(RED) {
             if (msg.method && n.method && (n.method === "use")) {
                 method = msg.method.toUpperCase();          // use the msg parameter
             }
-            var opts = urllib.parse(url);
+            var opts = {};
+            opts.url = url;
+            opts.timeout = node.reqTimeout;
             opts.method = method;
             opts.headers = {};
+            opts.encoding = null;  // Force NodeJs to return a Buffer (instead of a string)
+            opts.maxRedirects = 21;
             var ctSet = "Content-Type"; // set default camel case
             var clSet = "Content-Length";
             if (msg.headers) {
@@ -109,7 +111,7 @@ module.exports = function(RED) {
                 }
             }
             if (msg.hasOwnProperty('followRedirects')) {
-                opts.followRedirects = msg.followRedirects;
+                opts.followRedirect = msg.followRedirects;
                 }
             if (msg.cookies) {
                 var cookies = [];
@@ -134,7 +136,10 @@ module.exports = function(RED) {
                 }
             }
             if (this.credentials && this.credentials.user) {
-                opts.auth = this.credentials.user+":"+(this.credentials.password||"");
+                opts.auth = {
+                    user: this.credentials.user,
+                    pass: this.credentials.password||""
+                };
             }
             var payload = null;
 
@@ -160,6 +165,7 @@ module.exports = function(RED) {
                         opts.headers[clSet] = Buffer.byteLength(payload);
                     }
                 }
+                opts.body = payload;
             }
             // revert to user supplied Capitalisation if needed.
             if (opts.headers.hasOwnProperty('content-type') && (ctSet !== 'content-type')) {
@@ -170,7 +176,6 @@ module.exports = function(RED) {
                 opts.headers[clSet] = opts.headers['content-length'];
                 delete opts.headers['content-length'];
             }
-            var urltotest = url;
             var noproxy;
             if (noprox) {
                 for (var i in noprox) {
@@ -180,22 +185,11 @@ module.exports = function(RED) {
             if (prox && !noproxy) {
                 var match = prox.match(/^(http:\/\/)?(.+)?:([0-9]+)?/i);
                 if (match) {
-                    //opts.protocol = "http:";
-                    //opts.host = opts.hostname = match[2];
-                    //opts.port = (match[3] != null ? match[3] : 80);
-                    opts.headers['Host'] = opts.host;
-                    var heads = opts.headers;
-                    var path = opts.pathname = opts.href;
-                    opts = urllib.parse(prox);
-                    opts.path = opts.pathname = path;
-                    opts.headers = heads;
-                    opts.method = method;
-                    urltotest = match[0];
-                    if (opts.auth) {
-                        opts.headers['Proxy-Authorization'] = "Basic "+new Buffer(opts.auth).toString('Base64')
-                    }
+                    opts.proxy = prox;
+                } else {
+                    node.warn("Bad proxy url: "+ prox);
+                    opts.proxy = null;
                 }
-                else { node.warn("Bad proxy url: "+process.env.http_proxy); }
             }
             if (tlsNode) {
                 tlsNode.addTLSOptions(opts);
@@ -204,42 +198,37 @@ module.exports = function(RED) {
                     opts.rejectUnauthorized = msg.rejectUnauthorized;
                 }
             }
-            var req = ((/^https/.test(urltotest))?https:http).request(opts,function(res) {
-                // Force NodeJs to return a Buffer (instead of a string)
-                // See https://github.com/nodejs/node/issues/6038
-                res.setEncoding(null);
-                delete res._readableState.decoder;
-
-                msg.statusCode = res.statusCode;
-                msg.headers = res.headers;
-                msg.responseUrl = res.responseUrl;
-                msg.payload = [];
-
-                if (msg.headers.hasOwnProperty('set-cookie')) {
-                    msg.responseCookies = {};
-                    msg.headers['set-cookie'].forEach(function(c) {
-                        var parsedCookie = cookie.parse(c);
-                        var eq_idx = c.indexOf('=');
-                        var key = c.substr(0, eq_idx).trim()
-                        parsedCookie.value = parsedCookie[key];
-                        delete parsedCookie[key];
-                        msg.responseCookies[key] = parsedCookie;
-
-                    })
-
-                }
-                msg.headers['x-node-red-request-node'] = hashSum(msg.headers);
-                // msg.url = url;   // revert when warning above finally removed
-                res.on('data',function(chunk) {
-                    if (!Buffer.isBuffer(chunk)) {
-                        // if the 'setEncoding(null)' fix above stops working in
-                        // a new Node.js release, throw a noisy error so we know
-                        // about it.
-                        throw new Error("HTTP Request data chunk not a Buffer");
+            request(opts, function(err, res, body) {
+                if(err){
+                    if(err.code === 'ETIMEDOUT' || err.code === 'ESOCKETTIMEDOUT') {
+                        node.error(RED._("common.notification.errors.no-response"), msg);
+                        node.status({fill:"red", shape:"ring", text:"common.notification.errors.no-response"});
+                    }else{
+                        node.error(err,msg);
+                        node.status({fill:"red", shape:"ring", text:err.code});
                     }
-                    msg.payload.push(chunk);
-                });
-                res.on('end',function() {
+                    msg.payload = err.toString() + " : " + url;
+                    msg.statusCode = err.code;
+                    node.send(msg);
+                }else{
+                    msg.statusCode = res.statusCode;
+                    msg.headers = res.headers;
+                    msg.responseUrl = res.request.uri.href;
+                    msg.payload = body;
+
+                    if (msg.headers.hasOwnProperty('set-cookie')) {
+                        msg.responseCookies = {};
+                        msg.headers['set-cookie'].forEach(function(c) {
+                            var parsedCookie = cookie.parse(c);
+                            var eq_idx = c.indexOf('=');
+                            var key = c.substr(0, eq_idx).trim()
+                            parsedCookie.value = parsedCookie[key];
+                            delete parsedCookie[key];
+                            msg.responseCookies[key] = parsedCookie;
+                        });
+                    }
+                    msg.headers['x-node-red-request-node'] = hashSum(msg.headers);
+                    // msg.url = url;   // revert when warning above finally removed
                     if (node.metric()) {
                         // Calculate request time
                         var diff = process.hrtime(preRequestTimestamp);
@@ -251,44 +240,19 @@ module.exports = function(RED) {
                         }
                     }
 
-                    // Check that msg.payload is an array - if the req error
-                    // handler has been called, it will have been set to a string
-                    // and the error already handled - so no further action should
-                    // be taken. #1344
-                    if (Array.isArray(msg.payload)) {
-                        // Convert the payload to the required return type
-                        msg.payload = Buffer.concat(msg.payload); // bin
-                        if (node.ret !== "bin") {
-                            msg.payload = msg.payload.toString('utf8'); // txt
+                    // Convert the payload to the required return type
+                    if (node.ret !== "bin") {
+                        msg.payload = msg.payload.toString('utf8'); // txt
 
-                            if (node.ret === "obj") {
-                                try { msg.payload = JSON.parse(msg.payload); } // obj
-                                catch(e) { node.warn(RED._("httpin.errors.json-error")); }
-                            }
+                        if (node.ret === "obj") {
+                            try { msg.payload = JSON.parse(msg.payload); } // obj
+                            catch(e) { node.warn(RED._("httpin.errors.json-error")); }
                         }
-                        node.status({});
-                        node.send(msg);
                     }
-                });
+                    node.status({});
+                    node.send(msg);
+                }
             });
-            req.setTimeout(node.reqTimeout, function() {
-                node.error(RED._("common.notification.errors.no-response"),msg);
-                setTimeout(function() {
-                    node.status({fill:"red",shape:"ring",text:"common.notification.errors.no-response"});
-                },10);
-                req.abort();
-            });
-            req.on('error',function(err) {
-                node.error(err,msg);
-                msg.payload = err.toString() + " : " + url;
-                msg.statusCode = err.code;
-                node.status({fill:"red",shape:"ring",text:err.code});
-                node.send(msg);
-            });
-            if (payload) {
-                req.write(payload);
-            }
-            req.end();
         });
 
         this.on("close",function() {
diff --git a/package.json b/package.json
index f90789e43..eb7f30214 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,6 @@
     "cron": "1.3.0",
     "express": "4.16.3",
     "express-session": "1.15.6",
-    "follow-redirects": "1.4.1",
     "fs-extra": "5.0.0",
     "fs.notify": "0.0.4",
     "hash-sum": "1.0.2",
@@ -69,6 +68,7 @@
     "passport-http-bearer": "1.0.1",
     "passport-oauth2-client-password": "0.1.2",
     "raw-body": "2.3.3",
+    "request": "2.87.0",
     "semver": "5.5.0",
     "sentiment": "2.1.0",
     "uglify-js": "3.3.25",
diff --git a/test/nodes/core/io/21-httprequest_spec.js b/test/nodes/core/io/21-httprequest_spec.js
index 4a1b513f0..b35c55d66 100644
--- a/test/nodes/core/io/21-httprequest_spec.js
+++ b/test/nodes/core/io/21-httprequest_spec.js
@@ -825,7 +825,13 @@ describe('HTTP Request Node', function() {
                 var n2 = helper.getNode("n2");
                 n2.on("input", function(msg) {
                     try {
-                        msg.should.have.property('statusCode','ECONNRESET');
+                        msg.should.have.property('statusCode','ESOCKETTIMEDOUT');
+                        var logEvents = helper.log().args.filter(function(evt) {
+                            return evt[0].type == 'http request';
+                        });
+                        logEvents.should.have.length(1);
+                        var tstmp = logEvents[0][0].timestamp;
+                        logEvents[0][0].should.eql({level:helper.log().ERROR, id:'n1',type:'http request',msg:'common.notification.errors.no-response', timestamp:tstmp});
                         done();
                     } catch(err) {
                         done(err);

From a4eb8e11c3df0805ef347eb14ba4c77674638b47 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 23 May 2018 10:25:10 +0100
Subject: [PATCH 014/113] Collapse sidebar tabs

---
 editor/js/ui/common/popover.js              |   8 +-
 editor/js/ui/common/tabs.js                 | 194 ++++++++++++++++----
 editor/js/ui/projects/tab-versionControl.js |   2 +
 editor/js/ui/sidebar.js                     |   7 +-
 editor/js/ui/tab-config.js                  |   3 +-
 editor/js/ui/tab-info.js                    |   2 +
 editor/sass/popover.scss                    |  30 ++-
 editor/sass/tabs.scss                       |  61 +++++-
 nodes/core/core/58-debug.html               |   4 +-
 9 files changed, 269 insertions(+), 42 deletions(-)

diff --git a/editor/js/ui/common/popover.js b/editor/js/ui/common/popover.js
index 6a0bc9fdf..0170f7070 100644
--- a/editor/js/ui/common/popover.js
+++ b/editor/js/ui/common/popover.js
@@ -19,12 +19,14 @@ RED.popover = (function() {
         "default": {
             top: 10,
             leftRight: 17,
-            leftLeft: 25
+            leftLeft: 25,
+            leftBottom: 8,
         },
         "small": {
             top: 5,
             leftRight: 17,
-            leftLeft: 16
+            leftLeft: 16,
+            leftBottom: 3,
         }
     }
     function createPopover(options) {
@@ -69,6 +71,8 @@ RED.popover = (function() {
                     div.css({top: targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top,left:targetPos.left+targetWidth+deltaSizes[size].leftRight});
                 } else if (direction === 'left') {
                     div.css({top: targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top,left:targetPos.left-deltaSizes[size].leftLeft-divWidth});
+                } else if (direction === 'bottom') {
+                    div.css({top: targetPos.top+targetHeight+deltaSizes[size].top,left:targetPos.left+targetWidth/2-divWidth/2 - deltaSizes[size].leftBottom});
                 }
                 if (instant) {
                     div.show();
diff --git a/editor/js/ui/common/tabs.js b/editor/js/ui/common/tabs.js
index f66b95421..23b69f5d1 100644
--- a/editor/js/ui/common/tabs.js
+++ b/editor/js/ui/common/tabs.js
@@ -19,8 +19,10 @@
 RED.tabs = (function() {
     function createTabs(options) {
         var tabs = {};
+        var pinnedTabsCount = 0;
         var currentTabWidth;
         var currentActiveTabWidth = 0;
+        var collapsibleMenu;
 
         var ul = options.element || $("#"+options.id);
         var wrapper = ul.wrap( "<div>" ).parent();
@@ -50,6 +52,55 @@ RED.tabs = (function() {
             scrollRight = $('<div class="red-ui-tab-button red-ui-tab-scroll red-ui-tab-scroll-right"><a href="#" style="display:none;"><i class="fa fa-caret-right"></i></a></div>').appendTo(wrapper).find("a");
             scrollRight.on('mousedown',function(evt) { scrollEventHandler(evt,'+=150') }).on('click',function(evt){ evt.preventDefault();});
         }
+
+        if (options.collapsible) {
+            // var dropDown = $('<div>',{class:"red-ui-tabs-select"}).appendTo(wrapper);
+            // ul.hide();
+            wrapper.addClass("red-ui-tabs-collapsible");
+
+            var collapsedButtonsRow = $('<div class="red-ui-tab-link-buttons"></div>').appendTo(wrapper);
+
+            var selectButton = $('<a href="#"><i class="fa fa-caret-down"></i></a>').appendTo(collapsedButtonsRow);
+            selectButton.addClass("red-ui-tab-link-button-menu")
+            selectButton.click(function(evt) {
+                evt.preventDefault();
+                if (!collapsibleMenu) {
+                    var pinnedOptions = [];
+                    var options = [];
+                    ul.children().each(function(i,el) {
+                        var id = $(el).data('tabId');
+                        var opt = {
+                            id:"red-ui-tabs-menu-option-"+id,
+                            label: tabs[id].name,
+                            onselect: function() {
+                                activateTab(id);
+                            }
+                        };
+                        if (tabs[id].pinned) {
+                            pinnedOptions.push(opt);
+                        } else {
+                            options.push(opt);
+                        }
+                    });
+                    options = pinnedOptions.concat(options);
+                    collapsibleMenu = RED.menu.init({id:"debug-message-option-menu",options: options});
+                    collapsibleMenu.css({
+                        position: "absolute"
+                    })
+                    collapsibleMenu.on('mouseleave', function(){ $(this).hide() });
+                    collapsibleMenu.on('mouseup', function() { $(this).hide() });
+                    collapsibleMenu.appendTo("body");
+                    var elementPos = selectButton.offset();
+                    collapsibleMenu.css({
+                        top: (elementPos.top+selectButton.height()-20)+"px",
+                        left: (elementPos.left - collapsibleMenu.width() + selectButton.width())+"px"
+                    })
+                }
+                collapsibleMenu.toggle();
+            })
+
+        }
+
         function scrollEventHandler(evt,dir) {
             evt.preventDefault();
             if ($(this).hasClass('disabled')) {
@@ -118,6 +169,9 @@ RED.tabs = (function() {
                 ul.children().removeClass("active");
                 ul.children().css({"transition": "width 100ms"});
                 link.parent().addClass("active");
+                var parentId = link.parent().attr('id');
+                wrapper.find(".red-ui-tab-link-button").removeClass("active");
+                $("#"+parentId+"-link-button").addClass("active");
                 if (options.scrollable) {
                     var pos = link.parent().position().left;
                     if (pos-21 < 0) {
@@ -155,41 +209,70 @@ RED.tabs = (function() {
             var tabs = ul.find("li.red-ui-tab");
             var width = wrapper.width();
             var tabCount = tabs.size();
-            var tabWidth = (width-12-(tabCount*6))/tabCount;
-            currentTabWidth = (100*tabWidth/width)+"%";
-            currentActiveTabWidth = currentTabWidth+"%";
-            if (options.scrollable) {
-                tabWidth = Math.max(tabWidth,140);
-                currentTabWidth = tabWidth+"px";
-                currentActiveTabWidth = 0;
-                var listWidth = Math.max(wrapper.width(),12+(tabWidth+6)*tabCount);
-                ul.width(listWidth);
-                updateScroll();
-            } else if (options.hasOwnProperty("minimumActiveTabWidth")) {
-                if (tabWidth < options.minimumActiveTabWidth) {
-                    tabCount -= 1;
-                    tabWidth = (width-12-options.minimumActiveTabWidth-(tabCount*6))/tabCount;
-                    currentTabWidth = (100*tabWidth/width)+"%";
-                    currentActiveTabWidth = options.minimumActiveTabWidth+"px";
+            var tabWidth;
+
+            if (options.collapsible) {
+                tabWidth = width - collapsedButtonsRow.width()-10;
+                if (tabWidth < 198) {
+                    var delta = 198 - tabWidth;
+                    var b = collapsedButtonsRow.find("a:last").prev();
+                    while (b.is(":not(:visible)")) {
+                        b = b.prev();
+                    }
+                    if (!b.hasClass("red-ui-tab-link-button-pinned")) {
+                        b.hide();
+                    }
+                    tabWidth = width - collapsedButtonsRow.width()-10;
                 } else {
-                    currentActiveTabWidth = 0;
+                    var space = width - 198 - collapsedButtonsRow.width();
+                    if (space > 40) {
+                        collapsedButtonsRow.find("a:not(:visible):first").show();
+                        tabWidth = width - collapsedButtonsRow.width()-10;
+                    }
                 }
-            }
-            tabs.css({width:currentTabWidth});
-            if (tabWidth < 50) {
-                ul.find(".red-ui-tab-close").hide();
-                ul.find(".red-ui-tab-icon").hide();
-                ul.find(".red-ui-tab-label").css({paddingLeft:Math.min(12,Math.max(0,tabWidth-38))+"px"})
+                tabs.css({width:tabWidth});
+
             } else {
-                ul.find(".red-ui-tab-close").show();
-                ul.find(".red-ui-tab-icon").show();
-                ul.find(".red-ui-tab-label").css({paddingLeft:""})
-            }
-            if (currentActiveTabWidth !== 0) {
-                ul.find("li.red-ui-tab.active").css({"width":options.minimumActiveTabWidth});
-                ul.find("li.red-ui-tab.active .red-ui-tab-close").show();
-                ul.find("li.red-ui-tab.active .red-ui-tab-icon").show();
-                ul.find("li.red-ui-tab.active .red-ui-tab-label").css({paddingLeft:""})
+                var tabWidth = (width-12-(tabCount*6))/tabCount;
+                currentTabWidth = (100*tabWidth/width)+"%";
+                currentActiveTabWidth = currentTabWidth+"%";
+                if (options.scrollable) {
+                    tabWidth = Math.max(tabWidth,140);
+                    currentTabWidth = tabWidth+"px";
+                    currentActiveTabWidth = 0;
+                    var listWidth = Math.max(wrapper.width(),12+(tabWidth+6)*tabCount);
+                    ul.width(listWidth);
+                    updateScroll();
+                } else if (options.hasOwnProperty("minimumActiveTabWidth")) {
+                    if (tabWidth < options.minimumActiveTabWidth) {
+                        tabCount -= 1;
+                        tabWidth = (width-12-options.minimumActiveTabWidth-(tabCount*6))/tabCount;
+                        currentTabWidth = (100*tabWidth/width)+"%";
+                        currentActiveTabWidth = options.minimumActiveTabWidth+"px";
+                    } else {
+                        currentActiveTabWidth = 0;
+                    }
+                }
+                if (options.collapsible) {
+                    console.log(currentTabWidth);
+                }
+
+                tabs.css({width:currentTabWidth});
+                if (tabWidth < 50) {
+                    ul.find(".red-ui-tab-close").hide();
+                    ul.find(".red-ui-tab-icon").hide();
+                    ul.find(".red-ui-tab-label").css({paddingLeft:Math.min(12,Math.max(0,tabWidth-38))+"px"})
+                } else {
+                    ul.find(".red-ui-tab-close").show();
+                    ul.find(".red-ui-tab-icon").show();
+                    ul.find(".red-ui-tab-label").css({paddingLeft:""})
+                }
+                if (currentActiveTabWidth !== 0) {
+                    ul.find("li.red-ui-tab.active").css({"width":options.minimumActiveTabWidth});
+                    ul.find("li.red-ui-tab.active .red-ui-tab-close").show();
+                    ul.find("li.red-ui-tab.active .red-ui-tab-icon").show();
+                    ul.find("li.red-ui-tab.active .red-ui-tab-label").css({paddingLeft:""})
+                }
             }
 
         }
@@ -210,11 +293,15 @@ RED.tabs = (function() {
                 activateTab(tab.find("a"));
             }
             li.remove();
+            if (tabs[id].pinned) {
+                pinnedTabsCount--;
+            }
             if (options.onremove) {
                 options.onremove(tabs[id]);
             }
             delete tabs[id];
             updateTabWidths();
+            collapsibleMenu = null;
         }
 
         return {
@@ -223,13 +310,55 @@ RED.tabs = (function() {
                 var li = $("<li/>",{class:"red-ui-tab"}).appendTo(ul);
                 li.attr('id',"red-ui-tab-"+(tab.id.replace(".","-")));
                 li.data("tabId",tab.id);
+
+                if (options.maximumTabWidth) {
+                    li.css("maxWidth",options.maximumTabWidth+"px");
+                }
                 var link = $("<a/>",{href:"#"+tab.id, class:"red-ui-tab-label"}).appendTo(li);
                 if (tab.icon) {
                     $('<img src="'+tab.icon+'" class="red-ui-tab-icon"/>').appendTo(link);
+                } else if (tab.iconClass) {
+                    $('<i>',{class:"red-ui-tab-icon "+tab.iconClass}).appendTo(link);
                 }
                 var span = $('<span/>',{class:"bidiAware"}).text(tab.label).appendTo(link);
                 span.attr('dir', RED.text.bidi.resolveBaseTextDir(tab.label));
+                if (options.collapsible) {
+                    li.addClass("red-ui-tab-pinned");
+                    var pinnedLink = $('<a href="#'+tab.id+'" class="red-ui-tab-link-button"></a>');
+                    if (tab.pinned) {
+                        if (pinnedTabsCount === 0) {
+                            pinnedLink.prependTo(collapsedButtonsRow)
+                        } else {
+                            pinnedLink.insertAfter(collapsedButtonsRow.find("a.red-ui-tab-link-button-pinned:last"));
+                        }
+                    } else {
+                        pinnedLink.insertBefore(collapsedButtonsRow.find("a:last"));
+                    }
 
+                    pinnedLink.attr('id',li.attr('id')+"-link-button");
+                    if (tab.iconClass) {
+                        $('<i>',{class:tab.iconClass}).appendTo(pinnedLink);
+                    } else {
+                        $('<i>',{class:"fa fa-lemon-o"}).appendTo(pinnedLink);
+                    }
+                    pinnedLink.click(function(evt) {
+                        evt.preventDefault();
+                        activateTab(tab.id);
+                    });
+                    if (tab.pinned) {
+                        pinnedLink.addClass("red-ui-tab-link-button-pinned");
+                        pinnedTabsCount++;
+                    }
+                    RED.popover.create({
+                        target:$(pinnedLink),
+                        trigger: "hover",
+                        size: "small",
+                        direction: "bottom",
+                        content: tab.name,
+                        delay: { show: 550, hide: 10 }
+                    });
+
+                }
                 link.on("click",onTabClick);
                 link.on("dblclick",onTabDblClick);
                 if (tab.closeable) {
@@ -326,6 +455,7 @@ RED.tabs = (function() {
                         }
                     })
                 }
+                collapsibleMenu = null;
             },
             removeTab: removeTab,
             activateTab: activateTab,
diff --git a/editor/js/ui/projects/tab-versionControl.js b/editor/js/ui/projects/tab-versionControl.js
index 44b602019..4560a56e5 100644
--- a/editor/js/ui/projects/tab-versionControl.js
+++ b/editor/js/ui/projects/tab-versionControl.js
@@ -1003,6 +1003,8 @@ RED.sidebar.versionControl = (function() {
             name: "Project History",
             content: sidebarContent,
             enableOnEdit: false,
+            pinned: true,
+            iconClass: "fa fa-code-fork",
             onchange: function() {
                 setTimeout(function() {
                     sections.resize();
diff --git a/editor/js/ui/sidebar.js b/editor/js/ui/sidebar.js
index 222217668..d9f302885 100644
--- a/editor/js/ui/sidebar.js
+++ b/editor/js/ui/sidebar.js
@@ -35,7 +35,8 @@ RED.sidebar = (function() {
                 tab.onremove.call(tab);
             }
         },
-        minimumActiveTabWidth: 70
+        // minimumActiveTabWidth: 70,
+        collapsible: true
         // scrollable: true
     });
 
@@ -59,6 +60,8 @@ RED.sidebar = (function() {
             options = title;
         }
 
+        delete options.closeable;
+        
         options.wrapper = $('<div>',{style:"height:100%"}).appendTo("#sidebar-content")
         options.wrapper.append(options.content);
         options.wrapper.hide();
@@ -82,6 +85,8 @@ RED.sidebar = (function() {
             group: "sidebar-tabs"
         });
 
+        options.iconClass = options.iconClass || "fa fa-square-o"
+
         knownTabs[options.id] = options;
 
         if (options.visible !== false) {
diff --git a/editor/js/ui/tab-config.js b/editor/js/ui/tab-config.js
index 9a4619b28..00caea6cd 100644
--- a/editor/js/ui/tab-config.js
+++ b/editor/js/ui/tab-config.js
@@ -221,8 +221,7 @@ RED.sidebar.config = (function() {
             name: RED._("sidebar.config.name"),
             content: content,
             toolbar: toolbar,
-            closeable: true,
-            visible: false,
+            iconClass: "fa fa-cog",
             onchange: function() { refreshConfigNodeList(); }
         });
         RED.actions.add("core:show-config-tab",function() {RED.sidebar.show('config')});
diff --git a/editor/js/ui/tab-info.js b/editor/js/ui/tab-info.js
index b4cf87d46..340a6bd74 100644
--- a/editor/js/ui/tab-info.js
+++ b/editor/js/ui/tab-info.js
@@ -83,7 +83,9 @@ RED.sidebar.info = (function() {
             id: "info",
             label: RED._("sidebar.info.label"),
             name: RED._("sidebar.info.name"),
+            iconClass: "fa fa-info",
             content: content,
+            pinned: true,
             enableOnEdit: true
         });
         if (tips.enabled()) {
diff --git a/editor/sass/popover.scss b/editor/sass/popover.scss
index d3c077e6d..691acd5c8 100644
--- a/editor/sass/popover.scss
+++ b/editor/sass/popover.scss
@@ -30,7 +30,6 @@
 }
 
 .red-ui-popover:after, .red-ui-popover:before {
-    top: 50%;
     border: solid transparent;
     content: " ";
     height: 0;
@@ -39,12 +38,18 @@
     pointer-events: none;
 }
 .red-ui-popover.red-ui-popover-right:after, .red-ui-popover.red-ui-popover-right:before {
+    top: 50%;
     right: 100%;
 }
 .red-ui-popover.red-ui-popover-left:after, .red-ui-popover.red-ui-popover-left:before {
+    top: 50%;
     left: 100%;
 }
 
+.red-ui-popover.red-ui-popover-bottom:after, .red-ui-popover.red-ui-popover-bottom:before {
+    bottom: 100%;
+    left: 50%;
+}
 
 .red-ui-popover.red-ui-popover-right:after {
     border-color: rgba(136, 183, 213, 0);
@@ -72,6 +77,21 @@
     margin-top: -11px;
 }
 
+
+.red-ui-popover.red-ui-popover-bottom:after {
+    border-color: rgba(136, 183, 213, 0);
+    border-bottom-color: #fff;
+    border-width: 10px;
+    margin-left: -10px;
+}
+.red-ui-popover.red-ui-popover-bottom:before {
+    border-color: rgba(194, 225, 245, 0);
+    border-bottom-color: $primary-border-color;
+    border-width: 11px;
+    margin-left: -11px;
+}
+
+
 .red-ui-popover-size-small {
     font-size: 11px;
     padding: 5px;
@@ -93,4 +113,12 @@
         border-width: 6px;
         margin-top: -6px;
     }
+    &.red-ui-popover-bottom:after {
+        border-width: 5px;
+        margin-left: -5px;
+    }
+    &.red-ui-popover-bottom:before {
+        border-width: 6px;
+        margin-left: -6px;
+    }
 }
diff --git a/editor/sass/tabs.scss b/editor/sass/tabs.scss
index 4b2dc7f5d..488f4f3c9 100644
--- a/editor/sass/tabs.scss
+++ b/editor/sass/tabs.scss
@@ -93,7 +93,7 @@
                         color: $workspace-button-color-hover;
                     }
                 }
-                .red-ui-tab-icon {
+                img.red-ui-tab-icon {
                     opacity: 0.2;
                 }
             }
@@ -113,6 +113,21 @@
     &.red-ui-tabs-add.red-ui-tabs-scrollable {
         padding-right: 59px;
     }
+    &.red-ui-tabs-collapsible {
+        li:not(.active) {
+            display: none;
+             &.red-ui-tab-pinned {
+                 a {
+                     padding-left: 0;
+                     text-align: center;
+                 }
+                 span {
+                     display: none;
+                 }
+                 width: 32px;
+             }
+        }
+    }
 
     &.red-ui-tabs-vertical {
         box-sizing: border-box;
@@ -157,6 +172,15 @@
             }
         }
     }
+    .red-ui-tabs-select {
+        position: absolute;
+        top:0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        opacity: 0.4;
+        background: red;
+    }
 }
 .red-ui-tab-button {
     position: absolute;
@@ -180,7 +204,33 @@
         z-index: 2;
     }
 }
-
+.red-ui-tab-link-buttons {
+    position: absolute;
+    box-sizing: border-box;
+    top: 0;
+    right: 0;
+    height: 35px;
+    background: #fff;
+    border-bottom: 1px solid $primary-border-color;
+    z-index: 2;
+    a {
+        @include workspace-button;
+        line-height: 26px;
+        height: 28px;
+        width: 28px;
+        margin: 4px 3px 3px;
+        border: 1px solid $primary-border-color;
+        z-index: 2;
+        &.red-ui-tab-link-button {
+            &:not(.active) {
+                background: #eee;
+            }
+        }
+        &.red-ui-tab-link-button-menu {
+            border-color: white;
+        }
+    }
+}
 .red-ui-tab-scroll {
     width: 21px;
     top: 0;
@@ -216,7 +266,7 @@
     right: 38px;
 }
 
-.red-ui-tab-icon {
+img.red-ui-tab-icon {
     margin-left: -8px;
     margin-right: 3px;
     margin-top: -2px;
@@ -225,6 +275,11 @@
     height: 20px;
     vertical-align: middle;
 }
+i.red-ui-tab-icon {
+    opacity: 0.7;
+    width: 18px;
+    height: 20px;
+}
 
 .red-ui-tabs-badges {
     position: absolute;
diff --git a/nodes/core/core/58-debug.html b/nodes/core/core/58-debug.html
index 7317d7064..95b55d7f5 100644
--- a/nodes/core/core/58-debug.html
+++ b/nodes/core/core/58-debug.html
@@ -154,7 +154,9 @@
                 name: this._("debug.sidebar.name"),
                 content: uiComponents.content,
                 toolbar: uiComponents.footer,
-                enableOnEdit: true
+                enableOnEdit: true,
+                pinned: true,
+                iconClass: "fa fa-wrench"
             });
             RED.actions.add("core:show-debug-tab",function() { RED.sidebar.show('debug'); });
 

From 26bc142cc25b03df42759b4bc3d8fe342911726c Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 23 May 2018 10:59:08 +0100
Subject: [PATCH 015/113] Handle loading empty nodesDir

---
 red/runtime/nodes/registry/localfilesystem.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/red/runtime/nodes/registry/localfilesystem.js b/red/runtime/nodes/registry/localfilesystem.js
index b8a516597..b591245d5 100644
--- a/red/runtime/nodes/registry/localfilesystem.js
+++ b/red/runtime/nodes/registry/localfilesystem.js
@@ -88,7 +88,7 @@ function getLocalNodeFiles(dir) {
     try {
         files = fs.readdirSync(dir);
     } catch(err) {
-        return result;
+        return {files: [], icons: []};
     }
     files.sort();
     files.forEach(function(fn) {

From fcbea2629c57250f8abfd31d5f693235b77611dd Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 23 May 2018 22:41:39 +0100
Subject: [PATCH 016/113] Support flow.disabled and .info in /flow API

---
 red/runtime/nodes/flows/index.js | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/red/runtime/nodes/flows/index.js b/red/runtime/nodes/flows/index.js
index d1ba541f5..1b2a87ac0 100644
--- a/red/runtime/nodes/flows/index.js
+++ b/red/runtime/nodes/flows/index.js
@@ -477,11 +477,19 @@ function addFlow(flow) {
     }
     flow.id = redUtil.generateId();
 
-    var nodes = [{
+    var tabNode = {
         type:'tab',
         label:flow.label,
         id:flow.id
-    }];
+    }
+    if (flow.hasOwnProperty('info')) {
+        tabNode.info = flow.info;
+    }
+    if (flow.hasOwnProperty('disabled')) {
+        tabNode.disabled = flow.disabled;
+    }
+
+    var nodes = [tabNode];
 
     for (i=0;i<flow.nodes.length;i++) {
         node = flow.nodes[i];
@@ -534,6 +542,12 @@ function getFlow(id) {
     if (flow.label) {
         result.label = flow.label;
     }
+    if (flow.disabled) {
+        result.disabled = flow.disabled;
+    }
+    if (flow.hasOwnProperty('info')) {
+        result.info = flow.info;
+    }
     if (id !== 'global') {
         result.nodes = [];
     }
@@ -623,6 +637,13 @@ function updateFlow(id,newFlow) {
             label:newFlow.label,
             id:id
         }
+        if (newFlow.hasOwnProperty('info')) {
+            tabNode.info = newFlow.info;
+        }
+        if (newFlow.hasOwnProperty('disabled')) {
+            tabNode.disabled = newFlow.disabled;
+        }
+
         nodes = [tabNode].concat(newFlow.nodes||[]).concat(newFlow.configs||[]);
         nodes.forEach(function(n) {
             n.z = id;

From 83854c28db41d87500341e6ce39ce93521ac2ba9 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Thu, 24 May 2018 12:06:39 +0900
Subject: [PATCH 017/113] fix test failure of icon scan on windows

---
 test/red/runtime/nodes/registry/registry_spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/red/runtime/nodes/registry/registry_spec.js b/test/red/runtime/nodes/registry/registry_spec.js
index c5b9f6b5a..3a4a9fc21 100644
--- a/test/red/runtime/nodes/registry/registry_spec.js
+++ b/test/red/runtime/nodes/registry/registry_spec.js
@@ -563,7 +563,7 @@ describe("red/nodes/registry/registry",function() {
                 }
             },icons: [{path:testIcon,icons:['test_icon.png']}]});
             var iconPath = typeRegistry.getNodeIconPath('test-module','test_icon.png');
-            iconPath.should.eql(testIcon+"/test_icon.png");
+            iconPath.should.eql(path.resolve(testIcon+"/test_icon.png"));
         });
 
         it('returns the debug icon when getting an unknown module', function() {

From 3df3d6f5162ea7598f2721354133a5d763ead1fb Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Thu, 24 May 2018 10:02:51 +0100
Subject: [PATCH 018/113] add debug to trigger test to help work out fails

---
 test/nodes/core/core/89-trigger_spec.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/nodes/core/core/89-trigger_spec.js b/test/nodes/core/core/89-trigger_spec.js
index fb1b1df9a..d07ab2a9b 100644
--- a/test/nodes/core/core/89-trigger_spec.js
+++ b/test/nodes/core/core/89-trigger_spec.js
@@ -428,13 +428,14 @@ describe('trigger node', function() {
             n2.on("input", function(msg) {
                 try {
                     if (c === 0) {
+                        console.log(c,Date.now() - ss,msg);
                         msg.should.have.a.property("payload", "Hello");
                         c += 1;
                     }
                     else {
+                        console.log(c,Date.now() - ss,msg);
                         msg.should.have.a.property("payload", "World");
-                        //console.log(Date.now() - ss);
-                        (Date.now() - ss).should.be.greaterThan(140);
+                        (Date.now() - ss).should.be.greaterThan(150);
                         done();
                     }
                 }
@@ -444,7 +445,7 @@ describe('trigger node', function() {
             n1.emit("input", {payload:"Hello"});
             setTimeout( function() {
                 n1.emit("input", {payload:"Error"});
-            },20);
+            },30);
             setTimeout( function() {
                 n1.emit("input", {payload:"World"});
             },150);

From a5c00b5c81fd5c3c7f8877c602d4b2dd49458aeb Mon Sep 17 00:00:00 2001
From: YumaMatsuura <38545050+YumaMatsuura@users.noreply.github.com>
Date: Fri, 25 May 2018 21:55:03 +0900
Subject: [PATCH 019/113] add translate-user-settings (#1740)

---
 editor/js/ui/projects/projectUserSettings.js | 44 ++++++++++----------
 red/api/editor/locales/en-US/editor.json     | 25 ++++++++++-
 red/api/editor/locales/ja/editor.json        | 25 ++++++++++-
 3 files changed, 70 insertions(+), 24 deletions(-)

diff --git a/editor/js/ui/projects/projectUserSettings.js b/editor/js/ui/projects/projectUserSettings.js
index 4c3840461..a343a07cc 100644
--- a/editor/js/ui/projects/projectUserSettings.js
+++ b/editor/js/ui/projects/projectUserSettings.js
@@ -24,18 +24,18 @@ RED.projects.userSettings = (function() {
         var currentGitSettings = RED.settings.get('git') || {};
         currentGitSettings.user = currentGitSettings.user || {};
 
-        var title = $('<h3></h3>').text("Committer Details").appendTo(pane);
+        var title = $('<h3></h3>').text(RED._("editor:sidebar.project.userSettings.committerDetail")).appendTo(pane);
 
         var gitconfigContainer = $('<div class="user-settings-section"></div>').appendTo(pane);
-        $('<div style="color:#aaa;"></div>').appendTo(gitconfigContainer).text("Leave blank to use system default");
+        $('<div style="color:#aaa;"></div>').appendTo(gitconfigContainer).text(RED._("editor:sidebar.project.userSettings.committer-tip"));
 
         var row = $('<div class="user-settings-row"></div>').appendTo(gitconfigContainer);
-        $('<label for=""></label>').text('Username').appendTo(row);
+        $('<label for=""></label>').text(RED._("editor:sidebar.project.userSettings.userName")).appendTo(row);
         gitUsernameInput = $('<input type="text">').appendTo(row);
         gitUsernameInput.val(currentGitSettings.user.name||"");
 
         row = $('<div class="user-settings-row"></div>').appendTo(gitconfigContainer);
-        $('<label for=""></label>').text('Email').appendTo(row);
+        $('<label for=""></label>').text(RED._("editor:sidebar.project.userSettings.email")).appendTo(row);
         gitEmailInput = $('<input type="text">').appendTo(row);
         gitEmailInput.val(currentGitSettings.user.email||"");
     }
@@ -44,10 +44,10 @@ RED.projects.userSettings = (function() {
     function createSSHKeySection(pane) {
         var container = $('<div class="user-settings-section"></div>').appendTo(pane);
         var popover;
-        var title = $('<h3></h3>').text("SSH Keys").appendTo(container);
-        var subtitle = $('<div style="color:#aaa;"></div>').appendTo(container).text("Allows you to create secure connections to remote git repositories.");
+        var title = $('<h3></h3>').text(RED._("editor:sidebar.project.userSettings.sshKeys")).appendTo(container);
+        var subtitle = $('<div style="color:#aaa;"></div>').appendTo(container).text(RED._("editor:sidebar.project.userSettings.sshKeys-tip"));
 
-        var addKeyButton = $('<button id="user-settings-gitconfig-add-key" class="editor-button editor-button-small" style="float: right; margin-right: 10px;">add key</button>')
+        var addKeyButton = $('<button id="user-settings-gitconfig-add-key" class="editor-button editor-button-small" style="float: right; margin-right: 10px;">'+RED._("editor:sidebar.project.userSettings.add")+'</button>')
             .appendTo(subtitle)
             .click(function(evt) {
                 addKeyButton.attr('disabled',true);
@@ -72,9 +72,9 @@ RED.projects.userSettings = (function() {
                 var validPassphrase = passphrase.length === 0 || passphrase.length >= 8;
                 passphraseInput.toggleClass('input-error',!validPassphrase);
                 if (!validPassphrase) {
-                    passphraseInputSubLabel.text("Passphrase too short");
+                    passphraseInputSubLabel.text(RED._("editor:sidebar.project.userSettings.passphrase-short"));
                 } else if (passphrase.length === 0) {
-                    passphraseInputSubLabel.text("Optional");
+                    passphraseInputSubLabel.text(RED._("editor:sidebar.project.userSettings.optional"));
                 } else {
                     passphraseInputSubLabel.text("");
                 }
@@ -91,11 +91,11 @@ RED.projects.userSettings = (function() {
 
         var row = $('<div class="user-settings-row"></div>').appendTo(container);
         var addKeyDialog = $('<div class="projects-dialog-list-dialog"></div>').hide().appendTo(row);
-        $('<div class="projects-dialog-list-dialog-header">').text('Add SSH Key').appendTo(addKeyDialog);
+        $('<div class="projects-dialog-list-dialog-header">').text(RED._("editor:sidebar.project.userSettings.add-sshKey")).appendTo(addKeyDialog);
         var addKeyDialogBody = $('<div>').appendTo(addKeyDialog);
 
         row = $('<div class="user-settings-row"></div>').appendTo(addKeyDialogBody);
-        $('<div style="color:#aaa;"></div>').appendTo(row).text("Generate a new public/private key pair");
+        $('<div style="color:#aaa;"></div>').appendTo(row).text(RED._("editor:sidebar.project.userSettings.add-sshKey-tip"));
         // var bg = $('<div></div>',{class:"button-group", style:"text-align: center"}).appendTo(row);
         // var addLocalButton = $('<button class="editor-button toggle selected">use local key</button>').appendTo(bg);
         // var uploadButton = $('<button class="editor-button toggle">upload key</button>').appendTo(bg);
@@ -125,19 +125,19 @@ RED.projects.userSettings = (function() {
 
 
         row = $('<div class="user-settings-row"></div>').appendTo(addKeyDialogBody);
-        $('<label for=""></label>').text('Name').appendTo(row);
+        $('<label for=""></label>').text(RED._("editor:sidebar.project.userSettings.name")).appendTo(row);
         var keyNameInputChanged = false;
         var keyNameInput = $('<input type="text">').appendTo(row).on("change keyup paste",function() {
             keyNameInputChanged = true;
             validateForm();
         });
-        $('<label class="projects-edit-form-sublabel"><small>Must contain only A-Z 0-9 _ -</small></label>').appendTo(row).find("small");
+        $('<label class="projects-edit-form-sublabel"><small>'+RED._("editor:sidebar.project.userSettings.nameRule")+'</small></label>').appendTo(row).find("small");
 
         var generateKeyPane = $('<div>').appendTo(addKeyDialogBody);
         row = $('<div class="user-settings-row"></div>').appendTo(generateKeyPane);
-        $('<label for=""></label>').text('Passphrase').appendTo(row);
+        $('<label for=""></label>').text(RED._("editor:sidebar.project.userSettings.passphrase")).appendTo(row);
         var passphraseInput = $('<input type="password">').appendTo(row).on("change keyup paste",validateForm);
-        var passphraseInputSubLabel = $('<label class="projects-edit-form-sublabel"><small>Optional</small></label>').appendTo(row).find("small");
+        var passphraseInputSubLabel = $('<label class="projects-edit-form-sublabel"><small>'+RED._("editor:sidebar.project.userSettings.optional")+'</small></label>').appendTo(row).find("small");
 
         // var addLocalKeyPane = $('<div>').hide().appendTo(addKeyDialogBody);
         // row = $('<div class="user-settings-row"></div>').appendTo(addLocalKeyPane);
@@ -179,13 +179,13 @@ RED.projects.userSettings = (function() {
             }
         }
         var formButtons = $('<span class="button-row" style="position: relative; float: right; margin: 10px;"></span>').appendTo(addKeyDialog);
-        $('<button class="editor-button">Cancel</button>')
+        $('<button class="editor-button">'+RED._("editor:sidebar.project.userSettings.cancel")+'</button>')
             .appendTo(formButtons)
             .click(function(evt) {
                 evt.preventDefault();
                 hideEditForm();
             });
-        var saveButton = $('<button class="editor-button">Generate key</button>')
+        var saveButton = $('<button class="editor-button">'+RED._("editor:sidebar.project.userSettings.generate")+'</button>')
             .appendTo(formButtons)
             .click(function(evt) {
                 evt.preventDefault();
@@ -264,7 +264,7 @@ RED.projects.userSettings = (function() {
             utils.sendRequest(options);
 
             var formButtons = $('<span class="button-row" style="position: relative; float: right; margin: 10px;"></span>').appendTo(row);
-            $('<button class="editor-button editor-button-small">Copy public key to clipboard</button>')
+            $('<button class="editor-button editor-button-small">'+RED._("editor:sidebar.project.userSettings.copy-publicKey")+'</button>')
                 .appendTo(formButtons)
                 .click(function(evt) {
                     try {
@@ -289,7 +289,7 @@ RED.projects.userSettings = (function() {
                 var container = $('<div class="projects-dialog-list-entry">').appendTo(row);
                 if (entry.empty) {
                     container.addClass('red-ui-search-empty');
-                    container.text("No SSH keys");
+                    container.text(RED._("editor:sidebar.project.userSettings.no-sshKeys"));
                     return;
                 }
                 var topRow = $('<div class="projects-dialog-ssh-key-header">').appendTo(container);
@@ -313,7 +313,7 @@ RED.projects.userSettings = (function() {
                         .click(function(e) {
                             e.stopPropagation();
                             var spinner = utils.addSpinnerOverlay(row).addClass('projects-dialog-spinner-contain');
-                            var notification = RED.notify("Are you sure you want to delete the SSH key '"+entry.name+"'? This cannot be undone.", {
+                            var notification = RED.notify(RED._("editor:sidebar.project.userSettings.deleteConfirm", {name:entry.name}), {
                                 type: 'warning',
                                 modal: true,
                                 fixed: true,
@@ -326,7 +326,7 @@ RED.projects.userSettings = (function() {
                                         }
                                     },
                                     {
-                                        text: "Delete key",
+                                        text: RED._("editor:sidebar.project.userSettings.delete"),
                                         click: function() {
                                             notification.close();
                                             var url = "settings/user/keys/"+entry.name;
@@ -400,7 +400,7 @@ RED.projects.userSettings = (function() {
         utils = _utils;
         RED.userSettings.add({
             id:'gitconfig',
-            title: "Git config", // TODO: nls
+            title: RED._("editor:sidebar.project.userSettings.git-config"), // TODO: nls
             get: createSettingsPane,
             close: function() {
                 var currentGitSettings = RED.settings.get('git') || {};
diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json
index d827ba092..dfcef21a6 100644
--- a/red/api/editor/locales/en-US/editor.json
+++ b/red/api/editor/locales/en-US/editor.json
@@ -434,7 +434,30 @@
             "dependencies": "Dependencies",
             "settings": "Settings",
             "editDescription": "Edit project description",
-            "editDependencies": "Edit project dependencies"
+            "editDependencies": "Edit project dependencies",
+            "userSettings": {
+                "committerDetail": "Committer Details",
+                "committer-tip": "Leave blank to use system default",
+                "userName": "Username",
+                "email": "Email",
+                "sshKeys": "SSH Keys",
+                "sshKeys-tip": "Allows you to create secure connections to remote git repositories.",
+                "add": "add key",
+                "add-sshKey": "Add SSH Key",
+                "add-sshKey-tip": "Generate a new public/private key pair",
+                "name": "Name",
+                "nameRule": "Must contain only A-Z 0-9 _ -",
+                "passphrase": "Passphrase",
+                "passphrase-short": "Passphrase too short",
+                "optional": "Optional",
+                "cancel": "Cancel",
+                "generate": "Generate key",
+                "no-sshKeys": "No SSH keys",
+                "copy-publicKey": "Copy public key to clipboard",
+                "delete": "Delete key",
+                "git-config": "Git config",
+                "deleteConfirm": "Are you sure you want to delete the SSH key __name__? This cannot be undone."
+            } 
         }
     },
     "typedInput": {
diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json
index 68e4fc517..999dc3422 100644
--- a/red/api/editor/locales/ja/editor.json
+++ b/red/api/editor/locales/ja/editor.json
@@ -424,7 +424,30 @@
             "dependencies": "依存関係",
             "settings": "設定",
             "editDescription": "プロジェクトの詳細を編集",
-            "editDependencies": "プロジェクトの依存関係を編集"
+            "editDependencies": "プロジェクトの依存関係を編集",
+            "userSettings": {
+                "committerDetail": "コミッター詳細",
+                "committer-tip": "システムのデフォルトを使用する場合、空白のままにしてください",
+                "userName": "ユーザ名",
+                "email": "メールアドレス",
+                "sshKeys": "SSH キー",
+                "sshKeys-tip": "gitリポジトリへのセキュアな接続を作成できます。",
+                "add": "キーを追加",
+                "add-sshKey": "SSHキーを追加",
+                "add-sshKey-tip": "新しい公開鍵/秘密鍵ペアを生成します",
+                "name": "名前",
+                "nameRule": "A-Z 0-9 _ - のみを含む",
+                "passphrase": "パスフレーズ",
+                "passphrase-short": "パスフレーズが短すぎます",
+                "optional": "任意",
+                "cancel": "中止",
+                "generate": "キーを生成",
+                "no-sshKeys": "SSHキーがありません",
+                "copy-publicKey": "公開鍵をクリップボードにコピー",
+                "delete": "キーを削除",
+                "git-config": "Git設定",
+                "deleteConfirm": "SSHキー __name__ を削除してもよいですか？ 削除したSSHキーを元に戻すことはできません。"
+            }
         }
     },
     "typedInput": {

From c157960846578a50998b2e18bad8da023b5cf471 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 24 May 2018 16:47:51 +0100
Subject: [PATCH 020/113] Change debug sidebar icon

---
 nodes/core/core/58-debug.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nodes/core/core/58-debug.html b/nodes/core/core/58-debug.html
index 95b55d7f5..dc011ebda 100644
--- a/nodes/core/core/58-debug.html
+++ b/nodes/core/core/58-debug.html
@@ -156,7 +156,7 @@
                 toolbar: uiComponents.footer,
                 enableOnEdit: true,
                 pinned: true,
-                iconClass: "fa fa-wrench"
+                iconClass: "fa fa-list-alt"
             });
             RED.actions.add("core:show-debug-tab",function() { RED.sidebar.show('debug'); });
 

From 392ed706fdd4a33333ec35a5a7b7ae49b0130c98 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Sat, 26 May 2018 14:21:30 +0900
Subject: [PATCH 021/113] add i18n support for projects interface and Japanese
 message catalogue

---
 editor/js/ui/projects/projects.js        | 319 +++++++++++------------
 red/api/editor/locales/en-US/editor.json | 168 +++++++++++-
 red/api/editor/locales/ja/editor.json    | 168 +++++++++++-
 3 files changed, 492 insertions(+), 163 deletions(-)

diff --git a/editor/js/ui/projects/projects.js b/editor/js/ui/projects/projects.js
index d7c2787d8..71a19d661 100644
--- a/editor/js/ui/projects/projects.js
+++ b/editor/js/ui/projects/projects.js
@@ -22,18 +22,18 @@ RED.projects = (function() {
     function reportUnexpectedError(error) {
         var notification;
         if (error.error === 'git_missing_user') {
-            notification = RED.notify("<p>You Git client is not configured with a username/email.</p>",{
+            notification = RED.notify("<p>"+RED._("projects.errors.no-username-email")+"</p>",{
                 fixed: true,
                 type:'error',
                 buttons: [
                     {
-                        text: "Cancel",
+                        text: RED._("common.label.cancel"),
                         click: function() {
                             notification.close();
                         }
                     },
                     {
-                        text: "Configure Git client",
+                        text: RED._("projects.config-git"),
                         click: function() {
                             RED.userSettings.show('gitconfig');
                             notification.close();
@@ -43,13 +43,13 @@ RED.projects = (function() {
             })
         } else {
             console.log(error);
-            notification = RED.notify("<p>An unexpected error occurred:</p><p>"+error.message+"</p><small>code: "+error.error+"</small>",{
+            notification = RED.notify("<p>"+RED._("projects.errors.unexpected")+":</p><p>"+error.message+"</p><small>"+RED._("projects.errors.code")+": "+error.error+"</small>",{
                 fixed: true,
                 modal: true,
                 type: 'error',
                 buttons: [
                     {
-                        text: "Close",
+                        text: RED._("common.label.close"),
                         click: function() {
                             notification.close();
                         }
@@ -75,14 +75,14 @@ RED.projects = (function() {
                     migrateProjectHeader.appendTo(container);
 
                     var body = $('<div class="projects-dialog-screen-start-body"></div>').appendTo(container);
-                    $('<p>').text("Hello! We have introduced 'projects' to Node-RED.").appendTo(body);
-                    $('<p>').text("This is a new way for you to manage your flow files and includes version control of your flows.").appendTo(body);
-                    $('<p>').text("To get started you can create your first project or clone an existing project from a git repository.").appendTo(body);
-                    $('<p>').text("If you are not sure, you can skip this for now. You will still be able to create your first project from the 'Projects' menu at any time.").appendTo(body);
+                    $('<p>').text(RED._("projects.welcome.hello")).appendTo(body);
+                    $('<p>').text(RED._("projects.welcome.desc0")).appendTo(body);
+                    $('<p>').text(RED._("projects.welcome.desc1")).appendTo(body);
+                    $('<p>').text(RED._("projects.welcome.desc2")).appendTo(body);
 
                     var row = $('<div style="text-align: center"></div>').appendTo(body);
-                    var createAsEmpty = $('<button data-type="empty" class="editor-button projects-dialog-screen-create-type"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-asterisk"></i><br/>Create Project</button>').appendTo(row);
-                    var createAsClone = $('<button data-type="clone" class="editor-button projects-dialog-screen-create-type"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-git"></i><br/>Clone Repository</button>').appendTo(row);
+                    var createAsEmpty = $('<button data-type="empty" class="editor-button projects-dialog-screen-create-type"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-asterisk"></i><br/>'+RED._("projects.welcome.create")+'</button>').appendTo(row);
+                    var createAsClone = $('<button data-type="clone" class="editor-button projects-dialog-screen-create-type"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-git"></i><br/>'+RED._("projects.welcome.clone")+'</button>').appendTo(row);
 
                     createAsEmpty.click(function(e) {
                         e.preventDefault();
@@ -105,7 +105,7 @@ RED.projects = (function() {
                 buttons: [
                     {
                         // id: "clipboard-dialog-cancel",
-                        text: "Not right now",
+                        text: RED._("projects.welcome.not-right-now"),
                         click: function() {
                             createProjectOptions = {};
                             $( this ).dialog( "close" );
@@ -139,23 +139,23 @@ RED.projects = (function() {
                         migrateProjectHeader.appendTo(container);
                         var body = $('<div class="projects-dialog-screen-start-body"></div>').appendTo(container);
 
-                        $('<p>').text("Setup your version control client").appendTo(body);
-                        $('<p>').text("Node-RED uses the open source tool Git for version control. It tracks changes to your project files and lets you push them to remote repositories.").appendTo(body);
-                        $('<p>').text("When you commit a set of changes, Git records who made the changes with a username and email address. The Username can be anything you want - it does not need to be your real name.").appendTo(body);
+                        $('<p>').text(RED._("projects.git-config.setup")).appendTo(body);
+                        $('<p>').text(RED._("projects.git-config.desc0")).appendTo(body);
+                        $('<p>').text(RED._("projects.git-config.desc1")).appendTo(body);
 
                         if (isGlobalConfig) {
-                            $('<p>').text("Your Git client is already configured with the details below.").appendTo(body);
+                            $('<p>').text(RED._("projects.git-config.desc2")).appendTo(body);
                         }
-                        $('<p>').text("You can change these settings later under the 'Git config' tab of the settings dialog.").appendTo(body);
+                        $('<p>').text(RED._("projects.git-config.desc3")).appendTo(body);
 
                         var row = $('<div class="form-row"></div>').appendTo(body);
-                        $('<label for="">Username</label>').appendTo(row);
+                        $('<label for="">'+RED._("projects.git-config.username")+'</label>').appendTo(row);
                         gitUsernameInput = $('<input type="text">').val((existingGitSettings&&existingGitSettings.name)||"").appendTo(row);
                         // $('<div style="position:relative;"></div>').text("This does not need to be your real name").appendTo(row);
                         gitUsernameInput.on("change keyup paste",validateForm);
 
                         row = $('<div class="form-row"></div>').appendTo(body);
-                        $('<label for="">Email</label>').appendTo(row);
+                        $('<label for="">'+RED._("projects.git-config.email")+'</label>').appendTo(row);
                         gitEmailInput = $('<input type="text">').val((existingGitSettings&&existingGitSettings.email)||"").appendTo(row);
                         gitEmailInput.on("change keyup paste",validateForm);
                         // $('<div style="position:relative;"></div>').text("Something something email").appendTo(row);
@@ -168,14 +168,14 @@ RED.projects = (function() {
                     buttons: [
                         {
                             // id: "clipboard-dialog-cancel",
-                            text: "Back",
+                            text: RED._("common.label.back"),
                             click: function() {
                                 show('welcome');
                             }
                         },
                         {
                             id: "projects-dialog-git-config",
-                            text: "Next", // TODO: nls
+                            text: RED._("common.label.next"),
                             class: "primary",
                             click: function() {
                                 var currentGitSettings = RED.settings.get('git') || {};
@@ -216,10 +216,10 @@ RED.projects = (function() {
                         migrateProjectHeader.appendTo(container);
                         var body = $('<div class="projects-dialog-screen-start-body"></div>').appendTo(container);
 
-                        $('<p>').text("Create your project").appendTo(body);
-                        $('<p>').text("A project is maintained as a Git repository. It makes it much easier to share your flows with others and to collaborate on them.").appendTo(body);
-                        $('<p>').text("You can create multiple projects and quickly switch between them from the editor.").appendTo(body);
-                        $('<p>').text("To begin, your project needs a name and an optional description.").appendTo(body);
+                        $('<p>').text(RED._("projects.project-details.create")).appendTo(body);
+                        $('<p>').text(RED._("projects.project-details.desc0")).appendTo(body);
+                        $('<p>').text(RED._("projects.project-details.desc1")).appendTo(body);
+                        $('<p>').text(RED._("projects.project-details.desc2")).appendTo(body);
 
                         var validateForm = function() {
                             var projectName = projectNameInput.val();
@@ -236,14 +236,14 @@ RED.projects = (function() {
                                     projectNameValid = false;
                                     valid = false;
                                     if (projectList[projectName]) {
-                                        projectNameSublabel.text("Project already exists");
+                                        projectNameSublabel.text(RED._("projects.project-details.already-exists"));
                                     } else {
-                                        projectNameSublabel.text("Must contain only A-Z 0-9 _ -");
+                                        projectNameSublabel.text(RED._("projects.project-details.must-contain"));
                                     }
                                 } else {
                                     projectNameInput.removeClass("input-error");
                                     $('<i style="margin-top: 8px;" class="fa fa-check"></i>').appendTo(projectNameStatus);
-                                    projectNameSublabel.text("Must contain only A-Z 0-9 _ -");
+                                    projectNameSublabel.text(RED._("projects.project-details.must-contain"));
                                     projectNameValid = true;
                                 }
                                 projectNameLastChecked = projectName;
@@ -253,7 +253,7 @@ RED.projects = (function() {
                         }
 
                         var row = $('<div class="form-row"></div>').appendTo(body);
-                        $('<label for="projects-dialog-screen-create-project-name">Project name</label>').appendTo(row);
+                        $('<label for="projects-dialog-screen-create-project-name">'+RED._("projects.project-details.project-name")+'</label>').appendTo(row);
 
                         var subrow = $('<div style="position:relative;"></div>').appendTo(row);
                         projectNameInput = $('<input id="projects-dialog-screen-create-project-name" type="text"></input>').val(createProjectOptions.name||"").appendTo(subrow);
@@ -283,13 +283,13 @@ RED.projects = (function() {
                                 checkProjectName = null;
                             },300)
                         });
-                        projectNameSublabel = $('<label class="projects-edit-form-sublabel"><small>Must contain only A-Z 0-9 _ -</small></label>').appendTo(row).find("small");
+                        projectNameSublabel = $('<label class="projects-edit-form-sublabel"><small>'+RED._("projects.project-details.must-contain")+'</small></label>').appendTo(row).find("small");
 
                         // Empty Project
                         row = $('<div class="form-row projects-dialog-screen-create-row projects-dialog-screen-create-row-empty"></div>').appendTo(body);
-                        $('<label for="projects-dialog-screen-create-project-desc">Description</label>').appendTo(row);
+                        $('<label for="projects-dialog-screen-create-project-desc">'+RED._("projects.project-details.desc")+'</label>').appendTo(row);
                         projectSummaryInput = $('<input id="projects-dialog-screen-create-project-desc" type="text">').val(createProjectOptions.summary||"").appendTo(row);
-                        $('<label class="projects-edit-form-sublabel"><small>Optional</small></label>').appendTo(row);
+                        $('<label class="projects-edit-form-sublabel"><small>'+RED._("projects.project-details.opt")+'</small></label>').appendTo(row);
 
                         setTimeout(function() {
                             projectNameInput.focus();
@@ -300,7 +300,7 @@ RED.projects = (function() {
                     buttons: function(options) {
                         return [
                             {
-                                text: "Back",
+                                text: RED._("common.label.back"),
                                 click: function() {
                                     show('git-config');
                                 }
@@ -308,7 +308,7 @@ RED.projects = (function() {
                             {
                                 id: "projects-dialog-create-name",
                                 disabled: true,
-                                text: "Next", // TODO: nls
+                                text: RED._("common.label.next"),
                                 class: "primary disabled",
                                 click: function() {
                                     createProjectOptions.name = projectNameInput.val();
@@ -344,8 +344,8 @@ RED.projects = (function() {
                         var container = $('<div class="projects-dialog-screen-start"></div>');
                         migrateProjectHeader.appendTo(container);
                         var body = $('<div class="projects-dialog-screen-start-body"></div>').appendTo(container);
-                        $('<p>').text("Clone a project").appendTo(body);
-                        $('<p>').text("If you already have a git repository containing a project, you can clone it to get started.").appendTo(body);
+                        $('<p>').text(RED._("projects.clone-project.clone")).appendTo(body);
+                        $('<p>').text(RED._("projects.clone-project.desc0")).appendTo(body);
 
                         var projectList = null;
                         var pendingFormValidation = false;
@@ -376,14 +376,14 @@ RED.projects = (function() {
                                     projectNameValid = false;
                                     valid = false;
                                     if (projectList[projectName]) {
-                                        projectNameSublabel.text("Project already exists");
+                                        projectNameSublabel.text(RED._("projects.clone-project.already-exists"));
                                     } else {
-                                        projectNameSublabel.text("Must contain only A-Z 0-9 _ -");
+                                        projectNameSublabel.text(RED._("projects.clone-project.must-contain"));
                                     }
                                 } else {
                                     projectNameInput.removeClass("input-error");
                                     $('<i style="margin-top: 8px;" class="fa fa-check"></i>').appendTo(projectNameStatus);
-                                    projectNameSublabel.text("Must contain only A-Z 0-9 _ -");
+                                    projectNameSublabel.text(RED._("projects.clone-project.must-contain"));
                                     projectNameValid = true;
                                 }
                                 projectNameLastChecked = projectName;
@@ -395,7 +395,7 @@ RED.projects = (function() {
                             // var validRepo = /^(?:file|git|ssh|https?|[\d\w\.\-_]+@[\w\.]+):(?:\/\/)?[\w\.@:\/~_-]+(?:\/?|\#[\d\w\.\-_]+?)$/.test(repo);
                             var validRepo = repo.length > 0 && !/\s/.test(repo);
                             if (/^https?:\/\/[^/]+@/i.test(repo)) {
-                                $("#projects-dialog-screen-create-project-repo-label small").text("Do not include the username/password in the url");
+                                $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.clone-project.no-info-in-url"));
                                 validRepo = false;
                             }
                             if (!validRepo) {
@@ -426,7 +426,7 @@ RED.projects = (function() {
                         var row;
 
                         row = $('<div class="form-row projects-dialog-screen-create-row projects-dialog-screen-create-row-empty projects-dialog-screen-create-row-clone"></div>').appendTo(body);
-                        $('<label for="projects-dialog-screen-create-project-name">Project name</label>').appendTo(row);
+                        $('<label for="projects-dialog-screen-create-project-name">'+RED._("projects.clone-project.project-name")+'</label>').appendTo(row);
 
                         var subrow = $('<div style="position:relative;"></div>').appendTo(row);
                         projectNameInput = $('<input id="projects-dialog-screen-create-project-name" type="text"></input>').appendTo(subrow);
@@ -456,19 +456,19 @@ RED.projects = (function() {
                                 checkProjectName = null;
                             },300)
                         });
-                        projectNameSublabel = $('<label class="projects-edit-form-sublabel"><small>Must contain only A-Z 0-9 _ -</small></label>').appendTo(row).find("small");
+                        projectNameSublabel = $('<label class="projects-edit-form-sublabel"><small>'+RED._("projects.clone-project.must-contain")+'</small></label>').appendTo(row).find("small");
 
                         row = $('<div class="form-row projects-dialog-screen-create-row projects-dialog-screen-create-row-clone"></div>').appendTo(body);
-                        $('<label for="projects-dialog-screen-create-project-repo">Git repository URL</label>').appendTo(row);
+                        $('<label for="projects-dialog-screen-create-project-repo">'+RED._("projects.clone-project.git-url")+'</label>').appendTo(row);
                         projectRepoInput = $('<input id="projects-dialog-screen-create-project-repo" type="text" placeholder="https://git.example.com/path/my-project.git"></input>').appendTo(row);
-                        $('<label id="projects-dialog-screen-create-project-repo-label" class="projects-edit-form-sublabel"><small>https://, ssh:// or file://</small></label>').appendTo(row);
+                        $('<label id="projects-dialog-screen-create-project-repo-label" class="projects-edit-form-sublabel"><small>'+RED._("projects.clone-project.protocols")+'</small></label>').appendTo(row);
                         var projectRepoChanged = false;
                         var lastProjectRepo = "";
                         projectRepoInput.on("change keyup paste",function() {
                             projectRepoChanged = true;
                             var repo = $(this).val();
                             if (lastProjectRepo !== repo) {
-                                $("#projects-dialog-screen-create-project-repo-label small").text("https://, ssh:// or file://");
+                                $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.clone-project.protocols"));
                             }
                             lastProjectRepo = repo;
 
@@ -486,24 +486,24 @@ RED.projects = (function() {
 
                         var cloneAuthRows = $('<div class="projects-dialog-screen-create-row"></div>').appendTo(body);
                         row = $('<div class="form-row projects-dialog-screen-create-row-auth-error"></div>').hide().appendTo(cloneAuthRows);
-                        $('<div><i class="fa fa-warning"></i> Authentication failed</div>').appendTo(row);
+                        $('<div><i class="fa fa-warning"></i> '+RED._("projects.clone-project.auth-failed")+'</div>').appendTo(row);
 
                         // Repo credentials - username/password ----------------
                         row = $('<div class="hide form-row projects-dialog-screen-create-row-creds"></div>').hide().appendTo(cloneAuthRows);
 
                         var subrow = $('<div style="width: calc(50% - 10px); display:inline-block;"></div>').appendTo(row);
-                        $('<label for="projects-dialog-screen-create-project-repo-user">Username</label>').appendTo(subrow);
+                        $('<label for="projects-dialog-screen-create-project-repo-user">'+RED._("projects.clone-project.username")+'</label>').appendTo(subrow);
                         projectRepoUserInput = $('<input id="projects-dialog-screen-create-project-repo-user" type="text"></input>').appendTo(subrow);
 
                         subrow = $('<div style="width: calc(50% - 10px); margin-left: 20px; display:inline-block;"></div>').appendTo(row);
-                        $('<label for="projects-dialog-screen-create-project-repo-pass">Password</label>').appendTo(subrow);
+                        $('<label for="projects-dialog-screen-create-project-repo-pass">'+RED._("projects.clone-project.passwd")+'</label>').appendTo(subrow);
                         projectRepoPasswordInput = $('<input id="projects-dialog-screen-create-project-repo-pass" type="password"></input>').appendTo(subrow);
                         // -----------------------------------------------------
 
                         // Repo credentials - key/passphrase -------------------
                         row = $('<div class="form-row projects-dialog-screen-create-row projects-dialog-screen-create-row-sshkey"></div>').hide().appendTo(cloneAuthRows);
                         subrow = $('<div style="width: calc(50% - 10px); display:inline-block;"></div>').appendTo(row);
-                        $('<label for="projects-dialog-screen-create-project-repo-passphrase">SSH Key</label>').appendTo(subrow);
+                        $('<label for="projects-dialog-screen-create-project-repo-passphrase">'+RED._("projects.clone-project.ssh-key")+'</label>').appendTo(subrow);
                         projectRepoSSHKeySelect = $("<select>",{style:"width: 100%"}).appendTo(subrow);
 
                         $.getJSON("settings/user/keys", function(data) {
@@ -523,14 +523,14 @@ RED.projects = (function() {
                             }
                         });
                         subrow = $('<div style="width: calc(50% - 10px); margin-left: 20px; display:inline-block;"></div>').appendTo(row);
-                        $('<label for="projects-dialog-screen-create-project-repo-passphrase">Passphrase</label>').appendTo(subrow);
+                        $('<label for="projects-dialog-screen-create-project-repo-passphrase">'+RED._("projects.clone-project.passphrase")+'</label>').appendTo(subrow);
                         projectRepoPassphrase = $('<input id="projects-dialog-screen-create-project-repo-passphrase" type="password"></input>').appendTo(subrow);
 
                         subrow = $('<div class="form-row projects-dialog-screen-create-row projects-dialog-screen-create-row-sshkey"></div>').appendTo(cloneAuthRows);
                         var sshwarningRow = $('<div class="projects-dialog-screen-create-row-auth-error-no-keys"></div>').hide().appendTo(subrow);
-                        $('<div class="form-row"><i class="fa fa-warning"></i> Before you can clone a repository over ssh you must add an SSH key to access it.</div>').appendTo(sshwarningRow);
+                        $('<div class="form-row"><i class="fa fa-warning"></i> '+RED._("projects.clone-project.ssh-key-desc")+'</div>').appendTo(sshwarningRow);
                         subrow = $('<div style="text-align: center">').appendTo(sshwarningRow);
-                        $('<button class="editor-button">Add an ssh key</button>').appendTo(subrow).click(function(e) {
+                        $('<button class="editor-button">'+RED._("projects.clone-project.ssh-key-add")+'</button>').appendTo(subrow).click(function(e) {
                             e.preventDefault();
                             $('#projects-dialog-cancel').click();
                             RED.userSettings.show('gitconfig');
@@ -543,7 +543,7 @@ RED.projects = (function() {
 
                         // Secret - clone
                         row = $('<div class="form-row projects-dialog-screen-create-row projects-dialog-screen-create-row-clone"></div>').appendTo(body);
-                        $('<label>Credentials encryption key</label>').appendTo(row);
+                        $('<label>'+RED._("projects.clone-project.credential-key")+'</label>').appendTo(row);
                         projectSecretInput = $('<input type="password"></input>').appendTo(row);
 
 
@@ -553,7 +553,7 @@ RED.projects = (function() {
                     buttons: function(options) {
                         return [
                             {
-                                text: "Back",
+                                text: RED._("common.label.back"),
                                 click: function() {
                                     show('git-config');
                                 }
@@ -561,7 +561,7 @@ RED.projects = (function() {
                             {
                                 id: "projects-dialog-clone-project",
                                 disabled: true,
-                                text: "Clone project", // TODO: nls
+                                text: RED._("common.label.clone"),
                                 class: "primary disabled",
                                 click: function() {
                                     var projectType = $(".projects-dialog-screen-create-type.selected").data('type');
@@ -585,7 +585,7 @@ RED.projects = (function() {
                                             };
                                         }
                                         else {
-                                            console.log("Error! Can't get selected SSH key path.");
+                                            console.log(RED._("projects.clone-project.cant-get-ssh-key"));
                                             return;
                                         }
                                     }
@@ -602,7 +602,7 @@ RED.projects = (function() {
                                     }
 
                                     $(".projects-dialog-screen-create-row-auth-error").hide();
-                                    $("#projects-dialog-screen-create-project-repo-label small").text("https://, ssh:// or file://");
+                                    $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.clone-project.protocols"));
 
                                     projectRepoUserInput.removeClass("input-error");
                                     projectRepoPasswordInput.removeClass("input-error");
@@ -622,22 +622,22 @@ RED.projects = (function() {
                                             },
                                             400: {
                                                 'project_exists': function(error) {
-                                                    console.log("already exists");
+                                                    console.log(RED._("projects.clone-project.already-exists"));
                                                 },
                                                 'git_error': function(error) {
-                                                    console.log("git error",error);
+                                                    console.log(RED._("projects.clone-project.git-error"),error);
                                                 },
                                                 'git_connection_failed': function(error) {
                                                     projectRepoInput.addClass("input-error");
-                                                    $("#projects-dialog-screen-create-project-repo-label small").text("Connection failed");
+                                                    $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.clone-project.connection-failed"));
                                                 },
                                                 'git_not_a_repository': function(error) {
                                                     projectRepoInput.addClass("input-error");
-                                                    $("#projects-dialog-screen-create-project-repo-label small").text("Not a git repository");
+                                                    $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.clone-project.not-git-repo"));
                                                 },
                                                 'git_repository_not_found': function(error) {
                                                     projectRepoInput.addClass("input-error");
-                                                    $("#projects-dialog-screen-create-project-repo-label small").text("Repository not found");
+                                                    $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.clone-project.repo-not-found"));
                                                 },
                                                 'git_auth_failed': function(error) {
                                                     $(".projects-dialog-screen-create-row-auth-error").show();
@@ -689,11 +689,11 @@ RED.projects = (function() {
                         migrateProjectHeader.appendTo(container);
                         var body = $('<div class="projects-dialog-screen-start-body"></div>').appendTo(container);
 
-                        $('<p>').text("Create your project files").appendTo(body);
-                        $('<p>').text("A project contains your flow files, a README file and a package.json file.").appendTo(body);
-                        $('<p>').text("It can contain any other files you want to maintain in the Git repository.").appendTo(body);
+                        $('<p>').text(RED._("projects.default-files.create")).appendTo(body);
+                        $('<p>').text(RED._("projects.default-files.desc0")).appendTo(body);
+                        $('<p>').text(RED._("projects.default-files.desc1")).appendTo(body);
                         if (!options.existingProject && RED.settings.files) {
-                            $('<p>').text("Your existing flow and credential files will be copied into the project.").appendTo(body);
+                            $('<p>').text(RED._("projects.default-files.desc2")).appendTo(body);
                         }
 
                         var validateForm = function() {
@@ -724,7 +724,7 @@ RED.projects = (function() {
                             $("#projects-dialog-create-default-files").prop('disabled',!valid).toggleClass('disabled ui-button-disabled ui-state-disabled',!valid);
                         }
                         var row = $('<div class="form-row"></div>').appendTo(body);
-                        $('<label for="projects-dialog-screen-create-project-file">Flow file</label>').appendTo(row);
+                        $('<label for="projects-dialog-screen-create-project-file">'+RED._("projects.default-files.flow-file")+'</label>').appendTo(row);
                         var subrow = $('<div style="position:relative;"></div>').appendTo(row);
                         var defaultFlowFile = (createProjectOptions.files &&createProjectOptions.files.flow) || (RED.settings.files && RED.settings.files.flow)||"flow.json";
                         projectFlowFileInput = $('<input id="projects-dialog-screen-create-project-file" type="text">').val(defaultFlowFile)
@@ -735,7 +735,7 @@ RED.projects = (function() {
 
                         var defaultCredentialsFile = (createProjectOptions.files &&createProjectOptions.files.credentials) || (RED.settings.files && RED.settings.files.credentials)||"flow_cred.json";
                         row = $('<div class="form-row"></div>').appendTo(body);
-                        $('<label for="projects-dialog-screen-create-project-credfile">Credentials file</label>').appendTo(row);
+                        $('<label for="projects-dialog-screen-create-project-credfile">'+RED._("projects.default-files.credentials-file")+'</label>').appendTo(row);
                         subrow = $('<div style="position:relative;"></div>').appendTo(row);
                         projectCredentialFileInput = $('<div style="width: 100%" class="uneditable-input" id="projects-dialog-screen-create-project-credentials">').text(defaultCredentialsFile)
                             .appendTo(subrow);
@@ -752,7 +752,7 @@ RED.projects = (function() {
                         return [
                             {
                                 // id: "clipboard-dialog-cancel",
-                                text: options.existingProject?"Cancel":"Back",
+                                text: RED._(options.existingProject ? "common.label.cancel": "common.label.back"),
                                 click: function() {
                                     if (options.existingProject) {
                                         $(this).dialog('close');
@@ -763,7 +763,7 @@ RED.projects = (function() {
                             },
                             {
                                 id: "projects-dialog-create-default-files",
-                                text: "Next", // TODO: nls
+                                text: RED._("common.label.next"),
                                 class: "primary",
                                 click: function() {
                                     createProjectOptions.files = {
@@ -789,22 +789,22 @@ RED.projects = (function() {
                         migrateProjectHeader.appendTo(container);
                         var body = $('<div class="projects-dialog-screen-start-body"></div>').appendTo(container);
 
-                        $('<p>').text("Setup encryption of your credentials file").appendTo(body);
+                        $('<p>').text(RED._("projects.encryption-config.setup")).appendTo(body);
                         if (options.existingProject) {
-                            $('<p>').text("Your flow credentials file can be encrypted to keep its contents secure.").appendTo(body);
-                            $('<p>').text("If you want to store these credentials in a public Git repository, you must encrypt them by providing a secret key phrase.").appendTo(body);
+                            $('<p>').text(RED._("projects.encryption-config.desc0")).appendTo(body);
+                            $('<p>').text(RED._("projects.encryption-config.desc1")).appendTo(body);
                         } else {
                             if (RED.settings.flowEncryptionType === 'disabled') {
-                                $('<p>').text("Your flow credentials file is not currently encrypted.").appendTo(body);
-                                $('<p>').text("That means its contents, such as passwords and access tokens, can be read by anyone with access to the file.").appendTo(body);
-                                $('<p>').text("If you want to store these credentials in a public Git repository, you must encrypt them by providing a secret key phrase.").appendTo(body);
+                                $('<p>').text(RED._("projects.encryption-config.desc2")).appendTo(body);
+                                $('<p>').text(RED._("projects.encryption-config.desc3")).appendTo(body);
+                                $('<p>').text(RED._("projects.encryption-config.desc4")).appendTo(body);
                             } else {
                                 if (RED.settings.flowEncryptionType === 'user') {
-                                    $('<p>').text("Your flow credentials file is currently encrypted using the credentialSecret property from your settings file as the key.").appendTo(body);
+                                    $('<p>').text(RED._("projects.encryption-config.desc5")).appendTo(body);
                                 } else if (RED.settings.flowEncryptionType === 'system') {
-                                    $('<p>').text("Your flow credentials file is currently encrypted using a system-generated key. You should provide a new secret key for this project.").appendTo(body);
+                                    $('<p>').text(RED._("projects.encryption-config.desc6")).appendTo(body);
                                 }
-                                $('<p>').text("The key will be stored separately from your project files. You will need to provide the key to use this project in another instance of Node-RED.").appendTo(body);
+                                $('<p>').text(RED._("projects.encryption-config.desc7")).appendTo(body);
                             }
                         }
 
@@ -832,16 +832,16 @@ RED.projects = (function() {
 
 
                         var row = $('<div class="form-row projects-dialog-screen-create-row projects-dialog-screen-create-row-empty"></div>').appendTo(body);
-                        $('<label>Credentials</label>').appendTo(row);
+                        $('<label>'+RED._("projects.encryption-config.credentials")+'</label>').appendTo(row);
 
                         var credentialsBox = $('<div style="width: 550px">').appendTo(row);
                         var credentialsRightBox = $('<div style="min-height:150px; box-sizing: border-box; float: right; vertical-align: top; width: 331px; margin-left: -1px; padding: 15px; margin-top: -15px; border: 1px solid #ccc; border-radius: 3px;  display: inline-block">').appendTo(credentialsBox);
                         var credentialsLeftBox = $('<div style="vertical-align: top; width: 220px;  display: inline-block">').appendTo(credentialsBox);
 
                         var credentialsEnabledBox = $('<div class="form-row" style="padding:  7px 8px 3px 8px;border: 1px solid #ccc;border-radius: 4px;border-top-right-radius: 0;border-bottom-right-radius: 0;border-right-color: white;"></div>').appendTo(credentialsLeftBox);
-                        $('<label class="projects-edit-form-inline-label" style="margin-left: 5px"><input type="radio" style="vertical-align: middle; margin-top:0; margin-right: 10px;" name="projects-encryption-type" value="enabled"> <i style="font-size: 1.4em; margin-right: 8px; vertical-align: middle; color: #888;" class="fa fa-lock"></i> <span style="vertical-align: middle;">Enable encryption</span></label>').appendTo(credentialsEnabledBox);
+                        $('<label class="projects-edit-form-inline-label" style="margin-left: 5px"><input type="radio" style="vertical-align: middle; margin-top:0; margin-right: 10px;" name="projects-encryption-type" value="enabled"> <i style="font-size: 1.4em; margin-right: 8px; vertical-align: middle; color: #888;" class="fa fa-lock"></i> <span style="vertical-align: middle;">'+RED._("projects.encryption-config.enable")+'</span></label>').appendTo(credentialsEnabledBox);
                         var credentialsDisabledBox = $('<div class="form-row" style="padding:  7px 8px 3px 8px;border: 1px solid white;border-radius: 4px;border-top-right-radius: 0;border-bottom-right-radius: 0;border-right-color: #ccc; "></div>').appendTo(credentialsLeftBox);
-                        $('<label class="projects-edit-form-inline-label" style="margin-left: 5px"><input type="radio" style="vertical-align: middle; margin-top:0; margin-right: 10px;" name="projects-encryption-type" value="disabled"> <i style="font-size: 1.4em; margin-right: 8px; vertical-align: middle; color: #888;" class="fa fa-unlock"></i> <span style="vertical-align: middle;">Disable encryption</span></label>').appendTo(credentialsDisabledBox);
+                        $('<label class="projects-edit-form-inline-label" style="margin-left: 5px"><input type="radio" style="vertical-align: middle; margin-top:0; margin-right: 10px;" name="projects-encryption-type" value="disabled"> <i style="font-size: 1.4em; margin-right: 8px; vertical-align: middle; color: #888;" class="fa fa-unlock"></i> <span style="vertical-align: middle;">'+RED._("projects.encryption-config.disable")+'</span></label>').appendTo(credentialsDisabledBox);
 
                         credentialsLeftBox.find("input[name=projects-encryption-type]").click(function(e) {
                             var val = $(this).val();
@@ -876,15 +876,15 @@ RED.projects = (function() {
                         })
 
                         row = $('<div class="form-row projects-encryption-enabled-row"></div>').appendTo(credentialsRightBox);
-                        $('<label class="projects-edit-form-inline-label '+((RED.settings.flowEncryptionType !== 'user')?'disabled':'')+'" style="margin-left: 5px"><input '+((RED.settings.flowEncryptionType !== 'user')?'disabled':'')+' type="radio" style="vertical-align: middle; margin-top:0; margin-right: 10px;" value="default" name="projects-encryption-key"> <span style="vertical-align: middle;">Copy over existing key</span></label>').appendTo(row);
+                        $('<label class="projects-edit-form-inline-label '+((RED.settings.flowEncryptionType !== 'user')?'disabled':'')+'" style="margin-left: 5px"><input '+((RED.settings.flowEncryptionType !== 'user')?RED._("projects.encryption-config.disabled"):'')+' type="radio" style="vertical-align: middle; margin-top:0; margin-right: 10px;" value="default" name="projects-encryption-key"> <span style="vertical-align: middle;">'+RED._("projects.encryption-config.copy")+'</span></label>').appendTo(row);
                         row = $('<div class="form-row projects-encryption-enabled-row"></div>').appendTo(credentialsRightBox);
-                        $('<label class="projects-edit-form-inline-label" style="margin-left: 5px"><input type="radio" style="vertical-align: middle; margin-top:0; margin-right: 10px;" value="custom" name="projects-encryption-key"> <span style="vertical-align: middle;">Use custom key</span></label>').appendTo(row);
+                        $('<label class="projects-edit-form-inline-label" style="margin-left: 5px"><input type="radio" style="vertical-align: middle; margin-top:0; margin-right: 10px;" value="custom" name="projects-encryption-key"> <span style="vertical-align: middle;">'+RED._("projects.encryption-config.use-custom")+'</span></label>').appendTo(row);
                         row = $('<div class="projects-encryption-enabled-row"></div>').appendTo(credentialsRightBox);
                         emptyProjectCredentialInput = $('<input disabled type="password" style="margin-left: 25px; width: calc(100% - 30px);"></input>').appendTo(row);
                         emptyProjectCredentialInput.on("change keyup paste", validateForm);
 
                         row = $('<div class="form-row projects-encryption-disabled-row"></div>').hide().appendTo(credentialsRightBox);
-                        $('<div class="" style="padding: 5px 20px;"><i class="fa fa-warning"></i> The credentials file will not be encrypted and its contents easily read</div>').appendTo(row);
+                        $('<div class="" style="padding: 5px 20px;"><i class="fa fa-warning"></i> '+RED._("projects.encryption-config.desc8")+'</div>').appendTo(row);
 
                         credentialsRightBox.find("input[name=projects-encryption-key]").click(function() {
                             var val = $(this).val();
@@ -911,14 +911,14 @@ RED.projects = (function() {
                             return [
                             {
                                 // id: "clipboard-dialog-cancel",
-                                text: "Back",
+                                text: RED._("common.label.back"),
                                 click: function() {
                                     show('default-files',options);
                                 }
                             },
                             {
                                 id: "projects-dialog-create-encryption",
-                                text: options.existingProject?"Create project files":"Create project", // TODO: nls
+                                text: RED._(options.existingProject?"projects.encryption-config.create-project-files":"projects.encryption-config.create-project"),
                                 class: "primary disabled",
                                 disabled: true,
                                 click: function() {
@@ -966,10 +966,10 @@ RED.projects = (function() {
                                             },
                                             400: {
                                                 'project_exists': function(error) {
-                                                    console.log("already exists");
+                                                    console.log(RED._("projects.encryption-config.already-exists"));
                                                 },
                                                 'git_error': function(error) {
-                                                    console.log("git error",error);
+                                                    console.log(RED._("projects.encryption-config.git-error"),error);
                                                 },
                                                 'git_connection_failed': function(error) {
                                                     projectRepoInput.addClass("input-error");
@@ -978,7 +978,7 @@ RED.projects = (function() {
                                                     projectRepoUserInput.addClass("input-error");
                                                     projectRepoPasswordInput.addClass("input-error");
                                                     // getRepoAuthDetails(req);
-                                                    console.log("git auth error",error);
+                                                    console.log(RED._("projects.encryption-config.git-auth-error"),error);
                                                 },
                                                 '*': function(error) {
                                                     reportUnexpectedError(error);
@@ -1004,19 +1004,16 @@ RED.projects = (function() {
                     migrateProjectHeader.appendTo(container);
                     var body = $('<div class="projects-dialog-screen-start-body"></div>').appendTo(container);
 
-                    $('<p>').text("You have successfully created your first project!").appendTo(body);
-                    $('<p>').text("You can now continue to use Node-RED just as you always have.").appendTo(body);
-                    $('<p>').text("The 'info' tab in the sidebar shows you what your current active project is. "+
-                    "The button next to the name can be used to access the project settings view.").appendTo(body);
-                    $('<p>').text("The 'history' tab in the sidebar can be used to view files that have changed "+
-                    "in your project and to commit them. It shows you a complete history of your commits and "+
-                    "allows you to push your changes to a remote repository.").appendTo(body);
+                    $('<p>').text(RED._("projects.create-success.success")).appendTo(body);
+                    $('<p>').text(RED._("projects.create-success.desc0")).appendTo(body);
+                    $('<p>').text(RED._("projects.create-success.desc1")).appendTo(body);
+                    $('<p>').text(RED._("projects.create-success.desc2")).appendTo(body);
 
                     return container;
                 },
                 buttons: [
                     {
-                        text: "Done",
+                        text: RED._("common.label.done"),
                         click: function() {
                             $( this ).dialog( "close" );
                         }
@@ -1043,7 +1040,7 @@ RED.projects = (function() {
                 var selectedProject;
 
                 return {
-                    title: "Projects", // TODO: NLS
+                    title: RED._("projects.create.projects"),
                     content: function(options) {
                         var projectList = null;
                         selectedProject = null;
@@ -1077,14 +1074,14 @@ RED.projects = (function() {
                                     projectNameValid = false;
                                     valid = false;
                                     if (projectList[projectName]) {
-                                        projectNameSublabel.text("Project already exists");
+                                        projectNameSublabel.text(RED._("projects.create.already-exists"));
                                     } else {
-                                        projectNameSublabel.text("Must contain only A-Z 0-9 _ -");
+                                        projectNameSublabel.text(RED._("projects.create.must-contain"));
                                     }
                                 } else {
                                     projectNameInput.removeClass("input-error");
                                     $('<i style="margin-top: 8px;" class="fa fa-check"></i>').appendTo(projectNameStatus);
-                                    projectNameSublabel.text("Must contain only A-Z 0-9 _ -");
+                                    projectNameSublabel.text(RED._("projects.create.must-contain"));
                                     projectNameValid = true;
                                 }
                                 projectNameLastChecked = projectName;
@@ -1102,7 +1099,7 @@ RED.projects = (function() {
                                 // var validRepo = /^(?:file|git|ssh|https?|[\d\w\.\-_]+@[\w\.]+):(?:\/\/)?[\w\.@:\/~_-]+(?:\/?|\#[\d\w\.\-_]+?)$/.test(repo);
                                 var validRepo = repo.length > 0 && !/\s/.test(repo);
                                 if (/^https?:\/\/[^/]+@/i.test(repo)) {
-                                    $("#projects-dialog-screen-create-project-repo-label small").text("Do not include the username/password in the url");
+                                    $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.create.no-info-in-url"));
                                     validRepo = false;
                                 }
                                 if (!validRepo) {
@@ -1159,10 +1156,10 @@ RED.projects = (function() {
 
                         row = $('<div class="form-row button-group"></div>').appendTo(container);
 
-                        var openProject = $('<button data-type="open" class="editor-button projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-folder-open"></i><br/>Open Project</button>').appendTo(row);
-                        var createAsEmpty = $('<button data-type="empty" class="editor-button projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-asterisk"></i><br/>Create Project</button>').appendTo(row);
+                        var openProject = $('<button data-type="open" class="editor-button projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-folder-open"></i><br/>'+RED._("projects.create.open")+'</button>').appendTo(row);
+                        var createAsEmpty = $('<button data-type="empty" class="editor-button projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-asterisk"></i><br/>'+RED._("projects.create.create")+'</button>').appendTo(row);
                         // var createAsCopy = $('<button data-type="copy" class="editor-button projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i class="fa fa-long-arrow-right fa-2x"></i><i class="fa fa-archive fa-2x"></i><br/>Copy existing</button>').appendTo(row);
-                        var createAsClone = $('<button data-type="clone" class="editor-button projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-git"></i><br/>Clone Repository</button>').appendTo(row);
+                        var createAsClone = $('<button data-type="clone" class="editor-button projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-git"></i><br/>'+RED._("projects.create.clone")+'</button>').appendTo(row);
                         // var createAsClone = $('<button data-type="clone" class="editor-button projects-dialog-screen-create-type toggle"><i class="fa fa-git fa-2x"></i><i class="fa fa-arrows-h fa-2x"></i><i class="fa fa-archive fa-2x"></i><br/>Clone Repository</button>').appendTo(row);
                         row.find(".projects-dialog-screen-create-type").click(function(evt) {
                             evt.preventDefault();
@@ -1173,9 +1170,9 @@ RED.projects = (function() {
                             validateForm();
                             projectNameInput.focus();
                             switch ($(this).data('type')) {
-                                case "open": $("#projects-dialog-create").text("Open project"); break;
-                                case "empty": $("#projects-dialog-create").text("Create project"); break;
-                                case "clone": $("#projects-dialog-create").text("Clone project"); break;
+                                case "open": $("#projects-dialog-create").text(RED._("projects.create.open")); break;
+                                case "empty": $("#projects-dialog-create").text(RED._("projects.create.create")); break;
+                                case "clone": $("#projects-dialog-create").text(RED._("projects.create.clone")); break;
                             }
                         })
 
@@ -1201,7 +1198,7 @@ RED.projects = (function() {
                         }).appendTo(row);
 
                         row = $('<div class="form-row projects-dialog-screen-create-row projects-dialog-screen-create-row-empty projects-dialog-screen-create-row-clone"></div>').appendTo(container);
-                        $('<label for="projects-dialog-screen-create-project-name">Project name</label>').appendTo(row);
+                        $('<label for="projects-dialog-screen-create-project-name">'+RED._("projects.create.project-name")+'</label>').appendTo(row);
 
                         var subrow = $('<div style="position:relative;"></div>').appendTo(row);
                         projectNameInput = $('<input id="projects-dialog-screen-create-project-name" type="text"></input>').appendTo(subrow);
@@ -1231,16 +1228,16 @@ RED.projects = (function() {
                                 checkProjectName = null;
                             },300)
                         });
-                        projectNameSublabel = $('<label class="projects-edit-form-sublabel"><small>Must contain only A-Z 0-9 _ -</small></label>').appendTo(row).find("small");
+                        projectNameSublabel = $('<label class="projects-edit-form-sublabel"><small>'+RED._("projects.create.must-contain")+'</small></label>').appendTo(row).find("small");
 
                         // Empty Project
                         row = $('<div class="form-row projects-dialog-screen-create-row projects-dialog-screen-create-row-empty"></div>').appendTo(container);
-                        $('<label for="projects-dialog-screen-create-project-desc">Description</label>').appendTo(row);
+                        $('<label for="projects-dialog-screen-create-project-desc">'+RED._("projects.create.desc")+'</label>').appendTo(row);
                         projectSummaryInput = $('<input id="projects-dialog-screen-create-project-desc" type="text">').appendTo(row);
-                        $('<label class="projects-edit-form-sublabel"><small>Optional</small></label>').appendTo(row);
+                        $('<label class="projects-edit-form-sublabel"><small>'+RED._("projects.create.opt")+'</small></label>').appendTo(row);
 
                         row = $('<div class="form-row projects-dialog-screen-create-row projects-dialog-screen-create-row-empty"></div>').appendTo(container);
-                        $('<label for="projects-dialog-screen-create-project-file">Flow file</label>').appendTo(row);
+                        $('<label for="projects-dialog-screen-create-project-file">'+RED._("projects.create.flow-file")+'</label>').appendTo(row);
                         subrow = $('<div style="position:relative;"></div>').appendTo(row);
                         projectFlowFileInput = $('<input id="projects-dialog-screen-create-project-file" type="text">').val("flow.json")
                             .on("change keyup paste",validateForm)
@@ -1249,16 +1246,16 @@ RED.projects = (function() {
                         $('<label class="projects-edit-form-sublabel"><small>*.json</small></label>').appendTo(row);
 
                         row = $('<div class="form-row projects-dialog-screen-create-row projects-dialog-screen-create-row-empty"></div>').appendTo(container);
-                        $('<label>Credentials</label>').appendTo(row);
+                        $('<label>'+RED._("projects.create.credentials")+'</label>').appendTo(row);
 
                         var credentialsBox = $('<div style="width: 550px">').appendTo(row);
                         var credentialsRightBox = $('<div style="min-height:150px; box-sizing: border-box; float: right; vertical-align: top; width: 331px; margin-left: -1px; padding: 15px; margin-top: -15px; border: 1px solid #ccc; border-radius: 3px;  display: inline-block">').appendTo(credentialsBox);
                         var credentialsLeftBox = $('<div style="vertical-align: top; width: 220px;  display: inline-block">').appendTo(credentialsBox);
 
                         var credentialsEnabledBox = $('<div class="form-row" style="padding:  7px 8px 3px 8px;border: 1px solid #ccc;border-radius: 4px;border-top-right-radius: 0;border-bottom-right-radius: 0;border-right-color: white;"></div>').appendTo(credentialsLeftBox);
-                        $('<label class="projects-edit-form-inline-label" style="margin-left: 5px"><input type="radio" checked style="vertical-align: middle; margin-top:0; margin-right: 10px;" name="projects-encryption-type" value="enabled"> <i style="font-size: 1.4em; margin-right: 8px; vertical-align: middle; color: #888;" class="fa fa-lock"></i> <span style="vertical-align: middle;">Enable encryption</span></label>').appendTo(credentialsEnabledBox);
+                        $('<label class="projects-edit-form-inline-label" style="margin-left: 5px"><input type="radio" checked style="vertical-align: middle; margin-top:0; margin-right: 10px;" name="projects-encryption-type" value="enabled"> <i style="font-size: 1.4em; margin-right: 8px; vertical-align: middle; color: #888;" class="fa fa-lock"></i> <span style="vertical-align: middle;">'+RED._("projects.create.enable-encryption")+'</span></label>').appendTo(credentialsEnabledBox);
                         var credentialsDisabledBox = $('<div class="form-row" style="padding:  7px 8px 3px 8px;border: 1px solid white;border-radius: 4px;border-top-right-radius: 0;border-bottom-right-radius: 0;border-right-color: #ccc; "></div>').appendTo(credentialsLeftBox);
-                        $('<label class="projects-edit-form-inline-label" style="margin-left: 5px"><input type="radio" style="vertical-align: middle; margin-top:0; margin-right: 10px;" name="projects-encryption-type" value="disabled"> <i style="font-size: 1.4em; margin-right: 8px; vertical-align: middle; color: #888;" class="fa fa-unlock"></i> <span style="vertical-align: middle;">Disable encryption</span></label>').appendTo(credentialsDisabledBox);
+                        $('<label class="projects-edit-form-inline-label" style="margin-left: 5px"><input type="radio" style="vertical-align: middle; margin-top:0; margin-right: 10px;" name="projects-encryption-type" value="disabled"> <i style="font-size: 1.4em; margin-right: 8px; vertical-align: middle; color: #888;" class="fa fa-unlock"></i> <span style="vertical-align: middle;">'+RED._("projects.create.disable-encryption")+'</span></label>').appendTo(credentialsDisabledBox);
 
                         credentialsLeftBox.find("input[name=projects-encryption-type]").click(function(e) {
                             var val = $(this).val();
@@ -1292,15 +1289,15 @@ RED.projects = (function() {
                         })
 
                         row = $('<div class="form-row projects-encryption-enabled-row"></div>').appendTo(credentialsRightBox);
-                        $('<label class="projects-edit-form-inline-label">Encryption key</label>').appendTo(row);
+                        $('<label class="projects-edit-form-inline-label">'+RED._("projects.create.encryption-key")+'</label>').appendTo(row);
                         // row = $('<div class="projects-encryption-enabled-row"></div>').appendTo(credentialsRightBox);
                         emptyProjectCredentialInput = $('<input type="password"></input>').appendTo(row);
                         emptyProjectCredentialInput.on("change keyup paste", validateForm);
-                        $('<label class="projects-edit-form-sublabel"><small>A phrase to secure your credentials with</small></label>').appendTo(row);
+                        $('<label class="projects-edit-form-sublabel"><small>'+RED._("projects.create.desc0")+'</small></label>').appendTo(row);
 
 
                         row = $('<div class="form-row projects-encryption-disabled-row"></div>').hide().appendTo(credentialsRightBox);
-                        $('<div class="" style="padding: 5px 20px;"><i class="fa fa-warning"></i> The credentials file will not be encrypted and its contents easily read</div>').appendTo(row);
+                        $('<div class="" style="padding: 5px 20px;"><i class="fa fa-warning"></i> '+RED._("projects.create.desc1")+'</div>').appendTo(row);
 
                         credentialsRightBox.find("input[name=projects-encryption-key]").click(function() {
                             var val = $(this).val();
@@ -1313,9 +1310,9 @@ RED.projects = (function() {
 
                         // Clone Project
                         row = $('<div class="hide form-row projects-dialog-screen-create-row projects-dialog-screen-create-row-clone"></div>').appendTo(container);
-                        $('<label for="projects-dialog-screen-create-project-repo">Git repository URL</label>').appendTo(row);
+                        $('<label for="projects-dialog-screen-create-project-repo">'+RED._("projects.create.git-url")+'</label>').appendTo(row);
                         projectRepoInput = $('<input id="projects-dialog-screen-create-project-repo" type="text" placeholder="https://git.example.com/path/my-project.git"></input>').appendTo(row);
-                        $('<label id="projects-dialog-screen-create-project-repo-label" class="projects-edit-form-sublabel"><small>https://, ssh:// or file://</small></label>').appendTo(row);
+                        $('<label id="projects-dialog-screen-create-project-repo-label" class="projects-edit-form-sublabel"><small>'+RED._("projects.create.protocols")+'</small></label>').appendTo(row);
 
                         var projectRepoChanged = false;
                         var lastProjectRepo = "";
@@ -1323,7 +1320,7 @@ RED.projects = (function() {
                             projectRepoChanged = true;
                             var repo = $(this).val();
                             if (lastProjectRepo !== repo) {
-                                $("#projects-dialog-screen-create-project-repo-label small").text("https://, ssh:// or file://");
+                                $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.create.protocols"));
                             }
                             lastProjectRepo = repo;
 
@@ -1342,24 +1339,24 @@ RED.projects = (function() {
 
                         var cloneAuthRows = $('<div class="hide projects-dialog-screen-create-row projects-dialog-screen-create-row-clone"></div>').hide().appendTo(container);
                         row = $('<div class="form-row projects-dialog-screen-create-row-auth-error"></div>').hide().appendTo(cloneAuthRows);
-                        $('<div><i class="fa fa-warning"></i> Authentication failed</div>').appendTo(row);
+                        $('<div><i class="fa fa-warning"></i> '+RED._("projects.create.auth-failed")+'</div>').appendTo(row);
 
                         // Repo credentials - username/password ----------------
                         row = $('<div class="hide form-row projects-dialog-screen-create-row-creds"></div>').hide().appendTo(cloneAuthRows);
 
                         var subrow = $('<div style="width: calc(50% - 10px); display:inline-block;"></div>').appendTo(row);
-                        $('<label for="projects-dialog-screen-create-project-repo-user">Username</label>').appendTo(subrow);
+                        $('<label for="projects-dialog-screen-create-project-repo-user">'+RED._("projects.create.username")+'</label>').appendTo(subrow);
                         projectRepoUserInput = $('<input id="projects-dialog-screen-create-project-repo-user" type="text"></input>').appendTo(subrow);
 
                         subrow = $('<div style="width: calc(50% - 10px); margin-left: 20px; display:inline-block;"></div>').appendTo(row);
-                        $('<label for="projects-dialog-screen-create-project-repo-pass">Password</label>').appendTo(subrow);
+                        $('<label for="projects-dialog-screen-create-project-repo-pass">'+RED._("projects.create.password")+'</label>').appendTo(subrow);
                         projectRepoPasswordInput = $('<input id="projects-dialog-screen-create-project-repo-pass" type="password"></input>').appendTo(subrow);
                         // -----------------------------------------------------
 
                         // Repo credentials - key/passphrase -------------------
                         row = $('<div class="form-row projects-dialog-screen-create-row projects-dialog-screen-create-row-sshkey"></div>').hide().appendTo(cloneAuthRows);
                         subrow = $('<div style="width: calc(50% - 10px); display:inline-block;"></div>').appendTo(row);
-                        $('<label for="projects-dialog-screen-create-project-repo-passphrase">SSH Key</label>').appendTo(subrow);
+                        $('<label for="projects-dialog-screen-create-project-repo-passphrase">'+RED._("projects.create.ssh-key")+'</label>').appendTo(subrow);
                         projectRepoSSHKeySelect = $("<select>",{style:"width: 100%"}).appendTo(subrow);
 
                         $.getJSON("settings/user/keys", function(data) {
@@ -1379,14 +1376,14 @@ RED.projects = (function() {
                             }
                         });
                         subrow = $('<div style="width: calc(50% - 10px); margin-left: 20px; display:inline-block;"></div>').appendTo(row);
-                        $('<label for="projects-dialog-screen-create-project-repo-passphrase">Passphrase</label>').appendTo(subrow);
+                        $('<label for="projects-dialog-screen-create-project-repo-passphrase">'+RED._("projects.create.passphrase")+'</label>').appendTo(subrow);
                         projectRepoPassphrase = $('<input id="projects-dialog-screen-create-project-repo-passphrase" type="password"></input>').appendTo(subrow);
 
                         subrow = $('<div class="form-row projects-dialog-screen-create-row projects-dialog-screen-create-row-sshkey"></div>').appendTo(cloneAuthRows);
                         var sshwarningRow = $('<div class="projects-dialog-screen-create-row-auth-error-no-keys"></div>').hide().appendTo(subrow);
-                        $('<div class="form-row"><i class="fa fa-warning"></i> Before you can clone a repository over ssh you must add an SSH key to access it.</div>').appendTo(sshwarningRow);
+                        $('<div class="form-row"><i class="fa fa-warning"></i> '+RED._("projects.create.desc2")+'</div>').appendTo(sshwarningRow);
                         subrow = $('<div style="text-align: center">').appendTo(sshwarningRow);
-                        $('<button class="editor-button">Add an ssh key</button>').appendTo(subrow).click(function(e) {
+                        $('<button class="editor-button">'+RED._("projects.create.add-ssh-key")+'</button>').appendTo(subrow).click(function(e) {
                             e.preventDefault();
                             $('#projects-dialog-cancel').click();
                             RED.userSettings.show('gitconfig');
@@ -1399,7 +1396,7 @@ RED.projects = (function() {
 
                         // Secret - clone
                         row = $('<div class="hide form-row projects-dialog-screen-create-row projects-dialog-screen-create-row-clone"></div>').appendTo(container);
-                        $('<label>Credentials encryption key</label>').appendTo(row);
+                        $('<label>'+RED._("projects.create.credentials-encryption-key")+'</label>').appendTo(row);
                         projectSecretInput = $('<input type="password"></input>').appendTo(row);
 
 
@@ -1421,9 +1418,9 @@ RED.projects = (function() {
                     buttons: function(options) {
                         var initialLabel;
                         switch (options.screen||"empty") {
-                            case "open": initialLabel = "Open project"; break;
-                            case "empty": initialLabel = "Create project"; break;
-                            case "clone": initialLabel = "Clone project"; break;
+                            case "open": initialLabel = RED._("projects.create.open"); break;
+                            case "empty": initialLabel = RED._("projects.create.create"); break;
+                            case "clone": initialLabel = RED._("projects.create.clone"); break;
                         }
                         return [
                             {
@@ -1477,7 +1474,7 @@ RED.projects = (function() {
                                                 };
                                             }
                                             else {
-                                                console.log("Error! Can't get selected SSH key path.");
+                                                console.log(RED._("projects.create.cant-get-ssh-key-path"));
                                                 return;
                                             }
                                         }
@@ -1497,14 +1494,14 @@ RED.projects = (function() {
                                             dialog.dialog( "close" );
                                             if (err) {
                                                 if (err.error !== 'credentials_load_failed') {
-                                                    console.log("unexpected_error",err)
+                                                    console.log(RED._("projects.create.unexpected_error"),err)
                                                 }
                                             }
                                         })
                                     }
 
                                     $(".projects-dialog-screen-create-row-auth-error").hide();
-                                    $("#projects-dialog-screen-create-project-repo-label small").text("https://, ssh:// or file://");
+                                    $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.create.protocols"));
 
                                     projectRepoUserInput.removeClass("input-error");
                                     projectRepoPasswordInput.removeClass("input-error");
@@ -1524,22 +1521,22 @@ RED.projects = (function() {
                                             },
                                             400: {
                                                 'project_exists': function(error) {
-                                                    console.log("already exists");
+                                                    console.log(RED._("projects.create.already-exists-2"));
                                                 },
                                                 'git_error': function(error) {
-                                                    console.log("git error",error);
+                                                    console.log(RED._("projects.create.git-error"),error);
                                                 },
                                                 'git_connection_failed': function(error) {
                                                     projectRepoInput.addClass("input-error");
-                                                    $("#projects-dialog-screen-create-project-repo-label small").text("Connection failed");
+                                                    $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.create.con-failed"));
                                                 },
                                                 'git_not_a_repository': function(error) {
                                                     projectRepoInput.addClass("input-error");
-                                                    $("#projects-dialog-screen-create-project-repo-label small").text("Not a git repository");
+                                                    $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.create.not-git"));
                                                 },
                                                 'git_repository_not_found': function(error) {
                                                     projectRepoInput.addClass("input-error");
-                                                    $("#projects-dialog-screen-create-project-repo-label small").text("Repository not found");
+                                                    $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.create.no-resource"));
                                                 },
                                                 'git_auth_failed': function(error) {
                                                     $(".projects-dialog-screen-create-row-auth-error").show();
@@ -1619,15 +1616,15 @@ RED.projects = (function() {
             whitespace: "nowrap",
             width:"1000px"
         }).click(function(evt) { evt.stopPropagation(); }).appendTo(row);
-        $('<span>').css({"lineHeight":"40px"}).text("Are you sure you want to delete this project?").appendTo(cover);
-        $('<button style="margin-left:20px" class="editor-button">Cancel</button>')
+        $('<span>').css({"lineHeight":"40px"}).text(RED._("projects.delete.confirm")).appendTo(cover);
+        $('<button style="margin-left:20px" class="editor-button">'+RED._("common.label.cancel")+'</button>')
             .appendTo(cover)
             .click(function(e) {
                 e.stopPropagation();
                 cover.remove();
                 done(true);
             });
-        $('<button style="margin-left:20px" class="editor-button primary">Delete</button>')
+        $('<button style="margin-left:20px" class="editor-button primary">'+RED._("common.label.delete")+'</button>')
             .appendTo(cover)
             .click(function(e) {
                 e.stopPropagation();
@@ -1681,7 +1678,7 @@ RED.projects = (function() {
         var filterTerm = "";
 
         var searchDiv = $("<div>",{class:"red-ui-search-container"}).appendTo(container);
-        var searchInput = $('<input id="projects-dialog-project-list-search" type="text" placeholder="search your projects">').appendTo(searchDiv).searchBox({
+        var searchInput = $('<input id="projects-dialog-project-list-search" type="text" placeholder="'+RED._("projects.create-project-list.search")+'">').appendTo(searchDiv).searchBox({
             //data-i18n="[placeholder]menu.label.searchInput"
             delay: 200,
             change: function() {
@@ -1790,7 +1787,7 @@ RED.projects = (function() {
                 $('<span class="projects-dialog-project-list-entry-name" style=""></span>').text(entry.name).appendTo(header);
                 if (activeProject && activeProject.name === entry.name) {
                     header.addClass("projects-list-entry-current");
-                    $('<span class="projects-dialog-project-list-entry-current">current</span>').appendTo(header);
+                    $('<span class="projects-dialog-project-list-entry-current">'+RED._("projects.create-project-list.current")+'</span>').appendTo(header);
                     if (options.canSelectActive === false) {
                         // active project cannot be selected; so skip the rest
                         return
@@ -1852,7 +1849,7 @@ RED.projects = (function() {
 
     function requireCleanWorkspace(done) {
         if (RED.nodes.dirty()) {
-            var message = '<p>You have undeployed changes that will be lost.</p><p>Do you want to continue?</p>';
+            var message = RED._("projects.require-clean.confirm");
             var cleanNotification = RED.notify(message,{
                 type:"info",
                 fixed: true,
@@ -1867,7 +1864,7 @@ RED.projects = (function() {
                             done(true);
                         }
                     },{
-                        text: 'Continue',
+                        text: RED._("common.label.cont"),
                         click: function() {
                             cleanNotification.close();
                             done(false);
@@ -1945,14 +1942,14 @@ RED.projects = (function() {
                     var url = activeProject.git.remotes[xhr.responseJSON.remote||options.remote||'origin'].fetch;
 
                     var message = $('<div>'+
-                        '<div class="form-row">Authentication required for repository:</div>'+
+                        '<div class="form-row">'+RED._("projects.send-req.auth-req")+':</div>'+
                         '<div class="form-row"><div style="margin-left: 20px;">'+url+'</div></div>'+
                         '</div>');
 
                     var isSSH = false;
                     if (/^https?:\/\//.test(url)) {
-                        $('<div class="form-row"><label for="projects-user-auth-username">Username</label><input id="projects-user-auth-username" type="text"></input></div>'+
-                        '<div class="form-row"><label for=projects-user-auth-password">Password</label><input id="projects-user-auth-password" type="password"></input></div>').appendTo(message);
+                        $('<div class="form-row"><label for="projects-user-auth-username">'+RED._("projects.send-req.username")+'</label><input id="projects-user-auth-username" type="text"></input></div>'+
+                          '<div class="form-row"><label for=projects-user-auth-password">'+RED._("projects.send-req.password")+'</label><input id="projects-user-auth-password" type="password"></input></div>').appendTo(message);
                     } else if (/^(?:ssh|[\d\w\.\-_]+@[\w\.]+):(?:\/\/)?/.test(url)) {
                         isSSH = true;
                         var row = $('<div class="form-row"></div>').appendTo(message);
@@ -1969,7 +1966,7 @@ RED.projects = (function() {
                             }
                         });
                         row = $('<div class="form-row"></div>').appendTo(message);
-                        $('<label for="projects-user-auth-passphrase">Passphrase</label>').appendTo(row);
+                        $('<label for="projects-user-auth-passphrase">'+RED._("projects.send-req.passphrase")+'</label>').appendTo(row);
                         $('<input id="projects-user-auth-passphrase" type="password"></input>').appendTo(row);
                     }
 
@@ -1999,7 +1996,7 @@ RED.projects = (function() {
                                     }
                                     var done = function(err) {
                                         if (err) {
-                                            console.log("Failed to update auth");
+                                            console.log(RED._("projects.send-req.update-failed"));
                                             console.log(err);
                                         } else {
                                             sendRequest(options,body);
@@ -2039,7 +2036,7 @@ RED.projects = (function() {
                     return;
                 }
             }
-            console.log("Unhandled error response:");
+            console.log(RED._("projects.send-req.unhandled")+":");
             console.log(xhr);
             console.log(textStatus);
             console.log(err);
@@ -2073,7 +2070,7 @@ RED.projects = (function() {
                         branchFilterCreateItem.addClass("input-error");
                         branchFilterCreateItem.find("i").addClass("fa-warning").removeClass("fa-code-fork");
                     }
-                    branchFilterCreateItem.find("span").text("Invalid branch: "+branchPrefix+branchFilterTerm);
+                    branchFilterCreateItem.find("span").text(RED._("projects.create-branch-list.invalid")+": "+branchPrefix+branchFilterTerm);
                 } else {
                     if (branchFilterCreateItem.hasClass("input-error")) {
                         branchFilterCreateItem.removeClass("input-error");
@@ -2093,14 +2090,14 @@ RED.projects = (function() {
                 if (!entry.hasOwnProperty('commit')) {
                     branchFilterCreateItem = container;
                     $('<i class="fa fa-code-fork"></i>').appendTo(container);
-                    $('<span>').text("Create branch:").appendTo(container);
+                    $('<span>').text(RED._("projects.create-branch-list.create")+":").appendTo(container);
                     $('<div class="sidebar-version-control-branch-list-entry-create-name" style="margin-left: 10px;">').text(entry.name).appendTo(container);
                 } else {
                     $('<i class="fa fa-code-fork"></i>').appendTo(container);
                     $('<span>').text(entry.name).appendTo(container);
                     if (entry.current) {
                         container.addClass("selected");
-                        $('<span class="current"></span>').text(options.currentLabel||"current").appendTo(container);
+                        $('<span class="current"></span>').text(options.currentLabel||RED._("projects.create-branch-list.current")).appendTo(container);
                     }
                 }
                 container.click(function(evt) {
@@ -2240,9 +2237,9 @@ RED.projects = (function() {
 
     function createDefaultFileSet() {
         if (!activeProject) {
-            throw new Error("Cannot create default file set without an active project");
+            throw new Error(RED._("projects.create-default-file-set.no-active"));
         } else if (!activeProject.empty) {
-            throw new Error("Cannot create default file set on a non-empty project");
+            throw new Error(RED._("projects.create-default-file-set.no-empty"));
         }
         if (!RED.user.hasPermission("projects.write")) {
             RED.notify(RED._("user.errors.notAuthorized"),"error");
@@ -2269,7 +2266,7 @@ RED.projects = (function() {
                 200: function(data) { },
                 400: {
                     'git_error': function(error) {
-                        console.log("git error",error);
+                        console.log(RED._("projects.create-default-file-set.git-error"),error);
                     },
                     'missing_flow_file': function(error) {
                         // This is a natural next error - but let the runtime event
diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json
index dfcef21a6..0b7880667 100644
--- a/red/api/editor/locales/en-US/editor.json
+++ b/red/api/editor/locales/en-US/editor.json
@@ -10,7 +10,11 @@
             "load": "Load",
             "save": "Save",
             "import": "Import",
-            "export": "Export"
+            "export": "Export",
+            "back": "Back",
+            "next": "Next",
+            "clone": "Clone project",
+            "cont": "Continue"
         }
     },
     "workspace": {
@@ -509,5 +513,167 @@
         "modeString": "Handle as UTF-8 String",
         "modeArray": "Handle as JSON array",
         "modeDesc":"<h3>Buffer editor</h3><p>The Buffer type is stored as a JSON array of byte values. The editor will attempt to parse the entered value as a JSON array. If it is not valid JSON, it will be treated as a UTF-8 String and converted to an array of the individual character code points.</p><p>For example, a value of <code>Hello World</code> will be converted to the JSON array:<pre>[72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100]</pre></p>"
+    },
+    "projects": {
+        "config-git": "Configure Git client",
+        "welcome": {
+            "hello": "Hello! We have introduced 'projects' to Node-RED.",
+            "desc0": "This is a new way for you to manage your flow files and includes version control of your flows.",
+            "desc1": "To get started you can create your first project or clone an existing project from a git repository.",
+            "desc2": "If you are not sure, you can skip this for now. You will still be able to create your first project from the 'Projects' menu at any time.",
+            "create": "Create Project",
+            "clone": "Clone Repository",
+            "not-right-now": "Not right now"
+        },
+        "git-config": {
+            "setup": "Setup your version control client",
+            "desc0": "Node-RED uses the open source tool Git for version control. It tracks changes to your project files and lets you push them to remote repositories.",
+            "desc1": "When you commit a set of changes, Git records who made the changes with a username and email address. The Username can be anything you want - it does not need to be your real name.",
+            "desc2": "Your Git client is already configured with the details below.",
+            "desc3": "You can change these settings later under the 'Git config' tab of the settings dialog.",
+            "username": "Username",
+            "email": "Email"
+        },
+        "project-details": {
+            "create": "Create your project",
+            "desc0": "A project is maintained as a Git repository. It makes it much easier to share your flows with others and to collaborate on them.",
+            "desc1": "You can create multiple projects and quickly switch between them from the editor.",
+            "desc2": "To begin, your project needs a name and an optional description.",
+            "already-exists": "Project already exists",
+            "must-contain": "Must contain only A-Z 0-9 _ -",
+            "project-name": "Project name",
+            "desc": "Description",
+            "opt": "Optional"
+        },
+        "clone-project": {
+            "clone": "Clone a project",
+            "desc0": "If you already have a git repository containing a project, you can clone it to get started.",
+            "already-exists": "Project already exists",
+            "must-contain": "Must contain only A-Z 0-9 _ -",
+            "project-name": "Project name",
+            "no-info-in-url": "Do not include the username/password in the url",
+            "git-url": "Git repository URL",
+            "protocols": "https://, ssh:// or file://",
+            "auth-failed": "Authentication failed",
+            "username": "Username",
+            "passwd": "Password",
+            "ssh-key": "SSH Key",
+            "passphrase": "Passphrase",
+            "ssh-key-desc": "Before you can clone a repository over ssh you must add an SSH key to access it.",
+            "ssh-key-add": "Add an ssh key",
+            "credential-key": "Credentials encryption key",
+            "cant-get-ssh-key": "Error! Can't get selected SSH key path.",
+            "already-exists": "already exists",
+            "git-error": "git error",
+            "connection-failed": "Connection failed",
+            "not-git-repo": "Not a git repository",
+            "repo-not-found": "Repository not found"
+        },
+        "default-files": {
+            "create": "Create your project files",
+            "desc0": "A project contains your flow files, a README file and a package.json file.",
+            "desc1": "It can contain any other files you want to maintain in the Git repository.",
+            "desc2": "Your existing flow and credential files will be copied into the project.",
+            "flow-file": "Flow file",
+            "credentials-file": "Credentials file"
+        },
+        "encryption-config": {
+            "setup": "Setup encryption of your credentials file",
+            "desc0": "Your flow credentials file can be encrypted to keep its contents secure.",
+            "desc1": "If you want to store these credentials in a public Git repository, you must encrypt them by providing a secret key phrase.",
+            "desc2": "Your flow credentials file is not currently encrypted.",
+            "desc3": "That means its contents, such as passwords and access tokens, can be read by anyone with access to the file.",
+            "desc4": "If you want to store these credentials in a public Git repository, you must encrypt them by providing a secret key phrase.",
+            "desc5": "Your flow credentials file is currently encrypted using the credentialSecret property from your settings file as the key.",
+            "desc6": "Your flow credentials file is currently encrypted using a system-generated key. You should provide a new secret key for this project.",
+            "desc7": "The key will be stored separately from your project files. You will need to provide the key to use this project in another instance of Node-RED.",
+            "credentials": "Credentials",
+            "enable": "Enable encryption",
+            "disable": "Disable encryption",
+            "disabled": "disabled",
+            "copy": "Copy over existing key",
+            "use-custom": "Use custom key",
+            "desc8": "The credentials file will not be encrypted and its contents easily read",
+            "create-project-files": "Create project files",
+            "create-project": "Create project",
+            "already-exists": "already exists",
+            "git-error": "git error",
+            "git-auth-error": "git auth error"
+        },
+        "create-success": {
+            "success": "You have successfully created your first project!",
+            "desc0": "You can now continue to use Node-RED just as you always have.",
+            "desc1": "The 'info' tab in the sidebar shows you what your current active project is. The button next to the name can be used to access the project settings view.",
+            "desc2": "The 'history' tab in the sidebar can be used to view files that have changed in your project and to commit them. It shows you a complete history of your commits and allows you to push your changes to a remote repository."
+        },
+        "create": {
+            "projects": "Projects",
+            "already-exists": "Project already exists",
+            "must-contain": "Must contain only A-Z 0-9 _ -",
+            "no-info-in-url": "Do not include the username/password in the url",
+            "open": "Open Project",
+            "create": "Create Project",
+            "clone": "Clone Repository",
+            "project-name": "Project name",
+            "desc": "Description",
+            "opt": "Optional",
+            "flow-file": "Flow file",
+            "credentials": "Credentials",
+            "enable-encryption": "Enable encryption",
+            "disable-encryption": "Disable encryption",
+            "encryption-key": "Encryption key",
+            "desc0": "A phrase to secure your credentials with",
+            "desc1": "The credentials file will not be encrypted and its contents easily read",
+            "git-url": "Git repository URL",
+            "protocols": "https://, ssh:// or file://",
+            "auth-failed": "Authentication failed",
+            "username": "Username",
+            "password": "Password",
+            "ssh-key": "SSH Key",
+            "passphrase": "Passphrase",
+            "desc2": "Before you can clone a repository over ssh you must add an SSH key to access it.",
+            "add-ssh-key": "Add an ssh key",
+            "credentials-encryption-key": "Credentials encryption key",
+            "already-exists-2": "already exists",
+            "git-error": "git error",
+            "con-failed": "Connection failed",
+            "not-git": "Not a git repository",
+            "no-resource": "Repository not found",
+            "cant-get-ssh-key-path": "Error! Can't get selected SSH key path.",
+            "unexpected_error": "unexpected_error"
+        },
+        "delete": {
+            "confirm": "Are you sure you want to delete this project?"
+        },
+        "create-project-list": {
+            "search": "search your projects",
+            "current": "current"
+        },
+        "require-clean": {
+            "confirm": "<p>You have undeployed changes that will be lost.</p><p>Do you want to continue?</p>"
+        },
+        "send-req": {
+            "auth-req": "Authentication required for repository",
+            "username": "Username",
+            "password": "Password",
+            "passphrase": "Passphrase",
+            "update-failed": "Failed to update auth",
+            "unhandled": "Unhandled error response"
+        },
+        "create-branch-list": {
+            "invalid": "Invalid branch",
+            "create": "Create branch",
+            "current": "current"
+        },
+        "create-default-file-set": {
+            "no-active": "Cannot create default file set without an active project",
+            "no-empty": "Cannot create default file set on a non-empty project",
+            "git-error": "git error"
+        },
+        "errors" : {
+            "no-username-email": "Your Git client is not configured with a username/email.",
+            "unexpected": "An unexpected error occurred",
+            "code": "code"
+        }
     }
 }
diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json
index 999dc3422..46f970341 100644
--- a/red/api/editor/locales/ja/editor.json
+++ b/red/api/editor/locales/ja/editor.json
@@ -10,7 +10,11 @@
             "load": "読み込み",
             "save": "保存",
             "import": "読み込み",
-            "export": "書き出し"
+            "export": "書き出し",
+            "back": "戻る",
+            "next": "進む",
+            "clone": "プロジェクトをクローン",
+            "cont": "続ける"
         }
     },
     "workspace": {
@@ -499,5 +503,167 @@
         "modeString": "UTF-8文字列として処理",
         "modeArray": "JSON配列として処理",
         "modeDesc": "<h3>バッファエディタ</h3><p>バッファ型は、バイト値から成るJSON配列として格納されます。このエディタは、入力値をJSON配列として構文解析します。もし不正なJSON配列の場合、UTF-8文字列として扱い、各文字コード番号から成る配列へ変換します。</p><p>例えば、 <code>Hello World</code> という値を、以下のJSON配列へ変換します。<pre>[72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100]</pre></p>"
+    },
+    "projects": {
+        "config-git": "Gitクライアントの設定",
+        "welcome": {
+            "hello": "こんにちは！ Node-REDで「プロジェクト」機能が利用できるようになりました。",
+            "desc0": "フローファイルの管理方法が刷新され、バージョン管理も可能です。",
+            "desc1": "まず最初にプロジェクトを作成するか、既存のGitリポジトリからプロジェクトをクローンしてください。",
+            "desc2": "とりあえずこの処理をスキップしてもかまいません。「プロジェクト」メニューから、いつでもプロジェクトの作成を開始できます。",
+            "create": "プロジェクトの作成",
+            "clone": "プロジェクトのクローン",
+            "not-right-now": "後にする"
+        },
+        "git-config": {
+            "setup": "バージョン管理クライアントの設定",
+            "desc0": "Node-REDはオープンソースツールのGitを使ってバージョン管理を行います。Gitによりプロジェクトファイルに対する変化を記録し、外部リポジトリに保存することができます。",
+            "desc1": "変更をコミットする際、変更を行った人物の情報としてユーザ名とEmailアドレスをGitが記憶します。ユーザ名は本名でなくても構いません。好きな名前を使ってください。",
+            "desc2": "Gitクライアントの現在の設定は以下の通りです。",
+            "desc3": "設定ダイアログの「Git設定」タブから別途変更することもできます。",
+            "username": "ユーザ名",
+            "email": "Email"
+        },
+        "project-details": {
+            "create": "プロジェクトの作成",
+            "desc0": "プロジェクトはGitリポジトリとして管理します。Gitリポジトリを使ってフローの共有やコラボレーションが簡単にできます。",
+            "desc1": "複数のプロジェクトを作成し、エディタから即座に変更できます。",
+            "desc2": "まず、プロジェクト名と説明(任意)を指定してください。",
+            "already-exists": "既に存在するプロジェクトです",
+            "must-contain": "A-Z 0-9 _ - のみ指定可能",
+            "project-name": "プロジェクト名",
+            "desc": "説明",
+            "opt": "任意"
+        },
+        "clone-project": {
+            "clone": "プロジェクトをクローン",
+            "desc0": "プロジェクトを含んだGitリポジトリを作成済みの場合、クローンを作成することができます。",
+            "already-exists": "既に存在するプロジェクトです",
+            "must-contain": "A-Z 0-9 _ - のみ指定可能",
+            "project-name": "プロジェクト名",
+            "no-info-in-url": "URLにユーザ名/パスワードを含めないようにしてください",
+            "git-url": "GitリポジトリのURL",
+            "protocols": "https://, ssh:// もしくは file://",
+            "auth-failed": "認証に失敗しました",
+            "username": "ユーザ名",
+            "passwd": "パスワード",
+            "ssh-key": "SSHキー",
+            "passphrase": "パスフレーズ",
+            "ssh-key-desc": "SSHでリポジトリをクローンする前にSSHキーを追加してください。",
+            "ssh-key-add": "SSHキーの追加",
+            "credential-key": "認証情報の暗号化キー",
+            "cant-get-ssh-key": "エラー! 選択したSSHキーのパスを取得できません。",
+            "already-exists": "既に存在します",
+            "git-error": "Gitエラー",
+            "connection-failed": "接続に失敗しました",
+            "not-git-repo": "Gitリポジトリではありません",
+            "repo-not-found": "リポジトリが見つかりません"
+        },
+        "default-files": {
+            "create": "プロジェクト関連ファアイルの作成",
+            "desc0": "プロジェクトはフローファイル、README、package.jsonを含みます。",
+            "desc1": "その他、Gitリポジトリで管理したいファイルを含めても構いません。",
+            "desc2": "既存のフローと認証情報ファイルをプロジェクトにコピーします。",
+            "flow-file": "フローファイル",
+            "credentials-file": "認証情報ファイル"
+        },
+        "encryption-config": {
+            "setup": "認証情報ファイルの暗号化設定",
+            "desc0": "フロー認証情報ファイルを暗号化して内容の安全性を担保できます。",
+            "desc1": "認証情報を公開Gitリポジトリに保存する際には、秘密キーフレーズによって暗号化します。",
+            "desc2": "認証情報ファイルは暗号化されていません。",
+            "desc3": "パスワードやアクセストークンといった認証情報を他人が参照できます。",
+            "desc4": "認証情報を公開Gitリポジトリに保存する際には、秘密キーフレーズによって暗号化します。",
+            "desc5": "フロー認証情報ファイルはsettingsファイルのcredentialSecretプロパティで暗号化されています。",
+            "desc6": "フロー認証情報ファイルはシステムが生成したキーによって暗号化されています。このプロジェクト用に新しい秘密キーを指定してください。",
+            "desc7": "キーはプロジェクトファイルとば別に保存されます。他のNode-REDでこのプロジェクトを利用するには、このプロジェクトのキーが必要です。",
+            "credentials": "認証情報",
+            "enable": "暗号化を有効にする",
+            "disable": "暗号化を無効にする",
+            "disabled": "無効",
+            "copy": "既存のキーをコピー",
+            "use-custom": "カスタムキーを使用",
+            "desc8": "認証情報ファイルが暗号化されないため、簡単に読み出すことができます。",
+            "create-project-files": "プロジェクト関連ファイル作成",
+            "create-project": "プロジェクト作成",
+            "already-exists": "既に存在",
+            "git-error": "Gitエラー",
+            "git-auth-error": "Git認証エラー"
+        },
+        "create-success": {
+            "success": "最初のプロジェクトの作成が成功しました!",
+            "desc0": "以降は、これまでと同様にNode-REDを利用できます。",
+            "desc1": "サイドバーの「情報」タブに現在選択されたプロジェクトを表示します。プロジェクト名の隣のボタンでプロジェクト設定画面を呼び出すことができます。",
+            "desc2": "サイドバーの「履歴」タブで変更が加えられたプロジェクト内のファイルを確認しコミットできます。このサイドバーでは、全てのコミット履歴を確認し、変更を外部リポジトリにプッシュすることが可能です。"
+        },
+        "create": {
+            "projects": "プロジェクト",
+            "already-exists": "プロジェクトは既に存在します",
+            "must-contain": "A-Z 0-9 _ - のみ指定可能",
+            "no-info-in-url": "URLにユーザ名/パスワードを含めないようにしてください",
+            "open": "プロジェクトを開く",
+            "create": "プロジェクトを作成",
+            "clone": "プロジェクトをクローン",
+            "project-name": "プロジェクト名",
+            "desc": "説明",
+            "opt": "任意",
+            "flow-file": "フローファイル",
+            "credentials": "認証情報",
+            "enable-encryption": "暗号化を有効にする",
+            "disable-encryption": "暗号化を無効にする",
+            "encryption-key": "暗号化キー",
+            "desc0": "認証情報をセキュアにするためのフレーズ",
+            "desc1": "認証情報ファイルが暗号化されないため、簡単に読み出すことができます",
+            "git-url": "GitリポジトリのURL",
+            "protocols": "https://, ssh:// もしくは file://",
+            "auth-failed": "認証に失敗しました",
+            "username": "ユーザ名",
+            "password": "パスワード",
+            "ssh-key": "SSHキー",
+            "passphrase": "パスフレーズ",
+            "desc2": "SSHでリポジトリをクローンする前にSSHキーを追加してください。",
+            "add-ssh-key": "SSHキーの追加",
+            "credentials-encryption-key": "認証情報の暗号化キー",
+            "already-exists-2": "既に存在します",
+            "git-error": "Gitエラー",
+            "con-failed": "接続に失敗しました",
+            "not-git": "Gitリポジトリではありません",
+            "no-resource": "リポジトリが見つかりません",
+            "cant-get-ssh-key-path": "エラー! 選択したSSHキーのパスを取得できません。",
+            "unexpected_error": "予期しないエラー"
+        },
+        "delete": {
+            "confirm": "プロジェクトを削除しても良いですか?"
+        },
+        "create-project-list": {
+            "search": "プロジェクトを検索",
+            "current": "有効"
+        },
+        "require-clean": {
+            "confirm": "<p>デプロイされていない変更は失われます。</p><p>続けますか?</p>"
+        },
+        "send-req": {
+            "auth-req": "リポジトリ対する認証が必要です",
+            "username": "ユーザ名",
+            "password": "パスワード",
+            "passphrase": "パスフレーズ",
+            "update-failed": "認証の更新に失敗しました",
+            "unhandled": "エラー応答が処理されませんでした"
+        },
+        "create-branch-list": {
+            "invalid": "不正なブランチ",
+            "create": "ブランチの作成",
+            "current": "有効"
+        },
+        "create-default-file-set": {
+            "no-active": "有効なプロジェクトが無い場合、デフォルトのファイル群を作成できません。",
+            "no-empty": "デフォルトのファイル群を空でないプロジェクトに作成することはできません。",
+            "git-error": "Gitエラー"
+        },
+        "errors" : {
+            "no-username-email": "Gitクライアントのユーザ名/emailが設定されていません。",
+            "unexpected": "予期しないエラーが発生しました",
+            "code": "コード"
+        }
     }
 }

From 865853da1901b307766432449443acff8cfebd57 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Sat, 26 May 2018 20:08:39 +0900
Subject: [PATCH 022/113] add some i18n support for main editor interface and
 Japanese message catalogue

---
 editor/js/main.js                        | 40 ++++++++++++------------
 red/api/editor/locales/en-US/editor.json | 24 +++++++++++++-
 red/api/editor/locales/ja/editor.json    | 27 ++++++++++++++--
 3 files changed, 68 insertions(+), 23 deletions(-)

diff --git a/editor/js/main.js b/editor/js/main.js
index e65b8f30a..80e0a692f 100644
--- a/editor/js/main.js
+++ b/editor/js/main.js
@@ -153,13 +153,13 @@
                     loadFlows(function() {
                         var project = RED.projects.getActiveProject();
                         var message = {
-                            "change-branch":"Change to local branch '"+project.git.branches.local+"'",
-                            "merge-abort":"Git merge aborted",
-                            "loaded":"Project '"+msg.project+"' loaded",
-                            "updated":"Project '"+msg.project+"' updated",
-                            "pull":"Project '"+msg.project+"' reloaded",
-                            "revert": "Project '"+msg.project+"' reloaded",
-                            "merge-complete":"Git merge completed"
+                            "change-branch": RED._("notification.project.change-branch", {project: project.git.branches.local}),
+                            "merge-abort": RED._("notification.project.merge-abort"),
+                            "loaded": RED._("notification.project.loaded", {project: msg.project}),
+                            "updated": RED._("notification.project.updated", {project: msg.project}),
+                            "pull": RED._("notification.project.pull", {project: msg.project}),
+                            "revert": RED._("notification.project.revert", {project: msg.project}),
+                            "merge-complete": RED._("notification.project.merge-complete")
                         }[msg.action];
                         RED.notify("<p>"+message+"</p>");
                         RED.sidebar.info.refresh()
@@ -183,7 +183,7 @@
                         if (!!RED.projects.getActiveProject()) {
                             options.buttons = [
                                 {
-                                    text: "Manage project dependencies",
+                                    text: RED._("notification.label.manage-project-dep"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                         RED.projects.settings.show('deps');
@@ -194,7 +194,7 @@
                         } else {
                             options.buttons = [
                                 {
-                                    text: "Close",
+                                    text: RED._("common.label.close"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                     }
@@ -207,7 +207,7 @@
                             if (RED.user.hasPermission("projects.write")) {
                                 options.buttons = [
                                     {
-                                        text: "Setup credentials",
+                                        text: RED._("notification.label.setup-cred"),
                                         click: function() {
                                             persistentNotifications[notificationId].hideNotification();
                                             RED.projects.showCredentialsPrompt();
@@ -218,7 +218,7 @@
                         } else {
                             options.buttons = [
                                 {
-                                    text: "Close",
+                                    text: RED._("common.label.close"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                     }
@@ -229,7 +229,7 @@
                         if (RED.user.hasPermission("projects.write")) {
                             options.buttons = [
                                 {
-                                    text: "Setup project files",
+                                    text: RED._("notification.label.setup-project"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                         RED.projects.showFilesPrompt();
@@ -241,7 +241,7 @@
                         if (RED.user.hasPermission("projects.write")) {
                             options.buttons = [
                                 {
-                                    text: "Create default package file",
+                                    text: RED._("notification.label.create-default-package"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                         RED.projects.createDefaultPackageFile();
@@ -253,13 +253,13 @@
                         if (RED.user.hasPermission("projects.write")) {
                             options.buttons = [
                                 {
-                                    text: "No thanks",
+                                    text: RED._("notification.label.no-thanks"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                     }
                                 },
                                 {
-                                    text: "Create default project files",
+                                    text: RED._("notification.label.create-default-project"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                         RED.projects.createDefaultFileSet();
@@ -273,7 +273,7 @@
                         if (RED.user.hasPermission("projects.write")) {
                             options.buttons = [
                                 {
-                                    text: "Show merge conflicts",
+                                    text: RED._("notification.label.show-merge-conflicts"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                         RED.sidebar.versionControl.showLocalChanges();
@@ -382,10 +382,10 @@
     function loadEditor() {
         var menuOptions = [];
         if (RED.settings.theme("projects.enabled",false)) {
-            menuOptions.push({id:"menu-item-projects-menu",label:"Projects",options:[
-                {id:"menu-item-projects-new",label:"New",disabled:false,onselect:"core:new-project"},
-                {id:"menu-item-projects-open",label:"Open",disabled:false,onselect:"core:open-project"},
-                {id:"menu-item-projects-settings",label:"Project Settings",disabled:false,onselect:"core:show-project-settings"}
+            menuOptions.push({id:"menu-item-projects-menu",label:RED._("menu.label.projects"),options:[
+                {id:"menu-item-projects-new",label:RED._("menu.label.projects-new"),disabled:false,onselect:"core:new-project"},
+                {id:"menu-item-projects-open",label:RED._("menu.label.projects-open"),disabled:false,onselect:"core:open-project"},
+                {id:"menu-item-projects-settings",label:RED._("menu.label.projects-settings"),disabled:false,onselect:"core:show-project-settings"}
             ]});
         }
 
diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json
index dfcef21a6..ed7b7c2dc 100644
--- a/red/api/editor/locales/en-US/editor.json
+++ b/red/api/editor/locales/en-US/editor.json
@@ -67,7 +67,11 @@
             "editPalette":"Manage palette",
             "other": "Other",
             "showTips": "Show tips",
-            "help": "Node-RED website"
+            "help": "Node-RED website",
+            "projects": "Projects",
+            "projects-new": "New",
+            "projects-open": "Open",
+            "projects-settings": "Project Settings"
         }
     },
     "user": {
@@ -108,6 +112,24 @@
             "cannotAddCircularReference": "Cannot add subflow - circular reference detected",
             "unsupportedVersion": "<p>Using an unsupported version of Node.js</p><p>You should upgrade to the latest Node.js LTS release</p>",
             "failedToAppendNode": "<p>Failed to load '__module__'</p><p>__error__</p>"
+        },
+        "project": {
+            "change-branch": "Change to local branch '__project__'",
+            "merge-abort": "Git merge aborted",
+            "loaded": "Project '__project__' loaded",
+            "updated": "Project '__project__' updated",
+            "pull": "Project '__project__' reloaded",
+            "revert": "Project '__project__' reloaded",
+            "merge-complete": "Git merge completed"
+        },
+        "label": {
+            "manage-project-dep": "Manage project dependencies",
+            "setup-cred": "Setup credentials",
+            "setup-project": "Setup project files",
+            "create-default-package": "Create default package file",
+            "no-thanks": "No thanks",
+            "create-default-project": "Create default project files",
+            "show-merge-conflicts": "Show merge conflicts"
         }
     },
     "clipboard": {
diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json
index 999dc3422..ac17f9a75 100644
--- a/red/api/editor/locales/ja/editor.json
+++ b/red/api/editor/locales/ja/editor.json
@@ -67,7 +67,11 @@
             "editPalette": "パレットの管理",
             "other": "その他",
             "showTips": "ヒントを表示",
-            "help": "Node-REDウェブサイト"
+            "help": "Node-REDウェブサイト",
+            "projects": "プロジェクト",
+            "projects-new": "新規",
+            "projects-open": "開く",
+            "projects-settings": "設定"
         }
     },
     "user": {
@@ -102,7 +106,26 @@
             "lostConnectionTry": "すぐに接続",
             "cannotAddSubflowToItself": "サブフロー自身を追加できません",
             "cannotAddCircularReference": "循環参照を検出したため、サブフローを追加できません",
-            "unsupportedVersion": "サポートされていないバージョンのNode.jsを使用しています。<br/>最新のNode.js LTSに更新してください。"
+            "unsupportedVersion": "サポートされていないバージョンのNode.jsを使用しています。<br/>最新のNode.js LTSに更新してください。",
+            "failedToAppendNode": "<p>'__module__'がロードできませんでした。</p><p>__error__</p>"
+        },
+        "project": {
+            "change-branch": "ローカルブランチ'__project__'に変更しました",
+            "merge-abort": "Gitマージを中止しました",
+            "loaded": "プロジェクト'__project__'をロードしました",
+            "updated": "プロジェクト'__project__'を更新しました",
+            "pull": "プロジェクト'__project__'を再ロードしました",
+            "revert": "プロジェクト'__project__'を再ロードしました",
+            "merge-complete": "Gitマージが完了しました"
+        },
+        "label": {
+            "manage-project-dep": "プロジェクトの依存関係の管理",
+            "setup-cred": "認証情報の設定",
+            "setup-project": "プロジェクトファイルの設定",
+            "create-default-package": "デフォルトパッケージファイルの作成",
+            "no-thanks": "不要",
+            "create-default-project": "デフォルトプロジェクトファイルの作成",
+            "show-merge-conflicts": "マージ競合を表示"
         }
     },
     "clipboard": {

From 0ad54cc2d1270c6074643fe09933c6bfc4259642 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Sun, 27 May 2018 01:05:50 +0900
Subject: [PATCH 023/113] allow i18n translation in runtime

---
 red/runtime/i18n.js | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/red/runtime/i18n.js b/red/runtime/i18n.js
index fc3599c87..336a2c9a6 100644
--- a/red/runtime/i18n.js
+++ b/red/runtime/i18n.js
@@ -81,16 +81,32 @@ var MessageFileLoader = {
 
 }
 
+function current_locale() {
+    var env = process.env;
+    for (var name of ['LC_ALL', 'LC_MESSAGES', 'LANG']) {
+        if (name in env) {
+            var val = env[name];
+            return val.substring(0, 2);
+        }
+    }
+    return undefined;
+}
+
 function init() {
     return when.promise(function(resolve,reject) {
         i18n.backend(MessageFileLoader);
-        i18n.init({
+        var opt = {
             ns: {
                 namespaces: [],
                 defaultNs: "runtime"
             },
             fallbackLng: [defaultLang]
-        },function() {
+        };
+        var lang = current_locale();
+        if (lang) {
+            opt.lng = lang;
+        }
+        i18n.init(opt ,function() {
             resolve();
         });
     });

From 4565342b057e7d9d354969b8148eee245f4cfed3 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Sun, 27 May 2018 01:38:54 +0900
Subject: [PATCH 024/113] add i18n support for project default files generation

---
 red/runtime/locales/en-US/runtime.json                |  4 +++-
 red/runtime/locales/ja/runtime.json                   | 10 ++++++++++
 .../storage/localfilesystem/projects/Project.js       |  4 ++--
 .../localfilesystem/projects/defaultFileSet.js        | 11 ++++++-----
 4 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 red/runtime/locales/ja/runtime.json

diff --git a/red/runtime/locales/en-US/runtime.json b/red/runtime/locales/en-US/runtime.json
index 2b04a26b7..6e9f057ae 100644
--- a/red/runtime/locales/en-US/runtime.json
+++ b/red/runtime/locales/en-US/runtime.json
@@ -150,7 +150,9 @@
                 "disabled": "Projects disabled : editorTheme.projects.enabled=false",
                 "disabledNoFlag": "Projects disabled : set editorTheme.projects.enabled=true to enable",
                 "git-not-found": "Projects disabled : git command not found",
-                "git-version-old": "Projects disabled : git __version__ not supported. Requires 2.x"
+                "git-version-old": "Projects disabled : git __version__ not supported. Requires 2.x",
+                "summary": "A Node-RED Project",
+                "readme": "### About\n\nThis is your project's README.md file. It helps users understand what your\nproject does, how to use it and anything else they may need to know."
             }
         }
     }
diff --git a/red/runtime/locales/ja/runtime.json b/red/runtime/locales/ja/runtime.json
new file mode 100644
index 000000000..87e3fe0cb
--- /dev/null
+++ b/red/runtime/locales/ja/runtime.json
@@ -0,0 +1,10 @@
+{
+    "storage": {
+        "localfilesystem": {
+            "projects": {
+                "summary": "Node-REDプロジェクト",
+                "readme": "### 説明\nこれはプロジェクトのREADME.mdファイルです。このファイルには、\nプロジェクトの説明、利用方法、その他の情報を記載します。"
+            }
+        }
+    }
+}
diff --git a/red/runtime/storage/localfilesystem/projects/Project.js b/red/runtime/storage/localfilesystem/projects/Project.js
index 8ba85f768..989774d6c 100644
--- a/red/runtime/storage/localfilesystem/projects/Project.js
+++ b/red/runtime/storage/localfilesystem/projects/Project.js
@@ -162,7 +162,7 @@ Project.prototype.initialise = function(user,data) {
         if (defaultFileSet.hasOwnProperty(file)) {
             var path = fspath.join(project.path,file);
             if (!fs.existsSync(path)) {
-                promises.push(util.writeFile(path,defaultFileSet[file](project)));
+                promises.push(util.writeFile(path,defaultFileSet[file](project, runtime)));
             }
 
         }
@@ -850,7 +850,7 @@ function createDefaultProject(user, project) {
         }
         for (var file in defaultFileSet) {
             if (defaultFileSet.hasOwnProperty(file)) {
-                promises.push(util.writeFile(fspath.join(projectPath,file),defaultFileSet[file](project)));
+                promises.push(util.writeFile(fspath.join(projectPath,file),defaultFileSet[file](project, runtime)));
             }
         }
 
diff --git a/red/runtime/storage/localfilesystem/projects/defaultFileSet.js b/red/runtime/storage/localfilesystem/projects/defaultFileSet.js
index 12368ec75..a7e825207 100644
--- a/red/runtime/storage/localfilesystem/projects/defaultFileSet.js
+++ b/red/runtime/storage/localfilesystem/projects/defaultFileSet.js
@@ -15,10 +15,11 @@
  **/
 
 module.exports = {
-    "package.json": function(project) {
+    "package.json": function(project, runtime) {
+        var i18n = runtime.i18n;
         var package = {
             "name": project.name,
-            "description": project.summary||"A Node-RED Project",
+            "description": project.summary||i18n._("storage.localfilesystem.projects.summary"),
             "version": "0.0.1",
             "dependencies": {},
             "node-red": {
@@ -34,13 +35,13 @@ module.exports = {
         }
         return JSON.stringify(package,"",4);
     },
-    "README.md": function(project) {
+    "README.md": function(project, runtime) {
+        var i18n = runtime.i18n;
         var content = project.name+"\n"+("=".repeat(project.name.length))+"\n\n";
         if (project.summary) {
             content += project.summary+"\n\n";
         }
-        content += "### About\n\nThis is your project's README.md file. It helps users understand what your\nproject does, how to use it and anything else they may need to know.";
-
+        content += i18n._("storage.localfilesystem.projects.readme");
         return content;
     },
     ".gitignore": function() { return "*.backup" ;}

From a84b2ab5bbbfba50a92e50ef5af0fbfdc6f42e62 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Sun, 27 May 2018 22:30:05 +0900
Subject: [PATCH 025/113] update defaultFileSet test for i18n support

---
 .../localfilesystem/projects/defaultFileSet_spec.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/test/red/runtime/storage/localfilesystem/projects/defaultFileSet_spec.js b/test/red/runtime/storage/localfilesystem/projects/defaultFileSet_spec.js
index 130e5c15b..71ec8adc1 100644
--- a/test/red/runtime/storage/localfilesystem/projects/defaultFileSet_spec.js
+++ b/test/red/runtime/storage/localfilesystem/projects/defaultFileSet_spec.js
@@ -19,6 +19,13 @@ var should = require("should");
 var defaultFileSet = require("../../../../../../red/runtime/storage/localfilesystem/projects/defaultFileSet");
 
 describe('storage/localfilesystem/projects/defaultFileSet', function() {
+    var runtime = {
+        i18n: {
+            "_": function(name) {
+                return name;
+            }
+        }
+    };
     it('generates package.json for a project', function() {
         var generated = defaultFileSet["package.json"]({
             name: "A TEST NAME",
@@ -27,7 +34,7 @@ describe('storage/localfilesystem/projects/defaultFileSet', function() {
                 flow: "MY FLOW FILE",
                 credentials: "MY CREDENTIALS FILE"
             }
-        });
+        }, runtime);
 
         var parsed = JSON.parse(generated);
         parsed.should.have.property('name',"A TEST NAME");
@@ -42,7 +49,7 @@ describe('storage/localfilesystem/projects/defaultFileSet', function() {
         var generated = defaultFileSet["README.md"]({
             name: "A TEST NAME",
             summary: "A TEST SUMMARY"
-        });
+        }, runtime);
         generated.should.match(/A TEST NAME/);
         generated.should.match(/A TEST SUMMARY/);
     });
@@ -50,7 +57,7 @@ describe('storage/localfilesystem/projects/defaultFileSet', function() {
         var generated = defaultFileSet[".gitignore"]({
             name: "A TEST NAME",
             summary: "A TEST SUMMARY"
-        });
+        }, runtime);
         generated.length.should.be.greaterThan(0);
     });
 });

From b2cca10e8ba5f42cacd41eae93fafb9bcb66a5d3 Mon Sep 17 00:00:00 2001
From: Kazuki-Nakanishi <kazuki.nakanishi.vr@hitachi-solutions.com>
Date: Mon, 28 May 2018 17:01:53 +0900
Subject: [PATCH 026/113] Add i18n support for version control of project

---
 editor/js/ui/projects/tab-versionControl.js | 131 ++++++++++----------
 red/api/editor/locales/en-US/editor.json    |  69 ++++++++++-
 red/api/editor/locales/ja/editor.json       |  68 ++++++++++
 3 files changed, 203 insertions(+), 65 deletions(-)

diff --git a/editor/js/ui/projects/tab-versionControl.js b/editor/js/ui/projects/tab-versionControl.js
index 4560a56e5..c5db3f251 100644
--- a/editor/js/ui/projects/tab-versionControl.js
+++ b/editor/js/ui/projects/tab-versionControl.js
@@ -52,11 +52,11 @@ RED.sidebar.versionControl = (function() {
                 200: function(data) {
                     var title;
                     if (state === 'unstaged') {
-                        title = 'Unstaged changes : '+entry.file
+                        title = RED._("sidebar.project.versionControl.unstagedChanges")+' : '+entry.file
                     } else if (state === 'staged') {
-                        title = 'Staged changes : '+entry.file
+                        title = RED._("sidebar.project.versionControl.stagedChanges")+' : '+entry.file
                     } else {
-                        title = 'Resolve conflicts : '+entry.file
+                        title = RED._("sidebar.project.versionControl.resolveConflicts")+' : '+entry.file
                     }
                     var options = {
                         diff: data.diff,
@@ -65,18 +65,18 @@ RED.sidebar.versionControl = (function() {
                         project: activeProject
                     }
                     if (state == 'unstaged') {
-                        options.oldRevTitle = entry.indexStatus === " "?"HEAD":"Staged";
-                        options.newRevTitle = "Unstaged";
+                        options.oldRevTitle = entry.indexStatus === " "?RED._("sidebar.project.versionControl.head"):RED._("sidebar.project.versionControl.staged");
+                        options.newRevTitle = RED._("sidebar.project.versionControl.unstaged");
                         options.oldRev = entry.indexStatus === " "?"@":":0";
                         options.newRev = "_";
                     } else if (state === 'staged') {
-                        options.oldRevTitle = "HEAD";
-                        options.newRevTitle = "Staged";
+                        options.oldRevTitle = RED._("sidebar.project.versionControl.head");
+                        options.newRevTitle = RED._("sidebar.project.versionControl.staged");
                         options.oldRev = "@";
                         options.newRev = ":0";
                     } else {
-                        options.oldRevTitle = "Local";
-                        options.newRevTitle = "Remote";
+                        options.oldRevTitle = RED._("sidebar.project.versionControl.local");
+                        options.newRevTitle = RED._("sidebar.project.versionControl.remote");
                         options.commonRev = ":1";
                         options.oldRev = ":2";
                         options.newRev = ":3";
@@ -156,7 +156,7 @@ RED.sidebar.versionControl = (function() {
                     evt.preventDefault();
 
                     var spinner = utils.addSpinnerOverlay(container).addClass('projects-dialog-spinner-contain');
-                    var notification = RED.notify("Are you sure you want to revert the changes to '"+entry.file+"'? This cannot be undone.", {
+                    var notification = RED.notify(RED._("sidebar.project.versionControl.revert",{file:entry.file}), {
                         type: "warning",
                         modal: true,
                         fixed: true,
@@ -168,7 +168,7 @@ RED.sidebar.versionControl = (function() {
                                     notification.close();
                                 }
                             },{
-                                text: 'Revert changes',
+                                text: RED._("sidebar.project.versionControl.revertChanges"),
                                 click: function() {
                                     notification.close();
                                     var activeProject = RED.projects.getActiveProject();
@@ -281,6 +281,8 @@ RED.sidebar.versionControl = (function() {
         entry["update"+((state==='unstaged')?"Unstaged":"Staged")](entry, status);
     }
     var utils;
+    var emptyStagedItem;
+    var emptyMergedItem;
     function init(_utils) {
         utils = _utils;
 
@@ -312,7 +314,7 @@ RED.sidebar.versionControl = (function() {
         });
 
         localChanges = sections.add({
-            title: "Local Changes",
+            title: RED._("sidebar.project.versionControl.localChanges"),
             collapsible: true
         });
         localChanges.expand();
@@ -326,10 +328,12 @@ RED.sidebar.versionControl = (function() {
                 refresh(true);
             })
 
+        emptyStagedItem = { label: RED._("sidebar.project.versionControl.none") };
+        emptyMergedItem = { label: RED._("sidebar.project.versionControl.conflictResolve") };
 
         var unstagedContent = $('<div class="sidebar-version-control-change-container"></div>').appendTo(localChanges.content);
-        var header = $('<div class="sidebar-version-control-change-header">Local files</div>').appendTo(unstagedContent);
-        stageAllButton = $('<button class="editor-button editor-button-small" style="float: right"><i class="fa fa-plus"></i> all</button>')
+        var header = $('<div class="sidebar-version-control-change-header">'+RED._("sidebar.project.versionControl.localFiles")+'</div>').appendTo(unstagedContent);
+        stageAllButton = $('<button class="editor-button editor-button-small" style="float: right"><i class="fa fa-plus"></i> '+RED._("sidebar.project.versionControl.all")+'</button>')
             .appendTo(header)
             .click(function(evt) {
                 evt.preventDefault();
@@ -359,9 +363,9 @@ RED.sidebar.versionControl = (function() {
 
         unmergedContent = $('<div class="sidebar-version-control-change-container"></div>').appendTo(localChanges.content);
 
-        header = $('<div class="sidebar-version-control-change-header">Unmerged changes</div>').appendTo(unmergedContent);
+        header = $('<div class="sidebar-version-control-change-header">'+RED._("sidebar.project.versionControl.unmergedChanges")+'</div>').appendTo(unmergedContent);
         bg = $('<div style="float: right"></div>').appendTo(header);
-        var abortMergeButton = $('<button class="editor-button editor-button-small" style="margin-right: 5px;">abort merge</button>')
+        var abortMergeButton = $('<button class="editor-button editor-button-small" style="margin-right: 5px;">'+RED._("sidebar.project.versionControl.abortMerge")+'</button>')
             .appendTo(bg)
             .click(function(evt) {
                 evt.preventDefault();
@@ -399,7 +403,7 @@ RED.sidebar.versionControl = (function() {
             addItem: function(row,index,entry) {
                 if (entry === emptyMergedItem) {
                     entry.button = {
-                        label: 'commit',
+                        label: RED._("sidebar.project.versionControl.commit"),
                         click: function(evt) {
                             evt.preventDefault();
                             evt.stopPropagation();
@@ -423,7 +427,7 @@ RED.sidebar.versionControl = (function() {
 
         var stagedContent = $('<div class="sidebar-version-control-change-container"></div>').appendTo(localChanges.content);
 
-        header = $('<div class="sidebar-version-control-change-header">Changes to commit</div>').appendTo(stagedContent);
+        header = $('<div class="sidebar-version-control-change-header">'+RED._("sidebar.project.versionControl.changeToCommit")+'</div>').appendTo(stagedContent);
 
         bg = $('<div style="float: right"></div>').appendTo(header);
         var showCommitBox = function() {
@@ -446,14 +450,14 @@ RED.sidebar.versionControl = (function() {
             abortMergeButton.attr("disabled",true);
             commitMessage.focus();
         }
-        commitButton = $('<button class="editor-button editor-button-small" style="margin-right: 5px;">commit</button>')
+        commitButton = $('<button class="editor-button editor-button-small" style="margin-right: 5px;">'+RED._("sidebar.project.versionControl.commit")+'</button>')
             .appendTo(bg)
             .click(function(evt) {
                 evt.preventDefault();
                 evt.stopPropagation();
                 showCommitBox();
             });
-        unstageAllButton = $('<button class="editor-button editor-button-small"><i class="fa fa-minus"></i> all</button>')
+        unstageAllButton = $('<button class="editor-button editor-button-small"><i class="fa fa-minus"></i> '+RED._("sidebar.project.versionControl.all")+'</button>')
             .appendTo(bg)
             .click(function(evt) {
                 evt.preventDefault();
@@ -480,14 +484,14 @@ RED.sidebar.versionControl = (function() {
 
         commitBox = $('<div class="sidebar-version-control-slide-box sidebar-version-control-slide-box-bottom"></div>').hide().appendTo(localChanges.content);
 
-        var commitMessage = $('<textarea placeholder="Enter your commit message"></textarea>')
+        var commitMessage = $('<textarea placeholder='+RED._("sidebar.project.versionControl.commitPlaceholder")+'></textarea>')
             .appendTo(commitBox)
             .on("change keyup paste",function() {
                 submitCommitButton.attr('disabled',$(this).val().trim()==="");
             });
         var commitToolbar = $('<div class="sidebar-version-control-slide-box-toolbar button-group">').appendTo(commitBox);
 
-        var cancelCommitButton = $('<button class="editor-button">Cancel</button>')
+        var cancelCommitButton = $('<button class="editor-button">'+RED._("sidebar.project.versionControl.cancelCapital")+'</button>')
             .appendTo(commitToolbar)
             .click(function(evt) {
                 evt.preventDefault();
@@ -505,7 +509,7 @@ RED.sidebar.versionControl = (function() {
                 abortMergeButton.attr("disabled",false);
 
             })
-        var submitCommitButton = $('<button class="editor-button">Commit</button>')
+        var submitCommitButton = $('<button class="editor-button">'+RED._("sidebar.project.versionControl.commitCapital")+'</button>')
             .appendTo(commitToolbar)
             .click(function(evt) {
                 evt.preventDefault();
@@ -541,7 +545,7 @@ RED.sidebar.versionControl = (function() {
 
 
         var localHistory = sections.add({
-            title: "Commit History",
+            title: RED._("sidebar.project.versionControl.commitHistory"),
             collapsible: true
         });
 
@@ -555,7 +559,7 @@ RED.sidebar.versionControl = (function() {
 
         var localBranchToolbar = $('<div class="sidebar-version-control-change-header" style="text-align: right;"></div>').appendTo(localHistory.content);
 
-        var localBranchButton = $('<button class="editor-button editor-button-small"><i class="fa fa-code-fork"></i> Branch: <span id="sidebar-version-control-local-branch"></span></button>')
+        var localBranchButton = $('<button class="editor-button editor-button-small"><i class="fa fa-code-fork"></i> '+RED._("sidebar.project.versionControl.branch")+' <span id="sidebar-version-control-local-branch"></span></button>')
             .appendTo(localBranchToolbar)
             .click(function(evt) {
                 evt.preventDefault();
@@ -612,7 +616,7 @@ RED.sidebar.versionControl = (function() {
                 row.addClass('sidebar-version-control-commit-entry');
                 if (entry.url) {
                     row.addClass('sidebar-version-control-commit-more');
-                    row.text("+ "+(entry.total-entry.totalKnown)+" more commit(s)");
+                    row.text("+ "+(entry.total-entry.totalKnown)+RED._("sidebar.project.versionControl.moreCommits"));
                     row.click(function(e) {
                         e.preventDefault();
                         getCommits(entry.url,localCommitList,row,entry.limit,entry.before);
@@ -626,8 +630,8 @@ RED.sidebar.versionControl = (function() {
                                 result.parents = entry.parents;
                                 result.oldRev = entry.sha+"~1";
                                 result.newRev = entry.sha;
-                                result.oldRevTitle = "Commit "+entry.sha.substring(0,7)+"~1";
-                                result.newRevTitle = "Commit "+entry.sha.substring(0,7);
+                                result.oldRevTitle = RED._("sidebar.project.versionControl.commitCapital")+" "+entry.sha.substring(0,7)+"~1";
+                                result.newRevTitle = RED._("sidebar.project.versionControl.commitCapital")+" "+entry.sha.substring(0,7);
                                 result.date = humanizeSinceDate(parseInt(entry.date));
                                 RED.diff.showCommitDiff(result);
                             });
@@ -666,10 +670,10 @@ RED.sidebar.versionControl = (function() {
         }
         var localBranchBox = $('<div class="sidebar-version-control-slide-box sidebar-version-control-slide-box-top" style="top:30px;"></div>').hide().appendTo(localHistory.content);
 
-        $('<div class="sidebar-version-control-slide-box-header"></div>').text("Change local branch").appendTo(localBranchBox);
+        $('<div class="sidebar-version-control-slide-box-header"></div>').text(RED._("sidebar.project.versionControl.changeLocalBranch")).appendTo(localBranchBox);
 
         var localBranchList = utils.createBranchList({
-            placeholder: "Find or create a branch",
+            placeholder: RED._("sidebar.project.versionControl.createBranchPlaceholder"),
             container: localBranchBox,
             onselect: function(body) {
                 if (body.current) {
@@ -701,7 +705,7 @@ RED.sidebar.versionControl = (function() {
                         400: {
                             'git_local_overwrite': function(error) {
                                 spinner.remove();
-                                RED.notify("You have local changes that would be overwritten by changing the branch. You must either commit or undo those changes first.",{
+                                RED.notify(RED._("sidebar.project.versionControl.localOverwrite"),{
                                     type:'error',
                                     timeout: 8000
                                 });
@@ -744,10 +748,10 @@ RED.sidebar.versionControl = (function() {
                 },200);
             }
         }
-        $('<div class="sidebar-version-control-slide-box-header"></div>').text("Manage remote branch").appendTo(remoteBox);
+        $('<div class="sidebar-version-control-slide-box-header"></div>').text(RED._("sidebar.project.versionControl.manageRemoteBranch")).appendTo(remoteBox);
 
         var remoteBranchRow = $('<div style="margin-bottom: 5px;"></div>').appendTo(remoteBox);
-        var remoteBranchButton = $('<button id="sidebar-version-control-repo-branch" class="sidebar-version-control-repo-action editor-button"><i class="fa fa-code-fork"></i> Remote: <span id="sidebar-version-control-remote-branch"></span></button>')
+        var remoteBranchButton = $('<button id="sidebar-version-control-repo-branch" class="sidebar-version-control-repo-action editor-button"><i class="fa fa-code-fork"></i> '+RED._("sidebar.project.versionControl.remote")+': <span id="sidebar-version-control-remote-branch"></span></button>')
             .appendTo(remoteBranchRow)
             .click(function(evt) {
                 evt.preventDefault();
@@ -770,9 +774,9 @@ RED.sidebar.versionControl = (function() {
 
 
         var errorMessage = $('<div id="sidebar-version-control-repo-toolbar-error-message" class="sidebar-version-control-slide-box-header" style="min-height: 100px;"></div>').hide().appendTo(remoteBox);
-        $('<div style="margin-top: 10px;"><i class="fa fa-warning"></i> Unable to access remote repository</div>').appendTo(errorMessage)
+        $('<div style="margin-top: 10px;"><i class="fa fa-warning"></i> '+RED._("sidebar.project.versionControl.unableToAccess")+'</div>').appendTo(errorMessage)
         var buttonRow = $('<div style="margin: 10px 30px; text-align: center"></div>').appendTo(errorMessage);
-        $('<button class="editor-button" style="width: 80%;"><i class="fa fa-refresh"></i> Retry</button>')
+        $('<button class="editor-button" style="width: 80%;"><i class="fa fa-refresh"></i> '+RED._("sidebar.project.versionControl.retry")+'</button>')
             .appendTo(buttonRow)
             .click(function(e) {
                 e.preventDefault();
@@ -810,12 +814,12 @@ RED.sidebar.versionControl = (function() {
                 });
             })
 
-        $('<div class="sidebar-version-control-slide-box-header" style="height: 20px;"><label id="sidebar-version-control-repo-toolbar-set-upstream-row" for="sidebar-version-control-repo-toolbar-set-upstream" class="hide"><input type="checkbox" id="sidebar-version-control-repo-toolbar-set-upstream"> Set as upstream branch</label></div>').appendTo(remoteBox);
+        $('<div class="sidebar-version-control-slide-box-header" style="height: 20px;"><label id="sidebar-version-control-repo-toolbar-set-upstream-row" for="sidebar-version-control-repo-toolbar-set-upstream" class="hide"><input type="checkbox" id="sidebar-version-control-repo-toolbar-set-upstream"> '+RED._("sidebar.project.versionControl.setUpstreamBranch")+'</label></div>').appendTo(remoteBox);
 
         var remoteBranchSubRow = $('<div style="height: 0;overflow:hidden; transition: height 0.2s ease-in-out;"></div>').hide().appendTo(remoteBranchRow);
         var remoteBranchList = utils.createBranchList({
-            placeholder: "Find or create a remote branch",
-            currentLabel: "upstream",
+            placeholder: RED._("sidebar.project.versionControl.createRemoteBranchPlaceholder"),
+            currentLabel: RED._("sidebar.project.versionControl.upstream"),
             remote: function() {
                 var project = RED.projects.getActiveProject();
                 var remotes = Object.keys(project.git.remotes);
@@ -845,11 +849,11 @@ RED.sidebar.versionControl = (function() {
                         })
                     } else {
                         if (!activeProject.git.branches.remote) {
-                            $('#sidebar-version-control-repo-toolbar-message').text("The created branch will be set as the tracked upstream branch.");
+                            $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.trackedUpstreamBranch"));
                             $("#sidebar-version-control-repo-toolbar-set-upstream").prop('checked',true);
                             $("#sidebar-version-control-repo-toolbar-set-upstream").prop('disabled',true);
                         } else {
-                            $('#sidebar-version-control-repo-toolbar-message').text("The branch will be created. Select below to set it as the tracked upstream branch.");
+                            $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.selectUpstreamBranch"));
                         }
                         $("#sidebar-version-control-repo-pull").attr('disabled',true);
                         $("#sidebar-version-control-repo-push").attr('disabled',false);
@@ -861,7 +865,7 @@ RED.sidebar.versionControl = (function() {
 
         var row = $('<div style="margin-bottom: 5px;"></div>').appendTo(remoteBox);
 
-        $('<button id="sidebar-version-control-repo-push" class="sidebar-version-control-repo-sub-action editor-button"><i class="fa fa-long-arrow-up"></i> <span>push</span></button>')
+        $('<button id="sidebar-version-control-repo-push" class="sidebar-version-control-repo-sub-action editor-button"><i class="fa fa-long-arrow-up"></i> <span data-i18n="sidebar.project.versionControl.push"></span></button>')
             .appendTo(row)
             .click(function(e) {
                 e.preventDefault();
@@ -893,8 +897,7 @@ RED.sidebar.versionControl = (function() {
                         },
                         400: {
                             'git_push_failed': function(err) {
-                                // TODO: better message + NLS
-                                RED.notify("NLS: Push failed as the remote has more recent commits. Pull first and write a better error message!","error");
+                                RED.notify(RED._("sidebar.project.versionControl.pushFailed"),"error");
                             },
                             'unexpected_error': function(error) {
                                 console.log(error);
@@ -945,18 +948,18 @@ RED.sidebar.versionControl = (function() {
                     },
                     400: {
                         'git_local_overwrite': function(err) {
-                            RED.notify("<p>Unable to pull remote changes; your unstaged local changes would be overwritten.</p><p>Commit your changes and try again.</p>"+
-                                '<p><a href="#" onclick="RED.sidebar.versionControl.showLocalChanges(); return false;">'+'Show unstaged changes'+'</a></p>',"error",false,10000000);
+                            RED.notify(RED._("sidebar.project.versionControl.unablePull")+
+                                '<p><a href="#" onclick="RED.sidebar.versionControl.showLocalChanges(); return false;">'+RED._("sidebar.project.versionControl.showUnstagedChanges")+'</a></p>',"error",false,10000000);
                         },
                         'git_pull_merge_conflict': function(err) {
                             refresh(true);
                             closeRemoteBox();
                         },
                         'git_connection_failed': function(err) {
-                            RED.notify("Could not connect to remote repository: "+err.toString(),"warning")
+                            RED.notify(RED._("sidebar.project.versionControl.connectionFailed")+err.toString(),"warning")
                         },
                         'git_pull_unrelated_history': function(error) {
-                            var notification = RED.notify("<p>The remote has an unrelated history of commits.</p><p>Are you sure you want to pull the changes into your local repository?</p>",{
+                            var notification = RED.notify(RED._("sidebar.project.versionControl.pullUnrelatedHistory"),{
                                 type: 'error',
                                 modal: true,
                                 fixed: true,
@@ -967,7 +970,7 @@ RED.sidebar.versionControl = (function() {
                                             notification.close();
                                         }
                                     },{
-                                        text: 'Pull changes',
+                                        text: RED._("sidebar.project.versionControl.pullChanges"),
                                         click: function() {
                                             notification.close();
                                             options.allowUnrelatedHistories = true;
@@ -986,7 +989,7 @@ RED.sidebar.versionControl = (function() {
                 spinner.remove();
             });
         }
-        $('<button id="sidebar-version-control-repo-pull" class="sidebar-version-control-repo-sub-action editor-button"><i class="fa fa-long-arrow-down"></i> <span>pull</span></button>')
+        $('<button id="sidebar-version-control-repo-pull" class="sidebar-version-control-repo-sub-action editor-button"><i class="fa fa-long-arrow-down"></i> <span data-i18n="sidebar.project.versionControl.pull"></span></button>')
             .appendTo(row)
             .click(function(e) {
                 e.preventDefault();
@@ -999,7 +1002,7 @@ RED.sidebar.versionControl = (function() {
 
         RED.sidebar.addTab({
             id: "version-control",
-            label: "history",
+            label: RED._("sidebar.project.versionControl.history"),
             name: "Project History",
             content: sidebarContent,
             enableOnEdit: false,
@@ -1021,17 +1024,17 @@ RED.sidebar.versionControl = (function() {
         if (daysDelta > 30) {
             return (new Date(date*1000)).toLocaleDateString();
         } else if (daysDelta > 0) {
-            return daysDelta+" day"+(daysDelta>1?"s":"")+" ago";
+            return RED._("sidebar.project.versionControl.daysAgo", {count:daysDelta})
         }
         var hoursDelta = Math.floor(delta / (60*60));
         if (hoursDelta > 0) {
-            return hoursDelta+" hour"+(hoursDelta>1?"s":"")+" ago";
+            return RED._("sidebar.project.versionControl.hoursAgo", {count:hoursDelta})
         }
         var minutesDelta = Math.floor(delta / 60);
         if (minutesDelta > 0) {
-            return minutesDelta+" minute"+(minutesDelta>1?"s":"")+" ago";
+            return RED._("sidebar.project.versionControl.minsAgo", {count:minutesDelta})
         }
-        return "Seconds ago";
+        return RED._("sidebar.project.versionControl.secondsAgo");
     }
 
     function updateBulk(files,unstaged) {
@@ -1066,9 +1069,6 @@ RED.sidebar.versionControl = (function() {
 
     var refreshInProgress = false;
 
-    var emptyStagedItem = { label:"None" };
-    var emptyMergedItem = { label:"All conflicts resolved. Commit the changes to complete the merge." };
-
     function getCommits(url,targetList,spinnerTarget,limit,before) {
         var spinner = utils.addSpinnerOverlay(spinnerTarget);
         var fullUrl = url+"?limit="+(limit||20);
@@ -1276,7 +1276,7 @@ RED.sidebar.versionControl = (function() {
                 refreshFiles(result);
 
                 $('#sidebar-version-control-local-branch').text(result.branches.local);
-                $('#sidebar-version-control-remote-branch').text(result.branches.remote||"none");
+                $('#sidebar-version-control-remote-branch').text(result.branches.remote||RED._("sidebar.project.versionControl.none"));
 
                 var commitsAhead = result.commits.ahead || 0;
                 var commitsBehind = result.commits.behind || 0;
@@ -1306,7 +1306,7 @@ RED.sidebar.versionControl = (function() {
                             $('#sidebar-version-control-commits-ahead').text("");
                             $('#sidebar-version-control-commits-behind').text("");
 
-                            $('#sidebar-version-control-repo-toolbar-message').text("Your local branch is not currently tracking a remote branch.");
+                            $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.notTracking"));
                             $("#sidebar-version-control-repo-pull").attr('disabled',true);
                             $("#sidebar-version-control-repo-push").attr('disabled',true);
                         }
@@ -1332,23 +1332,26 @@ RED.sidebar.versionControl = (function() {
         $('#sidebar-version-control-commits-ahead').text(commitsAhead);
         $('#sidebar-version-control-commits-behind').text(commitsBehind);
         if (isMerging) {
-            $('#sidebar-version-control-repo-toolbar-message').text("Your repository has unmerged changes. You need to fix the conflicts and commit the result.");
+            $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.statusUnmergedChanged"));
             $("#sidebar-version-control-repo-pull").attr('disabled',true);
             $("#sidebar-version-control-repo-push").attr('disabled',true);
         } else if (commitsAhead > 0 && commitsBehind === 0) {
-            $('#sidebar-version-control-repo-toolbar-message').text("Your repository is "+commitsAhead+" commit"+(commitsAhead===1?'':'s')+" ahead of the remote. You can push "+(commitsAhead===1?'this commit':'these commits')+" now.");
+            $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.commitsAhead", {count:commitsAhead}));
             $("#sidebar-version-control-repo-pull").attr('disabled',true);
             $("#sidebar-version-control-repo-push").attr('disabled',false);
         } else if (commitsAhead === 0 && commitsBehind > 0) {
-            $('#sidebar-version-control-repo-toolbar-message').text("Your repository is "+commitsBehind+" commit"+(commitsBehind===1?'':'s')+" behind of the remote. You can pull "+(commitsBehind===1?'this commit':'these commits')+" now.");
+            $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.commitsBehind",{ count: commitsBehind }));
             $("#sidebar-version-control-repo-pull").attr('disabled',false);
             $("#sidebar-version-control-repo-push").attr('disabled',true);
         } else if (commitsAhead > 0 && commitsBehind > 0) {
-            $('#sidebar-version-control-repo-toolbar-message').text("Your repository is "+commitsBehind+" commit"+(commitsBehind===1?'':'s')+" behind and "+commitsAhead+" commit"+(commitsAhead===1?'':'s')+" ahead of the remote. You must pull the remote commit"+(commitsBehind===1?'':'s')+" down before pushing.");
+            $('#sidebar-version-control-repo-toolbar-message').text(
+                RED._("sidebar.project.versionControl.commitsAheadAndBehind1",{ count:commitsBehind })+
+                RED._("sidebar.project.versionControl.commitsAheadAndBehind2",{ count:commitsAhead })+
+                RED._("sidebar.project.versionControl.commitsAheadAndBehind3",{ count:commitsBehind }));
             $("#sidebar-version-control-repo-pull").attr('disabled',false);
             $("#sidebar-version-control-repo-push").attr('disabled',true);
         } else if (commitsAhead === 0 && commitsBehind === 0) {
-            $('#sidebar-version-control-repo-toolbar-message').text("Your repository is up to date.");
+            $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.repositoryUpToDate"));
             $("#sidebar-version-control-repo-pull").attr('disabled',true);
             $("#sidebar-version-control-repo-push").attr('disabled',true);
         }
diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json
index dfcef21a6..01905db93 100644
--- a/red/api/editor/locales/en-US/editor.json
+++ b/red/api/editor/locales/en-US/editor.json
@@ -457,7 +457,74 @@
                 "delete": "Delete key",
                 "git-config": "Git config",
                 "deleteConfirm": "Are you sure you want to delete the SSH key __name__? This cannot be undone."
-            } 
+            },
+            "versionControl": {
+                "unstagedChanges": "Unstaged changes",
+                "stagedChanges": "Staged changes",
+                "resolveConflicts": "Resolve conflicts",
+                "head": "HEAD",
+                "staged": "Staged",
+                "unstaged": "Unstaged",
+                "local": "Local",
+                "remote": "Remote",
+                "revert": "Are you sure you want to revert the changes to '__file__'? This cannot be undone.",
+                "revertChanges": "Revert changes",
+                "localChanges": "Local Changes",
+                "none": "None",
+                "conflictResolve": "All conflicts resolved. Commit the changes to complete the merge.",
+                "localFiles": "Local files",
+                "all": "all",
+                "unmergedChanges": "Unmerged changes",
+                "abortMerge": "abort merge",
+                "commit": "commit",
+                "changeToCommit": "Changes to commit",
+                "commitPlaceholder": "Enter your commit message",
+                "cancelCapital": "Cancel",
+                "commitCapital": "Commit",
+                "commitHistory": "Commit History",
+                "branch": "Branch:",
+                "moreCommits": " more commit(s)",
+                "changeLocalBranch": "Change local branch",
+                "createBranchPlaceholder": "Find or create a branch",
+                "upstream": "upstream",
+                "localOverwrite": "You have local changes that would be overwritten by changing the branch. You must either commit or undo those changes first.",
+                "manageRemoteBranch": "Manage remote branch",
+                "unableToAccess": "Unable to access remote repository",
+                "retry": "Retry",
+                "setUpstreamBranch": "Set as upstream branch",
+                "createRemoteBranchPlaceholder": "Find or create a remote branch",
+                "trackedUpstreamBranch": "The created branch will be set as the tracked upstream branch.",
+                "selectUpstreamBranch": "The branch will be created. Select below to set it as the tracked upstream branch.",
+                "pushFailed": "Push failed as the remote has more recent commits. Pull and merge first, then push again.", // TODO: better message
+                "push": "push",
+                "pull": "pull",
+                "unablePull": "<p>Unable to pull remote changes; your unstaged local changes would be overwritten.</p><p>Commit your changes and try again.</p>",
+                "showUnstagedChanges": "Show unstaged changes",
+                "connectionFailed": "Could not connect to remote repository: ",
+                "pullUnrelatedHistory": "<p>The remote has an unrelated history of commits.</p><p>Are you sure you want to pull the changes into your local repository?</p>",
+                "pullChanges": "Pull changes",
+                "history": "history",
+                "daysAgo": "__count__ day ago",
+                "daysAgo_plural": "__count__ days ago",
+                "hoursAgo": "__count__ hour ago",
+                "hoursAgo_plural": "__count__ hours ago",
+                "minsAgo": "__count__ min ago",
+                "minsAgo_plural": "__count__ mins ago",
+                "secondsAgo": "Seconds ago",
+                "notTracking": "Your local branch is not currently tracking a remote branch.",
+                "statusUnmergedChanged": "Your repository has unmerged changes. You need to fix the conflicts and commit the result.",
+                "repositoryUpToDate": "Your repository is up to date.",
+                "commitsAhead": "Your repository is __count__ commit ahead of the remote. You can push this commit now.",
+                "commitsAhead_plural": "Your repository is __count__ commits ahead of the remote. You can push these commits now.",
+                "commitsBehind": "Your repository is __count__ commit behind of the remote. You can pull this commit now.",
+                "commitsBehind_plural": "Your repository is __count__ commits behind of the remote. You can pull these commits now.",
+                "commitsAheadAndBehind1": "Your repository is __count__ commit behind and ",
+                "commitsAheadAndBehind1_plural": "Your repository is __count__ commits behind and ",
+                "commitsAheadAndBehind2": "__count__ commit ahead of the remote. ",
+                "commitsAheadAndBehind2_plural": "__count__ commits ahead of the remote. ",
+                "commitsAheadAndBehind3": "You must pull the remote commit down before pushing.",
+                "commitsAheadAndBehind3_plural": "You must pull the remote commits down before pushing."
+            }
         }
     },
     "typedInput": {
diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json
index 999dc3422..58d9fe6bf 100644
--- a/red/api/editor/locales/ja/editor.json
+++ b/red/api/editor/locales/ja/editor.json
@@ -447,6 +447,74 @@
                 "delete": "キーを削除",
                 "git-config": "Git設定",
                 "deleteConfirm": "SSHキー __name__ を削除してもよいですか？ 削除したSSHキーを元に戻すことはできません。"
+            },
+            "versionControl": {
+                "unstagedChanges": "ステージングされていない変更",
+                "stagedChanges": "ステージングされた変更",
+                "resolveConflicts": "コンフリクトの解決",
+                "head": "最新",
+                "staged": "ステージング",
+                "unstaged": "未ステージング",
+                "local": "ローカル",
+                "remote": "リモート",
+                "revert": "'__file__'への変更を本当に戻しますか？この操作は元に戻せません。",
+                "revertChanges": "変更を戻す",
+                "localChanges": "ローカルの変更",
+                "none": "なし",
+                "conflictResolve": "全てのコンフリクトが解消されました。マージを完了するため、変更をコミットしてください。",
+                "localFiles": "ローカルファイル",
+                "all": "全て",
+                "unmergedChanges": "マージされていない変更",
+                "abortMerge": "マージ中止",
+                "commit": "コミット",
+                "changeToCommit": "コミット対象とする変更",
+                "commitPlaceholder": "コミットメッセージを入力してください。",
+                "cancelCapital": "キャンセル",
+                "commitCapital": "コミット",
+                "commitHistory": "コミット履歴",
+                "branch": "ブランチ:",
+                "moreCommits": "個のコミット",
+                "changeLocalBranch": "ローカルブランチの変更",
+                "createBranchPlaceholder": "ブランチの検索または作成",
+                "upstream": "アップストリーム",
+                "localOverwrite": "ブランチの変更によって上書きされたローカルの変更があります。これらの変更を先にコミットするか、あるいは元に戻さなければなりません。",
+                "manageRemoteBranch": "リモートブランチの管理",
+                "unableToAccess": "リモートのリポジトリにアクセスできません。",
+                "retry": "リトライ",
+                "setUpstreamBranch": "アップストリームとして設定する",
+                "createRemoteBranchPlaceholder": "リモートブランチの検索または作成",
+                "trackedUpstreamBranch": "作成されたブランチは、トラッキングされたアップストリームブランチとなります。",
+                "selectUpstreamBranch": "ブランチが作成されました。トラッキングするアップストリームブランチを選択してください。",
+                "pushFailed": "リモートに新しいコミットがあるため、プッシュに失敗しました。プルしてマージしてから、再度プッシュしてください。",
+                "push": "プッシュ",
+                "pull": "プル",
+                "unablePull": "<p>リモートの変更のプル失敗：ステージングされていないローカルの変更を上書きされてしまいます。</p><p>変更をコミットしてから再度実行してください。</p>",
+                "showUnstagedChanges": "ステージングされていない変更を表示",
+                "connectionFailed": "リモートリポジトリに接続できません: ",
+                "pullUnrelatedHistory": "<p>リモートに関連のないコミット履歴があります。</p><p>本当に変更をプルしてローカルリポジトリに反映しますか？</p>",
+                "pullChanges": "プル変更",
+                "history": "履歴",
+                "plural": "",
+                "daysAgo": "__count__ 日前",
+                "daysAgo_plural": "__count__ 日前",
+                "hoursAgo": "__count__ 時間前",
+                "hoursAgo_plural": "__count__ 時間前",
+                "minsAgo": "__count__ 分前",
+                "minsAgo_plural": "__count__ 分前",
+                "secondsAgo": "数秒前",
+                "notTracking": "ローカルブランチは現在リモートブランチをトラッキングしていません。",
+                "statusUnmergedChanged": "リポジトリ内にマージされていない変更があります。コンフリクトを解決してコミットしてください。",
+                "repositoryUpToDate": "リポジトリは最新です。",
+                "commitsAhead": "あなたのリポジトリはリモートより__count__コミット進んでいます。現在のコミットをプッシュできます。",
+                "commitsAhead_plural": "あなたのリポジトリはリモートより__count__コミット進んでいます。現在のコミットをプッシュできます。",
+                "commitsBehind": "あなたのリポジトリはリモートより__count__コミット遅れています。現在のコミットをプルできます。",
+                "commitsBehind_plural": "あなたのリポジトリはリモートより__count__コミット遅れています。現在のコミットをプルできます。",
+                "commitsAheadAndBehind1": "あなたのリポジトリはリモートより__count__コミット遅れており、かつ",
+                "commitsAheadAndBehind1_plural": "あなたのリポジトリはリモートより__count__コミット遅れており、かつ",
+                "commitsAheadAndBehind2": "__count__コミット進んでいます。 ",
+                "commitsAheadAndBehind2_plural": "__count__コミット進んでいます。 ",
+                "commitsAheadAndBehind3": "プッシュする前にリモートのコミットをプルしてください。",
+                "commitsAheadAndBehind3_plural": "プッシュする前にリモートのコミットをプルしてください。"
             }
         }
     },

From b0c693cc3ad0bdb6f90cf018eee260f947818210 Mon Sep 17 00:00:00 2001
From: Kazuki-Nakanishi <kazuki.nakanishi.vr@hitachi-solutions.com>
Date: Mon, 28 May 2018 17:06:38 +0900
Subject: [PATCH 027/113] move comment from json to js

---
 editor/js/ui/projects/tab-versionControl.js | 1 +
 red/api/editor/locales/en-US/editor.json    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/editor/js/ui/projects/tab-versionControl.js b/editor/js/ui/projects/tab-versionControl.js
index c5db3f251..ee8cb98f4 100644
--- a/editor/js/ui/projects/tab-versionControl.js
+++ b/editor/js/ui/projects/tab-versionControl.js
@@ -897,6 +897,7 @@ RED.sidebar.versionControl = (function() {
                         },
                         400: {
                             'git_push_failed': function(err) {
+                                // TODO: better message
                                 RED.notify(RED._("sidebar.project.versionControl.pushFailed"),"error");
                             },
                             'unexpected_error': function(error) {
diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json
index 01905db93..34e527c19 100644
--- a/red/api/editor/locales/en-US/editor.json
+++ b/red/api/editor/locales/en-US/editor.json
@@ -495,7 +495,7 @@
                 "createRemoteBranchPlaceholder": "Find or create a remote branch",
                 "trackedUpstreamBranch": "The created branch will be set as the tracked upstream branch.",
                 "selectUpstreamBranch": "The branch will be created. Select below to set it as the tracked upstream branch.",
-                "pushFailed": "Push failed as the remote has more recent commits. Pull and merge first, then push again.", // TODO: better message
+                "pushFailed": "Push failed as the remote has more recent commits. Pull and merge first, then push again.",
                 "push": "push",
                 "pull": "pull",
                 "unablePull": "<p>Unable to pull remote changes; your unstaged local changes would be overwritten.</p><p>Commit your changes and try again.</p>",

From 4f7d98aacee4cbd32f326ee1a3dee4655530399f Mon Sep 17 00:00:00 2001
From: Yuma Matsuura <yuma.matsuura.uj@hitachi-solutions.com>
Date: Mon, 28 May 2018 17:03:33 +0900
Subject: [PATCH 028/113] modify translate user settings

---
 editor/js/ui/projects/projectUserSettings.js | 16 ++++++++--------
 red/api/editor/locales/en-US/editor.json     | 16 ++++++++--------
 red/api/editor/locales/ja/editor.json        | 16 ++++++++--------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/editor/js/ui/projects/projectUserSettings.js b/editor/js/ui/projects/projectUserSettings.js
index a343a07cc..c13bd476f 100644
--- a/editor/js/ui/projects/projectUserSettings.js
+++ b/editor/js/ui/projects/projectUserSettings.js
@@ -27,7 +27,7 @@ RED.projects.userSettings = (function() {
         var title = $('<h3></h3>').text(RED._("editor:sidebar.project.userSettings.committerDetail")).appendTo(pane);
 
         var gitconfigContainer = $('<div class="user-settings-section"></div>').appendTo(pane);
-        $('<div style="color:#aaa;"></div>').appendTo(gitconfigContainer).text(RED._("editor:sidebar.project.userSettings.committer-tip"));
+        $('<div style="color:#aaa;"></div>').appendTo(gitconfigContainer).text(RED._("editor:sidebar.project.userSettings.committerTip"));
 
         var row = $('<div class="user-settings-row"></div>').appendTo(gitconfigContainer);
         $('<label for=""></label>').text(RED._("editor:sidebar.project.userSettings.userName")).appendTo(row);
@@ -45,7 +45,7 @@ RED.projects.userSettings = (function() {
         var container = $('<div class="user-settings-section"></div>').appendTo(pane);
         var popover;
         var title = $('<h3></h3>').text(RED._("editor:sidebar.project.userSettings.sshKeys")).appendTo(container);
-        var subtitle = $('<div style="color:#aaa;"></div>').appendTo(container).text(RED._("editor:sidebar.project.userSettings.sshKeys-tip"));
+        var subtitle = $('<div style="color:#aaa;"></div>').appendTo(container).text(RED._("editor:sidebar.project.userSettings.sshKeysTip"));
 
         var addKeyButton = $('<button id="user-settings-gitconfig-add-key" class="editor-button editor-button-small" style="float: right; margin-right: 10px;">'+RED._("editor:sidebar.project.userSettings.add")+'</button>')
             .appendTo(subtitle)
@@ -72,7 +72,7 @@ RED.projects.userSettings = (function() {
                 var validPassphrase = passphrase.length === 0 || passphrase.length >= 8;
                 passphraseInput.toggleClass('input-error',!validPassphrase);
                 if (!validPassphrase) {
-                    passphraseInputSubLabel.text(RED._("editor:sidebar.project.userSettings.passphrase-short"));
+                    passphraseInputSubLabel.text(RED._("editor:sidebar.project.userSettings.passphraseShort"));
                 } else if (passphrase.length === 0) {
                     passphraseInputSubLabel.text(RED._("editor:sidebar.project.userSettings.optional"));
                 } else {
@@ -91,11 +91,11 @@ RED.projects.userSettings = (function() {
 
         var row = $('<div class="user-settings-row"></div>').appendTo(container);
         var addKeyDialog = $('<div class="projects-dialog-list-dialog"></div>').hide().appendTo(row);
-        $('<div class="projects-dialog-list-dialog-header">').text(RED._("editor:sidebar.project.userSettings.add-sshKey")).appendTo(addKeyDialog);
+        $('<div class="projects-dialog-list-dialog-header">').text(RED._("editor:sidebar.project.userSettings.addSshKey")).appendTo(addKeyDialog);
         var addKeyDialogBody = $('<div>').appendTo(addKeyDialog);
 
         row = $('<div class="user-settings-row"></div>').appendTo(addKeyDialogBody);
-        $('<div style="color:#aaa;"></div>').appendTo(row).text(RED._("editor:sidebar.project.userSettings.add-sshKey-tip"));
+        $('<div style="color:#aaa;"></div>').appendTo(row).text(RED._("editor:sidebar.project.userSettings.addSshKeyTip"));
         // var bg = $('<div></div>',{class:"button-group", style:"text-align: center"}).appendTo(row);
         // var addLocalButton = $('<button class="editor-button toggle selected">use local key</button>').appendTo(bg);
         // var uploadButton = $('<button class="editor-button toggle">upload key</button>').appendTo(bg);
@@ -264,7 +264,7 @@ RED.projects.userSettings = (function() {
             utils.sendRequest(options);
 
             var formButtons = $('<span class="button-row" style="position: relative; float: right; margin: 10px;"></span>').appendTo(row);
-            $('<button class="editor-button editor-button-small">'+RED._("editor:sidebar.project.userSettings.copy-publicKey")+'</button>')
+            $('<button class="editor-button editor-button-small">'+RED._("editor:sidebar.project.userSettings.copyPublicKey")+'</button>')
                 .appendTo(formButtons)
                 .click(function(evt) {
                     try {
@@ -289,7 +289,7 @@ RED.projects.userSettings = (function() {
                 var container = $('<div class="projects-dialog-list-entry">').appendTo(row);
                 if (entry.empty) {
                     container.addClass('red-ui-search-empty');
-                    container.text(RED._("editor:sidebar.project.userSettings.no-sshKeys"));
+                    container.text(RED._("editor:sidebar.project.userSettings.noSshKeys"));
                     return;
                 }
                 var topRow = $('<div class="projects-dialog-ssh-key-header">').appendTo(container);
@@ -400,7 +400,7 @@ RED.projects.userSettings = (function() {
         utils = _utils;
         RED.userSettings.add({
             id:'gitconfig',
-            title: RED._("editor:sidebar.project.userSettings.git-config"), // TODO: nls
+            title: RED._("editor:sidebar.project.userSettings.gitConfig"),
             get: createSettingsPane,
             close: function() {
                 var currentGitSettings = RED.settings.get('git') || {};
diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json
index dfcef21a6..165a29088 100644
--- a/red/api/editor/locales/en-US/editor.json
+++ b/red/api/editor/locales/en-US/editor.json
@@ -437,25 +437,25 @@
             "editDependencies": "Edit project dependencies",
             "userSettings": {
                 "committerDetail": "Committer Details",
-                "committer-tip": "Leave blank to use system default",
+                "committerTip": "Leave blank to use system default",
                 "userName": "Username",
                 "email": "Email",
                 "sshKeys": "SSH Keys",
-                "sshKeys-tip": "Allows you to create secure connections to remote git repositories.",
+                "sshKeysTip": "Allows you to create secure connections to remote git repositories.",
                 "add": "add key",
-                "add-sshKey": "Add SSH Key",
-                "add-sshKey-tip": "Generate a new public/private key pair",
+                "addSshKey": "Add SSH Key",
+                "addSshKeyTip": "Generate a new public/private key pair",
                 "name": "Name",
                 "nameRule": "Must contain only A-Z 0-9 _ -",
                 "passphrase": "Passphrase",
-                "passphrase-short": "Passphrase too short",
+                "passphraseShort": "Passphrase too short",
                 "optional": "Optional",
                 "cancel": "Cancel",
                 "generate": "Generate key",
-                "no-sshKeys": "No SSH keys",
-                "copy-publicKey": "Copy public key to clipboard",
+                "noSshKeys": "No SSH keys",
+                "copyPublicKey": "Copy public key to clipboard",
                 "delete": "Delete key",
-                "git-config": "Git config",
+                "gitConfig": "Git config",
                 "deleteConfirm": "Are you sure you want to delete the SSH key __name__? This cannot be undone."
             } 
         }
diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json
index 999dc3422..3ed45e9e7 100644
--- a/red/api/editor/locales/ja/editor.json
+++ b/red/api/editor/locales/ja/editor.json
@@ -427,25 +427,25 @@
             "editDependencies": "プロジェクトの依存関係を編集",
             "userSettings": {
                 "committerDetail": "コミッター詳細",
-                "committer-tip": "システムのデフォルトを使用する場合、空白のままにしてください",
+                "committerTip": "システムのデフォルトを使用する場合、空白のままにしてください",
                 "userName": "ユーザ名",
                 "email": "メールアドレス",
                 "sshKeys": "SSH キー",
-                "sshKeys-tip": "gitリポジトリへのセキュアな接続を作成できます。",
+                "sshKeysTip": "gitリポジトリへのセキュアな接続を作成できます。",
                 "add": "キーを追加",
-                "add-sshKey": "SSHキーを追加",
-                "add-sshKey-tip": "新しい公開鍵/秘密鍵ペアを生成します",
+                "addSshKey": "SSHキーを追加",
+                "addSshKeyTip": "新しい公開鍵/秘密鍵ペアを生成します",
                 "name": "名前",
                 "nameRule": "A-Z 0-9 _ - のみを含む",
                 "passphrase": "パスフレーズ",
-                "passphrase-short": "パスフレーズが短すぎます",
+                "passphraseShort": "パスフレーズが短すぎます",
                 "optional": "任意",
                 "cancel": "中止",
                 "generate": "キーを生成",
-                "no-sshKeys": "SSHキーがありません",
-                "copy-publicKey": "公開鍵をクリップボードにコピー",
+                "noSshKeys": "SSHキーがありません",
+                "copyPublicKey": "公開鍵をクリップボードにコピー",
                 "delete": "キーを削除",
-                "git-config": "Git設定",
+                "gitConfig": "Git設定",
                 "deleteConfirm": "SSHキー __name__ を削除してもよいですか？ 削除したSSHキーを元に戻すことはできません。"
             }
         }

From de43148341f5c381a9a1409c4a1c2dbbb0c5f080 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Wed, 30 May 2018 20:32:56 +0900
Subject: [PATCH 029/113] change current_locale to getCurrentLocale

---
 red/runtime/i18n.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/red/runtime/i18n.js b/red/runtime/i18n.js
index 336a2c9a6..b34564f47 100644
--- a/red/runtime/i18n.js
+++ b/red/runtime/i18n.js
@@ -81,7 +81,7 @@ var MessageFileLoader = {
 
 }
 
-function current_locale() {
+function getCurrentLocale() {
     var env = process.env;
     for (var name of ['LC_ALL', 'LC_MESSAGES', 'LANG']) {
         if (name in env) {
@@ -102,7 +102,7 @@ function init() {
             },
             fallbackLng: [defaultLang]
         };
-        var lang = current_locale();
+        var lang = getCurrentLocale();
         if (lang) {
             opt.lng = lang;
         }

From 0a0ca380d3773862ec64dbd44bafd852bb50c60c Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 30 May 2018 13:32:38 +0100
Subject: [PATCH 030/113] Ensure apiMaxLength applies to HTTP Nodes Fixes #1278

---
 nodes/core/io/21-httpin.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nodes/core/io/21-httpin.js b/nodes/core/io/21-httpin.js
index d71a7fa29..43e25b56f 100644
--- a/nodes/core/io/21-httpin.js
+++ b/nodes/core/io/21-httpin.js
@@ -21,8 +21,6 @@ module.exports = function(RED) {
     var cookieParser = require("cookie-parser");
     var getBody = require('raw-body');
     var cors = require('cors');
-    var jsonParser = bodyParser.json();
-    var urlencParser = bodyParser.urlencoded({extended:true});
     var onHeaders = require('on-headers');
     var typer = require('media-typer');
     var isUtf8 = require('is-utf8');
@@ -212,6 +210,10 @@ module.exports = function(RED) {
                 }
             }
 
+            var maxApiRequestSize = RED.settings.apiMaxLength || '5mb';
+            var jsonParser = bodyParser.json({limit:maxApiRequestSize});
+            var urlencParser = bodyParser.urlencoded({limit:maxApiRequestSize,extended:true});
+
             var metricsHandler = function(req,res,next) { next(); }
             if (this.metric()) {
                 metricsHandler = function(req, res, next) {

From 5a70bea67ad7b40ce349e4179f4a578b1228a6fe Mon Sep 17 00:00:00 2001
From: Yuma Matsuura <yuma.matsuura.uj@hitachi-solutions.com>
Date: Mon, 28 May 2018 16:00:32 +0900
Subject: [PATCH 031/113] add translate project diff

---
 editor/js/ui/diff.js                     | 12 ++++++------
 red/api/editor/locales/en-US/editor.json |  8 ++++++--
 red/api/editor/locales/ja/editor.json    |  7 ++++++-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/editor/js/ui/diff.js b/editor/js/ui/diff.js
index 4a305eb6c..97a92178b 100644
--- a/editor/js/ui/diff.js
+++ b/editor/js/ui/diff.js
@@ -1233,7 +1233,7 @@ RED.diff = (function() {
         // currentDiff = diff;
 
         var trayOptions = {
-            title: options.title||"Review Changes", //TODO: nls
+            title: options.title||RED._("diff.reviewChanges"),
             width: Infinity,
             overlay: true,
             buttons: [
@@ -1416,7 +1416,7 @@ RED.diff = (function() {
 
     function showTextDiff(textA,textB) {
         var trayOptions = {
-            title: "Compare Changes", //TODO: nls
+            title: RED._("diff.compareChanges"),
             width: Infinity,
             overlay: true,
             buttons: [
@@ -1797,7 +1797,7 @@ RED.diff = (function() {
             if (isBinary) {
                 var diffBinaryRow = $('<tr class="node-text-diff-header">').appendTo(codeBody);
                 var binaryContent = $('<td colspan="3"></td>').appendTo(diffBinaryRow);
-                $('<span></span>').text("Cannot show binary file contents").appendTo(binaryContent);
+                $('<span></span>').text(RED._("diff.noBinaryFileShowed")).appendTo(binaryContent);
 
             } else {
                 if (commitOptions.unmerged) {
@@ -1946,7 +1946,7 @@ RED.diff = (function() {
     function showCommitDiff(options) {
         var commit = parseCommitDiff(options.commit);
         var trayOptions = {
-            title: "View Commit Changes", //TODO: nls
+            title: RED._("diff.viewCommitDiff"),
             width: Infinity,
             overlay: true,
             buttons: [
@@ -2008,7 +2008,7 @@ RED.diff = (function() {
         }
 
         var trayOptions = {
-            title: title||"Compare Changes", //TODO: nls
+            title: title|| RED._("diff.compareChanges"),
             width: Infinity,
             overlay: true,
             buttons: [
@@ -2041,7 +2041,7 @@ RED.diff = (function() {
             trayOptions.buttons.push(
                 {
                     id: "node-diff-view-resolve-diff",
-                    text: "Save conflict resolution",
+                    text: RED._("diff.saveConflict"),
                     class: "primary disabled",
                     click: function() {
                         if (!$("#node-diff-view-resolve-diff").hasClass('disabled')) {
diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json
index d827ba092..bcfe55972 100644
--- a/red/api/editor/locales/en-US/editor.json
+++ b/red/api/editor/locales/en-US/editor.json
@@ -193,8 +193,12 @@
         "nodeCount": "__count__ node",
         "nodeCount_plural": "__count__ nodes",
         "local":"Local changes",
-        "remote":"Remote changes"
-
+        "remote":"Remote changes",
+        "reviewChanges": "Review Changes",
+        "noBinaryFileShowed": "Cannot show binary file contents",
+        "viewCommitDiff": "View Commit Changes",
+        "compareChanges": "Compare Changes",
+        "saveConflict": "Save conflict resolution"
     },
     "subflow": {
         "editSubflow": "Edit flow template: __name__",
diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json
index 68e4fc517..8d3c958ff 100644
--- a/red/api/editor/locales/ja/editor.json
+++ b/red/api/editor/locales/ja/editor.json
@@ -188,7 +188,12 @@
         "nodeCount": "__count__ 個のノード",
         "nodeCount_plural": "__count__ 個のノード",
         "local": "ローカルの変更",
-        "remote": "リモートの変更"
+        "remote": "リモートの変更",
+        "reviewChanges": "変更を表示",
+        "noBinaryFileShowed": "バイナリファイルの中身は表示することができません",
+        "viewCommitDiff": "コミットの内容を表示",
+        "compareChanges": "変更を比較",
+        "saveConflict": "解決して保存"
     },
     "subflow": {
         "editSubflow": "フローのテンプレートを編集: __name__",

From 9e87a605976027bb6f3cdfe9dc5f7371a6bfe22e Mon Sep 17 00:00:00 2001
From: Yuma Matsuura <yuma.matsuura.uj@hitachi-solutions.com>
Date: Wed, 30 May 2018 17:07:45 +0900
Subject: [PATCH 032/113] modify translate project diff

---
 editor/js/ui/diff.js                     | 10 +++++-----
 red/api/editor/locales/en-US/editor.json |  6 +++++-
 red/api/editor/locales/ja/editor.json    |  6 +++++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/editor/js/ui/diff.js b/editor/js/ui/diff.js
index 97a92178b..eb822df1e 100644
--- a/editor/js/ui/diff.js
+++ b/editor/js/ui/diff.js
@@ -1747,7 +1747,7 @@ RED.diff = (function() {
                         try {
                             commonFlow = JSON.parse(commonVersion.content||"[]");
                         } catch(err) {
-                            console.log("Common Version doesn't contain valid JSON:",commonVersionUrl);
+                            console.log(RED._("diff.commonVersionError"),commonVersionUrl);
                             console.log(err);
                             return;
                         }
@@ -1755,7 +1755,7 @@ RED.diff = (function() {
                     try {
                         oldFlow = JSON.parse(oldVersion.content||"[]");
                     } catch(err) {
-                        console.log("Old Version doesn't contain valid JSON:",oldVersionUrl);
+                        console.log(RED._("diff.oldVersionError"),oldVersionUrl);
                         console.log(err);
                         return;
                     }
@@ -1765,7 +1765,7 @@ RED.diff = (function() {
                     try {
                         newFlow = JSON.parse(newVersion.content||"[]");
                     } catch(err) {
-                        console.log("New Version doesn't contain valid JSON:",newFlow);
+                        console.log(RED._("diff.newVersionError"),newFlow);
                         console.log(err);
                         return;
                     }
@@ -1801,7 +1801,7 @@ RED.diff = (function() {
 
             } else {
                 if (commitOptions.unmerged) {
-                    conflictHeader = $('<span style="float: right;"><span>'+resolvedConflicts+'</span> of <span>'+unresolvedConflicts+'</span> conflicts resolved</span>').appendTo(content);
+                    conflictHeader = $('<span style="float: right;">'+RED._("diff.conflictHeader",{resolved:resolvedConflicts, unresolved:unresolvedConflicts})+'</span>').appendTo(content);
                 }
                 hunks.forEach(function(hunk) {
                     var diffRow = $('<tr class="node-text-diff-header">').appendTo(codeBody);
@@ -1914,7 +1914,7 @@ RED.diff = (function() {
                                         diffRow.remove();
                                         addedRows.find(".linetext").addClass('added');
                                         conflictHeader.empty();
-                                        $('<span><span>'+resolvedConflicts+'</span> of <span>'+unresolvedConflicts+'</span> conflicts resolved</span>').appendTo(conflictHeader);
+                                        $('<span>'+RED._("diff.conflictHeader",{resolved:resolvedConflicts, unresolved:unresolvedConflicts})+'</span>').appendTo(conflictHeader);
 
                                         conflictResolutions[file.file] = conflictResolutions[file.file] || {};
                                         conflictResolutions[file.file][hunk.localChangeStart] = {
diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json
index bcfe55972..96af46b9c 100644
--- a/red/api/editor/locales/en-US/editor.json
+++ b/red/api/editor/locales/en-US/editor.json
@@ -198,7 +198,11 @@
         "noBinaryFileShowed": "Cannot show binary file contents",
         "viewCommitDiff": "View Commit Changes",
         "compareChanges": "Compare Changes",
-        "saveConflict": "Save conflict resolution"
+        "saveConflict": "Save conflict resolution",
+        "conflictHeader": "<span>__resolved__</span> of <span>__unresolved__</span> conflicts resolved",
+        "commonVersionError": "Common Version doesn't contain valid JSON:",
+        "oldVersionError": "Old Version doesn't contain valid JSON:",
+        "newVersionError": "New Version doesn't contain valid JSON:"
     },
     "subflow": {
         "editSubflow": "Edit flow template: __name__",
diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json
index 8d3c958ff..17dcefb1e 100644
--- a/red/api/editor/locales/ja/editor.json
+++ b/red/api/editor/locales/ja/editor.json
@@ -193,7 +193,11 @@
         "noBinaryFileShowed": "バイナリファイルの中身は表示することができません",
         "viewCommitDiff": "コミットの内容を表示",
         "compareChanges": "変更を比較",
-        "saveConflict": "解決して保存"
+        "saveConflict": "解決して保存",
+        "conflictHeader": "<span>__unresolved__</span> 個中 <span>__resolved__</span> 個のコンフリクトを解決",
+        "commonVersionError": "共通バージョンは正しいJSON形式ではありません:",
+        "oldVersionError": "古いバージョンは正しいJSON形式ではありません:",
+        "newVersionError": "新しいバージョンは正しいJSON形式ではありません:"
     },
     "subflow": {
         "editSubflow": "フローのテンプレートを編集: __name__",

From ab788bc1e3b9decc6e55979b3b6d7e5e1d82468a Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Fri, 1 Jun 2018 12:58:09 +0900
Subject: [PATCH 033/113] Add i18n support for projectSettings.js

---
 editor/js/ui/projects/projectSettings.js | 112 +++++++++++++----------
 red/api/editor/locales/en-US/editor.json |  39 ++++++++
 red/api/editor/locales/ja/editor.json    |  38 ++++++++
 3 files changed, 140 insertions(+), 49 deletions(-)

diff --git a/editor/js/ui/projects/projectSettings.js b/editor/js/ui/projects/projectSettings.js
index 91dbb57ff..b5ee024a1 100644
--- a/editor/js/ui/projects/projectSettings.js
+++ b/editor/js/ui/projects/projectSettings.js
@@ -49,7 +49,7 @@ RED.projects.settings = (function() {
         var tabContainer;
 
         var trayOptions = {
-            title: "Project Settings",// RED._("menu.label.userSettings"),, // TODO: nls
+            title: RED._("menu.label.userSettings"),
             buttons: [
                 {
                     id: "node-dialog-ok",
@@ -173,14 +173,14 @@ RED.projects.settings = (function() {
         container.empty();
         var bg = $('<span class="button-row" style="position: relative; float: right; margin-right:0;"></span>').appendTo(container);
         var input = $('<input type="text" style="width: calc(100% - 150px); margin-right: 10px;">').val(summary||"").appendTo(container);
-        $('<button class="editor-button">Cancel</button>')
+        $('<button class="editor-button">' + RED._("common.label.cancel") + '</button>')
             .appendTo(bg)
             .click(function(evt) {
                 evt.preventDefault();
                 updateProjectSummary(activeProject.summary, container);
                 editButton.show();
             });
-        $('<button class="editor-button">Save</button>')
+        $('<button class="editor-button">' + RED._("common.label.save") + '</button>')
             .appendTo(bg)
             .click(function(evt) {
                 evt.preventDefault();
@@ -223,7 +223,7 @@ RED.projects.settings = (function() {
         if (summary) {
             container.text(summary).removeClass('node-info-node');
         } else {
-            container.text("No summary available").addClass('node-info-none');// TODO: nls
+            container.text(RED._("sidebar.project.projectSettings.noSummaryAvailable")).addClass('node-info-none');
         }
     }
 
@@ -235,7 +235,8 @@ RED.projects.settings = (function() {
         var summaryContent = $('<div></div>',{style:"color: #999"}).appendTo(summary);
         updateProjectSummary(activeProject.summary, summaryContent);
         if (RED.user.hasPermission("projects.write")) {
-            $('<button class="editor-button editor-button-small" style="float: right;">edit description</button>')
+            $('<button class="editor-button editor-button-small" style="float: right;">'
+            + RED._('sidebar.project.editDescription') + '</button>')
                 .prependTo(summary)
                 .click(function(evt) {
                     evt.preventDefault();
@@ -250,7 +251,8 @@ RED.projects.settings = (function() {
         updateProjectDescription(activeProject, descriptionContent);
 
         if (RED.user.hasPermission("projects.write")) {
-            $('<button class="editor-button editor-button-small" style="float: right;">edit README.md</button>')
+            $('<button class="editor-button editor-button-small" style="float: right;">'
+            + RED._('sidebar.project.editReadme') + '</button>')
                 .prependTo(description)
                 .click(function(evt) {
                     evt.preventDefault();
@@ -316,7 +318,7 @@ RED.projects.settings = (function() {
         //     depsList.editableList('addItem',{index:3, label:"Unused dependencies"}); // TODO: nls
         // }
         if (totalCount === 0) {
-            depsList.editableList('addItem',{index:0, label:"None"}); // TODO: nls
+            depsList.editableList('addItem',{index:0, label:RED._("sidebar.project.projectSettings.none")});
         }
 
     }
@@ -381,7 +383,8 @@ RED.projects.settings = (function() {
     function createDependenciesPane(activeProject) {
         var pane = $('<div id="project-settings-tab-deps" class="project-settings-tab-pane node-help"></div>');
         if (RED.user.hasPermission("projects.write")) {
-            $('<button class="editor-button editor-button-small" style="margin-top:10px;float: right;">edit</button>')
+            $('<button class="editor-button editor-button-small" style="margin-top:10px;float: right;">'
+            + RED._("sidebar.project.projectSettings.edit") + '</button>')
                 .appendTo(pane)
                 .click(function(evt) {
                     evt.preventDefault();
@@ -451,7 +454,8 @@ RED.projects.settings = (function() {
                     var buttons = $('<div class="palette-module-button-group"></div>').appendTo(metaRow);
                     if (RED.user.hasPermission("projects.write")) {
                         if (!entry.installed && RED.settings.theme('palette.editable') !== false) {
-                            $('<a href="#" class="editor-button editor-button-small">install</a>').appendTo(buttons)
+                            $('<a href="#" class="editor-button editor-button-small">'
+                            + RED._("sidebar.project.projectSettings.install") + '</a>').appendTo(buttons)
                                 .click(function(evt) {
                                     evt.preventDefault();
                                     RED.palette.editor.install(entry,row,function(err) {
@@ -468,7 +472,8 @@ RED.projects.settings = (function() {
                                     });
                                 })
                         } else if (entry.known && entry.count === 0) {
-                            $('<a href="#" class="editor-button editor-button-small">remove from project</a>').appendTo(buttons)
+                            $('<a href="#" class="editor-button editor-button-small">'
+                            + RED._("sidebar.project.projectSettings.removeFromProject") + '</a>').appendTo(buttons)
                                 .click(function(evt) {
                                     evt.preventDefault();
                                     var deps = $.extend(true, {}, activeProject.dependencies);
@@ -484,7 +489,8 @@ RED.projects.settings = (function() {
                                     });
                                 });
                         } else if (!entry.known) {
-                            $('<a href="#" class="editor-button editor-button-small">add to project</a>').appendTo(buttons)
+                            $('<a href="#" class="editor-button editor-button-small">'
+                            + RED._("sidebar.project.projectSettings.addToProject") + '</a>').appendTo(buttons)
                                 .click(function(evt) {
                                     evt.preventDefault();
                                     var deps = $.extend(true, {}, activeProject.dependencies);
@@ -723,10 +729,11 @@ RED.projects.settings = (function() {
     // }
 
     function createFilesSection(activeProject,pane) {
-        var title = $('<h3></h3>').text("Files").appendTo(pane);
+        var title = $('<h3></h3>').text(RED._("sidebar.project.projectSettings.files")).appendTo(pane);
         var filesContainer = $('<div class="user-settings-section"></div>').appendTo(pane);
         if (RED.user.hasPermission("projects.write")) {
-            var editFilesButton = $('<button class="editor-button editor-button-small" style="float: right;">edit</button>')
+            var editFilesButton = $('<button class="editor-button editor-button-small" style="float: right;">'
+            + RED._('sidebar.project.projectSettings.edit') + '</button>')
                 .appendTo(title)
                 .click(function(evt) {
                     evt.preventDefault();
@@ -750,7 +757,7 @@ RED.projects.settings = (function() {
 
         // Flow files
         row = $('<div class="user-settings-row"></div>').appendTo(filesContainer);
-        $('<label for=""></label>').text('Flow').appendTo(row);
+        $('<label for=""></label>').text(RED._("sidebar.project.projectSettings.flow")).appendTo(row);
         var flowFileLabel = $('<div class="uneditable-input" style="padding:0">').appendTo(row);
         var flowFileLabelText = $('<span style="display:inline-block; padding: 6px">').text(activeProject.files.flow).appendTo(flowFileLabel);
 
@@ -787,7 +794,7 @@ RED.projects.settings = (function() {
             })
 
         row = $('<div class="user-settings-row"></div>').appendTo(filesContainer);
-        $('<label for=""></label>').text('Credentials').appendTo(row);
+        $('<label for=""></label>').text(RED._("sidebar.project.projectSettings.credentials")).appendTo(row);
         var credFileLabel = $('<div class="uneditable-input">').text(activeProject.files.credentials).appendTo(row);
         var credFileInput = $('<div class="uneditable-input">').text(activeProject.files.credentials).hide().insertAfter(credFileLabel);
 
@@ -899,12 +906,15 @@ RED.projects.settings = (function() {
 
         var credentialFormRows = $('<div>',{style:"margin-top:10px"}).hide().appendTo(credentialStateLabel);
 
-        var credentialSetLabel = $('<div style="margin: 20px 0 10px 5px;">Set the encryption key:</div>').hide().appendTo(credentialFormRows);
-        var credentialChangeLabel = $('<div style="margin: 20px 0 10px 5px;">Change the encryption key:</div>').hide().appendTo(credentialFormRows);
-        var credentialResetLabel = $('<div style="margin: 20px 0 10px 5px;">Reset the encryption key:</div>').hide().appendTo(credentialFormRows);
+        var credentialSetLabel = $('<div style="margin: 20px 0 10px 5px;">'
+        + RED._("sidebar.project.projectSettings.setTheEncryptionKey") + '</div>').hide().appendTo(credentialFormRows);
+        var credentialChangeLabel = $('<div style="margin: 20px 0 10px 5px;">'
+        + RED._("sidebar.project.projectSettings.changeTheEncryptionKey") + '</div>').hide().appendTo(credentialFormRows);
+        var credentialResetLabel = $('<div style="margin: 20px 0 10px 5px;">'
+        + RED._("sidebar.project.projectSettings.resetTheEncryptionKey") + '</div>').hide().appendTo(credentialFormRows);
 
         var credentialSecretExistingRow = $('<div class="user-settings-row user-settings-row-credentials"></div>').appendTo(credentialFormRows);
-        $('<label for=""></label>').text('Current key').appendTo(credentialSecretExistingRow);
+        $('<label for=""></label>').text(RED._("sidebar.project.projectSettings.currentKey")).appendTo(credentialSecretExistingRow);
         var credentialSecretExistingInput = $('<input type="password">').appendTo(credentialSecretExistingRow)
             .on("change keyup paste",function() {
                 if (popover) {
@@ -917,10 +927,11 @@ RED.projects.settings = (function() {
         var credentialSecretNewRow = $('<div class="user-settings-row user-settings-row-credentials"></div>').appendTo(credentialFormRows);
 
 
-        $('<label for=""></label>').text('New key').appendTo(credentialSecretNewRow);
+        $('<label for=""></label>').text(RED._("sidebar.project.projectSettings.newKey")).appendTo(credentialSecretNewRow);
         var credentialSecretNewInput = $('<input type="password">').appendTo(credentialSecretNewRow).on("change keyup paste",checkFiles);
 
-        var credentialResetWarning = $('<div class="form-tips form-warning" style="margin: 10px;"><i class="fa fa-warning"></i> This will delete all existing credentials</div>').hide().appendTo(credentialFormRows);
+        var credentialResetWarning = $('<div class="form-tips form-warning" style="margin: 10px;"><i class="fa fa-warning"></i>'
+        + RED._("sidebar.project.projectSettings.credentialsAlert") + '</div>').hide().appendTo(credentialFormRows);
 
 
         var hideEditForm = function() {
@@ -950,13 +961,13 @@ RED.projects.settings = (function() {
         }
 
         var formButtons = $('<span class="button-row" style="position: relative; float: right; margin-right:0;"></span>').hide().appendTo(filesContainer);
-        $('<button class="editor-button">Cancel</button>')
+        $('<button class="editor-button">' + RED._("common.label.cancel") + '</button>')
             .appendTo(formButtons)
             .click(function(evt) {
                 evt.preventDefault();
                 hideEditForm();
             });
-        var saveButton = $('<button class="editor-button">Save</button>')
+        var saveButton = $('<button class="editor-button">' + RED._("common.label.save") + '</button>')
             .appendTo(formButtons)
             .click(function(evt) {
                 evt.preventDefault();
@@ -1032,13 +1043,13 @@ RED.projects.settings = (function() {
         var updateForm = function() {
             if (activeProject.settings.credentialSecretInvalid) {
                 credentialStateLabel.find(".user-settings-credentials-state-icon").removeClass().addClass("user-settings-credentials-state-icon fa fa-warning");
-                credentialStateLabel.find(".user-settings-credentials-state").text("Invalid encryption key");
+                credentialStateLabel.find(".user-settings-credentials-state").text(RED._("sidebar.project.projectSettings.invalidEncryptionKey"));
             } else if (activeProject.settings.credentialsEncrypted) {
                 credentialStateLabel.find(".user-settings-credentials-state-icon").removeClass().addClass("user-settings-credentials-state-icon fa fa-lock");
-                credentialStateLabel.find(".user-settings-credentials-state").text("Encryption enabled");
+                credentialStateLabel.find(".user-settings-credentials-state").text(RED._("sidebar.project.projectSettings.encryptionEnabled"));
             } else {
                 credentialStateLabel.find(".user-settings-credentials-state-icon").removeClass().addClass("user-settings-credentials-state-icon fa fa-unlock");
-                credentialStateLabel.find(".user-settings-credentials-state").text("Encryption disabled");
+                credentialStateLabel.find(".user-settings-credentials-state").text(RED._("sidebar.project.projectSettings.encryptionDisabled"));
             }
             credentialSecretResetButton.toggleClass('disabled',!activeProject.settings.credentialSecretInvalid && !activeProject.settings.credentialsEncrypted);
             credentialSecretResetButton.prop('disabled',!activeProject.settings.credentialSecretInvalid && !activeProject.settings.credentialsEncrypted);
@@ -1050,7 +1061,7 @@ RED.projects.settings = (function() {
 
     function createLocalBranchListSection(activeProject,pane) {
         var localBranchContainer = $('<div class="user-settings-section"></div>').appendTo(pane);
-        $('<h4></h4>').text("Branches").appendTo(localBranchContainer);
+        $('<h4></h4>').text(RED._("sidebar.project.projectSettings.branches")).appendTo(localBranchContainer);
 
         var row = $('<div class="user-settings-row projects-dialog-list"></div>').appendTo(localBranchContainer);
 
@@ -1063,7 +1074,7 @@ RED.projects.settings = (function() {
                 var container = $('<div class="projects-dialog-list-entry">').appendTo(row);
                 if (entry.empty) {
                     container.addClass('red-ui-search-empty');
-                    container.text("No branches");
+                    container.text(RED._("sidebar.project.projectSettings.noBranches"));
                     return;
                 }
                 if (entry.current) {
@@ -1095,7 +1106,7 @@ RED.projects.settings = (function() {
                         .click(function(e) {
                             e.preventDefault();
                             var spinner = utils.addSpinnerOverlay(row).addClass('projects-dialog-spinner-contain');
-                            var notification = RED.notify("Are you sure you want to delete the local branch '"+entry.name+"'? This cannot be undone.", {
+                            var notification = RED.notify(RED._("sidebar.project.projectSettings.deleteConfirm", { name: entry.name }), {
                                 type: "warning",
                                 modal: true,
                                 fixed: true,
@@ -1123,7 +1134,7 @@ RED.projects.settings = (function() {
                                                     },
                                                     400: {
                                                         'git_delete_branch_unmerged': function(error) {
-                                                            notification = RED.notify("The local branch '"+entry.name+"' has unmerged changes that will be lost. Are you sure you want to delete it?", {
+                                                            notification = RED.notify(RED._("sidebar.project.projectSettings.unmergedConfirm", { name: entry.name }), {
                                                                 type: "warning",
                                                                 modal: true,
                                                                 fixed: true,
@@ -1135,7 +1146,7 @@ RED.projects.settings = (function() {
                                                                             notification.close();
                                                                         }
                                                                     },{
-                                                                        text: 'Delete unmerged branch',
+                                                                        text: RED._("sidebar.project.projectSettings.deleteUnmergedBranch"),
                                                                         click: function() {
                                                                             options.url += "?force=true";
                                                                             notification.close();
@@ -1183,14 +1194,15 @@ RED.projects.settings = (function() {
     }
 
     function createRemoteRepositorySection(activeProject,pane) {
-        $('<h3></h3>').text("Version Control").appendTo(pane);
+        $('<h3></h3>').text(RED._("sidebar.project.projectSettings.versionControl")).appendTo(pane);
 
         createLocalBranchListSection(activeProject,pane);
 
         var repoContainer = $('<div class="user-settings-section"></div>').appendTo(pane);
-        var title = $('<h4></h4>').text("Git remotes").appendTo(repoContainer);
+        var title = $('<h4></h4>').text(RED._("sidebar.project.projectSettings.gitRemotes")).appendTo(repoContainer);
 
-        var editRepoButton = $('<button class="editor-button editor-button-small" style="float: right; margin-right: 10px;">add remote</button>')
+        var editRepoButton = $('<button class="editor-button editor-button-small" style="float: right; margin-right: 10px;">'
+        + RED._("sidebar.project.projectSettings.addRemote") + '</button>')
             .appendTo(title)
             .click(function(evt) {
                 editRepoButton.attr('disabled',true);
@@ -1221,7 +1233,7 @@ RED.projects.settings = (function() {
                 var container = $('<div class="projects-dialog-list-entry">').appendTo(row);
                 if (entry.empty) {
                     container.addClass('red-ui-search-empty');
-                    container.text("No remotes");
+                    container.text(RED._("sidebar.project.projectSettings.noRemotes"));
                     return;
                 } else {
                     $('<span class="entry-icon"><i class="fa fa-globe"></i></span>').appendTo(container);
@@ -1240,7 +1252,7 @@ RED.projects.settings = (function() {
                         .click(function(e) {
                             e.preventDefault();
                             var spinner = utils.addSpinnerOverlay(row).addClass('projects-dialog-spinner-contain');
-                            var notification = RED.notify("Are you sure you want to delete the remote '"+entry.name+"'?", {
+                            var notification = RED.notify(RED._("sidebar.project.projectSettings.deleteRemoteConfrim", { name: entry.name }), {
                                 type: "warning",
                                 modal: true,
                                 fixed: true,
@@ -1252,7 +1264,7 @@ RED.projects.settings = (function() {
                                             notification.close();
                                         }
                                     },{
-                                        text: 'Delete remote',
+                                        text: RED._("sidebar.project.projectSettings.deleteRemote"),
                                         click: function() {
                                             notification.close();
 
@@ -1315,10 +1327,10 @@ RED.projects.settings = (function() {
             // var validRepo = /^(?:file|git|ssh|https?|[\d\w\.\-_]+@[\w\.]+):(?:\/\/)?[\w\.@:\/~_-]+(?:\.git)?(?:\/?|\#[\d\w\.\-_]+?)$/.test(remoteURLInput.val());
             var validRepo = repo.length > 0 && !/\s/.test(repo);
             if (/^https?:\/\/[^/]+@/i.test(repo)) {
-                remoteURLLabel.text("Do not include the username/password in the url");
+                remoteURLLabel.text(RED._("sidebar.project.projectSettings.urlRule2"));
                 validRepo = false;
             } else {
-                remoteURLLabel.text("https://, ssh:// or file://");
+                remoteURLLabel.text(RED._("sidebar.project.projectSettings.urlRule"));
             }
             saveButton.attr('disabled',(!validName || !validRepo))
             remoteNameInput.toggleClass('input-error',remoteNameInputChanged&&!validName);
@@ -1332,22 +1344,24 @@ RED.projects.settings = (function() {
         var remoteNameInputChanged = false;
         var remoteURLInputChanged = false;
 
-        $('<div class="projects-dialog-list-dialog-header">').text('Add remote').appendTo(addRemoteDialog);
+        $('<div class="projects-dialog-list-dialog-header">').text(RED._('sidebar.project.projectSettings.addRemote2')).appendTo(addRemoteDialog);
 
         row = $('<div class="user-settings-row"></div>').appendTo(addRemoteDialog);
-        $('<label for=""></label>').text('Remote name').appendTo(row);
+        $('<label for=""></label>').text(RED._("sidebar.project.projectSettings.remoteName")).appendTo(row);
         var remoteNameInput = $('<input type="text">').appendTo(row).on("change keyup paste",function() {
             remoteNameInputChanged = true;
             validateForm();
         });
-        $('<label class="projects-edit-form-sublabel"><small>Must contain only A-Z 0-9 _ -</small></label>').appendTo(row).find("small");
+        $('<label class="projects-edit-form-sublabel"><small>'
+        + RED._("sidebar.project.projectSettings.nameRule") + '</small></label>').appendTo(row).find("small");
         row = $('<div class="user-settings-row"></div>').appendTo(addRemoteDialog);
-        $('<label for=""></label>').text('URL').appendTo(row);
+        $('<label for=""></label>').text(RED._("sidebar.project.projectSettings.url")).appendTo(row);
         var remoteURLInput = $('<input type="text">').appendTo(row).on("change keyup paste",function() {
             remoteURLInputChanged = true;
             validateForm()
         });
-        var remoteURLLabel = $('<label class="projects-edit-form-sublabel"><small>https://, ssh:// or file://</small></label>').appendTo(row).find("small");
+        var remoteURLLabel = $('<label class="projects-edit-form-sublabel"><small>'
+        + RED._("sidebar.project.projectSettings.urlRule") +'</small></label>').appendTo(row).find("small");
 
         var hideEditForm = function() {
             editRepoButton.attr('disabled',false);
@@ -1361,13 +1375,13 @@ RED.projects.settings = (function() {
         }
         var formButtons = $('<span class="button-row" style="position: relative; float: right; margin: 10px;"></span>')
             .appendTo(addRemoteDialog);
-        $('<button class="editor-button">Cancel</button>')
+        $('<button class="editor-button">' + RED._("common.label.cancel") + '</button>')
             .appendTo(formButtons)
             .click(function(evt) {
                 evt.preventDefault();
                 hideEditForm();
             });
-        var saveButton = $('<button class="editor-button">Add remote</button>')
+        var saveButton = $('<button class="editor-button">' + RED._("sidebar.project.projectSettings.addRemote2") + '</button>')
             .appendTo(formButtons)
             .click(function(evt) {
                 evt.preventDefault();
@@ -1484,19 +1498,19 @@ RED.projects.settings = (function() {
         utils = _utils;
         addPane({
             id:'main',
-            title: "Project", // TODO: nls
+            title: RED._("sidebar.project.name"),
             get: createMainPane,
             close: function() { }
         });
         addPane({
             id:'deps',
-            title: "Dependencies", // TODO: nls
+            title: RED._("sidebar.project.dependencies"),
             get: createDependenciesPane,
             close: function() { }
         });
         addPane({
             id:'settings',
-            title: "Settings", // TODO: nls
+            title: RED._("sidebar.project.settings"),
             get: createSettingsPane,
             close: function() {
                 if (popover) {
diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json
index b2285f566..af62248da 100644
--- a/red/api/editor/locales/en-US/editor.json
+++ b/red/api/editor/locales/en-US/editor.json
@@ -467,8 +467,47 @@
             "description": "Description",
             "dependencies": "Dependencies",
             "settings": "Settings",
+            "noSummaryAvailable": "No summary available",
             "editDescription": "Edit project description",
             "editDependencies": "Edit project dependencies",
+            "editReadme": "Edit README.md",
+            "projectSettings": {
+                "edit": "edit",
+                "none": "None",
+                "install": "install",
+                "removeFromProject": "remove from project",
+                "addToProject": "add to project",
+                "none": "None",
+                "files": "Files",
+                "flow": "Flow",
+                "credentials": "Credentials",
+                "invalidEncryptionKey": "Invalid encryption key",
+                "encryptionEnabled": "Encryption enabled",
+                "encryptionDisabled": "Encryption disabled",
+                "resetTheEncryptionKey": "Reset the encryption key:",
+                "setTheEncryptionKey": "Set the encryption key:",
+                "changeTheEncryptionKey": "Change the encryption key:",
+                "currentKey": "Current key",
+                "newKey": "New key",
+                "credentialsAlert": "This will delete all existing credentials",
+                "versionControl": "Version Control",
+                "branches": "Branches",
+                "noBranches": "No branches",
+                "deleteConfirm": "Are you sure you want to delete the local branch '__name__'? This cannot be undone.",
+                "unmergedConfirm": "The local branch '__name__' has unmerged changes that will be lost. Are you sure you want to delete it?",
+                "deleteUnmergedBranch": "Delete unmerged branch",
+                "gitRemotes": "Git remotes",
+                "addRemote": "add remote",
+                "addRemote2": "Add remote",
+                "remoteName": "Remote name",
+                "nameRule": "Must contain only A-Z 0-9 _ -",
+                "url": "URL",
+                "urlRule": "https://, ssh:// or file://",
+                "urlRule2": "Do not include the username/password in the URL",
+                "noRemotes": "No remotes",
+                "deleteRemoteConfrim": "Are you sure you want to delete the remote '__name__'?",
+                "deleteRemote": "Delete remote"
+            },
             "userSettings": {
                 "committerDetail": "Committer Details",
                 "committerTip": "Leave blank to use system default",
diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json
index d24dcc711..d18938123 100644
--- a/red/api/editor/locales/ja/editor.json
+++ b/red/api/editor/locales/ja/editor.json
@@ -459,8 +459,46 @@
             "description": "詳細",
             "dependencies": "依存関係",
             "settings": "設定",
+            "noSummaryAvailable": "サマリが存在しません",
             "editDescription": "プロジェクトの詳細を編集",
             "editDependencies": "プロジェクトの依存関係を編集",
+            "editReadme": "README.mdを編集",
+            "projectSettings": {
+                "edit": "編集",
+                "none": "なし",
+                "install": "インストール",
+                "removeFromProject": "プロジェクトから削除",
+                "addToProject": "プロジェクトへ追加",
+                "files": "ファイル",
+                "flow": "フロー",
+                "credentials": "認証情報",
+                "invalidEncryptionKey": "不正な暗号化キー",
+                "encryptionEnabled": "暗号化が有効になっています",
+                "encryptionDisabled": "暗号化が無効になっています",
+                "setTheEncryptionKey": "暗号化キーを設定:",
+                "resetTheEncryptionKey": "暗号化キーを初期化:",
+                "changeTheEncryptionKey": "暗号化キーを変更:",
+                "currentKey": "現在のキー",
+                "newKey": "新規のキー",
+                "credentialsAlert": "既存の認証情報は全て削除されます",
+                "versionControl": "バージョン管理",
+                "branches": "ブランチ",
+                "noBranches": "ブランチなし",
+                "deleteConfirm": "本当にローカルブランチ'__name__'を削除しますか？削除すると元に戻すことはできません。",
+                "unmergedConfirm": "ローカルブランチ'__name__'にはマージされていない変更があります。この変更は削除されます。本当に削除しますか？",
+                "deleteUnmergedBranch": "マージされていないブランチを削除",
+                "gitRemotes": "Gitリモート",
+                "addRemote": "リモートを追加",
+                "addRemote2": "リモートを追加",
+                "remoteName": "リモート名",
+                "nameRule": "A-Z 0-9 _ - のみを含む",
+                "url": "URL",
+                "urlRule": "https://、ssh:// または file://",
+                "urlRule2": "URLにユーザ名、パスワードを含んではいけません",
+                "noRemotes": "リモートなし",
+                "deleteRemoteConfrim": "本当にリモート'__name__'を削除しますか？",
+                "deleteRemote": "リモートを削除"
+            },
             "userSettings": {
                 "committerDetail": "コミッター詳細",
                 "committerTip": "システムのデフォルトを使用する場合、空白のままにしてください",

From dc139bcc305bb0cfd687b5a07d70706aa86d6c43 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Mon, 4 Jun 2018 07:15:26 +0900
Subject: [PATCH 034/113] Remove new line

---
 editor/js/ui/projects/projectSettings.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/editor/js/ui/projects/projectSettings.js b/editor/js/ui/projects/projectSettings.js
index b5ee024a1..b7156fcb6 100644
--- a/editor/js/ui/projects/projectSettings.js
+++ b/editor/js/ui/projects/projectSettings.js
@@ -1360,8 +1360,7 @@ RED.projects.settings = (function() {
             remoteURLInputChanged = true;
             validateForm()
         });
-        var remoteURLLabel = $('<label class="projects-edit-form-sublabel"><small>'
-        + RED._("sidebar.project.projectSettings.urlRule") +'</small></label>').appendTo(row).find("small");
+        var remoteURLLabel = $('<label class="projects-edit-form-sublabel"><small>' + RED._("sidebar.project.projectSettings.urlRule") +'</small></label>').appendTo(row).find("small");
 
         var hideEditForm = function() {
             editRepoButton.attr('disabled',false);

From 0e4cedbc5e2bcd3568d7f4c8a4edd2153a30450a Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Mon, 4 Jun 2018 07:21:48 +0900
Subject: [PATCH 035/113] Remove new lines

---
 editor/js/ui/projects/projectSettings.js | 39 ++++++++----------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/editor/js/ui/projects/projectSettings.js b/editor/js/ui/projects/projectSettings.js
index b7156fcb6..011c9fbe7 100644
--- a/editor/js/ui/projects/projectSettings.js
+++ b/editor/js/ui/projects/projectSettings.js
@@ -235,8 +235,7 @@ RED.projects.settings = (function() {
         var summaryContent = $('<div></div>',{style:"color: #999"}).appendTo(summary);
         updateProjectSummary(activeProject.summary, summaryContent);
         if (RED.user.hasPermission("projects.write")) {
-            $('<button class="editor-button editor-button-small" style="float: right;">'
-            + RED._('sidebar.project.editDescription') + '</button>')
+            $('<button class="editor-button editor-button-small" style="float: right;">' + RED._('sidebar.project.editDescription') + '</button>')
                 .prependTo(summary)
                 .click(function(evt) {
                     evt.preventDefault();
@@ -251,8 +250,7 @@ RED.projects.settings = (function() {
         updateProjectDescription(activeProject, descriptionContent);
 
         if (RED.user.hasPermission("projects.write")) {
-            $('<button class="editor-button editor-button-small" style="float: right;">'
-            + RED._('sidebar.project.editReadme') + '</button>')
+            $('<button class="editor-button editor-button-small" style="float: right;">' + RED._('sidebar.project.editReadme') + '</button>')
                 .prependTo(description)
                 .click(function(evt) {
                     evt.preventDefault();
@@ -383,8 +381,7 @@ RED.projects.settings = (function() {
     function createDependenciesPane(activeProject) {
         var pane = $('<div id="project-settings-tab-deps" class="project-settings-tab-pane node-help"></div>');
         if (RED.user.hasPermission("projects.write")) {
-            $('<button class="editor-button editor-button-small" style="margin-top:10px;float: right;">'
-            + RED._("sidebar.project.projectSettings.edit") + '</button>')
+            $('<button class="editor-button editor-button-small" style="margin-top:10px;float: right;">' + RED._("sidebar.project.projectSettings.edit") + '</button>')
                 .appendTo(pane)
                 .click(function(evt) {
                     evt.preventDefault();
@@ -454,8 +451,7 @@ RED.projects.settings = (function() {
                     var buttons = $('<div class="palette-module-button-group"></div>').appendTo(metaRow);
                     if (RED.user.hasPermission("projects.write")) {
                         if (!entry.installed && RED.settings.theme('palette.editable') !== false) {
-                            $('<a href="#" class="editor-button editor-button-small">'
-                            + RED._("sidebar.project.projectSettings.install") + '</a>').appendTo(buttons)
+                            $('<a href="#" class="editor-button editor-button-small">' + RED._("sidebar.project.projectSettings.install") + '</a>').appendTo(buttons)
                                 .click(function(evt) {
                                     evt.preventDefault();
                                     RED.palette.editor.install(entry,row,function(err) {
@@ -472,8 +468,7 @@ RED.projects.settings = (function() {
                                     });
                                 })
                         } else if (entry.known && entry.count === 0) {
-                            $('<a href="#" class="editor-button editor-button-small">'
-                            + RED._("sidebar.project.projectSettings.removeFromProject") + '</a>').appendTo(buttons)
+                            $('<a href="#" class="editor-button editor-button-small">' + RED._("sidebar.project.projectSettings.removeFromProject") + '</a>').appendTo(buttons)
                                 .click(function(evt) {
                                     evt.preventDefault();
                                     var deps = $.extend(true, {}, activeProject.dependencies);
@@ -489,8 +484,7 @@ RED.projects.settings = (function() {
                                     });
                                 });
                         } else if (!entry.known) {
-                            $('<a href="#" class="editor-button editor-button-small">'
-                            + RED._("sidebar.project.projectSettings.addToProject") + '</a>').appendTo(buttons)
+                            $('<a href="#" class="editor-button editor-button-small">' + RED._("sidebar.project.projectSettings.addToProject") + '</a>').appendTo(buttons)
                                 .click(function(evt) {
                                     evt.preventDefault();
                                     var deps = $.extend(true, {}, activeProject.dependencies);
@@ -732,8 +726,7 @@ RED.projects.settings = (function() {
         var title = $('<h3></h3>').text(RED._("sidebar.project.projectSettings.files")).appendTo(pane);
         var filesContainer = $('<div class="user-settings-section"></div>').appendTo(pane);
         if (RED.user.hasPermission("projects.write")) {
-            var editFilesButton = $('<button class="editor-button editor-button-small" style="float: right;">'
-            + RED._('sidebar.project.projectSettings.edit') + '</button>')
+            var editFilesButton = $('<button class="editor-button editor-button-small" style="float: right;">' + RED._('sidebar.project.projectSettings.edit') + '</button>')
                 .appendTo(title)
                 .click(function(evt) {
                     evt.preventDefault();
@@ -906,12 +899,9 @@ RED.projects.settings = (function() {
 
         var credentialFormRows = $('<div>',{style:"margin-top:10px"}).hide().appendTo(credentialStateLabel);
 
-        var credentialSetLabel = $('<div style="margin: 20px 0 10px 5px;">'
-        + RED._("sidebar.project.projectSettings.setTheEncryptionKey") + '</div>').hide().appendTo(credentialFormRows);
-        var credentialChangeLabel = $('<div style="margin: 20px 0 10px 5px;">'
-        + RED._("sidebar.project.projectSettings.changeTheEncryptionKey") + '</div>').hide().appendTo(credentialFormRows);
-        var credentialResetLabel = $('<div style="margin: 20px 0 10px 5px;">'
-        + RED._("sidebar.project.projectSettings.resetTheEncryptionKey") + '</div>').hide().appendTo(credentialFormRows);
+        var credentialSetLabel = $('<div style="margin: 20px 0 10px 5px;">' + RED._("sidebar.project.projectSettings.setTheEncryptionKey") + '</div>').hide().appendTo(credentialFormRows);
+        var credentialChangeLabel = $('<div style="margin: 20px 0 10px 5px;">' + RED._("sidebar.project.projectSettings.changeTheEncryptionKey") + '</div>').hide().appendTo(credentialFormRows);
+        var credentialResetLabel = $('<div style="margin: 20px 0 10px 5px;">' + RED._("sidebar.project.projectSettings.resetTheEncryptionKey") + '</div>').hide().appendTo(credentialFormRows);
 
         var credentialSecretExistingRow = $('<div class="user-settings-row user-settings-row-credentials"></div>').appendTo(credentialFormRows);
         $('<label for=""></label>').text(RED._("sidebar.project.projectSettings.currentKey")).appendTo(credentialSecretExistingRow);
@@ -930,8 +920,7 @@ RED.projects.settings = (function() {
         $('<label for=""></label>').text(RED._("sidebar.project.projectSettings.newKey")).appendTo(credentialSecretNewRow);
         var credentialSecretNewInput = $('<input type="password">').appendTo(credentialSecretNewRow).on("change keyup paste",checkFiles);
 
-        var credentialResetWarning = $('<div class="form-tips form-warning" style="margin: 10px;"><i class="fa fa-warning"></i>'
-        + RED._("sidebar.project.projectSettings.credentialsAlert") + '</div>').hide().appendTo(credentialFormRows);
+        var credentialResetWarning = $('<div class="form-tips form-warning" style="margin: 10px;"><i class="fa fa-warning"></i>' + RED._("sidebar.project.projectSettings.credentialsAlert") + '</div>').hide().appendTo(credentialFormRows);
 
 
         var hideEditForm = function() {
@@ -1201,8 +1190,7 @@ RED.projects.settings = (function() {
         var repoContainer = $('<div class="user-settings-section"></div>').appendTo(pane);
         var title = $('<h4></h4>').text(RED._("sidebar.project.projectSettings.gitRemotes")).appendTo(repoContainer);
 
-        var editRepoButton = $('<button class="editor-button editor-button-small" style="float: right; margin-right: 10px;">'
-        + RED._("sidebar.project.projectSettings.addRemote") + '</button>')
+        var editRepoButton = $('<button class="editor-button editor-button-small" style="float: right; margin-right: 10px;">' + RED._("sidebar.project.projectSettings.addRemote") + '</button>')
             .appendTo(title)
             .click(function(evt) {
                 editRepoButton.attr('disabled',true);
@@ -1352,8 +1340,7 @@ RED.projects.settings = (function() {
             remoteNameInputChanged = true;
             validateForm();
         });
-        $('<label class="projects-edit-form-sublabel"><small>'
-        + RED._("sidebar.project.projectSettings.nameRule") + '</small></label>').appendTo(row).find("small");
+        $('<label class="projects-edit-form-sublabel"><small>' + RED._("sidebar.project.projectSettings.nameRule") + '</small></label>').appendTo(row).find("small");
         row = $('<div class="user-settings-row"></div>').appendTo(addRemoteDialog);
         $('<label for=""></label>').text(RED._("sidebar.project.projectSettings.url")).appendTo(row);
         var remoteURLInput = $('<input type="text">').appendTo(row).on("change keyup paste",function() {

From dcf44fed5820d76611200492159f21d1c549773a Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Tue, 5 Jun 2018 20:18:40 +0900
Subject: [PATCH 036/113] allow multi-line category name in editor

---
 editor/sass/palette.scss | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/editor/sass/palette.scss b/editor/sass/palette.scss
index 34890b8b5..10fd60cad 100644
--- a/editor/sass/palette.scss
+++ b/editor/sass/palette.scss
@@ -90,13 +90,12 @@
     text-align: left;
     padding: 9px;
     font-weight: bold;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-
+    padding-left: 30px;
 }
 .palette-header > i {
-    margin: 3px 10px 3px 3px;
+    position: absolute;
+    left: 11px;
+    top: 12px;
     -webkit-transition: all 0.2s ease-in-out;
     -moz-transition: all 0.2s ease-in-out;
     -o-transition: all 0.2s ease-in-out;

From 4fbf1fe780fc6d63b8de8490642f1fe3fffd5398 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 6 Jun 2018 20:51:30 +0100
Subject: [PATCH 037/113] Add middle-button-drag to pan the workspace

---
 editor/js/ui/state.js |  3 ++-
 editor/js/ui/view.js  | 46 ++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/editor/js/ui/state.js b/editor/js/ui/state.js
index 1b0990c58..b14bc915b 100644
--- a/editor/js/ui/state.js
+++ b/editor/js/ui/state.js
@@ -23,5 +23,6 @@ RED.state = {
     EXPORT: 6,
     IMPORT: 7,
     IMPORT_DRAGGING: 8,
-    QUICK_JOINING: 9
+    QUICK_JOINING: 9,
+    PANNING: 10
 }
diff --git a/editor/js/ui/view.js b/editor/js/ui/view.js
index ba568459c..d6c1bfa8c 100644
--- a/editor/js/ui/view.js
+++ b/editor/js/ui/view.js
@@ -58,7 +58,8 @@ RED.view = (function() {
         lastClickNode = null,
         dblClickPrimed = null,
         clickTime = 0,
-        clickElapsed = 0;
+        clickElapsed = 0,
+        scroll_position;
 
     var clipboard = "";
 
@@ -73,6 +74,8 @@ RED.view = (function() {
     var PORT_TYPE_INPUT = 1;
     var PORT_TYPE_OUTPUT = 0;
 
+    var chart = $("#chart");
+
     var outer = d3.select("#chart")
         .append("svg:svg")
         .attr("width", space_width)
@@ -94,6 +97,16 @@ RED.view = (function() {
         .on("mousemove", canvasMouseMove)
         .on("mousedown", canvasMouseDown)
         .on("mouseup", canvasMouseUp)
+        .on("mouseenter", function() {
+            if (lasso) {
+                if (d3.event.buttons !== 1) {
+                    lasso.remove();
+                    lasso = null;
+                }
+            } else if (mouse_mode === RED.state.PANNING && d3.event.buttons !== 4) {
+                resetMouseVars();
+            }
+        })
         .on("touchend", function() {
             clearTimeout(touchStartTime);
             touchStartTime = null;
@@ -283,7 +296,6 @@ RED.view = (function() {
     function init() {
 
         RED.events.on("workspace:change",function(event) {
-            var chart = $("#chart");
             if (event.old !== 0) {
                 workspaceScrollPositions[event.old] = {
                     left:chart.scrollLeft(),
@@ -526,6 +538,15 @@ RED.view = (function() {
     function canvasMouseDown() {
         var point;
 
+        if (d3.event.button === 1) {
+            // Middle Click pan
+            mouse_mode = RED.state.PANNING;
+            mouse_position = [d3.event.pageX,d3.event.pageY]
+            scroll_position = [chart.scrollLeft(),chart.scrollTop()];
+
+            return;
+        }
+
         if (!mousedown_node && !mousedown_link) {
             selected_link = null;
             updateSelection();
@@ -644,7 +665,6 @@ RED.view = (function() {
     function canvasMouseMove() {
         var i;
         var node;
-        mouse_position = d3.touches(this)[0]||d3.mouse(this);
         // Prevent touch scrolling...
         //if (d3.touches(this)[0]) {
         //    d3.event.preventDefault();
@@ -655,6 +675,22 @@ RED.view = (function() {
         //if (point[0]-container.scrollLeft < 30 && container.scrollLeft > 0) { container.scrollLeft -= 15; }
         //console.log(d3.mouse(this),container.offsetWidth,container.offsetHeight,container.scrollLeft,container.scrollTop);
 
+        if (mouse_mode === RED.state.PANNING) {
+
+            var pos = [d3.event.pageX,d3.event.pageY];
+            var deltaPos = [
+                mouse_position[0]-pos[0],
+                mouse_position[1]-pos[1]
+            ];
+
+            chart.scrollLeft(scroll_position[0]+deltaPos[0])
+            chart.scrollTop(scroll_position[1]+deltaPos[1])
+            return
+        }
+
+        mouse_position = d3.touches(this)[0]||d3.mouse(this);
+
+
         if (lasso) {
             var ox = parseInt(lasso.attr("ox"));
             var oy = parseInt(lasso.attr("oy"));
@@ -906,6 +942,10 @@ RED.view = (function() {
     function canvasMouseUp() {
         var i;
         var historyEvent;
+        if (mouse_mode === RED.state.PANNING) {
+            resetMouseVars();
+            return
+        }
         if (mouse_mode === RED.state.QUICK_JOINING) {
             return;
         }

From 17c5fdf0d502a76497e4f907320108c50c1fae4d Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 8 Jun 2018 23:32:17 +0100
Subject: [PATCH 038/113] Add flow navigator widget

---
 Gruntfile.js                   |   1 +
 editor/js/ui/view-navigator.js | 164 +++++++++++++++++++++++++++++++++
 editor/js/ui/view.js           |  11 ++-
 editor/sass/mixins.scss        |   3 +-
 editor/sass/workspace.scss     |   4 +-
 editor/templates/index.mst     |   1 +
 6 files changed, 180 insertions(+), 4 deletions(-)
 create mode 100644 editor/js/ui/view-navigator.js

diff --git a/Gruntfile.js b/Gruntfile.js
index 3738e60b4..6d53e4d29 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -144,6 +144,7 @@ module.exports = function(grunt) {
                     "editor/js/ui/keyboard.js",
                     "editor/js/ui/workspaces.js",
                     "editor/js/ui/view.js",
+                    "editor/js/ui/view-navigator.js",
                     "editor/js/ui/sidebar.js",
                     "editor/js/ui/palette.js",
                     "editor/js/ui/tab-info.js",
diff --git a/editor/js/ui/view-navigator.js b/editor/js/ui/view-navigator.js
new file mode 100644
index 000000000..da1908982
--- /dev/null
+++ b/editor/js/ui/view-navigator.js
@@ -0,0 +1,164 @@
+/**
+ * Copyright 2016 IBM Corp.
+ *
+ * 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.view.navigator = (function() {
+
+     var nav_scale = 25;
+     var nav_width = 5000/nav_scale;
+     var nav_height = 5000/nav_scale;
+
+     var navContainer;
+     var navBox;
+     var navBorder;
+     var navVis;
+     var scrollPos;
+     var scaleFactor;
+     var chartSize;
+     var dimensions;
+     var isDragging;
+     var isShowing = false;
+
+     function refreshNodes() {
+         if (!isShowing) {
+             return;
+         }
+         var navNode = navVis.selectAll(".navnode").data(RED.view.getActiveNodes(),function(d){return d.id});
+         navNode.exit().remove();
+         navNode.enter().insert("rect")
+             .attr('class','navnode')
+             .attr("pointer-events", "none");
+         navNode.each(function(d) {
+             d3.select(this).attr("x",function(d) { return (d.x-d.w/2)/nav_scale })
+             .attr("y",function(d) { return (d.y-d.h/2)/nav_scale })
+             .attr("width",function(d) { return Math.max(9,d.w/nav_scale) })
+             .attr("height",function(d) { return Math.max(3,d.h/nav_scale) })
+             .attr("fill",function(d) { return d._def.color;})
+         });
+     }
+     function onScroll() {
+         if (!isDragging) {
+             resizeNavBorder();
+         }
+     }
+     function resizeNavBorder() {
+         if (navBorder) {
+             scaleFactor = RED.view.scale();
+             chartSize = [ $("#chart").width(), $("#chart").height()];
+             scrollPos = [$("#chart").scrollLeft(),$("#chart").scrollTop()];
+             navBorder.attr('x',scrollPos[0]/nav_scale)
+                      .attr('y',scrollPos[1]/nav_scale)
+                      .attr('width',chartSize[0]/nav_scale/scaleFactor)
+                      .attr('height',chartSize[1]/nav_scale/scaleFactor)
+         }
+     }
+
+     return {
+         init: function() {
+
+             $(window).resize(resizeNavBorder);
+             RED.events.on("sidebar:resize",resizeNavBorder);
+
+             var hideTimeout;
+
+             navContainer = $('<div>').css({
+                 "position":"absolute",
+                 "bottom":$("#workspace-footer").height(),
+                 "right":0,
+                 zIndex: 1
+             }).appendTo("#workspace").hide();
+
+             navBox = d3.select(navContainer[0])
+                 .append("svg:svg")
+                 .attr("width", nav_width)
+                 .attr("height", nav_height)
+                 .attr("pointer-events", "all")
+                 .style({
+                     position: "absolute",
+                     bottom: 0,
+                     right:0,
+                     zIndex: 101,
+                     "border-left": "1px solid #ccc",
+                     "border-top": "1px solid #ccc",
+                     background: "rgba(245,245,245,0.5)",
+                     "box-shadow": "-1px 0 3px rgba(0,0,0,0.1)"
+                 });
+
+             navBox.append("rect").attr("x",0).attr("y",0).attr("width",nav_width).attr("height",nav_height).style({
+                 fill:"none",
+                 stroke:"none",
+                 pointerEvents:"all"
+             }).on("mousedown", function() {
+                 // Update these in case they have changed
+                 scaleFactor = RED.view.scale();
+                 chartSize = [ $("#chart").width(), $("#chart").height()];
+                 dimensions = [chartSize[0]/nav_scale/scaleFactor, chartSize[1]/nav_scale/scaleFactor];
+                 var newX = Math.max(0,Math.min(d3.event.offsetX+dimensions[0]/2,nav_width)-dimensions[0]);
+                 var newY = Math.max(0,Math.min(d3.event.offsetY+dimensions[1]/2,nav_height)-dimensions[1]);
+                 navBorder.attr('x',newX).attr('y',newY);
+                 isDragging = true;
+                 $("#chart").scrollLeft(newX*nav_scale*scaleFactor);
+                 $("#chart").scrollTop(newY*nav_scale*scaleFactor);
+             }).on("mousemove", function() {
+                 if (!isDragging) { return }
+                 if (d3.event.buttons === 0) {
+                     isDragging = false;
+                     return;
+                 }
+                 var newX = Math.max(0,Math.min(d3.event.offsetX+dimensions[0]/2,nav_width)-dimensions[0]);
+                 var newY = Math.max(0,Math.min(d3.event.offsetY+dimensions[1]/2,nav_height)-dimensions[1]);
+                 navBorder.attr('x',newX).attr('y',newY);
+                 $("#chart").scrollLeft(newX*nav_scale*scaleFactor);
+                 $("#chart").scrollTop(newY*nav_scale*scaleFactor);
+             }).on("mouseup", function() {
+                 isDragging = false;
+             })
+
+             navBorder = navBox.append("rect")
+                 .attr("stroke-dasharray","5,5")
+                 .attr("pointer-events", "none")
+                 .style({
+                     stroke: "#999",
+                     strokeWidth: 1,
+                     fill: "white",
+                 });
+
+             navVis = navBox.append("svg:g")
+
+
+            $("#btn-navigate").click(function(evt) {
+                evt.preventDefault();
+                if (!isShowing) {
+                    isShowing = true;
+                    $("#btn-navigate").addClass("selected");
+                    resizeNavBorder();
+                    refreshNodes();
+                    $("#chart").on("scroll",onScroll);
+                    navContainer.fadeIn(200);
+                } else {
+                    isShowing = false;
+                    navContainer.fadeOut(100);
+                    $("#chart").off("scroll",onScroll);
+                    $("#btn-navigate").removeClass("selected");
+                }
+            })
+        },
+        refresh: refreshNodes,
+        resize: resizeNavBorder
+    }
+
+
+})();
diff --git a/editor/js/ui/view.js b/editor/js/ui/view.js
index d6c1bfa8c..6a8dd77c4 100644
--- a/editor/js/ui/view.js
+++ b/editor/js/ui/view.js
@@ -332,6 +332,8 @@ RED.view = (function() {
             redraw();
         });
 
+        RED.view.navigator.init();
+
         $("#btn-zoom-out").click(function() {zoomOut();});
         $("#btn-zoom-zero").click(function() {zoomZero();});
         $("#btn-zoom-in").click(function() {zoomIn();});
@@ -1060,17 +1062,20 @@ RED.view = (function() {
     function zoomIn() {
         if (scaleFactor < 2) {
             scaleFactor += 0.1;
+            RED.view.navigator.resize();
             redraw();
         }
     }
     function zoomOut() {
         if (scaleFactor > 0.3) {
             scaleFactor -= 0.1;
+            RED.view.navigator.resize();
             redraw();
         }
     }
     function zoomZero() {
         scaleFactor = 1;
+        RED.view.navigator.resize();
         redraw();
     }
 
@@ -2542,7 +2547,7 @@ RED.view = (function() {
                 }
             ).classed("link_selected", false);
         }
-
+        RED.view.navigator.refresh();
         if (d3.event) {
             d3.event.preventDefault();
         }
@@ -2816,7 +2821,9 @@ RED.view = (function() {
                 gridSize = Math.max(5,v);
                 updateGrid();
             }
+        },
+        getActiveNodes: function() {
+            return activeNodes;
         }
-
     };
 })();
diff --git a/editor/sass/mixins.scss b/editor/sass/mixins.scss
index 7201ef544..36d08c948 100644
--- a/editor/sass/mixins.scss
+++ b/editor/sass/mixins.scss
@@ -203,7 +203,7 @@
     height: 25px;
     line-height: 23px;
     padding: 0 10px;
-
+    user-select: none;
 
     .button-group:not(:last-child) {
         margin-right: 5px;
@@ -227,6 +227,7 @@
     font-size: 11px;
     line-height: 17px;
     height: 18px;
+    width: 18px;
     &.text-button {
         width: auto;
         padding: 0 5px;
diff --git a/editor/sass/workspace.scss b/editor/sass/workspace.scss
index 59b8fcf75..14b6eebb0 100644
--- a/editor/sass/workspace.scss
+++ b/editor/sass/workspace.scss
@@ -47,7 +47,9 @@
 .workspace-footer-button {
     @include component-footer-button;
 }
-
+.workspace-footer-button-toggle {
+    @include component-footer-button-toggle;
+}
 #workspace-footer {
     @include component-footer;
 }
diff --git a/editor/templates/index.mst b/editor/templates/index.mst
index b8d0ac0c0..972258a55 100644
--- a/editor/templates/index.mst
+++ b/editor/templates/index.mst
@@ -51,6 +51,7 @@
             <a class="workspace-footer-button" id="btn-zoom-out" href="#"><i class="fa fa-minus"></i></a>
             <a class="workspace-footer-button" id="btn-zoom-zero" href="#"><i class="fa fa-circle-o"></i></a>
             <a class="workspace-footer-button" id="btn-zoom-in" href="#"><i class="fa fa-plus"></i></a>
+            <a class="workspace-footer-button-toggle" id="btn-navigate" href="#"><i class="fa fa-map-o"></i></a>
         </div>
         <div id="editor-shade" class="hide"></div>
     </div>

From 2a122ed28358cc34130b8f9ab4338b364e007ac0 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 12 Jun 2018 12:54:32 +0100
Subject: [PATCH 039/113] Allow subflows to be put in any palette category

---
 editor/js/nodes.js                       |  5 +-
 editor/js/ui/editor.js                   | 44 +++++++++++++-
 editor/js/ui/palette.js                  | 75 +++++++++++++++++-------
 editor/js/ui/tab-info.js                 |  7 +++
 editor/templates/index.mst               |  4 ++
 red/api/editor/locales/en-US/editor.json |  2 +
 6 files changed, 113 insertions(+), 24 deletions(-)

diff --git a/editor/js/nodes.js b/editor/js/nodes.js
index 433e400a2..12ff3e682 100644
--- a/editor/js/nodes.js
+++ b/editor/js/nodes.js
@@ -133,7 +133,7 @@ RED.nodes = (function() {
             registerNodeType: function(nt,def) {
                 nodeDefinitions[nt] = def;
                 def.type = nt;
-                if (def.category != "subflows") {
+                if (nt.substring(0,8) != "subflow:") {
                     def.set = nodeSets[typeToId[nt]];
                     nodeSets[typeToId[nt]].added = true;
                     nodeSets[typeToId[nt]].enabled = true;
@@ -356,7 +356,7 @@ RED.nodes = (function() {
             defaults:{name:{value:""}},
             info: sf.info,
             icon: function() { return sf.icon||"subflow.png" },
-            category: "subflows",
+            category: sf.category || "subflows",
             inputs: sf.in.length,
             outputs: sf.out.length,
             color: "#da9",
@@ -519,6 +519,7 @@ RED.nodes = (function() {
         node.type = n.type;
         node.name = n.name;
         node.info = n.info;
+        node.category = n.category;
         node.in = [];
         node.out = [];
 
diff --git a/editor/js/ui/editor.js b/editor/js/ui/editor.js
index df50db725..380521333 100644
--- a/editor/js/ui/editor.js
+++ b/editor/js/ui/editor.js
@@ -1701,6 +1701,21 @@ RED.editor = (function() {
                             editing_node.icon = icon;
                             changed = true;
                         }
+                        var newCategory = $("#subflow-input-category").val().trim();
+                        if (newCategory === "_custom_") {
+                            newCategory = $("#subflow-input-custom-category").val().trim();
+                            if (newCategory === "") {
+                                newCategory = editing_node.category;
+                            }
+                        }
+                        if (newCategory === 'subflows') {
+                            newCategory = '';
+                        }
+                        if (newCategory != editing_node.category) {
+                            changes['category'] = editing_node.category;
+                            editing_node.category = newCategory;
+                            changed = true;
+                        }
 
                         RED.palette.refresh();
 
@@ -1773,8 +1788,6 @@ RED.editor = (function() {
                 });
                 portLabels.content.addClass("editor-tray-content");
 
-
-
                 if (editing_node) {
                     RED.sidebar.info.refresh(editing_node);
                 }
@@ -1787,6 +1800,33 @@ RED.editor = (function() {
 
                 $("#subflow-input-name").val(subflow.name);
                 RED.text.bidi.prepareInput($("#subflow-input-name"));
+
+                $("#subflow-input-category").empty();
+                var categories = RED.palette.getCategories();
+                categories.sort(function(A,B) {
+                    return A.label.localeCompare(B.label);
+                })
+                categories.forEach(function(cat) {
+                    $("#subflow-input-category").append($("<option></option>").val(cat.id).text(cat.label));
+                })
+                $("#subflow-input-category").append($("<option></option>").attr('disabled',true).text("---"));
+                $("#subflow-input-category").append($("<option></option>").val("_custom_").text(RED._("palette.addCategory")));
+
+
+                $("#subflow-input-category").change(function() {
+                    var val = $(this).val();
+                    if (val === "_custom_") {
+                        $("#subflow-input-category").width(120);
+                        $("#subflow-input-custom-category").show();
+                    } else {
+                        $("#subflow-input-category").width(250);
+                        $("#subflow-input-custom-category").hide();
+                    }
+                })
+
+
+                $("#subflow-input-category").val(subflow.category||"subflows");
+
                 subflowEditor.getSession().setValue(subflow.info||"",-1);
                 var userCount = 0;
                 var subflowType = "subflow:"+editing_node.id;
diff --git a/editor/js/ui/palette.js b/editor/js/ui/palette.js
index 38ebc1091..c72ed4f7a 100644
--- a/editor/js/ui/palette.js
+++ b/editor/js/ui/palette.js
@@ -21,7 +21,18 @@ RED.palette = (function() {
 
     var categoryContainers = {};
 
-    function createCategoryContainer(category, label) {
+
+    function createCategory(originalCategory,rootCategory,category,ns) {
+        if ($("#palette-base-category-"+rootCategory).length === 0) {
+            createCategoryContainer(originalCategory,rootCategory, ns+":palette.label."+rootCategory);
+        }
+        $("#palette-container-"+rootCategory).show();
+        if ($("#palette-"+category).length === 0) {
+            $("#palette-base-category-"+rootCategory).append('<div id="palette-'+category+'"></div>');
+        }
+    }
+    function createCategoryContainer(originalCategory,category, labelId) {
+        var label = RED._(labelId, {defaultValue:category});
         label = (label || category).replace(/_/g, " ");
         var catDiv = $('<div id="palette-container-'+category+'" class="palette-category palette-close hide">'+
             '<div id="palette-header-'+category+'" class="palette-header"><i class="expanded fa fa-angle-down"></i><span>'+label+'</span></div>'+
@@ -31,7 +42,8 @@ RED.palette = (function() {
             '<div id="palette-'+category+'-function"></div>'+
             '</div>'+
             '</div>').appendTo("#palette-container");
-
+        catDiv.data('category',originalCategory);
+        catDiv.data('label',label);
         categoryContainers[category] = {
             container: catDiv,
             close: function() {
@@ -133,6 +145,7 @@ RED.palette = (function() {
         }
         if (exclusion.indexOf(def.category)===-1) {
 
+            var originalCategory = def.category;
             var category = def.category.replace(/ /g,"_");
             var rootCategory = category.split("-")[0];
 
@@ -153,7 +166,6 @@ RED.palette = (function() {
 
             d.className="palette_node";
 
-
             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);
@@ -174,21 +186,12 @@ RED.palette = (function() {
                 d.appendChild(portIn);
             }
 
-            if ($("#palette-base-category-"+rootCategory).length === 0) {
-                if(coreCategories.indexOf(rootCategory) !== -1){
-                    createCategoryContainer(rootCategory, RED._("node-red:palette.label."+rootCategory, {defaultValue:rootCategory}));
-                } else {
-                    var ns = def.set.id;
-                    createCategoryContainer(rootCategory, RED._(ns+":palette.label."+rootCategory, {defaultValue:rootCategory}));
-                }
-            }
-            $("#palette-container-"+rootCategory).show();
-
-            if ($("#palette-"+category).length === 0) {
-                $("#palette-base-category-"+rootCategory).append('<div id="palette-'+category+'"></div>');
-            }
+            createCategory(def.category,rootCategory,category,(coreCategories.indexOf(rootCategory) !== -1)?"node-red":def.set.id);
 
             $("#palette-"+category).append(d);
+
+            $(d).data('category',rootCategory);
+
             d.onmousedown = function(e) { e.preventDefault(); };
 
             var popover = RED.popover.create({
@@ -308,7 +311,7 @@ RED.palette = (function() {
             });
 
             var nodeInfo = null;
-            if (def.category == "subflows") {
+            if (nt.indexOf("subflow:") === 0) {
                 $(d).dblclick(function(e) {
                     RED.workspaces.show(nt.substring(8));
                     e.preventDefault();
@@ -382,6 +385,31 @@ RED.palette = (function() {
             }
             setLabel(sf.type+":"+sf.id,paletteNode,sf.name,marked(sf.info||""));
             setIcon(paletteNode,sf);
+
+            var currentCategory = paletteNode.data('category');
+            var newCategory = (sf.category||"subflows");
+            if (currentCategory !== newCategory) {
+                var category = newCategory.replace(/ /g,"_");
+                createCategory(newCategory,category,category,"node-red");
+
+                var currentCategoryNode = paletteNode.closest(".palette-category");
+                var newCategoryNode = $("#palette-"+category);
+                newCategoryNode.append(paletteNode);
+                if (newCategoryNode.find(".palette_node").length === 1) {
+                    categoryContainers[category].open();
+                }
+
+                paletteNode.data('category',newCategory);
+                if (currentCategoryNode.find(".palette_node").length === 0) {
+                    if (currentCategoryNode.find("i").hasClass("expanded")) {
+                        currentCategoryNode.find(".palette-content").slideToggle();
+                        currentCategoryNode.find("i").toggleClass("expanded");
+                    }
+                }
+
+
+
+            }
         });
     }
 
@@ -471,7 +499,7 @@ RED.palette = (function() {
             categoryList = coreCategories
         }
         categoryList.forEach(function(category){
-            createCategoryContainer(category, RED._("palette.label."+category,{defaultValue:category}));
+            createCategoryContainer(category, category, "palette.label."+category);
         });
 
         $("#palette-collapse-all").on("click", function(e) {
@@ -491,13 +519,20 @@ RED.palette = (function() {
             }
         });
     }
-
+    function getCategories() {
+        var categories = [];
+        $("#palette-container .palette-category").each(function(i,d) {
+            categories.push({id:$(d).data('category'),label:$(d).data('label')});
+        })
+        return categories;
+    }
     return {
         init: init,
         add:addNodeType,
         remove:removeNodeType,
         hide:hideNodeType,
         show:showNodeType,
-        refresh:refreshNodeTypes
+        refresh:refreshNodeTypes,
+        getCategories: getCategories
     };
 })();
diff --git a/editor/js/ui/tab-info.js b/editor/js/ui/tab-info.js
index 340a6bd74..bb1bf37cb 100644
--- a/editor/js/ui/tab-info.js
+++ b/editor/js/ui/tab-info.js
@@ -170,6 +170,10 @@ RED.sidebar.info = (function() {
                 if (node.type === "tab") {
                     propRow = $('<tr class="node-info-node-row"><td>'+RED._("sidebar.info.status")+'</td><td></td></tr>').appendTo(tableBody);
                     $(propRow.children()[1]).text((!!!node.disabled)?RED._("sidebar.info.enabled"):RED._("sidebar.info.disabled"))
+                } else if (node.type === "subflow") {
+                    propRow = $('<tr class="node-info-node-row"><td>'+RED._("subflow.category")+'</td><td></td></tr>').appendTo(tableBody);
+                    var category = node.category||"subflows";
+                    $(propRow.children()[1]).text(RED._("palette.label."+category,{defaultValue:category}))
                 }
             } else {
                 propRow = $('<tr class="node-info-node-row"><td>'+RED._("sidebar.info.node")+"</td><td></td></tr>").appendTo(tableBody);
@@ -235,6 +239,9 @@ RED.sidebar.info = (function() {
                 }
             }
             if (m) {
+                propRow = $('<tr class="node-info-node-row"><td>'+RED._("subflow.category")+'</td><td></td></tr>').appendTo(tableBody);
+                var category = subflowNode.category||"subflows";
+                $(propRow.children()[1]).text(RED._("palette.label."+category,{defaultValue:category}))
                 $('<tr class="node-info-subflow-row"><td>'+RED._("sidebar.info.instances")+"</td><td>"+subflowUserCount+'</td></tr>').appendTo(tableBody);
             }
 
diff --git a/editor/templates/index.mst b/editor/templates/index.mst
index 972258a55..23a87fde7 100644
--- a/editor/templates/index.mst
+++ b/editor/templates/index.mst
@@ -132,6 +132,10 @@
         <i class="fa fa-tag"></i>
         <label for="subflow-input-name" data-i18n="common.label.name"></label><input type="text" id="subflow-input-name">
     </div>
+    <div class="form-row">
+        <i class="fa fa-folder-o"></i>
+        <label for="subflow-input-category" data-i18n="editor:subflow.category"></label><select style="width: 250px;" id="subflow-input-category"></select><input style="display:none; margin-left: 10px; width:calc(100% - 250px)" type="text" id="subflow-input-custom-category">
+    </div>
     <div class="form-row" style="margin-bottom: 0px;">
         <label for="subflow-input-info" data-i18n="editor:subflow.info"></label>
         <a href="https://help.github.com/articles/markdown-basics/" style="font-size: 0.8em; float: right;" data-i18n="[html]subflow.format"></a>
diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json
index af62248da..65681850f 100644
--- a/red/api/editor/locales/en-US/editor.json
+++ b/red/api/editor/locales/en-US/editor.json
@@ -240,6 +240,7 @@
         "output": "outputs:",
         "deleteSubflow": "delete subflow",
         "info": "Description",
+        "category": "Category",
         "format":"markdown format",
         "errors": {
             "noNodesSelected": "<strong>Cannot create subflow</strong>: no nodes selected",
@@ -318,6 +319,7 @@
         "noInfo": "no information available",
         "filter": "filter nodes",
         "search": "search modules",
+        "addCategory": "Add new...",
         "label": {
             "subflows": "subflows",
             "input": "input",

From 68779caa2e83013b83c74335b8d5b44afcb4519a Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 12 Jun 2018 15:34:08 +0100
Subject: [PATCH 040/113] Only edit nodes on dbl click on primary button with
 no modifiers

---
 editor/js/ui/view.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/editor/js/ui/view.js b/editor/js/ui/view.js
index 6a8dd77c4..71454153d 100644
--- a/editor/js/ui/view.js
+++ b/editor/js/ui/view.js
@@ -1697,7 +1697,9 @@ RED.view = (function() {
         clickElapsed = now-clickTime;
         clickTime = now;
 
-        dblClickPrimed = (lastClickNode == mousedown_node);
+        dblClickPrimed = (lastClickNode == mousedown_node &&
+            d3.event.buttons === 1 &&
+            !d3.event.shiftKey && !d3.event.metaKey && !d3.event.altKey && !d3.event.ctrlKey);
         lastClickNode = mousedown_node;
 
         var i;

From 6cad80c4ad3fe913c6d6107470652214f61fa209 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 12 Jun 2018 23:46:06 +0100
Subject: [PATCH 041/113] Add node icon picker widget

---
 editor/js/ui/editor.js  | 227 +++++++++++++++++++++-------------------
 editor/sass/editor.scss |  61 +++++++++++
 2 files changed, 179 insertions(+), 109 deletions(-)

diff --git a/editor/js/ui/editor.js b/editor/js/ui/editor.js
index 380521333..0f6050b8a 100644
--- a/editor/js/ui/editor.js
+++ b/editor/js/ui/editor.js
@@ -108,17 +108,6 @@ RED.editor = (function() {
                 }
             }
         }
-        if (node.icon) {
-            var iconPath = RED.utils.separateIconPath(node.icon);
-            if (!iconPath.module) {
-                return isValid;
-            }
-            var iconSets = RED.nodes.getIconSets();
-            var iconFileList = iconSets[iconPath.module];
-            if (!iconFileList || iconFileList.indexOf(iconPath.file) === -1) {
-                isValid = false;
-            }
-        }
         return isValid;
     }
 
@@ -170,27 +159,6 @@ RED.editor = (function() {
                 }
             }
         }
-        validateIcon(node);
-    }
-
-    function validateIcon(node) {
-        if (node._def.hasOwnProperty("defaults") && !node._def.defaults.hasOwnProperty("icon") && node.icon) {
-            var iconPath = RED.utils.separateIconPath(node.icon);
-            var iconSets = RED.nodes.getIconSets();
-            var iconFileList = iconSets[iconPath.module];
-            var iconModule = $("#node-settings-icon-module");
-            var iconFile = $("#node-settings-icon-file");
-            if (!iconFileList) {
-                iconModule.addClass("input-error");
-                iconFile.removeClass("input-error");
-            } else if (iconFileList.indexOf(iconPath.file) === -1) {
-                iconModule.removeClass("input-error");
-                iconFile.addClass("input-error");
-            } else {
-                iconModule.removeClass("input-error");
-                iconFile.removeClass("input-error");
-            }
-        }
     }
 
     function validateNodeEditorProperty(node,defaults,property,prefix) {
@@ -711,6 +679,97 @@ RED.editor = (function() {
         }
         return result;
     }
+    function showIconPicker(container, node, iconPath, done) {
+        var containerPos = container.offset();
+        var pickerBackground = $('<div>').css({
+            position: "absolute",top:0,bottom:0,left:0,right:0,zIndex:20
+        }).appendTo("body");
+
+        var top = containerPos.top - 30;
+
+        if (top+280 > $( window ).height()) {
+            top = $( window ).height() - 280;
+        }
+        var picker = $('<div class="red-ui-icon-picker">').css({
+            top: top+"px",
+            left: containerPos.left+"px",
+        }).appendTo("body");
+
+        var hide = function() {
+            pickerBackground.remove();
+            picker.remove();
+            RED.keyboard.remove("escape");
+        }
+        RED.keyboard.add("*","escape",function(){hide()});
+        pickerBackground.on("mousedown", hide);
+
+        var searchDiv = $("<div>",{class:"red-ui-search-container"}).appendTo(picker);
+        searchInput = $('<input type="text">').attr("placeholder","Search icons").appendTo(searchDiv).searchBox({
+            delay: 50,
+            change: function() {
+                var searchTerm = $(this).val().trim();
+                if (searchTerm === "") {
+                    iconList.find(".red-ui-icon-list-module").show();
+                    iconList.find(".red-ui-icon-list-icon").show();
+                } else {
+                    iconList.find(".red-ui-icon-list-module").hide();
+                    iconList.find(".red-ui-icon-list-icon").each(function(i,n) {
+                        if ($(n).data('icon').indexOf(searchTerm) === -1) {
+                            $(n).hide();
+                        } else {
+                            $(n).show();
+                        }
+                    });
+                }
+            }
+        });
+
+        var row = $('<div>').appendTo(picker);
+        var iconList = $('<div class="red-ui-icon-list">').appendTo(picker);
+        var metaRow = $('<div class="red-ui-icon-meta"></div>').appendTo(picker);
+        var summary = $('<span>').appendTo(metaRow);
+        var resetButton = $('<button class="editor-button editor-button-small">use default</button>').appendTo(metaRow).click(function(e) {
+            e.preventDefault();
+            hide();
+            done(null);
+        });
+        var iconSets = RED.nodes.getIconSets();
+        Object.keys(iconSets).forEach(function(moduleName) {
+            var icons = iconSets[moduleName];
+            if (icons.length > 0) {
+                // selectIconModule.append($("<option></option>").val(moduleName).text(moduleName));
+                var header = $('<div class="red-ui-icon-list-module"></div>').text(moduleName).appendTo(iconList);
+                $('<i class="fa fa-cube"></i>').prependTo(header);
+                icons.forEach(function(icon) {
+                    var iconDiv = $('<div>',{class:"red-ui-icon-list-icon"}).appendTo(iconList);
+                    var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(iconDiv);
+                    var colour = node._def.color;
+                    var icon_url = "icons/"+moduleName+"/"+icon;
+                    iconDiv.data('icon',icon_url)
+                    nodeDiv.css('backgroundColor',colour);
+                    var iconContainer = $('<div/>',{class:"palette_icon_container"}).appendTo(nodeDiv);
+                    $('<div/>',{class:"palette_icon",style:"background-image: url("+icon_url+")"}).appendTo(iconContainer);
+
+                    if (iconPath.module === moduleName && iconPath.file === icon) {
+                        iconDiv.addClass("selected");
+                    }
+                    iconDiv.on("mouseover", function() {
+                        summary.text(icon);
+                    })
+                    iconDiv.on("mouseout", function() {
+                        summary.html("&nbsp;");
+                    })
+                    iconDiv.click(function() {
+                        hide();
+                        done(moduleName+"/"+icon);
+                    })
+                })
+            }
+        });
+        picker.slideDown(100);
+        searchInput.focus();
+    }
+
     function buildLabelForm(container,node) {
         var dialogForm = $('<form class="dialog-form form-horizontal" autocomplete="off"></form>').appendTo(container);
 
@@ -748,81 +807,36 @@ RED.editor = (function() {
         }
 
         if ((!node._def.defaults || !node._def.defaults.hasOwnProperty("icon"))) {
-            $('<div class="form-row"><div id="node-settings-icon"></div></div>').appendTo(dialogForm);
-            var iconDiv = $("#node-settings-icon");
-            $('<label data-i18n="editor.settingIcon">').appendTo(iconDiv);
-            var iconForm = $('<div>',{class:"node-label-form-row"});
-            iconForm.appendTo(iconDiv);
-            $('<label>').appendTo(iconForm);
+            $('<hr>').appendTo(dialogForm);
+            var iconRow = $('<div class="form-row"></div>').appendTo(dialogForm);
+            $('<label style="width: 50px" data-i18n="editor.settingIcon">').appendTo(iconRow);
 
-            var selectIconModule = $('<select id="node-settings-icon-module"><option value=""></option></select>').appendTo(iconForm);
-            var iconPath;
-            if (node.icon) {
-                iconPath = RED.utils.separateIconPath(node.icon);
-            } else {
-                iconPath = RED.utils.getDefaultNodeIcon(node._def, node);
-            }
-            var iconSets = RED.nodes.getIconSets();
-            Object.keys(iconSets).forEach(function(moduleName) {
-                selectIconModule.append($("<option></option>").val(moduleName).text(moduleName));
-            });
-            if (iconPath.module && !iconSets[iconPath.module]) {
-                selectIconModule.append($("<option disabled></option>").val(iconPath.module).text(iconPath.module));
-            }
-            selectIconModule.val(iconPath.module);
-            var iconModuleHidden = $('<input type="hidden" id="node-settings-icon-module-hidden"></input>').appendTo(iconForm);
-            iconModuleHidden.val(iconPath.module);
+            var iconButton = $('<button class="editor-button">').appendTo(iconRow);
 
-            var selectIconFile = $('<select id="node-settings-icon-file"><option value=""></option></select>').appendTo(iconForm);
-            selectIconModule.change(function() {
-                moduleChange(selectIconModule, selectIconFile, iconModuleHidden, iconFileHidden, iconSets, true);
-            });
-            var iconFileHidden = $('<input type="hidden" id="node-settings-icon-file-hidden"></input>').appendTo(iconForm);
-            iconFileHidden.val(iconPath.file);
-            selectIconFile.change(function() {
-                selectIconFile.removeClass("input-error");
-                var fileName = selectIconFile.val();
-                iconFileHidden.val(fileName);
-            });
-            var clear = $('<button class="editor-button editor-button-small"><i class="fa fa-times"></i></button>').appendTo(iconForm);
-            clear.click(function(evt) {
-                evt.preventDefault();
-                var iconPath = RED.utils.getDefaultNodeIcon(node._def, node);
-                selectIconModule.val(iconPath.module);
-                moduleChange(selectIconModule, selectIconFile, iconModuleHidden, iconFileHidden, iconSets, true);
-                selectIconFile.removeClass("input-error");
-                selectIconFile.val(iconPath.file);
-                iconFileHidden.val(iconPath.file);
-            });
+            var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(iconButton);
+            var colour = node._def.color;
+            var icon_url = RED.utils.getNodeIcon(node._def,node);
+            nodeDiv.css('backgroundColor',colour);
+            var iconContainer = $('<div/>',{class:"palette_icon_container"}).appendTo(nodeDiv);
+            var iconDiv = $('<div/>',{class:"palette_icon",style:"background-image: url("+icon_url+")"}).appendTo(iconContainer);
 
-            moduleChange(selectIconModule, selectIconFile, iconModuleHidden, iconFileHidden, iconSets, false);
-            var iconFileList = iconSets[selectIconModule.val()];
-            if (!iconFileList || iconFileList.indexOf(iconPath.file) === -1) {
-                selectIconFile.append($("<option disabled></option>").val(iconPath.file).text(iconPath.file));
-            }
-            selectIconFile.val(iconPath.file);
-        }
-    }
-
-    function moduleChange(selectIconModule, selectIconFile, iconModuleHidden, iconFileHidden, iconSets, updateIconFile) {
-        selectIconFile.children().remove();
-        var moduleName = selectIconModule.val();
-        if (moduleName !== null) {
-            iconModuleHidden.val(moduleName);
-        }
-        var iconFileList = iconSets[moduleName];
-        if (iconFileList) {
-            iconFileList.forEach(function(fileName) {
-                if (updateIconFile) {
-                    updateIconFile = false;
-                    iconFileHidden.val(fileName);
+            iconButton.click(function(e) {
+                e.preventDefault();
+                var iconPath;
+                var icon = $("#node-settings-icon").text()||"";
+                if (icon) {
+                    iconPath = RED.utils.separateIconPath(icon);
+                } else {
+                    iconPath = RED.utils.getDefaultNodeIcon(node._def, node);
                 }
-                selectIconFile.append($("<option></option>").val(fileName).text(fileName));
-            });
+                showIconPicker(iconRow,node,iconPath,function(newIcon) {
+                    $("#node-settings-icon").text(newIcon||"");
+                    var icon_url = RED.utils.getNodeIcon(node._def,{type:node.type,icon:newIcon});
+                    iconDiv.css("backgroundImage","url("+icon_url+")");
+                });
+            })
+            $('<div class="uneditable-input" id="node-settings-icon">').text(node.icon).appendTo(iconRow);
         }
-        selectIconFile.prop("disabled", !iconFileList);
-        selectIconFile.removeClass("input-error");
-        selectIconModule.removeClass("input-error");
     }
 
     function updateLabels(editing_node, changes, outputMap) {
@@ -1086,9 +1100,7 @@ RED.editor = (function() {
                         }
 
                         if (!editing_node._def.defaults || !editing_node._def.defaults.hasOwnProperty("icon")) {
-                            var iconModule = $("#node-settings-icon-module-hidden").val();
-                            var iconFile = $("#node-settings-icon-file-hidden").val();
-                            var icon = (iconModule && iconFile) ? iconModule+"/"+iconFile : "";
+                            var icon = $("#node-settings-icon").text()||""
                             if (!isDefaultIcon) {
                                 if (icon !== editing_node.icon) {
                                     changes.icon = editing_node.icon;
@@ -1692,9 +1704,7 @@ RED.editor = (function() {
                         if (updateLabels(editing_node, changes, null)) {
                             changed = true;
                         }
-                        var iconModule = $("#node-settings-icon-module-hidden").val();
-                        var iconFile = $("#node-settings-icon-file-hidden").val();
-                        var icon = (iconModule && iconFile) ? iconModule+"/"+iconFile : "";
+                        var icon = $("#node-settings-icon").text()||"";
                         if ((editing_node.icon === undefined && icon !== "node-red/subflow.png") ||
                             (editing_node.icon !== undefined && editing_node.icon !== icon)) {
                             changes.icon = editing_node.icon;
@@ -1839,7 +1849,6 @@ RED.editor = (function() {
                 $("#subflow-dialog-user-count").text(RED._("subflow.subflowInstances", {count:userCount})).show();
 
                 buildLabelForm(portLabels.content,subflow);
-                validateIcon(subflow);
                 trayBody.i18n();
             },
             close: function() {
diff --git a/editor/sass/editor.scss b/editor/sass/editor.scss
index af116c9ef..c4df4791b 100644
--- a/editor/sass/editor.scss
+++ b/editor/sass/editor.scss
@@ -353,3 +353,64 @@
     }
 
 }
+#node-settings-icon {
+    margin-left: 10px;
+    width: calc(100% - 163px);
+}
+.red-ui-icon-picker {
+    position: absolute;
+    border: 1px solid $primary-border-color;
+    box-shadow: 0 1px 6px -3px black;
+    background: white;
+    z-Index: 21;
+    display: none;
+    select {
+        box-sizing: border-box;
+        margin: 3px;
+        width: calc(100% - 6px);
+    }
+}
+.red-ui-icon-list {
+    width: 308px;
+    height: 200px;
+    overflow-y: scroll;
+    line-height: 0px;
+}
+.red-ui-icon-list-icon {
+    display: inline-block;
+    margin: 2px;
+    padding: 4px;
+    cursor: pointer;
+    border-radius: 4px;
+    &:hover {
+        background: lighten($node-selected-color,20%);
+    }
+    &.selected {
+        background: lighten($node-selected-color,20%);
+        .red-ui-search-result-node {
+            border-color: white;
+        }
+    }
+}
+.red-ui-icon-list-module {
+    background: $palette-header-background;
+    font-size: 0.9em;
+    padding: 3px;
+    color: #666;
+    clear: both;
+    i {
+        margin-right: 5px;
+    }
+}
+.red-ui-icon-meta {
+    border-top: 1px solid $secondary-border-color;
+    span {
+        padding: 4px;
+        color: #666;
+        font-size: 0.9em;
+    }
+    button {
+        float: right;
+        margin: 2px;
+    }
+}

From d46b66878aa2883aa6ee4174a83e3074e453aaa8 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 13 Jun 2018 14:56:09 +0100
Subject: [PATCH 042/113] Show unknown node properties in info tab

---
 editor/js/ui/tab-info.js | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/editor/js/ui/tab-info.js b/editor/js/ui/tab-info.js
index bb1bf37cb..83623c878 100644
--- a/editor/js/ui/tab-info.js
+++ b/editor/js/ui/tab-info.js
@@ -180,19 +180,31 @@ RED.sidebar.info = (function() {
                 RED.utils.createObjectElement(node.id).appendTo(propRow.children()[1]);
 
 
-                if (node.type !== "subflow" && node.name) {
+                if (node.type !== "subflow" && node.type !== "unknown" && node.name) {
                     propRow = $('<tr class="node-info-node-row"><td>'+RED._("common.label.name")+'</td><td></td></tr>').appendTo(tableBody);
                     $('<span class="bidiAware" dir="'+RED.text.bidi.resolveBaseTextDir(node.name)+'"></span>').text(node.name).appendTo(propRow.children()[1]);
                 }
                 if (!m) {
                     propRow = $('<tr class="node-info-node-row"><td>'+RED._("sidebar.info.type")+"</td><td></td></tr>").appendTo(tableBody);
-                    $(propRow.children()[1]).text(node.type);
+                    $(propRow.children()[1]).text((node.type === "unknown")?node._orig.type:node.type);
+                    if (node.type === "unknown") {
+                        $('<span style="float: right; font-size: 0.8em"><i class="fa fa-warning"></i></span>').prependTo($(propRow.children()[1]))
+                    }
                 }
-
                 if (!m && node.type != "subflow" && node.type != "comment") {
-                    if (node._def) {
+                    var defaults;
+                    if (node.type === 'unknown') {
+                        defaults = {};
+                        Object.keys(node._orig).forEach(function(k) {
+                            if (k !== 'type') {
+                                defaults[k] = {};
+                            }
+                        })
+                    } else if (node._def) {
+                        defaults = node._def.defaults;
+                    }
+                    if (defaults) {
                         var count = 0;
-                        var defaults = node._def.defaults;
                         for (var n in defaults) {
                             if (n != "name" && defaults.hasOwnProperty(n)) {
                                 var val = node[n];

From 5ed3360c0b91c53b0993d769eeb61822b4dcbae9 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 15 Jun 2018 13:24:52 +0100
Subject: [PATCH 043/113] Fix css for single toggle buttons

---
 editor/sass/mixins.scss    | 9 ++++++---
 editor/templates/index.mst | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/editor/sass/mixins.scss b/editor/sass/mixins.scss
index 36d08c948..bdef0ebc4 100644
--- a/editor/sass/mixins.scss
+++ b/editor/sass/mixins.scss
@@ -134,15 +134,18 @@
     color: $workspace-button-toggle-color !important;
     background:$workspace-button-background-active;
     margin-bottom: 1px;
-    &.selected:not(.disabled) {
+
+    &.selected:not(.disabled):not(:disabled) {
         color: $workspace-button-toggle-color-selected !important;
         background: $workspace-button-background;
         border-bottom-width: 2px;
         border-bottom-color: $form-input-border-selected-color;
         margin-bottom: 0;
-        cursor: default;
+        &:not(.single) {
+            cursor: default;
+        }
     }
-    &.disabled {
+    &.disabled,&:disabled {
         color: $workspace-button-toggle-color-disabled !important;
     }
 }
diff --git a/editor/templates/index.mst b/editor/templates/index.mst
index 23a87fde7..846150118 100644
--- a/editor/templates/index.mst
+++ b/editor/templates/index.mst
@@ -51,7 +51,7 @@
             <a class="workspace-footer-button" id="btn-zoom-out" href="#"><i class="fa fa-minus"></i></a>
             <a class="workspace-footer-button" id="btn-zoom-zero" href="#"><i class="fa fa-circle-o"></i></a>
             <a class="workspace-footer-button" id="btn-zoom-in" href="#"><i class="fa fa-plus"></i></a>
-            <a class="workspace-footer-button-toggle" id="btn-navigate" href="#"><i class="fa fa-map-o"></i></a>
+            <a class="workspace-footer-button-toggle single" id="btn-navigate" href="#"><i class="fa fa-map-o"></i></a>
         </div>
         <div id="editor-shade" class="hide"></div>
     </div>

From f7434b5ec8ab8e1790d4f625d78d1e41dfcb552a Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 15 Jun 2018 13:25:05 +0100
Subject: [PATCH 044/113] Add output to File Out node and update icons

---
 editor/icons/file-in.png        | Bin 0 -> 542 bytes
 editor/icons/file-out.png       | Bin 0 -> 503 bytes
 nodes/core/storage/50-file.html |   7 ++---
 nodes/core/storage/50-file.js   |  47 ++++++++++++++++++++++----------
 4 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 editor/icons/file-in.png
 create mode 100644 editor/icons/file-out.png

diff --git a/editor/icons/file-in.png b/editor/icons/file-in.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3e5cd7fee68ea5d99fc0e644f4e5871f5badcd4
GIT binary patch
literal 542
zcmV+(0^$9MP)<h;3K|Lk000e1NJLTq001Ze002A)1^@s66uJ1|00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10h>ugK~!jg?Uy}H!$1&5zkxs>i8G|(8mW+IIRpraW6&bOC1@!q
zLPM7;1c@sUQ4{efY|DvbC$_Ucme|*3yz{c2omoqXL?V$$IES88*0>+KAl@V$3i^?B
zEa+a+gP>bUPlE0wJqo&!^elL|WB|d#Bm)WdmkcP_PcpDzcgYBXjgq6z+uIT|GZ*U|
zxmd&}|4XoCtv$7=;ey&aX$p44iKJIa(=C~rx(zO9W(JHU%_U8$zg6R-)S#IyC0$Bd
z?u(6fNX+a*(v_suuDGbD*v#G}-F1Gj#}sHyL%!l<UwaemybGK8M!*dC0k%$ebiq95
z7+3&bz+_)=aKSw9Bo|zewW47O=DDY2uX+a5UuI$o=J{{(WgmxrS*X9V4dfNS1E+%$
zq&y^_z}c?A;DVHG<{LQQ7aUZOvQe*qi#88<qaj~0>TcWqqhNxREd^k!t3<i5uH~63
zyImIz`Pj^U2O&r{Z|9QMN7|8@ZRC#9sLAH+i#FwI2`)%BU!PU^9+9N#?n!ZW@If_S
gbcsYFkx2OA4+j@3u5bOyeE<Le07*qoM6N<$f(YB_RsaA1

literal 0
HcmV?d00001

diff --git a/editor/icons/file-out.png b/editor/icons/file-out.png
new file mode 100644
index 0000000000000000000000000000000000000000..051f819c8b442a1d1ed21543d565145dc839f074
GIT binary patch
literal 503
zcmV<T0SNwyP)<h;3K|Lk000e1NJLTq001Ze002A)1^@s66uJ1|00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10dz@3K~!jg?U%h#!$1&5-+Dv=Zo-u)C8Y?QPzEUh6hTTr00mG3
zO}GG<SpwNJ8n{FEvnxEzzEtwg^J>4-3W6XAg1{VY<Xer~a~D)MNkc&&Nn=5KNe4k&
zNhd)&Nk>5&NoT=+$rS|qBv%q_mt0Y>O>$+yddWW!%t{W`?JYz^#G=l|qKGH|O7LOn
zhSu3l&G3ojoMdjk0G@%d;!jnPn%iPQ5fN400&l?1UN0?JHG?8@04{-pmDCc|ArX;x
z;0pM(*ZIk&bXezz$SZKOf?xYFBO><{B)gl^u4R5ZsOn4a@$&02bGp#_YO+jrcZxGb
zU6XC{s&h?t&kQDN?X73<?3V?z4yx*?svp)J>`w7fZpW15ZEKC3L-!-r>6m$<Q!YoB
zpsEhQBTm~5%)UvM<}fn?cR22c(9uCv-2>N#E=j5u*4g!uX}dQ4D(v2<kJn5RTPj%f
th`ke=qF8W^#HOg}pnGD2AP9oMo-fy=$IR}84T=B&002ovPDHLkV1mPj)qVf~

literal 0
HcmV?d00001

diff --git a/nodes/core/storage/50-file.html b/nodes/core/storage/50-file.html
index cdb001eb6..eabf56a76 100644
--- a/nodes/core/storage/50-file.html
+++ b/nodes/core/storage/50-file.html
@@ -123,9 +123,8 @@
         },
         color:"BurlyWood",
         inputs:1,
-        outputs:0,
-        icon: "file.png",
-        align: "right",
+        outputs:1,
+        icon: "file-out.png",
         label: function() {
             if (this.overwriteFile === "delete") {
                 return this.name||this._("file.label.deletelabel",{file:this.filename});
@@ -159,7 +158,7 @@
         outputLabels: function(i) {
             return (this.format === "utf8") ? "UTF8 string" : "binary buffer";
         },
-        icon: "file.png",
+        icon: "file-in.png",
         label: function() {
             return this.name||this.filename||this._("file.label.filelabel");
         },
diff --git a/nodes/core/storage/50-file.js b/nodes/core/storage/50-file.js
index a0e49f6fc..76cedb136 100644
--- a/nodes/core/storage/50-file.js
+++ b/nodes/core/storage/50-file.js
@@ -39,14 +39,20 @@ module.exports = function(RED) {
                     node.tout = null;
                 },333);
             }
-            if (filename === "") { node.warn(RED._("file.errors.nofilename")); }
-            else if (node.overwriteFile === "delete") {
+            if (filename === "") {
+                node.warn(RED._("file.errors.nofilename"));
+            } else if (node.overwriteFile === "delete") {
                 fs.unlink(filename, function (err) {
-                    if (err) { node.error(RED._("file.errors.deletefail",{error:err.toString()}),msg); }
-                    else if (RED.settings.verbose) { node.log(RED._("file.status.deletedfile",{file:filename})); }
+                    if (err) {
+                        node.error(RED._("file.errors.deletefail",{error:err.toString()}),msg);
+                    } else {
+                        if (RED.settings.verbose) {
+                            node.log(RED._("file.status.deletedfile",{file:filename}));
+                        }
+                        node.send(msg);
+                    }
                 });
-            }
-            else if (msg.hasOwnProperty("payload") && (typeof msg.payload !== "undefined")) {
+            } else if (msg.hasOwnProperty("payload") && (typeof msg.payload !== "undefined")) {
                 var dir = path.dirname(filename);
                 if (node.createDir) {
                     try {
@@ -64,15 +70,21 @@ 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(Buffer.from(data));
+                node.data.push({msg:msg,data:Buffer.from(data)});
 
                 while (node.data.length > 0) {
                     if (node.overwriteFile === "true") {
-                        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.end(node.data.shift());
+                        (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);
+                                });
+                            })
+                        })(node.data.shift());
                     }
                     else {
                         // Append mode
@@ -115,10 +127,17 @@ module.exports = function(RED) {
                         }
                         if (node.filename) {
                             // Static filename - write and reuse the stream next time
-                            node.wstream.write(node.data.shift());
+                            var packet = node.data.shift()
+                            node.wstream.write(packet.data, function() {
+                                node.send(packet.msg);
+                            });
+
                         } else {
                             // Dynamic filename - write and close the stream
-                            node.wstream.end(node.data.shift());
+                            var packet = node.data.shift()
+                            node.wstream.end(packet.data, function() {
+                                node.send(packet.msg);
+                            });
                             delete node.wstream;
                             delete node.wstreamIno;
                         }

From de35c7024af0d3c6bc1ce5294a3fc342a9e6fa72 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 15 Jun 2018 17:28:29 +0100
Subject: [PATCH 045/113] Tab buttons should use editor-button-toggle style

---
 editor/js/ui/common/tabs.js | 4 ++--
 editor/sass/tabs.scss       | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/editor/js/ui/common/tabs.js b/editor/js/ui/common/tabs.js
index 23b69f5d1..4ed7ffe53 100644
--- a/editor/js/ui/common/tabs.js
+++ b/editor/js/ui/common/tabs.js
@@ -170,8 +170,8 @@ RED.tabs = (function() {
                 ul.children().css({"transition": "width 100ms"});
                 link.parent().addClass("active");
                 var parentId = link.parent().attr('id');
-                wrapper.find(".red-ui-tab-link-button").removeClass("active");
-                $("#"+parentId+"-link-button").addClass("active");
+                wrapper.find(".red-ui-tab-link-button").removeClass("active selected");
+                $("#"+parentId+"-link-button").addClass("active selected");
                 if (options.scrollable) {
                     var pos = link.parent().position().left;
                     if (pos-21 < 0) {
diff --git a/editor/sass/tabs.scss b/editor/sass/tabs.scss
index 488f4f3c9..2dfe511e2 100644
--- a/editor/sass/tabs.scss
+++ b/editor/sass/tabs.scss
@@ -214,12 +214,11 @@
     border-bottom: 1px solid $primary-border-color;
     z-index: 2;
     a {
-        @include workspace-button;
+        @include workspace-button-toggle;
         line-height: 26px;
         height: 28px;
         width: 28px;
         margin: 4px 3px 3px;
-        border: 1px solid $primary-border-color;
         z-index: 2;
         &.red-ui-tab-link-button {
             &:not(.active) {

From 2648b7ca54f9437d5ff5f449260eb5d942c7797b Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 15 Jun 2018 22:33:53 +0100
Subject: [PATCH 046/113] Handle releasing ctrl when using quick-add node
 dialog

---
 editor/js/ui/view.js | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/editor/js/ui/view.js b/editor/js/ui/view.js
index 71454153d..3332f9916 100644
--- a/editor/js/ui/view.js
+++ b/editor/js/ui/view.js
@@ -59,7 +59,9 @@ RED.view = (function() {
         dblClickPrimed = null,
         clickTime = 0,
         clickElapsed = 0,
-        scroll_position;
+        scroll_position = [],
+        quickAddActive = false,
+        quickAddLink = null;
 
     var clipboard = "";
 
@@ -569,14 +571,16 @@ RED.view = (function() {
                     mouse_mode = RED.state.QUICK_JOINING;
                     $(window).on('keyup',disableQuickJoinEventHandler);
                 }
-
+                quickAddActive = true;
                 RED.typeSearch.show({
                     x:d3.event.clientX-mainPos.left-node_width/2,
                     y:d3.event.clientY-mainPos.top-node_height/2,
                     cancel: function() {
+                        quickAddActive = false;
                         resetMouseVars();
                     },
                     add: function(type) {
+                        quickAddActive = false;
                         var result = addNode(type);
                         if (!result) {
                             return;
@@ -585,11 +589,10 @@ RED.view = (function() {
                         var historyEvent = result.historyEvent;
                         nn.x = point[0];
                         nn.y = point[1];
-                        if (mouse_mode === RED.state.QUICK_JOINING) {
-                            if (drag_lines.length > 0) {
-                                var drag_line = drag_lines[0];
+                        if (mouse_mode === RED.state.QUICK_JOINING || quickAddLink) {
+                            if (quickAddLink || drag_lines.length > 0) {
+                                var drag_line = quickAddLink||drag_lines[0];
                                 var src = null,dst,src_port;
-
                                 if (drag_line.portType === PORT_TYPE_OUTPUT && nn.inputs > 0) {
                                     src = drag_line.node;
                                     src_port = drag_line.port;
@@ -604,9 +607,9 @@ RED.view = (function() {
                                     RED.nodes.addLink(link);
                                     historyEvent.links = [link];
                                     hideDragLines();
-                                    if (drag_line.portType === PORT_TYPE_OUTPUT && nn.outputs > 0) {
+                                    if (!quickAddLink && drag_line.portType === PORT_TYPE_OUTPUT && nn.outputs > 0) {
                                         showDragLines([{node:nn,port:0,portType:PORT_TYPE_OUTPUT}]);
-                                    } else if (drag_line.portType === PORT_TYPE_INPUT && nn.inputs > 0) {
+                                    } else if (!quickAddLink && drag_line.portType === PORT_TYPE_INPUT && nn.inputs > 0) {
                                         showDragLines([{node:nn,port:0,portType:PORT_TYPE_INPUT}]);
                                     } else {
                                         resetMouseVars();
@@ -624,9 +627,9 @@ RED.view = (function() {
                                     resetMouseVars();
                                 }
                             }
+                            quickAddLink = null;
                         }
 
-
                         RED.history.push(historyEvent);
                         RED.nodes.add(nn);
                         RED.editor.validateNode(nn);
@@ -1412,6 +1415,9 @@ RED.view = (function() {
     function disableQuickJoinEventHandler(evt) {
         // Check for ctrl (all browsers), "Meta" (Chrome/FF), keyCode 91 (Safari)
         if (evt.keyCode === 17 || evt.key === "Meta" || evt.keyCode === 91) {
+            if (quickAddActive && drag_lines.length > 0) {
+                quickAddLink = drag_lines[0];
+            }
             resetMouseVars();
             hideDragLines();
             redraw();

From a467fe5ed7d66767efe36c47257ffc0d7027a601 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 19 Jun 2018 10:49:50 +0100
Subject: [PATCH 047/113] Reposition tab menu before opening

---
 editor/js/ui/common/tabs.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/editor/js/ui/common/tabs.js b/editor/js/ui/common/tabs.js
index 4ed7ffe53..7404ba337 100644
--- a/editor/js/ui/common/tabs.js
+++ b/editor/js/ui/common/tabs.js
@@ -90,12 +90,12 @@ RED.tabs = (function() {
                     collapsibleMenu.on('mouseleave', function(){ $(this).hide() });
                     collapsibleMenu.on('mouseup', function() { $(this).hide() });
                     collapsibleMenu.appendTo("body");
-                    var elementPos = selectButton.offset();
-                    collapsibleMenu.css({
-                        top: (elementPos.top+selectButton.height()-20)+"px",
-                        left: (elementPos.left - collapsibleMenu.width() + selectButton.width())+"px"
-                    })
                 }
+                var elementPos = selectButton.offset();
+                collapsibleMenu.css({
+                    top: (elementPos.top+selectButton.height()-20)+"px",
+                    left: (elementPos.left - collapsibleMenu.width() + selectButton.width())+"px"
+                })
                 collapsibleMenu.toggle();
             })
 

From aa6b72ac87fbedfa1f65c1a492c0af23de576c8b Mon Sep 17 00:00:00 2001
From: Hiroki Uchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Thu, 15 Mar 2018 15:03:24 +0900
Subject: [PATCH 048/113] Move context.js to context folder and rename
 context.js -> index.js

---
 red/runtime/nodes/{context.js => context/index.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename red/runtime/nodes/{context.js => context/index.js} (100%)

diff --git a/red/runtime/nodes/context.js b/red/runtime/nodes/context/index.js
similarity index 100%
rename from red/runtime/nodes/context.js
rename to red/runtime/nodes/context/index.js

From cd44f1317190d066d6cfb80a2581ffac74014a8f Mon Sep 17 00:00:00 2001
From: Hiroki Uchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Thu, 15 Mar 2018 15:03:50 +0900
Subject: [PATCH 049/113] Move context_spec.js to context folder and rename
 context_spec.js -> index_spec.js

---
 test/red/runtime/nodes/{context_spec.js => context/index_spec.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/red/runtime/nodes/{context_spec.js => context/index_spec.js} (100%)

diff --git a/test/red/runtime/nodes/context_spec.js b/test/red/runtime/nodes/context/index_spec.js
similarity index 100%
rename from test/red/runtime/nodes/context_spec.js
rename to test/red/runtime/nodes/context/index_spec.js

From 771b598c09c82f5ee716f003193b69ef65b2c8e4 Mon Sep 17 00:00:00 2001
From: Hiroki Uchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Thu, 15 Mar 2018 15:15:26 +0900
Subject: [PATCH 050/113] Add persistable context and avoid exception when arg
 is undefined in util/getMessageProperty

---
 red/runtime/nodes/context/index.js           |  50 ++-
 red/runtime/util.js                          |   2 +-
 test/red/runtime/nodes/context/index_spec.js | 330 ++++++++++++-------
 3 files changed, 253 insertions(+), 129 deletions(-)

diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index e71a1eaed..b63aedb17 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -14,20 +14,27 @@
  * limitations under the License.
  **/
 
-var clone = require("clone");
-var when = require("when");
-var util = require("../util");
+var util = require("../../util");
+var log = require("../../log");
+var externalContext = require("./external");
+
+var contexts = {};
+var globalContext = null;
+
+var re = /^(\$.*?)\.(.+)|^(\$.*)/;
 
 function createContext(id,seed) {
+    var flowId = id;
     var data = seed || {};
     var obj = seed || {};
-    obj.get = function get(key) {
+
+    function get(key) {
         return util.getMessageProperty(data,key);
     };
-    obj.set = function set(key, value) {
+    function set(key, value) {
         util.setMessageProperty(data,key,value);
-    }
-    obj.keys = function() {
+    };
+    function keys() {
         var keysData = Object.keys(data);
         if (seed == null) {
             return keysData;
@@ -36,13 +43,32 @@ function createContext(id,seed) {
                 return key !== "set" && key !== "get" && key !== "keys";
             });
         }
+    };
+
+    obj.get = function(key) {
+        if(externalContext.canUse(key)) {
+            return externalContext.get(key, flowId);
+        }else{
+            return get(key);
+        }
+    };
+    obj.set = function(key, value) {
+        if(externalContext.canUse(key)) {
+            externalContext.set(key, value, flowId);
+        }else{
+            set(key, value);
+        }
+    }
+    obj.keys = function(key) {
+        if(externalContext.canUse(key)) {
+            return externalContext.keys(key, flowId);
+        }else{
+            return keys();
+        }
     }
     return obj;
 }
 
-var contexts = {};
-var globalContext = null;
-
 function getContext(localId,flowId) {
     var contextId = localId;
     if (flowId) {
@@ -61,6 +87,7 @@ function getContext(localId,flowId) {
     contexts[contextId] = newContext;
     return newContext;
 }
+
 function deleteContext(id,flowId) {
     var contextId = id;
     if (flowId) {
@@ -68,6 +95,7 @@ function deleteContext(id,flowId) {
     }
     delete contexts[contextId];
 }
+
 function clean(flowConfig) {
     var activeIds = {};
     var contextId;
@@ -81,9 +109,11 @@ function clean(flowConfig) {
         }
     }
 }
+
 module.exports = {
     init: function(settings) {
         globalContext = createContext("global",settings.functionGlobalContext || {});
+        externalContext.init(settings);
     },
     get: getContext,
     delete: deleteContext,
diff --git a/red/runtime/util.js b/red/runtime/util.js
index 257e87777..4d077c21f 100644
--- a/red/runtime/util.js
+++ b/red/runtime/util.js
@@ -240,7 +240,7 @@ function getMessageProperty(msg,expr) {
     var msgPropParts = normalisePropertyExpression(expr);
     var m;
     msgPropParts.reduce(function(obj, key) {
-        result = (typeof obj[key] !== "undefined" ? obj[key] : undefined);
+        result = ((typeof obj !== "undefined") && (typeof obj[key] !== "undefined") ? obj[key] : undefined);
         return result;
     }, msg);
     return result;
diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index 3e7c03de4..fce39bcf4 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -16,129 +16,223 @@
 
 var should = require("should");
 var sinon = require('sinon');
-var Context = require("../../../../red/runtime/nodes/context");
+var path = require('path');
+var fs = require('fs-extra');
+var Context = require("../../../../../red/runtime/nodes/context/index");
 
 describe('context', function() {
-    beforeEach(function() {
-        Context.init({});
-    });
-    afterEach(function() {
-        Context.clean({allNodes:{}});
-    });
-    it('stores local property',function() {
-        var context1 = Context.get("1","flowA");
-        should.not.exist(context1.get("foo"));
-        context1.set("foo","test");
-        context1.get("foo").should.eql("test");
-    });
-    it('stores local property - creates parent properties',function() {
-        var context1 = Context.get("1","flowA");
-        context1.set("foo.bar","test");
-        context1.get("foo").should.eql({bar:"test"});
-    });
-    it('deletes local property',function() {
-        var context1 = Context.get("1","flowA");
-        context1.set("foo.abc.bar1","test1");
-        context1.set("foo.abc.bar2","test2");
-        context1.get("foo.abc").should.eql({bar1:"test1",bar2:"test2"});
-        context1.set("foo.abc.bar1",undefined);
-        context1.get("foo.abc").should.eql({bar2:"test2"});
-        context1.set("foo.abc",undefined);
-        should.not.exist(context1.get("foo.abc"));
-        context1.set("foo",undefined);
-        should.not.exist(context1.get("foo"));
-    });
-    it('stores flow property',function() {
-        var context1 = Context.get("1","flowA");
-        should.not.exist(context1.flow.get("foo"));
-        context1.flow.set("foo","test");
-        context1.flow.get("foo").should.eql("test");
-    });
-    it('stores global property',function() {
-        var context1 = Context.get("1","flowA");
-        should.not.exist(context1.global.get("foo"));
-        context1.global.set("foo","test");
-        context1.global.get("foo").should.eql("test");
+    describe('localmemory',function() {
+        beforeEach(function() {
+            Context.init({});
+        });
+        afterEach(function() {
+            Context.clean({allNodes:{}});
+        });
+        it('stores local property',function() {
+            var context1 = Context.get("1","flowA");
+            should.not.exist(context1.get("foo"));
+            context1.set("foo","test");
+            context1.get("foo").should.eql("test");
+        });
+        it('stores local property - creates parent properties',function() {
+            var context1 = Context.get("1","flowA");
+            context1.set("foo.bar","test");
+            context1.get("foo").should.eql({bar:"test"});
+        });
+        it('deletes local property',function() {
+            var context1 = Context.get("1","flowA");
+            context1.set("foo.abc.bar1","test1");
+            context1.set("foo.abc.bar2","test2");
+            context1.get("foo.abc").should.eql({bar1:"test1",bar2:"test2"});
+            context1.set("foo.abc.bar1",undefined);
+            context1.get("foo.abc").should.eql({bar2:"test2"});
+            context1.set("foo.abc",undefined);
+            should.not.exist(context1.get("foo.abc"));
+            context1.set("foo",undefined);
+            should.not.exist(context1.get("foo"));
+        });
+        it('stores flow property',function() {
+            var context1 = Context.get("1","flowA");
+            should.not.exist(context1.flow.get("foo"));
+            context1.flow.set("foo","test");
+            context1.flow.get("foo").should.eql("test");
+        });
+        it('stores global property',function() {
+            var context1 = Context.get("1","flowA");
+            should.not.exist(context1.global.get("foo"));
+            context1.global.set("foo","test");
+            context1.global.get("foo").should.eql("test");
+        });
+
+        it('keeps local context local', function() {
+            var context1 = Context.get("1","flowA");
+            var context2 = Context.get("2","flowA");
+
+            should.not.exist(context1.get("foo"));
+            should.not.exist(context2.get("foo"));
+            context1.set("foo","test");
+
+            context1.get("foo").should.eql("test");
+            should.not.exist(context2.get("foo"));
+        });
+        it('flow context accessible to all flow nodes', function() {
+            var context1 = Context.get("1","flowA");
+            var context2 = Context.get("2","flowA");
+
+            should.not.exist(context1.flow.get("foo"));
+            should.not.exist(context2.flow.get("foo"));
+
+            context1.flow.set("foo","test");
+            context1.flow.get("foo").should.eql("test");
+            context2.flow.get("foo").should.eql("test");
+        });
+
+        it('flow context not shared to nodes on other flows', function() {
+            var context1 = Context.get("1","flowA");
+            var context2 = Context.get("2","flowB");
+
+            should.not.exist(context1.flow.get("foo"));
+            should.not.exist(context2.flow.get("foo"));
+
+            context1.flow.set("foo","test");
+            context1.flow.get("foo").should.eql("test");
+            should.not.exist(context2.flow.get("foo"));
+        });
+
+        it('global context shared to all nodes', function() {
+            var context1 = Context.get("1","flowA");
+            var context2 = Context.get("2","flowB");
+
+            should.not.exist(context1.global.get("foo"));
+            should.not.exist(context2.global.get("foo"));
+
+            context1.global.set("foo","test");
+            context1.global.get("foo").should.eql("test");
+            context2.global.get("foo").should.eql("test");
+        });
+
+        it('deletes context',function() {
+            var context = Context.get("1","flowA");
+            should.not.exist(context.get("foo"));
+            context.set("foo","abc");
+            context.get("foo").should.eql("abc");
+
+            Context.delete("1","flowA");
+            context = Context.get("1","flowA");
+            should.not.exist(context.get("foo"));
+        });
+
+        it('enumerates context keys', function() {
+            var context = Context.get("1","flowA");
+
+            var keys = context.keys();
+            keys.should.be.an.Array();
+            keys.should.be.empty();
+
+            context.set("foo","bar");
+            keys = context.keys();
+            keys.should.have.length(1);
+            keys[0].should.eql("foo");
+
+            context.set("abc.def","bar");
+            keys = context.keys();
+            keys.should.have.length(2);
+            keys[1].should.eql("abc");
+        });
     });
 
-    it('keeps local context local', function() {
-        var context1 = Context.get("1","flowA");
-        var context2 = Context.get("2","flowA");
+    describe('external context storage',function() {
+        var testDir = path.join(__dirname,".testUserHome");
+        var context;
+        var stubGet = sinon.stub();
+        var stubSet = sinon.stub();
+        var stubKeys = sinon.stub();
+        var contextStorage={
+                test:{
+                    module: {
+                        init: function() {
+                            return true;
+                        },
+                        get: stubGet,
+                        set: stubSet,
+                        keys: stubKeys,
+                    },
+                    config:{}
+                }
+            };
 
-        should.not.exist(context1.get("foo"));
-        should.not.exist(context2.get("foo"));
-        context1.set("foo","test");
+        beforeEach(function() {
+            Context.init({contextStorage:contextStorage});
+            context =  Context.get("1","flow");
+        });
+        afterEach(function(done) {
+            stubGet.reset();
+            stubSet.reset();
+            stubKeys.reset();
+            Context.clean({allNodes:{}});
+            fs.remove(testDir,done);
+        });
 
-        context1.get("foo").should.eql("test");
-        should.not.exist(context2.get("foo"));
+        describe('if external context storage exists',function() {
+            it('should store local property to external context storage',function() {
+                should.not.exist(context.get("$test.foo"));
+                context.set("$test.foo","test");
+                context.get("$test.foo");
+                context.keys("$test");
+                stubGet.called.should.be.true();
+                stubSet.called.should.be.true();
+                stubKeys.called.should.be.true();
+            });
+            it('should store flow property to external context storage',function() {
+                should.not.exist(context.flow.get("$test.foo"));
+                context.flow.set("$test.foo","test");
+                context.flow.get("$test.foo");
+                context.flow.keys("$test");
+                stubGet.called.should.be.true();
+                stubSet.called.should.be.true();
+                stubKeys.called.should.be.true();
+            });
+            it('should store global property to external context storage',function() {
+                should.not.exist(context.global.get("$test.foo"));
+                context.global.set("$test.foo","test");
+                context.global.get("$test.foo");
+                context.global.keys("$test");
+                stubGet.called.should.be.true();
+                stubSet.called.should.be.true();
+                stubKeys.called.should.be.true();
+            });
+        });
+
+        describe('if external context storage does not exist',function() {
+            it('should store local property to local memory',function() {
+                should.not.exist(context.flow.get("$nonexist.foo"));
+                context.set("$nonexist.foo","test");
+                context.get("$nonexist.foo").should.eql("test");
+                context.keys("$nonexist").should.have.length(1);
+                stubGet.notCalled.should.be.true();
+                stubSet.notCalled.should.be.true();
+                stubKeys.notCalled.should.be.true();
+            });
+
+            it('should store flow property to local memory',function() {
+                should.not.exist(context.flow.get("$nonexist.foo"));
+                context.flow.set("$nonexist.foo","test");
+                context.flow.get("$nonexist.foo").should.eql("test");
+                context.flow.keys("$nonexist").should.have.length(1);
+                stubGet.notCalled.should.be.true();
+                stubSet.notCalled.should.be.true();
+                stubKeys.notCalled.should.be.true();
+            });
+
+            it('should store global property to local memory',function() {
+                should.not.exist(context.global.get("$nonexist.foo"));
+                context.global.set("$nonexist.foo","test");
+                context.global.get("$nonexist.foo").should.eql("test");
+                context.global.keys("$nonexist").should.have.length(1);
+                stubGet.notCalled.should.be.true();
+                stubSet.notCalled.should.be.true();
+                stubKeys.notCalled.should.be.true();
+            });
+        });
     });
-    it('flow context accessible to all flow nodes', function() {
-        var context1 = Context.get("1","flowA");
-        var context2 = Context.get("2","flowA");
-
-        should.not.exist(context1.flow.get("foo"));
-        should.not.exist(context2.flow.get("foo"));
-
-        context1.flow.set("foo","test");
-        context1.flow.get("foo").should.eql("test");
-        context2.flow.get("foo").should.eql("test");
-    });
-
-    it('flow context not shared to nodes on other flows', function() {
-        var context1 = Context.get("1","flowA");
-        var context2 = Context.get("2","flowB");
-
-        should.not.exist(context1.flow.get("foo"));
-        should.not.exist(context2.flow.get("foo"));
-
-        context1.flow.set("foo","test");
-        context1.flow.get("foo").should.eql("test");
-        should.not.exist(context2.flow.get("foo"));
-    });
-
-    it('global context shared to all nodes', function() {
-        var context1 = Context.get("1","flowA");
-        var context2 = Context.get("2","flowB");
-
-        should.not.exist(context1.global.get("foo"));
-        should.not.exist(context2.global.get("foo"));
-
-        context1.global.set("foo","test");
-        context1.global.get("foo").should.eql("test");
-        context2.global.get("foo").should.eql("test");
-    });
-
-    it('deletes context',function() {
-        var context = Context.get("1","flowA");
-        should.not.exist(context.get("foo"));
-        context.set("foo","abc");
-        context.get("foo").should.eql("abc");
-
-        Context.delete("1","flowA");
-        context = Context.get("1","flowA");
-        should.not.exist(context.get("foo"));
-    })
-
-    it('enumerates context keys', function() {
-        var context = Context.get("1","flowA");
-
-        var keys = context.keys();
-        keys.should.be.an.Array();
-        keys.should.be.empty();
-
-        context.set("foo","bar");
-        keys = context.keys();
-        keys.should.have.length(1);
-        keys[0].should.eql("foo");
-
-        context.set("abc.def","bar");
-        keys = context.keys();
-        keys.should.have.length(2);
-        keys[1].should.eql("abc");
-
-
-
-
-    })
-
 });

From e66b3810702d6f9dc99ae56068ae42a07f2cbeab Mon Sep 17 00:00:00 2001
From: Hiroki Uchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Fri, 16 Mar 2018 05:52:17 +0900
Subject: [PATCH 051/113] add external context files

---
 red/runtime/nodes/context/external.js         | 133 +++++++++++
 red/runtime/nodes/context/localfilesystem.js  |  81 +++++++
 .../runtime/nodes/context/external_spec.js    | 222 ++++++++++++++++++
 .../nodes/context/localfilesystem_spec.js     |   0
 4 files changed, 436 insertions(+)
 create mode 100644 red/runtime/nodes/context/external.js
 create mode 100644 red/runtime/nodes/context/localfilesystem.js
 create mode 100644 test/red/runtime/nodes/context/external_spec.js
 create mode 100644 test/red/runtime/nodes/context/localfilesystem_spec.js

diff --git a/red/runtime/nodes/context/external.js b/red/runtime/nodes/context/external.js
new file mode 100644
index 000000000..d969fc53d
--- /dev/null
+++ b/red/runtime/nodes/context/external.js
@@ -0,0 +1,133 @@
+/**
+ * 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 when = require("when");
+var log = require("../../log");
+
+var re = /^(\$.*?)\.(.+)|^(\$.*)/;
+var externalContexts;
+
+function parseKey(key){
+    var keys = null;
+    var temp = re.exec(key);
+    if(temp){
+        keys = [];
+        if(temp[3]){
+            keys[0] = temp[3];
+            keys[1] = null;
+        } else {
+            keys[0] = temp[1];
+            keys[1] = temp[2];
+        }
+        keys[0] = keys[0] === "$" ? "default" : keys[0].substring(1);
+    }
+    return keys;
+}
+
+function hasContextStorage(plugin) {
+    return externalContexts.hasOwnProperty(plugin);
+}
+
+var contextModuleInterface ={
+    init: function (settings) {
+        var plugins = settings.contextStorage;
+        externalContexts = {};
+        if (plugins) {
+            for(var pluginName in plugins){
+                var plugin;
+                if(plugins[pluginName].hasOwnProperty("module") && plugins[pluginName].hasOwnProperty("config")) {
+                    if(typeof plugins[pluginName].module === "string") {
+                        try{
+                            plugin = require(plugins[pluginName].module);
+                        }catch(err){
+                            log.error(err);
+                            continue;
+                        }
+                    } else {
+                        plugin = plugins[pluginName].module;
+                    }
+                    plugin.init(plugins[pluginName].config);
+                    externalContexts[pluginName] = plugin;
+                }
+            }
+        }
+    },
+    get: function(key, flowId) {
+        var result = parseKey(key);
+        if(!result){
+            throw new Error("Invalid key");
+        }
+        if(hasContextStorage(result[0])){
+            return externalContexts[result[0]].get(result[1], flowId);
+        }else if(hasContextStorage("default")) {
+            // log.warn(result[1] " is got from default context storage");
+            return externalContexts["default"].get(result[1], flowId);
+        }else{
+            throw new Error(result[0] + " is not defined in setting.js");
+        }
+        
+    },
+    set: function(key, value, flowId) {
+        var result = parseKey(key);
+        if(!result){
+            throw new Error("Invalid key");
+        }
+        if(hasContextStorage(result[0])){
+            externalContexts[result[0]].set(result[1], value, flowId);
+        }else if(hasContextStorage("default")) {
+            // log.warn(result[1] " is set to default context storage");
+            externalContexts["default"].set(result[1], value, flowId);
+        }else{
+            throw new Error(result[0] + " is not defined in setting.js");
+        }
+    },
+    keys: function(key, flowId) {
+        var result = parseKey(key);
+        if(!result){
+            throw new Error("Invalid key");
+        }
+        if(hasContextStorage(result[0])){
+            return externalContexts[result[0]].keys(flowId);
+        }else if(hasContextStorage("default")) {
+            // log.warn("keys are got from default context storage");
+            externalContexts["default"].keys(flowId);
+        }else{
+            throw new Error(result[0] + " is not defined in setting.js");
+        }
+    },
+    // run: function(command,key,value,flowId) {
+    //     //todo: run custom method in plugin
+    // },
+    // close: function(){
+    //     //todo: close connections, streams, etc...
+    // },
+    canUse: function(key){
+        var result = parseKey(key);
+        if(!result){
+            return false;
+        }else{
+            if(hasContextStorage(result[0]) || hasContextStorage("default")){
+                return true;
+            }else{
+                return false;
+            }
+        }
+    },
+    hasContextStorage: hasContextStorage,
+    parseKey: parseKey
+};
+
+module.exports = contextModuleInterface;
\ No newline at end of file
diff --git a/red/runtime/nodes/context/localfilesystem.js b/red/runtime/nodes/context/localfilesystem.js
new file mode 100644
index 000000000..733c619d1
--- /dev/null
+++ b/red/runtime/nodes/context/localfilesystem.js
@@ -0,0 +1,81 @@
+/**
+ * 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 storage = require('node-persist');
+var fs = require('fs-extra');
+var fspath = require("path");
+
+var configs;
+var storagePath;
+var fileStorages;
+
+function createStorage(path) {
+    var fileStorage = storage.create({dir: fspath.join(storagePath,path)});
+    fileStorage.initSync();
+    fileStorages[path] = fileStorage;
+}
+
+var localfilesystem = {
+    init: function(_configs) {
+        configs = _configs;
+        fileStorages = {};
+        if (!configs.dir) {
+            try {
+                fs.statSync(fspath.join(process.env.NODE_RED_HOME,".config.json"));
+                storagePath = fspath.join(process.env.NODE_RED_HOME,"contexts");
+            } catch(err) {
+                try {
+                    // Consider compatibility for older versions
+                    if (process.env.HOMEPATH) {
+                        fs.statSync(fspath.join(process.env.HOMEPATH,".node-red",".config.json"));
+                        storagePath = fspath.join(process.env.HOMEPATH,".node-red","contexts");
+                    }
+                } catch(err) {
+                }
+                if (!configs.dir) {
+                    storagePath = fspath.join(process.env.HOME || process.env.USERPROFILE || process.env.HOMEPATH || process.env.NODE_RED_HOME,".node-red","contexts");
+                }
+            }
+        }else{
+            storagePath = configs.dir;
+        }
+        
+    },
+    stop: function() {
+        return when.resolve();
+    },
+    get: function (key, flowId) {
+        if(!fileStorages[flowId]){
+            createStorage(flowId);
+        }
+        return fileStorages[flowId].getItemSync(key);
+    },
+
+    set: function (key, value, flowId) {
+        if(!fileStorages[flowId]){
+            createStorage(flowId);
+        }
+        fileStorages[flowId].setItemSync(key, value);
+    },
+    keys: function (flowId) {
+        if(!fileStorages[flowId]){
+            createStorage(flowId);
+        }
+        return fileStorages[flowId].keys();
+    }
+};
+
+module.exports = localfilesystem;
diff --git a/test/red/runtime/nodes/context/external_spec.js b/test/red/runtime/nodes/context/external_spec.js
new file mode 100644
index 000000000..726d1c666
--- /dev/null
+++ b/test/red/runtime/nodes/context/external_spec.js
@@ -0,0 +1,222 @@
+/**
+ * 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 external = require("../../../../../red/runtime/nodes/context/external");
+
+describe("external", function() {
+    var stubModule = {
+        module: {
+            init: function(){},
+            get: function(){},
+            set: function(){},
+            keys: function(){},
+            run: function(){},
+            close: function(){}
+        },
+        config: {}
+    };
+    describe('#init()', function() {
+        it('should load bundle module as default', function() {
+            external.init({
+                contextStorage:{
+                    default:{
+                        module: "./localfilesystem",
+                        config:{}
+                    }
+            }});
+            external.hasContextStorage("default").should.be.true();
+        });
+
+        it('should load bundle module as localfile', function() {
+            external.init({
+                contextStorage:{
+                    localfile:{
+                        module: "./localfilesystem",
+                        config:{}
+                    }
+            }});
+            external.hasContextStorage("localfile").should.be.true();
+        });
+
+        it('should not load non-existent module', function() {
+            external.init({
+                contextStorage:{
+                    default:{
+                        module: "non-existent-module",
+                        config:{}
+                    }
+
+            }})
+            external.hasContextStorage("default").should.be.false();
+        });
+
+        it('should load multiple modules', function() {
+            external.init({
+                contextStorage:{
+                    default:{
+                        module: "./localfilesystem",
+                        config:{}
+                    },
+                    test:{
+                        module: {
+                            init: function() {
+                                return true;
+                            }
+                        },
+                        config:{}
+                    }
+                }
+            });
+            external.hasContextStorage("default").should.be.true();
+            external.hasContextStorage("test").should.be.true();
+        });
+
+        it('should load multiple modules without non-existent module', function() {
+            external.init({
+                contextStorage:{
+                    nonexist:{
+                        module: "non-existent-module",
+                        config:{}
+                    },
+                    default:{
+                        module: "./localfilesystem",
+                        config:{}
+                    },
+                    test:{
+                        module: {
+                            init: function() {
+                                return true;
+                            }
+                        },
+                        config:{}
+                    }
+                }
+            });
+            external.hasContextStorage("nonexist").should.be.false();
+            external.hasContextStorage("default").should.be.true();
+            external.hasContextStorage("test").should.be.true();
+        });
+    });
+
+    // describe('#get()', function() {
+    // });
+
+    // describe('#set()', function() {
+    // });
+
+    // describe('#keys()', function() {
+    // });    
+
+    // describe('#hasContextStorage()', function() {
+    // });
+
+    describe('#canUse()', function() {
+        it('should return true if specified module is loaded', function() {
+            external.init({
+                contextStorage:{
+                    localfilesystem:{
+                        module: {name:"test",init: function(){return true}},
+                        config: {}
+                    }
+                }
+            });
+            external.canUse("$localfilesystem").should.be.true();
+            external.canUse("$localfilesystem.foo").should.be.true();
+        });
+        it('should return false if specified module is not loaded', function() {
+            external.init({
+                contextStorage:{
+                    localfilesystem:{
+                        module: {name:"test",init: function(){return true}},
+                        config: {}
+                    }
+                }
+            });
+            external.canUse("$file").should.be.false();
+            external.canUse("$file.foo").should.be.false();
+        });
+        it('should return true if specified module is not loaded but default module is loaded', function() {
+            external.init({
+                contextStorage:{
+                    default:{
+                        module: {name:"test",init: function(){return true}},
+                        config: {}
+                    }
+                }
+            });
+            external.canUse("$file").should.be.true();
+            external.canUse("$file.foo").should.be.true();
+        });
+        it('should return false if argument does not contain module name', function() {
+            external.init({
+                contextStorage:{
+                    default:{
+                        module: {name:"test",init: function(){return true}},
+                        config: {}
+                    }
+                }
+            });
+            external.canUse("file").should.be.false();
+            external.canUse("file.foo").should.be.false();
+        });
+    });
+
+    describe('#parseKey()', function() {
+        function returnModuleAndKey(input, expectedModule, expectedKey) {
+            var result = external.parseKey(input);
+            result[0].should.eql(expectedModule);
+            result[1].should.eql(expectedKey);
+        };
+
+        function returnModule(input, expectedModule) {
+            var result = external.parseKey(input);
+            result[0].should.eql(expectedModule);
+            should(result[1]).be.null();
+        };
+
+        it('should retrun module and key', function() {
+            returnModuleAndKey("$test.aaa","test","aaa");
+            returnModuleAndKey("$test.aaa.bbb","test","aaa.bbb");
+            returnModuleAndKey("$1.234","1","234");
+            returnModuleAndKey("$$test.foo","$test","foo");
+            returnModuleAndKey("$test.$foo","test","$foo"); 
+            returnModuleAndKey("$test.$foo.$bar","test","$foo.$bar"); 
+            returnModuleAndKey("$test..foo","test",".foo");
+            returnModuleAndKey("$test..","test",".");
+        });
+
+        it('should retrun only module', function() {
+            returnModule("$test","test",null);
+            returnModule("$1","1",null);
+            returnModule("$$test","$test",null);
+            returnModule("$test.","test.",null);
+        });
+
+        it('should retrun module as default', function() {
+            returnModuleAndKey("$default.foo","default","foo");
+            returnModuleAndKey("$.foo","default","foo");
+            returnModule("$default","default");
+            returnModule("$","default");
+        });
+
+        it('should retrun null', function() {
+            should(external.parseKey("test.aaa")).be.null();
+            should(external.parseKey("test")).be.null();
+            should(external.parseKey(null)).be.null();
+        });
+    });
+});
\ No newline at end of file
diff --git a/test/red/runtime/nodes/context/localfilesystem_spec.js b/test/red/runtime/nodes/context/localfilesystem_spec.js
new file mode 100644
index 000000000..e69de29bb

From b4b70a988ee10da5386529b80a2b5c0027f547ad Mon Sep 17 00:00:00 2001
From: Hiroki Uchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Fri, 16 Mar 2018 06:06:06 +0900
Subject: [PATCH 052/113] Change delimiter to "_" from ":"

---
 red/runtime/nodes/context/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index b63aedb17..cd78f25de 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -72,7 +72,7 @@ function createContext(id,seed) {
 function getContext(localId,flowId) {
     var contextId = localId;
     if (flowId) {
-        contextId = localId+":"+flowId;
+        contextId = localId+"_"+flowId;
     }
     if (contexts.hasOwnProperty(contextId)) {
         return contexts[contextId];
@@ -91,7 +91,7 @@ function getContext(localId,flowId) {
 function deleteContext(id,flowId) {
     var contextId = id;
     if (flowId) {
-        contextId = id+":"+flowId;
+        contextId = id+"_"+flowId;
     }
     delete contexts[contextId];
 }
@@ -102,7 +102,7 @@ function clean(flowConfig) {
     var node;
     for (var id in contexts) {
         if (contexts.hasOwnProperty(id)) {
-            var idParts = id.split(":");
+            var idParts = id.split("_");
             if (!flowConfig.allNodes.hasOwnProperty(idParts[0])) {
                 delete contexts[id];
             }

From e33ec0cf505fc9429e8fb3dfde74ac50be24702f Mon Sep 17 00:00:00 2001
From: Hiroki Uchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Fri, 23 Mar 2018 17:18:56 +0900
Subject: [PATCH 053/113] update external context - Implement `delete` function
 - Swap default easily - Change memory context as a plugin - Update
 localfilesystem plugin   -  Change file/folder structure

---
 package.json                                  |   2 +
 red/runtime/index.js                          |   2 +
 red/runtime/nodes/context/external.js         | 133 -----------
 red/runtime/nodes/context/index.js            | 167 +++++++++----
 red/runtime/nodes/context/localfilesystem.js  | 114 ++++++---
 red/runtime/nodes/context/memory.js           |  59 +++++
 red/runtime/nodes/index.js                    |   5 +-
 .../runtime/nodes/context/external_spec.js    | 222 ------------------
 test/red/runtime/nodes/context/index_spec.js  |  51 ++++
 .../nodes/context/localfilesystem_spec.js     | 126 ++++++++++
 test/red/runtime/nodes/context/memory_spec.js | 141 +++++++++++
 11 files changed, 581 insertions(+), 441 deletions(-)
 delete mode 100644 red/runtime/nodes/context/external.js
 create mode 100644 red/runtime/nodes/context/memory.js
 delete mode 100644 test/red/runtime/nodes/context/external_spec.js
 create mode 100644 test/red/runtime/nodes/context/memory_spec.js

diff --git a/package.json b/package.json
index be2fec970..bd52aa85a 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,7 @@
     "mqtt": "2.18.0",
     "multer": "1.3.0",
     "mustache": "2.3.0",
+    "node-json-db": "0.7.5",
     "node-red-node-email": "0.1.*",
     "node-red-node-feedparser": "0.1.*",
     "node-red-node-rbe": "0.2.*",
@@ -101,6 +102,7 @@
     "http-proxy": "^1.16.2",
     "istanbul": "0.4.5",
     "mocha": "^5.1.1",
+    "rewire": "3.0.2",
     "should": "^8.4.0",
     "sinon": "1.17.7",
     "stoppable": "^1.0.6",
diff --git a/red/runtime/index.js b/red/runtime/index.js
index 6577ee59c..30d9c6f2b 100644
--- a/red/runtime/index.js
+++ b/red/runtime/index.js
@@ -109,6 +109,8 @@ function start() {
                 events.emit("runtime-event",{id:"runtime-unsupported-version",payload:{type:"error",text:"notification.errors.unsupportedVersion"},retain:true});
             }
             log.info(os.type()+" "+os.release()+" "+os.arch()+" "+os.endianness());
+            log.info("Loading external context plugins");
+            redNodes.loadContextsPlugin();
             return redNodes.load().then(function() {
 
                 var i;
diff --git a/red/runtime/nodes/context/external.js b/red/runtime/nodes/context/external.js
deleted file mode 100644
index d969fc53d..000000000
--- a/red/runtime/nodes/context/external.js
+++ /dev/null
@@ -1,133 +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 when = require("when");
-var log = require("../../log");
-
-var re = /^(\$.*?)\.(.+)|^(\$.*)/;
-var externalContexts;
-
-function parseKey(key){
-    var keys = null;
-    var temp = re.exec(key);
-    if(temp){
-        keys = [];
-        if(temp[3]){
-            keys[0] = temp[3];
-            keys[1] = null;
-        } else {
-            keys[0] = temp[1];
-            keys[1] = temp[2];
-        }
-        keys[0] = keys[0] === "$" ? "default" : keys[0].substring(1);
-    }
-    return keys;
-}
-
-function hasContextStorage(plugin) {
-    return externalContexts.hasOwnProperty(plugin);
-}
-
-var contextModuleInterface ={
-    init: function (settings) {
-        var plugins = settings.contextStorage;
-        externalContexts = {};
-        if (plugins) {
-            for(var pluginName in plugins){
-                var plugin;
-                if(plugins[pluginName].hasOwnProperty("module") && plugins[pluginName].hasOwnProperty("config")) {
-                    if(typeof plugins[pluginName].module === "string") {
-                        try{
-                            plugin = require(plugins[pluginName].module);
-                        }catch(err){
-                            log.error(err);
-                            continue;
-                        }
-                    } else {
-                        plugin = plugins[pluginName].module;
-                    }
-                    plugin.init(plugins[pluginName].config);
-                    externalContexts[pluginName] = plugin;
-                }
-            }
-        }
-    },
-    get: function(key, flowId) {
-        var result = parseKey(key);
-        if(!result){
-            throw new Error("Invalid key");
-        }
-        if(hasContextStorage(result[0])){
-            return externalContexts[result[0]].get(result[1], flowId);
-        }else if(hasContextStorage("default")) {
-            // log.warn(result[1] " is got from default context storage");
-            return externalContexts["default"].get(result[1], flowId);
-        }else{
-            throw new Error(result[0] + " is not defined in setting.js");
-        }
-        
-    },
-    set: function(key, value, flowId) {
-        var result = parseKey(key);
-        if(!result){
-            throw new Error("Invalid key");
-        }
-        if(hasContextStorage(result[0])){
-            externalContexts[result[0]].set(result[1], value, flowId);
-        }else if(hasContextStorage("default")) {
-            // log.warn(result[1] " is set to default context storage");
-            externalContexts["default"].set(result[1], value, flowId);
-        }else{
-            throw new Error(result[0] + " is not defined in setting.js");
-        }
-    },
-    keys: function(key, flowId) {
-        var result = parseKey(key);
-        if(!result){
-            throw new Error("Invalid key");
-        }
-        if(hasContextStorage(result[0])){
-            return externalContexts[result[0]].keys(flowId);
-        }else if(hasContextStorage("default")) {
-            // log.warn("keys are got from default context storage");
-            externalContexts["default"].keys(flowId);
-        }else{
-            throw new Error(result[0] + " is not defined in setting.js");
-        }
-    },
-    // run: function(command,key,value,flowId) {
-    //     //todo: run custom method in plugin
-    // },
-    // close: function(){
-    //     //todo: close connections, streams, etc...
-    // },
-    canUse: function(key){
-        var result = parseKey(key);
-        if(!result){
-            return false;
-        }else{
-            if(hasContextStorage(result[0]) || hasContextStorage("default")){
-                return true;
-            }else{
-                return false;
-            }
-        }
-    },
-    hasContextStorage: hasContextStorage,
-    parseKey: parseKey
-};
-
-module.exports = contextModuleInterface;
\ No newline at end of file
diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index cd78f25de..845408e8f 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -14,57 +14,110 @@
  * limitations under the License.
  **/
 
+var clone = require("clone");
 var util = require("../../util");
-var log = require("../../log");
-var externalContext = require("./external");
 
+var settings;
 var contexts = {};
 var globalContext = null;
+var externalContexts = {};
 
-var re = /^(\$.*?)\.(.+)|^(\$.*)/;
+function init(_settings) {
+    settings = _settings;
+    externalContexts = {};
 
-function createContext(id,seed) {
-    var flowId = id;
-    var data = seed || {};
-    var obj = seed || {};
+    // init meomory plugin
+    externalContexts["_"] = require("./memory");
+    externalContexts["_"].init();
+    globalContext = createContext("global",settings.functionGlobalContext || {});
+}
 
-    function get(key) {
-        return util.getMessageProperty(data,key);
-    };
-    function set(key, value) {
-        util.setMessageProperty(data,key,value);
-    };
-    function keys() {
-        var keysData = Object.keys(data);
-        if (seed == null) {
-            return keysData;
-        } else {
-            return keysData.filter(function (key) {
-                return key !== "set" && key !== "get" && key !== "keys";
-            });
+function load() {
+    // load & init plugins in settings.contextStorage
+    var plugins = settings.contextStorage;
+    var alias = null;
+    if (plugins) {
+        for(var pluginName in plugins){
+            if(pluginName === "_"){
+                continue;
+            }
+            if(pluginName === "default" && typeof plugins[pluginName] === "string"){
+                alias = plugins[pluginName];
+                continue;
+            }
+            var plugin;
+            if(plugins[pluginName].hasOwnProperty("module")){
+                var config = plugins[pluginName].config || {};
+                copySettings(config, settings);
+                try{
+                    plugin = require("./"+plugins[pluginName].module);
+                }catch(err){
+                    throw new Error(plugins[pluginName].module + " could not be loaded");
+                }
+                plugin.init(config);
+                externalContexts[pluginName] = plugin;
+            }else{
+                throw new Error("module is is not defined in settings.contextStorage." + plugins[pluginName] );
+            }
         }
-    };
-
-    obj.get = function(key) {
-        if(externalContext.canUse(key)) {
-            return externalContext.get(key, flowId);
-        }else{
-            return get(key);
-        }
-    };
-    obj.set = function(key, value) {
-        if(externalContext.canUse(key)) {
-            externalContext.set(key, value, flowId);
-        }else{
-            set(key, value);
+        if(alias){
+            if(externalContexts.hasOwnProperty(alias)){
+                externalContexts["default"] = externalContexts[alias];
+            }else{
+                throw new Error("default is invalid" + plugins["default"])
+            }
         }
     }
-    obj.keys = function(key) {
-        if(externalContext.canUse(key)) {
-            return externalContext.keys(key, flowId);
-        }else{
-            return keys();
+}
+
+function copySettings(config, settings){
+    var copy = ["userDir"]
+    config.settings = {};
+    copy.forEach(function(setting){
+        config.settings[setting] = clone(settings[setting]);
+    });
+}
+
+function createContext(id,seed) {
+    var scope = id;
+    var obj = seed || {};
+
+    obj.get = function(key) {
+        var result = parseKey(key);
+        if(!result){
+            return externalContexts["_"].get(key, scope);
         }
+        if(externalContexts.hasOwnProperty(result[0])){
+            return externalContexts[result[0]].get(result[1], scope);
+        }else if(externalContexts.hasOwnProperty("defalut")){
+            return externalContexts["defalut"].get(result[1], scope);
+        }else{
+            throw new Error(result[0] + " is not defined in setting.js");
+        }  
+    };
+    obj.set = function(key, value) {
+        var result = parseKey(key);
+        if(!result){
+            return externalContexts["_"].set(key, value, scope);
+        }
+        if(externalContexts.hasOwnProperty(result[0])){
+            externalContexts[result[0]].set(result[1], value, scope);
+        }else if(externalContexts.hasOwnProperty("defalut")){
+            externalContexts["defalut"].set(result[1], value, scope);
+        }else{
+            throw new Error(result[0] + " is not defined in setting.js");
+        }
+    };
+    obj.keys = function() {
+        //TODO: discuss about keys() behavior
+        var keys = [];
+        for(var plugin in externalContexts){
+            keys.concat(externalContexts[plugin].keys(scope));
+        }
+        return keys;
+    };
+    if(id === "global"){
+        externalContexts["_"].setGlobalContext(seed);
     }
     return obj;
 }
@@ -72,7 +125,7 @@ function createContext(id,seed) {
 function getContext(localId,flowId) {
     var contextId = localId;
     if (flowId) {
-        contextId = localId+"_"+flowId;
+        contextId = localId+":"+flowId;
     }
     if (contexts.hasOwnProperty(contextId)) {
         return contexts[contextId];
@@ -91,7 +144,10 @@ function getContext(localId,flowId) {
 function deleteContext(id,flowId) {
     var contextId = id;
     if (flowId) {
-        contextId = id+"_"+flowId;
+        contextId = id+":"+flowId;
+    }
+    for(var plugin in externalContexts){
+        externalContexts[plugin].delete(contextId);
     }
     delete contexts[contextId];
 }
@@ -102,19 +158,36 @@ function clean(flowConfig) {
     var node;
     for (var id in contexts) {
         if (contexts.hasOwnProperty(id)) {
-            var idParts = id.split("_");
+            var idParts = id.split(":");
             if (!flowConfig.allNodes.hasOwnProperty(idParts[0])) {
+                for(var plugin in externalContexts){
+                    externalContexts[plugin].delete(id);
+                }
                 delete contexts[id];
             }
         }
     }
 }
 
+function parseKey(key){
+    var keys = null;
+    if(!key){
+        return null;
+    }
+    var index_$ = key.indexOf("$");
+    var index_dot = key.indexOf(".", 1);
+    if(index_$ === 0 && index_dot){
+        keys = [];
+        keys[0] = key.substring(1,index_dot);
+        keys[1] = key.substring(index_dot + 1);
+        keys[0] = keys[0] || "default";
+    }
+    return keys;
+}
+
 module.exports = {
-    init: function(settings) {
-        globalContext = createContext("global",settings.functionGlobalContext || {});
-        externalContext.init(settings);
-    },
+    init: init,
+    load: load,
     get: getContext,
     delete: deleteContext,
     clean:clean
diff --git a/red/runtime/nodes/context/localfilesystem.js b/red/runtime/nodes/context/localfilesystem.js
index 733c619d1..e77954189 100644
--- a/red/runtime/nodes/context/localfilesystem.js
+++ b/red/runtime/nodes/context/localfilesystem.js
@@ -14,67 +14,105 @@
  * limitations under the License.
  **/
 
-var storage = require('node-persist');
+var JsonDB = require('node-json-db');
 var fs = require('fs-extra');
-var fspath = require("path");
+var path = require("path");
 
 var configs;
-var storagePath;
-var fileStorages;
+var storageBaseDir;
+var storages;
 
-function createStorage(path) {
-    var fileStorage = storage.create({dir: fspath.join(storagePath,path)});
-    fileStorage.initSync();
-    fileStorages[path] = fileStorage;
+function createStorage(scope) {
+    var i = scope.indexOf(":")
+    
+    if(i === -1){
+        if(scope === "global"){
+            storages[scope] = new JsonDB(path.join(storageBaseDir,"global",scope), true, true); 
+        }else{ // scope:flow
+            storages[scope] = new JsonDB(path.join(storageBaseDir,scope,"flow"), true, true);
+        }
+    }else{ // scope:local
+        var ids = scope.split(":")
+        storages[scope] = new JsonDB(path.join(storageBaseDir,ids[1],ids[0]), true, true);
+    }
 }
 
 var localfilesystem = {
     init: function(_configs) {
         configs = _configs;
-        fileStorages = {};
+        storages = {};
         if (!configs.dir) {
-            try {
-                fs.statSync(fspath.join(process.env.NODE_RED_HOME,".config.json"));
-                storagePath = fspath.join(process.env.NODE_RED_HOME,"contexts");
-            } catch(err) {
+            if(configs.settings && configs.settings.userDir){
+                storageBaseDir = path.join(configs.settings.userDir,"contexts");
+            }else{
                 try {
-                    // Consider compatibility for older versions
-                    if (process.env.HOMEPATH) {
-                        fs.statSync(fspath.join(process.env.HOMEPATH,".node-red",".config.json"));
-                        storagePath = fspath.join(process.env.HOMEPATH,".node-red","contexts");
-                    }
+                    fs.statSync(path.join(process.env.NODE_RED_HOME,".config.json"));
+                    storageBaseDir = path.join(process.env.NODE_RED_HOME,"contexts");
                 } catch(err) {
-                }
-                if (!configs.dir) {
-                    storagePath = fspath.join(process.env.HOME || process.env.USERPROFILE || process.env.HOMEPATH || process.env.NODE_RED_HOME,".node-red","contexts");
+                    try {
+                        // Consider compatibility for older versions
+                        if (process.env.HOMEPATH) {
+                            fs.statSync(path.join(process.env.HOMEPATH,".node-red",".config.json"));
+                            storageBaseDir = path.join(process.env.HOMEPATH,".node-red","contexts");
+                        }
+                    } catch(err) {
+                    }
+                    if (!storageBaseDir) {
+                        storageBaseDir = path.join(process.env.HOME || process.env.USERPROFILE || process.env.HOMEPATH || process.env.NODE_RED_HOME,".node-red","contexts");
+                    }
                 }
             }
         }else{
-            storagePath = configs.dir;
+            storageBaseDir = configs.dir;
         }
-        
     },
-    stop: function() {
-        return when.resolve();
-    },
-    get: function (key, flowId) {
-        if(!fileStorages[flowId]){
-            createStorage(flowId);
+    get: function (key, scope) {
+        if(!storages[scope]){
+            createStorage(scope);
+        }
+        try{
+            storages[scope].reload();
+            return storages[scope].getData("/" + key.replace(/\./g,"/"));
+        }catch(err){
+            if(err.name === "DataError"){
+                return undefined;
+            }else{
+                throw err;
+            }
         }
-        return fileStorages[flowId].getItemSync(key);
     },
 
-    set: function (key, value, flowId) {
-        if(!fileStorages[flowId]){
-            createStorage(flowId);
+    set: function (key, value, scope) {
+        if(!storages[scope]){
+            createStorage(scope);
+        }
+        if(value){
+            storages[scope].push("/" + key.replace(/\./g,"/"), value);
+        }else{
+            storages[scope].delete("/" + key.replace(/\./g,"/"));
         }
-        fileStorages[flowId].setItemSync(key, value);
     },
-    keys: function (flowId) {
-        if(!fileStorages[flowId]){
-            createStorage(flowId);
+    keys: function (scope) {
+        if(!storages[scope]){
+            return [];
+        }
+        return Object.keys(storages[scope].getData("/"));
+    },
+    delete: function(scope){
+        if(storages[scope]){
+            storages[scope].delete("/");
+            if(scope.indexOf(":") === -1){
+                fs.removeSync(path.dirname(storages[scope].filename));
+            }else{
+                try{
+                    fs.statSync(storages[scope].filename);
+                    fs.unlinkSync(storages[scope].filename);
+                }catch(err){
+                    console.log("deleted");
+                }
+            }
+            delete storages[scope];
         }
-        return fileStorages[flowId].keys();
     }
 };
 
diff --git a/red/runtime/nodes/context/memory.js b/red/runtime/nodes/context/memory.js
new file mode 100644
index 000000000..deed13d36
--- /dev/null
+++ b/red/runtime/nodes/context/memory.js
@@ -0,0 +1,59 @@
+/**
+ * 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 util = require("../../util");
+
+var data;
+var seedFlg = false;
+
+var memory = {
+    init: function(config) {
+        data = {};
+    },
+    get: function(key, scope) {
+        if(!data[scope]){
+            data[scope] = {};
+        }
+        return util.getMessageProperty(data[scope],key);
+    },
+    set: function(key, value, scope) {
+        if(!data[scope]){
+            data[scope] = {};
+        }
+        util.setMessageProperty(data[scope],key,value);
+    },
+    keys: function(scope){
+        if(!data[scope]){
+            data[scope] = {};
+        }
+        var keysData = Object.keys(data[scope]);
+        if (scope !== "global") {
+            return keysData;
+        } else {
+            return keysData.filter(function (key) {
+                return key !== "set" && key !== "get" && key !== "keys";
+            });
+        }
+    },
+    delete: function(scope){
+        delete data[scope];
+    },
+    setGlobalContext: function(seed){
+        data["global"] = seed;
+    }
+};
+
+module.exports = memory;
\ No newline at end of file
diff --git a/red/runtime/nodes/index.js b/red/runtime/nodes/index.js
index b2f8ff3b5..139f62ffa 100644
--- a/red/runtime/nodes/index.js
+++ b/red/runtime/nodes/index.js
@@ -216,5 +216,8 @@ module.exports = {
     setCredentialSecret: credentials.setKey,
     clearCredentials: credentials.clear,
     exportCredentials: credentials.export,
-    getCredentialKeyType: credentials.getKeyType
+    getCredentialKeyType: credentials.getKeyType,
+
+    // Contexts
+    loadContextsPlugin: context.load
 };
diff --git a/test/red/runtime/nodes/context/external_spec.js b/test/red/runtime/nodes/context/external_spec.js
deleted file mode 100644
index 726d1c666..000000000
--- a/test/red/runtime/nodes/context/external_spec.js
+++ /dev/null
@@ -1,222 +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 should = require("should");
-var sinon = require('sinon');
-var external = require("../../../../../red/runtime/nodes/context/external");
-
-describe("external", function() {
-    var stubModule = {
-        module: {
-            init: function(){},
-            get: function(){},
-            set: function(){},
-            keys: function(){},
-            run: function(){},
-            close: function(){}
-        },
-        config: {}
-    };
-    describe('#init()', function() {
-        it('should load bundle module as default', function() {
-            external.init({
-                contextStorage:{
-                    default:{
-                        module: "./localfilesystem",
-                        config:{}
-                    }
-            }});
-            external.hasContextStorage("default").should.be.true();
-        });
-
-        it('should load bundle module as localfile', function() {
-            external.init({
-                contextStorage:{
-                    localfile:{
-                        module: "./localfilesystem",
-                        config:{}
-                    }
-            }});
-            external.hasContextStorage("localfile").should.be.true();
-        });
-
-        it('should not load non-existent module', function() {
-            external.init({
-                contextStorage:{
-                    default:{
-                        module: "non-existent-module",
-                        config:{}
-                    }
-
-            }})
-            external.hasContextStorage("default").should.be.false();
-        });
-
-        it('should load multiple modules', function() {
-            external.init({
-                contextStorage:{
-                    default:{
-                        module: "./localfilesystem",
-                        config:{}
-                    },
-                    test:{
-                        module: {
-                            init: function() {
-                                return true;
-                            }
-                        },
-                        config:{}
-                    }
-                }
-            });
-            external.hasContextStorage("default").should.be.true();
-            external.hasContextStorage("test").should.be.true();
-        });
-
-        it('should load multiple modules without non-existent module', function() {
-            external.init({
-                contextStorage:{
-                    nonexist:{
-                        module: "non-existent-module",
-                        config:{}
-                    },
-                    default:{
-                        module: "./localfilesystem",
-                        config:{}
-                    },
-                    test:{
-                        module: {
-                            init: function() {
-                                return true;
-                            }
-                        },
-                        config:{}
-                    }
-                }
-            });
-            external.hasContextStorage("nonexist").should.be.false();
-            external.hasContextStorage("default").should.be.true();
-            external.hasContextStorage("test").should.be.true();
-        });
-    });
-
-    // describe('#get()', function() {
-    // });
-
-    // describe('#set()', function() {
-    // });
-
-    // describe('#keys()', function() {
-    // });    
-
-    // describe('#hasContextStorage()', function() {
-    // });
-
-    describe('#canUse()', function() {
-        it('should return true if specified module is loaded', function() {
-            external.init({
-                contextStorage:{
-                    localfilesystem:{
-                        module: {name:"test",init: function(){return true}},
-                        config: {}
-                    }
-                }
-            });
-            external.canUse("$localfilesystem").should.be.true();
-            external.canUse("$localfilesystem.foo").should.be.true();
-        });
-        it('should return false if specified module is not loaded', function() {
-            external.init({
-                contextStorage:{
-                    localfilesystem:{
-                        module: {name:"test",init: function(){return true}},
-                        config: {}
-                    }
-                }
-            });
-            external.canUse("$file").should.be.false();
-            external.canUse("$file.foo").should.be.false();
-        });
-        it('should return true if specified module is not loaded but default module is loaded', function() {
-            external.init({
-                contextStorage:{
-                    default:{
-                        module: {name:"test",init: function(){return true}},
-                        config: {}
-                    }
-                }
-            });
-            external.canUse("$file").should.be.true();
-            external.canUse("$file.foo").should.be.true();
-        });
-        it('should return false if argument does not contain module name', function() {
-            external.init({
-                contextStorage:{
-                    default:{
-                        module: {name:"test",init: function(){return true}},
-                        config: {}
-                    }
-                }
-            });
-            external.canUse("file").should.be.false();
-            external.canUse("file.foo").should.be.false();
-        });
-    });
-
-    describe('#parseKey()', function() {
-        function returnModuleAndKey(input, expectedModule, expectedKey) {
-            var result = external.parseKey(input);
-            result[0].should.eql(expectedModule);
-            result[1].should.eql(expectedKey);
-        };
-
-        function returnModule(input, expectedModule) {
-            var result = external.parseKey(input);
-            result[0].should.eql(expectedModule);
-            should(result[1]).be.null();
-        };
-
-        it('should retrun module and key', function() {
-            returnModuleAndKey("$test.aaa","test","aaa");
-            returnModuleAndKey("$test.aaa.bbb","test","aaa.bbb");
-            returnModuleAndKey("$1.234","1","234");
-            returnModuleAndKey("$$test.foo","$test","foo");
-            returnModuleAndKey("$test.$foo","test","$foo"); 
-            returnModuleAndKey("$test.$foo.$bar","test","$foo.$bar"); 
-            returnModuleAndKey("$test..foo","test",".foo");
-            returnModuleAndKey("$test..","test",".");
-        });
-
-        it('should retrun only module', function() {
-            returnModule("$test","test",null);
-            returnModule("$1","1",null);
-            returnModule("$$test","$test",null);
-            returnModule("$test.","test.",null);
-        });
-
-        it('should retrun module as default', function() {
-            returnModuleAndKey("$default.foo","default","foo");
-            returnModuleAndKey("$.foo","default","foo");
-            returnModule("$default","default");
-            returnModule("$","default");
-        });
-
-        it('should retrun null', function() {
-            should(external.parseKey("test.aaa")).be.null();
-            should(external.parseKey("test")).be.null();
-            should(external.parseKey(null)).be.null();
-        });
-    });
-});
\ No newline at end of file
diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index fce39bcf4..1bcea888d 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -18,6 +18,7 @@ var should = require("should");
 var sinon = require('sinon');
 var path = require('path');
 var fs = require('fs-extra');
+var rewire = require("rewire");
 var Context = require("../../../../../red/runtime/nodes/context/index");
 
 describe('context', function() {
@@ -147,6 +148,7 @@ describe('context', function() {
         var stubGet = sinon.stub();
         var stubSet = sinon.stub();
         var stubKeys = sinon.stub();
+        var stubDelete = sinon.stub();
         var contextStorage={
                 test:{
                     module: {
@@ -156,6 +158,7 @@ describe('context', function() {
                         get: stubGet,
                         set: stubSet,
                         keys: stubKeys,
+                        delete: stubDelete
                     },
                     config:{}
                 }
@@ -235,4 +238,52 @@ describe('context', function() {
             });
         });
     });
+
+    describe('#parseKey()', function() {
+        var parseKey = rewire("../../../../../red/runtime/nodes/context/index").__get__("parseKey");
+
+        function returnModuleAndKey(input, expectedModule, expectedKey) {
+            var result = parseKey(input);
+            result[0].should.eql(expectedModule);
+            result[1].should.eql(expectedKey);
+        };
+
+        function returnModule(input, expectedModule) {
+            var result = parseKey(input);
+            result[0].should.eql(expectedModule);
+            should(result[1]).be.null();
+        };
+
+        it('should retrun module and key', function() {
+            returnModuleAndKey("$test.aaa","test","aaa");
+            returnModuleAndKey("$test.aaa.bbb","test","aaa.bbb");
+            returnModuleAndKey("$1.234","1","234");
+            returnModuleAndKey("$$test.foo","$test","foo");
+            returnModuleAndKey("$test.$foo","test","$foo"); 
+            returnModuleAndKey("$test.$foo.$bar","test","$foo.$bar"); 
+            returnModuleAndKey("$test..foo","test",".foo");
+            returnModuleAndKey("$test..","test",".");
+        });
+
+        // it('should retrun only module', function() {
+        //     returnModule("$test","test",null);
+        //     returnModule("$1","1",null);
+        //     returnModule("$$test","$test",null);
+        //     returnModule("$test.","test.",null);
+        // });
+
+        it('should retrun module as default', function() {
+            returnModuleAndKey("$default.foo","default","foo");
+            returnModuleAndKey("$.foo","default","foo");
+            // returnModule("$default","default");
+            // returnModule("$","default");
+        });
+
+        it('should retrun null', function() {
+            should(parseKey("test.aaa")).be.null();
+            should(parseKey("test")).be.null();
+            should(parseKey(null)).be.null();
+        });
+    });
+
 });
diff --git a/test/red/runtime/nodes/context/localfilesystem_spec.js b/test/red/runtime/nodes/context/localfilesystem_spec.js
index e69de29bb..d0d545413 100644
--- a/test/red/runtime/nodes/context/localfilesystem_spec.js
+++ b/test/red/runtime/nodes/context/localfilesystem_spec.js
@@ -0,0 +1,126 @@
+/**
+ * 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 fs = require('fs-extra');
+var path = require("path");
+var context = require('../../../../../red/runtime/nodes/context/localfilesystem');
+
+var resourcesDir = path.resolve(path.join(__dirname,"..","resources","context"));
+
+describe('localfilesystem',function() {
+
+    beforeEach(function() {
+        context.init({dir: resourcesDir});
+    });
+
+    afterEach(function() {
+        context.delete("nodeX");
+        context.delete("nodeY");
+    });
+
+    after(function() {
+        fs.removeSync(resourcesDir);
+    });
+
+    describe('#get/set',function() {
+        it('should store property',function() {
+            should.not.exist(context.get("foo","nodeX"));
+            context.set("foo","test","nodeX");
+            context.get("foo","nodeX").should.eql("test");
+        });
+
+        it('should store property - creates parent properties',function() {
+            context.set("foo.bar","test","nodeX");
+            context.get("foo","nodeX").should.eql({bar:"test"});
+        });
+
+        it('should delete property',function() {
+            context.set("foo.abc.bar1","test1","nodeX");
+            context.set("foo.abc.bar2","test2","nodeX");
+            context.get("foo.abc","nodeX").should.eql({bar1:"test1",bar2:"test2"});
+            context.set("foo.abc.bar1",undefined,"nodeX");
+            context.get("foo.abc","nodeX").should.eql({bar2:"test2"});
+            context.set("foo.abc",undefined,"nodeX");
+            should.not.exist(context.get("foo.abc","nodeX"));
+            context.set("foo",undefined,"nodeX");
+            should.not.exist(context.get("foo","nodeX"));
+        });
+
+        it('should not shared context with other scope', function() {
+            should.not.exist(context.get("foo","nodeX"));
+            should.not.exist(context.get("foo","nodeY"));
+            context.set("foo","testX","nodeX");
+            context.set("foo","testY","nodeY");
+
+            context.get("foo","nodeX").should.eql("testX");
+            context.get("foo","nodeY").should.eql("testY");
+        });
+    });
+
+    describe('#keys',function() {
+        it('should enumerate context keys', function() {
+            var keys = context.keys("nodeX");
+            keys.should.be.an.Array();
+            keys.should.be.empty();
+
+            context.set("foo","bar","nodeX");
+            keys = context.keys("nodeX");
+            keys.should.have.length(1);
+            keys[0].should.eql("foo");
+
+            context.set("abc.def","bar","nodeX");
+            keys = context.keys("nodeX");
+            keys.should.have.length(2);
+            keys[1].should.eql("abc");
+        });
+
+        it('should enumerate context keys in each scopes', function() {
+            var keysX = context.keys("nodeX");
+            keysX.should.be.an.Array();
+            keysX.should.be.empty();
+
+            var keysY = context.keys("nodeY");
+            keysY.should.be.an.Array();
+            keysY.should.be.empty();
+
+            context.set("foo","bar","nodeX");
+            context.set("hoge","piyo","nodeY");
+            keysX = context.keys("nodeX");
+            keysX.should.have.length(1);
+            keysX[0].should.eql("foo");
+
+            keysY = context.keys("nodeY");
+            keysY.should.have.length(1);
+            keysY[0].should.eql("hoge");
+        });
+    });
+
+    describe('#delete',function() {
+        it('should delete context',function() {
+            should.not.exist(context.get("foo","nodeX"));
+            should.not.exist(context.get("foo","nodeY"));
+            context.set("foo","abc","nodeX");
+            context.set("foo","abc","nodeY");
+            context.get("foo","nodeX").should.eql("abc");
+            context.get("foo","nodeY").should.eql("abc");
+
+            context.delete("nodeX");
+            should.not.exist(context.get("foo","nodeX"));
+            should.exist(context.get("foo","nodeY"));
+        });
+    });
+});
\ No newline at end of file
diff --git a/test/red/runtime/nodes/context/memory_spec.js b/test/red/runtime/nodes/context/memory_spec.js
new file mode 100644
index 000000000..59acd67e1
--- /dev/null
+++ b/test/red/runtime/nodes/context/memory_spec.js
@@ -0,0 +1,141 @@
+/**
+ * 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 context = require('../../../../../red/runtime/nodes/context/memory');
+
+describe('memory',function() {
+
+    beforeEach(function() {
+        context.init({});
+    });
+
+    describe('#get/set',function() {
+        it('should store property',function() {
+            should.not.exist(context.get("foo","nodeX"));
+            context.set("foo","test","nodeX");
+            context.get("foo","nodeX").should.eql("test");
+        });
+
+        it('should store property - creates parent properties',function() {
+            context.set("foo.bar","test","nodeX");
+            context.get("foo","nodeX").should.eql({bar:"test"});
+        });
+
+        it('should delete property',function() {
+            context.set("foo.abc.bar1","test1","nodeX");
+            context.set("foo.abc.bar2","test2","nodeX");
+            context.get("foo.abc","nodeX").should.eql({bar1:"test1",bar2:"test2"});
+            context.set("foo.abc.bar1",undefined,"nodeX");
+            context.get("foo.abc","nodeX").should.eql({bar2:"test2"});
+            context.set("foo.abc",undefined,"nodeX");
+            should.not.exist(context.get("foo.abc","nodeX"));
+            context.set("foo",undefined,"nodeX");
+            should.not.exist(context.get("foo","nodeX"));
+        });
+
+        it('should not shared context with other scope', function() {
+            should.not.exist(context.get("foo","nodeX"));
+            should.not.exist(context.get("foo","nodeY"));
+            context.set("foo","testX","nodeX");
+            context.set("foo","testY","nodeY");
+
+            context.get("foo","nodeX").should.eql("testX");
+            context.get("foo","nodeY").should.eql("testY");
+        });
+    });
+
+    describe('#keys',function() {
+        it('should enumerate context keys', function() {
+            var keys = context.keys("nodeX");
+            keys.should.be.an.Array();
+            keys.should.be.empty();
+
+            context.set("foo","bar","nodeX");
+            keys = context.keys("nodeX");
+            keys.should.have.length(1);
+            keys[0].should.eql("foo");
+
+            context.set("abc.def","bar","nodeX");
+            keys = context.keys("nodeX");
+            keys.should.have.length(2);
+            keys[1].should.eql("abc");
+        });
+
+        it('should enumerate context keys in each scopes', function() {
+            var keysX = context.keys("nodeX");
+            keysX.should.be.an.Array();
+            keysX.should.be.empty();
+
+            var keysY = context.keys("nodeY");
+            keysY.should.be.an.Array();
+            keysY.should.be.empty();
+
+            context.set("foo","bar","nodeX");
+            context.set("hoge","piyo","nodeY");
+            keysX = context.keys("nodeX");
+            keysX.should.have.length(1);
+            keysX[0].should.eql("foo");
+
+            keysY = context.keys("nodeY");
+            keysY.should.have.length(1);
+            keysY[0].should.eql("hoge");
+        });
+
+        it('should enumerate only context keys when GlobalContext was given', function() {
+            var keys = context.keys("global");
+            keys.should.be.an.Array();
+            keys.should.be.empty();
+
+            var data = {
+                foo: "bar"
+            }
+            context.setGlobalContext(data);
+            keys = context.keys("global");
+            keys.should.have.length(1);
+            keys[0].should.eql("foo");
+        });
+    });
+
+    describe('#delete',function() {
+        it('should delete context',function() {
+            should.not.exist(context.get("foo","nodeX"));
+            should.not.exist(context.get("foo","nodeY"));
+            context.set("foo","abc","nodeX");
+            context.set("foo","abc","nodeY");
+            context.get("foo","nodeX").should.eql("abc");
+            context.get("foo","nodeY").should.eql("abc");
+
+            context.delete("nodeX");
+            should.not.exist(context.get("foo","nodeX"));
+            should.exist(context.get("foo","nodeY"));
+        });
+    });
+
+    describe('#setGlobalContext',function() {
+        it('should initialize global context with argument', function() {
+            var keys = context.keys("global");
+            keys.should.be.an.Array();
+            keys.should.be.empty();
+
+            var data = {
+                foo: "bar"
+            }
+            context.setGlobalContext(data);
+            context.get("foo","global").should.eql("bar");
+        });
+    });
+});
\ No newline at end of file

From 3a476ac493fce8a84642bd8b0c38dc114903bbcc Mon Sep 17 00:00:00 2001
From: Kazuki-Nakanishi <kazuki.nakanishi.vr@hitachi-solutions.com>
Date: Wed, 28 Mar 2018 15:54:16 +0900
Subject: [PATCH 054/113] Implemented error handlings

---
 red/runtime/nodes/context/index.js           |  96 +++++----
 test/red/runtime/nodes/context/index_spec.js | 211 ++++++++++++++-----
 2 files changed, 209 insertions(+), 98 deletions(-)

diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index 845408e8f..2a00d40d3 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -21,12 +21,13 @@ var settings;
 var contexts = {};
 var globalContext = null;
 var externalContexts = {};
+var noContextStorage = false;
 
 function init(_settings) {
     settings = _settings;
     externalContexts = {};
 
-    // init meomory plugin
+    // init memory plugin
     externalContexts["_"] = require("./memory");
     externalContexts["_"].init();
     globalContext = createContext("global",settings.functionGlobalContext || {});
@@ -37,6 +38,7 @@ function load() {
     var plugins = settings.contextStorage;
     var alias = null;
     if (plugins) {
+        noContextStorage = false;
         for(var pluginName in plugins){
             if(pluginName === "_"){
                 continue;
@@ -49,24 +51,30 @@ function load() {
             if(plugins[pluginName].hasOwnProperty("module")){
                 var config = plugins[pluginName].config || {};
                 copySettings(config, settings);
-                try{
-                    plugin = require("./"+plugins[pluginName].module);
-                }catch(err){
-                    throw new Error(plugins[pluginName].module + " could not be loaded");
+                if(typeof plugins[pluginName].module === "string") {
+                    try{
+                        plugin = require("./"+plugins[pluginName].module);
+                    }catch(err){
+                        throw new Error(plugins[pluginName].module + " could not be loaded");
+                    }
+                } else {
+                    plugin = plugins[pluginName].module;
                 }
                 plugin.init(config);
                 externalContexts[pluginName] = plugin;
             }else{
-                throw new Error("module is is not defined in settings.contextStorage." + plugins[pluginName] );
+                throw new Error("module is not defined in settings.contextStorage." + pluginName );
             }
         }
         if(alias){
             if(externalContexts.hasOwnProperty(alias)){
                 externalContexts["default"] = externalContexts[alias];
             }else{
-                throw new Error("default is invalid" + plugins["default"])
+                throw new Error("default is invalid. module name=" + plugins["default"])
             }
         }
+    } else {
+        noContextStorage = true;
     }
 }
 
@@ -78,35 +86,49 @@ function copySettings(config, settings){
     });
 }
 
+function parseKey(key){
+    if(!key){
+        return null;
+    }
+    var keyPath = {storage: "", key: ""};
+    var index_$ = key.indexOf("$");
+    var index_dot = key.indexOf(".", 1);
+    if(index_$===0&&index_dot) {
+        keyPath.storage = key.substring(1,index_dot)||"default";
+        keyPath.key = key.substring(index_dot+1);
+    } else {
+        keyPath.key = key;
+    }
+    return keyPath;
+}
+
+function getContextStorage(keyPath) {
+    if (noContextStorage || !keyPath.storage) {
+        return externalContexts["_"];
+    } else if (externalContexts.hasOwnProperty(keyPath.storage)) {
+        return externalContexts[keyPath.storage];
+    } else if (externalContexts.hasOwnProperty("default")) {
+        return externalContexts["default"];
+    } else {
+        var contextError = new Error(keyPath.storage + " is not defined in contextStorage on settings.js");
+        contextError.name = "ContextError";
+        throw contextError;
+    }
+}
+
 function createContext(id,seed) {
     var scope = id;
     var obj = seed || {};
 
     obj.get = function(key) {
-        var result = parseKey(key);
-        if(!result){
-            return externalContexts["_"].get(key, scope);
-        }
-        if(externalContexts.hasOwnProperty(result[0])){
-            return externalContexts[result[0]].get(result[1], scope);
-        }else if(externalContexts.hasOwnProperty("defalut")){
-            return externalContexts["defalut"].get(result[1], scope);
-        }else{
-            throw new Error(result[0] + " is not defined in setting.js");
-        }  
+        var keyPath = parseKey(key);
+        var context = getContextStorage(keyPath);
+        return context.get(keyPath.key, scope);
     };
     obj.set = function(key, value) {
-        var result = parseKey(key);
-        if(!result){
-            return externalContexts["_"].set(key, value, scope);
-        }
-        if(externalContexts.hasOwnProperty(result[0])){
-            externalContexts[result[0]].set(result[1], value, scope);
-        }else if(externalContexts.hasOwnProperty("defalut")){
-            externalContexts["defalut"].set(result[1], value, scope);
-        }else{
-            throw new Error(result[0] + " is not defined in setting.js");
-        }
+        var keyPath = parseKey(key);
+        var context = getContextStorage(keyPath);
+        return context.set(keyPath.key, value, scope);
     };
     obj.keys = function() {
         //TODO: discuss about keys() behavior
@@ -169,22 +191,6 @@ function clean(flowConfig) {
     }
 }
 
-function parseKey(key){
-    var keys = null;
-    if(!key){
-        return null;
-    }
-    var index_$ = key.indexOf("$");
-    var index_dot = key.indexOf(".", 1);
-    if(index_$ === 0 && index_dot){
-        keys = [];
-        keys[0] = key.substring(1,index_dot);
-        keys[1] = key.substring(index_dot + 1);
-        keys[0] = keys[0] || "default";
-    }
-    return keys;
-}
-
 module.exports = {
     init: init,
     load: load,
diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index 1bcea888d..e339de7e1 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -123,7 +123,7 @@ describe('context', function() {
             should.not.exist(context.get("foo"));
         });
 
-        it('enumerates context keys', function() {
+        it.skip('enumerates context keys', function() {
             var context = Context.get("1","flowA");
 
             var keys = context.keys();
@@ -150,24 +150,35 @@ describe('context', function() {
         var stubKeys = sinon.stub();
         var stubDelete = sinon.stub();
         var contextStorage={
-                test:{
-                    module: {
-                        init: function() {
-                            return true;
-                        },
-                        get: stubGet,
-                        set: stubSet,
-                        keys: stubKeys,
-                        delete: stubDelete
+            test:{
+                module: {
+                    init: function() {
+                        return true;
                     },
-                    config:{}
-                }
-            };
+                    get: stubGet,
+                    set: stubSet,
+                    keys: stubKeys,
+                    delete: stubDelete
+                },
+                config:{}
+            }
+        };
+        var contextDefaultStorage={
+            default: "test",
+            test:{
+                module: {
+                    init: function() {
+                        return true;
+                    },
+                    get: stubGet,
+                    set: stubSet,
+                    keys: stubKeys,
+                    delete: stubDelete
+                },
+                config:{}
+            }
+        };
 
-        beforeEach(function() {
-            Context.init({contextStorage:contextStorage});
-            context =  Context.get("1","flow");
-        });
         afterEach(function(done) {
             stubGet.reset();
             stubSet.reset();
@@ -176,8 +187,15 @@ describe('context', function() {
             fs.remove(testDir,done);
         });
 
+        function initializeContext() {
+            Context.init({contextStorage:contextStorage});
+            Context.load();
+            context =  Context.get("1","flow");
+        }
+
         describe('if external context storage exists',function() {
             it('should store local property to external context storage',function() {
+                initializeContext();
                 should.not.exist(context.get("$test.foo"));
                 context.set("$test.foo","test");
                 context.get("$test.foo");
@@ -187,6 +205,7 @@ describe('context', function() {
                 stubKeys.called.should.be.true();
             });
             it('should store flow property to external context storage',function() {
+                initializeContext();
                 should.not.exist(context.flow.get("$test.foo"));
                 context.flow.set("$test.foo","test");
                 context.flow.get("$test.foo");
@@ -196,6 +215,7 @@ describe('context', function() {
                 stubKeys.called.should.be.true();
             });
             it('should store global property to external context storage',function() {
+                initializeContext();
                 should.not.exist(context.global.get("$test.foo"));
                 context.global.set("$test.foo","test");
                 context.global.get("$test.foo");
@@ -204,37 +224,116 @@ describe('context', function() {
                 stubSet.called.should.be.true();
                 stubKeys.called.should.be.true();
             });
+            it('should store data on default context', function() {
+                Context.init({contextStorage:contextDefaultStorage});
+                Context.load();
+                context =  Context.get("1","flow");
+                should.not.exist(context.get("$nonexist.foo"));
+                context.set("$nonexist.foo","test");
+                context.get("$nonexist.foo");
+                context.keys("$nonexist");
+                stubGet.called.should.be.true();
+                stubSet.called.should.be.true();
+                stubKeys.called.should.be.true();
+            });
+            it('should load memory module', function(done) {
+                Context.init({ contextStorage: { _: {}}});
+                try {
+                    Context.load();
+                    context.set("_.foo","test");
+                    context.get("$_.foo");
+                    done();
+                } catch (err) {
+                    done(err);
+                }
+            });
+            it('should load localfilesystem module', function(done) {
+                Context.init({contextStorage:{ file:{module:"localfilesystem"} }});
+                try {
+                    Context.load();
+                    done();
+                } catch (err) {
+                    done(err);
+                }
+            });
         });
 
         describe('if external context storage does not exist',function() {
-            it('should store local property to local memory',function() {
-                should.not.exist(context.flow.get("$nonexist.foo"));
-                context.set("$nonexist.foo","test");
-                context.get("$nonexist.foo").should.eql("test");
-                context.keys("$nonexist").should.have.length(1);
-                stubGet.notCalled.should.be.true();
-                stubSet.notCalled.should.be.true();
-                stubKeys.notCalled.should.be.true();
+            it('should throw an error using undefined storage for local context', function(done) {
+                initializeContext();
+                try {
+                    context.get("$nonexist.local");
+                    should.fail(null, null, "An error was not thrown using undefined storage for local context");
+                } catch (err) {
+                    if (err.name === "ContextError") {
+                        done();
+                    } else {
+                        done(err);
+                    }
+                }
             });
-
-            it('should store flow property to local memory',function() {
-                should.not.exist(context.flow.get("$nonexist.foo"));
-                context.flow.set("$nonexist.foo","test");
-                context.flow.get("$nonexist.foo").should.eql("test");
-                context.flow.keys("$nonexist").should.have.length(1);
-                stubGet.notCalled.should.be.true();
-                stubSet.notCalled.should.be.true();
-                stubKeys.notCalled.should.be.true();
+            it('should throw an error using undefined storage for flow context', function(done) {
+                initializeContext();
+                try {
+                    context.flow.set("$nonexist.flow");
+                    should.fail(null, null, "An error was not thrown using undefined storage for flow context");
+                } catch (err) {
+                    if (err.name === "ContextError") {
+                        done();
+                    } else {
+                        done(err);
+                    }
+                }
             });
-
-            it('should store global property to local memory',function() {
-                should.not.exist(context.global.get("$nonexist.foo"));
-                context.global.set("$nonexist.foo","test");
-                context.global.get("$nonexist.foo").should.eql("test");
-                context.global.keys("$nonexist").should.have.length(1);
-                stubGet.notCalled.should.be.true();
-                stubSet.notCalled.should.be.true();
-                stubKeys.notCalled.should.be.true();
+            it('should fail when using invalid default context', function(done) {
+                Context.init({contextStorage:{default:"noexist"}});
+                try {
+                    Context.load();
+                    try {
+                        should.fail(null, null, "An error was not thrown using undefined storage for flow context");
+                    } catch (err) {
+                        done(err);
+                    }
+                } catch (err) {
+                    done();
+                }
+            });
+            it('should store data on memory when contextStorage is not defined', function() {
+                Context.init({});
+                Context.load();
+                context =  Context.get("1","flow");
+                context.set("$nonexist.key1", "val1");
+                context.get("$nonexist.key1").should.eql("val1");
+                context.flow.set("$nonexist.key2", "val2");
+                context.flow.get("$nonexist.key2").should.eql("val2");
+                context.global.set("$nonexist.key1", "val3");
+                context.global.get("$nonexist.key1").should.eql("val3");
+            });
+            it('should fail for the storage with no module', function(done) {
+                Context.init({ contextStorage: { test: {}}});
+                try {
+                    Context.load();
+                    try {
+                        should.fail(null, null, "Should fail when no module was specified");
+                    } catch (err) {
+                        done(err);
+                    }
+                } catch (err) {
+                    done();
+                }
+            });
+            it('should fail to load non-existent module', function(done) {
+                Context.init({contextStorage:{ file:{module:"nonexistent"} }});
+                try {
+                    Context.load();
+                    try {
+                        should.fail(null, null, "Should fail to load non-existent module");
+                    } catch (err) {
+                        done(err);
+                    }
+                } catch (err) {
+                    done();
+                }
             });
         });
     });
@@ -244,17 +343,17 @@ describe('context', function() {
 
         function returnModuleAndKey(input, expectedModule, expectedKey) {
             var result = parseKey(input);
-            result[0].should.eql(expectedModule);
-            result[1].should.eql(expectedKey);
+            result.storage.should.eql(expectedModule);
+            result.key.should.eql(expectedKey);
         };
 
         function returnModule(input, expectedModule) {
             var result = parseKey(input);
-            result[0].should.eql(expectedModule);
-            should(result[1]).be.null();
+            result.storage.should.eql(expectedModule);
+            should(result.key).be.null();
         };
 
-        it('should retrun module and key', function() {
+        it('should return module and key', function() {
             returnModuleAndKey("$test.aaa","test","aaa");
             returnModuleAndKey("$test.aaa.bbb","test","aaa.bbb");
             returnModuleAndKey("$1.234","1","234");
@@ -265,23 +364,29 @@ describe('context', function() {
             returnModuleAndKey("$test..","test",".");
         });
 
-        // it('should retrun only module', function() {
+        // it('should return only module', function() {
         //     returnModule("$test","test",null);
         //     returnModule("$1","1",null);
         //     returnModule("$$test","$test",null);
         //     returnModule("$test.","test.",null);
         // });
 
-        it('should retrun module as default', function() {
+        it('should return module as default', function() {
             returnModuleAndKey("$default.foo","default","foo");
             returnModuleAndKey("$.foo","default","foo");
             // returnModule("$default","default");
             // returnModule("$","default");
         });
 
-        it('should retrun null', function() {
-            should(parseKey("test.aaa")).be.null();
-            should(parseKey("test")).be.null();
+        it('should return null', function() {
+            var keyPath = parseKey("test.aaa");
+            keyPath.storage.should.eql("");
+            keyPath.key.should.eql("test.aaa");
+
+            keyPath = parseKey("test");
+            keyPath.storage.should.eql("");
+            keyPath.key.should.eql("test");
+
             should(parseKey(null)).be.null();
         });
     });

From e046fc1ac5dc247577728c84f1380e762ac9f951 Mon Sep 17 00:00:00 2001
From: Kazuki-Nakanishi <kazuki.nakanishi.vr@hitachi-solutions.com>
Date: Fri, 20 Apr 2018 11:41:29 +0900
Subject: [PATCH 055/113] Refactor parseKey and implement parseStorage

---
 red/runtime/locales/en-US/runtime.json       |  11 +
 red/runtime/nodes/context/index.js           |  70 +++---
 test/red/runtime/nodes/context/index_spec.js | 225 +++++++++++++------
 3 files changed, 210 insertions(+), 96 deletions(-)

diff --git a/red/runtime/locales/en-US/runtime.json b/red/runtime/locales/en-US/runtime.json
index 6e9f057ae..f7a4b8a3d 100644
--- a/red/runtime/locales/en-US/runtime.json
+++ b/red/runtime/locales/en-US/runtime.json
@@ -155,5 +155,16 @@
                 "readme": "### About\n\nThis is your project's README.md file. It helps users understand what your\nproject does, how to use it and anything else they may need to know."
             }
         }
+    },
+
+    "context": {
+        "error-module-not-loaded": "'__module__' could not be loaded",
+        "error-module-not-defined": "'module' is not defined in '__storage__' of settings.contextStorage",
+        "error-invalid-default-module": "Invalid storage '__storage__' is specified as a default storage",
+        "error-key-zero-length": "Invalid property expression: zero-length",
+        "error-unexpected-space-character": "Invalid property expression: unexpected ' ' at position __index__",
+        "error-empty-key": "Invalid property expression: key is empty",
+        "error-use-undefined-storage": "Undefined storage '__storage__' is specified"
     }
+
 }
diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index 2a00d40d3..31721e659 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -16,6 +16,7 @@
 
 var clone = require("clone");
 var util = require("../../util");
+var log = require("../../log");
 
 var settings;
 var contexts = {};
@@ -55,7 +56,7 @@ function load() {
                     try{
                         plugin = require("./"+plugins[pluginName].module);
                     }catch(err){
-                        throw new Error(plugins[pluginName].module + " could not be loaded");
+                        throw new Error(log._("context.error-module-not-loaded", {module:plugins[pluginName].module}));
                     }
                 } else {
                     plugin = plugins[pluginName].module;
@@ -63,14 +64,14 @@ function load() {
                 plugin.init(config);
                 externalContexts[pluginName] = plugin;
             }else{
-                throw new Error("module is not defined in settings.contextStorage." + pluginName );
+                throw new Error(log._("context.error-module-not-defined", {storage:pluginName}));
             }
         }
         if(alias){
             if(externalContexts.hasOwnProperty(alias)){
                 externalContexts["default"] = externalContexts[alias];
             }else{
-                throw new Error("default is invalid. module name=" + plugins["default"])
+                throw new Error(log._("context.error-invalid-default-module", {storage:plugins["default"]}));
             }
         }
     } else {
@@ -86,31 +87,52 @@ function copySettings(config, settings){
     });
 }
 
-function parseKey(key){
-    if(!key){
-        return null;
+function parseStorage(key) {
+    if (!key || key.charAt(0) !== '$') {
+        return "";
+    } else {
+        var endOfStorageName = key.indexOf(".");
+        if (endOfStorageName == -1) {
+            endOfStorageName = key.length;
+        }
+        return key.substring(1,endOfStorageName)||"default";
     }
-    var keyPath = {storage: "", key: ""};
-    var index_$ = key.indexOf("$");
-    var index_dot = key.indexOf(".", 1);
-    if(index_$===0&&index_dot) {
-        keyPath.storage = key.substring(1,index_dot)||"default";
-        keyPath.key = key.substring(index_dot+1);
+}
+
+function parseKey(key) {
+    if (!key) {
+        throw new Error(log._("context.error-key-zero-length"));
+    }
+    var indexSpace = key.indexOf(" ");
+    if (indexSpace != -1) {
+        throw new Error(log._("context.error-unexpected-space-character", {index:indexSpace}));
+    }
+    var keyPath = { storage: "", key: "" };
+    var indexDot = key.indexOf(".");
+    // The key of "$file" should be treated as a key without persistable context.
+    if (indexDot != -1) {
+        keyPath.storage = parseStorage(key);
+    }
+    if (keyPath.storage) {
+        keyPath.key = key.substring(indexDot + 1);
     } else {
         keyPath.key = key;
     }
+    if(!keyPath.key) {
+        throw new Error(log._("context.error-empty-key"));
+    }
     return keyPath;
 }
 
-function getContextStorage(keyPath) {
-    if (noContextStorage || !keyPath.storage) {
+function getContextStorage(storage) {
+    if (noContextStorage || !storage) {
         return externalContexts["_"];
-    } else if (externalContexts.hasOwnProperty(keyPath.storage)) {
-        return externalContexts[keyPath.storage];
+    } else if (externalContexts.hasOwnProperty(storage)) {
+        return externalContexts[storage];
     } else if (externalContexts.hasOwnProperty("default")) {
         return externalContexts["default"];
     } else {
-        var contextError = new Error(keyPath.storage + " is not defined in contextStorage on settings.js");
+        var contextError = new Error(log._("context.error-use-undefined-storage", {storage:storage}));
         contextError.name = "ContextError";
         throw contextError;
     }
@@ -122,21 +144,19 @@ function createContext(id,seed) {
 
     obj.get = function(key) {
         var keyPath = parseKey(key);
-        var context = getContextStorage(keyPath);
+        var context = getContextStorage(keyPath.storage);
         return context.get(keyPath.key, scope);
     };
     obj.set = function(key, value) {
         var keyPath = parseKey(key);
-        var context = getContextStorage(keyPath);
+        var context = getContextStorage(keyPath.storage);
         return context.set(keyPath.key, value, scope);
     };
-    obj.keys = function() {
+    obj.keys = function(storage) {
         //TODO: discuss about keys() behavior
-        var keys = [];
-        for(var plugin in externalContexts){
-            keys.concat(externalContexts[plugin].keys(scope));
-        }
-        return keys;
+        var storageName = parseStorage(storage);
+        var context = getContextStorage(storageName);
+        return context.keys(scope);
     };
     if(id === "global"){
         externalContexts["_"].setGlobalContext(seed);
diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index e339de7e1..bc9e6aff6 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -163,21 +163,6 @@ describe('context', function() {
                 config:{}
             }
         };
-        var contextDefaultStorage={
-            default: "test",
-            test:{
-                module: {
-                    init: function() {
-                        return true;
-                    },
-                    get: stubGet,
-                    set: stubSet,
-                    keys: stubKeys,
-                    delete: stubDelete
-                },
-                config:{}
-            }
-        };
 
         afterEach(function(done) {
             stubGet.reset();
@@ -193,7 +178,68 @@ describe('context', function() {
             context =  Context.get("1","flow");
         }
 
+        describe('key name',function() {
+            var memoryStorage = {
+                memory: {
+                    module: "memory"
+                }
+            };
+            beforeEach(function() {
+                Context.init({contextStorage:memoryStorage});
+                Context.load();
+                context =  Context.get("1","flow");
+            });
+            afterEach(function() {
+                Context.clean({allNodes:{}});
+            });
+            it('should work correctly with the valid key name',function() {
+                context.set("$memory.azAZ09$_","valid");
+                context.get("$memory.azAZ09$_").should.eql("valid");
+                context.set("$memory.a.b","ab");
+                context.get("$memory.a.b").should.eql("ab");
+            });
+            it('should treat the key name without dot as a normal context',function() {
+                context.set("$memory","normal");
+                context.get("$memory").should.eql("normal");
+            });
+            it('should fail when specifying invalid characters',function() {
+                (function() {
+                    context.set("$memory.a.-","invalid1");
+                }).should.throw();
+                (function() {
+                    context.set("$memory.'abc","invalid2");
+                }).should.throw();
+            });
+            it('should fail when specifying unnecesary space characters for key name',function() {
+                (function() {
+                    context.set("$ memory.space","space1");
+                }).should.throw();
+                (function() {
+                    context.set("$memory .space","space2");
+                }).should.throw();
+                (function() {
+                    context.set("$memory. space","space3");
+                }).should.throw();
+            });
+        });
+
         describe('if external context storage exists',function() {
+            var contextDefaultStorage={
+                default: "test",
+                test:{
+                    module: {
+                        init: function() {
+                            return true;
+                        },
+                        get: stubGet,
+                        set: stubSet,
+                        keys: stubKeys,
+                        delete: stubDelete
+                    },
+                    config:{}
+                }
+            };
+
             it('should store local property to external context storage',function() {
                 initializeContext();
                 should.not.exist(context.get("$test.foo"));
@@ -224,7 +270,7 @@ describe('context', function() {
                 stubSet.called.should.be.true();
                 stubKeys.called.should.be.true();
             });
-            it('should store data on default context', function() {
+            it('should store data when non-existent context storage was specified', function() {
                 Context.init({contextStorage:contextDefaultStorage});
                 Context.load();
                 context =  Context.get("1","flow");
@@ -236,12 +282,39 @@ describe('context', function() {
                 stubSet.called.should.be.true();
                 stubKeys.called.should.be.true();
             });
+            it('should use the default context', function() {
+                Context.init({contextStorage:contextDefaultStorage});
+                Context.load();
+                context =  Context.get("1","flow");
+                should.not.exist(context.get("$default.foo"));
+                context.set("$default.foo","default");
+                context.get("$default.foo");
+                context.keys("$default");
+                stubGet.called.should.be.true();
+                stubSet.called.should.be.true();
+                stubKeys.called.should.be.true();
+            });
+            it('should use the alias of default context', function() {
+                Context.init({contextStorage:contextDefaultStorage});
+                Context.load();
+                context =  Context.get("1","flow");
+                should.not.exist(context.get("$.foo"));
+                context.set("$.foo","alias");
+                context.get("$.foo");
+                context.keys("$");
+                stubGet.called.should.be.true();
+                stubSet.called.should.be.true();
+                stubKeys.called.should.be.true();
+            });
             it('should load memory module', function(done) {
                 Context.init({ contextStorage: { _: {}}});
                 try {
                     Context.load();
-                    context.set("_.foo","test");
-                    context.get("$_.foo");
+                    context.set("$_.foo","mem1");
+                    context.get("$_.foo").should.eql("mem1");
+                    var keys = context.keys("$_");
+                    keys.should.have.length(1);
+                    keys[0].should.eql("foo");
                     done();
                 } catch (err) {
                     done(err);
@@ -256,6 +329,27 @@ describe('context', function() {
                     done(err);
                 }
             });
+            it('should accept special storage name', function(done) {
+                Context.init({
+                    contextStorage:{
+                        "#%&":{module:"memory"},
+                        \u3042:{module:"memory"},
+                        1:{module:"localfilesystem"},
+                    }
+                });
+                try {
+                    Context.load();
+                    context.set("$#%&.sign","sign1");
+                    context.get("$#%&.sign").should.eql("sign1");
+                    context.set("$\u3042.file2","file2");
+                    context.get("$\u3042.file2").should.eql("file2");
+                    context.set("$1.num","num3");
+                    context.get("$1.num").should.eql("num3");
+                    done();
+                } catch (err) {
+                    done(err);
+                }
+            });
         });
 
         describe('if external context storage does not exist',function() {
@@ -285,18 +379,11 @@ describe('context', function() {
                     }
                 }
             });
-            it('should fail when using invalid default context', function(done) {
+            it('should fail when using invalid default context', function() {
                 Context.init({contextStorage:{default:"noexist"}});
-                try {
+                (function() {
                     Context.load();
-                    try {
-                        should.fail(null, null, "An error was not thrown using undefined storage for flow context");
-                    } catch (err) {
-                        done(err);
-                    }
-                } catch (err) {
-                    done();
-                }
+                }).should.throw();
             });
             it('should store data on memory when contextStorage is not defined', function() {
                 Context.init({});
@@ -309,31 +396,17 @@ describe('context', function() {
                 context.global.set("$nonexist.key1", "val3");
                 context.global.get("$nonexist.key1").should.eql("val3");
             });
-            it('should fail for the storage with no module', function(done) {
+            it('should fail for the storage with no module', function() {
                 Context.init({ contextStorage: { test: {}}});
-                try {
+                (function() {
                     Context.load();
-                    try {
-                        should.fail(null, null, "Should fail when no module was specified");
-                    } catch (err) {
-                        done(err);
-                    }
-                } catch (err) {
-                    done();
-                }
+                }).should.throw();
             });
-            it('should fail to load non-existent module', function(done) {
+            it('should fail to load non-existent module', function() {
                 Context.init({contextStorage:{ file:{module:"nonexistent"} }});
-                try {
+                (function() {
                     Context.load();
-                    try {
-                        should.fail(null, null, "Should fail to load non-existent module");
-                    } catch (err) {
-                        done(err);
-                    }
-                } catch (err) {
-                    done();
-                }
+                }).should.throw();
             });
         });
     });
@@ -347,12 +420,6 @@ describe('context', function() {
             result.key.should.eql(expectedKey);
         };
 
-        function returnModule(input, expectedModule) {
-            var result = parseKey(input);
-            result.storage.should.eql(expectedModule);
-            should(result.key).be.null();
-        };
-
         it('should return module and key', function() {
             returnModuleAndKey("$test.aaa","test","aaa");
             returnModuleAndKey("$test.aaa.bbb","test","aaa.bbb");
@@ -362,32 +429,48 @@ describe('context', function() {
             returnModuleAndKey("$test.$foo.$bar","test","$foo.$bar"); 
             returnModuleAndKey("$test..foo","test",".foo");
             returnModuleAndKey("$test..","test",".");
+            returnModuleAndKey("$te-_st.aaa","te-_st","aaa");
+            returnModuleAndKey("$te{st.a2","te{st","a2");
+            returnModuleAndKey("$te[st.a3","te[st","a3");
+            returnModuleAndKey("$te'st.a4","te'st","a4");
+            returnModuleAndKey("$te\"st.a5","te\"st","a5");
         });
 
-        // it('should return only module', function() {
-        //     returnModule("$test","test",null);
-        //     returnModule("$1","1",null);
-        //     returnModule("$$test","$test",null);
-        //     returnModule("$test.","test.",null);
-        // });
-
         it('should return module as default', function() {
             returnModuleAndKey("$default.foo","default","foo");
             returnModuleAndKey("$.foo","default","foo");
-            // returnModule("$default","default");
-            // returnModule("$","default");
         });
 
-        it('should return null', function() {
-            var keyPath = parseKey("test.aaa");
-            keyPath.storage.should.eql("");
-            keyPath.key.should.eql("test.aaa");
+        it('should return only keys', function() {
+            returnModuleAndKey("test.aaa", "", "test.aaa");
+            returnModuleAndKey("test", "", "test");
+            returnModuleAndKey("$test", "", "$test");
+        });
 
-            keyPath = parseKey("test");
-            keyPath.storage.should.eql("");
-            keyPath.key.should.eql("test");
+        it('should fail with null key', function() {
+            (function() {
+                parseKey("");
+            }).should.throw();
 
-            should(parseKey(null)).be.null();
+            (function() {
+                parseKey(null);
+            }).should.throw();
+        });
+
+        it('should fail with space character', function() {
+            (function() {
+                parseKey(" $test");
+            }).should.throw();
+
+            (function() {
+                parseKey("$test .a");
+            }).should.throw();
+        });
+
+        it('should fail with empty key', function() {
+            (function() {
+                parseKey("$test.");
+            }).should.throw();
         });
     });
 

From 0be9c88106d3665ea82fe9ace2e0237d16281ade Mon Sep 17 00:00:00 2001
From: Hiroki Uchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Mon, 23 Apr 2018 10:45:30 +0900
Subject: [PATCH 056/113] Improve processing when default is an alias and fix
 test cases

---
 red/runtime/nodes/context/index.js           | 10 +++++-----
 test/red/runtime/index_spec.js               |  3 +++
 test/red/runtime/nodes/context/index_spec.js |  5 +++--
 test/red/runtime/util_spec.js                |  8 +++-----
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index 31721e659..a0821531e 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -37,7 +37,7 @@ function init(_settings) {
 function load() {
     // load & init plugins in settings.contextStorage
     var plugins = settings.contextStorage;
-    var alias = null;
+    var isAlias = false;
     if (plugins) {
         noContextStorage = false;
         for(var pluginName in plugins){
@@ -45,7 +45,7 @@ function load() {
                 continue;
             }
             if(pluginName === "default" && typeof plugins[pluginName] === "string"){
-                alias = plugins[pluginName];
+                isAlias = true;
                 continue;
             }
             var plugin;
@@ -67,9 +67,9 @@ function load() {
                 throw new Error(log._("context.error-module-not-defined", {storage:pluginName}));
             }
         }
-        if(alias){
-            if(externalContexts.hasOwnProperty(alias)){
-                externalContexts["default"] = externalContexts[alias];
+        if(isAlias){
+            if(externalContexts.hasOwnProperty(plugins["default"])){
+                externalContexts["default"] =  externalContexts[plugins["default"]];
             }else{
                 throw new Error(log._("context.error-invalid-default-module", {storage:plugins["default"]}));
             }
diff --git a/test/red/runtime/index_spec.js b/test/red/runtime/index_spec.js
index 4e30c1e8a..d67c12ee1 100644
--- a/test/red/runtime/index_spec.js
+++ b/test/red/runtime/index_spec.js
@@ -79,6 +79,7 @@ describe("runtime", function() {
         var redNodesGetNodeList;
         var redNodesLoadFlows;
         var redNodesStartFlows;
+        var redNodesLoadContextsPlugin;
 
         beforeEach(function() {
             storageInit = sinon.stub(storage,"init",function(settings) {return when.resolve();});
@@ -91,6 +92,7 @@ describe("runtime", function() {
             redNodesCleanModuleList = sinon.stub(redNodes,"cleanModuleList",function(){});
             redNodesLoadFlows = sinon.stub(redNodes,"loadFlows",function() {return when.resolve()});
             redNodesStartFlows = sinon.stub(redNodes,"startFlows",function() {});
+            redNodesLoadContextsPlugin = sinon.stub(redNodes,"loadContextsPlugin",function() {});
         });
         afterEach(function() {
             storageInit.restore();
@@ -104,6 +106,7 @@ describe("runtime", function() {
             redNodesCleanModuleList.restore();
             redNodesLoadFlows.restore();
             redNodesStartFlows.restore();
+            redNodesLoadContextsPlugin.restore();
         });
         it("reports errored/missing modules",function(done) {
             redNodesGetNodeList = sinon.stub(redNodes,"getNodeList", function(cb) {
diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index bc9e6aff6..33fbd79b8 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -123,7 +123,7 @@ describe('context', function() {
             should.not.exist(context.get("foo"));
         });
 
-        it.skip('enumerates context keys', function() {
+        it('enumerates context keys', function() {
             var context = Context.get("1","flowA");
 
             var keys = context.keys();
@@ -168,6 +168,7 @@ describe('context', function() {
             stubGet.reset();
             stubSet.reset();
             stubKeys.reset();
+            stubDelete.reset();
             Context.clean({allNodes:{}});
             fs.remove(testDir,done);
         });
@@ -418,7 +419,7 @@ describe('context', function() {
             var result = parseKey(input);
             result.storage.should.eql(expectedModule);
             result.key.should.eql(expectedKey);
-        };
+        }
 
         it('should return module and key', function() {
             returnModuleAndKey("$test.aaa","test","aaa");
diff --git a/test/red/runtime/util_spec.js b/test/red/runtime/util_spec.js
index 1b7438efd..c3e797d26 100644
--- a/test/red/runtime/util_spec.js
+++ b/test/red/runtime/util_spec.js
@@ -153,11 +153,9 @@ describe("red/util", function() {
             var v = util.getMessageProperty({a:"foo"},"msg.b");
             should.not.exist(v);
         });
-        it('should throw error if property parent does not exist', function() {
-            /*jshint immed: false */
-            (function() {
-                util.getMessageProperty({a:"foo"},"msg.a.b.c");
-            }).should.throw();
+        it('should return undefined if property parent does not exist', function() {
+            var v = util.getMessageProperty({a:"foo"},"msg.a.b.c");
+            should.not.exist(v);
         });
         it('retrieves a property with array syntax', function() {
             var v = util.getMessageProperty({a:["foo","bar"]},"msg.a[0]");

From e30f8628db7f3f994407c219130255af44343142 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Wed, 9 May 2018 19:19:37 +0900
Subject: [PATCH 057/113] Revert runtime/util

---
 red/runtime/util.js           | 2 +-
 test/red/runtime/util_spec.js | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/red/runtime/util.js b/red/runtime/util.js
index 4d077c21f..257e87777 100644
--- a/red/runtime/util.js
+++ b/red/runtime/util.js
@@ -240,7 +240,7 @@ function getMessageProperty(msg,expr) {
     var msgPropParts = normalisePropertyExpression(expr);
     var m;
     msgPropParts.reduce(function(obj, key) {
-        result = ((typeof obj !== "undefined") && (typeof obj[key] !== "undefined") ? obj[key] : undefined);
+        result = (typeof obj[key] !== "undefined" ? obj[key] : undefined);
         return result;
     }, msg);
     return result;
diff --git a/test/red/runtime/util_spec.js b/test/red/runtime/util_spec.js
index c3e797d26..1b7438efd 100644
--- a/test/red/runtime/util_spec.js
+++ b/test/red/runtime/util_spec.js
@@ -153,9 +153,11 @@ describe("red/util", function() {
             var v = util.getMessageProperty({a:"foo"},"msg.b");
             should.not.exist(v);
         });
-        it('should return undefined if property parent does not exist', function() {
-            var v = util.getMessageProperty({a:"foo"},"msg.a.b.c");
-            should.not.exist(v);
+        it('should throw error if property parent does not exist', function() {
+            /*jshint immed: false */
+            (function() {
+                util.getMessageProperty({a:"foo"},"msg.a.b.c");
+            }).should.throw();
         });
         it('retrieves a property with array syntax', function() {
             var v = util.getMessageProperty({a:["foo","bar"]},"msg.a[0]");

From 84f598e14352a063940b1d6edaef67056febf090 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Wed, 23 May 2018 10:23:39 +0900
Subject: [PATCH 058/113] Change prefix from $ to #

---
 red/runtime/nodes/context/index.js           |   2 +-
 test/red/runtime/nodes/context/index_spec.js | 142 +++++++++----------
 2 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index a0821531e..de34b3dc8 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -88,7 +88,7 @@ function copySettings(config, settings){
 }
 
 function parseStorage(key) {
-    if (!key || key.charAt(0) !== '$') {
+    if (!key || key.charAt(0) !== '#') {
         return "";
     } else {
         var endOfStorageName = key.indexOf(".");
diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index 33fbd79b8..4b488657a 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -194,32 +194,32 @@ describe('context', function() {
                 Context.clean({allNodes:{}});
             });
             it('should work correctly with the valid key name',function() {
-                context.set("$memory.azAZ09$_","valid");
-                context.get("$memory.azAZ09$_").should.eql("valid");
-                context.set("$memory.a.b","ab");
-                context.get("$memory.a.b").should.eql("ab");
+                context.set("#memory.azAZ09#_","valid");
+                context.get("#memory.azAZ09#_").should.eql("valid");
+                context.set("#memory.a.b","ab");
+                context.get("#memory.a.b").should.eql("ab");
             });
             it('should treat the key name without dot as a normal context',function() {
-                context.set("$memory","normal");
-                context.get("$memory").should.eql("normal");
+                context.set("#memory","normal");
+                context.get("#memory").should.eql("normal");
             });
             it('should fail when specifying invalid characters',function() {
                 (function() {
-                    context.set("$memory.a.-","invalid1");
+                    context.set("#memory.a.-","invalid1");
                 }).should.throw();
                 (function() {
-                    context.set("$memory.'abc","invalid2");
+                    context.set("#memory.'abc","invalid2");
                 }).should.throw();
             });
             it('should fail when specifying unnecesary space characters for key name',function() {
                 (function() {
-                    context.set("$ memory.space","space1");
+                    context.set("# memory.space","space1");
                 }).should.throw();
                 (function() {
-                    context.set("$memory .space","space2");
+                    context.set("#memory .space","space2");
                 }).should.throw();
                 (function() {
-                    context.set("$memory. space","space3");
+                    context.set("#memory. space","space3");
                 }).should.throw();
             });
         });
@@ -243,30 +243,30 @@ describe('context', function() {
 
             it('should store local property to external context storage',function() {
                 initializeContext();
-                should.not.exist(context.get("$test.foo"));
-                context.set("$test.foo","test");
-                context.get("$test.foo");
-                context.keys("$test");
+                should.not.exist(context.get("#test.foo"));
+                context.set("#test.foo","test");
+                context.get("#test.foo");
+                context.keys("#test");
                 stubGet.called.should.be.true();
                 stubSet.called.should.be.true();
                 stubKeys.called.should.be.true();
             });
             it('should store flow property to external context storage',function() {
                 initializeContext();
-                should.not.exist(context.flow.get("$test.foo"));
-                context.flow.set("$test.foo","test");
-                context.flow.get("$test.foo");
-                context.flow.keys("$test");
+                should.not.exist(context.flow.get("#test.foo"));
+                context.flow.set("#test.foo","test");
+                context.flow.get("#test.foo");
+                context.flow.keys("#test");
                 stubGet.called.should.be.true();
                 stubSet.called.should.be.true();
                 stubKeys.called.should.be.true();
             });
             it('should store global property to external context storage',function() {
                 initializeContext();
-                should.not.exist(context.global.get("$test.foo"));
-                context.global.set("$test.foo","test");
-                context.global.get("$test.foo");
-                context.global.keys("$test");
+                should.not.exist(context.global.get("#test.foo"));
+                context.global.set("#test.foo","test");
+                context.global.get("#test.foo");
+                context.global.keys("#test");
                 stubGet.called.should.be.true();
                 stubSet.called.should.be.true();
                 stubKeys.called.should.be.true();
@@ -275,10 +275,10 @@ describe('context', function() {
                 Context.init({contextStorage:contextDefaultStorage});
                 Context.load();
                 context =  Context.get("1","flow");
-                should.not.exist(context.get("$nonexist.foo"));
-                context.set("$nonexist.foo","test");
-                context.get("$nonexist.foo");
-                context.keys("$nonexist");
+                should.not.exist(context.get("#nonexist.foo"));
+                context.set("#nonexist.foo","test");
+                context.get("#nonexist.foo");
+                context.keys("#nonexist");
                 stubGet.called.should.be.true();
                 stubSet.called.should.be.true();
                 stubKeys.called.should.be.true();
@@ -287,10 +287,10 @@ describe('context', function() {
                 Context.init({contextStorage:contextDefaultStorage});
                 Context.load();
                 context =  Context.get("1","flow");
-                should.not.exist(context.get("$default.foo"));
-                context.set("$default.foo","default");
-                context.get("$default.foo");
-                context.keys("$default");
+                should.not.exist(context.get("#default.foo"));
+                context.set("#default.foo","default");
+                context.get("#default.foo");
+                context.keys("#default");
                 stubGet.called.should.be.true();
                 stubSet.called.should.be.true();
                 stubKeys.called.should.be.true();
@@ -299,10 +299,10 @@ describe('context', function() {
                 Context.init({contextStorage:contextDefaultStorage});
                 Context.load();
                 context =  Context.get("1","flow");
-                should.not.exist(context.get("$.foo"));
-                context.set("$.foo","alias");
-                context.get("$.foo");
-                context.keys("$");
+                should.not.exist(context.get("#.foo"));
+                context.set("#.foo","alias");
+                context.get("#.foo");
+                context.keys("#");
                 stubGet.called.should.be.true();
                 stubSet.called.should.be.true();
                 stubKeys.called.should.be.true();
@@ -311,9 +311,9 @@ describe('context', function() {
                 Context.init({ contextStorage: { _: {}}});
                 try {
                     Context.load();
-                    context.set("$_.foo","mem1");
-                    context.get("$_.foo").should.eql("mem1");
-                    var keys = context.keys("$_");
+                    context.set("#_.foo","mem1");
+                    context.get("#_.foo").should.eql("mem1");
+                    var keys = context.keys("#_");
                     keys.should.have.length(1);
                     keys[0].should.eql("foo");
                     done();
@@ -340,12 +340,12 @@ describe('context', function() {
                 });
                 try {
                     Context.load();
-                    context.set("$#%&.sign","sign1");
-                    context.get("$#%&.sign").should.eql("sign1");
-                    context.set("$\u3042.file2","file2");
-                    context.get("$\u3042.file2").should.eql("file2");
-                    context.set("$1.num","num3");
-                    context.get("$1.num").should.eql("num3");
+                    context.set("##%&.sign","sign1");
+                    context.get("##%&.sign").should.eql("sign1");
+                    context.set("#\u3042.file2","file2");
+                    context.get("#\u3042.file2").should.eql("file2");
+                    context.set("#1.num","num3");
+                    context.get("#1.num").should.eql("num3");
                     done();
                 } catch (err) {
                     done(err);
@@ -357,7 +357,7 @@ describe('context', function() {
             it('should throw an error using undefined storage for local context', function(done) {
                 initializeContext();
                 try {
-                    context.get("$nonexist.local");
+                    context.get("#nonexist.local");
                     should.fail(null, null, "An error was not thrown using undefined storage for local context");
                 } catch (err) {
                     if (err.name === "ContextError") {
@@ -370,7 +370,7 @@ describe('context', function() {
             it('should throw an error using undefined storage for flow context', function(done) {
                 initializeContext();
                 try {
-                    context.flow.set("$nonexist.flow");
+                    context.flow.set("#nonexist.flow");
                     should.fail(null, null, "An error was not thrown using undefined storage for flow context");
                 } catch (err) {
                     if (err.name === "ContextError") {
@@ -390,12 +390,12 @@ describe('context', function() {
                 Context.init({});
                 Context.load();
                 context =  Context.get("1","flow");
-                context.set("$nonexist.key1", "val1");
-                context.get("$nonexist.key1").should.eql("val1");
-                context.flow.set("$nonexist.key2", "val2");
-                context.flow.get("$nonexist.key2").should.eql("val2");
-                context.global.set("$nonexist.key1", "val3");
-                context.global.get("$nonexist.key1").should.eql("val3");
+                context.set("#nonexist.key1", "val1");
+                context.get("#nonexist.key1").should.eql("val1");
+                context.flow.set("#nonexist.key2", "val2");
+                context.flow.get("#nonexist.key2").should.eql("val2");
+                context.global.set("#nonexist.key1", "val3");
+                context.global.get("#nonexist.key1").should.eql("val3");
             });
             it('should fail for the storage with no module', function() {
                 Context.init({ contextStorage: { test: {}}});
@@ -422,30 +422,30 @@ describe('context', function() {
         }
 
         it('should return module and key', function() {
-            returnModuleAndKey("$test.aaa","test","aaa");
-            returnModuleAndKey("$test.aaa.bbb","test","aaa.bbb");
-            returnModuleAndKey("$1.234","1","234");
-            returnModuleAndKey("$$test.foo","$test","foo");
-            returnModuleAndKey("$test.$foo","test","$foo"); 
-            returnModuleAndKey("$test.$foo.$bar","test","$foo.$bar"); 
-            returnModuleAndKey("$test..foo","test",".foo");
-            returnModuleAndKey("$test..","test",".");
-            returnModuleAndKey("$te-_st.aaa","te-_st","aaa");
-            returnModuleAndKey("$te{st.a2","te{st","a2");
-            returnModuleAndKey("$te[st.a3","te[st","a3");
-            returnModuleAndKey("$te'st.a4","te'st","a4");
-            returnModuleAndKey("$te\"st.a5","te\"st","a5");
+            returnModuleAndKey("#test.aaa","test","aaa");
+            returnModuleAndKey("#test.aaa.bbb","test","aaa.bbb");
+            returnModuleAndKey("#1.234","1","234");
+            returnModuleAndKey("##test.foo","#test","foo");
+            returnModuleAndKey("#test.#foo","test","#foo"); 
+            returnModuleAndKey("#test.#foo.#bar","test","#foo.#bar"); 
+            returnModuleAndKey("#test..foo","test",".foo");
+            returnModuleAndKey("#test..","test",".");
+            returnModuleAndKey("#te-_st.aaa","te-_st","aaa");
+            returnModuleAndKey("#te{st.a2","te{st","a2");
+            returnModuleAndKey("#te[st.a3","te[st","a3");
+            returnModuleAndKey("#te'st.a4","te'st","a4");
+            returnModuleAndKey("#te\"st.a5","te\"st","a5");
         });
 
         it('should return module as default', function() {
-            returnModuleAndKey("$default.foo","default","foo");
-            returnModuleAndKey("$.foo","default","foo");
+            returnModuleAndKey("#default.foo","default","foo");
+            returnModuleAndKey("#.foo","default","foo");
         });
 
         it('should return only keys', function() {
             returnModuleAndKey("test.aaa", "", "test.aaa");
             returnModuleAndKey("test", "", "test");
-            returnModuleAndKey("$test", "", "$test");
+            returnModuleAndKey("#test", "", "#test");
         });
 
         it('should fail with null key', function() {
@@ -460,17 +460,17 @@ describe('context', function() {
 
         it('should fail with space character', function() {
             (function() {
-                parseKey(" $test");
+                parseKey(" #test");
             }).should.throw();
 
             (function() {
-                parseKey("$test .a");
+                parseKey("#test .a");
             }).should.throw();
         });
 
         it('should fail with empty key', function() {
             (function() {
-                parseKey("$test.");
+                parseKey("#test.");
             }).should.throw();
         });
     });

From 7fafa21a1b3f61860c7262e650fc3084e1171096 Mon Sep 17 00:00:00 2001
From: Hiroki Uchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Wed, 23 May 2018 11:42:53 +0900
Subject: [PATCH 059/113] Change the order of arguments

---
 red/runtime/nodes/context/index.js            |  4 +-
 red/runtime/nodes/context/localfilesystem.js  |  4 +-
 red/runtime/nodes/context/memory.js           |  5 +-
 test/red/runtime/nodes/context/index_spec.js  |  2 +-
 .../nodes/context/localfilesystem_spec.js     | 64 +++++++++---------
 test/red/runtime/nodes/context/memory_spec.js | 66 +++++++++----------
 6 files changed, 72 insertions(+), 73 deletions(-)

diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index de34b3dc8..633dc22d5 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -145,12 +145,12 @@ function createContext(id,seed) {
     obj.get = function(key) {
         var keyPath = parseKey(key);
         var context = getContextStorage(keyPath.storage);
-        return context.get(keyPath.key, scope);
+        return context.get(scope, keyPath.key);
     };
     obj.set = function(key, value) {
         var keyPath = parseKey(key);
         var context = getContextStorage(keyPath.storage);
-        return context.set(keyPath.key, value, scope);
+        return context.set(scope, keyPath.key, value);
     };
     obj.keys = function(storage) {
         //TODO: discuss about keys() behavior
diff --git a/red/runtime/nodes/context/localfilesystem.js b/red/runtime/nodes/context/localfilesystem.js
index e77954189..30b7f5920 100644
--- a/red/runtime/nodes/context/localfilesystem.js
+++ b/red/runtime/nodes/context/localfilesystem.js
@@ -66,7 +66,7 @@ var localfilesystem = {
             storageBaseDir = configs.dir;
         }
     },
-    get: function (key, scope) {
+    get: function (scope, key) {
         if(!storages[scope]){
             createStorage(scope);
         }
@@ -82,7 +82,7 @@ var localfilesystem = {
         }
     },
 
-    set: function (key, value, scope) {
+    set: function (scope, key, value) {
         if(!storages[scope]){
             createStorage(scope);
         }
diff --git a/red/runtime/nodes/context/memory.js b/red/runtime/nodes/context/memory.js
index deed13d36..820039747 100644
--- a/red/runtime/nodes/context/memory.js
+++ b/red/runtime/nodes/context/memory.js
@@ -17,19 +17,18 @@
 var util = require("../../util");
 
 var data;
-var seedFlg = false;
 
 var memory = {
     init: function(config) {
         data = {};
     },
-    get: function(key, scope) {
+    get: function(scope, key) {
         if(!data[scope]){
             data[scope] = {};
         }
         return util.getMessageProperty(data[scope],key);
     },
-    set: function(key, value, scope) {
+    set: function(scope, key, value) {
         if(!data[scope]){
             data[scope] = {};
         }
diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index 4b488657a..56135e52a 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -335,7 +335,7 @@ describe('context', function() {
                     contextStorage:{
                         "#%&":{module:"memory"},
                         \u3042:{module:"memory"},
-                        1:{module:"localfilesystem"},
+                        1:{module:"memory"},
                     }
                 });
                 try {
diff --git a/test/red/runtime/nodes/context/localfilesystem_spec.js b/test/red/runtime/nodes/context/localfilesystem_spec.js
index d0d545413..8fc538c8d 100644
--- a/test/red/runtime/nodes/context/localfilesystem_spec.js
+++ b/test/red/runtime/nodes/context/localfilesystem_spec.js
@@ -38,36 +38,36 @@ describe('localfilesystem',function() {
 
     describe('#get/set',function() {
         it('should store property',function() {
-            should.not.exist(context.get("foo","nodeX"));
-            context.set("foo","test","nodeX");
-            context.get("foo","nodeX").should.eql("test");
+            should.not.exist(context.get("nodeX","foo"));
+            context.set("nodeX","foo","test");
+            context.get("nodeX","foo").should.eql("test");
         });
 
         it('should store property - creates parent properties',function() {
-            context.set("foo.bar","test","nodeX");
-            context.get("foo","nodeX").should.eql({bar:"test"});
+            context.set("nodeX","foo.bar","test");
+            context.get("nodeX","foo").should.eql({bar:"test"});
         });
 
         it('should delete property',function() {
-            context.set("foo.abc.bar1","test1","nodeX");
-            context.set("foo.abc.bar2","test2","nodeX");
-            context.get("foo.abc","nodeX").should.eql({bar1:"test1",bar2:"test2"});
-            context.set("foo.abc.bar1",undefined,"nodeX");
-            context.get("foo.abc","nodeX").should.eql({bar2:"test2"});
-            context.set("foo.abc",undefined,"nodeX");
-            should.not.exist(context.get("foo.abc","nodeX"));
-            context.set("foo",undefined,"nodeX");
-            should.not.exist(context.get("foo","nodeX"));
+            context.set("nodeX","foo.abc.bar1","test1");
+            context.set("nodeX","foo.abc.bar2","test2");
+            context.get("nodeX","foo.abc").should.eql({bar1:"test1",bar2:"test2"});
+            context.set("nodeX","foo.abc.bar1",undefined);
+            context.get("nodeX","foo.abc").should.eql({bar2:"test2"});
+            context.set("nodeX","foo.abc",undefined);
+            should.not.exist(context.get("nodeX","foo.abc"));
+            context.set("nodeX","foo",undefined);
+            should.not.exist(context.get("nodeX","foo"));
         });
 
         it('should not shared context with other scope', function() {
-            should.not.exist(context.get("foo","nodeX"));
-            should.not.exist(context.get("foo","nodeY"));
-            context.set("foo","testX","nodeX");
-            context.set("foo","testY","nodeY");
+            should.not.exist(context.get("nodeX","foo"));
+            should.not.exist(context.get("nodeY","foo"));
+            context.set("nodeX","foo","testX");
+            context.set("nodeY","foo","testY");
 
-            context.get("foo","nodeX").should.eql("testX");
-            context.get("foo","nodeY").should.eql("testY");
+            context.get("nodeX","foo").should.eql("testX");
+            context.get("nodeY","foo").should.eql("testY");
         });
     });
 
@@ -77,12 +77,12 @@ describe('localfilesystem',function() {
             keys.should.be.an.Array();
             keys.should.be.empty();
 
-            context.set("foo","bar","nodeX");
+            context.set("nodeX","foo","bar");
             keys = context.keys("nodeX");
             keys.should.have.length(1);
             keys[0].should.eql("foo");
 
-            context.set("abc.def","bar","nodeX");
+            context.set("nodeX","abc.def","bar");
             keys = context.keys("nodeX");
             keys.should.have.length(2);
             keys[1].should.eql("abc");
@@ -97,8 +97,8 @@ describe('localfilesystem',function() {
             keysY.should.be.an.Array();
             keysY.should.be.empty();
 
-            context.set("foo","bar","nodeX");
-            context.set("hoge","piyo","nodeY");
+            context.set("nodeX","foo","bar");
+            context.set("nodeY","hoge","piyo");
             keysX = context.keys("nodeX");
             keysX.should.have.length(1);
             keysX[0].should.eql("foo");
@@ -111,16 +111,16 @@ describe('localfilesystem',function() {
 
     describe('#delete',function() {
         it('should delete context',function() {
-            should.not.exist(context.get("foo","nodeX"));
-            should.not.exist(context.get("foo","nodeY"));
-            context.set("foo","abc","nodeX");
-            context.set("foo","abc","nodeY");
-            context.get("foo","nodeX").should.eql("abc");
-            context.get("foo","nodeY").should.eql("abc");
+            should.not.exist(context.get("nodeX","foo"));
+            should.not.exist(context.get("nodeY","foo"));
+            context.set("nodeX","foo","abc");
+            context.set("nodeY","foo","abc");
+            context.get("nodeX","foo").should.eql("abc");
+            context.get("nodeY","foo").should.eql("abc");
 
             context.delete("nodeX");
-            should.not.exist(context.get("foo","nodeX"));
-            should.exist(context.get("foo","nodeY"));
+            should.not.exist(context.get("nodeX","foo"));
+            should.exist(context.get("nodeY","foo"));
         });
     });
 });
\ No newline at end of file
diff --git a/test/red/runtime/nodes/context/memory_spec.js b/test/red/runtime/nodes/context/memory_spec.js
index 59acd67e1..91f4ab917 100644
--- a/test/red/runtime/nodes/context/memory_spec.js
+++ b/test/red/runtime/nodes/context/memory_spec.js
@@ -25,36 +25,36 @@ describe('memory',function() {
 
     describe('#get/set',function() {
         it('should store property',function() {
-            should.not.exist(context.get("foo","nodeX"));
-            context.set("foo","test","nodeX");
-            context.get("foo","nodeX").should.eql("test");
+            should.not.exist(context.get("nodeX","foo"));
+            context.set("nodeX","foo","test");
+            context.get("nodeX","foo").should.eql("test");
         });
 
         it('should store property - creates parent properties',function() {
-            context.set("foo.bar","test","nodeX");
-            context.get("foo","nodeX").should.eql({bar:"test"});
+            context.set("nodeX","foo.bar","test");
+            context.get("nodeX","foo").should.eql({bar:"test"});
         });
 
         it('should delete property',function() {
-            context.set("foo.abc.bar1","test1","nodeX");
-            context.set("foo.abc.bar2","test2","nodeX");
-            context.get("foo.abc","nodeX").should.eql({bar1:"test1",bar2:"test2"});
-            context.set("foo.abc.bar1",undefined,"nodeX");
-            context.get("foo.abc","nodeX").should.eql({bar2:"test2"});
-            context.set("foo.abc",undefined,"nodeX");
-            should.not.exist(context.get("foo.abc","nodeX"));
-            context.set("foo",undefined,"nodeX");
-            should.not.exist(context.get("foo","nodeX"));
+            context.set("nodeX","foo.abc.bar1","test1");
+            context.set("nodeX","foo.abc.bar2","test2");
+            context.get("nodeX","foo.abc").should.eql({bar1:"test1",bar2:"test2"});
+            context.set("nodeX","foo.abc.bar1",undefined);
+            context.get("nodeX","foo.abc").should.eql({bar2:"test2"});
+            context.set("nodeX","foo.abc",undefined);
+            should.not.exist(context.get("nodeX","foo.abc"));
+            context.set("nodeX","foo",undefined);
+            should.not.exist(context.get("nodeX","foo"));
         });
 
         it('should not shared context with other scope', function() {
-            should.not.exist(context.get("foo","nodeX"));
-            should.not.exist(context.get("foo","nodeY"));
-            context.set("foo","testX","nodeX");
-            context.set("foo","testY","nodeY");
+            should.not.exist(context.get("nodeX","foo"));
+            should.not.exist(context.get("nodeY","foo"));
+            context.set("nodeX","foo","testX");
+            context.set("nodeY","foo","testY");
 
-            context.get("foo","nodeX").should.eql("testX");
-            context.get("foo","nodeY").should.eql("testY");
+            context.get("nodeX","foo").should.eql("testX");
+            context.get("nodeY","foo").should.eql("testY");
         });
     });
 
@@ -64,12 +64,12 @@ describe('memory',function() {
             keys.should.be.an.Array();
             keys.should.be.empty();
 
-            context.set("foo","bar","nodeX");
+            context.set("nodeX","foo","bar");
             keys = context.keys("nodeX");
             keys.should.have.length(1);
             keys[0].should.eql("foo");
 
-            context.set("abc.def","bar","nodeX");
+            context.set("nodeX","abc.def","bar");
             keys = context.keys("nodeX");
             keys.should.have.length(2);
             keys[1].should.eql("abc");
@@ -84,8 +84,8 @@ describe('memory',function() {
             keysY.should.be.an.Array();
             keysY.should.be.empty();
 
-            context.set("foo","bar","nodeX");
-            context.set("hoge","piyo","nodeY");
+            context.set("nodeX","foo","bar");
+            context.set("nodeY","hoge","piyo");
             keysX = context.keys("nodeX");
             keysX.should.have.length(1);
             keysX[0].should.eql("foo");
@@ -112,16 +112,16 @@ describe('memory',function() {
 
     describe('#delete',function() {
         it('should delete context',function() {
-            should.not.exist(context.get("foo","nodeX"));
-            should.not.exist(context.get("foo","nodeY"));
-            context.set("foo","abc","nodeX");
-            context.set("foo","abc","nodeY");
-            context.get("foo","nodeX").should.eql("abc");
-            context.get("foo","nodeY").should.eql("abc");
+            should.not.exist(context.get("nodeX","foo"));
+            should.not.exist(context.get("nodeY","foo"));
+            context.set("nodeX","foo","abc");
+            context.set("nodeY","foo","abc");
+            context.get("nodeX","foo").should.eql("abc");
+            context.get("nodeY","foo").should.eql("abc");
 
             context.delete("nodeX");
-            should.not.exist(context.get("foo","nodeX"));
-            should.exist(context.get("foo","nodeY"));
+            should.not.exist(context.get("nodeX","foo"));
+            should.exist(context.get("nodeY","foo"));
         });
     });
 
@@ -135,7 +135,7 @@ describe('memory',function() {
                 foo: "bar"
             }
             context.setGlobalContext(data);
-            context.get("foo","global").should.eql("bar");
+            context.get("global","foo").should.eql("bar");
         });
     });
 });
\ No newline at end of file

From 28d05e2449dd5e486d4f042e07f2301f534ce4a8 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Thu, 24 May 2018 21:42:40 +0900
Subject: [PATCH 060/113] Allow multiple instances of a given storage module to
 exist

---
 red/runtime/nodes/context/index.js            |   7 +-
 red/runtime/nodes/context/localfilesystem.js  | 161 +++++++++---------
 red/runtime/nodes/context/memory.js           |  82 +++++----
 test/red/runtime/nodes/context/index_spec.js  |  30 ++--
 .../nodes/context/localfilesystem_spec.js     |  16 +-
 test/red/runtime/nodes/context/memory_spec.js |   5 +-
 6 files changed, 157 insertions(+), 144 deletions(-)

diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index 633dc22d5..30481e9d1 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -29,8 +29,8 @@ function init(_settings) {
     externalContexts = {};
 
     // init memory plugin
-    externalContexts["_"] = require("./memory");
-    externalContexts["_"].init();
+    var memory = require("./memory");
+    externalContexts["_"] = memory();
     globalContext = createContext("global",settings.functionGlobalContext || {});
 }
 
@@ -61,8 +61,7 @@ function load() {
                 } else {
                     plugin = plugins[pluginName].module;
                 }
-                plugin.init(config);
-                externalContexts[pluginName] = plugin;
+                externalContexts[pluginName] = plugin(config);
             }else{
                 throw new Error(log._("context.error-module-not-defined", {storage:pluginName}));
             }
diff --git a/red/runtime/nodes/context/localfilesystem.js b/red/runtime/nodes/context/localfilesystem.js
index 30b7f5920..d18f4fd76 100644
--- a/red/runtime/nodes/context/localfilesystem.js
+++ b/red/runtime/nodes/context/localfilesystem.js
@@ -18,102 +18,109 @@ var JsonDB = require('node-json-db');
 var fs = require('fs-extra');
 var path = require("path");
 
-var configs;
-var storageBaseDir;
-var storages;
-
-function createStorage(scope) {
+function createStorage(storageBaseDir, scope) {
     var i = scope.indexOf(":")
     
     if(i === -1){
         if(scope === "global"){
-            storages[scope] = new JsonDB(path.join(storageBaseDir,"global",scope), true, true); 
+            return new JsonDB(path.join(storageBaseDir,"global",scope), true, true); 
         }else{ // scope:flow
-            storages[scope] = new JsonDB(path.join(storageBaseDir,scope,"flow"), true, true);
+            return new JsonDB(path.join(storageBaseDir,scope,"flow"), true, true);
         }
     }else{ // scope:local
         var ids = scope.split(":")
-        storages[scope] = new JsonDB(path.join(storageBaseDir,ids[1],ids[0]), true, true);
+        return new JsonDB(path.join(storageBaseDir,ids[1],ids[0]), true, true);
     }
 }
 
-var localfilesystem = {
-    init: function(_configs) {
-        configs = _configs;
-        storages = {};
-        if (!configs.dir) {
-            if(configs.settings && configs.settings.userDir){
-                storageBaseDir = path.join(configs.settings.userDir,"contexts");
-            }else{
+function getStoragePath(config) {
+    var base = config.base || "contexts";
+    var storageBaseDir;
+    if (!config.dir) {
+        if(config.settings && config.settings.userDir){
+            storageBaseDir = path.join(config.settings.userDir, base);
+        }else{
+            try {
+                fs.statSync(path.join(process.env.NODE_RED_HOME,".config.json"));
+                storageBaseDir = path.join(process.env.NODE_RED_HOME, base);
+            } catch(err) {
                 try {
-                    fs.statSync(path.join(process.env.NODE_RED_HOME,".config.json"));
-                    storageBaseDir = path.join(process.env.NODE_RED_HOME,"contexts");
+                    // Consider compatibility for older versions
+                    if (process.env.HOMEPATH) {
+                        fs.statSync(path.join(process.env.HOMEPATH,".node-red",".config.json"));
+                        storageBaseDir = path.join(process.env.HOMEPATH, ".node-red", base);
+                    }
                 } catch(err) {
-                    try {
-                        // Consider compatibility for older versions
-                        if (process.env.HOMEPATH) {
-                            fs.statSync(path.join(process.env.HOMEPATH,".node-red",".config.json"));
-                            storageBaseDir = path.join(process.env.HOMEPATH,".node-red","contexts");
-                        }
-                    } catch(err) {
-                    }
-                    if (!storageBaseDir) {
-                        storageBaseDir = path.join(process.env.HOME || process.env.USERPROFILE || process.env.HOMEPATH || process.env.NODE_RED_HOME,".node-red","contexts");
-                    }
+                }
+                if (!storageBaseDir) {
+                    storageBaseDir = path.join(process.env.HOME || process.env.USERPROFILE || process.env.HOMEPATH || process.env.NODE_RED_HOME,".node-red", base);
                 }
             }
-        }else{
-            storageBaseDir = configs.dir;
         }
-    },
-    get: function (scope, key) {
-        if(!storages[scope]){
-            createStorage(scope);
-        }
-        try{
-            storages[scope].reload();
-            return storages[scope].getData("/" + key.replace(/\./g,"/"));
-        }catch(err){
-            if(err.name === "DataError"){
-                return undefined;
-            }else{
-                throw err;
-            }
-        }
-    },
+    }else{
+        storageBaseDir = path.join(config.dir, base);
+    }
+    return storageBaseDir;
+}
 
-    set: function (scope, key, value) {
-        if(!storages[scope]){
-            createStorage(scope);
-        }
-        if(value){
-            storages[scope].push("/" + key.replace(/\./g,"/"), value);
+function LocalFileSystem(config){
+    this.config = config;
+    this.storageBaseDir = getStoragePath(this.config);
+    this.storages = {};
+}
+
+LocalFileSystem.prototype.get = function (scope, key) {
+    if(!this.storages[scope]){
+        return undefined;
+    }
+    try{
+        this.storages[scope].reload();
+        return this.storages[scope].getData("/" + key.replace(/\./g,"/"));
+    }catch(err){
+        if(err.name === "DataError"){
+            return undefined;
         }else{
-            storages[scope].delete("/" + key.replace(/\./g,"/"));
-        }
-    },
-    keys: function (scope) {
-        if(!storages[scope]){
-            return [];
-        }
-        return Object.keys(storages[scope].getData("/"));
-    },
-    delete: function(scope){
-        if(storages[scope]){
-            storages[scope].delete("/");
-            if(scope.indexOf(":") === -1){
-                fs.removeSync(path.dirname(storages[scope].filename));
-            }else{
-                try{
-                    fs.statSync(storages[scope].filename);
-                    fs.unlinkSync(storages[scope].filename);
-                }catch(err){
-                    console.log("deleted");
-                }
-            }
-            delete storages[scope];
+            throw err;
         }
     }
+}
+
+LocalFileSystem.prototype.set = function(scope, key, value) {
+    if(!this.storages[scope]){
+        this.storages[scope] = createStorage(this.storageBaseDir ,scope);
+    }
+    if(value){
+        this.storages[scope].push("/" + key.replace(/\./g,"/"), value);
+    }else{
+        this.storages[scope].delete("/" + key.replace(/\./g,"/"));
+    }
+}
+
+LocalFileSystem.prototype.keys = function(scope) {
+    if(!this.storages[scope]){
+        return [];
+    }
+    return Object.keys(this.storages[scope].getData("/"));
+}
+
+LocalFileSystem.prototype.delete = function(scope){
+    if(this.storages[scope]){
+        this.storages[scope].delete("/");
+        if(scope.indexOf(":") === -1){
+            fs.removeSync(path.dirname(this.storages[scope].filename));
+        }else{
+            try{
+                fs.statSync(this.storages[scope].filename);
+                fs.unlinkSync(this.storages[scope].filename);
+            }catch(err){
+                    console.log("deleted");
+            }
+        }
+        delete this.storages[scope];
+    }
+}
+
+module.exports = function(config){
+    return new LocalFileSystem(config);
 };
 
-module.exports = localfilesystem;
diff --git a/red/runtime/nodes/context/memory.js b/red/runtime/nodes/context/memory.js
index 820039747..617c850eb 100644
--- a/red/runtime/nodes/context/memory.js
+++ b/red/runtime/nodes/context/memory.js
@@ -16,43 +16,53 @@
 
 var util = require("../../util");
 
-var data;
+function Memory(config){
+    this.data = {};
+}
 
-var memory = {
-    init: function(config) {
-        data = {};
-    },
-    get: function(scope, key) {
-        if(!data[scope]){
-            data[scope] = {};
-        }
-        return util.getMessageProperty(data[scope],key);
-    },
-    set: function(scope, key, value) {
-        if(!data[scope]){
-            data[scope] = {};
-        }
-        util.setMessageProperty(data[scope],key,value);
-    },
-    keys: function(scope){
-        if(!data[scope]){
-            data[scope] = {};
-        }
-        var keysData = Object.keys(data[scope]);
-        if (scope !== "global") {
-            return keysData;
-        } else {
-            return keysData.filter(function (key) {
-                return key !== "set" && key !== "get" && key !== "keys";
-            });
-        }
-    },
-    delete: function(scope){
-        delete data[scope];
-    },
-    setGlobalContext: function(seed){
-        data["global"] = seed;
+Memory.prototype.get = function(scope, key) {
+    if(!this.data[scope]){
+        return undefined;
+    }
+    return util.getMessageProperty(this.data[scope],key);
+};
+
+Memory.prototype.set =function(scope, key, value) {
+    if(!this.data[scope]){
+        this.data[scope] = {};
+    }
+    util.setMessageProperty(this.data[scope],key,value);
+};
+
+Memory.prototype.keys = function(scope){
+    if(!this.data[scope]){
+        return [];
+    } 
+    if (scope !== "global") {
+        return Object.keys(this.data[scope]);
+    } else {
+        return Object.keys(this.data[scope]).filter(function (key) {
+            return key !== "set" && key !== "get" && key !== "keys";
+        });
     }
 };
 
-module.exports = memory;
\ No newline at end of file
+Memory.prototype.delete = function(scope){
+    delete this.data[scope];
+};
+
+Memory.prototype.open = function(){
+    return true;
+};
+
+Memory.prototype.close = function(){
+    delete this.data;
+};
+
+Memory.prototype.setGlobalContext= function(seed){
+    this.data["global"] = seed;
+};
+
+module.exports = function(config){
+    return new Memory(config);
+};
\ No newline at end of file
diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index 56135e52a..f9bf94d4d 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -151,14 +151,13 @@ describe('context', function() {
         var stubDelete = sinon.stub();
         var contextStorage={
             test:{
-                module: {
-                    init: function() {
-                        return true;
-                    },
-                    get: stubGet,
-                    set: stubSet,
-                    keys: stubKeys,
-                    delete: stubDelete
+                module: function(config){
+                    function Test(){}
+                    Test.prototype.get = stubGet;
+                    Test.prototype.set = stubSet;
+                    Test.prototype.keys = stubKeys;
+                    Test.prototype.delete = stubDelete;
+                    return new Test(config);
                 },
                 config:{}
             }
@@ -228,14 +227,13 @@ describe('context', function() {
             var contextDefaultStorage={
                 default: "test",
                 test:{
-                    module: {
-                        init: function() {
-                            return true;
-                        },
-                        get: stubGet,
-                        set: stubSet,
-                        keys: stubKeys,
-                        delete: stubDelete
+                    module: function(config){
+                        function Test(){}
+                        Test.prototype.get = stubGet;
+                        Test.prototype.set = stubSet;
+                        Test.prototype.keys = stubKeys;
+                        Test.prototype.delete = stubDelete;
+                        return new Test(config);
                     },
                     config:{}
                 }
diff --git a/test/red/runtime/nodes/context/localfilesystem_spec.js b/test/red/runtime/nodes/context/localfilesystem_spec.js
index 8fc538c8d..f5866d338 100644
--- a/test/red/runtime/nodes/context/localfilesystem_spec.js
+++ b/test/red/runtime/nodes/context/localfilesystem_spec.js
@@ -17,23 +17,21 @@
 var should = require('should');
 var fs = require('fs-extra');
 var path = require("path");
-var context = require('../../../../../red/runtime/nodes/context/localfilesystem');
+var LocalFileSystem = require('../../../../../red/runtime/nodes/context/localfilesystem');
 
 var resourcesDir = path.resolve(path.join(__dirname,"..","resources","context"));
 
 describe('localfilesystem',function() {
+    var context;
 
     beforeEach(function() {
-        context.init({dir: resourcesDir});
+        context = LocalFileSystem({dir: resourcesDir});
     });
 
-    afterEach(function() {
-        context.delete("nodeX");
-        context.delete("nodeY");
-    });
-
-    after(function() {
-        fs.removeSync(resourcesDir);
+    afterEach(function(done) {
+        fs.remove(resourcesDir).then(function(result){
+            return done(result);
+        });
     });
 
     describe('#get/set',function() {
diff --git a/test/red/runtime/nodes/context/memory_spec.js b/test/red/runtime/nodes/context/memory_spec.js
index 91f4ab917..953529e38 100644
--- a/test/red/runtime/nodes/context/memory_spec.js
+++ b/test/red/runtime/nodes/context/memory_spec.js
@@ -15,12 +15,13 @@
  **/
 
 var should = require('should');
-var context = require('../../../../../red/runtime/nodes/context/memory');
+var Memory = require('../../../../../red/runtime/nodes/context/memory');
 
 describe('memory',function() {
+    var context;
 
     beforeEach(function() {
-        context.init({});
+        context = Memory({});
     });
 
     describe('#get/set',function() {

From 7185bcd51fecbeb4017f520677cced69c102c327 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Wed, 30 May 2018 10:24:27 +0900
Subject: [PATCH 061/113] Add open/close API for context

---
 red/runtime/index.js                          |   7 +-
 red/runtime/nodes/context/index.js            |  35 +-
 red/runtime/nodes/context/localfilesystem.js  |  13 +-
 red/runtime/nodes/context/memory.js           |  16 +-
 red/runtime/nodes/index.js                    |   3 +-
 test/red/runtime/index_spec.js                |  22 +-
 test/red/runtime/nodes/context/index_spec.js  | 474 +++++++++---------
 .../nodes/context/localfilesystem_spec.js     |   8 +-
 8 files changed, 318 insertions(+), 260 deletions(-)

diff --git a/red/runtime/index.js b/red/runtime/index.js
index 30d9c6f2b..e8af69712 100644
--- a/red/runtime/index.js
+++ b/red/runtime/index.js
@@ -90,6 +90,7 @@ function start() {
         })
         .then(function() { return storage.init(runtime)})
         .then(function() { return settings.load(storage)})
+        .then(function() { return redNodes.loadContextsPlugin()})
         .then(function() {
 
             if (log.metric()) {
@@ -109,8 +110,6 @@ function start() {
                 events.emit("runtime-event",{id:"runtime-unsupported-version",payload:{type:"error",text:"notification.errors.unsupportedVersion"},retain:true});
             }
             log.info(os.type()+" "+os.release()+" "+os.arch()+" "+os.endianness());
-            log.info("Loading external context plugins");
-            redNodes.loadContextsPlugin();
             return redNodes.load().then(function() {
 
                 var i;
@@ -231,7 +230,9 @@ function stop() {
         clearTimeout(reinstallTimeout);
     }
     started = false;
-    return redNodes.stopFlows();
+    return redNodes.stopFlows().then(function(){
+        return redNodes.closeContextsPlugin();
+    });
 }
 
 var runtime = module.exports = {
diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index 30481e9d1..80fe2c774 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -17,6 +17,7 @@
 var clone = require("clone");
 var util = require("../../util");
 var log = require("../../log");
+var when = require("when");
 
 var settings;
 var contexts = {};
@@ -30,8 +31,10 @@ function init(_settings) {
 
     // init memory plugin
     var memory = require("./memory");
+    var seed = settings.functionGlobalContext || {};
     externalContexts["_"] = memory();
-    globalContext = createContext("global",settings.functionGlobalContext || {});
+    externalContexts["_"].setGlobalContext(seed);
+    globalContext = createContext("global",seed);
 }
 
 function load() {
@@ -39,6 +42,7 @@ function load() {
     var plugins = settings.contextStorage;
     var isAlias = false;
     if (plugins) {
+        var promises = [];
         noContextStorage = false;
         for(var pluginName in plugins){
             if(pluginName === "_"){
@@ -56,25 +60,32 @@ function load() {
                     try{
                         plugin = require("./"+plugins[pluginName].module);
                     }catch(err){
-                        throw new Error(log._("context.error-module-not-loaded", {module:plugins[pluginName].module}));
+                        return when.reject(new Error(log._("context.error-module-not-loaded", {module:plugins[pluginName].module})));
                     }
                 } else {
                     plugin = plugins[pluginName].module;
                 }
                 externalContexts[pluginName] = plugin(config);
             }else{
-                throw new Error(log._("context.error-module-not-defined", {storage:pluginName}));
+                return when.reject(new Error(log._("context.error-module-not-defined", {storage:pluginName})));
             }
         }
         if(isAlias){
             if(externalContexts.hasOwnProperty(plugins["default"])){
                 externalContexts["default"] =  externalContexts[plugins["default"]];
             }else{
-                throw new Error(log._("context.error-invalid-default-module", {storage:plugins["default"]}));
+                return when.reject(new Error(log._("context.error-invalid-default-module", {storage:plugins["default"]})));
             }
         }
+        for(var plugin in externalContexts){
+            if(externalContexts.hasOwnProperty(plugin)){
+                promises.push(externalContexts[plugin].open());
+            }
+        }
+        return when.all(promises);
     } else {
         noContextStorage = true;
+        return externalContexts["_"].open();
     }
 }
 
@@ -157,9 +168,6 @@ function createContext(id,seed) {
         var context = getContextStorage(storageName);
         return context.keys(scope);
     };
-    if(id === "global"){
-        externalContexts["_"].setGlobalContext(seed);
-    }
     return obj;
 }
 
@@ -210,10 +218,21 @@ function clean(flowConfig) {
     }
 }
 
+function close() {
+    var promises = [];
+    for(var plugin in externalContexts){
+        if(externalContexts.hasOwnProperty(plugin)){
+            promises.push(externalContexts[plugin].close());
+        }
+    }
+    return when.all(promises);
+}
+
 module.exports = {
     init: init,
     load: load,
     get: getContext,
     delete: deleteContext,
-    clean:clean
+    clean: clean,
+    close: close
 };
diff --git a/red/runtime/nodes/context/localfilesystem.js b/red/runtime/nodes/context/localfilesystem.js
index d18f4fd76..ee693dfd5 100644
--- a/red/runtime/nodes/context/localfilesystem.js
+++ b/red/runtime/nodes/context/localfilesystem.js
@@ -17,11 +17,10 @@
 var JsonDB = require('node-json-db');
 var fs = require('fs-extra');
 var path = require("path");
+var when = require("when");
 
 function createStorage(storageBaseDir, scope) {
-    var i = scope.indexOf(":")
-    
-    if(i === -1){
+    if(scope.indexOf(":") === -1){
         if(scope === "global"){
             return new JsonDB(path.join(storageBaseDir,"global",scope), true, true); 
         }else{ // scope:flow
@@ -69,6 +68,14 @@ function LocalFileSystem(config){
     this.storages = {};
 }
 
+LocalFileSystem.prototype.open = function(){
+    return when.resolve();
+}
+
+LocalFileSystem.prototype.close = function(){
+    return when.resolve();
+}
+
 LocalFileSystem.prototype.get = function (scope, key) {
     if(!this.storages[scope]){
         return undefined;
diff --git a/red/runtime/nodes/context/memory.js b/red/runtime/nodes/context/memory.js
index 617c850eb..278773ca6 100644
--- a/red/runtime/nodes/context/memory.js
+++ b/red/runtime/nodes/context/memory.js
@@ -15,11 +15,20 @@
  **/
 
 var util = require("../../util");
+var when = require("when");
 
 function Memory(config){
     this.data = {};
 }
 
+Memory.prototype.open = function(){
+    return when.resolve();
+};
+
+Memory.prototype.close = function(){
+    return when.resolve();
+};
+
 Memory.prototype.get = function(scope, key) {
     if(!this.data[scope]){
         return undefined;
@@ -49,14 +58,7 @@ Memory.prototype.keys = function(scope){
 
 Memory.prototype.delete = function(scope){
     delete this.data[scope];
-};
 
-Memory.prototype.open = function(){
-    return true;
-};
-
-Memory.prototype.close = function(){
-    delete this.data;
 };
 
 Memory.prototype.setGlobalContext= function(seed){
diff --git a/red/runtime/nodes/index.js b/red/runtime/nodes/index.js
index 139f62ffa..3321c87dc 100644
--- a/red/runtime/nodes/index.js
+++ b/red/runtime/nodes/index.js
@@ -219,5 +219,6 @@ module.exports = {
     getCredentialKeyType: credentials.getKeyType,
 
     // Contexts
-    loadContextsPlugin: context.load
+    loadContextsPlugin: context.load,
+    closeContextsPlugin: context.close
 };
diff --git a/test/red/runtime/index_spec.js b/test/red/runtime/index_spec.js
index d67c12ee1..c2adfa9c2 100644
--- a/test/red/runtime/index_spec.js
+++ b/test/red/runtime/index_spec.js
@@ -92,7 +92,7 @@ describe("runtime", function() {
             redNodesCleanModuleList = sinon.stub(redNodes,"cleanModuleList",function(){});
             redNodesLoadFlows = sinon.stub(redNodes,"loadFlows",function() {return when.resolve()});
             redNodesStartFlows = sinon.stub(redNodes,"startFlows",function() {});
-            redNodesLoadContextsPlugin = sinon.stub(redNodes,"loadContextsPlugin",function() {});
+            redNodesLoadContextsPlugin = sinon.stub(redNodes,"loadContextsPlugin",function() {return when.resolve()});
         });
         afterEach(function() {
             storageInit.restore();
@@ -186,7 +186,7 @@ describe("runtime", function() {
         });
 
         it("reports runtime metrics",function(done) {
-            var stopFlows = sinon.stub(redNodes,"stopFlows",function() {} );
+            var stopFlows = sinon.stub(redNodes,"stopFlows",function() { return when.resolve();} );
             redNodesGetNodeList = sinon.stub(redNodes,"getNodeList", function() {return []});
             logMetric.restore();
             logMetric = sinon.stub(log,"metric",function() { return true; });
@@ -217,10 +217,18 @@ describe("runtime", function() {
 
     });
 
-    it("stops components", function() {
-        var stopFlows = sinon.stub(redNodes,"stopFlows",function() {} );
-        runtime.stop();
-        stopFlows.called.should.be.true();
-        stopFlows.restore();
+    it("stops components", function(done) {
+        var stopFlows = sinon.stub(redNodes,"stopFlows",function() { return when.resolve();} );
+        var closeContextsPlugin = sinon.stub(redNodes,"closeContextsPlugin",function() { return when.resolve();} );
+        runtime.stop().then(function(){
+            stopFlows.called.should.be.true();
+            closeContextsPlugin.called.should.be.true();
+            done();
+        }).catch(function(err){
+            return done(err)
+        }).finally(function(){
+            stopFlows.restore();
+            closeContextsPlugin.restore();
+        });
     });
 });
diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index f9bf94d4d..0a4ec3174 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -16,18 +16,18 @@
 
 var should = require("should");
 var sinon = require('sinon');
-var path = require('path');
-var fs = require('fs-extra');
 var rewire = require("rewire");
 var Context = require("../../../../../red/runtime/nodes/context/index");
 
 describe('context', function() {
-    describe('localmemory',function() {
+    describe('local memory',function() {
         beforeEach(function() {
             Context.init({});
+            return Context.load();
         });
         afterEach(function() {
             Context.clean({allNodes:{}});
+            return Context.close();
         });
         it('stores local property',function() {
             var context1 = Context.get("1","flowA");
@@ -140,57 +140,261 @@ describe('context', function() {
             keys.should.have.length(2);
             keys[1].should.eql("abc");
         });
+
+        it('should store data on memory when contextStorage is not defined', function() {
+            var context =  Context.get("1","flow");
+            context.set("#nonexist.key1", "val1");
+            context.get("#nonexist.key1").should.eql("val1");
+            context.flow.set("#nonexist.key2", "val2");
+            context.flow.get("#nonexist.key2").should.eql("val2");
+            context.global.set("#nonexist.key1", "val3");
+            context.global.get("#nonexist.key1").should.eql("val3");
+        });
     });
 
     describe('external context storage',function() {
-        var testDir = path.join(__dirname,".testUserHome");
-        var context;
-        var stubGet = sinon.stub();
-        var stubSet = sinon.stub();
-        var stubKeys = sinon.stub();
-        var stubDelete = sinon.stub();
-        var contextStorage={
-            test:{
-                module: function(config){
-                    function Test(){}
-                    Test.prototype.get = stubGet;
-                    Test.prototype.set = stubSet;
-                    Test.prototype.keys = stubKeys;
-                    Test.prototype.delete = stubDelete;
-                    return new Test(config);
-                },
-                config:{}
-            }
-        };
+        describe('load modules',function(){
+            afterEach(function() {
+                Context.clean({allNodes:{}});
+                return Context.close();
+            });
 
-        afterEach(function(done) {
-            stubGet.reset();
-            stubSet.reset();
-            stubKeys.reset();
-            stubDelete.reset();
-            Context.clean({allNodes:{}});
-            fs.remove(testDir,done);
+            it('should load memory module', function() {
+                Context.init({contextStorage:{memory:{module:"memory"}}});
+                return Context.load();
+            });
+            it('should load localfilesystem module', function() {
+                Context.init({contextStorage:{file:{module:"localfilesystem"}}});
+                return Context.load();
+            });
+            it('should accept special storage name', function() {
+                Context.init({
+                    contextStorage:{
+                        "#%&":{module:"memory"},
+                        \u3042:{module:"memory"},
+                        1:{module:"memory"},
+                    }
+                });
+                return Context.load().then(function(){
+                    var context = Context.get("1","flow");
+                    context.set("##%&.sign","sign1");
+                    context.get("##%&.sign").should.eql("sign1");
+                    context.set("#\u3042.file2","file2");
+                    context.get("#\u3042.file2").should.eql("file2");
+                    context.set("#1.num","num3");
+                    context.get("#1.num").should.eql("num3");
+                });
+            });
+            it('should fail when using invalid default context', function(done) {
+                Context.init({contextStorage:{default:"noexist"}});
+                Context.load().then(function(){
+                    done("An error was not thrown");
+                }).catch(function(){
+                    done();
+                });
+            });
+            it('should fail for the storage with no module', function(done) {
+                Context.init({ contextStorage: { test: {}}});
+                Context.load().then(function(){
+                    done("An error was not thrown");
+                }).catch(function(){
+                    done();
+                });
+            });
+            it('should fail to load non-existent module', function(done) {
+                Context.init({contextStorage:{ file:{module:"nonexistent"} }});
+                Context.load().then(function(){
+                    done("An error was not thrown");
+                }).catch(function(){
+                    done();
+                });
+            });
         });
 
-        function initializeContext() {
-            Context.init({contextStorage:contextStorage});
-            Context.load();
-            context =  Context.get("1","flow");
-        }
-
-        describe('key name',function() {
-            var memoryStorage = {
-                memory: {
-                    module: "memory"
+        describe('store data',function() {
+            var sandbox = sinon.sandbox.create();
+            var stubGet = sandbox.stub();
+            var stubSet = sandbox.stub();
+            var stubKeys = sandbox.stub();
+            var stubDelete = sandbox.stub();
+            var stubOpen = sandbox.stub().returns(Promise.resolve());
+            var stubClose = sandbox.stub().returns(Promise.resolve());
+            var stubGet2 = sandbox.stub();
+            var stubSet2 = sandbox.stub();
+            var stubKeys2 = sandbox.stub();
+            var stubDelete2 = sandbox.stub();
+            var stubOpen2 = sandbox.stub().returns(Promise.resolve());
+            var stubClose2 = sandbox.stub().returns(Promise.resolve());
+            var testPlugin = function(config){
+                function Test(){}
+                Test.prototype.get = stubGet;
+                Test.prototype.set = stubSet;
+                Test.prototype.keys = stubKeys;
+                Test.prototype.delete = stubDelete;
+                Test.prototype.open = stubOpen;
+                Test.prototype.close = stubClose;
+                return new Test(config);
+            };
+            var testPlugin2 = function(config){
+                function Test2(){}
+                Test2.prototype.get = stubGet2;
+                Test2.prototype.set = stubSet2;
+                Test2.prototype.keys = stubKeys2;
+                Test2.prototype.delete = stubDelete2;
+                Test2.prototype.open = stubOpen2;
+                Test2.prototype.close = stubClose2;
+                return new Test2(config);
+            };
+            var contextStorage={
+                test:{
+                    module: testPlugin,
+                    config:{}
                 }
             };
+            var contextDefaultStorage={
+                default: {
+                    module: testPlugin2,
+                    config:{}
+                },
+                test:{
+                    module: testPlugin,
+                    config:{}
+                }
+            };
+
+            afterEach(function() {
+                sandbox.reset();
+                Context.clean({allNodes:{}});
+                return Context.close();
+            });
+    
+            it('should store local property to external context storage',function() {
+                Context.init({contextStorage:contextStorage});
+                return Context.load().then(function(){
+                    var context =  Context.get("1","flow");
+                    should.not.exist(context.get("#test.foo"));
+                    context.set("#test.foo","test");
+                    context.get("#test.foo");
+                    context.keys("#test");
+                    stubSet.calledWithExactly("1:flow","foo","test").should.be.true();
+                    stubGet.calledWithExactly("1:flow","foo").should.be.true();
+                    stubKeys.calledWithExactly("1:flow").should.be.true();
+                });
+            });
+            it('should store flow property to external context storage',function() {
+                Context.init({contextStorage:contextStorage});
+                return Context.load().then(function(){
+                    var context =  Context.get("1","flow");
+                    should.not.exist(context.flow.get("#test.foo"));
+                    context.flow.set("#test.foo","test");
+                    context.flow.get("#test.foo");
+                    context.flow.keys("#test");
+                    stubSet.calledWithExactly("flow","foo","test").should.be.true();
+                    stubGet.calledWithExactly("flow","foo").should.be.true();
+                    stubKeys.calledWithExactly("flow").should.be.true();
+                });
+            });
+            it('should store global property to external context storage',function() {
+                Context.init({contextStorage:contextStorage});
+                return Context.load().then(function(){
+                    var context =  Context.get("1","flow");
+                    should.not.exist(context.global.get("#test.foo"));
+                    context.global.set("#test.foo","test");
+                    context.global.get("#test.foo");
+                    context.global.keys("#test");
+                    stubSet.calledWithExactly("global","foo","test").should.be.true();
+                    stubGet.calledWithExactly("global","foo").should.be.true();
+                    stubKeys.calledWithExactly("global").should.be.true();
+                });
+            });
+            it('should store data to the default context when non-existent context storage was specified', function() {
+                Context.init({contextStorage:contextDefaultStorage});
+                return Context.load().then(function(){
+                    var context =  Context.get("1","flow");
+                    should.not.exist(context.get("#nonexist.foo"));
+                    context.set("#nonexist.foo","test");
+                    context.get("#nonexist.foo");
+                    context.keys("#nonexist");
+                    stubGet.called.should.be.false();
+                    stubSet.called.should.be.false();
+                    stubKeys.called.should.be.false();
+                    stubSet2.calledWithExactly("1:flow","foo","test").should.be.true();
+                    stubGet2.calledWithExactly("1:flow","foo").should.be.true();
+                    stubKeys2.calledWithExactly("1:flow").should.be.true();
+                });
+            });
+            it('should use the default context', function() {
+                Context.init({contextStorage:contextDefaultStorage});
+                return Context.load().then(function(){
+                    var context =  Context.get("1","flow");
+                    should.not.exist(context.get("#default.foo"));
+                    context.set("#default.foo","default");
+                    context.get("#default.foo");
+                    context.keys("#default");
+                    stubGet.called.should.be.false();
+                    stubSet.called.should.be.false();
+                    stubKeys.called.should.be.false();
+                    stubSet2.calledWithExactly("1:flow","foo","default").should.be.true();
+                    stubGet2.calledWithExactly("1:flow","foo").should.be.true();
+                    stubKeys2.calledWithExactly("1:flow").should.be.true();
+                });
+            });
+            it('should use the alias of default context', function() {
+                Context.init({contextStorage:contextDefaultStorage});
+                return Context.load().then(function(){
+                    var context =  Context.get("1","flow");
+                    should.not.exist(context.get("#.foo"));
+                    context.set("#.foo","alias");
+                    context.get("#.foo");
+                    context.keys("#");
+                    stubGet.called.should.be.false();
+                    stubSet.called.should.be.false();
+                    stubKeys.called.should.be.false();
+                    stubSet2.calledWithExactly("1:flow","foo","alias").should.be.true();
+                    stubGet2.calledWithExactly("1:flow","foo").should.be.true();
+                    stubKeys2.calledWithExactly("1:flow").should.be.true();
+                });
+            });
+            it('should throw an error using undefined storage for local context', function(done) {
+                Context.init({contextStorage:contextStorage});
+                Context.load().then(function(){
+                    var context =  Context.get("1","flow");
+                    context.get("#nonexist.local");
+                    should.fail(null, null, "An error was not thrown using undefined storage for local context");
+                }).catch(function(err) {
+                    if (err.name === "ContextError") {
+                        done();
+                    } else {
+                        done(err);
+                    }
+                });
+            });
+            it('should throw an error using undefined storage for flow context', function(done) {
+                Context.init({contextStorage:contextStorage});
+                Context.load().then(function(){
+                    var context =  Context.get("1","flow");
+                    context.flow.set("#nonexist.flow");
+                    should.fail(null, null, "An error was not thrown using undefined storage for flow context");
+                }).catch(function(err) {
+                    if (err.name === "ContextError") {
+                        done();
+                    } else {
+                        done(err);
+                    }
+                });
+            });
+        });
+
+        describe('key name',function() {
             beforeEach(function() {
-                Context.init({contextStorage:memoryStorage});
-                Context.load();
-                context =  Context.get("1","flow");
+                Context.init({contextStorage:{memory:{module:"memory"}}});
+                return Context.load().then(function(){
+                    context =  Context.get("1","flow");
+                });
             });
             afterEach(function() {
                 Context.clean({allNodes:{}});
+                return Context.close();
             });
             it('should work correctly with the valid key name',function() {
                 context.set("#memory.azAZ09#_","valid");
@@ -222,192 +426,6 @@ describe('context', function() {
                 }).should.throw();
             });
         });
-
-        describe('if external context storage exists',function() {
-            var contextDefaultStorage={
-                default: "test",
-                test:{
-                    module: function(config){
-                        function Test(){}
-                        Test.prototype.get = stubGet;
-                        Test.prototype.set = stubSet;
-                        Test.prototype.keys = stubKeys;
-                        Test.prototype.delete = stubDelete;
-                        return new Test(config);
-                    },
-                    config:{}
-                }
-            };
-
-            it('should store local property to external context storage',function() {
-                initializeContext();
-                should.not.exist(context.get("#test.foo"));
-                context.set("#test.foo","test");
-                context.get("#test.foo");
-                context.keys("#test");
-                stubGet.called.should.be.true();
-                stubSet.called.should.be.true();
-                stubKeys.called.should.be.true();
-            });
-            it('should store flow property to external context storage',function() {
-                initializeContext();
-                should.not.exist(context.flow.get("#test.foo"));
-                context.flow.set("#test.foo","test");
-                context.flow.get("#test.foo");
-                context.flow.keys("#test");
-                stubGet.called.should.be.true();
-                stubSet.called.should.be.true();
-                stubKeys.called.should.be.true();
-            });
-            it('should store global property to external context storage',function() {
-                initializeContext();
-                should.not.exist(context.global.get("#test.foo"));
-                context.global.set("#test.foo","test");
-                context.global.get("#test.foo");
-                context.global.keys("#test");
-                stubGet.called.should.be.true();
-                stubSet.called.should.be.true();
-                stubKeys.called.should.be.true();
-            });
-            it('should store data when non-existent context storage was specified', function() {
-                Context.init({contextStorage:contextDefaultStorage});
-                Context.load();
-                context =  Context.get("1","flow");
-                should.not.exist(context.get("#nonexist.foo"));
-                context.set("#nonexist.foo","test");
-                context.get("#nonexist.foo");
-                context.keys("#nonexist");
-                stubGet.called.should.be.true();
-                stubSet.called.should.be.true();
-                stubKeys.called.should.be.true();
-            });
-            it('should use the default context', function() {
-                Context.init({contextStorage:contextDefaultStorage});
-                Context.load();
-                context =  Context.get("1","flow");
-                should.not.exist(context.get("#default.foo"));
-                context.set("#default.foo","default");
-                context.get("#default.foo");
-                context.keys("#default");
-                stubGet.called.should.be.true();
-                stubSet.called.should.be.true();
-                stubKeys.called.should.be.true();
-            });
-            it('should use the alias of default context', function() {
-                Context.init({contextStorage:contextDefaultStorage});
-                Context.load();
-                context =  Context.get("1","flow");
-                should.not.exist(context.get("#.foo"));
-                context.set("#.foo","alias");
-                context.get("#.foo");
-                context.keys("#");
-                stubGet.called.should.be.true();
-                stubSet.called.should.be.true();
-                stubKeys.called.should.be.true();
-            });
-            it('should load memory module', function(done) {
-                Context.init({ contextStorage: { _: {}}});
-                try {
-                    Context.load();
-                    context.set("#_.foo","mem1");
-                    context.get("#_.foo").should.eql("mem1");
-                    var keys = context.keys("#_");
-                    keys.should.have.length(1);
-                    keys[0].should.eql("foo");
-                    done();
-                } catch (err) {
-                    done(err);
-                }
-            });
-            it('should load localfilesystem module', function(done) {
-                Context.init({contextStorage:{ file:{module:"localfilesystem"} }});
-                try {
-                    Context.load();
-                    done();
-                } catch (err) {
-                    done(err);
-                }
-            });
-            it('should accept special storage name', function(done) {
-                Context.init({
-                    contextStorage:{
-                        "#%&":{module:"memory"},
-                        \u3042:{module:"memory"},
-                        1:{module:"memory"},
-                    }
-                });
-                try {
-                    Context.load();
-                    context.set("##%&.sign","sign1");
-                    context.get("##%&.sign").should.eql("sign1");
-                    context.set("#\u3042.file2","file2");
-                    context.get("#\u3042.file2").should.eql("file2");
-                    context.set("#1.num","num3");
-                    context.get("#1.num").should.eql("num3");
-                    done();
-                } catch (err) {
-                    done(err);
-                }
-            });
-        });
-
-        describe('if external context storage does not exist',function() {
-            it('should throw an error using undefined storage for local context', function(done) {
-                initializeContext();
-                try {
-                    context.get("#nonexist.local");
-                    should.fail(null, null, "An error was not thrown using undefined storage for local context");
-                } catch (err) {
-                    if (err.name === "ContextError") {
-                        done();
-                    } else {
-                        done(err);
-                    }
-                }
-            });
-            it('should throw an error using undefined storage for flow context', function(done) {
-                initializeContext();
-                try {
-                    context.flow.set("#nonexist.flow");
-                    should.fail(null, null, "An error was not thrown using undefined storage for flow context");
-                } catch (err) {
-                    if (err.name === "ContextError") {
-                        done();
-                    } else {
-                        done(err);
-                    }
-                }
-            });
-            it('should fail when using invalid default context', function() {
-                Context.init({contextStorage:{default:"noexist"}});
-                (function() {
-                    Context.load();
-                }).should.throw();
-            });
-            it('should store data on memory when contextStorage is not defined', function() {
-                Context.init({});
-                Context.load();
-                context =  Context.get("1","flow");
-                context.set("#nonexist.key1", "val1");
-                context.get("#nonexist.key1").should.eql("val1");
-                context.flow.set("#nonexist.key2", "val2");
-                context.flow.get("#nonexist.key2").should.eql("val2");
-                context.global.set("#nonexist.key1", "val3");
-                context.global.get("#nonexist.key1").should.eql("val3");
-            });
-            it('should fail for the storage with no module', function() {
-                Context.init({ contextStorage: { test: {}}});
-                (function() {
-                    Context.load();
-                }).should.throw();
-            });
-            it('should fail to load non-existent module', function() {
-                Context.init({contextStorage:{ file:{module:"nonexistent"} }});
-                (function() {
-                    Context.load();
-                }).should.throw();
-            });
-        });
     });
 
     describe('#parseKey()', function() {
diff --git a/test/red/runtime/nodes/context/localfilesystem_spec.js b/test/red/runtime/nodes/context/localfilesystem_spec.js
index f5866d338..fae96bcd4 100644
--- a/test/red/runtime/nodes/context/localfilesystem_spec.js
+++ b/test/red/runtime/nodes/context/localfilesystem_spec.js
@@ -17,6 +17,7 @@
 var should = require('should');
 var fs = require('fs-extra');
 var path = require("path");
+var when = require("when");
 var LocalFileSystem = require('../../../../../red/runtime/nodes/context/localfilesystem');
 
 var resourcesDir = path.resolve(path.join(__dirname,"..","resources","context"));
@@ -26,11 +27,12 @@ describe('localfilesystem',function() {
 
     beforeEach(function() {
         context = LocalFileSystem({dir: resourcesDir});
+        return context.open();
     });
 
-    afterEach(function(done) {
-        fs.remove(resourcesDir).then(function(result){
-            return done(result);
+    afterEach(function() {
+        return context.close().then(function(){
+            return fs.remove(resourcesDir);
         });
     });
 

From f2623484970aa612a933fa8c8f0df8e8d2a8ee37 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Wed, 30 May 2018 15:23:34 +0900
Subject: [PATCH 062/113] Add clean to context plugin and don't delete local
 context unless the context is deleted by a user

---
 red/runtime/nodes/Node.js                     |   4 +-
 red/runtime/nodes/context/index.js            |  40 ++--
 red/runtime/nodes/context/localfilesystem.js  |  36 ++--
 red/runtime/nodes/context/memory.js           |  14 +-
 red/runtime/nodes/flows/index.js              |   9 +-
 test/red/runtime/nodes/context/index_spec.js  | 183 ++++++++++++------
 .../nodes/context/localfilesystem_spec.js     |  40 +++-
 test/red/runtime/nodes/context/memory_spec.js |  41 +++-
 8 files changed, 260 insertions(+), 107 deletions(-)

diff --git a/red/runtime/nodes/Node.js b/red/runtime/nodes/Node.js
index b8cfa6532..308d30125 100644
--- a/red/runtime/nodes/Node.js
+++ b/red/runtime/nodes/Node.js
@@ -105,12 +105,12 @@ Node.prototype.close = function(removed) {
     if (promises.length > 0) {
         return when.settle(promises).then(function() {
             if (this._context) {
-                 context.delete(this._alias||this.id,this.z);
+               return context.delete(this._alias||this.id,this.z);
             }
         });
     } else {
         if (this._context) {
-             context.delete(this._alias||this.id,this.z);
+            return context.delete(this._alias||this.id,this.z);
         }
         return;
     }
diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index 80fe2c774..4a3f6c3d5 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -70,6 +70,11 @@ function load() {
                 return when.reject(new Error(log._("context.error-module-not-defined", {storage:pluginName})));
             }
         }
+        for(var plugin in externalContexts){
+            if(externalContexts.hasOwnProperty(plugin)){
+                promises.push(externalContexts[plugin].open());
+            }
+        }
         if(isAlias){
             if(externalContexts.hasOwnProperty(plugins["default"])){
                 externalContexts["default"] =  externalContexts[plugins["default"]];
@@ -77,11 +82,6 @@ function load() {
                 return when.reject(new Error(log._("context.error-invalid-default-module", {storage:plugins["default"]})));
             }
         }
-        for(var plugin in externalContexts){
-            if(externalContexts.hasOwnProperty(plugin)){
-                promises.push(externalContexts[plugin].open());
-            }
-        }
         return when.all(promises);
     } else {
         noContextStorage = true;
@@ -191,31 +191,35 @@ function getContext(localId,flowId) {
 }
 
 function deleteContext(id,flowId) {
-    var contextId = id;
-    if (flowId) {
-        contextId = id+":"+flowId;
+    if(noContextStorage){
+        var promises = [];
+        var contextId = id;
+        if (flowId) {
+            contextId = id+":"+flowId;
+        }
+        delete contexts[contextId];
+        return externalContexts["_"].delete(contextId);
+    }else{
+        return when.resolve();
     }
-    for(var plugin in externalContexts){
-        externalContexts[plugin].delete(contextId);
-    }
-    delete contexts[contextId];
 }
 
 function clean(flowConfig) {
-    var activeIds = {};
-    var contextId;
-    var node;
+    var promises = [];
+    for(var plugin in externalContexts){
+        if(externalContexts.hasOwnProperty(plugin)){
+            promises.push(externalContexts[plugin].clean(Object.keys(flowConfig.allNodes)));
+        }
+    }
     for (var id in contexts) {
         if (contexts.hasOwnProperty(id)) {
             var idParts = id.split(":");
             if (!flowConfig.allNodes.hasOwnProperty(idParts[0])) {
-                for(var plugin in externalContexts){
-                    externalContexts[plugin].delete(id);
-                }
                 delete contexts[id];
             }
         }
     }
+    return when.all(promises);
 }
 
 function close() {
diff --git a/red/runtime/nodes/context/localfilesystem.js b/red/runtime/nodes/context/localfilesystem.js
index ee693dfd5..2cffe7d96 100644
--- a/red/runtime/nodes/context/localfilesystem.js
+++ b/red/runtime/nodes/context/localfilesystem.js
@@ -78,7 +78,7 @@ LocalFileSystem.prototype.close = function(){
 
 LocalFileSystem.prototype.get = function (scope, key) {
     if(!this.storages[scope]){
-        return undefined;
+        this.storages[scope] = createStorage(this.storageBaseDir ,scope);
     }
     try{
         this.storages[scope].reload();
@@ -105,28 +105,38 @@ LocalFileSystem.prototype.set = function(scope, key, value) {
 
 LocalFileSystem.prototype.keys = function(scope) {
     if(!this.storages[scope]){
-        return [];
+        this.storages[scope] = createStorage(this.storageBaseDir ,scope);
     }
     return Object.keys(this.storages[scope].getData("/"));
 }
 
 LocalFileSystem.prototype.delete = function(scope){
+    var self = this;
     if(this.storages[scope]){
+        var promise;
         this.storages[scope].delete("/");
-        if(scope.indexOf(":") === -1){
-            fs.removeSync(path.dirname(this.storages[scope].filename));
-        }else{
-            try{
-                fs.statSync(this.storages[scope].filename);
-                fs.unlinkSync(this.storages[scope].filename);
-            }catch(err){
-                    console.log("deleted");
-            }
-        }
-        delete this.storages[scope];
+        return fs.remove(this.storages[scope].filename).then(function(){
+            delete self.storages[scope];
+            return when.resolve();
+        });
+    }else{
+        return when.resolve();
     }
 }
 
+LocalFileSystem.prototype.clean = function(activeNodes){
+    var self = this;
+    return fs.readdir(self.storageBaseDir).then(function(dirs){
+        return when.all(dirs.reduce(function(result, item){
+            if(item !== "global" && !activeNodes.includes(item)){
+                result.push(fs.remove(path.join(self.storageBaseDir,item)));
+                delete self.storages[item];
+            }
+            return result;
+        },[]));
+    });
+ }
+
 module.exports = function(config){
     return new LocalFileSystem(config);
 };
diff --git a/red/runtime/nodes/context/memory.js b/red/runtime/nodes/context/memory.js
index 278773ca6..ba86d086d 100644
--- a/red/runtime/nodes/context/memory.js
+++ b/red/runtime/nodes/context/memory.js
@@ -58,9 +58,21 @@ Memory.prototype.keys = function(scope){
 
 Memory.prototype.delete = function(scope){
     delete this.data[scope];
-
+    return Promise.resolve();
 };
 
+Memory.prototype.clean = function(activeNodes){
+    for(var id in this.data){
+        if(this.data.hasOwnProperty(id) && id !== "global"){
+            var idParts = id.split(":");
+            if(!activeNodes.includes(idParts[0])){
+                delete this.data[id];
+            }
+        }
+    }
+    return Promise.resolve();
+}
+
 Memory.prototype.setGlobalContext= function(seed){
     this.data["global"] = seed;
 };
diff --git a/red/runtime/nodes/flows/index.js b/red/runtime/nodes/flows/index.js
index 1b2a87ac0..0f12e4746 100644
--- a/red/runtime/nodes/flows/index.js
+++ b/red/runtime/nodes/flows/index.js
@@ -160,11 +160,12 @@ function setFlows(_config,type,muteLog,forceStart) {
             activeFlowConfig = newFlowConfig;
             if (forceStart || started) {
                 return stop(type,diff,muteLog).then(function() {
-                    context.clean(activeFlowConfig);
-                    start(type,diff,muteLog).then(function() {
-                        events.emit("runtime-event",{id:"runtime-deploy",payload:{revision:flowRevision},retain: true});
+                    return context.clean(activeFlowConfig).then(function() {
+                        start(type,diff,muteLog).then(function() {
+                            events.emit("runtime-event",{id:"runtime-deploy",payload:{revision:flowRevision},retain: true});
+                        });
+                        return flowRevision;
                     });
-                    return flowRevision;
                 }).catch(function(err) {
                 })
             } else {
diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index 0a4ec3174..fa048aa31 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -118,9 +118,10 @@ describe('context', function() {
             context.set("foo","abc");
             context.get("foo").should.eql("abc");
 
-            Context.delete("1","flowA");
-            context = Context.get("1","flowA");
-            should.not.exist(context.get("foo"));
+            return Context.delete("1","flowA").then(function(){
+                context = Context.get("1","flowA");
+                should.not.exist(context.get("foo"));                
+            });
         });
 
         it('enumerates context keys', function() {
@@ -153,12 +154,75 @@ describe('context', function() {
     });
 
     describe('external context storage',function() {
-        describe('load modules',function(){
-            afterEach(function() {
-                Context.clean({allNodes:{}});
+        var sandbox = sinon.sandbox.create();
+        var stubGet = sandbox.stub();
+        var stubSet = sandbox.stub();
+        var stubKeys = sandbox.stub();
+        var stubDelete = sandbox.stub().returns(Promise.resolve());
+        var stubClean = sandbox.stub().returns(Promise.resolve());
+        var stubOpen = sandbox.stub().returns(Promise.resolve());
+        var stubClose = sandbox.stub().returns(Promise.resolve());
+        var stubGet2 = sandbox.stub();
+        var stubSet2 = sandbox.stub();
+        var stubKeys2 = sandbox.stub();
+        var stubDelete2 = sandbox.stub().returns(Promise.resolve());
+        var stubClean2 = sandbox.stub().returns(Promise.resolve());
+        var stubOpen2 = sandbox.stub().returns(Promise.resolve());
+        var stubClose2 = sandbox.stub().returns(Promise.resolve());
+        var testPlugin = function(config){
+            function Test(){}
+            Test.prototype.get = stubGet;
+            Test.prototype.set = stubSet;
+            Test.prototype.keys = stubKeys;
+            Test.prototype.delete = stubDelete;
+            Test.prototype.clean = stubClean;
+            Test.prototype.open = stubOpen;
+            Test.prototype.close = stubClose;
+            return new Test(config);
+        };
+        var testPlugin2 = function(config){
+            function Test2(){}
+            Test2.prototype.get = stubGet2;
+            Test2.prototype.set = stubSet2;
+            Test2.prototype.keys = stubKeys2;
+            Test2.prototype.delete = stubDelete2;
+            Test2.prototype.clean = stubClean2;
+            Test2.prototype.open = stubOpen2;
+            Test2.prototype.close = stubClose2;
+            return new Test2(config);
+        };
+        var contextStorage={
+            test:{
+                module: testPlugin,
+                config:{}
+            }
+        };
+        var contextDefaultStorage={
+            default: {
+                module: testPlugin2,
+                config:{}
+            },
+            test:{
+                module: testPlugin,
+                config:{}
+            }
+        };
+
+        afterEach(function() {
+            sandbox.reset();
+            return Context.clean({allNodes:{}}).then(function(){
                 return Context.close();
             });
-
+        });
+    
+        describe('load modules',function(){
+            it('should call open()', function() {
+                Context.init({contextStorage:contextDefaultStorage});
+                return Context.load().then(function(){
+                    stubOpen.called.should.be.true();
+                    stubOpen2.called.should.be.true();
+                });
+            });
             it('should load memory module', function() {
                 Context.init({contextStorage:{memory:{module:"memory"}}});
                 return Context.load();
@@ -185,6 +249,18 @@ describe('context', function() {
                     context.get("#1.num").should.eql("num3");
                 });
             });
+            it('should ignore reserved storage name `_`', function() {
+                Context.init({contextStorage:{_:{module:testPlugin}}});
+                return Context.load().then(function(){
+                    var context = Context.get("1","flow");
+                    context.set("#_.foo","bar");
+                    context.get("#_.foo");
+                    context.keys("#_");
+                    stubSet.called.should.be.false();
+                    stubGet.called.should.be.false();
+                    stubKeys.called.should.be.false();
+                });
+            });
             it('should fail when using invalid default context', function(done) {
                 Context.init({contextStorage:{default:"noexist"}});
                 Context.load().then(function(){
@@ -211,63 +287,19 @@ describe('context', function() {
             });
         });
 
-        describe('store data',function() {
-            var sandbox = sinon.sandbox.create();
-            var stubGet = sandbox.stub();
-            var stubSet = sandbox.stub();
-            var stubKeys = sandbox.stub();
-            var stubDelete = sandbox.stub();
-            var stubOpen = sandbox.stub().returns(Promise.resolve());
-            var stubClose = sandbox.stub().returns(Promise.resolve());
-            var stubGet2 = sandbox.stub();
-            var stubSet2 = sandbox.stub();
-            var stubKeys2 = sandbox.stub();
-            var stubDelete2 = sandbox.stub();
-            var stubOpen2 = sandbox.stub().returns(Promise.resolve());
-            var stubClose2 = sandbox.stub().returns(Promise.resolve());
-            var testPlugin = function(config){
-                function Test(){}
-                Test.prototype.get = stubGet;
-                Test.prototype.set = stubSet;
-                Test.prototype.keys = stubKeys;
-                Test.prototype.delete = stubDelete;
-                Test.prototype.open = stubOpen;
-                Test.prototype.close = stubClose;
-                return new Test(config);
-            };
-            var testPlugin2 = function(config){
-                function Test2(){}
-                Test2.prototype.get = stubGet2;
-                Test2.prototype.set = stubSet2;
-                Test2.prototype.keys = stubKeys2;
-                Test2.prototype.delete = stubDelete2;
-                Test2.prototype.open = stubOpen2;
-                Test2.prototype.close = stubClose2;
-                return new Test2(config);
-            };
-            var contextStorage={
-                test:{
-                    module: testPlugin,
-                    config:{}
-                }
-            };
-            var contextDefaultStorage={
-                default: {
-                    module: testPlugin2,
-                    config:{}
-                },
-                test:{
-                    module: testPlugin,
-                    config:{}
-                }
-            };
-
-            afterEach(function() {
-                sandbox.reset();
-                Context.clean({allNodes:{}});
-                return Context.close();
+        describe('close modules',function(){
+            it('should call close()', function() {
+                Context.init({contextStorage:contextDefaultStorage});
+                return Context.load().then(function(){
+                    return Context.close().then(function(){
+                        stubClose.called.should.be.true();
+                        stubClose2.called.should.be.true();
+                    });
+                });
             });
-    
+        });
+
+        describe('store context',function() {
             it('should store local property to external context storage',function() {
                 Context.init({contextStorage:contextStorage});
                 return Context.load().then(function(){
@@ -385,6 +417,31 @@ describe('context', function() {
             });
         });
 
+        describe('delete context',function(){
+            it('should not call delete()', function() {
+                Context.init({contextStorage:contextDefaultStorage});
+                return Context.load().then(function(){
+                    Context.get("flowA");
+                    return Context.delete("flowA").then(function(){
+                        stubDelete.called.should.be.false();
+                        stubDelete2.called.should.be.false();
+                    });
+                });
+            });
+        });
+
+        describe('clean context',function(){
+            it('should call clean()', function() {
+                Context.init({contextStorage:contextDefaultStorage});
+                return Context.load().then(function(){
+                    return Context.clean({allNodes:{}}).then(function(){
+                        stubClean.calledWithExactly([]).should.be.true();
+                        stubClean2.calledWithExactly([]).should.be.true();
+                    });
+                });
+            });
+        });
+
         describe('key name',function() {
             beforeEach(function() {
                 Context.init({contextStorage:{memory:{module:"memory"}}});
diff --git a/test/red/runtime/nodes/context/localfilesystem_spec.js b/test/red/runtime/nodes/context/localfilesystem_spec.js
index fae96bcd4..77a6c440d 100644
--- a/test/red/runtime/nodes/context/localfilesystem_spec.js
+++ b/test/red/runtime/nodes/context/localfilesystem_spec.js
@@ -31,8 +31,10 @@ describe('localfilesystem',function() {
     });
 
     afterEach(function() {
-        return context.close().then(function(){
-            return fs.remove(resourcesDir);
+        return context.clean([]).then(function(){
+            return context.close().then(function(){
+                return fs.remove(resourcesDir);
+            });
         });
     });
 
@@ -118,9 +120,39 @@ describe('localfilesystem',function() {
             context.get("nodeX","foo").should.eql("abc");
             context.get("nodeY","foo").should.eql("abc");
 
-            context.delete("nodeX");
+            return context.delete("nodeX").then(function(){
+                should.not.exist(context.get("nodeX","foo"));
+                should.exist(context.get("nodeY","foo"));  
+            })
+        });
+    });
+
+    describe('#clean',function() {
+        it('should clean unnecessary context',function() {
             should.not.exist(context.get("nodeX","foo"));
-            should.exist(context.get("nodeY","foo"));
+            should.not.exist(context.get("nodeY","foo"));
+            context.set("nodeX","foo","abc");
+            context.set("nodeY","foo","abc");
+            context.get("nodeX","foo").should.eql("abc");
+            context.get("nodeY","foo").should.eql("abc");
+
+            return context.clean([]).then(function(){
+                should.not.exist(context.get("nodeX","foo"));
+                should.not.exist(context.get("nodeY","foo"));
+            });
+        });
+        it('should not clean active context',function() {
+            should.not.exist(context.get("nodeX","foo"));
+            should.not.exist(context.get("nodeY","foo"));
+            context.set("nodeX","foo","abc");
+            context.set("nodeY","foo","abc");
+            context.get("nodeX","foo").should.eql("abc");
+            context.get("nodeY","foo").should.eql("abc");
+
+            return context.clean(["nodeX"]).then(function(){
+                should.exist(context.get("nodeX","foo"));
+                should.not.exist(context.get("nodeY","foo"));
+            });
         });
     });
 });
\ No newline at end of file
diff --git a/test/red/runtime/nodes/context/memory_spec.js b/test/red/runtime/nodes/context/memory_spec.js
index 953529e38..8da35be19 100644
--- a/test/red/runtime/nodes/context/memory_spec.js
+++ b/test/red/runtime/nodes/context/memory_spec.js
@@ -22,6 +22,13 @@ describe('memory',function() {
 
     beforeEach(function() {
         context = Memory({});
+        return context.open();
+    });
+
+    afterEach(function() {
+        return context.clean([]).then(function(){
+            return context.close();
+        });
     });
 
     describe('#get/set',function() {
@@ -120,9 +127,39 @@ describe('memory',function() {
             context.get("nodeX","foo").should.eql("abc");
             context.get("nodeY","foo").should.eql("abc");
 
-            context.delete("nodeX");
+            return context.delete("nodeX").then(function(){
+                should.not.exist(context.get("nodeX","foo"));
+                should.exist(context.get("nodeY","foo"));
+            });
+        });
+    });
+
+    describe('#clean',function() {
+        it('should clean unnecessary context',function() {
             should.not.exist(context.get("nodeX","foo"));
-            should.exist(context.get("nodeY","foo"));
+            should.not.exist(context.get("nodeY","foo"));
+            context.set("nodeX","foo","abc");
+            context.set("nodeY","foo","abc");
+            context.get("nodeX","foo").should.eql("abc");
+            context.get("nodeY","foo").should.eql("abc");
+
+            return context.clean([]).then(function(){
+                should.not.exist(context.get("nodeX","foo"));
+                should.not.exist(context.get("nodeY","foo"));
+            });
+        });
+        it('should not clean active context',function() {
+            should.not.exist(context.get("nodeX","foo"));
+            should.not.exist(context.get("nodeY","foo"));
+            context.set("nodeX","foo","abc");
+            context.set("nodeY","foo","abc");
+            context.get("nodeX","foo").should.eql("abc");
+            context.get("nodeY","foo").should.eql("abc");
+
+            return context.clean(["nodeX"]).then(function(){
+                should.exist(context.get("nodeX","foo"));
+                should.not.exist(context.get("nodeY","foo"));
+            });
         });
     });
 

From c48c74f173af65163d4a6397abca4e0e188b3912 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Thu, 31 May 2018 09:46:54 +0900
Subject: [PATCH 063/113] Delete unused variables

---
 red/runtime/nodes/context/index.js           | 3 ---
 red/runtime/nodes/context/localfilesystem.js | 1 -
 2 files changed, 4 deletions(-)

diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index 4a3f6c3d5..d1bf32be3 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -15,7 +15,6 @@
  **/
 
 var clone = require("clone");
-var util = require("../../util");
 var log = require("../../log");
 var when = require("when");
 
@@ -163,7 +162,6 @@ function createContext(id,seed) {
         return context.set(scope, keyPath.key, value);
     };
     obj.keys = function(storage) {
-        //TODO: discuss about keys() behavior
         var storageName = parseStorage(storage);
         var context = getContextStorage(storageName);
         return context.keys(scope);
@@ -192,7 +190,6 @@ function getContext(localId,flowId) {
 
 function deleteContext(id,flowId) {
     if(noContextStorage){
-        var promises = [];
         var contextId = id;
         if (flowId) {
             contextId = id+":"+flowId;
diff --git a/red/runtime/nodes/context/localfilesystem.js b/red/runtime/nodes/context/localfilesystem.js
index 2cffe7d96..60098cc91 100644
--- a/red/runtime/nodes/context/localfilesystem.js
+++ b/red/runtime/nodes/context/localfilesystem.js
@@ -113,7 +113,6 @@ LocalFileSystem.prototype.keys = function(scope) {
 LocalFileSystem.prototype.delete = function(scope){
     var self = this;
     if(this.storages[scope]){
-        var promise;
         this.storages[scope].delete("/");
         return fs.remove(this.storages[scope].filename).then(function(){
             delete self.storages[scope];

From 16715673c3a3b95c8f61f547e4352898ce77063b Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Thu, 31 May 2018 09:47:21 +0900
Subject: [PATCH 064/113] Add test case

---
 test/red/runtime/nodes/context/index_spec.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index fa048aa31..c4bfa12ed 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -142,6 +142,16 @@ describe('context', function() {
             keys[1].should.eql("abc");
         });
 
+        it('should enumerate only context keys when GlobalContext was given', function() {
+            Context.init({functionGlobalContext: {foo:"bar"}});
+            return Context.load().then(function(){
+                var context = Context.get("1","flowA");
+                var keys = context.global.keys("global");
+                keys.should.have.length(1);
+                keys[0].should.eql("foo");
+            });
+        });
+
         it('should store data on memory when contextStorage is not defined', function() {
             var context =  Context.get("1","flow");
             context.set("#nonexist.key1", "val1");

From a835f9f0cb0c009f5fead2840155b82b8ec5e079 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Thu, 31 May 2018 14:09:36 +0900
Subject: [PATCH 065/113] Fix ENOENT error in LocalFileSystem.clean()

---
 red/runtime/nodes/context/localfilesystem.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/red/runtime/nodes/context/localfilesystem.js b/red/runtime/nodes/context/localfilesystem.js
index 60098cc91..4909f9c14 100644
--- a/red/runtime/nodes/context/localfilesystem.js
+++ b/red/runtime/nodes/context/localfilesystem.js
@@ -133,6 +133,12 @@ LocalFileSystem.prototype.clean = function(activeNodes){
             }
             return result;
         },[]));
+    }).catch(function(err){
+        if(err.code == 'ENOENT') {
+            return when.resolve();
+        }else{
+            return when.reject(err);
+        }
     });
  }
 

From 6e34f0697c8e6787eda0b4e2e45101924d01d6d5 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Fri, 1 Jun 2018 11:44:45 +0900
Subject: [PATCH 066/113] Allow .get/set/keys to return asynchronous results

---
 red/runtime/nodes/context/index.js           | 35 +++++++++++++++++---
 red/runtime/nodes/context/localfilesystem.js | 12 +++++++
 red/runtime/nodes/context/memory.js          | 14 +++++++-
 3 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index d1bf32be3..57fc3a747 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -118,7 +118,7 @@ function parseKey(key) {
     }
     var keyPath = { storage: "", key: "" };
     var indexDot = key.indexOf(".");
-    // The key of "$file" should be treated as a key without persistable context.
+    // The key of "#file" should be treated as a key without persistable context.
     if (indexDot != -1) {
         keyPath.storage = parseStorage(key);
     }
@@ -154,17 +154,44 @@ function createContext(id,seed) {
     obj.get = function(key) {
         var keyPath = parseKey(key);
         var context = getContextStorage(keyPath.storage);
-        return context.get(scope, keyPath.key);
+        if(key === keyPath.key){
+            return context.get(scope, keyPath.key);
+        }else{
+            return context.getAsync(scope, keyPath.key);
+        }
     };
     obj.set = function(key, value) {
         var keyPath = parseKey(key);
         var context = getContextStorage(keyPath.storage);
-        return context.set(scope, keyPath.key, value);
+        if(key === keyPath.key){
+            return context.set(scope, keyPath.key, value);
+        }else{
+            return context.setAsync(scope, keyPath.key, value);
+        }
     };
     obj.keys = function(storage) {
         var storageName = parseStorage(storage);
         var context = getContextStorage(storageName);
-        return context.keys(scope);
+        if(!storage){
+            return context.keys(scope);
+        }else{
+            return context.keysAsync(scope);
+        }
+    };
+    obj.getAsync = function(key) {
+        var keyPath = parseKey(key);
+        var context = getContextStorage(keyPath.storage);
+        return context.getAsync(scope, keyPath.key);
+    };
+    obj.setAsync = function(key, value) {
+        var keyPath = parseKey(key);
+        var context = getContextStorage(keyPath.storage);
+        return context.setAsync(scope, keyPath.key, value);
+    };
+    obj.keysAsync = function(storage) {
+        var storageName = parseStorage(storage);
+        var context = getContextStorage(storageName);
+        return context.keysAsync(scope);
     };
     return obj;
 }
diff --git a/red/runtime/nodes/context/localfilesystem.js b/red/runtime/nodes/context/localfilesystem.js
index 4909f9c14..730f0020c 100644
--- a/red/runtime/nodes/context/localfilesystem.js
+++ b/red/runtime/nodes/context/localfilesystem.js
@@ -110,6 +110,18 @@ LocalFileSystem.prototype.keys = function(scope) {
     return Object.keys(this.storages[scope].getData("/"));
 }
 
+LocalFileSystem.prototype.getAsync = function(scope, key) {
+    return when.resolve(this.get(scope, key));
+};
+
+LocalFileSystem.prototype.setAsync =function(scope, key, value) {
+    return when.resolve(this.set(scope, key, value));
+};
+
+LocalFileSystem.prototype.keysAsync = function(scope){
+    return when.resolve(this.keys(scope));
+};
+
 LocalFileSystem.prototype.delete = function(scope){
     var self = this;
     if(this.storages[scope]){
diff --git a/red/runtime/nodes/context/memory.js b/red/runtime/nodes/context/memory.js
index ba86d086d..1d9711094 100644
--- a/red/runtime/nodes/context/memory.js
+++ b/red/runtime/nodes/context/memory.js
@@ -51,11 +51,23 @@ Memory.prototype.keys = function(scope){
         return Object.keys(this.data[scope]);
     } else {
         return Object.keys(this.data[scope]).filter(function (key) {
-            return key !== "set" && key !== "get" && key !== "keys";
+            return key !== "set" && key !== "get" && key !== "keys" && key !== "setAsync" && key !== "getAsync" && key !== "keysAsync";
         });
     }
 };
 
+Memory.prototype.getAsync = function(scope, key) {
+    return when.resolve(this.get(scope, key));
+};
+
+Memory.prototype.setAsync =function(scope, key, value) {
+    return when.resolve(this.set(scope, key, value));
+};
+
+Memory.prototype.keysAsync = function(scope){
+    return when.resolve(this.keys(scope));
+};
+
 Memory.prototype.delete = function(scope){
     delete this.data[scope];
     return Promise.resolve();

From fbe0e2d6ebfc5e208c7a493a8c1e76eef469feda Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Fri, 1 Jun 2018 19:21:41 +0900
Subject: [PATCH 067/113] Delete async function in context/index

---
 red/runtime/nodes/context/index.js | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index 57fc3a747..02f5a933d 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -178,21 +178,6 @@ function createContext(id,seed) {
             return context.keysAsync(scope);
         }
     };
-    obj.getAsync = function(key) {
-        var keyPath = parseKey(key);
-        var context = getContextStorage(keyPath.storage);
-        return context.getAsync(scope, keyPath.key);
-    };
-    obj.setAsync = function(key, value) {
-        var keyPath = parseKey(key);
-        var context = getContextStorage(keyPath.storage);
-        return context.setAsync(scope, keyPath.key, value);
-    };
-    obj.keysAsync = function(storage) {
-        var storageName = parseStorage(storage);
-        var context = getContextStorage(storageName);
-        return context.keysAsync(scope);
-    };
     return obj;
 }
 

From 7aced85a310f5ba31dc92f5eca62cb9e211ea198 Mon Sep 17 00:00:00 2001
From: Hiroki Uchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Mon, 4 Jun 2018 13:04:56 +0900
Subject: [PATCH 068/113] Use Array.indexOf() instead of Array.includes()

---
 red/runtime/nodes/context/localfilesystem.js | 2 +-
 red/runtime/nodes/context/memory.js          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/red/runtime/nodes/context/localfilesystem.js b/red/runtime/nodes/context/localfilesystem.js
index 730f0020c..914b62995 100644
--- a/red/runtime/nodes/context/localfilesystem.js
+++ b/red/runtime/nodes/context/localfilesystem.js
@@ -139,7 +139,7 @@ LocalFileSystem.prototype.clean = function(activeNodes){
     var self = this;
     return fs.readdir(self.storageBaseDir).then(function(dirs){
         return when.all(dirs.reduce(function(result, item){
-            if(item !== "global" && !activeNodes.includes(item)){
+            if(item !== "global" && activeNodes.indexOf(item) === -1){
                 result.push(fs.remove(path.join(self.storageBaseDir,item)));
                 delete self.storages[item];
             }
diff --git a/red/runtime/nodes/context/memory.js b/red/runtime/nodes/context/memory.js
index 1d9711094..422b1b9f2 100644
--- a/red/runtime/nodes/context/memory.js
+++ b/red/runtime/nodes/context/memory.js
@@ -77,7 +77,7 @@ Memory.prototype.clean = function(activeNodes){
     for(var id in this.data){
         if(this.data.hasOwnProperty(id) && id !== "global"){
             var idParts = id.split(":");
-            if(!activeNodes.includes(idParts[0])){
+            if(!activeNodes.indexOf(idParts[0])){
                 delete this.data[id];
             }
         }

From f44487338dec72b6eee63874f70bf717c19d7c29 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Wed, 6 Jun 2018 18:46:32 +0900
Subject: [PATCH 069/113] Fix a wrong statement

---
 red/runtime/nodes/context/memory.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/red/runtime/nodes/context/memory.js b/red/runtime/nodes/context/memory.js
index 422b1b9f2..74a8a4380 100644
--- a/red/runtime/nodes/context/memory.js
+++ b/red/runtime/nodes/context/memory.js
@@ -77,7 +77,7 @@ Memory.prototype.clean = function(activeNodes){
     for(var id in this.data){
         if(this.data.hasOwnProperty(id) && id !== "global"){
             var idParts = id.split(":");
-            if(!activeNodes.indexOf(idParts[0])){
+            if(activeNodes.indexOf(idParts[0]) === -1){
                 delete this.data[id];
             }
         }

From ed1d34e6788c5a9f7e88d209403cbcaf0c9fb138 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Thu, 7 Jun 2018 20:17:51 +0900
Subject: [PATCH 070/113] Use fs-extra instead of node-json-db

---
 package.json                                 |   1 -
 red/runtime/nodes/context/localfilesystem.js | 108 +++++++++----------
 2 files changed, 52 insertions(+), 57 deletions(-)

diff --git a/package.json b/package.json
index bd52aa85a..6a9b99fda 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,6 @@
     "mqtt": "2.18.0",
     "multer": "1.3.0",
     "mustache": "2.3.0",
-    "node-json-db": "0.7.5",
     "node-red-node-email": "0.1.*",
     "node-red-node-feedparser": "0.1.*",
     "node-red-node-rbe": "0.2.*",
diff --git a/red/runtime/nodes/context/localfilesystem.js b/red/runtime/nodes/context/localfilesystem.js
index 914b62995..efd869b6e 100644
--- a/red/runtime/nodes/context/localfilesystem.js
+++ b/red/runtime/nodes/context/localfilesystem.js
@@ -14,25 +14,25 @@
  * limitations under the License.
  **/
 
-var JsonDB = require('node-json-db');
 var fs = require('fs-extra');
 var path = require("path");
 var when = require("when");
+var util = require("../../util");
 
-function createStorage(storageBaseDir, scope) {
+function getStoragePath(storageBaseDir, scope) {
     if(scope.indexOf(":") === -1){
         if(scope === "global"){
-            return new JsonDB(path.join(storageBaseDir,"global",scope), true, true); 
+            return path.join(storageBaseDir,"global",scope); 
         }else{ // scope:flow
-            return new JsonDB(path.join(storageBaseDir,scope,"flow"), true, true);
+            return path.join(storageBaseDir,scope,"flow");
         }
     }else{ // scope:local
         var ids = scope.split(":")
-        return new JsonDB(path.join(storageBaseDir,ids[1],ids[0]), true, true);
+        return path.join(storageBaseDir,ids[1],ids[0]);
     }
 }
 
-function getStoragePath(config) {
+function getBasePath(config) {
     var base = config.base || "contexts";
     var storageBaseDir;
     if (!config.dir) {
@@ -62,10 +62,21 @@ function getStoragePath(config) {
     return storageBaseDir;
 }
 
+function loadFile(storagePath){
+    return fs.pathExists(storagePath).then(function(exists){
+        if(exists === true){
+            return fs.readFile(storagePath, "utf8");
+        }else{
+            return when.resolve(undefined);
+        }
+    }).catch(function(err){
+        throw when.reject(err);
+    });
+}
+
 function LocalFileSystem(config){
     this.config = config;
-    this.storageBaseDir = getStoragePath(this.config);
-    this.storages = {};
+    this.storageBaseDir = getBasePath(this.config);
 }
 
 LocalFileSystem.prototype.open = function(){
@@ -76,63 +87,49 @@ LocalFileSystem.prototype.close = function(){
     return when.resolve();
 }
 
-LocalFileSystem.prototype.get = function (scope, key) {
-    if(!this.storages[scope]){
-        this.storages[scope] = createStorage(this.storageBaseDir ,scope);
-    }
-    try{
-        this.storages[scope].reload();
-        return this.storages[scope].getData("/" + key.replace(/\./g,"/"));
-    }catch(err){
-        if(err.name === "DataError"){
-            return undefined;
-        }else{
-            throw err;
-        }
-    }
-}
-
-LocalFileSystem.prototype.set = function(scope, key, value) {
-    if(!this.storages[scope]){
-        this.storages[scope] = createStorage(this.storageBaseDir ,scope);
-    }
-    if(value){
-        this.storages[scope].push("/" + key.replace(/\./g,"/"), value);
-    }else{
-        this.storages[scope].delete("/" + key.replace(/\./g,"/"));
-    }
-}
-
-LocalFileSystem.prototype.keys = function(scope) {
-    if(!this.storages[scope]){
-        this.storages[scope] = createStorage(this.storageBaseDir ,scope);
-    }
-    return Object.keys(this.storages[scope].getData("/"));
-}
-
 LocalFileSystem.prototype.getAsync = function(scope, key) {
-    return when.resolve(this.get(scope, key));
+    var storagePath = getStoragePath(this.storageBaseDir ,scope);
+    return loadFile(storagePath).then(function(data){
+        if(data){
+            return util.getMessageProperty(JSON.parse(data),key);
+        }else{
+            return undefined
+        }
+    }).catch(function(err){
+        return when.reject(err);
+    });
 };
 
 LocalFileSystem.prototype.setAsync =function(scope, key, value) {
-    return when.resolve(this.set(scope, key, value));
+    var storagePath = getStoragePath(this.storageBaseDir ,scope);
+    return loadFile(storagePath).then(function(data){
+        var obj = data ? JSON.parse(data) : {}
+        util.setMessageProperty(obj,key,value);
+        return obj;
+    }).then(function(obj){
+        var str = JSON.stringify(obj, undefined, 4);
+        return fs.outputFile(storagePath, str, "utf8");
+    }).catch(function(err){
+        return when.reject(err);
+    });
 };
 
 LocalFileSystem.prototype.keysAsync = function(scope){
-    return when.resolve(this.keys(scope));
+    var storagePath = getStoragePath(this.storageBaseDir ,scope);
+    return loadFile(storagePath).then(function(data){
+        if(data){
+            return Object.keys(JSON.parse(data));
+        }else{
+            return []
+        }
+    }).catch(function(err){
+        return when.reject(err);
+    });
 };
 
 LocalFileSystem.prototype.delete = function(scope){
-    var self = this;
-    if(this.storages[scope]){
-        this.storages[scope].delete("/");
-        return fs.remove(this.storages[scope].filename).then(function(){
-            delete self.storages[scope];
-            return when.resolve();
-        });
-    }else{
-        return when.resolve();
-    }
+    var storagePath = getStoragePath(this.storageBaseDir ,scope);
+    return fs.remove(storagePath);
 }
 
 LocalFileSystem.prototype.clean = function(activeNodes){
@@ -141,7 +138,6 @@ LocalFileSystem.prototype.clean = function(activeNodes){
         return when.all(dirs.reduce(function(result, item){
             if(item !== "global" && activeNodes.indexOf(item) === -1){
                 result.push(fs.remove(path.join(self.storageBaseDir,item)));
-                delete self.storages[item];
             }
             return result;
         },[]));

From 41a04a2849bbbecbc40e83981fef2ebc125536ee Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Thu, 7 Jun 2018 21:51:11 +0900
Subject: [PATCH 071/113] Add async API to context and add test cases for async

---
 red/runtime/nodes/context/index.js            |  27 +-
 test/red/runtime/nodes/context/index_spec.js  | 264 +++++++-------
 .../nodes/context/localfilesystem_spec.js     | 321 +++++++++++++-----
 test/red/runtime/nodes/context/memory_spec.js |  30 +-
 4 files changed, 420 insertions(+), 222 deletions(-)

diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index 02f5a933d..216a24855 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -154,30 +154,45 @@ function createContext(id,seed) {
     obj.get = function(key) {
         var keyPath = parseKey(key);
         var context = getContextStorage(keyPath.storage);
-        if(key === keyPath.key){
+        if(!keyPath.storage){
             return context.get(scope, keyPath.key);
         }else{
-            return context.getAsync(scope, keyPath.key);
+            throw new Error(keyPath.storage + " does not support get(). Use getAsync()");
         }
     };
     obj.set = function(key, value) {
         var keyPath = parseKey(key);
         var context = getContextStorage(keyPath.storage);
-        if(key === keyPath.key){
+        if(!keyPath.storage){
             return context.set(scope, keyPath.key, value);
         }else{
-            return context.setAsync(scope, keyPath.key, value);
+            throw new Error(keyPath.storage + " does not support set(). Use setAsync()");
         }
     };
     obj.keys = function(storage) {
         var storageName = parseStorage(storage);
         var context = getContextStorage(storageName);
-        if(!storage){
+        if(!storageName){
             return context.keys(scope);
         }else{
-            return context.keysAsync(scope);
+            throw new Error(storageName + " does not support keys(). Use keysAsync()");
         }
     };
+    obj.getAsync = function(key) {
+        var keyPath = parseKey(key);
+        var context = getContextStorage(keyPath.storage);
+        return context.getAsync(scope, keyPath.key);
+    };
+    obj.setAsync  = function(key, value) {
+        var keyPath = parseKey(key);
+        var context = getContextStorage(keyPath.storage);
+        return context.setAsync(scope, keyPath.key, value);
+    };
+    obj.keysAsync  = function(storage) {
+        var storageName = parseStorage(storage);
+        var context = getContextStorage(storageName);
+        return context.keysAsync(scope);
+    };
     return obj;
 }
 
diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index c4bfa12ed..021f078ff 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -16,6 +16,7 @@
 
 var should = require("should");
 var sinon = require('sinon');
+var when = require("when")
 var rewire = require("rewire");
 var Context = require("../../../../../red/runtime/nodes/context/index");
 
@@ -33,7 +34,7 @@ describe('context', function() {
             var context1 = Context.get("1","flowA");
             should.not.exist(context1.get("foo"));
             context1.set("foo","test");
-            context1.get("foo").should.eql("test");
+            context1.get("foo").should.equal("test");
         });
         it('stores local property - creates parent properties',function() {
             var context1 = Context.get("1","flowA");
@@ -56,13 +57,13 @@ describe('context', function() {
             var context1 = Context.get("1","flowA");
             should.not.exist(context1.flow.get("foo"));
             context1.flow.set("foo","test");
-            context1.flow.get("foo").should.eql("test");
+            context1.flow.get("foo").should.equal("test");
         });
         it('stores global property',function() {
             var context1 = Context.get("1","flowA");
             should.not.exist(context1.global.get("foo"));
             context1.global.set("foo","test");
-            context1.global.get("foo").should.eql("test");
+            context1.global.get("foo").should.equal("test");
         });
 
         it('keeps local context local', function() {
@@ -73,7 +74,7 @@ describe('context', function() {
             should.not.exist(context2.get("foo"));
             context1.set("foo","test");
 
-            context1.get("foo").should.eql("test");
+            context1.get("foo").should.equal("test");
             should.not.exist(context2.get("foo"));
         });
         it('flow context accessible to all flow nodes', function() {
@@ -84,8 +85,8 @@ describe('context', function() {
             should.not.exist(context2.flow.get("foo"));
 
             context1.flow.set("foo","test");
-            context1.flow.get("foo").should.eql("test");
-            context2.flow.get("foo").should.eql("test");
+            context1.flow.get("foo").should.equal("test");
+            context2.flow.get("foo").should.equal("test");
         });
 
         it('flow context not shared to nodes on other flows', function() {
@@ -96,7 +97,7 @@ describe('context', function() {
             should.not.exist(context2.flow.get("foo"));
 
             context1.flow.set("foo","test");
-            context1.flow.get("foo").should.eql("test");
+            context1.flow.get("foo").should.equal("test");
             should.not.exist(context2.flow.get("foo"));
         });
 
@@ -108,15 +109,15 @@ describe('context', function() {
             should.not.exist(context2.global.get("foo"));
 
             context1.global.set("foo","test");
-            context1.global.get("foo").should.eql("test");
-            context2.global.get("foo").should.eql("test");
+            context1.global.get("foo").should.equal("test");
+            context2.global.get("foo").should.equal("test");
         });
 
         it('deletes context',function() {
             var context = Context.get("1","flowA");
             should.not.exist(context.get("foo"));
             context.set("foo","abc");
-            context.get("foo").should.eql("abc");
+            context.get("foo").should.equal("abc");
 
             return Context.delete("1","flowA").then(function(){
                 context = Context.get("1","flowA");
@@ -134,12 +135,12 @@ describe('context', function() {
             context.set("foo","bar");
             keys = context.keys();
             keys.should.have.length(1);
-            keys[0].should.eql("foo");
+            keys[0].should.equal("foo");
 
             context.set("abc.def","bar");
             keys = context.keys();
             keys.should.have.length(2);
-            keys[1].should.eql("abc");
+            keys[1].should.equal("abc");
         });
 
         it('should enumerate only context keys when GlobalContext was given', function() {
@@ -148,42 +149,45 @@ describe('context', function() {
                 var context = Context.get("1","flowA");
                 var keys = context.global.keys("global");
                 keys.should.have.length(1);
-                keys[0].should.eql("foo");
+                keys[0].should.equal("foo");
             });
         });
 
-        it('should store data on memory when contextStorage is not defined', function() {
+        it('should throw error when persistable key is passed', function() {
             var context =  Context.get("1","flow");
-            context.set("#nonexist.key1", "val1");
-            context.get("#nonexist.key1").should.eql("val1");
-            context.flow.set("#nonexist.key2", "val2");
-            context.flow.get("#nonexist.key2").should.eql("val2");
-            context.global.set("#nonexist.key1", "val3");
-            context.global.get("#nonexist.key1").should.eql("val3");
+            (function() {
+                context.set("#nonexist.key1", "val1");
+            }).should.throw();
+            (function() {
+                context.get("#nonexist.key1");
+            }).should.throw();
+            (function() {
+                context.keys("#nonexist");
+            }).should.throw();
         });
     });
 
     describe('external context storage',function() {
         var sandbox = sinon.sandbox.create();
-        var stubGet = sandbox.stub();
-        var stubSet = sandbox.stub();
-        var stubKeys = sandbox.stub();
-        var stubDelete = sandbox.stub().returns(Promise.resolve());
-        var stubClean = sandbox.stub().returns(Promise.resolve());
-        var stubOpen = sandbox.stub().returns(Promise.resolve());
-        var stubClose = sandbox.stub().returns(Promise.resolve());
-        var stubGet2 = sandbox.stub();
-        var stubSet2 = sandbox.stub();
-        var stubKeys2 = sandbox.stub();
-        var stubDelete2 = sandbox.stub().returns(Promise.resolve());
-        var stubClean2 = sandbox.stub().returns(Promise.resolve());
-        var stubOpen2 = sandbox.stub().returns(Promise.resolve());
-        var stubClose2 = sandbox.stub().returns(Promise.resolve());
+        var stubGetAsync = sandbox.stub().returns(when.resolve());
+        var stubSetAsync = sandbox.stub().returns(when.resolve());
+        var stubKeysAsync = sandbox.stub().returns(when.resolve());
+        var stubDelete = sandbox.stub().returns(when.resolve());
+        var stubClean = sandbox.stub().returns(when.resolve());
+        var stubOpen = sandbox.stub().returns(when.resolve());
+        var stubClose = sandbox.stub().returns(when.resolve());
+        var stubGetAsync2 = sandbox.stub().returns(when.resolve());
+        var stubSetAsync2 = sandbox.stub().returns(when.resolve());
+        var stubKeysAsync2 = sandbox.stub().returns(when.resolve());
+        var stubDelete2 = sandbox.stub().returns(when.resolve());
+        var stubClean2 = sandbox.stub().returns(when.resolve());
+        var stubOpen2 = sandbox.stub().returns(when.resolve());
+        var stubClose2 = sandbox.stub().returns(when.resolve());
         var testPlugin = function(config){
             function Test(){}
-            Test.prototype.get = stubGet;
-            Test.prototype.set = stubSet;
-            Test.prototype.keys = stubKeys;
+            Test.prototype.getAsync = stubGetAsync;
+            Test.prototype.setAsync = stubSetAsync;
+            Test.prototype.keysAsync = stubKeysAsync;
             Test.prototype.delete = stubDelete;
             Test.prototype.clean = stubClean;
             Test.prototype.open = stubOpen;
@@ -192,9 +196,9 @@ describe('context', function() {
         };
         var testPlugin2 = function(config){
             function Test2(){}
-            Test2.prototype.get = stubGet2;
-            Test2.prototype.set = stubSet2;
-            Test2.prototype.keys = stubKeys2;
+            Test2.prototype.getAsync = stubGetAsync2;
+            Test2.prototype.setAsync = stubSetAsync2;
+            Test2.prototype.keysAsync = stubKeysAsync2;
             Test2.prototype.delete = stubDelete2;
             Test2.prototype.clean = stubClean2;
             Test2.prototype.open = stubOpen2;
@@ -251,24 +255,32 @@ describe('context', function() {
                 });
                 return Context.load().then(function(){
                     var context = Context.get("1","flow");
-                    context.set("##%&.sign","sign1");
-                    context.get("##%&.sign").should.eql("sign1");
-                    context.set("#\u3042.file2","file2");
-                    context.get("#\u3042.file2").should.eql("file2");
-                    context.set("#1.num","num3");
-                    context.get("#1.num").should.eql("num3");
+                    return when.all([
+                        context.setAsync("##%&.sign","sign1").then(function(){
+                            return context.getAsync("##%&.sign").should.finally.equal("sign1");
+                        }),
+                        context.setAsync("#\u3042.file2","file2").then(function(){
+                            return context.getAsync("#\u3042.file2").should.finally.equal("file2");
+                        }),
+                        context.setAsync("#1.num","num3").then(function(){
+                            return context.getAsync("#1.num").should.finally.equal("num3");
+                        })
+                    ]);
                 });
             });
             it('should ignore reserved storage name `_`', function() {
                 Context.init({contextStorage:{_:{module:testPlugin}}});
                 return Context.load().then(function(){
                     var context = Context.get("1","flow");
-                    context.set("#_.foo","bar");
-                    context.get("#_.foo");
-                    context.keys("#_");
-                    stubSet.called.should.be.false();
-                    stubGet.called.should.be.false();
-                    stubKeys.called.should.be.false();
+                    return when.all([
+                        context.setAsync("#_.foo","bar"),
+                        context.getAsync("#_.foo"),
+                        context.keysAsync("#_")
+                    ]).then(function(){
+                        stubSetAsync.called.should.be.false();
+                        stubGetAsync.called.should.be.false();
+                        stubKeysAsync.called.should.be.false();
+                    });
                 });
             });
             it('should fail when using invalid default context', function(done) {
@@ -314,94 +326,106 @@ describe('context', function() {
                 Context.init({contextStorage:contextStorage});
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    should.not.exist(context.get("#test.foo"));
-                    context.set("#test.foo","test");
-                    context.get("#test.foo");
-                    context.keys("#test");
-                    stubSet.calledWithExactly("1:flow","foo","test").should.be.true();
-                    stubGet.calledWithExactly("1:flow","foo").should.be.true();
-                    stubKeys.calledWithExactly("1:flow").should.be.true();
+                    return when.all([
+                        context.setAsync("#test.foo","test"),
+                        context.getAsync("#test.foo"),
+                        context.keysAsync("#test")
+                    ]).then(function(){
+                        stubSetAsync.calledWithExactly("1:flow","foo","test").should.be.true();
+                        stubGetAsync.calledWithExactly("1:flow","foo").should.be.true();
+                        stubKeysAsync.calledWithExactly("1:flow").should.be.true();
+                    });
                 });
             });
             it('should store flow property to external context storage',function() {
                 Context.init({contextStorage:contextStorage});
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    should.not.exist(context.flow.get("#test.foo"));
-                    context.flow.set("#test.foo","test");
-                    context.flow.get("#test.foo");
-                    context.flow.keys("#test");
-                    stubSet.calledWithExactly("flow","foo","test").should.be.true();
-                    stubGet.calledWithExactly("flow","foo").should.be.true();
-                    stubKeys.calledWithExactly("flow").should.be.true();
+                    return when.all([
+                        context.flow.setAsync("#test.foo","test"),
+                        context.flow.getAsync("#test.foo"),
+                        context.flow.keysAsync("#test")
+                    ]).then(function(){
+                        stubSetAsync.calledWithExactly("flow","foo","test").should.be.true();
+                        stubGetAsync.calledWithExactly("flow","foo").should.be.true();
+                        stubKeysAsync.calledWithExactly("flow").should.be.true();
+                    });
                 });
             });
             it('should store global property to external context storage',function() {
                 Context.init({contextStorage:contextStorage});
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    should.not.exist(context.global.get("#test.foo"));
-                    context.global.set("#test.foo","test");
-                    context.global.get("#test.foo");
-                    context.global.keys("#test");
-                    stubSet.calledWithExactly("global","foo","test").should.be.true();
-                    stubGet.calledWithExactly("global","foo").should.be.true();
-                    stubKeys.calledWithExactly("global").should.be.true();
+                    return when.all([
+                        context.global.setAsync("#test.foo","test"),
+                        context.global.getAsync("#test.foo"),
+                        context.global.keysAsync("#test")
+                    ]).then(function(){
+                        stubSetAsync.calledWithExactly("global","foo","test").should.be.true();
+                        stubGetAsync.calledWithExactly("global","foo").should.be.true();
+                        stubKeysAsync.calledWithExactly("global").should.be.true();
+                    });
                 });
             });
             it('should store data to the default context when non-existent context storage was specified', function() {
                 Context.init({contextStorage:contextDefaultStorage});
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    should.not.exist(context.get("#nonexist.foo"));
-                    context.set("#nonexist.foo","test");
-                    context.get("#nonexist.foo");
-                    context.keys("#nonexist");
-                    stubGet.called.should.be.false();
-                    stubSet.called.should.be.false();
-                    stubKeys.called.should.be.false();
-                    stubSet2.calledWithExactly("1:flow","foo","test").should.be.true();
-                    stubGet2.calledWithExactly("1:flow","foo").should.be.true();
-                    stubKeys2.calledWithExactly("1:flow").should.be.true();
+                    return when.all([
+                        context.setAsync("#nonexist.foo","test"),
+                        context.getAsync("#nonexist.foo"),
+                        context.keysAsync("#nonexist")
+                    ]).then(function(){
+                        stubGetAsync.called.should.be.false();
+                        stubSetAsync.called.should.be.false();
+                        stubKeysAsync.called.should.be.false();
+                        stubSetAsync2.calledWithExactly("1:flow","foo","test").should.be.true();
+                        stubGetAsync2.calledWithExactly("1:flow","foo").should.be.true();
+                        stubKeysAsync2.calledWithExactly("1:flow").should.be.true();
+                    });
                 });
             });
             it('should use the default context', function() {
                 Context.init({contextStorage:contextDefaultStorage});
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    should.not.exist(context.get("#default.foo"));
-                    context.set("#default.foo","default");
-                    context.get("#default.foo");
-                    context.keys("#default");
-                    stubGet.called.should.be.false();
-                    stubSet.called.should.be.false();
-                    stubKeys.called.should.be.false();
-                    stubSet2.calledWithExactly("1:flow","foo","default").should.be.true();
-                    stubGet2.calledWithExactly("1:flow","foo").should.be.true();
-                    stubKeys2.calledWithExactly("1:flow").should.be.true();
+                    return when.all([
+                        context.setAsync("#default.foo","default"),
+                        context.getAsync("#default.foo"),
+                        context.keysAsync("#default")
+                    ]).then(function(){
+                        stubGetAsync.called.should.be.false();
+                        stubSetAsync.called.should.be.false();
+                        stubKeysAsync.called.should.be.false();
+                        stubSetAsync2.calledWithExactly("1:flow","foo","default").should.be.true();
+                        stubGetAsync2.calledWithExactly("1:flow","foo").should.be.true();
+                        stubKeysAsync2.calledWithExactly("1:flow").should.be.true();
+                    });
                 });
             });
             it('should use the alias of default context', function() {
                 Context.init({contextStorage:contextDefaultStorage});
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    should.not.exist(context.get("#.foo"));
-                    context.set("#.foo","alias");
-                    context.get("#.foo");
-                    context.keys("#");
-                    stubGet.called.should.be.false();
-                    stubSet.called.should.be.false();
-                    stubKeys.called.should.be.false();
-                    stubSet2.calledWithExactly("1:flow","foo","alias").should.be.true();
-                    stubGet2.calledWithExactly("1:flow","foo").should.be.true();
-                    stubKeys2.calledWithExactly("1:flow").should.be.true();
+                    return when.all([
+                        context.setAsync("#.foo","alias"),
+                        context.getAsync("#.foo"),
+                        context.keysAsync("#")
+                    ]).then(function(){
+                        stubGetAsync.called.should.be.false();
+                        stubSetAsync.called.should.be.false();
+                        stubKeysAsync.called.should.be.false();
+                        stubSetAsync2.calledWithExactly("1:flow","foo","alias").should.be.true();
+                        stubGetAsync2.calledWithExactly("1:flow","foo").should.be.true();
+                        stubKeysAsync2.calledWithExactly("1:flow").should.be.true();
+                    });
                 });
             });
             it('should throw an error using undefined storage for local context', function(done) {
                 Context.init({contextStorage:contextStorage});
                 Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    context.get("#nonexist.local");
+                    context.getAsync("#nonexist.local");
                     should.fail(null, null, "An error was not thrown using undefined storage for local context");
                 }).catch(function(err) {
                     if (err.name === "ContextError") {
@@ -415,7 +439,7 @@ describe('context', function() {
                 Context.init({contextStorage:contextStorage});
                 Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    context.flow.set("#nonexist.flow");
+                    context.flow.setAsync("#nonexist.flow");
                     should.fail(null, null, "An error was not thrown using undefined storage for flow context");
                 }).catch(function(err) {
                     if (err.name === "ContextError") {
@@ -464,32 +488,36 @@ describe('context', function() {
                 return Context.close();
             });
             it('should work correctly with the valid key name',function() {
-                context.set("#memory.azAZ09#_","valid");
-                context.get("#memory.azAZ09#_").should.eql("valid");
-                context.set("#memory.a.b","ab");
-                context.get("#memory.a.b").should.eql("ab");
+                return when.all([
+                    context.setAsync("#memory.azAZ09#_","valid"),
+                    context.setAsync("#memory.a.b","ab")
+                ]).then(function(){
+                    context.getAsync("#memory.azAZ09#_").should.finally.equal("valid");
+                    context.getAsync("#memory.a.b").should.finally.equal("ab");
+                });
             });
             it('should treat the key name without dot as a normal context',function() {
-                context.set("#memory","normal");
-                context.get("#memory").should.eql("normal");
+                return context.setAsync("#memory","normal").then(function(){
+                    return context.getAsync("#memory").should.finally.equal("normal");
+                });
             });
             it('should fail when specifying invalid characters',function() {
                 (function() {
-                    context.set("#memory.a.-","invalid1");
+                    context.setAsync("#memory.a.-","invalid1");
                 }).should.throw();
                 (function() {
-                    context.set("#memory.'abc","invalid2");
+                    context.setAsync("#memory.'abc","invalid2");
                 }).should.throw();
             });
             it('should fail when specifying unnecesary space characters for key name',function() {
                 (function() {
-                    context.set("# memory.space","space1");
+                    context.setAsync("# memory.space","space1");
                 }).should.throw();
                 (function() {
-                    context.set("#memory .space","space2");
+                    context.setAsync("#memory .space","space2");
                 }).should.throw();
                 (function() {
-                    context.set("#memory. space","space3");
+                    context.setAsync("#memory. space","space3");
                 }).should.throw();
             });
         });
@@ -500,8 +528,8 @@ describe('context', function() {
 
         function returnModuleAndKey(input, expectedModule, expectedKey) {
             var result = parseKey(input);
-            result.storage.should.eql(expectedModule);
-            result.key.should.eql(expectedKey);
+            result.storage.should.equal(expectedModule);
+            result.key.should.equal(expectedKey);
         }
 
         it('should return module and key', function() {
diff --git a/test/red/runtime/nodes/context/localfilesystem_spec.js b/test/red/runtime/nodes/context/localfilesystem_spec.js
index 77a6c440d..f90bb53d9 100644
--- a/test/red/runtime/nodes/context/localfilesystem_spec.js
+++ b/test/red/runtime/nodes/context/localfilesystem_spec.js
@@ -38,120 +38,275 @@ describe('localfilesystem',function() {
         });
     });
 
-    describe('#get/set',function() {
+    describe('#getAsync/setAsync',function() {
         it('should store property',function() {
-            should.not.exist(context.get("nodeX","foo"));
-            context.set("nodeX","foo","test");
-            context.get("nodeX","foo").should.eql("test");
+            return context.getAsync("nodeX","foo").should.be.finally.undefined()
+            .then(function(){
+                return context.setAsync("nodeX","foo","test");
+            }).then(function(){
+                return context.getAsync("nodeX","foo").should.be.finally.equal("test");
+            });
         });
 
         it('should store property - creates parent properties',function() {
-            context.set("nodeX","foo.bar","test");
-            context.get("nodeX","foo").should.eql({bar:"test"});
+            return context.setAsync("nodeX","foo.bar","test").then(function(){
+                return context.getAsync("nodeX","foo").should.be.finally.eql({bar:"test"});
+            });
         });
 
         it('should delete property',function() {
-            context.set("nodeX","foo.abc.bar1","test1");
-            context.set("nodeX","foo.abc.bar2","test2");
-            context.get("nodeX","foo.abc").should.eql({bar1:"test1",bar2:"test2"});
-            context.set("nodeX","foo.abc.bar1",undefined);
-            context.get("nodeX","foo.abc").should.eql({bar2:"test2"});
-            context.set("nodeX","foo.abc",undefined);
-            should.not.exist(context.get("nodeX","foo.abc"));
-            context.set("nodeX","foo",undefined);
-            should.not.exist(context.get("nodeX","foo"));
+            return context.setAsync("nodeX","foo.abc.bar1","test1")
+            .then(function(){
+                return context.setAsync("nodeX","foo.abc.bar2","test2")
+            }).then(function(){
+                return context.getAsync("nodeX","foo.abc").should.be.finally.eql({bar1:"test1",bar2:"test2"});
+            }).then(function(){
+                return context.setAsync("nodeX","foo.abc.bar1",undefined).then(function(){
+                   return context.getAsync("nodeX","foo.abc").should.be.finally.eql({bar2:"test2"});
+                });
+            }).then(function(){
+                return context.setAsync("nodeX","foo.abc",undefined).then(function(){
+                    return context.getAsync("nodeX","foo.abc").should.be.finally.undefined();
+                });
+            }).then(function(){
+                return context.setAsync("nodeX","foo",undefined).then(function(){
+                    return context.getAsync("nodeX","foo").should.be.finally.undefined();
+                });
+            });
         });
 
         it('should not shared context with other scope', function() {
-            should.not.exist(context.get("nodeX","foo"));
-            should.not.exist(context.get("nodeY","foo"));
-            context.set("nodeX","foo","testX");
-            context.set("nodeY","foo","testY");
+            return when.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
+                             context.getAsync("nodeY","foo").should.be.finally.undefined()
+            ]).then(function(){
+                return when.all([context.setAsync("nodeX","foo","testX"),
+                                 context.setAsync("nodeY","foo","testY")])
+            }).then(function(){
+                return when.all([context.getAsync("nodeX","foo").should.be.finally.equal("testX"),
+                                 context.getAsync("nodeY","foo").should.be.finally.equal("testY")]);
+            });
+        });
 
-            context.get("nodeX","foo").should.eql("testX");
-            context.get("nodeY","foo").should.eql("testY");
+        it('should store string',function() {
+            return context.getAsync("nodeX","foo").should.be.finally.undefined()
+            .then(function(){
+                return context.setAsync("nodeX","foo","bar");
+            }).then(function(){
+                return context.getAsync("nodeX","foo")
+            }).then(function(result){
+                result.should.be.String();
+                result.should.be.equal("bar");
+            }).then(function(){
+                return context.setAsync("nodeX","foo","1");
+            }).then(function(){
+                return context.getAsync("nodeX","foo")
+            }).then(function(result){
+                result.should.be.String();
+                result.should.be.equal("1");
+            });
+        });
+
+        it('should store number',function() {
+            return context.getAsync("nodeX","foo").should.be.finally.undefined()
+            .then(function(){
+                return context.setAsync("nodeX","foo",1);
+            }).then(function(){
+                return context.getAsync("nodeX","foo")
+            }).then(function(result){
+                result.should.be.Number();
+                result.should.be.equal(1);
+            });
+        });
+
+        it('should store null',function() {
+            return context.getAsync("nodeX","foo").should.be.finally.undefined()
+            .then(function(){
+                return context.setAsync("nodeX","foo",null);
+            }).then(function(){
+                return context.getAsync("nodeX","foo").should.be.finally.null();
+            });
+        });
+
+        it('should store boolean',function() {
+            return context.getAsync("nodeX","foo").should.be.finally.undefined()
+            .then(function(){
+                return context.setAsync("nodeX","foo",true);
+            }).then(function(){
+                return context.getAsync("nodeX","foo").should.be.finally.Boolean().and.true();
+            }).then(function(){
+                return context.setAsync("nodeX","foo",false);
+            }).then(function(){
+                return context.getAsync("nodeX","foo").should.be.finally.Boolean().and.false();
+            });
+        });
+
+        it('should store object',function() {
+            return context.getAsync("nodeX","foo").should.be.finally.undefined()
+            .then(function(){
+                return context.setAsync("nodeX","foo",{obj:"bar"});
+            }).then(function(){
+                return context.getAsync("nodeX","foo")
+            }).then(function(result){
+                result.should.be.Object();
+                result.should.eql({obj:"bar"});
+            });
+        });
+
+        it('should store array',function() {
+            return context.getAsync("nodeX","foo").should.be.finally.undefined()
+            .then(function(){
+                return context.setAsync("nodeX","foo",["a","b","c"]);
+            }).then(function(){
+                return context.getAsync("nodeX","foo")
+            }).then(function(result){
+                result.should.be.Array();
+                result.should.eql(["a","b","c"]);
+            }).then(function(){
+                return context.getAsync("nodeX","foo[1]")
+            }).then(function(result){
+                result.should.be.String();
+                result.should.equal("b");
+            });
+        });
+
+        it('should store array of arrays',function() {
+            return context.getAsync("nodeX","foo").should.be.finally.undefined()
+            .then(function(){
+                return context.setAsync("nodeX","foo",[["a","b","c"],[1,2,3,4],[true,false]]);
+            }).then(function(){
+                return context.getAsync("nodeX","foo")
+            }).then(function(result){
+                result.should.be.Array();
+                result.should.have.length(3);
+                result[0].should.have.length(3);
+                result[1].should.have.length(4);
+                result[2].should.have.length(2);
+            }).then(function(){
+                return context.getAsync("nodeX","foo[1]")
+            }).then(function(result){
+                result.should.be.Array();
+                result.should.have.length(4);
+                result.should.be.eql([1,2,3,4]);
+            });
+        });
+
+        it('should store array of objects',function() {
+            return context.getAsync("nodeX","foo").should.be.finally.undefined()
+            .then(function(){
+                return context.setAsync("nodeX","foo",[{obj:"bar1"},{obj:"bar2"},{obj:"bar3"}]);
+            }).then(function(){
+                return context.getAsync("nodeX","foo")
+            }).then(function(result){
+                result.should.be.Array();
+                result.should.have.length(3);
+                result[0].should.be.Object();
+                result[1].should.be.Object();
+                result[2].should.be.Object();
+            }).then(function(){
+                return context.getAsync("nodeX","foo[1]")
+            }).then(function(result){
+                result.should.be.Object();
+                result.should.be.eql({obj:"bar2"});
+            });
         });
     });
 
-    describe('#keys',function() {
+    describe('#keysAsync',function() {
         it('should enumerate context keys', function() {
-            var keys = context.keys("nodeX");
-            keys.should.be.an.Array();
-            keys.should.be.empty();
-
-            context.set("nodeX","foo","bar");
-            keys = context.keys("nodeX");
-            keys.should.have.length(1);
-            keys[0].should.eql("foo");
-
-            context.set("nodeX","abc.def","bar");
-            keys = context.keys("nodeX");
-            keys.should.have.length(2);
-            keys[1].should.eql("abc");
+            return context.keysAsync("nodeX").then(function(result){
+                result.should.be.an.Array();
+                result.should.be.empty();
+            }).then(function(){
+                return context.setAsync("nodeX","foo","bar");
+            }).then(function(){
+                return context.keysAsync("nodeX").then(function(result){
+                    result.should.have.length(1);
+                    result[0].should.equal("foo");
+                });
+            }).then(function(){
+                return context.setAsync("nodeX","abc.def","bar");
+            }).then(function(){
+                return context.keysAsync("nodeX").then(function(result){
+                    result.should.have.length(2);
+                    result[1].should.equal("abc");
+                });
+            });
         });
 
         it('should enumerate context keys in each scopes', function() {
-            var keysX = context.keys("nodeX");
-            keysX.should.be.an.Array();
-            keysX.should.be.empty();
-
-            var keysY = context.keys("nodeY");
-            keysY.should.be.an.Array();
-            keysY.should.be.empty();
-
-            context.set("nodeX","foo","bar");
-            context.set("nodeY","hoge","piyo");
-            keysX = context.keys("nodeX");
-            keysX.should.have.length(1);
-            keysX[0].should.eql("foo");
-
-            keysY = context.keys("nodeY");
-            keysY.should.have.length(1);
-            keysY[0].should.eql("hoge");
+            return when.all([context.keysAsync("nodeX"),
+                             context.keysAsync("nodeY")
+            ]).then(function(results){
+                results[0].should.be.an.Array();
+                results[0].should.be.empty();
+                results[1].should.be.an.Array();
+                results[1].should.be.empty();
+            }).then(function(){
+                return when.all([context.setAsync("nodeX","foo","bar"),
+                                 context.setAsync("nodeY","hoge","piyo")]);
+            }).then(function(){
+                return when.all([context.keysAsync("nodeX"),
+                                 context.keysAsync("nodeY")]);
+            }).then(function(results){
+                results[0].should.have.length(1);
+                results[0][0].should.equal("foo");
+                results[1].should.have.length(1);
+                results[1][0].should.equal("hoge");
+            });
         });
     });
 
     describe('#delete',function() {
         it('should delete context',function() {
-            should.not.exist(context.get("nodeX","foo"));
-            should.not.exist(context.get("nodeY","foo"));
-            context.set("nodeX","foo","abc");
-            context.set("nodeY","foo","abc");
-            context.get("nodeX","foo").should.eql("abc");
-            context.get("nodeY","foo").should.eql("abc");
-
-            return context.delete("nodeX").then(function(){
-                should.not.exist(context.get("nodeX","foo"));
-                should.exist(context.get("nodeY","foo"));  
-            })
+            return when.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
+                             context.getAsync("nodeY","foo").should.be.finally.undefined()
+            ]).then(function(){
+                return when.all([context.setAsync("nodeX","foo","abc"),
+                                 context.setAsync("nodeY","foo","abc")]);
+            }).then(function(){
+                return when.all([context.getAsync("nodeX","foo").should.be.finally.equal("abc"),
+                                 context.getAsync("nodeY","foo").should.be.finally.equal("abc")])
+            }).then(function(){
+                return context.delete("nodeX");
+            }).then(function(){
+                return when.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
+                                 context.getAsync("nodeY","foo").should.be.finally.equal("abc")]);
+            });  
         });
     });
 
     describe('#clean',function() {
         it('should clean unnecessary context',function() {
-            should.not.exist(context.get("nodeX","foo"));
-            should.not.exist(context.get("nodeY","foo"));
-            context.set("nodeX","foo","abc");
-            context.set("nodeY","foo","abc");
-            context.get("nodeX","foo").should.eql("abc");
-            context.get("nodeY","foo").should.eql("abc");
-
-            return context.clean([]).then(function(){
-                should.not.exist(context.get("nodeX","foo"));
-                should.not.exist(context.get("nodeY","foo"));
+            return when.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
+                             context.getAsync("nodeY","foo").should.be.finally.undefined()
+            ]).then(function(values){
+                return when.all([context.setAsync("nodeX","foo","abc"),
+                                 context.setAsync("nodeY","foo","abc")]);
+            }).then(function(){
+                return when.all([context.getAsync("nodeX","foo").should.be.finally.equal("abc"),
+                                 context.getAsync("nodeY","foo").should.be.finally.equal("abc")])
+            }).then(function(){
+                return context.clean([]);
+            }).then(function(){
+                return when.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
+                                 context.getAsync("nodeY","foo").should.be.finally.undefined()]);
             });
         });
-        it('should not clean active context',function() {
-            should.not.exist(context.get("nodeX","foo"));
-            should.not.exist(context.get("nodeY","foo"));
-            context.set("nodeX","foo","abc");
-            context.set("nodeY","foo","abc");
-            context.get("nodeX","foo").should.eql("abc");
-            context.get("nodeY","foo").should.eql("abc");
 
-            return context.clean(["nodeX"]).then(function(){
-                should.exist(context.get("nodeX","foo"));
-                should.not.exist(context.get("nodeY","foo"));
+        it('should not clean active context',function() {
+            return when.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
+                             context.getAsync("nodeY","foo").should.be.finally.undefined()
+            ]).then(function(){
+                return when.all([context.setAsync("nodeX","foo","abc"),
+                                 context.setAsync("nodeY","foo","abc")]);
+            }).then(function(){
+                return when.all([context.getAsync("nodeX","foo").should.be.finally.equal("abc"),
+                                 context.getAsync("nodeY","foo").should.be.finally.equal("abc")])
+            }).then(function(){
+                return context.clean(["nodeX"]);
+            }).then(function(){
+                return when.all([context.getAsync("nodeX","foo").should.be.finally.equal("abc"),
+                                 context.getAsync("nodeY","foo").should.be.finally.undefined()]);
             });
         });
     });
diff --git a/test/red/runtime/nodes/context/memory_spec.js b/test/red/runtime/nodes/context/memory_spec.js
index 8da35be19..090c46b41 100644
--- a/test/red/runtime/nodes/context/memory_spec.js
+++ b/test/red/runtime/nodes/context/memory_spec.js
@@ -35,7 +35,7 @@ describe('memory',function() {
         it('should store property',function() {
             should.not.exist(context.get("nodeX","foo"));
             context.set("nodeX","foo","test");
-            context.get("nodeX","foo").should.eql("test");
+            context.get("nodeX","foo").should.equal("test");
         });
 
         it('should store property - creates parent properties',function() {
@@ -61,8 +61,8 @@ describe('memory',function() {
             context.set("nodeX","foo","testX");
             context.set("nodeY","foo","testY");
 
-            context.get("nodeX","foo").should.eql("testX");
-            context.get("nodeY","foo").should.eql("testY");
+            context.get("nodeX","foo").should.equal("testX");
+            context.get("nodeY","foo").should.equal("testY");
         });
     });
 
@@ -75,12 +75,12 @@ describe('memory',function() {
             context.set("nodeX","foo","bar");
             keys = context.keys("nodeX");
             keys.should.have.length(1);
-            keys[0].should.eql("foo");
+            keys[0].should.equal("foo");
 
             context.set("nodeX","abc.def","bar");
             keys = context.keys("nodeX");
             keys.should.have.length(2);
-            keys[1].should.eql("abc");
+            keys[1].should.equal("abc");
         });
 
         it('should enumerate context keys in each scopes', function() {
@@ -96,11 +96,11 @@ describe('memory',function() {
             context.set("nodeY","hoge","piyo");
             keysX = context.keys("nodeX");
             keysX.should.have.length(1);
-            keysX[0].should.eql("foo");
+            keysX[0].should.equal("foo");
 
             keysY = context.keys("nodeY");
             keysY.should.have.length(1);
-            keysY[0].should.eql("hoge");
+            keysY[0].should.equal("hoge");
         });
 
         it('should enumerate only context keys when GlobalContext was given', function() {
@@ -114,7 +114,7 @@ describe('memory',function() {
             context.setGlobalContext(data);
             keys = context.keys("global");
             keys.should.have.length(1);
-            keys[0].should.eql("foo");
+            keys[0].should.equal("foo");
         });
     });
 
@@ -124,8 +124,8 @@ describe('memory',function() {
             should.not.exist(context.get("nodeY","foo"));
             context.set("nodeX","foo","abc");
             context.set("nodeY","foo","abc");
-            context.get("nodeX","foo").should.eql("abc");
-            context.get("nodeY","foo").should.eql("abc");
+            context.get("nodeX","foo").should.equal("abc");
+            context.get("nodeY","foo").should.equal("abc");
 
             return context.delete("nodeX").then(function(){
                 should.not.exist(context.get("nodeX","foo"));
@@ -140,8 +140,8 @@ describe('memory',function() {
             should.not.exist(context.get("nodeY","foo"));
             context.set("nodeX","foo","abc");
             context.set("nodeY","foo","abc");
-            context.get("nodeX","foo").should.eql("abc");
-            context.get("nodeY","foo").should.eql("abc");
+            context.get("nodeX","foo").should.equal("abc");
+            context.get("nodeY","foo").should.equal("abc");
 
             return context.clean([]).then(function(){
                 should.not.exist(context.get("nodeX","foo"));
@@ -153,8 +153,8 @@ describe('memory',function() {
             should.not.exist(context.get("nodeY","foo"));
             context.set("nodeX","foo","abc");
             context.set("nodeY","foo","abc");
-            context.get("nodeX","foo").should.eql("abc");
-            context.get("nodeY","foo").should.eql("abc");
+            context.get("nodeX","foo").should.equal("abc");
+            context.get("nodeY","foo").should.equal("abc");
 
             return context.clean(["nodeX"]).then(function(){
                 should.exist(context.get("nodeX","foo"));
@@ -173,7 +173,7 @@ describe('memory',function() {
                 foo: "bar"
             }
             context.setGlobalContext(data);
-            context.get("global","foo").should.eql("bar");
+            context.get("global","foo").should.equal("bar");
         });
     });
 });
\ No newline at end of file

From c4eae3f130282d3b36c39ea922df9bee3ab49695 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Fri, 8 Jun 2018 19:26:07 +0900
Subject: [PATCH 072/113] Fix file extension

---
 red/runtime/nodes/context/localfilesystem.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/red/runtime/nodes/context/localfilesystem.js b/red/runtime/nodes/context/localfilesystem.js
index efd869b6e..e85e68e16 100644
--- a/red/runtime/nodes/context/localfilesystem.js
+++ b/red/runtime/nodes/context/localfilesystem.js
@@ -22,7 +22,7 @@ var util = require("../../util");
 function getStoragePath(storageBaseDir, scope) {
     if(scope.indexOf(":") === -1){
         if(scope === "global"){
-            return path.join(storageBaseDir,"global",scope); 
+            return path.join(storageBaseDir,"global",scope);
         }else{ // scope:flow
             return path.join(storageBaseDir,scope,"flow");
         }
@@ -89,7 +89,7 @@ LocalFileSystem.prototype.close = function(){
 
 LocalFileSystem.prototype.getAsync = function(scope, key) {
     var storagePath = getStoragePath(this.storageBaseDir ,scope);
-    return loadFile(storagePath).then(function(data){
+    return loadFile(storagePath + ".json").then(function(data){
         if(data){
             return util.getMessageProperty(JSON.parse(data),key);
         }else{
@@ -102,13 +102,13 @@ LocalFileSystem.prototype.getAsync = function(scope, key) {
 
 LocalFileSystem.prototype.setAsync =function(scope, key, value) {
     var storagePath = getStoragePath(this.storageBaseDir ,scope);
-    return loadFile(storagePath).then(function(data){
+    return loadFile(storagePath + ".json").then(function(data){
         var obj = data ? JSON.parse(data) : {}
         util.setMessageProperty(obj,key,value);
         return obj;
     }).then(function(obj){
         var str = JSON.stringify(obj, undefined, 4);
-        return fs.outputFile(storagePath, str, "utf8");
+        return fs.outputFile(storagePath + ".json", str, {encoding:"utf8",flag:"w+"});
     }).catch(function(err){
         return when.reject(err);
     });
@@ -116,7 +116,7 @@ LocalFileSystem.prototype.setAsync =function(scope, key, value) {
 
 LocalFileSystem.prototype.keysAsync = function(scope){
     var storagePath = getStoragePath(this.storageBaseDir ,scope);
-    return loadFile(storagePath).then(function(data){
+    return loadFile(storagePath + ".json").then(function(data){
         if(data){
             return Object.keys(JSON.parse(data));
         }else{
@@ -129,7 +129,7 @@ LocalFileSystem.prototype.keysAsync = function(scope){
 
 LocalFileSystem.prototype.delete = function(scope){
     var storagePath = getStoragePath(this.storageBaseDir ,scope);
-    return fs.remove(storagePath);
+    return fs.remove(storagePath + ".json");
 }
 
 LocalFileSystem.prototype.clean = function(activeNodes){
@@ -148,7 +148,7 @@ LocalFileSystem.prototype.clean = function(activeNodes){
             return when.reject(err);
         }
     });
- }
+}
 
 module.exports = function(config){
     return new LocalFileSystem(config);

From 23b887c30ebde411b0254147f393014e1d71b441 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Mon, 11 Jun 2018 16:04:27 +0900
Subject: [PATCH 073/113] Add a test case for context/index

---
 test/red/runtime/nodes/context/index_spec.js | 30 +++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index 021f078ff..9ea38a49b 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -121,7 +121,7 @@ describe('context', function() {
 
             return Context.delete("1","flowA").then(function(){
                 context = Context.get("1","flowA");
-                should.not.exist(context.get("foo"));                
+                should.not.exist(context.get("foo"));
             });
         });
 
@@ -221,6 +221,13 @@ describe('context', function() {
                 config:{}
             }
         };
+        var contextAlias={
+            default: "test",
+            test:{
+                module: testPlugin,
+                config:{}
+            }
+        };
 
         afterEach(function() {
             sandbox.reset();
@@ -228,7 +235,7 @@ describe('context', function() {
                 return Context.close();
             });
         });
-    
+
         describe('load modules',function(){
             it('should call open()', function() {
                 Context.init({contextStorage:contextDefaultStorage});
@@ -421,6 +428,21 @@ describe('context', function() {
                     });
                 });
             });
+            it('should use default as the alias of other context', function() {
+                Context.init({contextStorage:contextAlias});
+                return Context.load().then(function(){
+                    var context =  Context.get("1","flow");
+                    return when.all([
+                        context.setAsync("#.foo","alias"),
+                        context.getAsync("#.foo"),
+                        context.keysAsync("#")
+                    ]).then(function(){
+                        stubSetAsync.calledWithExactly("1:flow","foo","alias").should.be.true();
+                        stubGetAsync.calledWithExactly("1:flow","foo").should.be.true();
+                        stubKeysAsync.calledWithExactly("1:flow").should.be.true();
+                    });
+                });
+            });
             it('should throw an error using undefined storage for local context', function(done) {
                 Context.init({contextStorage:contextStorage});
                 Context.load().then(function(){
@@ -537,8 +559,8 @@ describe('context', function() {
             returnModuleAndKey("#test.aaa.bbb","test","aaa.bbb");
             returnModuleAndKey("#1.234","1","234");
             returnModuleAndKey("##test.foo","#test","foo");
-            returnModuleAndKey("#test.#foo","test","#foo"); 
-            returnModuleAndKey("#test.#foo.#bar","test","#foo.#bar"); 
+            returnModuleAndKey("#test.#foo","test","#foo");
+            returnModuleAndKey("#test.#foo.#bar","test","#foo.#bar");
             returnModuleAndKey("#test..foo","test",".foo");
             returnModuleAndKey("#test..","test",".");
             returnModuleAndKey("#te-_st.aaa","te-_st","aaa");

From dd81d947fcac39aa94ad1e0a2d5dd1edcfad51b3 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Wed, 20 Jun 2018 19:50:55 +0900
Subject: [PATCH 074/113] Use native Promise instead of when.js

---
 red/runtime/nodes/context/index.js            | 15 ++--
 red/runtime/nodes/context/localfilesystem.js  | 21 +++--
 red/runtime/nodes/context/memory.js           | 13 ++--
 test/red/runtime/nodes/context/index_spec.js  | 49 ++++++------
 .../nodes/context/localfilesystem_spec.js     | 77 +++++++++----------
 5 files changed, 85 insertions(+), 90 deletions(-)

diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index 216a24855..4ea367185 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -16,7 +16,6 @@
 
 var clone = require("clone");
 var log = require("../../log");
-var when = require("when");
 
 var settings;
 var contexts = {};
@@ -59,14 +58,14 @@ function load() {
                     try{
                         plugin = require("./"+plugins[pluginName].module);
                     }catch(err){
-                        return when.reject(new Error(log._("context.error-module-not-loaded", {module:plugins[pluginName].module})));
+                        return Promise.reject(new Error(log._("context.error-module-not-loaded", {module:plugins[pluginName].module})));
                     }
                 } else {
                     plugin = plugins[pluginName].module;
                 }
                 externalContexts[pluginName] = plugin(config);
             }else{
-                return when.reject(new Error(log._("context.error-module-not-defined", {storage:pluginName})));
+                return Promise.reject(new Error(log._("context.error-module-not-defined", {storage:pluginName})));
             }
         }
         for(var plugin in externalContexts){
@@ -78,10 +77,10 @@ function load() {
             if(externalContexts.hasOwnProperty(plugins["default"])){
                 externalContexts["default"] =  externalContexts[plugins["default"]];
             }else{
-                return when.reject(new Error(log._("context.error-invalid-default-module", {storage:plugins["default"]})));
+                return Promise.reject(new Error(log._("context.error-invalid-default-module", {storage:plugins["default"]})));
             }
         }
-        return when.all(promises);
+        return Promise.all(promises);
     } else {
         noContextStorage = true;
         return externalContexts["_"].open();
@@ -224,7 +223,7 @@ function deleteContext(id,flowId) {
         delete contexts[contextId];
         return externalContexts["_"].delete(contextId);
     }else{
-        return when.resolve();
+        return Promise.resolve();
     }
 }
 
@@ -243,7 +242,7 @@ function clean(flowConfig) {
             }
         }
     }
-    return when.all(promises);
+    return Promise.all(promises);
 }
 
 function close() {
@@ -253,7 +252,7 @@ function close() {
             promises.push(externalContexts[plugin].close());
         }
     }
-    return when.all(promises);
+    return Promise.all(promises);
 }
 
 module.exports = {
diff --git a/red/runtime/nodes/context/localfilesystem.js b/red/runtime/nodes/context/localfilesystem.js
index e85e68e16..b49b2dacf 100644
--- a/red/runtime/nodes/context/localfilesystem.js
+++ b/red/runtime/nodes/context/localfilesystem.js
@@ -16,7 +16,6 @@
 
 var fs = require('fs-extra');
 var path = require("path");
-var when = require("when");
 var util = require("../../util");
 
 function getStoragePath(storageBaseDir, scope) {
@@ -67,10 +66,10 @@ function loadFile(storagePath){
         if(exists === true){
             return fs.readFile(storagePath, "utf8");
         }else{
-            return when.resolve(undefined);
+            return Promise.resolve(undefined);
         }
     }).catch(function(err){
-        throw when.reject(err);
+        throw Promise.reject(err);
     });
 }
 
@@ -80,11 +79,11 @@ function LocalFileSystem(config){
 }
 
 LocalFileSystem.prototype.open = function(){
-    return when.resolve();
+    return Promise.resolve();
 }
 
 LocalFileSystem.prototype.close = function(){
-    return when.resolve();
+    return Promise.resolve();
 }
 
 LocalFileSystem.prototype.getAsync = function(scope, key) {
@@ -96,7 +95,7 @@ LocalFileSystem.prototype.getAsync = function(scope, key) {
             return undefined
         }
     }).catch(function(err){
-        return when.reject(err);
+        return Promise.reject(err);
     });
 };
 
@@ -110,7 +109,7 @@ LocalFileSystem.prototype.setAsync =function(scope, key, value) {
         var str = JSON.stringify(obj, undefined, 4);
         return fs.outputFile(storagePath + ".json", str, {encoding:"utf8",flag:"w+"});
     }).catch(function(err){
-        return when.reject(err);
+        return Promise.reject(err);
     });
 };
 
@@ -123,7 +122,7 @@ LocalFileSystem.prototype.keysAsync = function(scope){
             return []
         }
     }).catch(function(err){
-        return when.reject(err);
+        return Promise.reject(err);
     });
 };
 
@@ -135,7 +134,7 @@ LocalFileSystem.prototype.delete = function(scope){
 LocalFileSystem.prototype.clean = function(activeNodes){
     var self = this;
     return fs.readdir(self.storageBaseDir).then(function(dirs){
-        return when.all(dirs.reduce(function(result, item){
+        return Promise.all(dirs.reduce(function(result, item){
             if(item !== "global" && activeNodes.indexOf(item) === -1){
                 result.push(fs.remove(path.join(self.storageBaseDir,item)));
             }
@@ -143,9 +142,9 @@ LocalFileSystem.prototype.clean = function(activeNodes){
         },[]));
     }).catch(function(err){
         if(err.code == 'ENOENT') {
-            return when.resolve();
+            return Promise.resolve();
         }else{
-            return when.reject(err);
+            return Promise.reject(err);
         }
     });
 }
diff --git a/red/runtime/nodes/context/memory.js b/red/runtime/nodes/context/memory.js
index 74a8a4380..ae9375f7b 100644
--- a/red/runtime/nodes/context/memory.js
+++ b/red/runtime/nodes/context/memory.js
@@ -15,18 +15,17 @@
  **/
 
 var util = require("../../util");
-var when = require("when");
 
 function Memory(config){
     this.data = {};
 }
 
 Memory.prototype.open = function(){
-    return when.resolve();
+    return Promise.resolve();
 };
 
 Memory.prototype.close = function(){
-    return when.resolve();
+    return Promise.resolve();
 };
 
 Memory.prototype.get = function(scope, key) {
@@ -46,7 +45,7 @@ Memory.prototype.set =function(scope, key, value) {
 Memory.prototype.keys = function(scope){
     if(!this.data[scope]){
         return [];
-    } 
+    }
     if (scope !== "global") {
         return Object.keys(this.data[scope]);
     } else {
@@ -57,15 +56,15 @@ Memory.prototype.keys = function(scope){
 };
 
 Memory.prototype.getAsync = function(scope, key) {
-    return when.resolve(this.get(scope, key));
+    return Promise.resolve(this.get(scope, key));
 };
 
 Memory.prototype.setAsync =function(scope, key, value) {
-    return when.resolve(this.set(scope, key, value));
+    return Promise.resolve(this.set(scope, key, value));
 };
 
 Memory.prototype.keysAsync = function(scope){
-    return when.resolve(this.keys(scope));
+    return Promise.resolve(this.keys(scope));
 };
 
 Memory.prototype.delete = function(scope){
diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index 9ea38a49b..65513374c 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -16,7 +16,6 @@
 
 var should = require("should");
 var sinon = require('sinon');
-var when = require("when")
 var rewire = require("rewire");
 var Context = require("../../../../../red/runtime/nodes/context/index");
 
@@ -169,20 +168,20 @@ describe('context', function() {
 
     describe('external context storage',function() {
         var sandbox = sinon.sandbox.create();
-        var stubGetAsync = sandbox.stub().returns(when.resolve());
-        var stubSetAsync = sandbox.stub().returns(when.resolve());
-        var stubKeysAsync = sandbox.stub().returns(when.resolve());
-        var stubDelete = sandbox.stub().returns(when.resolve());
-        var stubClean = sandbox.stub().returns(when.resolve());
-        var stubOpen = sandbox.stub().returns(when.resolve());
-        var stubClose = sandbox.stub().returns(when.resolve());
-        var stubGetAsync2 = sandbox.stub().returns(when.resolve());
-        var stubSetAsync2 = sandbox.stub().returns(when.resolve());
-        var stubKeysAsync2 = sandbox.stub().returns(when.resolve());
-        var stubDelete2 = sandbox.stub().returns(when.resolve());
-        var stubClean2 = sandbox.stub().returns(when.resolve());
-        var stubOpen2 = sandbox.stub().returns(when.resolve());
-        var stubClose2 = sandbox.stub().returns(when.resolve());
+        var stubGetAsync = sandbox.stub().returns(Promise.resolve());
+        var stubSetAsync = sandbox.stub().returns(Promise.resolve());
+        var stubKeysAsync = sandbox.stub().returns(Promise.resolve());
+        var stubDelete = sandbox.stub().returns(Promise.resolve());
+        var stubClean = sandbox.stub().returns(Promise.resolve());
+        var stubOpen = sandbox.stub().returns(Promise.resolve());
+        var stubClose = sandbox.stub().returns(Promise.resolve());
+        var stubGetAsync2 = sandbox.stub().returns(Promise.resolve());
+        var stubSetAsync2 = sandbox.stub().returns(Promise.resolve());
+        var stubKeysAsync2 = sandbox.stub().returns(Promise.resolve());
+        var stubDelete2 = sandbox.stub().returns(Promise.resolve());
+        var stubClean2 = sandbox.stub().returns(Promise.resolve());
+        var stubOpen2 = sandbox.stub().returns(Promise.resolve());
+        var stubClose2 = sandbox.stub().returns(Promise.resolve());
         var testPlugin = function(config){
             function Test(){}
             Test.prototype.getAsync = stubGetAsync;
@@ -262,7 +261,7 @@ describe('context', function() {
                 });
                 return Context.load().then(function(){
                     var context = Context.get("1","flow");
-                    return when.all([
+                    return Promise.all([
                         context.setAsync("##%&.sign","sign1").then(function(){
                             return context.getAsync("##%&.sign").should.finally.equal("sign1");
                         }),
@@ -279,7 +278,7 @@ describe('context', function() {
                 Context.init({contextStorage:{_:{module:testPlugin}}});
                 return Context.load().then(function(){
                     var context = Context.get("1","flow");
-                    return when.all([
+                    return Promise.all([
                         context.setAsync("#_.foo","bar"),
                         context.getAsync("#_.foo"),
                         context.keysAsync("#_")
@@ -333,7 +332,7 @@ describe('context', function() {
                 Context.init({contextStorage:contextStorage});
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    return when.all([
+                    return Promise.all([
                         context.setAsync("#test.foo","test"),
                         context.getAsync("#test.foo"),
                         context.keysAsync("#test")
@@ -348,7 +347,7 @@ describe('context', function() {
                 Context.init({contextStorage:contextStorage});
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    return when.all([
+                    return Promise.all([
                         context.flow.setAsync("#test.foo","test"),
                         context.flow.getAsync("#test.foo"),
                         context.flow.keysAsync("#test")
@@ -363,7 +362,7 @@ describe('context', function() {
                 Context.init({contextStorage:contextStorage});
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    return when.all([
+                    return Promise.all([
                         context.global.setAsync("#test.foo","test"),
                         context.global.getAsync("#test.foo"),
                         context.global.keysAsync("#test")
@@ -378,7 +377,7 @@ describe('context', function() {
                 Context.init({contextStorage:contextDefaultStorage});
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    return when.all([
+                    return Promise.all([
                         context.setAsync("#nonexist.foo","test"),
                         context.getAsync("#nonexist.foo"),
                         context.keysAsync("#nonexist")
@@ -396,7 +395,7 @@ describe('context', function() {
                 Context.init({contextStorage:contextDefaultStorage});
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    return when.all([
+                    return Promise.all([
                         context.setAsync("#default.foo","default"),
                         context.getAsync("#default.foo"),
                         context.keysAsync("#default")
@@ -414,7 +413,7 @@ describe('context', function() {
                 Context.init({contextStorage:contextDefaultStorage});
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    return when.all([
+                    return Promise.all([
                         context.setAsync("#.foo","alias"),
                         context.getAsync("#.foo"),
                         context.keysAsync("#")
@@ -432,7 +431,7 @@ describe('context', function() {
                 Context.init({contextStorage:contextAlias});
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    return when.all([
+                    return Promise.all([
                         context.setAsync("#.foo","alias"),
                         context.getAsync("#.foo"),
                         context.keysAsync("#")
@@ -510,7 +509,7 @@ describe('context', function() {
                 return Context.close();
             });
             it('should work correctly with the valid key name',function() {
-                return when.all([
+                return Promise.all([
                     context.setAsync("#memory.azAZ09#_","valid"),
                     context.setAsync("#memory.a.b","ab")
                 ]).then(function(){
diff --git a/test/red/runtime/nodes/context/localfilesystem_spec.js b/test/red/runtime/nodes/context/localfilesystem_spec.js
index f90bb53d9..a8ecf8cc3 100644
--- a/test/red/runtime/nodes/context/localfilesystem_spec.js
+++ b/test/red/runtime/nodes/context/localfilesystem_spec.js
@@ -17,7 +17,6 @@
 var should = require('should');
 var fs = require('fs-extra');
 var path = require("path");
-var when = require("when");
 var LocalFileSystem = require('../../../../../red/runtime/nodes/context/localfilesystem');
 
 var resourcesDir = path.resolve(path.join(__dirname,"..","resources","context"));
@@ -76,14 +75,14 @@ describe('localfilesystem',function() {
         });
 
         it('should not shared context with other scope', function() {
-            return when.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
-                             context.getAsync("nodeY","foo").should.be.finally.undefined()
+            return Promise.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
+                                context.getAsync("nodeY","foo").should.be.finally.undefined()
             ]).then(function(){
-                return when.all([context.setAsync("nodeX","foo","testX"),
-                                 context.setAsync("nodeY","foo","testY")])
+                return Promise.all([context.setAsync("nodeX","foo","testX"),
+                                    context.setAsync("nodeY","foo","testY")])
             }).then(function(){
-                return when.all([context.getAsync("nodeX","foo").should.be.finally.equal("testX"),
-                                 context.getAsync("nodeY","foo").should.be.finally.equal("testY")]);
+                return Promise.all([context.getAsync("nodeX","foo").should.be.finally.equal("testX"),
+                                    context.getAsync("nodeY","foo").should.be.finally.equal("testY")]);
             });
         });
 
@@ -234,19 +233,19 @@ describe('localfilesystem',function() {
         });
 
         it('should enumerate context keys in each scopes', function() {
-            return when.all([context.keysAsync("nodeX"),
-                             context.keysAsync("nodeY")
+            return Promise.all([context.keysAsync("nodeX"),
+                                context.keysAsync("nodeY")
             ]).then(function(results){
                 results[0].should.be.an.Array();
                 results[0].should.be.empty();
                 results[1].should.be.an.Array();
                 results[1].should.be.empty();
             }).then(function(){
-                return when.all([context.setAsync("nodeX","foo","bar"),
-                                 context.setAsync("nodeY","hoge","piyo")]);
+                return Promise.all([context.setAsync("nodeX","foo","bar"),
+                                    context.setAsync("nodeY","hoge","piyo")]);
             }).then(function(){
-                return when.all([context.keysAsync("nodeX"),
-                                 context.keysAsync("nodeY")]);
+                return Promise.all([context.keysAsync("nodeX"),
+                                    context.keysAsync("nodeY")]);
             }).then(function(results){
                 results[0].should.have.length(1);
                 results[0][0].should.equal("foo");
@@ -258,55 +257,55 @@ describe('localfilesystem',function() {
 
     describe('#delete',function() {
         it('should delete context',function() {
-            return when.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
-                             context.getAsync("nodeY","foo").should.be.finally.undefined()
+            return Promise.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
+                                context.getAsync("nodeY","foo").should.be.finally.undefined()
             ]).then(function(){
-                return when.all([context.setAsync("nodeX","foo","abc"),
-                                 context.setAsync("nodeY","foo","abc")]);
+                return Promise.all([context.setAsync("nodeX","foo","abc"),
+                                    context.setAsync("nodeY","foo","abc")]);
             }).then(function(){
-                return when.all([context.getAsync("nodeX","foo").should.be.finally.equal("abc"),
-                                 context.getAsync("nodeY","foo").should.be.finally.equal("abc")])
+                return Promise.all([context.getAsync("nodeX","foo").should.be.finally.equal("abc"),
+                                    context.getAsync("nodeY","foo").should.be.finally.equal("abc")])
             }).then(function(){
                 return context.delete("nodeX");
             }).then(function(){
-                return when.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
-                                 context.getAsync("nodeY","foo").should.be.finally.equal("abc")]);
-            });  
+                return Promise.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
+                                    context.getAsync("nodeY","foo").should.be.finally.equal("abc")]);
+            });
         });
     });
 
     describe('#clean',function() {
         it('should clean unnecessary context',function() {
-            return when.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
-                             context.getAsync("nodeY","foo").should.be.finally.undefined()
-            ]).then(function(values){
-                return when.all([context.setAsync("nodeX","foo","abc"),
-                                 context.setAsync("nodeY","foo","abc")]);
+            return Promise.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
+                                context.getAsync("nodeY","foo").should.be.finally.undefined()
+            ]).then(function(){
+                return Promise.all([context.setAsync("nodeX","foo","abc"),
+                                    context.setAsync("nodeY","foo","abc")]);
             }).then(function(){
-                return when.all([context.getAsync("nodeX","foo").should.be.finally.equal("abc"),
-                                 context.getAsync("nodeY","foo").should.be.finally.equal("abc")])
+                return Promise.all([context.getAsync("nodeX","foo").should.be.finally.equal("abc"),
+                                    context.getAsync("nodeY","foo").should.be.finally.equal("abc")])
             }).then(function(){
                 return context.clean([]);
             }).then(function(){
-                return when.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
-                                 context.getAsync("nodeY","foo").should.be.finally.undefined()]);
+                return Promise.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
+                                    context.getAsync("nodeY","foo").should.be.finally.undefined()]);
             });
         });
 
         it('should not clean active context',function() {
-            return when.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
-                             context.getAsync("nodeY","foo").should.be.finally.undefined()
+            return Promise.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
+                                context.getAsync("nodeY","foo").should.be.finally.undefined()
             ]).then(function(){
-                return when.all([context.setAsync("nodeX","foo","abc"),
-                                 context.setAsync("nodeY","foo","abc")]);
+                return Promise.all([context.setAsync("nodeX","foo","abc"),
+                                    context.setAsync("nodeY","foo","abc")]);
             }).then(function(){
-                return when.all([context.getAsync("nodeX","foo").should.be.finally.equal("abc"),
-                                 context.getAsync("nodeY","foo").should.be.finally.equal("abc")])
+                return Promise.all([context.getAsync("nodeX","foo").should.be.finally.equal("abc"),
+                                    context.getAsync("nodeY","foo").should.be.finally.equal("abc")])
             }).then(function(){
                 return context.clean(["nodeX"]);
             }).then(function(){
-                return when.all([context.getAsync("nodeX","foo").should.be.finally.equal("abc"),
-                                 context.getAsync("nodeY","foo").should.be.finally.undefined()]);
+                return Promise.all([context.getAsync("nodeX","foo").should.be.finally.equal("abc"),
+                                    context.getAsync("nodeY","foo").should.be.finally.undefined()]);
             });
         });
     });

From e6411d11b1c4bb68bd210f6fd56776bcdf7ab612 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Wed, 20 Jun 2018 20:00:39 +0900
Subject: [PATCH 075/113] Remove unnecessary context storage APIs and rename
 context storage APIs

---
 red/runtime/nodes/context/index.js            |   6 +-
 red/runtime/nodes/context/localfilesystem.js  |   6 +-
 red/runtime/nodes/context/memory.js           |  12 --
 test/red/runtime/nodes/context/index_spec.js  | 176 +++++++++---------
 .../nodes/context/localfilesystem_spec.js     | 176 +++++++++---------
 5 files changed, 182 insertions(+), 194 deletions(-)

diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index 4ea367185..e52308200 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -180,17 +180,17 @@ function createContext(id,seed) {
     obj.getAsync = function(key) {
         var keyPath = parseKey(key);
         var context = getContextStorage(keyPath.storage);
-        return context.getAsync(scope, keyPath.key);
+        return context.get(scope, keyPath.key);
     };
     obj.setAsync  = function(key, value) {
         var keyPath = parseKey(key);
         var context = getContextStorage(keyPath.storage);
-        return context.setAsync(scope, keyPath.key, value);
+        return context.set(scope, keyPath.key, value);
     };
     obj.keysAsync  = function(storage) {
         var storageName = parseStorage(storage);
         var context = getContextStorage(storageName);
-        return context.keysAsync(scope);
+        return context.keys(scope);
     };
     return obj;
 }
diff --git a/red/runtime/nodes/context/localfilesystem.js b/red/runtime/nodes/context/localfilesystem.js
index b49b2dacf..1d8352f56 100644
--- a/red/runtime/nodes/context/localfilesystem.js
+++ b/red/runtime/nodes/context/localfilesystem.js
@@ -86,7 +86,7 @@ LocalFileSystem.prototype.close = function(){
     return Promise.resolve();
 }
 
-LocalFileSystem.prototype.getAsync = function(scope, key) {
+LocalFileSystem.prototype.get = function(scope, key) {
     var storagePath = getStoragePath(this.storageBaseDir ,scope);
     return loadFile(storagePath + ".json").then(function(data){
         if(data){
@@ -99,7 +99,7 @@ LocalFileSystem.prototype.getAsync = function(scope, key) {
     });
 };
 
-LocalFileSystem.prototype.setAsync =function(scope, key, value) {
+LocalFileSystem.prototype.set =function(scope, key, value) {
     var storagePath = getStoragePath(this.storageBaseDir ,scope);
     return loadFile(storagePath + ".json").then(function(data){
         var obj = data ? JSON.parse(data) : {}
@@ -113,7 +113,7 @@ LocalFileSystem.prototype.setAsync =function(scope, key, value) {
     });
 };
 
-LocalFileSystem.prototype.keysAsync = function(scope){
+LocalFileSystem.prototype.keys = function(scope){
     var storagePath = getStoragePath(this.storageBaseDir ,scope);
     return loadFile(storagePath + ".json").then(function(data){
         if(data){
diff --git a/red/runtime/nodes/context/memory.js b/red/runtime/nodes/context/memory.js
index ae9375f7b..6ded30d45 100644
--- a/red/runtime/nodes/context/memory.js
+++ b/red/runtime/nodes/context/memory.js
@@ -55,18 +55,6 @@ Memory.prototype.keys = function(scope){
     }
 };
 
-Memory.prototype.getAsync = function(scope, key) {
-    return Promise.resolve(this.get(scope, key));
-};
-
-Memory.prototype.setAsync =function(scope, key, value) {
-    return Promise.resolve(this.set(scope, key, value));
-};
-
-Memory.prototype.keysAsync = function(scope){
-    return Promise.resolve(this.keys(scope));
-};
-
 Memory.prototype.delete = function(scope){
     delete this.data[scope];
     return Promise.resolve();
diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index 65513374c..00ac99fa6 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -168,25 +168,25 @@ describe('context', function() {
 
     describe('external context storage',function() {
         var sandbox = sinon.sandbox.create();
-        var stubGetAsync = sandbox.stub().returns(Promise.resolve());
-        var stubSetAsync = sandbox.stub().returns(Promise.resolve());
-        var stubKeysAsync = sandbox.stub().returns(Promise.resolve());
+        var stubGet = sandbox.stub().returns(Promise.resolve());
+        var stubSet = sandbox.stub().returns(Promise.resolve());
+        var stubKeys = sandbox.stub().returns(Promise.resolve());
         var stubDelete = sandbox.stub().returns(Promise.resolve());
         var stubClean = sandbox.stub().returns(Promise.resolve());
         var stubOpen = sandbox.stub().returns(Promise.resolve());
         var stubClose = sandbox.stub().returns(Promise.resolve());
-        var stubGetAsync2 = sandbox.stub().returns(Promise.resolve());
-        var stubSetAsync2 = sandbox.stub().returns(Promise.resolve());
-        var stubKeysAsync2 = sandbox.stub().returns(Promise.resolve());
+        var stubGet2 = sandbox.stub().returns(Promise.resolve());
+        var stubSet2 = sandbox.stub().returns(Promise.resolve());
+        var stubKeys2 = sandbox.stub().returns(Promise.resolve());
         var stubDelete2 = sandbox.stub().returns(Promise.resolve());
         var stubClean2 = sandbox.stub().returns(Promise.resolve());
         var stubOpen2 = sandbox.stub().returns(Promise.resolve());
         var stubClose2 = sandbox.stub().returns(Promise.resolve());
         var testPlugin = function(config){
             function Test(){}
-            Test.prototype.getAsync = stubGetAsync;
-            Test.prototype.setAsync = stubSetAsync;
-            Test.prototype.keysAsync = stubKeysAsync;
+            Test.prototype.get = stubGet;
+            Test.prototype.set = stubSet;
+            Test.prototype.keys = stubKeys;
             Test.prototype.delete = stubDelete;
             Test.prototype.clean = stubClean;
             Test.prototype.open = stubOpen;
@@ -195,9 +195,9 @@ describe('context', function() {
         };
         var testPlugin2 = function(config){
             function Test2(){}
-            Test2.prototype.getAsync = stubGetAsync2;
-            Test2.prototype.setAsync = stubSetAsync2;
-            Test2.prototype.keysAsync = stubKeysAsync2;
+            Test2.prototype.get = stubGet2;
+            Test2.prototype.set = stubSet2;
+            Test2.prototype.keys = stubKeys2;
             Test2.prototype.delete = stubDelete2;
             Test2.prototype.clean = stubClean2;
             Test2.prototype.open = stubOpen2;
@@ -262,14 +262,14 @@ describe('context', function() {
                 return Context.load().then(function(){
                     var context = Context.get("1","flow");
                     return Promise.all([
-                        context.setAsync("##%&.sign","sign1").then(function(){
-                            return context.getAsync("##%&.sign").should.finally.equal("sign1");
+                        context.set("##%&.sign","sign1").then(function(){
+                            return context.get("##%&.sign").should.finally.equal("sign1");
                         }),
-                        context.setAsync("#\u3042.file2","file2").then(function(){
-                            return context.getAsync("#\u3042.file2").should.finally.equal("file2");
+                        context.set("#\u3042.file2","file2").then(function(){
+                            return context.get("#\u3042.file2").should.finally.equal("file2");
                         }),
-                        context.setAsync("#1.num","num3").then(function(){
-                            return context.getAsync("#1.num").should.finally.equal("num3");
+                        context.set("#1.num","num3").then(function(){
+                            return context.get("#1.num").should.finally.equal("num3");
                         })
                     ]);
                 });
@@ -279,13 +279,13 @@ describe('context', function() {
                 return Context.load().then(function(){
                     var context = Context.get("1","flow");
                     return Promise.all([
-                        context.setAsync("#_.foo","bar"),
-                        context.getAsync("#_.foo"),
-                        context.keysAsync("#_")
+                        context.set("#_.foo","bar"),
+                        context.get("#_.foo"),
+                        context.keys("#_")
                     ]).then(function(){
-                        stubSetAsync.called.should.be.false();
-                        stubGetAsync.called.should.be.false();
-                        stubKeysAsync.called.should.be.false();
+                        stubSet.called.should.be.false();
+                        stubGet.called.should.be.false();
+                        stubKeys.called.should.be.false();
                     });
                 });
             });
@@ -333,13 +333,13 @@ describe('context', function() {
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
                     return Promise.all([
-                        context.setAsync("#test.foo","test"),
-                        context.getAsync("#test.foo"),
-                        context.keysAsync("#test")
+                        context.set("#test.foo","test"),
+                        context.get("#test.foo"),
+                        context.keys("#test")
                     ]).then(function(){
-                        stubSetAsync.calledWithExactly("1:flow","foo","test").should.be.true();
-                        stubGetAsync.calledWithExactly("1:flow","foo").should.be.true();
-                        stubKeysAsync.calledWithExactly("1:flow").should.be.true();
+                        stubSet.calledWithExactly("1:flow","foo","test").should.be.true();
+                        stubGet.calledWithExactly("1:flow","foo").should.be.true();
+                        stubKeys.calledWithExactly("1:flow").should.be.true();
                     });
                 });
             });
@@ -348,13 +348,13 @@ describe('context', function() {
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
                     return Promise.all([
-                        context.flow.setAsync("#test.foo","test"),
-                        context.flow.getAsync("#test.foo"),
-                        context.flow.keysAsync("#test")
+                        context.flow.set("#test.foo","test"),
+                        context.flow.get("#test.foo"),
+                        context.flow.keys("#test")
                     ]).then(function(){
-                        stubSetAsync.calledWithExactly("flow","foo","test").should.be.true();
-                        stubGetAsync.calledWithExactly("flow","foo").should.be.true();
-                        stubKeysAsync.calledWithExactly("flow").should.be.true();
+                        stubSet.calledWithExactly("flow","foo","test").should.be.true();
+                        stubGet.calledWithExactly("flow","foo").should.be.true();
+                        stubKeys.calledWithExactly("flow").should.be.true();
                     });
                 });
             });
@@ -363,13 +363,13 @@ describe('context', function() {
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
                     return Promise.all([
-                        context.global.setAsync("#test.foo","test"),
-                        context.global.getAsync("#test.foo"),
-                        context.global.keysAsync("#test")
+                        context.global.set("#test.foo","test"),
+                        context.global.get("#test.foo"),
+                        context.global.keys("#test")
                     ]).then(function(){
-                        stubSetAsync.calledWithExactly("global","foo","test").should.be.true();
-                        stubGetAsync.calledWithExactly("global","foo").should.be.true();
-                        stubKeysAsync.calledWithExactly("global").should.be.true();
+                        stubSet.calledWithExactly("global","foo","test").should.be.true();
+                        stubGet.calledWithExactly("global","foo").should.be.true();
+                        stubKeys.calledWithExactly("global").should.be.true();
                     });
                 });
             });
@@ -378,16 +378,16 @@ describe('context', function() {
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
                     return Promise.all([
-                        context.setAsync("#nonexist.foo","test"),
-                        context.getAsync("#nonexist.foo"),
-                        context.keysAsync("#nonexist")
+                        context.set("#nonexist.foo","test"),
+                        context.get("#nonexist.foo"),
+                        context.keys("#nonexist")
                     ]).then(function(){
-                        stubGetAsync.called.should.be.false();
-                        stubSetAsync.called.should.be.false();
-                        stubKeysAsync.called.should.be.false();
-                        stubSetAsync2.calledWithExactly("1:flow","foo","test").should.be.true();
-                        stubGetAsync2.calledWithExactly("1:flow","foo").should.be.true();
-                        stubKeysAsync2.calledWithExactly("1:flow").should.be.true();
+                        stubGet.called.should.be.false();
+                        stubSet.called.should.be.false();
+                        stubKeys.called.should.be.false();
+                        stubSet2.calledWithExactly("1:flow","foo","test").should.be.true();
+                        stubGet2.calledWithExactly("1:flow","foo").should.be.true();
+                        stubKeys2.calledWithExactly("1:flow").should.be.true();
                     });
                 });
             });
@@ -396,16 +396,16 @@ describe('context', function() {
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
                     return Promise.all([
-                        context.setAsync("#default.foo","default"),
-                        context.getAsync("#default.foo"),
-                        context.keysAsync("#default")
+                        context.set("#default.foo","default"),
+                        context.get("#default.foo"),
+                        context.keys("#default")
                     ]).then(function(){
-                        stubGetAsync.called.should.be.false();
-                        stubSetAsync.called.should.be.false();
-                        stubKeysAsync.called.should.be.false();
-                        stubSetAsync2.calledWithExactly("1:flow","foo","default").should.be.true();
-                        stubGetAsync2.calledWithExactly("1:flow","foo").should.be.true();
-                        stubKeysAsync2.calledWithExactly("1:flow").should.be.true();
+                        stubGet.called.should.be.false();
+                        stubSet.called.should.be.false();
+                        stubKeys.called.should.be.false();
+                        stubSet2.calledWithExactly("1:flow","foo","default").should.be.true();
+                        stubGet2.calledWithExactly("1:flow","foo").should.be.true();
+                        stubKeys2.calledWithExactly("1:flow").should.be.true();
                     });
                 });
             });
@@ -414,16 +414,16 @@ describe('context', function() {
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
                     return Promise.all([
-                        context.setAsync("#.foo","alias"),
-                        context.getAsync("#.foo"),
-                        context.keysAsync("#")
+                        context.set("#.foo","alias"),
+                        context.get("#.foo"),
+                        context.keys("#")
                     ]).then(function(){
-                        stubGetAsync.called.should.be.false();
-                        stubSetAsync.called.should.be.false();
-                        stubKeysAsync.called.should.be.false();
-                        stubSetAsync2.calledWithExactly("1:flow","foo","alias").should.be.true();
-                        stubGetAsync2.calledWithExactly("1:flow","foo").should.be.true();
-                        stubKeysAsync2.calledWithExactly("1:flow").should.be.true();
+                        stubGet.called.should.be.false();
+                        stubSet.called.should.be.false();
+                        stubKeys.called.should.be.false();
+                        stubSet2.calledWithExactly("1:flow","foo","alias").should.be.true();
+                        stubGet2.calledWithExactly("1:flow","foo").should.be.true();
+                        stubKeys2.calledWithExactly("1:flow").should.be.true();
                     });
                 });
             });
@@ -432,13 +432,13 @@ describe('context', function() {
                 return Context.load().then(function(){
                     var context =  Context.get("1","flow");
                     return Promise.all([
-                        context.setAsync("#.foo","alias"),
-                        context.getAsync("#.foo"),
-                        context.keysAsync("#")
+                        context.set("#.foo","alias"),
+                        context.get("#.foo"),
+                        context.keys("#")
                     ]).then(function(){
-                        stubSetAsync.calledWithExactly("1:flow","foo","alias").should.be.true();
-                        stubGetAsync.calledWithExactly("1:flow","foo").should.be.true();
-                        stubKeysAsync.calledWithExactly("1:flow").should.be.true();
+                        stubSet.calledWithExactly("1:flow","foo","alias").should.be.true();
+                        stubGet.calledWithExactly("1:flow","foo").should.be.true();
+                        stubKeys.calledWithExactly("1:flow").should.be.true();
                     });
                 });
             });
@@ -446,7 +446,7 @@ describe('context', function() {
                 Context.init({contextStorage:contextStorage});
                 Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    context.getAsync("#nonexist.local");
+                    context.get("#nonexist.local");
                     should.fail(null, null, "An error was not thrown using undefined storage for local context");
                 }).catch(function(err) {
                     if (err.name === "ContextError") {
@@ -460,7 +460,7 @@ describe('context', function() {
                 Context.init({contextStorage:contextStorage});
                 Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    context.flow.setAsync("#nonexist.flow");
+                    context.flow.set("#nonexist.flow");
                     should.fail(null, null, "An error was not thrown using undefined storage for flow context");
                 }).catch(function(err) {
                     if (err.name === "ContextError") {
@@ -510,35 +510,35 @@ describe('context', function() {
             });
             it('should work correctly with the valid key name',function() {
                 return Promise.all([
-                    context.setAsync("#memory.azAZ09#_","valid"),
-                    context.setAsync("#memory.a.b","ab")
+                    context.set("#memory.azAZ09#_","valid"),
+                    context.set("#memory.a.b","ab")
                 ]).then(function(){
-                    context.getAsync("#memory.azAZ09#_").should.finally.equal("valid");
-                    context.getAsync("#memory.a.b").should.finally.equal("ab");
+                    context.get("#memory.azAZ09#_").should.finally.equal("valid");
+                    context.get("#memory.a.b").should.finally.equal("ab");
                 });
             });
             it('should treat the key name without dot as a normal context',function() {
-                return context.setAsync("#memory","normal").then(function(){
-                    return context.getAsync("#memory").should.finally.equal("normal");
+                return context.set("#memory","normal").then(function(){
+                    return context.get("#memory").should.finally.equal("normal");
                 });
             });
             it('should fail when specifying invalid characters',function() {
                 (function() {
-                    context.setAsync("#memory.a.-","invalid1");
+                    context.set("#memory.a.-","invalid1");
                 }).should.throw();
                 (function() {
-                    context.setAsync("#memory.'abc","invalid2");
+                    context.set("#memory.'abc","invalid2");
                 }).should.throw();
             });
             it('should fail when specifying unnecesary space characters for key name',function() {
                 (function() {
-                    context.setAsync("# memory.space","space1");
+                    context.set("# memory.space","space1");
                 }).should.throw();
                 (function() {
-                    context.setAsync("#memory .space","space2");
+                    context.set("#memory .space","space2");
                 }).should.throw();
                 (function() {
-                    context.setAsync("#memory. space","space3");
+                    context.set("#memory. space","space3");
                 }).should.throw();
             });
         });
diff --git a/test/red/runtime/nodes/context/localfilesystem_spec.js b/test/red/runtime/nodes/context/localfilesystem_spec.js
index a8ecf8cc3..4a0d0643b 100644
--- a/test/red/runtime/nodes/context/localfilesystem_spec.js
+++ b/test/red/runtime/nodes/context/localfilesystem_spec.js
@@ -37,68 +37,68 @@ describe('localfilesystem',function() {
         });
     });
 
-    describe('#getAsync/setAsync',function() {
+    describe('#get/set',function() {
         it('should store property',function() {
-            return context.getAsync("nodeX","foo").should.be.finally.undefined()
+            return context.get("nodeX","foo").should.be.finally.undefined()
             .then(function(){
-                return context.setAsync("nodeX","foo","test");
+                return context.set("nodeX","foo","test");
             }).then(function(){
-                return context.getAsync("nodeX","foo").should.be.finally.equal("test");
+                return context.get("nodeX","foo").should.be.finally.equal("test");
             });
         });
 
         it('should store property - creates parent properties',function() {
-            return context.setAsync("nodeX","foo.bar","test").then(function(){
-                return context.getAsync("nodeX","foo").should.be.finally.eql({bar:"test"});
+            return context.set("nodeX","foo.bar","test").then(function(){
+                return context.get("nodeX","foo").should.be.finally.eql({bar:"test"});
             });
         });
 
         it('should delete property',function() {
-            return context.setAsync("nodeX","foo.abc.bar1","test1")
+            return context.set("nodeX","foo.abc.bar1","test1")
             .then(function(){
-                return context.setAsync("nodeX","foo.abc.bar2","test2")
+                return context.set("nodeX","foo.abc.bar2","test2")
             }).then(function(){
-                return context.getAsync("nodeX","foo.abc").should.be.finally.eql({bar1:"test1",bar2:"test2"});
+                return context.get("nodeX","foo.abc").should.be.finally.eql({bar1:"test1",bar2:"test2"});
             }).then(function(){
-                return context.setAsync("nodeX","foo.abc.bar1",undefined).then(function(){
-                   return context.getAsync("nodeX","foo.abc").should.be.finally.eql({bar2:"test2"});
+                return context.set("nodeX","foo.abc.bar1",undefined).then(function(){
+                   return context.get("nodeX","foo.abc").should.be.finally.eql({bar2:"test2"});
                 });
             }).then(function(){
-                return context.setAsync("nodeX","foo.abc",undefined).then(function(){
-                    return context.getAsync("nodeX","foo.abc").should.be.finally.undefined();
+                return context.set("nodeX","foo.abc",undefined).then(function(){
+                    return context.get("nodeX","foo.abc").should.be.finally.undefined();
                 });
             }).then(function(){
-                return context.setAsync("nodeX","foo",undefined).then(function(){
-                    return context.getAsync("nodeX","foo").should.be.finally.undefined();
+                return context.set("nodeX","foo",undefined).then(function(){
+                    return context.get("nodeX","foo").should.be.finally.undefined();
                 });
             });
         });
 
         it('should not shared context with other scope', function() {
-            return Promise.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
-                                context.getAsync("nodeY","foo").should.be.finally.undefined()
+            return Promise.all([context.get("nodeX","foo").should.be.finally.undefined(),
+                                context.get("nodeY","foo").should.be.finally.undefined()
             ]).then(function(){
-                return Promise.all([context.setAsync("nodeX","foo","testX"),
-                                    context.setAsync("nodeY","foo","testY")])
+                return Promise.all([context.set("nodeX","foo","testX"),
+                                    context.set("nodeY","foo","testY")])
             }).then(function(){
-                return Promise.all([context.getAsync("nodeX","foo").should.be.finally.equal("testX"),
-                                    context.getAsync("nodeY","foo").should.be.finally.equal("testY")]);
+                return Promise.all([context.get("nodeX","foo").should.be.finally.equal("testX"),
+                                    context.get("nodeY","foo").should.be.finally.equal("testY")]);
             });
         });
 
         it('should store string',function() {
-            return context.getAsync("nodeX","foo").should.be.finally.undefined()
+            return context.get("nodeX","foo").should.be.finally.undefined()
             .then(function(){
-                return context.setAsync("nodeX","foo","bar");
+                return context.set("nodeX","foo","bar");
             }).then(function(){
-                return context.getAsync("nodeX","foo")
+                return context.get("nodeX","foo")
             }).then(function(result){
                 result.should.be.String();
                 result.should.be.equal("bar");
             }).then(function(){
-                return context.setAsync("nodeX","foo","1");
+                return context.set("nodeX","foo","1");
             }).then(function(){
-                return context.getAsync("nodeX","foo")
+                return context.get("nodeX","foo")
             }).then(function(result){
                 result.should.be.String();
                 result.should.be.equal("1");
@@ -106,11 +106,11 @@ describe('localfilesystem',function() {
         });
 
         it('should store number',function() {
-            return context.getAsync("nodeX","foo").should.be.finally.undefined()
+            return context.get("nodeX","foo").should.be.finally.undefined()
             .then(function(){
-                return context.setAsync("nodeX","foo",1);
+                return context.set("nodeX","foo",1);
             }).then(function(){
-                return context.getAsync("nodeX","foo")
+                return context.get("nodeX","foo")
             }).then(function(result){
                 result.should.be.Number();
                 result.should.be.equal(1);
@@ -118,33 +118,33 @@ describe('localfilesystem',function() {
         });
 
         it('should store null',function() {
-            return context.getAsync("nodeX","foo").should.be.finally.undefined()
+            return context.get("nodeX","foo").should.be.finally.undefined()
             .then(function(){
-                return context.setAsync("nodeX","foo",null);
+                return context.set("nodeX","foo",null);
             }).then(function(){
-                return context.getAsync("nodeX","foo").should.be.finally.null();
+                return context.get("nodeX","foo").should.be.finally.null();
             });
         });
 
         it('should store boolean',function() {
-            return context.getAsync("nodeX","foo").should.be.finally.undefined()
+            return context.get("nodeX","foo").should.be.finally.undefined()
             .then(function(){
-                return context.setAsync("nodeX","foo",true);
+                return context.set("nodeX","foo",true);
             }).then(function(){
-                return context.getAsync("nodeX","foo").should.be.finally.Boolean().and.true();
+                return context.get("nodeX","foo").should.be.finally.Boolean().and.true();
             }).then(function(){
-                return context.setAsync("nodeX","foo",false);
+                return context.set("nodeX","foo",false);
             }).then(function(){
-                return context.getAsync("nodeX","foo").should.be.finally.Boolean().and.false();
+                return context.get("nodeX","foo").should.be.finally.Boolean().and.false();
             });
         });
 
         it('should store object',function() {
-            return context.getAsync("nodeX","foo").should.be.finally.undefined()
+            return context.get("nodeX","foo").should.be.finally.undefined()
             .then(function(){
-                return context.setAsync("nodeX","foo",{obj:"bar"});
+                return context.set("nodeX","foo",{obj:"bar"});
             }).then(function(){
-                return context.getAsync("nodeX","foo")
+                return context.get("nodeX","foo")
             }).then(function(result){
                 result.should.be.Object();
                 result.should.eql({obj:"bar"});
@@ -152,16 +152,16 @@ describe('localfilesystem',function() {
         });
 
         it('should store array',function() {
-            return context.getAsync("nodeX","foo").should.be.finally.undefined()
+            return context.get("nodeX","foo").should.be.finally.undefined()
             .then(function(){
-                return context.setAsync("nodeX","foo",["a","b","c"]);
+                return context.set("nodeX","foo",["a","b","c"]);
             }).then(function(){
-                return context.getAsync("nodeX","foo")
+                return context.get("nodeX","foo")
             }).then(function(result){
                 result.should.be.Array();
                 result.should.eql(["a","b","c"]);
             }).then(function(){
-                return context.getAsync("nodeX","foo[1]")
+                return context.get("nodeX","foo[1]")
             }).then(function(result){
                 result.should.be.String();
                 result.should.equal("b");
@@ -169,11 +169,11 @@ describe('localfilesystem',function() {
         });
 
         it('should store array of arrays',function() {
-            return context.getAsync("nodeX","foo").should.be.finally.undefined()
+            return context.get("nodeX","foo").should.be.finally.undefined()
             .then(function(){
-                return context.setAsync("nodeX","foo",[["a","b","c"],[1,2,3,4],[true,false]]);
+                return context.set("nodeX","foo",[["a","b","c"],[1,2,3,4],[true,false]]);
             }).then(function(){
-                return context.getAsync("nodeX","foo")
+                return context.get("nodeX","foo")
             }).then(function(result){
                 result.should.be.Array();
                 result.should.have.length(3);
@@ -181,7 +181,7 @@ describe('localfilesystem',function() {
                 result[1].should.have.length(4);
                 result[2].should.have.length(2);
             }).then(function(){
-                return context.getAsync("nodeX","foo[1]")
+                return context.get("nodeX","foo[1]")
             }).then(function(result){
                 result.should.be.Array();
                 result.should.have.length(4);
@@ -190,11 +190,11 @@ describe('localfilesystem',function() {
         });
 
         it('should store array of objects',function() {
-            return context.getAsync("nodeX","foo").should.be.finally.undefined()
+            return context.get("nodeX","foo").should.be.finally.undefined()
             .then(function(){
-                return context.setAsync("nodeX","foo",[{obj:"bar1"},{obj:"bar2"},{obj:"bar3"}]);
+                return context.set("nodeX","foo",[{obj:"bar1"},{obj:"bar2"},{obj:"bar3"}]);
             }).then(function(){
-                return context.getAsync("nodeX","foo")
+                return context.get("nodeX","foo")
             }).then(function(result){
                 result.should.be.Array();
                 result.should.have.length(3);
@@ -202,7 +202,7 @@ describe('localfilesystem',function() {
                 result[1].should.be.Object();
                 result[2].should.be.Object();
             }).then(function(){
-                return context.getAsync("nodeX","foo[1]")
+                return context.get("nodeX","foo[1]")
             }).then(function(result){
                 result.should.be.Object();
                 result.should.be.eql({obj:"bar2"});
@@ -210,22 +210,22 @@ describe('localfilesystem',function() {
         });
     });
 
-    describe('#keysAsync',function() {
+    describe('#keys',function() {
         it('should enumerate context keys', function() {
-            return context.keysAsync("nodeX").then(function(result){
+            return context.keys("nodeX").then(function(result){
                 result.should.be.an.Array();
                 result.should.be.empty();
             }).then(function(){
-                return context.setAsync("nodeX","foo","bar");
+                return context.set("nodeX","foo","bar");
             }).then(function(){
-                return context.keysAsync("nodeX").then(function(result){
+                return context.keys("nodeX").then(function(result){
                     result.should.have.length(1);
                     result[0].should.equal("foo");
                 });
             }).then(function(){
-                return context.setAsync("nodeX","abc.def","bar");
+                return context.set("nodeX","abc.def","bar");
             }).then(function(){
-                return context.keysAsync("nodeX").then(function(result){
+                return context.keys("nodeX").then(function(result){
                     result.should.have.length(2);
                     result[1].should.equal("abc");
                 });
@@ -233,19 +233,19 @@ describe('localfilesystem',function() {
         });
 
         it('should enumerate context keys in each scopes', function() {
-            return Promise.all([context.keysAsync("nodeX"),
-                                context.keysAsync("nodeY")
+            return Promise.all([context.keys("nodeX"),
+                                context.keys("nodeY")
             ]).then(function(results){
                 results[0].should.be.an.Array();
                 results[0].should.be.empty();
                 results[1].should.be.an.Array();
                 results[1].should.be.empty();
             }).then(function(){
-                return Promise.all([context.setAsync("nodeX","foo","bar"),
-                                    context.setAsync("nodeY","hoge","piyo")]);
+                return Promise.all([context.set("nodeX","foo","bar"),
+                                    context.set("nodeY","hoge","piyo")]);
             }).then(function(){
-                return Promise.all([context.keysAsync("nodeX"),
-                                    context.keysAsync("nodeY")]);
+                return Promise.all([context.keys("nodeX"),
+                                    context.keys("nodeY")]);
             }).then(function(results){
                 results[0].should.have.length(1);
                 results[0][0].should.equal("foo");
@@ -257,55 +257,55 @@ describe('localfilesystem',function() {
 
     describe('#delete',function() {
         it('should delete context',function() {
-            return Promise.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
-                                context.getAsync("nodeY","foo").should.be.finally.undefined()
+            return Promise.all([context.get("nodeX","foo").should.be.finally.undefined(),
+                                context.get("nodeY","foo").should.be.finally.undefined()
             ]).then(function(){
-                return Promise.all([context.setAsync("nodeX","foo","abc"),
-                                    context.setAsync("nodeY","foo","abc")]);
+                return Promise.all([context.set("nodeX","foo","abc"),
+                                    context.set("nodeY","foo","abc")]);
             }).then(function(){
-                return Promise.all([context.getAsync("nodeX","foo").should.be.finally.equal("abc"),
-                                    context.getAsync("nodeY","foo").should.be.finally.equal("abc")])
+                return Promise.all([context.get("nodeX","foo").should.be.finally.equal("abc"),
+                                    context.get("nodeY","foo").should.be.finally.equal("abc")])
             }).then(function(){
                 return context.delete("nodeX");
             }).then(function(){
-                return Promise.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
-                                    context.getAsync("nodeY","foo").should.be.finally.equal("abc")]);
+                return Promise.all([context.get("nodeX","foo").should.be.finally.undefined(),
+                                    context.get("nodeY","foo").should.be.finally.equal("abc")]);
             });
         });
     });
 
     describe('#clean',function() {
         it('should clean unnecessary context',function() {
-            return Promise.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
-                                context.getAsync("nodeY","foo").should.be.finally.undefined()
+            return Promise.all([context.get("nodeX","foo").should.be.finally.undefined(),
+                                context.get("nodeY","foo").should.be.finally.undefined()
             ]).then(function(){
-                return Promise.all([context.setAsync("nodeX","foo","abc"),
-                                    context.setAsync("nodeY","foo","abc")]);
+                return Promise.all([context.set("nodeX","foo","abc"),
+                                    context.set("nodeY","foo","abc")]);
             }).then(function(){
-                return Promise.all([context.getAsync("nodeX","foo").should.be.finally.equal("abc"),
-                                    context.getAsync("nodeY","foo").should.be.finally.equal("abc")])
+                return Promise.all([context.get("nodeX","foo").should.be.finally.equal("abc"),
+                                    context.get("nodeY","foo").should.be.finally.equal("abc")])
             }).then(function(){
                 return context.clean([]);
             }).then(function(){
-                return Promise.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
-                                    context.getAsync("nodeY","foo").should.be.finally.undefined()]);
+                return Promise.all([context.get("nodeX","foo").should.be.finally.undefined(),
+                                    context.get("nodeY","foo").should.be.finally.undefined()]);
             });
         });
 
         it('should not clean active context',function() {
-            return Promise.all([context.getAsync("nodeX","foo").should.be.finally.undefined(),
-                                context.getAsync("nodeY","foo").should.be.finally.undefined()
+            return Promise.all([context.get("nodeX","foo").should.be.finally.undefined(),
+                                context.get("nodeY","foo").should.be.finally.undefined()
             ]).then(function(){
-                return Promise.all([context.setAsync("nodeX","foo","abc"),
-                                    context.setAsync("nodeY","foo","abc")]);
+                return Promise.all([context.set("nodeX","foo","abc"),
+                                    context.set("nodeY","foo","abc")]);
             }).then(function(){
-                return Promise.all([context.getAsync("nodeX","foo").should.be.finally.equal("abc"),
-                                    context.getAsync("nodeY","foo").should.be.finally.equal("abc")])
+                return Promise.all([context.get("nodeX","foo").should.be.finally.equal("abc"),
+                                    context.get("nodeY","foo").should.be.finally.equal("abc")])
             }).then(function(){
                 return context.clean(["nodeX"]);
             }).then(function(){
-                return Promise.all([context.getAsync("nodeX","foo").should.be.finally.equal("abc"),
-                                    context.getAsync("nodeY","foo").should.be.finally.undefined()]);
+                return Promise.all([context.get("nodeX","foo").should.be.finally.equal("abc"),
+                                    context.get("nodeY","foo").should.be.finally.undefined()]);
             });
         });
     });

From fd67d084029829a832144a8f8ce9f9f1e32108f4 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Wed, 20 Jun 2018 20:09:02 +0900
Subject: [PATCH 076/113] Remove unnecessary module and skip persistable
 context test cases temporally

---
 package.json                                 |  1 -
 test/red/runtime/nodes/context/index_spec.js | 67 +-------------------
 2 files changed, 1 insertion(+), 67 deletions(-)

diff --git a/package.json b/package.json
index 6a9b99fda..be2fec970 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,6 @@
     "http-proxy": "^1.16.2",
     "istanbul": "0.4.5",
     "mocha": "^5.1.1",
-    "rewire": "3.0.2",
     "should": "^8.4.0",
     "sinon": "1.17.7",
     "stoppable": "^1.0.6",
diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index 00ac99fa6..96fbfda70 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -16,7 +16,6 @@
 
 var should = require("should");
 var sinon = require('sinon');
-var rewire = require("rewire");
 var Context = require("../../../../../red/runtime/nodes/context/index");
 
 describe('context', function() {
@@ -166,7 +165,7 @@ describe('context', function() {
         });
     });
 
-    describe('external context storage',function() {
+    describe.skip('external context storage',function() {
         var sandbox = sinon.sandbox.create();
         var stubGet = sandbox.stub().returns(Promise.resolve());
         var stubSet = sandbox.stub().returns(Promise.resolve());
@@ -543,68 +542,4 @@ describe('context', function() {
             });
         });
     });
-
-    describe('#parseKey()', function() {
-        var parseKey = rewire("../../../../../red/runtime/nodes/context/index").__get__("parseKey");
-
-        function returnModuleAndKey(input, expectedModule, expectedKey) {
-            var result = parseKey(input);
-            result.storage.should.equal(expectedModule);
-            result.key.should.equal(expectedKey);
-        }
-
-        it('should return module and key', function() {
-            returnModuleAndKey("#test.aaa","test","aaa");
-            returnModuleAndKey("#test.aaa.bbb","test","aaa.bbb");
-            returnModuleAndKey("#1.234","1","234");
-            returnModuleAndKey("##test.foo","#test","foo");
-            returnModuleAndKey("#test.#foo","test","#foo");
-            returnModuleAndKey("#test.#foo.#bar","test","#foo.#bar");
-            returnModuleAndKey("#test..foo","test",".foo");
-            returnModuleAndKey("#test..","test",".");
-            returnModuleAndKey("#te-_st.aaa","te-_st","aaa");
-            returnModuleAndKey("#te{st.a2","te{st","a2");
-            returnModuleAndKey("#te[st.a3","te[st","a3");
-            returnModuleAndKey("#te'st.a4","te'st","a4");
-            returnModuleAndKey("#te\"st.a5","te\"st","a5");
-        });
-
-        it('should return module as default', function() {
-            returnModuleAndKey("#default.foo","default","foo");
-            returnModuleAndKey("#.foo","default","foo");
-        });
-
-        it('should return only keys', function() {
-            returnModuleAndKey("test.aaa", "", "test.aaa");
-            returnModuleAndKey("test", "", "test");
-            returnModuleAndKey("#test", "", "#test");
-        });
-
-        it('should fail with null key', function() {
-            (function() {
-                parseKey("");
-            }).should.throw();
-
-            (function() {
-                parseKey(null);
-            }).should.throw();
-        });
-
-        it('should fail with space character', function() {
-            (function() {
-                parseKey(" #test");
-            }).should.throw();
-
-            (function() {
-                parseKey("#test .a");
-            }).should.throw();
-        });
-
-        it('should fail with empty key', function() {
-            (function() {
-                parseKey("#test.");
-            }).should.throw();
-        });
-    });
-
 });

From 461e6562ca4309937e9de5083d8ea736adfba93a Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 21 Jun 2018 10:46:07 +0100
Subject: [PATCH 077/113] Allow typedInputs to have options plus value

---
 editor/js/ui/common/typedInput.js     | 222 +++++++++++++++++++-------
 editor/sass/ui/common/typedInput.scss |  29 ++--
 2 files changed, 179 insertions(+), 72 deletions(-)

diff --git a/editor/js/ui/common/typedInput.js b/editor/js/ui/common/typedInput.js
index f5227fd68..bc6a71674 100644
--- a/editor/js/ui/common/typedInput.js
+++ b/editor/js/ui/common/typedInput.js
@@ -98,14 +98,17 @@
             var that = this;
 
             this.disarmClick = false;
+            this.input = $('<input type="text"></input>');
+            this.input.insertAfter(this.element);
+            this.input.val(this.element.val());
             this.element.addClass('red-ui-typedInput');
             this.uiWidth = this.element.outerWidth();
-            this.elementDiv = this.element.wrap("<div>").parent().addClass('red-ui-typedInput-input');
+            this.elementDiv = this.input.wrap("<div>").parent().addClass('red-ui-typedInput-input');
             this.uiSelect = this.elementDiv.wrap( "<div>" ).parent();
             var attrStyle = this.element.attr('style');
             var m;
             if ((m = /width\s*:\s*(calc\s*\(.*\)|\d+(%|px))/i.exec(attrStyle)) !== null) {
-                this.element.css('width','100%');
+                this.input.css('width','100%');
                 this.uiSelect.width(m[1]);
                 this.uiWidth = null;
             } else {
@@ -114,17 +117,19 @@
             ["Right","Left"].forEach(function(d) {
                 var m = that.element.css("margin"+d);
                 that.uiSelect.css("margin"+d,m);
-                that.element.css("margin"+d,0);
+                that.input.css("margin"+d,0);
             });
+
             this.uiSelect.addClass("red-ui-typedInput-container");
 
+            this.element.attr('type','hidden');
+
             this.options.types = this.options.types||Object.keys(allOptions);
 
             this.selectTrigger = $('<button tabindex="0"></button>').prependTo(this.uiSelect);
-            if (this.options.types.length > 1) {
-                $('<i class="fa fa-sort-desc"></i>').appendTo(this.selectTrigger);
-            }
-            this.selectLabel = $('<span></span>').appendTo(this.selectTrigger);
+            $('<i class="red-ui-typedInput-icon fa fa-sort-desc"></i>').toggle(this.options.types.length > 1).appendTo(this.selectTrigger);
+
+            this.selectLabel = $('<span class="red-ui-typedInput-type-label"></span>').appendTo(this.selectTrigger);
 
             this.types(this.options.types);
 
@@ -138,14 +143,16 @@
                 this.typeField = $("<input>",{type:'hidden'}).appendTo(this.uiSelect);
             }
 
-            this.element.on('focus', function() {
+            this.input.on('focus', function() {
                 that.uiSelect.addClass('red-ui-typedInput-focus');
             });
-            this.element.on('blur', function() {
+            this.input.on('blur', function() {
                 that.uiSelect.removeClass('red-ui-typedInput-focus');
             });
-            this.element.on('change', function() {
+            this.input.on('change', function() {
                 that.validate();
+                that.element.val(that.value());
+                that.element.trigger('change',that.propertyType,that.value());
             })
             this.selectTrigger.click(function(event) {
                 event.preventDefault();
@@ -161,7 +168,7 @@
             })
 
             // explicitly set optionSelectTrigger display to inline-block otherwise jQ sets it to 'inline'
-            this.optionSelectTrigger = $('<button tabindex="0" class="red-ui-typedInput-option-trigger" style="display:inline-block"><span class="red-ui-typedInput-option-caret"><i class="fa fa-sort-desc"></i></span></button>').appendTo(this.uiSelect);
+            this.optionSelectTrigger = $('<button tabindex="0" class="red-ui-typedInput-option-trigger" style="display:inline-block"><span class="red-ui-typedInput-option-caret"><i class="red-ui-typedInput-icon fa fa-sort-desc"></i></span></button>').appendTo(this.uiSelect);
             this.optionSelectLabel = $('<span class="red-ui-typedInput-option-label"></span>').prependTo(this.optionSelectTrigger);
             this.optionSelectTrigger.click(function(event) {
                 event.preventDefault();
@@ -177,9 +184,7 @@
                 that.uiSelect.addClass('red-ui-typedInput-focus');
             });
 
-            this.optionExpandButton = $('<button tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"><i class="fa fa-ellipsis-h"></i></button>').appendTo(this.uiSelect);
-
-
+            this.optionExpandButton = $('<button tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"><i class="red-ui-typedInput-icon fa fa-ellipsis-h"></i></button>').appendTo(this.uiSelect);
             this.type(this.options.default||this.typeList[0].value);
         },
         _showTypeMenu: function() {
@@ -187,7 +192,7 @@
                 this._showMenu(this.menu,this.selectTrigger);
                 this.menu.find("[value='"+this.propertyType+"']").focus();
             } else {
-                this.element.focus();
+                this.input.focus();
             }
         },
         _showOptionSelectMenu: function() {
@@ -196,8 +201,8 @@
                     minWidth:this.optionSelectLabel.width()
                 });
 
-                this._showMenu(this.optionMenu,this.optionSelectLabel);
-                var selectedOption = this.optionMenu.find("[value='"+this.value()+"']");
+                this._showMenu(this.optionMenu,this.optionSelectTrigger);
+                var selectedOption = this.optionMenu.find("[value='"+this.optionValue+"']");
                 if (selectedOption.length === 0) {
                     selectedOption = this.optionMenu.children(":first");
                 }
@@ -209,7 +214,7 @@
             $(document).off("mousedown.close-property-select");
             menu.hide();
             if (this.elementDiv.is(":visible")) {
-                this.element.focus();
+                this.input.focus();
             } else if (this.optionSelectTrigger.is(":visible")){
                 this.optionSelectTrigger.focus();
             } else {
@@ -228,10 +233,19 @@
                     op.text(opt.label);
                 }
                 if (opt.icon) {
-                    $('<img>',{src:opt.icon,style:"margin-right: 4px; height: 18px;"}).prependTo(op);
+                    if (opt.icon.indexOf("<") === 0) {
+                        $(opt.icon).prependTo(op);
+                    } else if (opt.icon.indexOf("/") !== -1) {
+                        $('<img>',{src:opt.icon,style:"margin-right: 4px; height: 18px;"}).prependTo(op);
+                    } else {
+                        $('<i>',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(op);
+                    }
                 } else {
                     op.css({paddingLeft: "18px"});
                 }
+                if (!opt.icon && !opt.label) {
+                    op.text(opt.value);
+                }
 
                 op.click(function(event) {
                     event.preventDefault();
@@ -310,7 +324,8 @@
             if (this.uiWidth !== null) {
                 this.uiSelect.width(this.uiWidth);
             }
-            if (this.typeMap[this.propertyType] && this.typeMap[this.propertyType].hasValue === false) {
+            var type = this.typeMap[this.propertyType];
+            if (type && type.hasValue === false) {
                 this.selectTrigger.addClass("red-ui-typedInput-full-width");
             } else {
                 this.selectTrigger.removeClass("red-ui-typedInput-full-width");
@@ -320,12 +335,64 @@
                     this.elementDiv.css('right',"22px");
                 } else {
                     this.elementDiv.css('right','0');
+                    this.input.css({
+                        'border-top-right-radius': '4px',
+                        'border-bottom-right-radius': '4px'
+                    });
                 }
+
+                // if (this.optionSelectTrigger) {
+                //     this.optionSelectTrigger.css({'left':(labelWidth)+"px",'width':'calc( 100% - '+labelWidth+'px )'});
+                // }
+
                 if (this.optionSelectTrigger) {
-                    this.optionSelectTrigger.css({'left':(labelWidth)+"px",'width':'calc( 100% - '+labelWidth+'px )'});
+                    if (type && type.options && type.hasValue === true) {
+                        this.optionSelectLabel.css({'left':'auto'})
+                        var lw = this._getLabelWidth(this.optionSelectLabel);
+                        this.optionSelectTrigger.css({'width':(23+lw)+"px"});
+                        this.elementDiv.css('right',(23+lw)+"px");
+                        this.input.css({
+                            'border-top-right-radius': 0,
+                            'border-bottom-right-radius': 0
+                        });
+                    } else {
+                        this.optionSelectLabel.css({'left':'0'})
+                        this.optionSelectTrigger.css({'width':'calc( 100% - '+labelWidth+'px )'});
+                        if (!this.optionExpandButton.is(":visible")) {
+                            this.elementDiv.css({'right':0});
+                            this.input.css({
+                                'border-top-right-radius': '4px',
+                                'border-bottom-right-radius': '4px'
+                            });
+                        }
+                    }
                 }
             }
         },
+        _updateOptionSelectLabel: function(o) {
+            var opt = this.typeMap[this.propertyType];
+            this.optionSelectLabel.empty();
+            if (o.icon) {
+                if (o.icon.indexOf("<") === 0) {
+                    $(o.icon).prependTo(this.optionSelectLabel);
+                } else if (o.icon.indexOf("/") !== -1) {
+                    // url
+                    $('<img>',{src:o.icon,style:"height: 18px;"}).prependTo(this.optionSelectLabel);
+                } else {
+                    // icon class
+                    $('<i>',{class:"red-ui-typedInput-icon "+o.icon}).prependTo(this.optionSelectLabel);
+                }
+            } else if (o.label) {
+                this.optionSelectLabel.text(o.label);
+            } else {
+                this.optionSelectLabel.text(o.value);
+            }
+            if (opt.hasValue) {
+                this.optionValue = o.value;
+                this._resize();
+                this.input.trigger('change',this.propertyType,this.value());
+            }
+        },
         _destroy: function() {
             this.menu.remove();
         },
@@ -344,6 +411,7 @@
                 return result;
             });
             this.selectTrigger.toggleClass("disabled", this.typeList.length === 1);
+            this.selectTrigger.find(".fa-sort-desc").toggle(this.typeList.length > 1)
             if (this.menu) {
                 this.menu.remove();
             }
@@ -351,6 +419,7 @@
             if (currentType && !this.typeMap.hasOwnProperty(currentType)) {
                 this.type(this.typeList[0].value);
             }
+            setTimeout(function() {that._resize();},0);
         },
         width: function(desiredWidth) {
             this.uiWidth = desiredWidth;
@@ -358,33 +427,33 @@
         },
         value: function(value) {
             if (!arguments.length) {
-                return this.element.val();
+                var v = this.input.val();
+                if (this.typeMap[this.propertyType].export) {
+                    v = this.typeMap[this.propertyType].export(v,this.optionValue)
+                }
+                return v;
             } else {
+                var selectedOption;
                 if (this.typeMap[this.propertyType].options) {
-                    var validValue = false;
-                    var label;
                     for (var i=0;i<this.typeMap[this.propertyType].options.length;i++) {
                         var op = this.typeMap[this.propertyType].options[i];
                         if (typeof op === "string") {
                             if (op === value) {
-                                label = value;
-                                validValue = true;
+                                selectedOption = this.activeOptions[op];
                                 break;
                             }
                         } else if (op.value === value) {
-                            label = op.label||op.value;
-                            validValue = true;
+                            selectedOption = op;
                             break;
                         }
                     }
-                    if (!validValue) {
-                        value = "";
-                        label = "";
+                    if (!selectedOption) {
+                        selectedOption = {value:""}
                     }
-                    this.optionSelectLabel.text(label);
+                    this._updateOptionSelectLabel(selectedOption)
                 }
-                this.element.val(value);
-                this.element.trigger('change',this.type(),value);
+                this.input.val(value);
+                this.input.trigger('change',this.type(),value);
             }
         },
         type: function(type) {
@@ -412,37 +481,72 @@
                         }
                         if (this.optionSelectTrigger) {
                             this.optionSelectTrigger.show();
-                            this.elementDiv.hide();
+                            if (!opt.hasValue) {
+                                this.elementDiv.hide();
+                            } else {
+                                this.elementDiv.show();
+                            }
+                            this.activeOptions = {};
+                            opt.options.forEach(function(o) {
+                                if (typeof o === 'string') {
+                                    that.activeOptions[o] = {label:o,value:o};
+                                } else {
+                                    that.activeOptions[o.value] = o;
+                                }
+                            })
                             this.optionMenu = this._createMenu(opt.options,function(v){
-                                that.optionSelectLabel.text(v);
-                                that.value(v);
+                                that._updateOptionSelectLabel(that.activeOptions[v]);
+                                if (!opt.hasValue) {
+                                    that.value(that.activeOptions[v].value)
+                                }
                             });
-                            var currentVal = this.element.val();
-                            var validValue = false;
                             var op;
-                            for (var i=0;i<opt.options.length;i++) {
-                                op = opt.options[i];
-                                if (typeof op === "string") {
-                                    if (op === currentVal) {
-                                        this.optionSelectLabel.text(currentVal);
+                            if (!opt.hasValue) {
+                                var currentVal = this.input.val();
+                                var validValue = false;
+                                for (var i=0;i<opt.options.length;i++) {
+                                    op = opt.options[i];
+                                    if (typeof op === "string" && op === currentVal) {
+                                        that._updateOptionSelectLabel({value:currentVal});
+                                        validValue = true;
+                                        break;
+                                    } else if (op.value === currentVal) {
+                                        that._updateOptionSelectLabel(op);
                                         validValue = true;
                                         break;
                                     }
-                                } else if (op.value === currentVal) {
-                                    this.optionSelectLabel.text(op.label||op.value);
-                                    validValue = true;
-                                    break;
                                 }
-                            }
-                            if (!validValue) {
-                                op = opt.options[0];
-                                if (typeof op === "string") {
-                                    this.value(op);
+                                if (!validValue) {
+                                    op = opt.options[0];
+                                    if (typeof op === "string") {
+                                        this.value(op);
+                                        that._updateOptionSelectLabel({value:op});
+                                    } else {
+                                        this.value(op.value);
+                                        that._updateOptionSelectLabel(op);
+                                    }
+                                }
+                            } else {
+                                var selectedOption = this.optionValue||opt.options[0];
+                                if (opt.parse) {
+                                    var parts = opt.parse(this.input.val());
+                                    if (parts.option) {
+                                        selectedOption = parts.option;
+                                    }
+                                    this.input.val(parts.value);
+                                    if (opt.export) {
+                                        this.element.val(opt.export(parts.value,parts.option||selectedOption));
+                                    }
+                                }
+
+                                if (typeof selectedOption === "string") {
+                                    this.optionValue = selectedOption;
+                                    this._updateOptionSelectLabel(this.activeOptions[selectedOption]);
                                 } else {
-                                    this.value(op.value);
+                                    this.optionValue = selectedOption.value;
+                                    this._updateOptionSelectLabel(selectedOption);
                                 }
                             }
-                            console.log(validValue);
                         }
                     } else {
                         if (this.optionMenu) {
@@ -453,12 +557,12 @@
                             this.optionSelectTrigger.hide();
                         }
                         if (opt.hasValue === false) {
-                            this.oldValue = this.element.val();
-                            this.element.val("");
+                            this.oldValue = this.input.val();
+                            this.input.val("");
                             this.elementDiv.hide();
                         } else {
                             if (this.oldValue !== undefined) {
-                                this.element.val(this.oldValue);
+                                this.input.val(this.oldValue);
                                 delete this.oldValue;
                             }
                             this.elementDiv.show();
@@ -473,7 +577,7 @@
                         } else {
                             this.optionExpandButton.hide();
                         }
-                        this.element.trigger('change',this.propertyType,this.value());
+                        this.input.trigger('change',this.propertyType,this.value());
                     }
                     if (image) {
                         image.onload = function() { that._resize(); }
diff --git a/editor/sass/ui/common/typedInput.scss b/editor/sass/ui/common/typedInput.scss
index 39d71d68e..b73c139f4 100644
--- a/editor/sass/ui/common/typedInput.scss
+++ b/editor/sass/ui/common/typedInput.scss
@@ -23,7 +23,7 @@
     margin: 0;
     vertical-align: middle;
     box-sizing: border-box;
-    overflow:hidden;
+    overflow:visible;
     position: relative;
     .red-ui-typedInput-input {
         position: absolute;
@@ -43,6 +43,7 @@
         border-bottom-left-radius: 0;
         box-shadow: none;
         vertical-align: middle;
+        // backgroun/d: #f0fff0;
     }
 
     &.red-ui-typedInput-focus:not(.input-error) {
@@ -63,7 +64,7 @@
         line-height: 32px;
         vertical-align: middle;
         color: #555;
-        i {
+        i.red-ui-typedInput-icon {
             position: relative;
             top: -3px;
             margin-left: 1px;
@@ -76,11 +77,11 @@
         }
         &.disabled {
             cursor: default;
-            i {
+            i.red-ui-typedInput-icon {
                 color: #bbb;
             }
         }
-        span {
+        .red-ui-typedInput-type-label,.red-ui-typedInput-option-label {
             display: inline-block;
             height: 100%;
             padding: 0 1px 0 5px;
@@ -121,26 +122,25 @@
         border-bottom-right-radius: 4px;
         padding: 0 0 0 0;
         position:absolute;
-        width: calc( 100% );
-
-        i {
-            position:absolute;
-            right: 4px;
-            top: 7px;
-        }
+        right: 0;
         .red-ui-typedInput-option-label {
-            background:#fff;
+            background:$typedInput-button-background;
             position:absolute;
             left:0;
             right:23px;
             top: 0;
-            padding: 0 5px 0 5px;
+            padding: 0 5px 0 8px;
+            i.red-ui-typedInput-icon {
+                margin-right: 4px;
+                margin-top: 4px;
+            }
         }
         .red-ui-typedInput-option-caret {
             top: 0;
             position: absolute;
             right: 0;
             width: 17px;
+            padding-left: 6px;
         }
         &:focus {
             box-shadow: none;
@@ -175,4 +175,7 @@
             background: $typedInput-button-background-active;
         }
     }
+    .red-ui-typedInput-icon {
+        margin-right: 4px;
+    }
 }

From f5e212ff1e11b851669e91903d06d2f4a4f7f916 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 21 Jun 2018 10:49:39 +0100
Subject: [PATCH 078/113] Refresh type options properly when typedInput.types
 called

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

diff --git a/editor/js/ui/common/typedInput.js b/editor/js/ui/common/typedInput.js
index bc6a71674..e49dbb250 100644
--- a/editor/js/ui/common/typedInput.js
+++ b/editor/js/ui/common/typedInput.js
@@ -418,6 +418,9 @@
             this.menu = this._createMenu(this.typeList, function(v) { that.type(v) });
             if (currentType && !this.typeMap.hasOwnProperty(currentType)) {
                 this.type(this.typeList[0].value);
+            } else {
+                this.propertyType = null;
+                this.type(currentType);
             }
             setTimeout(function() {that._resize();},0);
         },

From f2fa26fb07321fe5b33a7653fb2d6ad223ef56ef Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Fri, 22 Jun 2018 17:11:54 +0900
Subject: [PATCH 079/113] Use the callback instead of Promise in context API
 and remove unnecessary functions

---
 red/runtime/locales/en-US/runtime.json        |   3 -
 red/runtime/nodes/context/index.js            |  94 +---
 red/runtime/nodes/context/localfilesystem.js  |  43 +-
 red/runtime/nodes/context/memory.js           |   2 +-
 test/red/runtime/nodes/context/index_spec.js  | 302 ++++-------
 .../nodes/context/localfilesystem_spec.js     | 502 ++++++++++--------
 6 files changed, 449 insertions(+), 497 deletions(-)

diff --git a/red/runtime/locales/en-US/runtime.json b/red/runtime/locales/en-US/runtime.json
index f7a4b8a3d..1413ce523 100644
--- a/red/runtime/locales/en-US/runtime.json
+++ b/red/runtime/locales/en-US/runtime.json
@@ -161,9 +161,6 @@
         "error-module-not-loaded": "'__module__' could not be loaded",
         "error-module-not-defined": "'module' is not defined in '__storage__' of settings.contextStorage",
         "error-invalid-default-module": "Invalid storage '__storage__' is specified as a default storage",
-        "error-key-zero-length": "Invalid property expression: zero-length",
-        "error-unexpected-space-character": "Invalid property expression: unexpected ' ' at position __index__",
-        "error-empty-key": "Invalid property expression: key is empty",
         "error-use-undefined-storage": "Undefined storage '__storage__' is specified"
     }
 
diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index e52308200..ac52ca152 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -16,6 +16,7 @@
 
 var clone = require("clone");
 var log = require("../../log");
+var memory = require("./memory");
 
 var settings;
 var contexts = {};
@@ -28,7 +29,6 @@ function init(_settings) {
     externalContexts = {};
 
     // init memory plugin
-    var memory = require("./memory");
     var seed = settings.functionGlobalContext || {};
     externalContexts["_"] = memory();
     externalContexts["_"].setGlobalContext(seed);
@@ -95,43 +95,6 @@ function copySettings(config, settings){
     });
 }
 
-function parseStorage(key) {
-    if (!key || key.charAt(0) !== '#') {
-        return "";
-    } else {
-        var endOfStorageName = key.indexOf(".");
-        if (endOfStorageName == -1) {
-            endOfStorageName = key.length;
-        }
-        return key.substring(1,endOfStorageName)||"default";
-    }
-}
-
-function parseKey(key) {
-    if (!key) {
-        throw new Error(log._("context.error-key-zero-length"));
-    }
-    var indexSpace = key.indexOf(" ");
-    if (indexSpace != -1) {
-        throw new Error(log._("context.error-unexpected-space-character", {index:indexSpace}));
-    }
-    var keyPath = { storage: "", key: "" };
-    var indexDot = key.indexOf(".");
-    // The key of "#file" should be treated as a key without persistable context.
-    if (indexDot != -1) {
-        keyPath.storage = parseStorage(key);
-    }
-    if (keyPath.storage) {
-        keyPath.key = key.substring(indexDot + 1);
-    } else {
-        keyPath.key = key;
-    }
-    if(!keyPath.key) {
-        throw new Error(log._("context.error-empty-key"));
-    }
-    return keyPath;
-}
-
 function getContextStorage(storage) {
     if (noContextStorage || !storage) {
         return externalContexts["_"];
@@ -150,47 +113,30 @@ function createContext(id,seed) {
     var scope = id;
     var obj = seed || {};
 
-    obj.get = function(key) {
-        var keyPath = parseKey(key);
-        var context = getContextStorage(keyPath.storage);
-        if(!keyPath.storage){
-            return context.get(scope, keyPath.key);
-        }else{
-            throw new Error(keyPath.storage + " does not support get(). Use getAsync()");
+    obj.get = function(key, storage, callback) {
+        if (typeof storage === 'function') {
+            callback = storage;
+            storage = "default";
+        } else if(typeof storage === "string" && typeof callback !== 'function'){
+            throw new Error("Callback must be a function");
         }
+        return getContextStorage(storage).get(scope, key, callback);
     };
-    obj.set = function(key, value) {
-        var keyPath = parseKey(key);
-        var context = getContextStorage(keyPath.storage);
-        if(!keyPath.storage){
-            return context.set(scope, keyPath.key, value);
-        }else{
-            throw new Error(keyPath.storage + " does not support set(). Use setAsync()");
+    obj.set = function(key, value, storage, callback) {
+        if (typeof storage === 'function') {
+            callback = storage;
+            storage = "default";
         }
+        getContextStorage(storage).set(scope, key, value, callback);
     };
-    obj.keys = function(storage) {
-        var storageName = parseStorage(storage);
-        var context = getContextStorage(storageName);
-        if(!storageName){
-            return context.keys(scope);
-        }else{
-            throw new Error(storageName + " does not support keys(). Use keysAsync()");
+    obj.keys = function(storage, callback) {
+        if (typeof storage === 'function') {
+            callback = storage;
+            storage = "default";
+        } else if(typeof storage === "string" && typeof callback !== 'function'){
+            throw new Error("Callback must be a function");
         }
-    };
-    obj.getAsync = function(key) {
-        var keyPath = parseKey(key);
-        var context = getContextStorage(keyPath.storage);
-        return context.get(scope, keyPath.key);
-    };
-    obj.setAsync  = function(key, value) {
-        var keyPath = parseKey(key);
-        var context = getContextStorage(keyPath.storage);
-        return context.set(scope, keyPath.key, value);
-    };
-    obj.keysAsync  = function(storage) {
-        var storageName = parseStorage(storage);
-        var context = getContextStorage(storageName);
-        return context.keys(scope);
+        return getContextStorage(storage).keys(scope, callback);
     };
     return obj;
 }
diff --git a/red/runtime/nodes/context/localfilesystem.js b/red/runtime/nodes/context/localfilesystem.js
index 1d8352f56..fed8ae959 100644
--- a/red/runtime/nodes/context/localfilesystem.js
+++ b/red/runtime/nodes/context/localfilesystem.js
@@ -86,43 +86,52 @@ LocalFileSystem.prototype.close = function(){
     return Promise.resolve();
 }
 
-LocalFileSystem.prototype.get = function(scope, key) {
+LocalFileSystem.prototype.get = function(scope, key, callback) {
+    if(typeof callback !== "function"){
+        throw new Error("Callback must be a function");
+    }
     var storagePath = getStoragePath(this.storageBaseDir ,scope);
-    return loadFile(storagePath + ".json").then(function(data){
+    loadFile(storagePath + ".json").then(function(data){
         if(data){
-            return util.getMessageProperty(JSON.parse(data),key);
+            callback(null, util.getMessageProperty(JSON.parse(data),key));
         }else{
-            return undefined
+            callback(null, undefined);
         }
     }).catch(function(err){
-        return Promise.reject(err);
+        callback(err);
     });
 };
 
-LocalFileSystem.prototype.set =function(scope, key, value) {
+LocalFileSystem.prototype.set =function(scope, key, value, callback) {
     var storagePath = getStoragePath(this.storageBaseDir ,scope);
-    return loadFile(storagePath + ".json").then(function(data){
+    loadFile(storagePath + ".json").then(function(data){
         var obj = data ? JSON.parse(data) : {}
         util.setMessageProperty(obj,key,value);
-        return obj;
-    }).then(function(obj){
-        var str = JSON.stringify(obj, undefined, 4);
-        return fs.outputFile(storagePath + ".json", str, {encoding:"utf8",flag:"w+"});
+        return fs.outputFile(storagePath + ".json", JSON.stringify(obj, undefined, 4), "utf8");
+    }).then(function(){
+        if(typeof callback === "function"){
+            callback(null);
+        }
     }).catch(function(err){
-        return Promise.reject(err);
+        if(typeof callback === "function"){
+            callback(err);
+        }
     });
 };
 
-LocalFileSystem.prototype.keys = function(scope){
+LocalFileSystem.prototype.keys = function(scope, callback){
+    if(typeof callback !== "function"){
+        throw new Error("Callback must be a function");
+    }
     var storagePath = getStoragePath(this.storageBaseDir ,scope);
-    return loadFile(storagePath + ".json").then(function(data){
+    loadFile(storagePath + ".json").then(function(data){
         if(data){
-            return Object.keys(JSON.parse(data));
+            callback(null, Object.keys(JSON.parse(data)));
         }else{
-            return []
+            callback(null, []);
         }
     }).catch(function(err){
-        return Promise.reject(err);
+        callback(err);
     });
 };
 
diff --git a/red/runtime/nodes/context/memory.js b/red/runtime/nodes/context/memory.js
index 6ded30d45..3010b4315 100644
--- a/red/runtime/nodes/context/memory.js
+++ b/red/runtime/nodes/context/memory.js
@@ -50,7 +50,7 @@ Memory.prototype.keys = function(scope){
         return Object.keys(this.data[scope]);
     } else {
         return Object.keys(this.data[scope]).filter(function (key) {
-            return key !== "set" && key !== "get" && key !== "keys" && key !== "setAsync" && key !== "getAsync" && key !== "keysAsync";
+            return key !== "set" && key !== "get" && key !== "keys";
         });
     }
 };
diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index 96fbfda70..bc597d0b9 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -16,6 +16,7 @@
 
 var should = require("should");
 var sinon = require('sinon');
+var path = require("path");
 var Context = require("../../../../../red/runtime/nodes/context/index");
 
 describe('context', function() {
@@ -145,38 +146,26 @@ describe('context', function() {
             Context.init({functionGlobalContext: {foo:"bar"}});
             return Context.load().then(function(){
                 var context = Context.get("1","flowA");
-                var keys = context.global.keys("global");
+                var keys = context.global.keys();
                 keys.should.have.length(1);
                 keys[0].should.equal("foo");
             });
         });
-
-        it('should throw error when persistable key is passed', function() {
-            var context =  Context.get("1","flow");
-            (function() {
-                context.set("#nonexist.key1", "val1");
-            }).should.throw();
-            (function() {
-                context.get("#nonexist.key1");
-            }).should.throw();
-            (function() {
-                context.keys("#nonexist");
-            }).should.throw();
-        });
     });
 
-    describe.skip('external context storage',function() {
+    describe('external context storage',function() {
+        var resourcesDir = path.resolve(path.join(__dirname,"..","resources","context"));
         var sandbox = sinon.sandbox.create();
-        var stubGet = sandbox.stub().returns(Promise.resolve());
-        var stubSet = sandbox.stub().returns(Promise.resolve());
-        var stubKeys = sandbox.stub().returns(Promise.resolve());
+        var stubGet = sandbox.stub();
+        var stubSet = sandbox.stub();
+        var stubKeys = sandbox.stub();
         var stubDelete = sandbox.stub().returns(Promise.resolve());
         var stubClean = sandbox.stub().returns(Promise.resolve());
         var stubOpen = sandbox.stub().returns(Promise.resolve());
         var stubClose = sandbox.stub().returns(Promise.resolve());
-        var stubGet2 = sandbox.stub().returns(Promise.resolve());
-        var stubSet2 = sandbox.stub().returns(Promise.resolve());
-        var stubKeys2 = sandbox.stub().returns(Promise.resolve());
+        var stubGet2 = sandbox.stub();
+        var stubSet2 = sandbox.stub();
+        var stubKeys2 = sandbox.stub();
         var stubDelete2 = sandbox.stub().returns(Promise.resolve());
         var stubClean2 = sandbox.stub().returns(Promise.resolve());
         var stubOpen2 = sandbox.stub().returns(Promise.resolve());
@@ -247,45 +236,41 @@ describe('context', function() {
                 return Context.load();
             });
             it('should load localfilesystem module', function() {
-                Context.init({contextStorage:{file:{module:"localfilesystem"}}});
+                Context.init({contextStorage:{file:{module:"localfilesystem",config:{dir:resourcesDir}}}});
                 return Context.load();
             });
-            it('should accept special storage name', function() {
+            it('should accept special storage name', function(done) {
                 Context.init({
                     contextStorage:{
-                        "#%&":{module:"memory"},
-                        \u3042:{module:"memory"},
-                        1:{module:"memory"},
+                        "#%&":{module:testPlugin},
+                        \u3042:{module:testPlugin},
+                        1:{module:testPlugin},
                     }
                 });
-                return Context.load().then(function(){
+                Context.load().then(function(){
                     var context = Context.get("1","flow");
-                    return Promise.all([
-                        context.set("##%&.sign","sign1").then(function(){
-                            return context.get("##%&.sign").should.finally.equal("sign1");
-                        }),
-                        context.set("#\u3042.file2","file2").then(function(){
-                            return context.get("#\u3042.file2").should.finally.equal("file2");
-                        }),
-                        context.set("#1.num","num3").then(function(){
-                            return context.get("#1.num").should.finally.equal("num3");
-                        })
-                    ]);
+                    var cb = function(){done("An error occurred")}
+                    context.set("sign","sign1","#%&",cb);
+                    context.set("file","file2","\u3042",cb);
+                    context.set("num","num3","1",cb);
+                    stubSet.calledWithExactly("1:flow","sign","sign1",cb).should.be.true();
+                    stubSet.calledWithExactly("1:flow","file","file2",cb).should.be.true();
+                    stubSet.calledWithExactly("1:flow","num","num3",cb).should.be.true();
+                    done();
                 });
             });
-            it('should ignore reserved storage name `_`', function() {
+            it('should ignore reserved storage name `_`', function(done) {
                 Context.init({contextStorage:{_:{module:testPlugin}}});
-                return Context.load().then(function(){
+                Context.load().then(function(){
                     var context = Context.get("1","flow");
-                    return Promise.all([
-                        context.set("#_.foo","bar"),
-                        context.get("#_.foo"),
-                        context.keys("#_")
-                    ]).then(function(){
-                        stubSet.called.should.be.false();
-                        stubGet.called.should.be.false();
-                        stubKeys.called.should.be.false();
-                    });
+                    var cb = function(){done("An error occurred")}
+                    context.set("foo","bar","_",cb);
+                    context.get("foo","_",cb);
+                    context.keys("_",cb);
+                    stubSet.called.should.be.false();
+                    stubGet.called.should.be.false();
+                    stubKeys.called.should.be.false();
+                    done();
                 });
             });
             it('should fail when using invalid default context', function(done) {
@@ -327,125 +312,119 @@ describe('context', function() {
         });
 
         describe('store context',function() {
-            it('should store local property to external context storage',function() {
+            it('should store local property to external context storage',function(done) {
                 Context.init({contextStorage:contextStorage});
-                return Context.load().then(function(){
+                var cb = function(){done("An error occurred")}
+                Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    return Promise.all([
-                        context.set("#test.foo","test"),
-                        context.get("#test.foo"),
-                        context.keys("#test")
-                    ]).then(function(){
-                        stubSet.calledWithExactly("1:flow","foo","test").should.be.true();
-                        stubGet.calledWithExactly("1:flow","foo").should.be.true();
-                        stubKeys.calledWithExactly("1:flow").should.be.true();
-                    });
+                    context.set("foo","bar","test",cb);
+                    context.get("foo","test",cb);
+                    context.keys("test",cb);
+                    stubSet.calledWithExactly("1:flow","foo","bar",cb).should.be.true();
+                    stubGet.calledWithExactly("1:flow","foo",cb).should.be.true();
+                    stubKeys.calledWithExactly("1:flow",cb).should.be.true();
+                    done();
                 });
             });
-            it('should store flow property to external context storage',function() {
+            it('should store flow property to external context storage',function(done) {
                 Context.init({contextStorage:contextStorage});
-                return Context.load().then(function(){
+                Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    return Promise.all([
-                        context.flow.set("#test.foo","test"),
-                        context.flow.get("#test.foo"),
-                        context.flow.keys("#test")
-                    ]).then(function(){
-                        stubSet.calledWithExactly("flow","foo","test").should.be.true();
-                        stubGet.calledWithExactly("flow","foo").should.be.true();
-                        stubKeys.calledWithExactly("flow").should.be.true();
-                    });
+                    var cb = function(){done("An error occurred")}
+                    context.flow.set("foo","bar","test",cb);
+                    context.flow.get("foo","test",cb);
+                    context.flow.keys("test",cb);
+                    stubSet.calledWithExactly("flow","foo","bar",cb).should.be.true();
+                    stubGet.calledWithExactly("flow","foo",cb).should.be.true();
+                    stubKeys.calledWithExactly("flow",cb).should.be.true();
+                    done();
                 });
             });
-            it('should store global property to external context storage',function() {
+            it('should store global property to external context storage',function(done) {
                 Context.init({contextStorage:contextStorage});
-                return Context.load().then(function(){
+                Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    return Promise.all([
-                        context.global.set("#test.foo","test"),
-                        context.global.get("#test.foo"),
-                        context.global.keys("#test")
-                    ]).then(function(){
-                        stubSet.calledWithExactly("global","foo","test").should.be.true();
-                        stubGet.calledWithExactly("global","foo").should.be.true();
-                        stubKeys.calledWithExactly("global").should.be.true();
-                    });
+                    var cb = function(){done("An error occurred")}
+                    context.global.set("foo","bar","test",cb);
+                    context.global.get("foo","test",cb);
+                    context.global.keys("test",cb);
+                    stubSet.calledWithExactly("global","foo","bar",cb).should.be.true();
+                    stubGet.calledWithExactly("global","foo",cb).should.be.true();
+                    stubKeys.calledWithExactly("global",cb).should.be.true();
+                    done();
                 });
             });
-            it('should store data to the default context when non-existent context storage was specified', function() {
+            it('should store data to the default context when non-existent context storage was specified', function(done) {
                 Context.init({contextStorage:contextDefaultStorage});
-                return Context.load().then(function(){
+                Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    return Promise.all([
-                        context.set("#nonexist.foo","test"),
-                        context.get("#nonexist.foo"),
-                        context.keys("#nonexist")
-                    ]).then(function(){
-                        stubGet.called.should.be.false();
-                        stubSet.called.should.be.false();
-                        stubKeys.called.should.be.false();
-                        stubSet2.calledWithExactly("1:flow","foo","test").should.be.true();
-                        stubGet2.calledWithExactly("1:flow","foo").should.be.true();
-                        stubKeys2.calledWithExactly("1:flow").should.be.true();
-                    });
+                    var cb = function(){done("An error occurred")}
+                    context.set("foo","bar","nonexist",cb);
+                    context.get("foo","nonexist",cb);
+                    context.keys("nonexist",cb);
+                    stubGet.called.should.be.false();
+                    stubSet.called.should.be.false();
+                    stubKeys.called.should.be.false();
+                    stubSet2.calledWithExactly("1:flow","foo","bar",cb).should.be.true();
+                    stubGet2.calledWithExactly("1:flow","foo",cb).should.be.true();
+                    stubKeys2.calledWithExactly("1:flow",cb).should.be.true();
+                    done();
                 });
             });
-            it('should use the default context', function() {
+            it('should use the default context', function(done) {
                 Context.init({contextStorage:contextDefaultStorage});
-                return Context.load().then(function(){
+                Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    return Promise.all([
-                        context.set("#default.foo","default"),
-                        context.get("#default.foo"),
-                        context.keys("#default")
-                    ]).then(function(){
-                        stubGet.called.should.be.false();
-                        stubSet.called.should.be.false();
-                        stubKeys.called.should.be.false();
-                        stubSet2.calledWithExactly("1:flow","foo","default").should.be.true();
-                        stubGet2.calledWithExactly("1:flow","foo").should.be.true();
-                        stubKeys2.calledWithExactly("1:flow").should.be.true();
-                    });
+                    var cb = function(){done("An error occurred")}
+                    context.set("foo","bar","defaultt",cb);
+                    context.get("foo","default",cb);
+                    context.keys("default",cb);
+                    stubGet.called.should.be.false();
+                    stubSet.called.should.be.false();
+                    stubKeys.called.should.be.false();
+                    stubSet2.calledWithExactly("1:flow","foo","bar",cb).should.be.true();
+                    stubGet2.calledWithExactly("1:flow","foo",cb).should.be.true();
+                    stubKeys2.calledWithExactly("1:flow",cb).should.be.true();
+                    done();
                 });
             });
-            it('should use the alias of default context', function() {
+            it('should use the alias of default context', function(done) {
                 Context.init({contextStorage:contextDefaultStorage});
-                return Context.load().then(function(){
+                Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    return Promise.all([
-                        context.set("#.foo","alias"),
-                        context.get("#.foo"),
-                        context.keys("#")
-                    ]).then(function(){
-                        stubGet.called.should.be.false();
-                        stubSet.called.should.be.false();
-                        stubKeys.called.should.be.false();
-                        stubSet2.calledWithExactly("1:flow","foo","alias").should.be.true();
-                        stubGet2.calledWithExactly("1:flow","foo").should.be.true();
-                        stubKeys2.calledWithExactly("1:flow").should.be.true();
-                    });
+                    var cb = function(){done("An error occurred")}
+                    context.set("foo","alias",cb);
+                    context.get("foo",cb);
+                    context.keys(cb);
+                    stubGet.called.should.be.false();
+                    stubSet.called.should.be.false();
+                    stubKeys.called.should.be.false();
+                    stubSet2.calledWithExactly("1:flow","foo","alias",cb).should.be.true();
+                    stubGet2.calledWithExactly("1:flow","foo",cb).should.be.true();
+                    stubKeys2.calledWithExactly("1:flow",cb).should.be.true();
+                    done();
                 });
             });
-            it('should use default as the alias of other context', function() {
+            it('should use default as the alias of other context', function(done) {
                 Context.init({contextStorage:contextAlias});
-                return Context.load().then(function(){
+                Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    return Promise.all([
-                        context.set("#.foo","alias"),
-                        context.get("#.foo"),
-                        context.keys("#")
-                    ]).then(function(){
-                        stubSet.calledWithExactly("1:flow","foo","alias").should.be.true();
-                        stubGet.calledWithExactly("1:flow","foo").should.be.true();
-                        stubKeys.calledWithExactly("1:flow").should.be.true();
-                    });
+                    var cb = function(){done("An error occurred")}
+                    context.set("foo","alias",cb);
+                    context.get("foo",cb);
+                    context.keys(cb);
+                    stubSet.calledWithExactly("1:flow","foo","alias",cb).should.be.true();
+                    stubGet.calledWithExactly("1:flow","foo",cb).should.be.true();
+                    stubKeys.calledWithExactly("1:flow",cb).should.be.true();
+                    done();
                 });
             });
             it('should throw an error using undefined storage for local context', function(done) {
                 Context.init({contextStorage:contextStorage});
                 Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    context.get("#nonexist.local");
+                    var cb = function(){done("An error occurred")}
+                    context.get("local","nonexist",cb);
                     should.fail(null, null, "An error was not thrown using undefined storage for local context");
                 }).catch(function(err) {
                     if (err.name === "ContextError") {
@@ -459,7 +438,8 @@ describe('context', function() {
                 Context.init({contextStorage:contextStorage});
                 Context.load().then(function(){
                     var context =  Context.get("1","flow");
-                    context.flow.set("#nonexist.flow");
+                    var cb = function(){done("An error occurred")}
+                    context.flow.get("flow","nonexist",cb);
                     should.fail(null, null, "An error was not thrown using undefined storage for flow context");
                 }).catch(function(err) {
                     if (err.name === "ContextError") {
@@ -472,7 +452,7 @@ describe('context', function() {
         });
 
         describe('delete context',function(){
-            it('should not call delete()', function() {
+            it('should not call delete() when external context storage is used', function() {
                 Context.init({contextStorage:contextDefaultStorage});
                 return Context.load().then(function(){
                     Context.get("flowA");
@@ -495,51 +475,5 @@ describe('context', function() {
                 });
             });
         });
-
-        describe('key name',function() {
-            beforeEach(function() {
-                Context.init({contextStorage:{memory:{module:"memory"}}});
-                return Context.load().then(function(){
-                    context =  Context.get("1","flow");
-                });
-            });
-            afterEach(function() {
-                Context.clean({allNodes:{}});
-                return Context.close();
-            });
-            it('should work correctly with the valid key name',function() {
-                return Promise.all([
-                    context.set("#memory.azAZ09#_","valid"),
-                    context.set("#memory.a.b","ab")
-                ]).then(function(){
-                    context.get("#memory.azAZ09#_").should.finally.equal("valid");
-                    context.get("#memory.a.b").should.finally.equal("ab");
-                });
-            });
-            it('should treat the key name without dot as a normal context',function() {
-                return context.set("#memory","normal").then(function(){
-                    return context.get("#memory").should.finally.equal("normal");
-                });
-            });
-            it('should fail when specifying invalid characters',function() {
-                (function() {
-                    context.set("#memory.a.-","invalid1");
-                }).should.throw();
-                (function() {
-                    context.set("#memory.'abc","invalid2");
-                }).should.throw();
-            });
-            it('should fail when specifying unnecesary space characters for key name',function() {
-                (function() {
-                    context.set("# memory.space","space1");
-                }).should.throw();
-                (function() {
-                    context.set("#memory .space","space2");
-                }).should.throw();
-                (function() {
-                    context.set("#memory. space","space3");
-                }).should.throw();
-            });
-        });
     });
 });
diff --git a/test/red/runtime/nodes/context/localfilesystem_spec.js b/test/red/runtime/nodes/context/localfilesystem_spec.js
index 4a0d0643b..a03d5b24a 100644
--- a/test/red/runtime/nodes/context/localfilesystem_spec.js
+++ b/test/red/runtime/nodes/context/localfilesystem_spec.js
@@ -24,6 +24,10 @@ var resourcesDir = path.resolve(path.join(__dirname,"..","resources","context"))
 describe('localfilesystem',function() {
     var context;
 
+    before(function() {
+        return fs.remove(resourcesDir);
+    });
+
     beforeEach(function() {
         context = LocalFileSystem({dir: resourcesDir});
         return context.open();
@@ -38,274 +42,336 @@ describe('localfilesystem',function() {
     });
 
     describe('#get/set',function() {
-        it('should store property',function() {
-            return context.get("nodeX","foo").should.be.finally.undefined()
-            .then(function(){
-                return context.set("nodeX","foo","test");
-            }).then(function(){
-                return context.get("nodeX","foo").should.be.finally.equal("test");
-            });
-        });
-
-        it('should store property - creates parent properties',function() {
-            return context.set("nodeX","foo.bar","test").then(function(){
-                return context.get("nodeX","foo").should.be.finally.eql({bar:"test"});
-            });
-        });
-
-        it('should delete property',function() {
-            return context.set("nodeX","foo.abc.bar1","test1")
-            .then(function(){
-                return context.set("nodeX","foo.abc.bar2","test2")
-            }).then(function(){
-                return context.get("nodeX","foo.abc").should.be.finally.eql({bar1:"test1",bar2:"test2"});
-            }).then(function(){
-                return context.set("nodeX","foo.abc.bar1",undefined).then(function(){
-                   return context.get("nodeX","foo.abc").should.be.finally.eql({bar2:"test2"});
-                });
-            }).then(function(){
-                return context.set("nodeX","foo.abc",undefined).then(function(){
-                    return context.get("nodeX","foo.abc").should.be.finally.undefined();
-                });
-            }).then(function(){
-                return context.set("nodeX","foo",undefined).then(function(){
-                    return context.get("nodeX","foo").should.be.finally.undefined();
+        it('should store property',function(done) {
+            context.get("nodeX","foo",function(err, value){
+                should.not.exist(value);
+                context.set("nodeX","foo","test",function(err){
+                    context.get("nodeX","foo",function(err, value){
+                        value.should.be.equal("test");
+                        done();
+                    });
                 });
             });
         });
 
-        it('should not shared context with other scope', function() {
-            return Promise.all([context.get("nodeX","foo").should.be.finally.undefined(),
-                                context.get("nodeY","foo").should.be.finally.undefined()
-            ]).then(function(){
-                return Promise.all([context.set("nodeX","foo","testX"),
-                                    context.set("nodeY","foo","testY")])
-            }).then(function(){
-                return Promise.all([context.get("nodeX","foo").should.be.finally.equal("testX"),
-                                    context.get("nodeY","foo").should.be.finally.equal("testY")]);
+        it('should store property - creates parent properties',function(done) {
+            context.set("nodeX","foo.bar","test",function(err){
+                context.get("nodeX","foo",function(err, value){
+                    value.should.be.eql({bar:"test"});
+                    done();
+                });
             });
         });
 
-        it('should store string',function() {
-            return context.get("nodeX","foo").should.be.finally.undefined()
-            .then(function(){
-                return context.set("nodeX","foo","bar");
-            }).then(function(){
-                return context.get("nodeX","foo")
-            }).then(function(result){
-                result.should.be.String();
-                result.should.be.equal("bar");
-            }).then(function(){
-                return context.set("nodeX","foo","1");
-            }).then(function(){
-                return context.get("nodeX","foo")
-            }).then(function(result){
-                result.should.be.String();
-                result.should.be.equal("1");
+        it('should delete property',function(done) {
+            context.set("nodeX","foo.abc.bar1","test1",function(err){
+                context.set("nodeX","foo.abc.bar2","test2",function(err){
+                    context.get("nodeX","foo.abc",function(err, value){
+                        value.should.be.eql({bar1:"test1",bar2:"test2"});
+                        context.set("nodeX","foo.abc.bar1",undefined,function(err){
+                            context.get("nodeX","foo.abc",function(err, value){
+                                value.should.be.eql({bar2:"test2"});
+                                context.set("nodeX","foo.abc",undefined,function(err){
+                                    context.get("nodeX","foo.abc",function(err, value){
+                                        should.not.exist(value);
+                                        context.set("nodeX","foo",undefined,function(err){
+                                            context.get("nodeX","foo",function(err, value){
+                                                should.not.exist(value);
+                                                done();
+                                            });
+                                        });
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
             });
         });
 
-        it('should store number',function() {
-            return context.get("nodeX","foo").should.be.finally.undefined()
-            .then(function(){
-                return context.set("nodeX","foo",1);
-            }).then(function(){
-                return context.get("nodeX","foo")
-            }).then(function(result){
-                result.should.be.Number();
-                result.should.be.equal(1);
+        it('should not shared context with other scope', function(done) {
+            context.get("nodeX","foo",function(err, value){
+                should.not.exist(value);
+                context.get("nodeY","foo",function(err, value){
+                    should.not.exist(value);
+                    context.set("nodeX","foo","testX",function(err){
+                        context.set("nodeY","foo","testY",function(err){
+                            context.get("nodeX","foo",function(err, value){
+                                value.should.be.equal("testX"),
+                                context.get("nodeY","foo",function(err, value){
+                                    value.should.be.equal("testY");
+                                    done();
+                                });
+                            });
+                        });
+                    });
+                });
             });
         });
 
-        it('should store null',function() {
-            return context.get("nodeX","foo").should.be.finally.undefined()
-            .then(function(){
-                return context.set("nodeX","foo",null);
-            }).then(function(){
-                return context.get("nodeX","foo").should.be.finally.null();
+        it('should store string',function(done) {
+            context.get("nodeX","foo",function(err, value){
+                should.not.exist(value);
+                context.set("nodeX","foo","bar",function(err){
+                    context.get("nodeX","foo",function(err, value){
+                        value.should.be.String();
+                        value.should.be.equal("bar");
+                        context.set("nodeX","foo","1",function(err){
+                            context.get("nodeX","foo",function(err, value){
+                                value.should.be.String();
+                                value.should.be.equal("1");
+                                done();
+                            });
+                        });
+                    });
+                });
             });
         });
 
-        it('should store boolean',function() {
-            return context.get("nodeX","foo").should.be.finally.undefined()
-            .then(function(){
-                return context.set("nodeX","foo",true);
-            }).then(function(){
-                return context.get("nodeX","foo").should.be.finally.Boolean().and.true();
-            }).then(function(){
-                return context.set("nodeX","foo",false);
-            }).then(function(){
-                return context.get("nodeX","foo").should.be.finally.Boolean().and.false();
+        it('should store number',function(done) {
+            context.get("nodeX","foo",function(err, value){
+                should.not.exist(value);
+                context.set("nodeX","foo",1,function(err){
+                    context.get("nodeX","foo",function(err, value){
+                        value.should.be.Number();
+                        value.should.be.equal(1);
+                        done();
+                    });
+                });
             });
         });
 
-        it('should store object',function() {
-            return context.get("nodeX","foo").should.be.finally.undefined()
-            .then(function(){
-                return context.set("nodeX","foo",{obj:"bar"});
-            }).then(function(){
-                return context.get("nodeX","foo")
-            }).then(function(result){
-                result.should.be.Object();
-                result.should.eql({obj:"bar"});
+        it('should store null',function(done) {
+            context.get("nodeX","foo",function(err, value){
+                should.not.exist(value);
+                context.set("nodeX","foo",null,function(err){
+                    context.get("nodeX","foo",function(err, value){
+                        should(value).be.null();
+                        done();
+                    });
+                });
             });
         });
 
-        it('should store array',function() {
-            return context.get("nodeX","foo").should.be.finally.undefined()
-            .then(function(){
-                return context.set("nodeX","foo",["a","b","c"]);
-            }).then(function(){
-                return context.get("nodeX","foo")
-            }).then(function(result){
-                result.should.be.Array();
-                result.should.eql(["a","b","c"]);
-            }).then(function(){
-                return context.get("nodeX","foo[1]")
-            }).then(function(result){
-                result.should.be.String();
-                result.should.equal("b");
+        it('should store boolean',function(done) {
+            context.get("nodeX","foo",function(err, value){
+                should.not.exist(value);
+                context.set("nodeX","foo",true,function(err){
+                    context.get("nodeX","foo",function(err, value){
+                        value.should.be.Boolean().and.true();
+                        context.set("nodeX","foo",false,function(err){
+                            context.get("nodeX","foo",function(err, value){
+                                value.should.be.Boolean().and.false();
+                                done();
+                            });
+                        });
+                    });
+                });
             });
         });
 
-        it('should store array of arrays',function() {
-            return context.get("nodeX","foo").should.be.finally.undefined()
-            .then(function(){
-                return context.set("nodeX","foo",[["a","b","c"],[1,2,3,4],[true,false]]);
-            }).then(function(){
-                return context.get("nodeX","foo")
-            }).then(function(result){
-                result.should.be.Array();
-                result.should.have.length(3);
-                result[0].should.have.length(3);
-                result[1].should.have.length(4);
-                result[2].should.have.length(2);
-            }).then(function(){
-                return context.get("nodeX","foo[1]")
-            }).then(function(result){
-                result.should.be.Array();
-                result.should.have.length(4);
-                result.should.be.eql([1,2,3,4]);
+        it('should store object',function(done) {
+            context.get("nodeX","foo",function(err, value){
+                should.not.exist(value);
+                context.set("nodeX","foo",{obj:"bar"},function(err){
+                    context.get("nodeX","foo",function(err, value){
+                        value.should.be.Object();
+                        value.should.eql({obj:"bar"});
+                        done();
+                    });
+                });
             });
         });
 
-        it('should store array of objects',function() {
-            return context.get("nodeX","foo").should.be.finally.undefined()
-            .then(function(){
-                return context.set("nodeX","foo",[{obj:"bar1"},{obj:"bar2"},{obj:"bar3"}]);
-            }).then(function(){
-                return context.get("nodeX","foo")
-            }).then(function(result){
-                result.should.be.Array();
-                result.should.have.length(3);
-                result[0].should.be.Object();
-                result[1].should.be.Object();
-                result[2].should.be.Object();
-            }).then(function(){
-                return context.get("nodeX","foo[1]")
-            }).then(function(result){
-                result.should.be.Object();
-                result.should.be.eql({obj:"bar2"});
+        it('should store array',function(done) {
+            context.get("nodeX","foo",function(err, value){
+                should.not.exist(value);
+                context.set("nodeX","foo",["a","b","c"],function(err){
+                    context.get("nodeX","foo",function(err, value){
+                        value.should.be.Array();
+                        value.should.eql(["a","b","c"]);
+                        context.get("nodeX","foo[1]",function(err, value){
+                            value.should.be.String();
+                            value.should.equal("b");
+                            done();
+                        });
+                    });
+                });
+            });
+        });
+
+        it('should store array of arrays',function(done) {
+            context.get("nodeX","foo",function(err, value){
+                should.not.exist(value);
+                context.set("nodeX","foo",[["a","b","c"],[1,2,3,4],[true,false]],function(err){
+                    context.get("nodeX","foo",function(err, value){
+                        value.should.be.Array();
+                        value.should.have.length(3);
+                        value[0].should.have.length(3);
+                        value[1].should.have.length(4);
+                        value[2].should.have.length(2);
+                        context.get("nodeX","foo[1]",function(err, value){
+                            value.should.be.Array();
+                            value.should.have.length(4);
+                            value.should.be.eql([1,2,3,4]);
+                            done();
+                        });
+                    });
+                });
+            });
+        });
+
+        it('should store array of objects',function(done) {
+            context.get("nodeX","foo",function(err, value){
+                should.not.exist(value);
+                context.set("nodeX","foo",[{obj:"bar1"},{obj:"bar2"},{obj:"bar3"}],function(err){
+                    context.get("nodeX","foo",function(err, value){
+                        value.should.be.Array();
+                        value.should.have.length(3);
+                        value[0].should.be.Object();
+                        value[1].should.be.Object();
+                        value[2].should.be.Object();
+                        context.get("nodeX","foo[1]",function(err, value){
+                            value.should.be.Object();
+                            value.should.be.eql({obj:"bar2"});
+                            done();
+                        });
+                    });
+                });
             });
         });
     });
 
     describe('#keys',function() {
-        it('should enumerate context keys', function() {
-            return context.keys("nodeX").then(function(result){
-                result.should.be.an.Array();
-                result.should.be.empty();
-            }).then(function(){
-                return context.set("nodeX","foo","bar");
-            }).then(function(){
-                return context.keys("nodeX").then(function(result){
-                    result.should.have.length(1);
-                    result[0].should.equal("foo");
-                });
-            }).then(function(){
-                return context.set("nodeX","abc.def","bar");
-            }).then(function(){
-                return context.keys("nodeX").then(function(result){
-                    result.should.have.length(2);
-                    result[1].should.equal("abc");
+        it('should enumerate context keys', function(done) {
+            context.keys("nodeX",function(err, value){
+                value.should.be.an.Array();
+                value.should.be.empty();
+                context.set("nodeX","foo","bar",function(err){
+                    context.keys("nodeX",function(err, value){
+                        value.should.have.length(1);
+                        value[0].should.equal("foo");
+                        context.set("nodeX","abc.def","bar",function(err){
+                            context.keys("nodeX",function(err, value){
+                                value.should.have.length(2);
+                                value[1].should.equal("abc");
+                                done();
+                            });
+                        });
+                    });
                 });
             });
         });
 
-        it('should enumerate context keys in each scopes', function() {
-            return Promise.all([context.keys("nodeX"),
-                                context.keys("nodeY")
-            ]).then(function(results){
-                results[0].should.be.an.Array();
-                results[0].should.be.empty();
-                results[1].should.be.an.Array();
-                results[1].should.be.empty();
-            }).then(function(){
-                return Promise.all([context.set("nodeX","foo","bar"),
-                                    context.set("nodeY","hoge","piyo")]);
-            }).then(function(){
-                return Promise.all([context.keys("nodeX"),
-                                    context.keys("nodeY")]);
-            }).then(function(results){
-                results[0].should.have.length(1);
-                results[0][0].should.equal("foo");
-                results[1].should.have.length(1);
-                results[1][0].should.equal("hoge");
+        it('should enumerate context keys in each scopes', function(done) {
+            context.keys("nodeX",function(err, value){
+                value.should.be.an.Array();
+                value.should.be.empty();
+                context.keys("nodeY",function(err, value){
+                    value.should.be.an.Array();
+                    value.should.be.empty();
+                    context.set("nodeX","foo","bar",function(err){
+                        context.set("nodeY","hoge","piyo",function(err){
+                            context.keys("nodeX",function(err, value){
+                                value.should.have.length(1);
+                                value[0].should.equal("foo");
+                                context.keys("nodeY",function(err, value){
+                                    value.should.have.length(1);
+                                    value[0].should.equal("hoge");
+                                    done();
+                                });
+                            });
+                        });
+                    });
+                });
             });
         });
     });
 
     describe('#delete',function() {
-        it('should delete context',function() {
-            return Promise.all([context.get("nodeX","foo").should.be.finally.undefined(),
-                                context.get("nodeY","foo").should.be.finally.undefined()
-            ]).then(function(){
-                return Promise.all([context.set("nodeX","foo","abc"),
-                                    context.set("nodeY","foo","abc")]);
-            }).then(function(){
-                return Promise.all([context.get("nodeX","foo").should.be.finally.equal("abc"),
-                                    context.get("nodeY","foo").should.be.finally.equal("abc")])
-            }).then(function(){
-                return context.delete("nodeX");
-            }).then(function(){
-                return Promise.all([context.get("nodeX","foo").should.be.finally.undefined(),
-                                    context.get("nodeY","foo").should.be.finally.equal("abc")]);
+        it('should delete context',function(done) {
+            context.get("nodeX","foo",function(err, value){
+                should.not.exist(value);
+                context.get("nodeY","foo",function(err, value){
+                    should.not.exist(value);
+                    context.set("nodeX","foo","testX",function(err){
+                        context.set("nodeY","foo","testY",function(err){
+                            context.get("nodeX","foo",function(err, value){
+                                value.should.be.equal("testX");
+                                context.get("nodeY","foo",function(err, value){
+                                    value.should.be.equal("testY");
+                                    context.delete("nodeX").then(function(){
+                                        context.get("nodeX","foo",function(err, value){
+                                            should.not.exist(value);
+                                            context.get("nodeY","foo",function(err, value){
+                                                value.should.be.equal("testY");
+                                                done();
+                                            });
+                                        });
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
             });
         });
     });
 
     describe('#clean',function() {
-        it('should clean unnecessary context',function() {
-            return Promise.all([context.get("nodeX","foo").should.be.finally.undefined(),
-                                context.get("nodeY","foo").should.be.finally.undefined()
-            ]).then(function(){
-                return Promise.all([context.set("nodeX","foo","abc"),
-                                    context.set("nodeY","foo","abc")]);
-            }).then(function(){
-                return Promise.all([context.get("nodeX","foo").should.be.finally.equal("abc"),
-                                    context.get("nodeY","foo").should.be.finally.equal("abc")])
-            }).then(function(){
-                return context.clean([]);
-            }).then(function(){
-                return Promise.all([context.get("nodeX","foo").should.be.finally.undefined(),
-                                    context.get("nodeY","foo").should.be.finally.undefined()]);
+        it('should clean unnecessary context',function(done) {
+            context.get("nodeX","foo",function(err, value){
+                should.not.exist(value);
+                context.get("nodeY","foo",function(err, value){
+                    should.not.exist(value);
+                    context.set("nodeX","foo","testX",function(err){
+                        context.set("nodeY","foo","testY",function(err){
+                            context.get("nodeX","foo",function(err, value){
+                                value.should.be.equal("testX");
+                                context.get("nodeY","foo",function(err, value){
+                                    value.should.be.equal("testY");
+                                    context.clean([]).then(function(){
+                                        context.get("nodeX","foo",function(err, value){
+                                            should.not.exist(value);
+                                            context.get("nodeY","foo",function(err, value){
+                                                should.not.exist(value);
+                                                done();
+                                            });
+                                        });
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
             });
         });
 
-        it('should not clean active context',function() {
-            return Promise.all([context.get("nodeX","foo").should.be.finally.undefined(),
-                                context.get("nodeY","foo").should.be.finally.undefined()
-            ]).then(function(){
-                return Promise.all([context.set("nodeX","foo","abc"),
-                                    context.set("nodeY","foo","abc")]);
-            }).then(function(){
-                return Promise.all([context.get("nodeX","foo").should.be.finally.equal("abc"),
-                                    context.get("nodeY","foo").should.be.finally.equal("abc")])
-            }).then(function(){
-                return context.clean(["nodeX"]);
-            }).then(function(){
-                return Promise.all([context.get("nodeX","foo").should.be.finally.equal("abc"),
-                                    context.get("nodeY","foo").should.be.finally.undefined()]);
+        it('should not clean active context',function(done) {
+            context.get("nodeX","foo",function(err, value){
+                should.not.exist(value);
+                context.get("nodeY","foo",function(err, value){
+                    should.not.exist(value);
+                    context.set("nodeX","foo","testX",function(err){
+                        context.set("nodeY","foo","testY",function(err){
+                            context.get("nodeX","foo",function(err, value){
+                                value.should.be.equal("testX");
+                                context.get("nodeY","foo",function(err, value){
+                                    value.should.be.equal("testY");
+                                    context.clean(["nodeX"]).then(function(){
+                                        context.get("nodeX","foo",function(err, value){
+                                            value.should.be.equal("testX");
+                                            context.get("nodeY","foo",function(err, value){
+                                                should.not.exist(value);
+                                                done();
+                                            });
+                                        });
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
             });
         });
     });

From 0c6bf81c243520c2d4d0d0d51549259a4fa70119 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Sat, 23 Jun 2018 12:49:09 +0900
Subject: [PATCH 080/113] fix appearence of retry button of remote branch
 management dialog

---
 editor/js/ui/notifications.js            | 2 +-
 editor/js/ui/projects/projects.js        | 2 +-
 red/api/editor/locales/en-US/editor.json | 1 +
 red/api/editor/locales/ja/editor.json    | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/editor/js/ui/notifications.js b/editor/js/ui/notifications.js
index fef2b1610..e232af282 100644
--- a/editor/js/ui/notifications.js
+++ b/editor/js/ui/notifications.js
@@ -96,7 +96,7 @@ RED.notifications = (function() {
         if (options.buttons) {
             var buttonSet = $('<div style="margin-top: 20px;" class="ui-dialog-buttonset"></div>').appendTo(n)
             options.buttons.forEach(function(buttonDef) {
-                var b = $('<button>').text(buttonDef.text).click(buttonDef.click).appendTo(buttonSet);
+                var b = $('<button>').html(buttonDef.text).click(buttonDef.click).appendTo(buttonSet);
                 if (buttonDef.id) {
                     b.attr('id',buttonDef.id);
                 }
diff --git a/editor/js/ui/projects/projects.js b/editor/js/ui/projects/projects.js
index 71a19d661..9a98ed05a 100644
--- a/editor/js/ui/projects/projects.js
+++ b/editor/js/ui/projects/projects.js
@@ -1983,7 +1983,7 @@ RED.projects = (function() {
                                     notification.close();
                                 }
                             },{
-                                text: $('<span><i class="fa fa-refresh"></i> Retry</span>'),
+                                text: '<span><i class="fa fa-refresh"></i> ' +RED._("projects.send-req.retry") +'</span>',
                                 click: function() {
                                     body = body || {};
                                     var authBody = {};
diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json
index 65681850f..69e402e0a 100644
--- a/red/api/editor/locales/en-US/editor.json
+++ b/red/api/editor/locales/en-US/editor.json
@@ -795,6 +795,7 @@
             "username": "Username",
             "password": "Password",
             "passphrase": "Passphrase",
+            "retry": "Retry",
             "update-failed": "Failed to update auth",
             "unhandled": "Unhandled error response"
         },
diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json
index d18938123..e884ec842 100644
--- a/red/api/editor/locales/ja/editor.json
+++ b/red/api/editor/locales/ja/editor.json
@@ -785,6 +785,7 @@
             "username": "ユーザ名",
             "password": "パスワード",
             "passphrase": "パスフレーズ",
+            "retry": "リトライ",
             "update-failed": "認証の更新に失敗しました",
             "unhandled": "エラー応答が処理されませんでした"
         },

From bdf87452b6df4cd72a57b3cf9aee7014d12a0455 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 25 Jun 2018 10:38:02 +0100
Subject: [PATCH 081/113] Reset typedInput option when type changes

---
 editor/js/ui/common/typedInput.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/editor/js/ui/common/typedInput.js b/editor/js/ui/common/typedInput.js
index e49dbb250..0f9e2a0d9 100644
--- a/editor/js/ui/common/typedInput.js
+++ b/editor/js/ui/common/typedInput.js
@@ -496,7 +496,11 @@
                                 } else {
                                     that.activeOptions[o.value] = o;
                                 }
-                            })
+                            });
+
+                            if (!that.activeOptions.hasOwnProperty(that.optionValue)) {
+                                that.optionValue = null;
+                            }
                             this.optionMenu = this._createMenu(opt.options,function(v){
                                 that._updateOptionSelectLabel(that.activeOptions[v]);
                                 if (!opt.hasValue) {

From 11569d80564c60475883f84b4e83f505e48881c4 Mon Sep 17 00:00:00 2001
From: Kazuki-Nakanishi <kazuki.nakanishi.vr@hitachi-solutions.com>
Date: Mon, 25 Jun 2018 18:48:01 +0900
Subject: [PATCH 082/113] Follow the change of tab interface for UI test

---
 test/editor/pageobjects/workspace/debugTab_page.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/editor/pageobjects/workspace/debugTab_page.js b/test/editor/pageobjects/workspace/debugTab_page.js
index c66122d70..3964d3f5d 100644
--- a/test/editor/pageobjects/workspace/debugTab_page.js
+++ b/test/editor/pageobjects/workspace/debugTab_page.js
@@ -15,7 +15,7 @@
  **/
 
 function open() {
-    browser.clickWithWait('#red-ui-tab-debug');
+    browser.clickWithWait('#red-ui-tab-debug-link-button');
 }
 
 function getMessage(index) {

From 2b2eee352f6059f03e47c4c9ca3b63144d5da81e Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 25 Jun 2018 13:18:00 +0100
Subject: [PATCH 083/113] Better wire layout when looping back

---
 editor/js/ui/view.js  | 126 ++++++++++++++++++++++++++++--------------
 editor/sass/flow.scss |   2 +-
 2 files changed, 84 insertions(+), 44 deletions(-)

diff --git a/editor/js/ui/view.js b/editor/js/ui/view.js
index 3332f9916..0945a7cd9 100644
--- a/editor/js/ui/view.js
+++ b/editor/js/ui/view.js
@@ -464,6 +464,82 @@ RED.view = (function() {
         RED.actions.add("core:step-selection-left", function() { moveSelection(-20,0);});
     }
 
+    function generateLinkPath(origX,origY, destX, destY, sc) {
+        var dy = destY-origY;
+        var dx = destX-origX;
+        var delta = Math.sqrt(dy*dy+dx*dx);
+        var scale = lineCurveScale;
+        var scaleY = 0;
+        if (dx*sc > 0) {
+            if (delta < node_width) {
+                scale = 0.75-0.75*((node_width-delta)/node_width);
+                // scale += 2*(Math.min(5*node_width,Math.abs(dx))/(5*node_width));
+                // if (Math.abs(dy) < 3*node_height) {
+                //     scaleY = ((dy>0)?0.5:-0.5)*(((3*node_height)-Math.abs(dy))/(3*node_height))*(Math.min(node_width,Math.abs(dx))/(node_width)) ;
+                // }
+            }
+        } else {
+            scale = 0.4-0.2*(Math.max(0,(node_width-Math.min(Math.abs(dx),Math.abs(dy)))/node_width));
+        }
+        if (dx*sc > 0) {
+            return "M "+origX+" "+origY+
+                " C "+(origX+sc*(node_width*scale))+" "+(origY+scaleY*node_height)+" "+
+                (destX-sc*(scale)*node_width)+" "+(destY-scaleY*node_height)+" "+
+                destX+" "+destY
+        } else {
+
+            var midX = Math.floor(destX-dx/2);
+            var midY = Math.floor(destY-dy/2);
+            //
+            if (dy == 0) {
+                midY = destY + node_height;
+            }
+            var cp_height = node_height/2;
+            var y1 = (destY + midY)/2
+            var topX =origX + sc*node_width*scale;
+            var topY = dy>0?Math.min(y1 - dy/2 , origY+cp_height):Math.max(y1 - dy/2 , origY-cp_height);
+            var bottomX = destX - sc*node_width*scale;
+            var bottomY = dy>0?Math.max(y1, destY-cp_height):Math.min(y1, destY+cp_height);
+            var x1 = (origX+topX)/2;
+            var scy = dy>0?1:-1;
+            var cp = [
+                // Orig -> Top
+                [x1,origY],
+                [topX,dy>0?Math.max(origY, topY-cp_height):Math.min(origY, topY+cp_height)],
+                // Top -> Mid
+                // [Mirror previous cp]
+                [x1,dy>0?Math.min(midY, topY+cp_height):Math.max(midY, topY-cp_height)],
+                // Mid -> Bottom
+                // [Mirror previous cp]
+                [bottomX,dy>0?Math.max(midY, bottomY-cp_height):Math.min(midY, bottomY+cp_height)],
+                // Bottom -> Dest
+                // [Mirror previous cp]
+                [(destX+bottomX)/2,destY]
+            ];
+            if (cp[2][1] === topY+scy*cp_height) {
+                if (Math.abs(dy) < cp_height*10) {
+                    cp[1][1] = topY-scy*cp_height/2;
+                    cp[3][1] = bottomY-scy*cp_height/2;
+                }
+                cp[2][0] = topX;
+            }
+            return "M "+origX+" "+origY+
+                " C "+
+                   cp[0][0]+" "+cp[0][1]+" "+
+                   cp[1][0]+" "+cp[1][1]+" "+
+                   topX+" "+topY+
+                " S "+
+                   cp[2][0]+" "+cp[2][1]+" "+
+                   midX+" "+midY+
+               " S "+
+                  cp[3][0]+" "+cp[3][1]+" "+
+                  bottomX+" "+bottomY+
+                " S "+
+                    cp[4][0]+" "+cp[4][1]+" "+
+                    destX+" "+destY
+        }
+    }
+
 
     function addNode(type,x,y) {
         var m = /^subflow:(.+)$/.exec(type);
@@ -794,28 +870,7 @@ RED.view = (function() {
 
                 var sc = (drag_line.portType === PORT_TYPE_OUTPUT)?1:-1;
 
-                var dy = mousePos[1]-(drag_line.node.y+portY);
-                var dx = mousePos[0]-(drag_line.node.x+sc*drag_line.node.w/2);
-                var delta = Math.sqrt(dy*dy+dx*dx);
-                var scale = lineCurveScale;
-                var scaleY = 0;
-
-                if (delta < node_width) {
-                    scale = 0.75-0.75*((node_width-delta)/node_width);
-                }
-                if (dx*sc < 0) {
-                    scale += 2*(Math.min(5*node_width,Math.abs(dx))/(5*node_width));
-                    if (Math.abs(dy) < 3*node_height) {
-                        scaleY = ((dy>0)?0.5:-0.5)*(((3*node_height)-Math.abs(dy))/(3*node_height))*(Math.min(node_width,Math.abs(dx))/(node_width)) ;
-                    }
-                }
-
-                drag_line.el.attr("d",
-                    "M "+(drag_line.node.x+sc*drag_line.node.w/2)+" "+(drag_line.node.y+portY)+
-                    " C "+(drag_line.node.x+sc*(drag_line.node.w/2+node_width*scale))+" "+(drag_line.node.y+portY+scaleY*node_height)+" "+
-                    (mousePos[0]-sc*(scale)*node_width)+" "+(mousePos[1]-scaleY*node_height)+" "+
-                    mousePos[0]+" "+mousePos[1]
-                    );
+                drag_line.el.attr("d",generateLinkPath(drag_line.node.x+sc*drag_line.node.w/2,drag_line.node.y+portY,mousePos[0],mousePos[1],sc));
             }
             d3.event.preventDefault();
         } else if (mouse_mode == RED.state.MOVING) {
@@ -2394,32 +2449,17 @@ RED.view = (function() {
                         var numOutputs = d.source.outputs || 1;
                         var sourcePort = d.sourcePort || 0;
                         var y = -((numOutputs-1)/2)*13 +13*sourcePort;
-
-                        var dy = d.target.y-(d.source.y+y);
-                        var dx = (d.target.x-d.target.w/2)-(d.source.x+d.source.w/2);
-                        var delta = Math.sqrt(dy*dy+dx*dx);
-                        var scale = lineCurveScale;
-                        var scaleY = 0;
-                        if (delta < node_width) {
-                            scale = 0.75-0.75*((node_width-delta)/node_width);
-                        }
-
-                        if (dx < 0) {
-                            scale += 2*(Math.min(5*node_width,Math.abs(dx))/(5*node_width));
-                            if (Math.abs(dy) < 3*node_height) {
-                                scaleY = ((dy>0)?0.5:-0.5)*(((3*node_height)-Math.abs(dy))/(3*node_height))*(Math.min(node_width,Math.abs(dx))/(node_width)) ;
-                            }
-                        }
-
                         d.x1 = d.source.x+d.source.w/2;
                         d.y1 = d.source.y+y;
                         d.x2 = d.target.x-d.target.w/2;
                         d.y2 = d.target.y;
 
-                        return "M "+d.x1+" "+d.y1+
-                            " C "+(d.x1+scale*node_width)+" "+(d.y1+scaleY*node_height)+" "+
-                            (d.x2-scale*node_width)+" "+(d.y2-scaleY*node_height)+" "+
-                            d.x2+" "+d.y2;
+                        // return "M "+d.x1+" "+d.y1+
+                        //     " C "+(d.x1+scale*node_width)+" "+(d.y1+scaleY*node_height)+" "+
+                        //     (d.x2-scale*node_width)+" "+(d.y2-scaleY*node_height)+" "+
+                        //     d.x2+" "+d.y2;
+
+                        return generateLinkPath(d.x1,d.y1,d.x2,d.y2,1);
                     });
                 }
             })
diff --git a/editor/sass/flow.scss b/editor/sass/flow.scss
index 314bc8a8d..dd2d4e286 100644
--- a/editor/sass/flow.scss
+++ b/editor/sass/flow.scss
@@ -248,7 +248,7 @@
 
 .link_outline {
     stroke: #fff;
-    stroke-width: 4;
+    stroke-width: 5;
     cursor: crosshair;
     fill: none;
     pointer-events: none;

From f95a2851c899379d2bf730da62441b43c259bfef Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 25 Jun 2018 13:36:58 +0100
Subject: [PATCH 084/113] Ignore middle-click on node/ports to enable panning

---
 editor/js/ui/view.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/editor/js/ui/view.js b/editor/js/ui/view.js
index 0945a7cd9..129817285 100644
--- a/editor/js/ui/view.js
+++ b/editor/js/ui/view.js
@@ -1484,6 +1484,10 @@ RED.view = (function() {
         //console.log(d,portType,portIndex);
         // disable zoom
         //vis.call(d3.behavior.zoom().on("zoom"), null);
+        if (d3.event.button === 1) {
+            return;
+        }
+
         mousedown_node = d;
         mousedown_port_type = portType;
         mousedown_port_index = portIndex || 0;
@@ -1715,6 +1719,9 @@ RED.view = (function() {
 
     function nodeMouseDown(d) {
         focusView();
+        if (d3.event.button === 1) {
+            return;
+        }
         //var touch0 = d3.event;
         //var pos = [touch0.pageX,touch0.pageY];
         //RED.touch.radialMenu.show(d3.select(this),pos);

From 2cb4f6b1fccc16375181c7875dfb99af2772681d Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 25 Jun 2018 13:54:34 +0100
Subject: [PATCH 085/113] Prevent horizontal scroll when palette name cannot
 wrap

---
 editor/sass/palette.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/editor/sass/palette.scss b/editor/sass/palette.scss
index 10fd60cad..e83f929e2 100644
--- a/editor/sass/palette.scss
+++ b/editor/sass/palette.scss
@@ -91,6 +91,7 @@
     padding: 9px;
     font-weight: bold;
     padding-left: 30px;
+    overflow: hidden;
 }
 .palette-header > i {
     position: absolute;

From fe22cedc1d87eac5556b0060b645219175bd8e00 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 25 Jun 2018 22:31:11 +0100
Subject: [PATCH 086/113] Move debug encode/decode to utils for reuse

---
 editor/js/ui/utils.js                    |  35 ++++++-
 editor/sass/debug.scss                   |  32 +++---
 nodes/core/core/58-debug.js              | 107 +------------------
 nodes/core/core/lib/debug/debug-utils.js |  20 +---
 red/runtime/util.js                      | 125 +++++++++++++++++++++++
 5 files changed, 176 insertions(+), 143 deletions(-)

diff --git a/editor/js/ui/utils.js b/editor/js/ui/utils.js
index 6d5884cdd..4f84da8ba 100644
--- a/editor/js/ui/utils.js
+++ b/editor/js/ui/utils.js
@@ -34,6 +34,8 @@ RED.utils = (function() {
                 result = $('<span class="debug-message-object-value debug-message-type-meta"></span>').text('buffer['+value.length+']');
             } else if (value.hasOwnProperty('type') && value.type === 'array' && value.hasOwnProperty('data')) {
                 result = $('<span class="debug-message-object-value debug-message-type-meta"></span>').text('array['+value.length+']');
+            } else if (value.hasOwnProperty('type') && value.type === 'function') {
+                result = $('<span class="debug-message-object-value debug-message-type-meta"></span>').text('function');
             } else {
                 result = $('<span class="debug-message-object-value debug-message-type-meta">object</span>');
             }
@@ -125,7 +127,7 @@ RED.utils = (function() {
             e.stopPropagation();
             RED.clipboard.copyText(msg,copyPayload,"clipboard.copyMessageValue");
         })
-        if (strippedKey !== '') {
+        if (strippedKey !== undefined && strippedKey !== '') {
             var isPinned = pinnedPaths[sourceId].hasOwnProperty(strippedKey);
 
             var pinPath = $('<button class="editor-button editor-button-small debug-message-tools-pin"><i class="fa fa-map-pin"></i></button>').appendTo(tools).click(function(e) {
@@ -296,9 +298,12 @@ RED.utils = (function() {
             isArray = true;
             isArrayObject = true;
         }
-
         if (obj === null || obj === undefined) {
             $('<span class="debug-message-type-null">'+obj+'</span>').appendTo(entryObj);
+        } else if (typeHint === "function" || (obj.__encoded__ && obj.type === 'function')) {
+            e = $('<span class="debug-message-type-meta debug-message-object-header"></span>').text("function").appendTo(entryObj);
+        } else if (typeHint === "internal" || (obj.__encoded__ && obj.type === 'internal')) {
+            e = $('<span class="debug-message-type-meta debug-message-object-header"></span>').text("[internal]").appendTo(entryObj);
         } else if (typeof obj === 'string') {
             if (/[\t\n\r]/.test(obj)) {
                 element.addClass('collapsed');
@@ -791,6 +796,29 @@ RED.utils = (function() {
         return spinner;
     }
 
+    function decodeObject(payload,format) {
+        if ((format === 'number') && (payload === "NaN")) {
+            payload = Number.NaN;
+        } else if (format === 'Object' || /^array/.test(format) || format === 'boolean' || format === 'number' ) {
+            payload = JSON.parse(payload);
+        } else if (/error/i.test(format)) {
+            payload = JSON.parse(payload);
+            payload = (payload.name?payload.name+": ":"")+payload.message;
+        } else if (format === 'null') {
+            payload = null;
+        } else if (format === 'undefined') {
+            payload = undefined;
+        } else if (/^buffer/.test(format)) {
+            var buffer = payload;
+            payload = [];
+            for (var c = 0; c < buffer.length; c += 2) {
+                payload.push(parseInt(buffer.substr(c, 2), 16));
+            }
+        }
+        return payload;
+    }
+
+
     return {
         createObjectElement: buildMessageElement,
         getMessageProperty: getMessageProperty,
@@ -800,6 +828,7 @@ RED.utils = (function() {
         getDefaultNodeIcon: getDefaultNodeIcon,
         getNodeIcon: getNodeIcon,
         getNodeLabel: getNodeLabel,
-        addSpinnerOverlay: addSpinnerOverlay
+        addSpinnerOverlay: addSpinnerOverlay,
+        decodeObject: decodeObject
     }
 })();
diff --git a/editor/sass/debug.scss b/editor/sass/debug.scss
index aded6d718..a3acd18ff 100644
--- a/editor/sass/debug.scss
+++ b/editor/sass/debug.scss
@@ -64,22 +64,22 @@
             display: inline-block;
         }
     }
-    .debug-message-row {
-        .debug-message-tools-pin {
-            display: none;
-        }
-        &.debug-message-row-pinned .debug-message-tools-pin {
-            display: inline-block;
-        }
-        &:hover {
-            background: #f3f3f3;
-            &>.debug-message-tools {
-                .debug-message-tools-copy {
-                    display: inline-block;
-                }
-                .debug-message-tools-pin {
-                    display: inline-block;
-                }
+}
+.debug-message-row {
+    .debug-message-tools-pin {
+        display: none;
+    }
+    &.debug-message-row-pinned .debug-message-tools-pin {
+        display: inline-block;
+    }
+    &:hover {
+        background: #f3f3f3;
+        &>.debug-message-tools {
+            .debug-message-tools-copy {
+                display: inline-block;
+            }
+            .debug-message-tools-pin {
+                display: inline-block;
             }
         }
     }
diff --git a/nodes/core/core/58-debug.js b/nodes/core/core/58-debug.js
index 3e4290554..fe84d487d 100644
--- a/nodes/core/core/58-debug.js
+++ b/nodes/core/core/58-debug.js
@@ -4,7 +4,6 @@ module.exports = function(RED) {
     var util = require("util");
     var events = require("events");
     var path = require("path");
-    var safeJSONStringify = require("json-stringify-safe");
     var debuglength = RED.settings.debugMaxLength || 1000;
     var useColors = RED.settings.debugUseColors || false;
     util.inspect.styles.boolean = "red";
@@ -104,111 +103,7 @@ module.exports = function(RED) {
     function sendDebug(msg) {
         // don't put blank errors in sidebar (but do add to logs)
         //if ((msg.msg === "") && (msg.hasOwnProperty("level")) && (msg.level === 20)) { return; }
-        if (msg.msg instanceof Error) {
-            msg.format = "error";
-            var errorMsg = {};
-            if (msg.msg.name) {
-                errorMsg.name = msg.msg.name;
-            }
-            if (msg.msg.hasOwnProperty('message')) {
-                errorMsg.message = msg.msg.message;
-            } else {
-                errorMsg.message = msg.msg.toString();
-            }
-            msg.msg = JSON.stringify(errorMsg);
-        } else if (msg.msg instanceof Buffer) {
-            msg.format = "buffer["+msg.msg.length+"]";
-            msg.msg = msg.msg.toString('hex');
-            if (msg.msg.length > debuglength) {
-                msg.msg = msg.msg.substring(0,debuglength);
-            }
-        } else if (msg.msg && typeof msg.msg === 'object') {
-            try {
-                msg.format = msg.msg.constructor.name || "Object";
-                // Handle special case of msg.req/res objects from HTTP In node
-                if (msg.format === "IncomingMessage" || msg.format === "ServerResponse") {
-                    msg.format = "Object";
-                }
-            } catch(err) {
-                msg.format = "Object";
-            }
-            if (/error/i.test(msg.format)) {
-                msg.msg = JSON.stringify({
-                    name: msg.msg.name,
-                    message: msg.msg.message
-                });
-            } else {
-                var isArray = util.isArray(msg.msg);
-                if (isArray) {
-                    msg.format = "array["+msg.msg.length+"]";
-                    if (msg.msg.length > debuglength) {
-                        // msg.msg = msg.msg.slice(0,debuglength);
-                        msg.msg = {
-                            __encoded__: true,
-                            type: "array",
-                            data: msg.msg.slice(0,debuglength),
-                            length: msg.msg.length
-                        }
-                    }
-                }
-                if (isArray || (msg.format === "Object")) {
-                    msg.msg = safeJSONStringify(msg.msg, function(key, value) {
-                        if (key === '_req' || key === '_res') {
-                            value = "[internal]"
-                        } else if (value instanceof Error) {
-                            value = value.toString()
-                        } else if (util.isArray(value) && value.length > debuglength) {
-                            value = {
-                                __encoded__: true,
-                                type: "array",
-                                data: value.slice(0,debuglength),
-                                length: value.length
-                            }
-                        } else if (typeof value === 'string') {
-                            if (value.length > debuglength) {
-                                value = value.substring(0,debuglength)+"...";
-                            }
-                        } else if (value && value.constructor) {
-                            if (value.type === "Buffer") {
-                                value.__encoded__ = true;
-                                value.length = value.data.length;
-                                if (value.length > debuglength) {
-                                    value.data = value.data.slice(0,debuglength);
-                                }
-                            } else if (value.constructor.name === "ServerResponse") {
-                                value = "[internal]"
-                            } else if (value.constructor.name === "Socket") {
-                                value = "[internal]"
-                            }
-                        }
-                        return value;
-                    }," ");
-                } else {
-                    try { msg.msg = msg.msg.toString(); }
-                    catch(e) { msg.msg = "[Type not printable]"; }
-                }
-            }
-        } else if (typeof msg.msg === "boolean") {
-            msg.format = "boolean";
-            msg.msg = msg.msg.toString();
-        } else if (typeof msg.msg === "number") {
-            msg.format = "number";
-            msg.msg = msg.msg.toString();
-        } else if (msg.msg === 0) {
-            msg.format = "number";
-            msg.msg = "0";
-        } else if (msg.msg === null || typeof msg.msg === "undefined") {
-            msg.format = (msg.msg === null)?"null":"undefined";
-            msg.msg = "(undefined)";
-        } else {
-            msg.format = "string["+msg.msg.length+"]";
-            if (msg.msg.length > debuglength) {
-                msg.msg = msg.msg.substring(0,debuglength)+"...";
-            }
-        }
-        // if (msg.msg.length > debuglength) {
-        //     msg.msg = msg.msg.substr(0,debuglength) +" ....";
-        // }
+        msg = RED.util.encodeObject(msg,{maxLength:debuglength});
         RED.comms.publish("debug",msg);
     }
 
diff --git a/nodes/core/core/lib/debug/debug-utils.js b/nodes/core/core/lib/debug/debug-utils.js
index 17b850327..2d47155ba 100644
--- a/nodes/core/core/lib/debug/debug-utils.js
+++ b/nodes/core/core/lib/debug/debug-utils.js
@@ -455,24 +455,8 @@ RED.debug = (function() {
             $('<span class="debug-message-name">'+name+'</span>').appendTo(metaRow);
         }
 
-        if ((format === 'number') && (payload === "NaN")) {
-            payload = Number.NaN;
-        } else if (format === 'Object' || /^array/.test(format) || format === 'boolean' || format === 'number' ) {
-            payload = JSON.parse(payload);
-        } else if (/error/i.test(format)) {
-            payload = JSON.parse(payload);
-            payload = (payload.name?payload.name+": ":"")+payload.message;
-        } else if (format === 'null') {
-            payload = null;
-        } else if (format === 'undefined') {
-            payload = undefined;
-        } else if (/^buffer/.test(format)) {
-            var buffer = payload;
-            payload = [];
-            for (var c = 0; c < buffer.length; c += 2) {
-                payload.push(parseInt(buffer.substr(c, 2), 16));
-            }
-        }
+        payload = RED.utils.decodeObject(payload,format);
+
         var el = $('<span class="debug-message-payload"></span>').appendTo(msg);
         var path = o.property||'';
         var debugMessage = RED.utils.createObjectElement(payload, {
diff --git a/red/runtime/util.js b/red/runtime/util.js
index 257e87777..022faa65d 100644
--- a/red/runtime/util.js
+++ b/red/runtime/util.js
@@ -16,6 +16,8 @@
 
 var clone = require("clone");
 var jsonata = require("jsonata");
+var safeJSONStringify = require("json-stringify-safe");
+var util = require("util");
 
 function generateId() {
     return (1+Math.random()*4294967295).toString(16);
@@ -389,7 +391,130 @@ function normaliseNodeTypeName(name) {
     return result;
 }
 
+function encodeObject(msg,opts) {
+    var debuglength = 1000;
+    if (opts && opts.hasOwnProperty('maxLength')) {
+        debuglength = opts.maxLength;
+    }
+    var msgType = typeof msg.msg;
+    if (msg.msg instanceof Error) {
+        msg.format = "error";
+        var errorMsg = {};
+        if (msg.msg.name) {
+            errorMsg.name = msg.msg.name;
+        }
+        if (msg.msg.hasOwnProperty('message')) {
+            errorMsg.message = msg.msg.message;
+        } else {
+            errorMsg.message = msg.msg.toString();
+        }
+        msg.msg = JSON.stringify(errorMsg);
+    } else if (msg.msg instanceof Buffer) {
+        msg.format = "buffer["+msg.msg.length+"]";
+        msg.msg = msg.msg.toString('hex');
+        if (msg.msg.length > debuglength) {
+            msg.msg = msg.msg.substring(0,debuglength);
+        }
+    } else if (msg.msg && msgType === 'object') {
+        try {
+            msg.format = msg.msg.constructor.name || "Object";
+            // Handle special case of msg.req/res objects from HTTP In node
+            if (msg.format === "IncomingMessage" || msg.format === "ServerResponse") {
+                msg.format = "Object";
+            }
+        } catch(err) {
+            msg.format = "Object";
+        }
+        if (/error/i.test(msg.format)) {
+            msg.msg = JSON.stringify({
+                name: msg.msg.name,
+                message: msg.msg.message
+            });
+        } else {
+            var isArray = util.isArray(msg.msg);
+            if (isArray) {
+                msg.format = "array["+msg.msg.length+"]";
+                if (msg.msg.length > debuglength) {
+                    // msg.msg = msg.msg.slice(0,debuglength);
+                    msg.msg = {
+                        __encoded__: true,
+                        type: "array",
+                        data: msg.msg.slice(0,debuglength),
+                        length: msg.msg.length
+                    }
+                }
+            }
+            if (isArray || (msg.format === "Object")) {
+                msg.msg = safeJSONStringify(msg.msg, function(key, value) {
+                    if (key === '_req' || key === '_res') {
+                        value = {
+                            __encoded__: true,
+                            type: "internal"
+                        }
+                    } else if (value instanceof Error) {
+                        value = value.toString()
+                    } else if (util.isArray(value) && value.length > debuglength) {
+                        value = {
+                            __encoded__: true,
+                            type: "array",
+                            data: value.slice(0,debuglength),
+                            length: value.length
+                        }
+                    } else if (typeof value === 'string') {
+                        if (value.length > debuglength) {
+                            value = value.substring(0,debuglength)+"...";
+                        }
+                    } else if (typeof value === 'function') {
+                        value = {
+                            __encoded__: true,
+                            type: "function"
+                        }
+                    } else if (value && value.constructor) {
+                        if (value.type === "Buffer") {
+                            value.__encoded__ = true;
+                            value.length = value.data.length;
+                            if (value.length > debuglength) {
+                                value.data = value.data.slice(0,debuglength);
+                            }
+                        } else if (value.constructor.name === "ServerResponse") {
+                            value = "[internal]"
+                        } else if (value.constructor.name === "Socket") {
+                            value = "[internal]"
+                        }
+                    }
+                    return value;
+                }," ");
+            } else {
+                try { msg.msg = msg.msg.toString(); }
+                catch(e) { msg.msg = "[Type not printable]"; }
+            }
+        }
+    } else if (msgType === "function") {
+        msg.format = "function";
+        msg.msg = "[function]"
+    } else if (msgType === "boolean") {
+        msg.format = "boolean";
+        msg.msg = msg.msg.toString();
+    } else if (msgType === "number") {
+        msg.format = "number";
+        msg.msg = msg.msg.toString();
+    } else if (msg.msg === 0) {
+        msg.format = "number";
+        msg.msg = "0";
+    } else if (msg.msg === null || msgType === "undefined") {
+        msg.format = (msg.msg === null)?"null":"undefined";
+        msg.msg = "(undefined)";
+    } else {
+        msg.format = "string["+msg.msg.length+"]";
+        if (msg.msg.length > debuglength) {
+            msg.msg = msg.msg.substring(0,debuglength)+"...";
+        }
+    }
+    return msg;
+}
+
 module.exports = {
+    encodeObject: encodeObject,
     ensureString: ensureString,
     ensureBuffer: ensureBuffer,
     cloneMessage: cloneMessage,

From 73a18891c5840f34fb3c932d90bb817419789012 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 25 Jun 2018 22:31:36 +0100
Subject: [PATCH 087/113] Add RED.popover.tooltip for common reuse

---
 editor/js/ui/common/popover.js | 23 +++++++++++++++++++----
 editor/js/ui/common/tabs.js    |  9 +--------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/editor/js/ui/common/popover.js b/editor/js/ui/common/popover.js
index 0170f7070..d0253a8cc 100644
--- a/editor/js/ui/common/popover.js
+++ b/editor/js/ui/common/popover.js
@@ -53,7 +53,12 @@ RED.popover = (function() {
                     div.addClass("red-ui-popover-size-"+size);
                 }
                 if (typeof content === 'function') {
-                    content.call(res).appendTo(div);
+                    var result = content.call(res);
+                    if (typeof result === 'string') {
+                        div.text(result);
+                    } else {
+                        div.append(result);
+                    }
                 } else {
                     div.html(content);
                 }
@@ -63,8 +68,8 @@ RED.popover = (function() {
 
 
                 var targetPos = target.offset();
-                var targetWidth = target.width();
-                var targetHeight = target.height();
+                var targetWidth = target.outerWidth();
+                var targetHeight = target.outerHeight();
                 var divHeight = div.height();
                 var divWidth = div.width();
                 if (direction === 'right') {
@@ -147,7 +152,17 @@ RED.popover = (function() {
     }
 
     return {
-        create: createPopover
+        create: createPopover,
+        tooltip: function(target,content) {
+            RED.popover.create({
+                target:target,
+                trigger: "hover",
+                size: "small",
+                direction: "bottom",
+                content: content,
+                delay: { show: 550, hide: 10 }
+            });
+        }
     }
 
 })();
diff --git a/editor/js/ui/common/tabs.js b/editor/js/ui/common/tabs.js
index 7404ba337..700618495 100644
--- a/editor/js/ui/common/tabs.js
+++ b/editor/js/ui/common/tabs.js
@@ -349,14 +349,7 @@ RED.tabs = (function() {
                         pinnedLink.addClass("red-ui-tab-link-button-pinned");
                         pinnedTabsCount++;
                     }
-                    RED.popover.create({
-                        target:$(pinnedLink),
-                        trigger: "hover",
-                        size: "small",
-                        direction: "bottom",
-                        content: tab.name,
-                        delay: { show: 550, hide: 10 }
-                    });
+                    RED.popover.tooltip($(pinnedLink), tab.name);
 
                 }
                 link.on("click",onTabClick);

From cce7ac09d0fc959b1829f764c63ab0ac18a74988 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Tue, 26 Jun 2018 11:36:37 +0900
Subject: [PATCH 088/113] Add callback handling to memory plugin

---
 red/runtime/nodes/context/memory.js | 65 ++++++++++++++++++++++-------
 1 file changed, 51 insertions(+), 14 deletions(-)

diff --git a/red/runtime/nodes/context/memory.js b/red/runtime/nodes/context/memory.js
index 3010b4315..b6f687f96 100644
--- a/red/runtime/nodes/context/memory.js
+++ b/red/runtime/nodes/context/memory.js
@@ -28,30 +28,67 @@ Memory.prototype.close = function(){
     return Promise.resolve();
 };
 
-Memory.prototype.get = function(scope, key) {
-    if(!this.data[scope]){
-        return undefined;
+Memory.prototype.get = function(scope, key, callback) {
+    var value;
+    try{
+        if(this.data[scope]){
+            value = util.getMessageProperty(this.data[scope], key);
+        }
+    }catch(err){
+        if(callback){
+            callback(err);
+        }else{
+            throw err;
+        }
+    }
+    if(callback){
+        callback(null, value);
+    } else {
+        return value;
     }
-    return util.getMessageProperty(this.data[scope],key);
 };
 
-Memory.prototype.set =function(scope, key, value) {
+Memory.prototype.set =function(scope, key, value, callback) {
     if(!this.data[scope]){
         this.data[scope] = {};
     }
-    util.setMessageProperty(this.data[scope],key,value);
+    try{
+        util.setMessageProperty(this.data[scope],key,value);
+    }catch(err){
+        if(callback){
+            callback(err);
+        }else{
+            throw err;
+        }
+    }
+    if(callback){
+        callback(null);
+    }
 };
 
-Memory.prototype.keys = function(scope){
-    if(!this.data[scope]){
-        return [];
+Memory.prototype.keys = function(scope, callback){
+    var values = [];
+    try{
+        if(this.data[scope]){
+            if (scope !== "global") {
+                values = Object.keys(this.data[scope]);
+            } else {
+                values = Object.keys(this.data[scope]).filter(function (key) {
+                    return key !== "set" && key !== "get" && key !== "keys";
+                });
+            }
+        }
+    }catch(err){
+        if(callback){
+            callback(err);
+        }else{
+            throw err;
+        }
     }
-    if (scope !== "global") {
-        return Object.keys(this.data[scope]);
+    if(callback){
+        callback(null, values);
     } else {
-        return Object.keys(this.data[scope]).filter(function (key) {
-            return key !== "set" && key !== "get" && key !== "keys";
-        });
+        return values;
     }
 };
 

From 40ff54f67e5209e6ea23e440b14cd069995f6b56 Mon Sep 17 00:00:00 2001
From: HirokiUchikawa <hiroki.uchikawa.gb@hitachi.com>
Date: Tue, 26 Jun 2018 11:43:37 +0900
Subject: [PATCH 089/113] Improve context storage handling

---
 red/runtime/nodes/context/index.js           | 61 +++++++++++++-------
 test/red/runtime/nodes/context/index_spec.js |  2 +-
 2 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index ac52ca152..8ea3f5823 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -22,7 +22,7 @@ var settings;
 var contexts = {};
 var globalContext = null;
 var externalContexts = {};
-var noContextStorage = false;
+var noContextStorage = true;
 
 function init(_settings) {
     settings = _settings;
@@ -96,9 +96,7 @@ function copySettings(config, settings){
 }
 
 function getContextStorage(storage) {
-    if (noContextStorage || !storage) {
-        return externalContexts["_"];
-    } else if (externalContexts.hasOwnProperty(storage)) {
+    if (externalContexts.hasOwnProperty(storage)) {
         return externalContexts[storage];
     } else if (externalContexts.hasOwnProperty("default")) {
         return externalContexts["default"];
@@ -114,29 +112,52 @@ function createContext(id,seed) {
     var obj = seed || {};
 
     obj.get = function(key, storage, callback) {
-        if (typeof storage === 'function') {
-            callback = storage;
-            storage = "default";
-        } else if(typeof storage === "string" && typeof callback !== 'function'){
-            throw new Error("Callback must be a function");
+        var context;
+        if (!storage && !callback) {
+            context = externalContexts["_"];
+        } else {
+            if (typeof storage === 'function') {
+                callback = storage;
+                storage = "default";
+            }
+            if (typeof callback !== 'function'){
+                throw new Error("Callback must be a function");
+            }
+            context = getContextStorage(storage);
         }
-        return getContextStorage(storage).get(scope, key, callback);
+        return context.get(scope, key, callback);
     };
     obj.set = function(key, value, storage, callback) {
-        if (typeof storage === 'function') {
-            callback = storage;
-            storage = "default";
+        var context;
+        if (!storage && !callback) {
+            context = externalContexts["_"];
+        } else {
+            if (typeof storage === 'function') {
+                callback = storage;
+                storage = "default";
+            }
+            if (callback && typeof callback !== 'function') {
+                throw new Error("Callback must be a function");
+            }
+            context = getContextStorage(storage);
         }
-        getContextStorage(storage).set(scope, key, value, callback);
+        context.set(scope, key, value, callback);
     };
     obj.keys = function(storage, callback) {
-        if (typeof storage === 'function') {
-            callback = storage;
-            storage = "default";
-        } else if(typeof storage === "string" && typeof callback !== 'function'){
-            throw new Error("Callback must be a function");
+        var context;
+        if (!storage && !callback) {
+            context = externalContexts["_"];
+        } else {
+            if (typeof storage === 'function') {
+                callback = storage;
+                storage = "default";
+            }
+            if (typeof callback !== 'function') {
+                throw new Error("Callback must be a function");
+            }
+            context = getContextStorage(storage);
         }
-        return getContextStorage(storage).keys(scope, callback);
+        return context.keys(scope, callback);
     };
     return obj;
 }
diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index bc597d0b9..fa1332f20 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -263,7 +263,7 @@ describe('context', function() {
                 Context.init({contextStorage:{_:{module:testPlugin}}});
                 Context.load().then(function(){
                     var context = Context.get("1","flow");
-                    var cb = function(){done("An error occurred")}
+                    var cb = function(){}
                     context.set("foo","bar","_",cb);
                     context.get("foo","_",cb);
                     context.keys("_",cb);

From 8d6ac6406dd601e6966faf0a0ad9cc0d0dd4faec Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 21 Jun 2018 10:31:27 +0100
Subject: [PATCH 090/113] Initial context sidebar tab

---
 Gruntfile.js                             |  1 +
 editor/js/keymap.json                    |  1 +
 editor/js/ui/sidebar.js                  |  3 +-
 editor/js/ui/tab-context.js              | 41 ++++++++++++++++++++++++
 red/api/editor/locales/en-US/editor.json |  4 +++
 5 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 editor/js/ui/tab-context.js

diff --git a/Gruntfile.js b/Gruntfile.js
index 6d53e4d29..faf68f100 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -149,6 +149,7 @@ module.exports = function(grunt) {
                     "editor/js/ui/palette.js",
                     "editor/js/ui/tab-info.js",
                     "editor/js/ui/tab-config.js",
+                    "editor/js/ui/tab-context.js",
                     "editor/js/ui/palette-editor.js",
                     "editor/js/ui/editor.js",
                     "editor/js/ui/tray.js",
diff --git a/editor/js/keymap.json b/editor/js/keymap.json
index 08f83b4a5..dc37232e2 100644
--- a/editor/js/keymap.json
+++ b/editor/js/keymap.json
@@ -10,6 +10,7 @@
         "ctrl-g i": "core:show-info-tab",
         "ctrl-g d": "core:show-debug-tab",
         "ctrl-g c": "core:show-config-tab",
+        "ctrl-g x": "core:show-context-tab",
         "ctrl-e": "core:show-export-dialog",
         "ctrl-i": "core:show-import-dialog",
         "ctrl-space": "core:toggle-sidebar",
diff --git a/editor/js/ui/sidebar.js b/editor/js/ui/sidebar.js
index d9f302885..fe5c0f98e 100644
--- a/editor/js/ui/sidebar.js
+++ b/editor/js/ui/sidebar.js
@@ -61,7 +61,7 @@ RED.sidebar = (function() {
         }
 
         delete options.closeable;
-        
+
         options.wrapper = $('<div>',{style:"height:100%"}).appendTo("#sidebar-content")
         options.wrapper.append(options.content);
         options.wrapper.hide();
@@ -218,6 +218,7 @@ RED.sidebar = (function() {
         showSidebar();
         RED.sidebar.info.init();
         RED.sidebar.config.init();
+        RED.sidebar.context.init();
         // hide info bar at start if screen rather narrow...
         if ($(window).width() < 600) { RED.menu.setSelected("menu-item-sidebar",false); }
     }
diff --git a/editor/js/ui/tab-context.js b/editor/js/ui/tab-context.js
new file mode 100644
index 000000000..48176d624
--- /dev/null
+++ b/editor/js/ui/tab-context.js
@@ -0,0 +1,41 @@
+/**
+ * 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.sidebar.context = (function() {
+    var content;
+
+    function init() {
+        content = document.createElement("div");
+        content.className = "sidebar-node-info"
+
+        RED.actions.add("core:show-context-tab",show);
+
+        RED.sidebar.addTab({
+            id: "context",
+            label: RED._("sidebar.context.label"),
+            name: RED._("sidebar.context.name"),
+            iconClass: "fa fa-database",
+            content: content,
+            pinned: false,
+            enableOnEdit: false
+        });
+    }
+    function show() {
+        RED.sidebar.show("context");
+    }
+    return {
+        init: init
+    }
+})();
diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json
index 69e402e0a..53acebd51 100644
--- a/red/api/editor/locales/en-US/editor.json
+++ b/red/api/editor/locales/en-US/editor.json
@@ -459,6 +459,10 @@
             "filterAll":"all",
             "filtered": "__count__ hidden"
         },
+        "context": {
+            "name":"Context",
+            "label":"context"
+        },
         "palette": {
             "name": "Palette management",
             "label": "palette"

From 5d86f7b6ba9f66558b3674891bad22d2121c0a11 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 26 Jun 2018 23:34:32 +0100
Subject: [PATCH 091/113] Refresh context sidebar tab based on selection

---
 editor/js/ui/tab-context.js  | 232 ++++++++++++++++++++++++++++++++++-
 editor/sass/style.scss       |   1 +
 editor/sass/tab-context.scss |  41 +++++++
 red/api/admin/context.js     |  61 +++++++++
 red/api/admin/index.js       |   8 ++
 red/runtime/nodes/context.js |   1 +
 red/runtime/nodes/index.js   |   2 +
 7 files changed, 343 insertions(+), 3 deletions(-)
 create mode 100644 editor/sass/tab-context.scss
 create mode 100644 red/api/admin/context.js

diff --git a/editor/js/ui/tab-context.js b/editor/js/ui/tab-context.js
index 48176d624..863dacc76 100644
--- a/editor/js/ui/tab-context.js
+++ b/editor/js/ui/tab-context.js
@@ -14,11 +14,110 @@
  * limitations under the License.
  **/
 RED.sidebar.context = (function() {
+
     var content;
+    var sections;
+
+    var localCache = {};
+
+
+    var nodeSection;
+    // var subflowSection;
+    var flowSection;
+    var globalSection;
+
+    var currentNode;
+    var currentFlow;
 
     function init() {
-        content = document.createElement("div");
-        content.className = "sidebar-node-info"
+        content = $("<div>").css({"position":"relative","height":"100%"});
+        content.className = "sidebar-context"
+        // var toolbar = $('<div class="sidebar-header">'+
+        //     '<span class="button-group"><a id="sidebar-context-toggle-live" class="sidebar-header-button-toggle single" href="#"><i class="fa fa-play"></i> <span></span></a></span>'+
+        //     '</div>').appendTo(content);
+
+        var footerToolbar = $('<div>'+
+            // '<span class="button-group"><a class="sidebar-footer-button" href="#" data-i18n="[title]node-red:debug.sidebar.openWindow"><i class="fa fa-desktop"></i></a></span> ' +
+            '</div>');
+
+
+
+        var stackContainer = $("<div>",{class:"sidebar-context-stack"}).appendTo(content);
+        sections = RED.stack.create({
+            container: stackContainer
+        });
+
+        nodeSection = sections.add({
+            title: "Node",
+            collapsible: true,
+            // onexpand: function() {
+            //     updateNode(currentNode,true);
+            // }
+        });
+        nodeSection.expand();
+        nodeSection.content.css({height:"100%"});
+        var table = $('<table class="node-info"></table>').appendTo(nodeSection.content);
+        nodeSection.table = $('<tbody>').appendTo(table);
+        var bg = $('<div style="float: right"></div>').appendTo(nodeSection.header);
+        $('<button class="editor-button editor-button-small"><i class="fa fa-refresh"></i></button>')
+            .appendTo(bg)
+            .click(function(evt) {
+                evt.stopPropagation();
+                evt.preventDefault();
+                updateNode(currentNode, true);
+            })
+
+        // subflowSection  = sections.add({
+        //     title: "Subflow",
+        //     collapsible: true
+        // });
+        // subflowSection.expand();
+        // subflowSection.content.css({height:"100%"});
+        // bg = $('<div style="float: right"></div>').appendTo(subflowSection.header);
+        // $('<button class="editor-button editor-button-small"><i class="fa fa-refresh"></i></button>')
+        //     .appendTo(bg)
+        //     .click(function(evt) {
+        //         evt.stopPropagation();
+        //         evt.preventDefault();
+        //     })
+        //
+        // subflowSection.container.hide();
+
+        flowSection = sections.add({
+            title: "Flow",
+            collapsible: true
+        });
+        flowSection.expand();
+        flowSection.content.css({height:"100%"});
+        var table = $('<table class="node-info"></table>').appendTo(flowSection.content);
+        flowSection.table = $('<tbody>').appendTo(table);
+        bg = $('<div style="float: right"></div>').appendTo(flowSection.header);
+        $('<button class="editor-button editor-button-small"><i class="fa fa-refresh"></i></button>')
+            .appendTo(bg)
+            .click(function(evt) {
+                evt.stopPropagation();
+                evt.preventDefault();
+                updateFlow(currentFlow);
+            })
+
+        globalSection = sections.add({
+            title: "Global",
+            collapsible: true
+        });
+        globalSection.expand();
+        globalSection.content.css({height:"100%"});
+        var table = $('<table class="node-info"></table>').appendTo(globalSection.content);
+        globalSection.table = $('<tbody>').appendTo(table);
+
+        bg = $('<div style="float: right"></div>').appendTo(globalSection.header);
+        $('<button class="editor-button editor-button-small"><i class="fa fa-refresh"></i></button>')
+            .appendTo(bg)
+            .click(function(evt) {
+                evt.stopPropagation();
+                evt.preventDefault();
+                updateEntry(globalSection,"context/global","global");
+            })
+
 
         RED.actions.add("core:show-context-tab",show);
 
@@ -28,10 +127,137 @@ RED.sidebar.context = (function() {
             name: RED._("sidebar.context.name"),
             iconClass: "fa fa-database",
             content: content,
-            pinned: false,
+            toolbar: footerToolbar,
+            // pinned: true,
             enableOnEdit: false
         });
+
+        // var toggleLiveButton = $("#sidebar-context-toggle-live");
+        // toggleLiveButton.click(function(evt) {
+        //     evt.preventDefault();
+        //     if ($(this).hasClass("selected")) {
+        //         $(this).removeClass("selected");
+        //         $(this).find("i").removeClass("fa-pause");
+        //         $(this).find("i").addClass("fa-play");
+        //     } else {
+        //         $(this).addClass("selected");
+        //         $(this).find("i").removeClass("fa-play");
+        //         $(this).find("i").addClass("fa-pause");
+        //     }
+        // });
+        // RED.popover.tooltip(toggleLiveButton, function() {
+        //     if (toggleLiveButton.hasClass("selected")) {
+        //         return "Pause live updates"
+        //     } else {
+        //         return "Start live updates"
+        //     }
+        // });
+
+
+        RED.events.on("view:selection-changed", function(event) {
+            var selectedNode = event.nodes && event.nodes.length === 1 && event.nodes[0];
+            updateNode(selectedNode);
+        })
+
+        RED.events.on("workspace:change", function(event) {
+            updateFlow(RED.nodes.workspace(event.workspace));
+        })
+
+        updateEntry(globalSection,"context/global","global");
     }
+
+    function updateNode(node,force) {
+        currentNode = node;
+        if (force) {
+            if (node) {
+                updateEntry(nodeSection,"context/node/"+node.id,node.id);
+                // if (/^subflow:/.test(node.type)) {
+                //     subflowSection.container.show();
+                //     updateEntry(subflowSection,"context/flow/"+node.id,node.id);
+                // } else {
+                //     subflowSection.container.hide();
+                // }
+            } else {
+                // subflowSection.container.hide();
+                updateEntry(nodeSection)
+            }
+        } else {
+            $(nodeSection.table).empty();
+            if (node) {
+                $('<tr class="node-info-node-row red-ui-search-empty blank" colspan="2"><td>refresh to load</td></tr>').appendTo(nodeSection.table);
+
+            } else {
+                $('<tr class="node-info-node-row red-ui-search-empty blank" colspan="2"><td>none selected</td></tr>').appendTo(nodeSection.table);
+            }
+
+        }
+    }
+    function updateFlow(flow) {
+        currentFlow = flow;
+        if (flow) {
+            updateEntry(flowSection,"context/flow/"+flow.id,flow.id);
+        } else {
+            updateEntry(flowSection)
+        }
+    }
+
+    function refreshEntry(section,baseUrl,id) {
+        var container = section.table;
+
+        $.getJSON(baseUrl, function(data) {
+            $(container).empty();
+            var propRow;
+
+            var keys = Object.keys(data);
+            keys.sort();
+            var l = keys.length;
+            for (var i = 0; i < l; i++) {
+                var k = keys[i];
+                propRow = $('<tr class="node-info-node-row"><td class="sidebar-context-property"></td><td></td></tr>').appendTo(container);
+                var obj = $(propRow.children()[0]);
+                obj.text(k);
+                var tools = $('<span class="debug-message-tools button-group"></span>').appendTo(obj);
+                var refreshItem = $('<button class="editor-button editor-button-small"><i class="fa fa-refresh"></i></button>').appendTo(tools).click(function(e) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    $.getJSON(baseUrl+"/"+k, function(data) {
+                        $(propRow.children()[1]).empty();
+                        var payload = data.msg;
+                        var format = data.format;
+                        payload = RED.utils.decodeObject(payload,format);
+                        RED.utils.createObjectElement(payload, {
+                            typeHint: data.format,
+                            sourceId: id+"."+k
+                        }).appendTo(propRow.children()[1]);
+                    })
+                });
+
+
+                var payload = data[k].msg;
+                var format = data[k].format;
+                payload = RED.utils.decodeObject(payload,format);
+                RED.utils.createObjectElement(payload, {
+                    typeHint: data[k].format,
+                    sourceId: id+"."+k
+                }).appendTo(propRow.children()[1]);
+            }
+            if (l === 0) {
+                $('<tr class="node-info-node-row red-ui-search-empty blank" colspan="2"><td>empty</td></tr>').appendTo(container);
+            }
+        });
+    }
+    function updateEntry(section,baseUrl,id) {
+        var container = section.table;
+        if (id) {
+            refreshEntry(section,baseUrl,id);
+        } else {
+            $(container).empty();
+            $('<tr class="node-info-node-row red-ui-search-empty blank" colspan="2"><td>none selected</td></tr>').appendTo(container);
+        }
+    }
+
+
+
     function show() {
         RED.sidebar.show("context");
     }
diff --git a/editor/sass/style.scss b/editor/sass/style.scss
index 5d536c742..b160959c8 100644
--- a/editor/sass/style.scss
+++ b/editor/sass/style.scss
@@ -40,6 +40,7 @@
 @import "panels";
 @import "tabs";
 @import "tab-config";
+@import "tab-context";
 @import "tab-info";
 @import "popover";
 @import "flow";
diff --git a/editor/sass/tab-context.scss b/editor/sass/tab-context.scss
new file mode 100644
index 000000000..917b0dc48
--- /dev/null
+++ b/editor/sass/tab-context.scss
@@ -0,0 +1,41 @@
+/**
+ * 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.
+ **/
+
+.sidebar-context-stack {
+    position: absolute;
+    top: 0; // with toolbar: 43px;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    overflow-y: scroll;
+
+    .palette-category {
+        &:not(.palette-category-expanded) button {
+            display: none;
+        }
+    }
+}
+
+.sidebar-context-property {
+    position: relative;
+    .debug-message-tools {
+        right: 3px;
+        display: none;
+    }
+    &:hover .debug-message-tools {
+        display: inline-block;
+    }
+}
diff --git a/red/api/admin/context.js b/red/api/admin/context.js
new file mode 100644
index 000000000..37c6462cb
--- /dev/null
+++ b/red/api/admin/context.js
@@ -0,0 +1,61 @@
+/**
+ * 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 log;
+var redNodes;
+var util;
+
+module.exports = {
+    init: function(runtime) {
+        redNodes = runtime.nodes;
+        log = runtime.log;
+        util = runtime.util;
+    },
+
+    get: function(req,res) {
+        var scope = req.params.scope;
+        var id = req.params.id;
+        var key = req.params[0];
+        var result = {};
+        var ctx;
+        if (scope === 'global') {
+            ctx = redNodes.getContext('global');
+        } else if (scope === 'flow') {
+            ctx = redNodes.getContext(id);
+        } else if (scope === 'node') {
+            var node = redNodes.getNode(id);
+            if (node) {
+                ctx = node.context();
+            }
+        }
+        if (ctx) {
+            if (key) {
+                result = util.encodeObject({msg:ctx.get(key)});
+            } else {
+                var keys = ctx.keys();
+
+                var i = 0;
+                var l = keys.length;
+                while(i < l) {
+                    var k = keys[i];
+                    result[k] = util.encodeObject({msg:ctx.get(k)});
+                    i++;
+                }
+            }
+        }
+        res.json(result);
+    }
+}
diff --git a/red/api/admin/index.js b/red/api/admin/index.js
index 57c79eb62..15e56aecf 100644
--- a/red/api/admin/index.js
+++ b/red/api/admin/index.js
@@ -19,6 +19,7 @@ var express = require("express");
 var nodes = require("./nodes");
 var flows = require("./flows");
 var flow = require("./flow");
+var context = require("./context");
 var auth = require("../auth");
 
 var apiUtil = require("../util");
@@ -28,6 +29,7 @@ module.exports = {
         flows.init(runtime);
         flow.init(runtime);
         nodes.init(runtime);
+        context.init(runtime);
 
         var needsPermission = auth.needsPermission;
 
@@ -52,6 +54,12 @@ module.exports = {
         adminApp.get(/\/nodes\/((@[^\/]+\/)?[^\/]+)\/([^\/]+)$/,needsPermission("nodes.read"),nodes.getSet,apiUtil.errorHandler);
         adminApp.put(/\/nodes\/((@[^\/]+\/)?[^\/]+)\/([^\/]+)$/,needsPermission("nodes.write"),nodes.putSet,apiUtil.errorHandler);
 
+        // Context
+        adminApp.get("/context/:scope(global)",needsPermission("context.read"),context.get,apiUtil.errorHandler);
+        adminApp.get("/context/:scope(global)/*",needsPermission("context.read"),context.get,apiUtil.errorHandler);
+        adminApp.get("/context/:scope(node|flow)/:id",needsPermission("context.read"),context.get,apiUtil.errorHandler);
+        adminApp.get("/context/:scope(node|flow)/:id/*",needsPermission("context.read"),context.get,apiUtil.errorHandler);
+
         return adminApp;
     }
 }
diff --git a/red/runtime/nodes/context.js b/red/runtime/nodes/context.js
index e71a1eaed..2d6e7ba32 100644
--- a/red/runtime/nodes/context.js
+++ b/red/runtime/nodes/context.js
@@ -84,6 +84,7 @@ function clean(flowConfig) {
 module.exports = {
     init: function(settings) {
         globalContext = createContext("global",settings.functionGlobalContext || {});
+        contexts['global'] = globalContext;
     },
     get: getContext,
     delete: deleteContext,
diff --git a/red/runtime/nodes/index.js b/red/runtime/nodes/index.js
index b2f8ff3b5..be84130ef 100644
--- a/red/runtime/nodes/index.js
+++ b/red/runtime/nodes/index.js
@@ -167,6 +167,8 @@ module.exports = {
     createNode: createNode,
     getNode: flows.get,
     eachNode: flows.eachNode,
+    getContext: context.get,
+
 
     paletteEditorEnabled: registry.paletteEditorEnabled,
     installModule: installModule,

From e01996095f65f6fc9a881d67704d6565462d26f2 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 27 Jun 2018 10:00:23 +0100
Subject: [PATCH 092/113] Add refresh timestamp to context sidebar

---
 editor/js/ui/tab-context.js  | 6 +++++-
 editor/sass/palette.scss     | 1 +
 editor/sass/tab-context.scss | 6 ++++++
 red/runtime/nodes/context.js | 2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/editor/js/ui/tab-context.js b/editor/js/ui/tab-context.js
index 863dacc76..6f084ed64 100644
--- a/editor/js/ui/tab-context.js
+++ b/editor/js/ui/tab-context.js
@@ -56,6 +56,7 @@ RED.sidebar.context = (function() {
         });
         nodeSection.expand();
         nodeSection.content.css({height:"100%"});
+        nodeSection.timestamp = $('<div class="sidebar-context-updated">&nbsp;</div>').appendTo(nodeSection.content);
         var table = $('<table class="node-info"></table>').appendTo(nodeSection.content);
         nodeSection.table = $('<tbody>').appendTo(table);
         var bg = $('<div style="float: right"></div>').appendTo(nodeSection.header);
@@ -89,6 +90,7 @@ RED.sidebar.context = (function() {
         });
         flowSection.expand();
         flowSection.content.css({height:"100%"});
+        flowSection.timestamp = $('<div class="sidebar-context-updated">&nbsp;</div>').appendTo(flowSection.content);
         var table = $('<table class="node-info"></table>').appendTo(flowSection.content);
         flowSection.table = $('<tbody>').appendTo(table);
         bg = $('<div style="float: right"></div>').appendTo(flowSection.header);
@@ -106,6 +108,7 @@ RED.sidebar.context = (function() {
         });
         globalSection.expand();
         globalSection.content.css({height:"100%"});
+        globalSection.timestamp = $('<div class="sidebar-context-updated">&nbsp;</div>').appendTo(globalSection.content);
         var table = $('<table class="node-info"></table>').appendTo(globalSection.content);
         globalSection.table = $('<tbody>').appendTo(table);
 
@@ -185,10 +188,10 @@ RED.sidebar.context = (function() {
             $(nodeSection.table).empty();
             if (node) {
                 $('<tr class="node-info-node-row red-ui-search-empty blank" colspan="2"><td>refresh to load</td></tr>').appendTo(nodeSection.table);
-
             } else {
                 $('<tr class="node-info-node-row red-ui-search-empty blank" colspan="2"><td>none selected</td></tr>').appendTo(nodeSection.table);
             }
+            nodeSection.timestamp.html("&nbsp;");
 
         }
     }
@@ -244,6 +247,7 @@ RED.sidebar.context = (function() {
             if (l === 0) {
                 $('<tr class="node-info-node-row red-ui-search-empty blank" colspan="2"><td>empty</td></tr>').appendTo(container);
             }
+            $(section.timestamp).text(new Date().toLocaleString());
         });
     }
     function updateEntry(section,baseUrl,id) {
diff --git a/editor/sass/palette.scss b/editor/sass/palette.scss
index e83f929e2..b81f97740 100644
--- a/editor/sass/palette.scss
+++ b/editor/sass/palette.scss
@@ -92,6 +92,7 @@
     font-weight: bold;
     padding-left: 30px;
     overflow: hidden;
+    user-select: none;
 }
 .palette-header > i {
     position: absolute;
diff --git a/editor/sass/tab-context.scss b/editor/sass/tab-context.scss
index 917b0dc48..0c63a4794 100644
--- a/editor/sass/tab-context.scss
+++ b/editor/sass/tab-context.scss
@@ -39,3 +39,9 @@
         display: inline-block;
     }
 }
+.sidebar-context-updated {
+    text-align: right;
+    font-size: 11px;
+    color: #bbb;
+    padding: 1px 3px;
+}
diff --git a/red/runtime/nodes/context.js b/red/runtime/nodes/context.js
index 2d6e7ba32..19c929649 100644
--- a/red/runtime/nodes/context.js
+++ b/red/runtime/nodes/context.js
@@ -73,7 +73,7 @@ function clean(flowConfig) {
     var contextId;
     var node;
     for (var id in contexts) {
-        if (contexts.hasOwnProperty(id)) {
+        if (contexts.hasOwnProperty(id) && id !== "global") {
             var idParts = id.split(":");
             if (!flowConfig.allNodes.hasOwnProperty(idParts[0])) {
                 delete contexts[id];

From bc01f9f8fde8c90bb1aecccae6407ab3d9a749b5 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 28 Jun 2018 17:00:17 +0100
Subject: [PATCH 093/113] add placeholder api/admin/context_spec

---
 test/red/api/admin/context_spec.js | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 test/red/api/admin/context_spec.js

diff --git a/test/red/api/admin/context_spec.js b/test/red/api/admin/context_spec.js
new file mode 100644
index 000000000..e8e8f17dd
--- /dev/null
+++ b/test/red/api/admin/context_spec.js
@@ -0,0 +1,27 @@
+/**
+ * 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 request = require('supertest');
+var express = require('express');
+var bodyParser = require('body-parser');
+var sinon = require('sinon');
+var when = require('when');
+
+var context = require("../../../../red/api/admin/context");
+
+describe("api/admin/context", function() {
+});

From 17bf09e276ffab02a3b7b32a77a273a489298be3 Mon Sep 17 00:00:00 2001
From: Kazuki-Nakanishi <kazuki.nakanishi.vr@hitachi-solutions.com>
Date: Fri, 29 Jun 2018 10:41:44 +0900
Subject: [PATCH 094/113] Follow the change of typedinput interface for UI test

---
 test/editor/pageobjects/nodes/core/core/20-inject_page.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/editor/pageobjects/nodes/core/core/20-inject_page.js b/test/editor/pageobjects/nodes/core/core/20-inject_page.js
index 09aa8cca1..e30400423 100644
--- a/test/editor/pageobjects/nodes/core/core/20-inject_page.js
+++ b/test/editor/pageobjects/nodes/core/core/20-inject_page.js
@@ -33,6 +33,7 @@ var payloadType = {
     "json": 6,
     "bin": 7,
     "date": 8,
+    "env": 9,
 };
 
 injectNode.prototype.setPayload = function(type, value) {
@@ -42,7 +43,7 @@ injectNode.prototype.setPayload = function(type, value) {
     var payloadTypeXPath = '//*[@class="red-ui-typedInput-options"]/a[' + payloadType[type] + ']';
     browser.clickWithWait(payloadTypeXPath);
     // Input a value.
-    browser.setValue('#node-input-payload', value);
+    browser.setValue('//*[@class="red-ui-typedInput-input"]/input', value);
 }
 
 injectNode.prototype.setTopic = function(value) {

From 466cb4be8931223b5c9c968c40ad3f5fcb9eae4b Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 29 Jun 2018 09:48:38 +0100
Subject: [PATCH 095/113] Small tidy up on context plugin loading

---
 red/runtime/locales/en-US/runtime.json |   1 +
 red/runtime/nodes/context/index.js     | 114 +++++++++++++++----------
 2 files changed, 72 insertions(+), 43 deletions(-)

diff --git a/red/runtime/locales/en-US/runtime.json b/red/runtime/locales/en-US/runtime.json
index 1413ce523..32c768438 100644
--- a/red/runtime/locales/en-US/runtime.json
+++ b/red/runtime/locales/en-US/runtime.json
@@ -159,6 +159,7 @@
 
     "context": {
         "error-module-not-loaded": "'__module__' could not be loaded",
+        "error-loading-module": "Error loading context module '__module__': __message__ ",
         "error-module-not-defined": "'module' is not defined in '__storage__' of settings.contextStorage",
         "error-invalid-default-module": "Invalid storage '__storage__' is specified as a default storage",
         "error-use-undefined-storage": "Undefined storage '__storage__' is specified"
diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index 5c7f6609d..9db6e107a 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -22,7 +22,7 @@ var settings;
 var contexts = {};
 var globalContext = null;
 var externalContexts = {};
-var noContextStorage = true;
+var hasExternalContext = false;
 
 function init(_settings) {
     settings = _settings;
@@ -37,55 +37,80 @@ function init(_settings) {
 }
 
 function load() {
-    // load & init plugins in settings.contextStorage
-    var plugins = settings.contextStorage;
-    var isAlias = false;
-    if (plugins) {
+    return new Promise(function(resolve,reject) {
+        // load & init plugins in settings.contextStorage
+        var plugins = settings.contextStorage;
+        var defaultIsAlias = false;
         var promises = [];
-        noContextStorage = false;
-        for(var pluginName in plugins){
-            if(pluginName === "_"){
-                continue;
-            }
-            if(pluginName === "default" && typeof plugins[pluginName] === "string"){
-                isAlias = true;
-                continue;
-            }
-            var plugin;
-            if(plugins[pluginName].hasOwnProperty("module")){
-                var config = plugins[pluginName].config || {};
-                copySettings(config, settings);
-                if(typeof plugins[pluginName].module === "string") {
-                    try{
-                        plugin = require("./"+plugins[pluginName].module);
-                    }catch(err){
-                        return Promise.reject(new Error(log._("context.error-module-not-loaded", {module:plugins[pluginName].module})));
+        if (plugins) {
+            for (var pluginName in plugins) {
+                if (plugins.hasOwnProperty(pluginName)) {
+                    // "_" is a reserved name - do not allow it to be overridden
+                    if (pluginName === "_") {
+                        continue;
+                    }
+
+                    // Check if this is setting the 'default' context to be a named plugin
+                    if (pluginName === "default" && typeof plugins[pluginName] === "string") {
+                        // Check the 'default' alias exists before initialising anything
+                        if (!plugins.hasOwnProperty(plugins[pluginName])) {
+                            return reject(new Error(log._("context.error-invalid-default-module", {storage:plugins["default"]})));
+                        }
+                        defaultIsAlias = true;
+                        continue;
+                    }
+                    var plugin;
+                    if (plugins[pluginName].hasOwnProperty("module")) {
+                        // Get the provided config and copy in the 'approved' top-level settings (eg userDir)
+                        var config = plugins[pluginName].config || {};
+                        copySettings(config, settings);
+
+                        if (typeof plugins[pluginName].module === "string") {
+                            // This config identifies the module by name - assume it is a built-in one
+                            // TODO: check it exists locally, if not, try to require it as-is
+                            try {
+                                plugin = require("./"+plugins[pluginName].module);
+                            } catch(err) {
+                                return reject(new Error(log._("context.error-module-not-loaded", {module:plugins[pluginName].module})));
+                            }
+                        } else {
+                            // Assume `module` is an already-required module we can use
+                            plugin = plugins[pluginName].module;
+                        }
+                        try {
+                            // Create a new instance of the plugin by calling its module function
+                            externalContexts[pluginName] = plugin(config);
+                        } catch(err) {
+                            return reject(new Error(log._("context.error-loading-module",{module:pluginName,message:err.toString()})));
+                        }
+                    } else {
+                        // Plugin does not specify a 'module'
+                        return reject(new Error(log._("context.error-module-not-defined", {storage:pluginName})));
                     }
-                } else {
-                    plugin = plugins[pluginName].module;
                 }
-                externalContexts[pluginName] = plugin(config);
-            }else{
-                return Promise.reject(new Error(log._("context.error-module-not-defined", {storage:pluginName})));
             }
-        }
-        for(var plugin in externalContexts){
-            if(externalContexts.hasOwnProperty(plugin)){
-                promises.push(externalContexts[plugin].open());
+
+            // Open all of the configured contexts
+            for (var plugin in externalContexts) {
+                if (externalContexts.hasOwnProperty(plugin)) {
+                    promises.push(externalContexts[plugin].open());
+                }
             }
-        }
-        if(isAlias){
-            if(externalContexts.hasOwnProperty(plugins["default"])){
+
+            // If 'default' is an alias, point it at the right module - we have already
+            // checked that it exists
+            if (defaultIsAlias) {
                 externalContexts["default"] =  externalContexts[plugins["default"]];
-            }else{
-                return Promise.reject(new Error(log._("context.error-invalid-default-module", {storage:plugins["default"]})));
             }
         }
-        return Promise.all(promises);
-    } else {
-        noContextStorage = true;
-        return externalContexts["_"].open();
-    }
+
+        if (promises.length === 0) {
+            promises.push(externalContexts["_"].open())
+        } else {
+            hasExternalContext = true;
+        }
+        return resolve(Promise.all(promises));
+    });
 }
 
 function copySettings(config, settings){
@@ -98,10 +123,13 @@ function copySettings(config, settings){
 
 function getContextStorage(storage) {
     if (externalContexts.hasOwnProperty(storage)) {
+        // A known context
         return externalContexts[storage];
     } else if (externalContexts.hasOwnProperty("default")) {
+        // Not known, but we have a default to fall back to
         return externalContexts["default"];
     } else {
+        // Not known and no default configured
         var contextError = new Error(log._("context.error-use-undefined-storage", {storage:storage}));
         contextError.name = "ContextError";
         throw contextError;
@@ -183,7 +211,7 @@ function getContext(localId,flowId) {
 }
 
 function deleteContext(id,flowId) {
-    if(noContextStorage){
+    if(!hasExternalContext){
         var contextId = id;
         if (flowId) {
             contextId = id+":"+flowId;

From cdb173fd6ebf1b0b96e24d28fd58bd5adb09ae7c Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 29 Jun 2018 10:50:07 +0100
Subject: [PATCH 096/113] Handle NaN and Infinity properly in debug sidebar
 Fixes #1778 #1779

---
 editor/js/ui/clipboard.js | 17 ++++++++++++++---
 editor/js/ui/utils.js     | 10 ++++++++++
 red/runtime/util.js       |  8 ++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/editor/js/ui/clipboard.js b/editor/js/ui/clipboard.js
index 0d7519e10..e4350a464 100644
--- a/editor/js/ui/clipboard.js
+++ b/editor/js/ui/clipboard.js
@@ -276,9 +276,20 @@ RED.clipboard = (function() {
         if (typeof value !== "string" ) {
             value = JSON.stringify(value, function(key,value) {
                 if (value !== null && typeof value === 'object') {
-                    if (value.__encoded__ && value.hasOwnProperty('data') && value.hasOwnProperty('length')) {
-                        truncated = value.data.length !== value.length;
-                        return value.data;
+                    if (value.__encoded__) {
+                        if (value.hasOwnProperty('data') && value.hasOwnProperty('length')) {
+                            truncated = value.data.length !== value.length;
+                            return value.data;
+                        }
+                        if (value.type === 'function' || value.type === 'internal') {
+                            return undefined
+                        }
+                        if (value.type === 'number') {
+                            // Handle NaN and Infinity - they are not permitted
+                            // in JSON. We can either substitute with a String
+                            // representation or null
+                            return null;
+                        }
                     }
                 }
                 return value;
diff --git a/editor/js/ui/utils.js b/editor/js/ui/utils.js
index 4f84da8ba..e64a33996 100644
--- a/editor/js/ui/utils.js
+++ b/editor/js/ui/utils.js
@@ -36,6 +36,8 @@ RED.utils = (function() {
                 result = $('<span class="debug-message-object-value debug-message-type-meta"></span>').text('array['+value.length+']');
             } else if (value.hasOwnProperty('type') && value.type === 'function') {
                 result = $('<span class="debug-message-object-value debug-message-type-meta"></span>').text('function');
+            } else if (value.hasOwnProperty('type') && value.type === 'number') {
+                result = $('<span class="debug-message-object-value debug-message-type-number"></span>').text(value.data);
             } else {
                 result = $('<span class="debug-message-object-value debug-message-type-meta">object</span>');
             }
@@ -47,6 +49,8 @@ RED.utils = (function() {
                 subvalue = sanitize(value);
             }
             result = $('<span class="debug-message-object-value debug-message-type-string"></span>').html('"'+formatString(subvalue)+'"');
+        } else if (typeof value === 'number') {
+            result = $('<span class="debug-message-object-value debug-message-type-number"></span>').text(""+value);
         } else {
             result = $('<span class="debug-message-object-value debug-message-type-other"></span>').text(""+value);
         }
@@ -300,6 +304,8 @@ RED.utils = (function() {
         }
         if (obj === null || obj === undefined) {
             $('<span class="debug-message-type-null">'+obj+'</span>').appendTo(entryObj);
+        } else if (obj.__encoded__ && obj.type === 'number') {
+            e = $('<span class="debug-message-type-number debug-message-object-header"></span>').text(obj.data).appendTo(entryObj);
         } else if (typeHint === "function" || (obj.__encoded__ && obj.type === 'function')) {
             e = $('<span class="debug-message-type-meta debug-message-object-header"></span>').text("function").appendTo(entryObj);
         } else if (typeHint === "internal" || (obj.__encoded__ && obj.type === 'internal')) {
@@ -799,6 +805,10 @@ RED.utils = (function() {
     function decodeObject(payload,format) {
         if ((format === 'number') && (payload === "NaN")) {
             payload = Number.NaN;
+        } else if ((format === 'number') && (payload === "Infinity")) {
+            payload = Infinity;
+        } else if ((format === 'number') && (payload === "-Infinity")) {
+            payload = -Infinity;
         } else if (format === 'Object' || /^array/.test(format) || format === 'boolean' || format === 'number' ) {
             payload = JSON.parse(payload);
         } else if (/error/i.test(format)) {
diff --git a/red/runtime/util.js b/red/runtime/util.js
index 022faa65d..1d49641df 100644
--- a/red/runtime/util.js
+++ b/red/runtime/util.js
@@ -469,6 +469,14 @@ function encodeObject(msg,opts) {
                             __encoded__: true,
                             type: "function"
                         }
+                    } else if (typeof value === 'number') {
+                        if (isNaN(value) || value === Infinity || value === -Infinity) {
+                            value = {
+                                __encoded__: true,
+                                type: "number",
+                                data: value.toString()
+                            }
+                        }
                     } else if (value && value.constructor) {
                         if (value.type === "Buffer") {
                             value.__encoded__ = true;

From 14882bda7831bb15edfaded4c541511aa3971c1e Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 29 Jun 2018 11:49:39 +0100
Subject: [PATCH 097/113] Ensure runtime errors in Change node can be caught
 Fixes #1769

---
 nodes/core/logic/15-change.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nodes/core/logic/15-change.js b/nodes/core/logic/15-change.js
index c7c05118e..ab4f59cc3 100644
--- a/nodes/core/logic/15-change.js
+++ b/nodes/core/logic/15-change.js
@@ -123,7 +123,7 @@ module.exports = function(RED) {
                     try{
                         value = RED.util.evaluateJSONataExpression(rule.to,msg);
                     } catch(err) {
-                        node.error(RED._("change.errors.invalid-expr",{error:err.message}));
+                        node.error(RED._("change.errors.invalid-expr",{error:err.message}),msg);
                         return;
                     }
                 }
@@ -150,11 +150,11 @@ module.exports = function(RED) {
                                 fromRE = new RegExp(fromRE, "g");
                             } catch (e) {
                                 valid = false;
-                                node.error(RED._("change.errors.invalid-from",{error:e.message}));
+                                node.error(RED._("change.errors.invalid-from",{error:e.message}),msg);
                                 return;
                             }
                         } else {
-                            node.error(RED._("change.errors.invalid-from",{error:"unsupported type: "+(typeof fromValue)}));
+                            node.error(RED._("change.errors.invalid-from",{error:"unsupported type: "+(typeof fromValue)}),msg);
                             return
                         }
                     } else {

From 038d821a7c988d5fe461f5d1e1c5932b2616ca48 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 2 Jul 2018 15:21:13 +0100
Subject: [PATCH 098/113] Apply fGC to all global contexts for default values

---
 red/runtime/nodes/context/index.js            | 144 ++++++++++-----
 red/runtime/nodes/context/memory.js           |   6 +-
 test/red/runtime/nodes/context/index_spec.js  | 172 ++++++++++++++----
 test/red/runtime/nodes/context/memory_spec.js |  28 +--
 4 files changed, 239 insertions(+), 111 deletions(-)

diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index 9db6e107a..bd336d371 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -19,21 +19,23 @@ var log = require("../../log");
 var memory = require("./memory");
 
 var settings;
+
+// A map of scope id to context instance
 var contexts = {};
-var globalContext = null;
-var externalContexts = {};
-var hasExternalContext = false;
+
+// A map of store name to instance
+var stores = {};
+
+// Whether there context storage has been configured or left as default
+var hasConfiguredStore = false;
+
+var defaultStore = "_";
 
 function init(_settings) {
     settings = _settings;
-    externalContexts = {};
-
-    // init memory plugin
+    stores = {};
     var seed = settings.functionGlobalContext || {};
-    externalContexts["_"] = memory();
-    externalContexts["_"].setGlobalContext(seed);
-    globalContext = createContext("global",seed);
-    contexts['global'] = globalContext;
+    contexts['global'] = createContext("global",seed);
 }
 
 function load() {
@@ -43,6 +45,8 @@ function load() {
         var defaultIsAlias = false;
         var promises = [];
         if (plugins) {
+            var hasDefault = plugins.hasOwnProperty('default');
+            var defaultName;
             for (var pluginName in plugins) {
                 if (plugins.hasOwnProperty(pluginName)) {
                     // "_" is a reserved name - do not allow it to be overridden
@@ -59,6 +63,9 @@ function load() {
                         defaultIsAlias = true;
                         continue;
                     }
+                    if (!hasDefault && !defaultName) {
+                        defaultName = pluginName;
+                    }
                     var plugin;
                     if (plugins[pluginName].hasOwnProperty("module")) {
                         // Get the provided config and copy in the 'approved' top-level settings (eg userDir)
@@ -79,7 +86,7 @@ function load() {
                         }
                         try {
                             // Create a new instance of the plugin by calling its module function
-                            externalContexts[pluginName] = plugin(config);
+                            stores[pluginName] = plugin(config);
                         } catch(err) {
                             return reject(new Error(log._("context.error-loading-module",{module:pluginName,message:err.toString()})));
                         }
@@ -91,23 +98,39 @@ function load() {
             }
 
             // Open all of the configured contexts
-            for (var plugin in externalContexts) {
-                if (externalContexts.hasOwnProperty(plugin)) {
-                    promises.push(externalContexts[plugin].open());
+            for (var plugin in stores) {
+                if (stores.hasOwnProperty(plugin)) {
+                    promises.push(stores[plugin].open());
                 }
             }
 
-            // If 'default' is an alias, point it at the right module - we have already
-            // checked that it exists
-            if (defaultIsAlias) {
-                externalContexts["default"] =  externalContexts[plugins["default"]];
-            }
+            // There is a 'default' listed in the configuration
+            if (hasDefault) {
+                // If 'default' is an alias, point it at the right module - we have already
+                // checked that it exists. If it isn't an alias, then it will
+                // already be set to a configured store
+                if (defaultIsAlias) {
+                    stores["default"] =  stores[plugins["default"]];
+                }
+                stores["_"] = stores["default"];
+            } else if (defaultName) {
+                // No 'default' listed, so pick first in list as the default
+                stores["default"] = stores[defaultName];
+                stores["_"] = stores["default"];
+            } // else there were no stores list the config object - fall through
+              // to below where we default to a memory store
         }
 
         if (promises.length === 0) {
-            promises.push(externalContexts["_"].open())
+            // No stores have been configured. Setup the default as an instance
+            // of memory storage
+            stores["_"] = memory();
+            stores["default"] = stores["_"];
+            promises.push(stores["_"].open())
         } else {
-            hasExternalContext = true;
+            // if there's configured storage then the lifecycle is slightly different
+            // - specifically, we don't delete node context on redeploy
+            hasConfiguredStore = true;
         }
         return resolve(Promise.all(promises));
     });
@@ -122,12 +145,12 @@ function copySettings(config, settings){
 }
 
 function getContextStorage(storage) {
-    if (externalContexts.hasOwnProperty(storage)) {
+    if (stores.hasOwnProperty(storage)) {
         // A known context
-        return externalContexts[storage];
-    } else if (externalContexts.hasOwnProperty("default")) {
+        return stores[storage];
+    } else if (stores.hasOwnProperty("default")) {
         // Not known, but we have a default to fall back to
-        return externalContexts["default"];
+        return stores["default"];
     } else {
         // Not known and no default configured
         var contextError = new Error(log._("context.error-use-undefined-storage", {storage:storage}));
@@ -136,14 +159,19 @@ function getContextStorage(storage) {
     }
 }
 
+
 function createContext(id,seed) {
+    // Seed is only set for global context - sourced from functionGlobalContext
     var scope = id;
     var obj = seed || {};
-
+    var seedKeys;
+    if (seed) {
+        seedKeys = Object.keys(seed);
+    }
     obj.get = function(key, storage, callback) {
         var context;
         if (!storage && !callback) {
-            context = externalContexts["_"];
+            context = stores["_"];
         } else {
             if (typeof storage === 'function') {
                 callback = storage;
@@ -154,12 +182,34 @@ function createContext(id,seed) {
             }
             context = getContextStorage(storage);
         }
-        return context.get(scope, key, callback);
+        if (seed) {
+            // Get the value from the underlying store. If it is undefined,
+            // check the seed for a default value.
+            if (callback) {
+                context.get(scope,key,function(err, v) {
+                    if (v === undefined) {
+                        callback(err, seed[key]);
+                    } else {
+                        callback(err, v);
+                    }
+                })
+            } else {
+                // No callback, attempt to do this synchronously
+                var storeValue = context.get(scope,key);
+                if (storeValue === undefined) {
+                    return seed[key];
+                } else {
+                    return storeValue;
+                }
+            }
+        } else {
+            return context.get(scope, key, callback);
+        }
     };
     obj.set = function(key, value, storage, callback) {
         var context;
         if (!storage && !callback) {
-            context = externalContexts["_"];
+            context = stores["_"];
         } else {
             if (typeof storage === 'function') {
                 callback = storage;
@@ -175,7 +225,7 @@ function createContext(id,seed) {
     obj.keys = function(storage, callback) {
         var context;
         if (!storage && !callback) {
-            context = externalContexts["_"];
+            context = stores["_"];
         } else {
             if (typeof storage === 'function') {
                 callback = storage;
@@ -186,7 +236,18 @@ function createContext(id,seed) {
             }
             context = getContextStorage(storage);
         }
-        return context.keys(scope, callback);
+        if (seed) {
+            if (callback) {
+                context.keys(scope, function(err,keys) {
+                    callback(err,Array.from(new Set(seedKeys.concat(keys)).keys()));
+                });
+            } else {
+                var keys = context.keys(scope);
+                return Array.from(new Set(seedKeys.concat(keys)).keys())
+            }
+        } else {
+            return context.keys(scope, callback);
+        }
     };
     return obj;
 }
@@ -203,21 +264,20 @@ function getContext(localId,flowId) {
     if (flowId) {
         newContext.flow = getContext(flowId);
     }
-    if (globalContext) {
-        newContext.global = globalContext;
-    }
+    newContext.global = contexts['global'];
     contexts[contextId] = newContext;
     return newContext;
 }
 
 function deleteContext(id,flowId) {
-    if(!hasExternalContext){
+    if(!hasConfiguredStore){
+        // only delete context if there's no configured storage.
         var contextId = id;
         if (flowId) {
             contextId = id+":"+flowId;
         }
         delete contexts[contextId];
-        return externalContexts["_"].delete(contextId);
+        return stores["_"].delete(contextId);
     }else{
         return Promise.resolve();
     }
@@ -225,9 +285,9 @@ function deleteContext(id,flowId) {
 
 function clean(flowConfig) {
     var promises = [];
-    for(var plugin in externalContexts){
-        if(externalContexts.hasOwnProperty(plugin)){
-            promises.push(externalContexts[plugin].clean(Object.keys(flowConfig.allNodes)));
+    for(var plugin in stores){
+        if(stores.hasOwnProperty(plugin)){
+            promises.push(stores[plugin].clean(Object.keys(flowConfig.allNodes)));
         }
     }
     for (var id in contexts) {
@@ -243,9 +303,9 @@ function clean(flowConfig) {
 
 function close() {
     var promises = [];
-    for(var plugin in externalContexts){
-        if(externalContexts.hasOwnProperty(plugin)){
-            promises.push(externalContexts[plugin].close());
+    for(var plugin in stores){
+        if(stores.hasOwnProperty(plugin)){
+            promises.push(stores[plugin].close());
         }
     }
     return Promise.all(promises);
diff --git a/red/runtime/nodes/context/memory.js b/red/runtime/nodes/context/memory.js
index b6f687f96..93c213403 100644
--- a/red/runtime/nodes/context/memory.js
+++ b/red/runtime/nodes/context/memory.js
@@ -109,10 +109,6 @@ Memory.prototype.clean = function(activeNodes){
     return Promise.resolve();
 }
 
-Memory.prototype.setGlobalContext= function(seed){
-    this.data["global"] = seed;
-};
-
 module.exports = function(config){
     return new Memory(config);
-};
\ No newline at end of file
+};
diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index fa1332f20..eda70395a 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -124,7 +124,7 @@ describe('context', function() {
             });
         });
 
-        it('enumerates context keys', function() {
+        it('enumerates context keys - sync', function() {
             var context = Context.get("1","flowA");
 
             var keys = context.keys();
@@ -142,15 +142,63 @@ describe('context', function() {
             keys[1].should.equal("abc");
         });
 
-        it('should enumerate only context keys when GlobalContext was given', function() {
+        it('enumerates context keys - async', function(done) {
+            var context = Context.get("1","flowA");
+
+            var keys = context.keys(function(err,keys) {
+                keys.should.be.an.Array();
+                keys.should.be.empty();
+                context.set("foo","bar");
+                keys = context.keys(function(err,keys) {
+                    keys.should.have.length(1);
+                    keys[0].should.equal("foo");
+
+                    context.set("abc.def","bar");
+                    keys = context.keys(function(err,keys) {
+                        keys.should.have.length(2);
+                        keys[1].should.equal("abc");
+                        done();
+                    });
+                });
+            });
+        });
+
+        it('should enumerate only context keys when GlobalContext was given - sync', function() {
             Context.init({functionGlobalContext: {foo:"bar"}});
             return Context.load().then(function(){
                 var context = Context.get("1","flowA");
+                context.global.set("foo2","bar2");
                 var keys = context.global.keys();
-                keys.should.have.length(1);
+                keys.should.have.length(2);
                 keys[0].should.equal("foo");
+                keys[1].should.equal("foo2");
             });
         });
+
+        it('should enumerate only context keys when GlobalContext was given - async', function(done) {
+            Context.init({functionGlobalContext: {foo:"bar"}});
+            return Context.load().then(function(){
+                var context = Context.get("1","flowA");
+                context.global.set("foo2","bar2");
+                context.global.keys(function(err,keys) {
+                    keys.should.have.length(2);
+                    keys[0].should.equal("foo");
+                    keys[1].should.equal("foo2");
+                    done();
+                });
+            }).catch(done);
+        });
+
+
+
+        it('returns functionGlobalContext value if store value undefined', function() {
+            Context.init({functionGlobalContext: {foo:"bar"}});
+            return Context.load().then(function(){
+                var context = Context.get("1","flowA");
+                var v = context.global.get('foo');
+                v.should.equal('bar');
+            });
+        })
     });
 
     describe('external context storage',function() {
@@ -215,6 +263,11 @@ describe('context', function() {
                 config:{}
             }
         };
+        var memoryStorage ={
+            memory:{
+                module: "memory"
+            }
+        };
 
         afterEach(function() {
             sandbox.reset();
@@ -257,7 +310,7 @@ describe('context', function() {
                     stubSet.calledWithExactly("1:flow","file","file2",cb).should.be.true();
                     stubSet.calledWithExactly("1:flow","num","num3",cb).should.be.true();
                     done();
-                });
+                }).catch(done);
             });
             it('should ignore reserved storage name `_`', function(done) {
                 Context.init({contextStorage:{_:{module:testPlugin}}});
@@ -271,7 +324,7 @@ describe('context', function() {
                     stubGet.called.should.be.false();
                     stubKeys.called.should.be.false();
                     done();
-                });
+                }).catch(done);
             });
             it('should fail when using invalid default context', function(done) {
                 Context.init({contextStorage:{default:"noexist"}});
@@ -300,14 +353,15 @@ describe('context', function() {
         });
 
         describe('close modules',function(){
-            it('should call close()', function() {
+            it('should call close()', function(done) {
                 Context.init({contextStorage:contextDefaultStorage});
                 return Context.load().then(function(){
                     return Context.close().then(function(){
                         stubClose.called.should.be.true();
                         stubClose2.called.should.be.true();
+                        done();
                     });
-                });
+                }).catch(done);
             });
         });
 
@@ -324,7 +378,7 @@ describe('context', function() {
                     stubGet.calledWithExactly("1:flow","foo",cb).should.be.true();
                     stubKeys.calledWithExactly("1:flow",cb).should.be.true();
                     done();
-                });
+                }).catch(done);
             });
             it('should store flow property to external context storage',function(done) {
                 Context.init({contextStorage:contextStorage});
@@ -338,7 +392,7 @@ describe('context', function() {
                     stubGet.calledWithExactly("flow","foo",cb).should.be.true();
                     stubKeys.calledWithExactly("flow",cb).should.be.true();
                     done();
-                });
+                }).catch(done);
             });
             it('should store global property to external context storage',function(done) {
                 Context.init({contextStorage:contextStorage});
@@ -349,10 +403,10 @@ describe('context', function() {
                     context.global.get("foo","test",cb);
                     context.global.keys("test",cb);
                     stubSet.calledWithExactly("global","foo","bar",cb).should.be.true();
-                    stubGet.calledWithExactly("global","foo",cb).should.be.true();
-                    stubKeys.calledWithExactly("global",cb).should.be.true();
+                    stubGet.calledWith("global","foo").should.be.true();
+                    stubKeys.calledWith("global").should.be.true();
                     done();
-                });
+                }).catch(done);
             });
             it('should store data to the default context when non-existent context storage was specified', function(done) {
                 Context.init({contextStorage:contextDefaultStorage});
@@ -369,7 +423,7 @@ describe('context', function() {
                     stubGet2.calledWithExactly("1:flow","foo",cb).should.be.true();
                     stubKeys2.calledWithExactly("1:flow",cb).should.be.true();
                     done();
-                });
+                }).catch(done);
             });
             it('should use the default context', function(done) {
                 Context.init({contextStorage:contextDefaultStorage});
@@ -386,7 +440,7 @@ describe('context', function() {
                     stubGet2.calledWithExactly("1:flow","foo",cb).should.be.true();
                     stubKeys2.calledWithExactly("1:flow",cb).should.be.true();
                     done();
-                });
+                }).catch(done);
             });
             it('should use the alias of default context', function(done) {
                 Context.init({contextStorage:contextDefaultStorage});
@@ -403,7 +457,7 @@ describe('context', function() {
                     stubGet2.calledWithExactly("1:flow","foo",cb).should.be.true();
                     stubKeys2.calledWithExactly("1:flow",cb).should.be.true();
                     done();
-                });
+                }).catch(done);
             });
             it('should use default as the alias of other context', function(done) {
                 Context.init({contextStorage:contextAlias});
@@ -417,22 +471,16 @@ describe('context', function() {
                     stubGet.calledWithExactly("1:flow","foo",cb).should.be.true();
                     stubKeys.calledWithExactly("1:flow",cb).should.be.true();
                     done();
-                });
+                }).catch(done);
             });
-            it('should throw an error using undefined storage for local context', function(done) {
+            it('should not throw an error using undefined storage for local context', function(done) {
                 Context.init({contextStorage:contextStorage});
                 Context.load().then(function(){
                     var context =  Context.get("1","flow");
                     var cb = function(){done("An error occurred")}
                     context.get("local","nonexist",cb);
-                    should.fail(null, null, "An error was not thrown using undefined storage for local context");
-                }).catch(function(err) {
-                    if (err.name === "ContextError") {
-                        done();
-                    } else {
-                        done(err);
-                    }
-                });
+                    done()
+                }).catch(done);
             });
             it('should throw an error using undefined storage for flow context', function(done) {
                 Context.init({contextStorage:contextStorage});
@@ -440,39 +488,89 @@ describe('context', function() {
                     var context =  Context.get("1","flow");
                     var cb = function(){done("An error occurred")}
                     context.flow.get("flow","nonexist",cb);
-                    should.fail(null, null, "An error was not thrown using undefined storage for flow context");
-                }).catch(function(err) {
-                    if (err.name === "ContextError") {
-                        done();
-                    } else {
-                        done(err);
-                    }
-                });
+                    done();
+                }).catch(done);
             });
+
+            it('should return functionGlobalContext value as a default - synchronous', function(done) {
+                var fGC = { "foo": 456 };
+                Context.init({contextStorage:memoryStorage, functionGlobalContext:fGC });
+                Context.load().then(function() {
+                    var context = Context.get("1","flow");
+                    // Get foo - should be value from fGC
+                    var v = context.global.get("foo");
+                    v.should.equal(456);
+
+                    // Update foo - should not touch fGC object
+                    context.global.set("foo","new value");
+                    fGC.foo.should.equal(456);
+
+                    // Get foo - should be the updated value
+                    v = context.global.get("foo");
+                    v.should.equal("new value");
+                    done();
+                }).catch(done);
+            })
+
+            it('should return functionGlobalContext value as a default - async', function(done) {
+                var fGC = { "foo": 456 };
+                Context.init({contextStorage:memoryStorage, functionGlobalContext:fGC });
+                Context.load().then(function() {
+                    var context = Context.get("1","flow");
+                    // Get foo - should be value from fGC
+                    context.global.get("foo", function(err, v) {
+                        if (err) {
+                            done(err)
+                        } else {
+                            v.should.equal(456);
+                            // Update foo - should not touch fGC object
+                            context.global.set("foo","new value", function(err) {
+                                if (err) {
+                                    done(err)
+                                } else {
+                                    fGC.foo.should.equal(456);
+                                    // Get foo - should be the updated value
+                                    context.global.get("foo", function(err, v) {
+                                        if (err) {
+                                            done(err)
+                                        } else {
+                                            v.should.equal("new value");
+                                            done();
+                                        }
+                                    });
+                                }
+                            });
+                        }
+                    });
+                }).catch(done);
+            })
+
         });
 
         describe('delete context',function(){
-            it('should not call delete() when external context storage is used', function() {
+            it('should not call delete() when external context storage is used', function(done) {
                 Context.init({contextStorage:contextDefaultStorage});
                 return Context.load().then(function(){
                     Context.get("flowA");
                     return Context.delete("flowA").then(function(){
                         stubDelete.called.should.be.false();
                         stubDelete2.called.should.be.false();
+                        done();
                     });
-                });
+                }).catch(done);
             });
         });
 
         describe('clean context',function(){
-            it('should call clean()', function() {
+            it('should call clean()', function(done) {
                 Context.init({contextStorage:contextDefaultStorage});
                 return Context.load().then(function(){
                     return Context.clean({allNodes:{}}).then(function(){
                         stubClean.calledWithExactly([]).should.be.true();
                         stubClean2.calledWithExactly([]).should.be.true();
+                        done();
                     });
-                });
+                }).catch(done);
             });
         });
     });
diff --git a/test/red/runtime/nodes/context/memory_spec.js b/test/red/runtime/nodes/context/memory_spec.js
index 090c46b41..56a36a9f2 100644
--- a/test/red/runtime/nodes/context/memory_spec.js
+++ b/test/red/runtime/nodes/context/memory_spec.js
@@ -103,19 +103,6 @@ describe('memory',function() {
             keysY[0].should.equal("hoge");
         });
 
-        it('should enumerate only context keys when GlobalContext was given', function() {
-            var keys = context.keys("global");
-            keys.should.be.an.Array();
-            keys.should.be.empty();
-
-            var data = {
-                foo: "bar"
-            }
-            context.setGlobalContext(data);
-            keys = context.keys("global");
-            keys.should.have.length(1);
-            keys[0].should.equal("foo");
-        });
     });
 
     describe('#delete',function() {
@@ -163,17 +150,4 @@ describe('memory',function() {
         });
     });
 
-    describe('#setGlobalContext',function() {
-        it('should initialize global context with argument', function() {
-            var keys = context.keys("global");
-            keys.should.be.an.Array();
-            keys.should.be.empty();
-
-            var data = {
-                foo: "bar"
-            }
-            context.setGlobalContext(data);
-            context.get("global","foo").should.equal("bar");
-        });
-    });
-});
\ No newline at end of file
+});

From 08b0838f9ac186ac5531b5715ee959b5e295e3cc Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 2 Jul 2018 15:32:29 +0100
Subject: [PATCH 099/113] Fix linting in view.js

---
 editor/js/ui/view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/js/ui/view.js b/editor/js/ui/view.js
index 129817285..4559c5ec4 100644
--- a/editor/js/ui/view.js
+++ b/editor/js/ui/view.js
@@ -491,7 +491,7 @@ RED.view = (function() {
             var midX = Math.floor(destX-dx/2);
             var midY = Math.floor(destY-dy/2);
             //
-            if (dy == 0) {
+            if (dy === 0) {
                 midY = destY + node_height;
             }
             var cp_height = node_height/2;

From 742358350886a3ba0978ceaa8f5764b8fef921c0 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 2 Jul 2018 15:47:47 +0100
Subject: [PATCH 100/113] Create default store for node tests to use

---
 red/runtime/nodes/context/index.js           |  1 +
 test/red/runtime/nodes/context/index_spec.js | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index bd336d371..b5ae720eb 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -36,6 +36,7 @@ function init(_settings) {
     stores = {};
     var seed = settings.functionGlobalContext || {};
     contexts['global'] = createContext("global",seed);
+    stores["_"] = new memory();
 }
 
 function load() {
diff --git a/test/red/runtime/nodes/context/index_spec.js b/test/red/runtime/nodes/context/index_spec.js
index eda70395a..04a30a8f2 100644
--- a/test/red/runtime/nodes/context/index_spec.js
+++ b/test/red/runtime/nodes/context/index_spec.js
@@ -23,7 +23,7 @@ describe('context', function() {
     describe('local memory',function() {
         beforeEach(function() {
             Context.init({});
-            return Context.load();
+            Context.load();
         });
         afterEach(function() {
             Context.clean({allNodes:{}});
@@ -165,7 +165,7 @@ describe('context', function() {
 
         it('should enumerate only context keys when GlobalContext was given - sync', function() {
             Context.init({functionGlobalContext: {foo:"bar"}});
-            return Context.load().then(function(){
+            Context.load().then(function(){
                 var context = Context.get("1","flowA");
                 context.global.set("foo2","bar2");
                 var keys = context.global.keys();
@@ -177,7 +177,7 @@ describe('context', function() {
 
         it('should enumerate only context keys when GlobalContext was given - async', function(done) {
             Context.init({functionGlobalContext: {foo:"bar"}});
-            return Context.load().then(function(){
+            Context.load().then(function(){
                 var context = Context.get("1","flowA");
                 context.global.set("foo2","bar2");
                 context.global.keys(function(err,keys) {
@@ -193,7 +193,7 @@ describe('context', function() {
 
         it('returns functionGlobalContext value if store value undefined', function() {
             Context.init({functionGlobalContext: {foo:"bar"}});
-            return Context.load().then(function(){
+            Context.load().then(function(){
                 var context = Context.get("1","flowA");
                 var v = context.global.get('foo');
                 v.should.equal('bar');
@@ -279,18 +279,18 @@ describe('context', function() {
         describe('load modules',function(){
             it('should call open()', function() {
                 Context.init({contextStorage:contextDefaultStorage});
-                return Context.load().then(function(){
+                Context.load().then(function(){
                     stubOpen.called.should.be.true();
                     stubOpen2.called.should.be.true();
                 });
             });
             it('should load memory module', function() {
                 Context.init({contextStorage:{memory:{module:"memory"}}});
-                return Context.load();
+                Context.load();
             });
             it('should load localfilesystem module', function() {
                 Context.init({contextStorage:{file:{module:"localfilesystem",config:{dir:resourcesDir}}}});
-                return Context.load();
+                Context.load();
             });
             it('should accept special storage name', function(done) {
                 Context.init({
@@ -355,7 +355,7 @@ describe('context', function() {
         describe('close modules',function(){
             it('should call close()', function(done) {
                 Context.init({contextStorage:contextDefaultStorage});
-                return Context.load().then(function(){
+                Context.load().then(function(){
                     return Context.close().then(function(){
                         stubClose.called.should.be.true();
                         stubClose2.called.should.be.true();
@@ -550,7 +550,7 @@ describe('context', function() {
         describe('delete context',function(){
             it('should not call delete() when external context storage is used', function(done) {
                 Context.init({contextStorage:contextDefaultStorage});
-                return Context.load().then(function(){
+                Context.load().then(function(){
                     Context.get("flowA");
                     return Context.delete("flowA").then(function(){
                         stubDelete.called.should.be.false();
@@ -564,7 +564,7 @@ describe('context', function() {
         describe('clean context',function(){
             it('should call clean()', function(done) {
                 Context.init({contextStorage:contextDefaultStorage});
-                return Context.load().then(function(){
+                Context.load().then(function(){
                     return Context.clean({allNodes:{}}).then(function(){
                         stubClean.calledWithExactly([]).should.be.true();
                         stubClean2.calledWithExactly([]).should.be.true();

From 43d7c8d48cdb352835755ff2693a1cc3014f4f04 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 2 Jul 2018 22:32:20 +0100
Subject: [PATCH 101/113] Add caching to localfilesystem context

---
 red/api/admin/context.js                      |  32 +++--
 red/runtime/nodes/context/localfilesystem.js  | 134 +++++++++++++++---
 .../nodes/context/localfilesystem_spec.js     |   6 +-
 3 files changed, 140 insertions(+), 32 deletions(-)

diff --git a/red/api/admin/context.js b/red/api/admin/context.js
index 37c6462cb..66aedcdcb 100644
--- a/red/api/admin/context.js
+++ b/red/api/admin/context.js
@@ -29,7 +29,6 @@ module.exports = {
         var scope = req.params.scope;
         var id = req.params.id;
         var key = req.params[0];
-        var result = {};
         var ctx;
         if (scope === 'global') {
             ctx = redNodes.getContext('global');
@@ -43,19 +42,28 @@ module.exports = {
         }
         if (ctx) {
             if (key) {
-                result = util.encodeObject({msg:ctx.get(key)});
+                ctx.get(key,function(err, v) {
+                    console.log(key,v);
+                    res.json(util.encodeObject({msg:v}));
+                });
+                return;
             } else {
-                var keys = ctx.keys();
-
-                var i = 0;
-                var l = keys.length;
-                while(i < l) {
-                    var k = keys[i];
-                    result[k] = util.encodeObject({msg:ctx.get(k)});
-                    i++;
-                }
+                ctx.keys(function(err, keys) {
+                    var result = {};
+                    var c = keys.length;
+                    keys.forEach(function(key) {
+                        ctx.get(key,function(err, v) {
+                            result[key] = util.encodeObject({msg:v});
+                            c--;
+                            if (c === 0) {
+                                res.json(result);
+                            }
+                        });
+                    });
+                });
             }
+        } else {
+            res.json({});
         }
-        res.json(result);
     }
 }
diff --git a/red/runtime/nodes/context/localfilesystem.js b/red/runtime/nodes/context/localfilesystem.js
index fed8ae959..5cf37e4a6 100644
--- a/red/runtime/nodes/context/localfilesystem.js
+++ b/red/runtime/nodes/context/localfilesystem.js
@@ -14,10 +14,39 @@
  * limitations under the License.
  **/
 
+/**
+ * Local file-system based context storage
+ *
+ * Configuration options:
+ * {
+ *    base: "contexts",        // the base directory to use
+ *                             // default: "contexts"
+ *    dir: "/path/to/storage", // the directory to create the base directory in
+ *                             // default: settings.userDir
+ *    cache: true              // whether to cache contents in memory
+ *                             // default: true
+ *  }
+ *
+ *
+ *  $HOME/.node-red/contexts
+ *  ├── global
+ *  │     └── global_context.json
+ *  ├── <id of Flow 1>
+ *  │     ├── flow_context.json
+ *  │     ├── <id of Node a>.json
+ *  │     └── <id of Node b>.json
+ *  └── <id of Flow 2>
+ *         ├── flow_context.json
+ *         ├── <id of Node x>.json
+ *         └── <id of Node y>.json
+ */
+
 var fs = require('fs-extra');
 var path = require("path");
 var util = require("../../util");
 
+var MemoryStore = require("./memory");
+
 function getStoragePath(storageBaseDir, scope) {
     if(scope.indexOf(":") === -1){
         if(scope === "global"){
@@ -76,10 +105,48 @@ function loadFile(storagePath){
 function LocalFileSystem(config){
     this.config = config;
     this.storageBaseDir = getBasePath(this.config);
+    if (config.hasOwnProperty('cache')?config.cache:true) {
+        this.cache = MemoryStore({});
+    }
 }
 
 LocalFileSystem.prototype.open = function(){
-    return Promise.resolve();
+    var self = this;
+    if (this.cache) {
+        var scopes = [];
+        var promises = [];
+        var subdirs = [];
+        var subdirPromises = [];
+        return fs.readdir(self.storageBaseDir).then(function(dirs){
+            dirs.forEach(function(fn) {
+                var p = getStoragePath(self.storageBaseDir ,fn)+".json";
+                scopes.push(fn);
+                promises.push(loadFile(p));
+                subdirs.push(path.join(self.storageBaseDir,fn));
+                subdirPromises.push(fs.readdir(path.join(self.storageBaseDir,fn)));
+            })
+            return Promise.all(subdirPromises);
+        }).then(function(dirs) {
+            dirs.forEach(function(files,i) {
+                files.forEach(function(fn) {
+                    if (fn !== 'flow.json' && fn !== 'global.json') {
+                        scopes.push(fn.substring(0,fn.length-5)+":"+scopes[i]);
+                        promises.push(loadFile(path.join(subdirs[i],fn)))
+                    }
+                });
+            })
+            return Promise.all(promises);
+        }).then(function(res) {
+            scopes.forEach(function(scope,i) {
+                var data = res[i]?JSON.parse(res[i]):{};
+                Object.keys(data).forEach(function(key) {
+                    self.cache.set(scope,key,data[key]);
+                })
+            });
+        })
+    } else {
+        return Promise.resolve();
+    }
 }
 
 LocalFileSystem.prototype.close = function(){
@@ -87,6 +154,9 @@ LocalFileSystem.prototype.close = function(){
 }
 
 LocalFileSystem.prototype.get = function(scope, key, callback) {
+    if (this.cache) {
+        return this.cache.get(scope,key,callback);
+    }
     if(typeof callback !== "function"){
         throw new Error("Callback must be a function");
     }
@@ -102,7 +172,7 @@ LocalFileSystem.prototype.get = function(scope, key, callback) {
     });
 };
 
-LocalFileSystem.prototype.set =function(scope, key, value, callback) {
+LocalFileSystem.prototype._set = function(scope, key, value, callback) {
     var storagePath = getStoragePath(this.storageBaseDir ,scope);
     loadFile(storagePath + ".json").then(function(data){
         var obj = data ? JSON.parse(data) : {}
@@ -117,9 +187,23 @@ LocalFileSystem.prototype.set =function(scope, key, value, callback) {
             callback(err);
         }
     });
+}
+
+LocalFileSystem.prototype.set = function(scope, key, value, callback) {
+    if (this.cache) {
+        this.cache.set(scope,key,value,callback);
+        this._set(scope,key,value, function(err) {
+            // TODO: log any errors
+        });
+    } else {
+        this._set(scope,key,value,callback);
+    }
 };
 
 LocalFileSystem.prototype.keys = function(scope, callback){
+    if (this.cache) {
+        return this.cache.keys(scope,callback);
+    }
     if(typeof callback !== "function"){
         throw new Error("Callback must be a function");
     }
@@ -136,29 +220,45 @@ LocalFileSystem.prototype.keys = function(scope, callback){
 };
 
 LocalFileSystem.prototype.delete = function(scope){
-    var storagePath = getStoragePath(this.storageBaseDir ,scope);
-    return fs.remove(storagePath + ".json");
+    var cachePromise;
+    if (this.cache) {
+        cachePromise = this.cache.delete(scope);
+    } else {
+        cachePromise = Promise.resolve();
+    }
+    var that = this;
+    return cachePromise.then(function() {
+        var storagePath = getStoragePath(that.storageBaseDir,scope);
+        return fs.remove(storagePath + ".json");
+    });
 }
 
 LocalFileSystem.prototype.clean = function(activeNodes){
     var self = this;
-    return fs.readdir(self.storageBaseDir).then(function(dirs){
-        return Promise.all(dirs.reduce(function(result, item){
-            if(item !== "global" && activeNodes.indexOf(item) === -1){
-                result.push(fs.remove(path.join(self.storageBaseDir,item)));
+    var cachePromise;
+    if (this.cache) {
+        cachePromise = this.cache.clean(activeNodes);
+    } else {
+        cachePromise = Promise.resolve();
+    }
+    return cachePromise.then(function() {
+        return fs.readdir(self.storageBaseDir).then(function(dirs){
+            return Promise.all(dirs.reduce(function(result, item){
+                if(item !== "global" && activeNodes.indexOf(item) === -1){
+                    result.push(fs.remove(path.join(self.storageBaseDir,item)));
+                }
+                return result;
+            },[]));
+        }).catch(function(err){
+            if(err.code == 'ENOENT') {
+                return Promise.resolve();
+            }else{
+                return Promise.reject(err);
             }
-            return result;
-        },[]));
-    }).catch(function(err){
-        if(err.code == 'ENOENT') {
-            return Promise.resolve();
-        }else{
-            return Promise.reject(err);
-        }
+        });
     });
 }
 
 module.exports = function(config){
     return new LocalFileSystem(config);
 };
-
diff --git a/test/red/runtime/nodes/context/localfilesystem_spec.js b/test/red/runtime/nodes/context/localfilesystem_spec.js
index a03d5b24a..61d591b07 100644
--- a/test/red/runtime/nodes/context/localfilesystem_spec.js
+++ b/test/red/runtime/nodes/context/localfilesystem_spec.js
@@ -29,7 +29,7 @@ describe('localfilesystem',function() {
     });
 
     beforeEach(function() {
-        context = LocalFileSystem({dir: resourcesDir});
+        context = LocalFileSystem({dir: resourcesDir, cache: false});
         return context.open();
     });
 
@@ -308,7 +308,7 @@ describe('localfilesystem',function() {
                                                 done();
                                             });
                                         });
-                                    });
+                                    }).catch(done);
                                 });
                             });
                         });
@@ -375,4 +375,4 @@ describe('localfilesystem',function() {
             });
         });
     });
-});
\ No newline at end of file
+});

From 7d702e8332ff50dc9fe4f545c20639e8522cd4b1 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 2 Jul 2018 22:38:37 +0100
Subject: [PATCH 102/113] Remove console.log

---
 red/api/admin/context.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/red/api/admin/context.js b/red/api/admin/context.js
index 66aedcdcb..ef23a26ea 100644
--- a/red/api/admin/context.js
+++ b/red/api/admin/context.js
@@ -43,7 +43,6 @@ module.exports = {
         if (ctx) {
             if (key) {
                 ctx.get(key,function(err, v) {
-                    console.log(key,v);
                     res.json(util.encodeObject({msg:v}));
                 });
                 return;

From a1251371d784d628d20727350719ea3807173969 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 3 Jul 2018 11:29:45 +0100
Subject: [PATCH 103/113] Avoid unnecessary re-reading of file context when
 caching is enabled

---
 red/runtime/nodes/context/localfilesystem.js | 6 ++++--
 red/runtime/nodes/context/memory.js          | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/red/runtime/nodes/context/localfilesystem.js b/red/runtime/nodes/context/localfilesystem.js
index 5cf37e4a6..28e1c4cce 100644
--- a/red/runtime/nodes/context/localfilesystem.js
+++ b/red/runtime/nodes/context/localfilesystem.js
@@ -192,8 +192,10 @@ LocalFileSystem.prototype._set = function(scope, key, value, callback) {
 LocalFileSystem.prototype.set = function(scope, key, value, callback) {
     if (this.cache) {
         this.cache.set(scope,key,value,callback);
-        this._set(scope,key,value, function(err) {
-            // TODO: log any errors
+        // With cache enabled, no need to re-read the file prior to writing.
+        var newContext = this.cache._export()[scope];
+        var storagePath = getStoragePath(this.storageBaseDir ,scope);
+        fs.outputFile(storagePath + ".json", JSON.stringify(newContext, undefined, 4), "utf8").catch(function(err) {
         });
     } else {
         this._set(scope,key,value,callback);
diff --git a/red/runtime/nodes/context/memory.js b/red/runtime/nodes/context/memory.js
index 93c213403..cace896c5 100644
--- a/red/runtime/nodes/context/memory.js
+++ b/red/runtime/nodes/context/memory.js
@@ -109,6 +109,11 @@ Memory.prototype.clean = function(activeNodes){
     return Promise.resolve();
 }
 
+Memory.prototype._export = function() {
+    return this.data;
+}
+
+
 module.exports = function(config){
     return new Memory(config);
 };

From c440a4c73052cf4482bcecbb6dc55dde12dab596 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 3 Jul 2018 14:17:42 +0100
Subject: [PATCH 104/113] Expose list of context stores to the editor

---
 red/api/editor/settings.js         |  2 +
 red/runtime/nodes/context/index.js | 61 +++++++++++++++++-------------
 red/runtime/nodes/index.js         |  3 +-
 3 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/red/api/editor/settings.js b/red/api/editor/settings.js
index 8929f08de..3faec405e 100644
--- a/red/api/editor/settings.js
+++ b/red/api/editor/settings.js
@@ -40,6 +40,8 @@ module.exports = {
             })
         }
 
+        safeSettings.context = runtime.nodes.listContextStores();
+
         var themeSettings = theme.settings();
         if (themeSettings) {
             safeSettings.editorTheme = themeSettings;
diff --git a/red/runtime/nodes/context/index.js b/red/runtime/nodes/context/index.js
index b5ae720eb..e926d8c7d 100644
--- a/red/runtime/nodes/context/index.js
+++ b/red/runtime/nodes/context/index.js
@@ -25,11 +25,12 @@ var contexts = {};
 
 // A map of store name to instance
 var stores = {};
+var storeList = [];
+var defaultStore;
 
 // Whether there context storage has been configured or left as default
 var hasConfiguredStore = false;
 
-var defaultStore = "_";
 
 function init(_settings) {
     settings = _settings;
@@ -37,15 +38,16 @@ function init(_settings) {
     var seed = settings.functionGlobalContext || {};
     contexts['global'] = createContext("global",seed);
     stores["_"] = new memory();
+    defaultStore = "memory";
 }
 
 function load() {
     return new Promise(function(resolve,reject) {
         // load & init plugins in settings.contextStorage
-        var plugins = settings.contextStorage;
+        var plugins = settings.contextStorage || {};
         var defaultIsAlias = false;
         var promises = [];
-        if (plugins) {
+        if (plugins && Object.keys(plugins).length > 0) {
             var hasDefault = plugins.hasOwnProperty('default');
             var defaultName;
             for (var pluginName in plugins) {
@@ -104,34 +106,36 @@ function load() {
                     promises.push(stores[plugin].open());
                 }
             }
-
             // There is a 'default' listed in the configuration
             if (hasDefault) {
                 // If 'default' is an alias, point it at the right module - we have already
                 // checked that it exists. If it isn't an alias, then it will
                 // already be set to a configured store
                 if (defaultIsAlias) {
-                    stores["default"] =  stores[plugins["default"]];
+                    stores["_"] =  stores[plugins["default"]];
+                    defaultStore = plugins["default"];
+                } else {
+                    stores["_"] = stores["default"];
+                    defaultStore = "default";
                 }
-                stores["_"] = stores["default"];
             } else if (defaultName) {
                 // No 'default' listed, so pick first in list as the default
-                stores["default"] = stores[defaultName];
-                stores["_"] = stores["default"];
-            } // else there were no stores list the config object - fall through
-              // to below where we default to a memory store
-        }
-
-        if (promises.length === 0) {
-            // No stores have been configured. Setup the default as an instance
-            // of memory storage
-            stores["_"] = memory();
-            stores["default"] = stores["_"];
-            promises.push(stores["_"].open())
-        } else {
-            // if there's configured storage then the lifecycle is slightly different
-            // - specifically, we don't delete node context on redeploy
+                stores["_"] = stores[defaultName];
+                defaultStore = defaultName;
+                defaultIsAlias = true;
+            } else {
+                // else there were no stores list the config object - fall through
+                // to below where we default to a memory store
+                storeList = ["memory"];
+                defaultStore = "memory";
+            }
             hasConfiguredStore = true;
+            storeList = Object.keys(stores).filter(n=>!(defaultIsAlias && n==="default") && n!== "_");
+        } else {
+            // No configured plugins
+            promises.push(stores["_"].open())
+            storeList = ["memory"];
+            defaultStore = "memory";
         }
         return resolve(Promise.all(promises));
     });
@@ -149,9 +153,9 @@ function getContextStorage(storage) {
     if (stores.hasOwnProperty(storage)) {
         // A known context
         return stores[storage];
-    } else if (stores.hasOwnProperty("default")) {
+    } else if (stores.hasOwnProperty("_")) {
         // Not known, but we have a default to fall back to
-        return stores["default"];
+        return stores["_"];
     } else {
         // Not known and no default configured
         var contextError = new Error(log._("context.error-use-undefined-storage", {storage:storage}));
@@ -176,7 +180,7 @@ function createContext(id,seed) {
         } else {
             if (typeof storage === 'function') {
                 callback = storage;
-                storage = "default";
+                storage = "_";
             }
             if (typeof callback !== 'function'){
                 throw new Error("Callback must be a function");
@@ -214,7 +218,7 @@ function createContext(id,seed) {
         } else {
             if (typeof storage === 'function') {
                 callback = storage;
-                storage = "default";
+                storage = "_";
             }
             if (callback && typeof callback !== 'function') {
                 throw new Error("Callback must be a function");
@@ -230,7 +234,7 @@ function createContext(id,seed) {
         } else {
             if (typeof storage === 'function') {
                 callback = storage;
-                storage = "default";
+                storage = "_";
             }
             if (typeof callback !== 'function') {
                 throw new Error("Callback must be a function");
@@ -312,9 +316,14 @@ function close() {
     return Promise.all(promises);
 }
 
+function listStores() {
+    return {default:defaultStore,stores:storeList};
+}
+
 module.exports = {
     init: init,
     load: load,
+    listStores: listStores,
     get: getContext,
     delete: deleteContext,
     clean: clean,
diff --git a/red/runtime/nodes/index.js b/red/runtime/nodes/index.js
index cbb78784e..4e89acc2d 100644
--- a/red/runtime/nodes/index.js
+++ b/red/runtime/nodes/index.js
@@ -222,5 +222,6 @@ module.exports = {
 
     // Contexts
     loadContextsPlugin: context.load,
-    closeContextsPlugin: context.close
+    closeContextsPlugin: context.close,
+    listContextStores: context.listStores
 };

From 9bbe405cd0999adabdda2265cacc02e33a6724fb Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 3 Jul 2018 21:18:15 +0100
Subject: [PATCH 105/113] Do not show blank popovers

---
 editor/js/ui/common/popover.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/editor/js/ui/common/popover.js b/editor/js/ui/common/popover.js
index d0253a8cc..4e2a0b0ef 100644
--- a/editor/js/ui/common/popover.js
+++ b/editor/js/ui/common/popover.js
@@ -48,12 +48,15 @@ RED.popover = (function() {
 
         var openPopup = function(instant) {
             if (active) {
-                div = $('<div class="red-ui-popover red-ui-popover-'+direction+'"></div>').appendTo("body");
+                div = $('<div class="red-ui-popover red-ui-popover-'+direction+'"></div>');
                 if (size !== "default") {
                     div.addClass("red-ui-popover-size-"+size);
                 }
                 if (typeof content === 'function') {
                     var result = content.call(res);
+                    if (result === null) {
+                        return;
+                    }
                     if (typeof result === 'string') {
                         div.text(result);
                     } else {
@@ -65,7 +68,7 @@ RED.popover = (function() {
                 if (width !== "auto") {
                     div.width(width);
                 }
-
+                div.appendTo("body");
 
                 var targetPos = target.offset();
                 var targetWidth = target.outerWidth();

From 4e4a1f11e6a363eab9097967b75574ce71e31f3f Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 3 Jul 2018 21:18:43 +0100
Subject: [PATCH 106/113] Fix context admin api for empty contexts

---
 red/api/admin/context.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/red/api/admin/context.js b/red/api/admin/context.js
index ef23a26ea..b99221dc4 100644
--- a/red/api/admin/context.js
+++ b/red/api/admin/context.js
@@ -50,15 +50,19 @@ module.exports = {
                 ctx.keys(function(err, keys) {
                     var result = {};
                     var c = keys.length;
-                    keys.forEach(function(key) {
-                        ctx.get(key,function(err, v) {
-                            result[key] = util.encodeObject({msg:v});
-                            c--;
-                            if (c === 0) {
-                                res.json(result);
-                            }
+                    if (c === 0) {
+                        res.json(result);
+                    } else {
+                        keys.forEach(function(key) {
+                            ctx.get(key,function(err, v) {
+                                result[key] = util.encodeObject({msg:v});
+                                c--;
+                                if (c === 0) {
+                                    res.json(result);
+                                }
+                            });
                         });
-                    });
+                    }
                 });
             }
         } else {

From 80873e4ea976dac17d2863aa6e96fb520c6556bd Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 3 Jul 2018 21:27:55 +0100
Subject: [PATCH 107/113] fix settings api test for context stores

---
 test/red/api/editor/settings_spec.js | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/test/red/api/editor/settings_spec.js b/test/red/api/editor/settings_spec.js
index 142d5731a..631d0907a 100644
--- a/test/red/api/editor/settings_spec.js
+++ b/test/red/api/editor/settings_spec.js
@@ -59,7 +59,8 @@ describe("api/editor/settings", function() {
                 },
                 nodes: {
                     paletteEditorEnabled: function() { return true; },
-                    getCredentialKeyType: function() { return "test-key-type"}
+                    getCredentialKeyType: function() { return "test-key-type"},
+                    listContextStores: function() { return {default: "foo", stores: ["foo","bar"]}}
                 },
                 log: { error: console.error },
                 storage: {}
@@ -73,6 +74,7 @@ describe("api/editor/settings", function() {
                     }
                     res.body.should.have.property("httpNodeRoot","testHttpNodeRoot");
                     res.body.should.have.property("version","testVersion");
+                    res.body.should.have.property("context",{default: "foo", stores: ["foo","bar"]});
                     res.body.should.have.property("paletteCategories",["red","blue","green"]);
                     res.body.should.have.property("editorTheme",{test:456});
                     res.body.should.have.property("testNodeSetting","helloWorld");
@@ -95,7 +97,8 @@ describe("api/editor/settings", function() {
                 },
                 nodes: {
                     paletteEditorEnabled: function() { return true; },
-                    getCredentialKeyType: function() { return "test-key-type"}
+                    getCredentialKeyType: function() { return "test-key-type"},
+                    listContextStores: function() { return {default: "foo", stores: ["foo","bar"]}}
                 },
                 log: { error: console.error },
                 storage: {}
@@ -130,7 +133,8 @@ describe("api/editor/settings", function() {
                 },
                 nodes: {
                     paletteEditorEnabled: function() { return true; },
-                    getCredentialKeyType: function() { return "test-key-type"}
+                    getCredentialKeyType: function() { return "test-key-type"},
+                    listContextStores: function() { return {default: "foo", stores: ["foo","bar"]}}
                 },
                 log: { error: console.error },
                 storage: {
@@ -169,7 +173,8 @@ describe("api/editor/settings", function() {
                 },
                 nodes: {
                     paletteEditorEnabled: function() { return true; },
-                    getCredentialKeyType: function() { return "test-key-type"}
+                    getCredentialKeyType: function() { return "test-key-type"},
+                    listContextStores: function() { return {default: "foo", stores: ["foo","bar"]}}
                 },
                 log: { error: console.error },
                 storage: {
@@ -211,7 +216,8 @@ describe("api/editor/settings", function() {
                 },
                 nodes: {
                     paletteEditorEnabled: function() { return true; },
-                    getCredentialKeyType: function() { return "test-key-type"}
+                    getCredentialKeyType: function() { return "test-key-type"},
+                    listContextStores: function() { return {default: "foo", stores: ["foo","bar"]}}
                 },
                 log: { error: console.error },
                 storage: {
@@ -248,8 +254,8 @@ describe("api/editor/settings", function() {
                 },
                 nodes: {
                     paletteEditorEnabled: function() { return false; },
-                    getCredentialKeyType: function() { return "test-key-type"}
-
+                    getCredentialKeyType: function() { return "test-key-type"},
+                    listContextStores: function() { return {default: "foo", stores: ["foo","bar"]}}
                 },
                 log: { error: console.error },
                 storage: {}

From c2434814329429004d89bcb549393b4120910fa2 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 25 Jun 2018 10:38:34 +0100
Subject: [PATCH 108/113] Add sub options to Inject node

---
 editor/js/ui/common/typedInput.js | 34 +++++++++++++++++++++++++++++--
 nodes/core/core/20-inject.html    | 11 ++++++----
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/editor/js/ui/common/typedInput.js b/editor/js/ui/common/typedInput.js
index 0f9e2a0d9..27c11e108 100644
--- a/editor/js/ui/common/typedInput.js
+++ b/editor/js/ui/common/typedInput.js
@@ -14,10 +14,40 @@
  * limitations under the License.
  **/
 (function($) {
+    var contextParse = function(v) {
+        var parts = {};
+        var m = /^#:\((\S+?)\)::(.*)$/.exec(v);
+        if (m) {
+            parts.option = m[1];
+            parts.value = m[2];
+        } else {
+            parts.value = v;
+        }
+        return parts;
+    }
+    var contextExport = function(v,opt) {
+        return "#:("+((typeof opt === "string")?opt:opt.value)+")::"+v;
+    }
     var allOptions = {
         msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression},
-        flow: {value:"flow",label:"flow.",validate:RED.utils.validatePropertyExpression},
-        global: {value:"global",label:"global.",validate:RED.utils.validatePropertyExpression},
+        flow: {value:"flow",label:"flow.",hasValue:true,
+            options:[
+                {value:"memory",label: "memory", icon:'<i class="red-ui-typedInput-icon fa fa-database" style="color: #ddd"></i>'}//,
+                // {value:"redis",label:"redis",icon:'<i class="red-ui-typedInput-icon fa fa-database" style="color: #777"></i>'}
+            ],
+            validate:RED.utils.validatePropertyExpression,
+            parse: contextParse,
+            export: contextExport
+        },
+        global: {value:"global",label:"global.",hasValue:true,
+            options:[
+                {value:"memory",label: "memory", icon:'<i class="red-ui-typedInput-icon fa fa-database" style="color: #ddd"></i>'},
+                {value:"redis",label:"redis",icon:'<i class="red-ui-typedInput-icon fa fa-database" style="color: #777"></i>'}
+            ],
+            validate:RED.utils.validatePropertyExpression,
+            parse: contextParse,
+            export: contextExport
+        },
         str: {value:"str",label:"string",icon:"red/images/typedInput/az.png"},
         num: {value:"num",label:"number",icon:"red/images/typedInput/09.png",validate:/^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$/},
         bool: {value:"bool",label:"boolean",icon:"red/images/typedInput/bool.png",options:["true","false"]},
diff --git a/nodes/core/core/20-inject.html b/nodes/core/core/20-inject.html
index 6f8ebcf69..87bb807c6 100644
--- a/nodes/core/core/20-inject.html
+++ b/nodes/core/core/20-inject.html
@@ -237,10 +237,13 @@ If you want every 20 minutes from now - use the <i>"interval"</i> option.</p>
                 } else {
                     return this._("inject.timestamp")+suffix;
                 }
-            } else if (this.payloadType === 'flow' && this.payload.length < 19) {
-                return 'flow.'+this.payload+suffix;
-            } else if (this.payloadType === 'global' && this.payload.length < 17) {
-                return 'global.'+this.payload+suffix;
+            } else if (this.payloadType === 'flow' || this.payloadType === 'global') {
+                var key = this.payload;
+                var m = /^#:\((\S+?)\)::(.*)$/.exec(key);
+                if (m) {
+                    key = m[2];
+                }
+                return 'flow.'+key+suffix;
             } else {
                 return this._("inject.inject")+suffix;
             }

From 33b4774c497f0cd41f838f737ed60da5c9039346 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 3 Jul 2018 21:17:15 +0100
Subject: [PATCH 109/113] Load typedinput context list from settings

---
 editor/js/ui/common/typedInput.js | 34 +++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/editor/js/ui/common/typedInput.js b/editor/js/ui/common/typedInput.js
index 27c11e108..ca13961b6 100644
--- a/editor/js/ui/common/typedInput.js
+++ b/editor/js/ui/common/typedInput.js
@@ -22,28 +22,28 @@
             parts.value = m[2];
         } else {
             parts.value = v;
+            parts.option = RED.settings.context.default;
         }
         return parts;
     }
     var contextExport = function(v,opt) {
-        return "#:("+((typeof opt === "string")?opt:opt.value)+")::"+v;
+        var store = ((typeof opt === "string")?opt:opt.value)
+        if (store !== RED.settings.context.default) {
+            return "#:("+store+")::"+v;
+        } else {
+            return v;
+        }
     }
     var allOptions = {
         msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression},
         flow: {value:"flow",label:"flow.",hasValue:true,
-            options:[
-                {value:"memory",label: "memory", icon:'<i class="red-ui-typedInput-icon fa fa-database" style="color: #ddd"></i>'}//,
-                // {value:"redis",label:"redis",icon:'<i class="red-ui-typedInput-icon fa fa-database" style="color: #777"></i>'}
-            ],
+            options:[],
             validate:RED.utils.validatePropertyExpression,
             parse: contextParse,
             export: contextExport
         },
         global: {value:"global",label:"global.",hasValue:true,
-            options:[
-                {value:"memory",label: "memory", icon:'<i class="red-ui-typedInput-icon fa fa-database" style="color: #ddd"></i>'},
-                {value:"redis",label:"redis",icon:'<i class="red-ui-typedInput-icon fa fa-database" style="color: #777"></i>'}
-            ],
+            options:[],
             validate:RED.utils.validatePropertyExpression,
             parse: contextParse,
             export: contextExport
@@ -117,12 +117,19 @@
 
     $.widget( "nodered.typedInput", {
         _create: function() {
+            try {
             if (!nlsd && RED && RED._) {
                 for (var i in allOptions) {
                     if (allOptions.hasOwnProperty(i)) {
                         allOptions[i].label = RED._("typedInput.type."+i,{defaultValue:allOptions[i].label});
                     }
                 }
+                var contextStores = RED.settings.context.stores;
+                var contextOptions = contextStores.map(function(store) {
+                    return {value:store,label: store, icon:'<i class="red-ui-typedInput-icon fa fa-database" style="color: #'+(store==='memory'?'ddd':'777')+'"></i>'}
+                })
+                allOptions.flow.options = contextOptions;
+                allOptions.global.options = contextOptions;
             }
             nlsd = true;
             var that = this;
@@ -200,6 +207,9 @@
             // explicitly set optionSelectTrigger display to inline-block otherwise jQ sets it to 'inline'
             this.optionSelectTrigger = $('<button tabindex="0" class="red-ui-typedInput-option-trigger" style="display:inline-block"><span class="red-ui-typedInput-option-caret"><i class="red-ui-typedInput-icon fa fa-sort-desc"></i></span></button>').appendTo(this.uiSelect);
             this.optionSelectLabel = $('<span class="red-ui-typedInput-option-label"></span>').prependTo(this.optionSelectTrigger);
+            RED.popover.tooltip(this.optionSelectLabel,function() {
+                return that.optionValue;
+            });
             this.optionSelectTrigger.click(function(event) {
                 event.preventDefault();
                 that._showOptionSelectMenu();
@@ -216,6 +226,9 @@
 
             this.optionExpandButton = $('<button tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"><i class="red-ui-typedInput-icon fa fa-ellipsis-h"></i></button>').appendTo(this.uiSelect);
             this.type(this.options.default||this.typeList[0].value);
+        }catch(err) {
+            console.log(err.stack);
+        }
         },
         _showTypeMenu: function() {
             if (this.typeList.length > 1) {
@@ -578,6 +591,9 @@
 
                                 if (typeof selectedOption === "string") {
                                     this.optionValue = selectedOption;
+                                    if (!this.activeOptions.hasOwnProperty(selectedOption)) {
+                                        selectedOption = Object.keys(this.activeOptions)[0];
+                                    }
                                     this._updateOptionSelectLabel(this.activeOptions[selectedOption]);
                                 } else {
                                     this.optionValue = selectedOption.value;

From 7ca153abd0840fd846321d129eab4cd9de80822b Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Wed, 4 Jul 2018 20:50:33 +0900
Subject: [PATCH 110/113] fix error on typedInput initialization

---
 editor/js/ui/common/typedInput.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/editor/js/ui/common/typedInput.js b/editor/js/ui/common/typedInput.js
index 0f9e2a0d9..81b3a8d6e 100644
--- a/editor/js/ui/common/typedInput.js
+++ b/editor/js/ui/common/typedInput.js
@@ -467,7 +467,9 @@
                 var opt = this.typeMap[type];
                 if (opt && this.propertyType !== type) {
                     this.propertyType = type;
-                    this.typeField.val(type);
+                    if (this.typeField) {
+                        this.typeField.val(type);
+                    }
                     this.selectLabel.empty();
                     var image;
                     if (opt.icon) {
@@ -574,15 +576,17 @@
                             }
                             this.elementDiv.show();
                         }
-                        if (opt.expand && typeof opt.expand === 'function') {
-                            this.optionExpandButton.show();
-                            this.optionExpandButton.off('click');
-                            this.optionExpandButton.on('click',function(evt) {
-                                evt.preventDefault();
-                                opt.expand.call(that);
-                            })
-                        } else {
-                            this.optionExpandButton.hide();
+                        if (this.optionExpandButton) {
+                            if (opt.expand && typeof opt.expand === 'function') {
+                                this.optionExpandButton.show();
+                                this.optionExpandButton.off('click');
+                                this.optionExpandButton.on('click',function(evt) {
+                                    evt.preventDefault();
+                                    opt.expand.call(that);
+                                })
+                            } else {
+                                this.optionExpandButton.hide();
+                            }
                         }
                         this.input.trigger('change',this.propertyType,this.value());
                     }

From e6c5cfb703844ae337ca390c8fe76f516dfaefe2 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 4 Jul 2018 13:36:23 +0100
Subject: [PATCH 111/113] Do not show TypedInput context options if there's
 only one available

---
 editor/js/ui/common/typedInput.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/editor/js/ui/common/typedInput.js b/editor/js/ui/common/typedInput.js
index ca13961b6..77b94bbc3 100644
--- a/editor/js/ui/common/typedInput.js
+++ b/editor/js/ui/common/typedInput.js
@@ -27,6 +27,9 @@
         return parts;
     }
     var contextExport = function(v,opt) {
+        if (!opt) {
+            return v;
+        }
         var store = ((typeof opt === "string")?opt:opt.value)
         if (store !== RED.settings.context.default) {
             return "#:("+store+")::"+v;
@@ -128,8 +131,13 @@
                 var contextOptions = contextStores.map(function(store) {
                     return {value:store,label: store, icon:'<i class="red-ui-typedInput-icon fa fa-database" style="color: #'+(store==='memory'?'ddd':'777')+'"></i>'}
                 })
-                allOptions.flow.options = contextOptions;
-                allOptions.global.options = contextOptions;
+                if (contextOptions.length < 2) {
+                    delete allOptions.flow.options;
+                    delete allOptions.global.options
+                } else {
+                    allOptions.flow.options = contextOptions;
+                    allOptions.global.options = contextOptions;
+                }
             }
             nlsd = true;
             var that = this;

From 372c213c2cec7781d413248a44765c6b8a6e0e6b Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 4 Jul 2018 14:23:18 +0100
Subject: [PATCH 112/113] Still parse/export typedInput values even when no
 options set

---
 editor/js/ui/common/typedInput.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/editor/js/ui/common/typedInput.js b/editor/js/ui/common/typedInput.js
index 492a9dcc0..74bbeb9ac 100644
--- a/editor/js/ui/common/typedInput.js
+++ b/editor/js/ui/common/typedInput.js
@@ -132,8 +132,8 @@
                     return {value:store,label: store, icon:'<i class="red-ui-typedInput-icon fa fa-database" style="color: #'+(store==='memory'?'ddd':'777')+'"></i>'}
                 })
                 if (contextOptions.length < 2) {
-                    delete allOptions.flow.options;
-                    delete allOptions.global.options
+                    allOptions.flow.options = [];
+                    allOptions.global.options = [];
                 } else {
                     allOptions.flow.options = contextOptions;
                     allOptions.global.options = contextOptions;
@@ -592,22 +592,31 @@
                                     var parts = opt.parse(this.input.val());
                                     if (parts.option) {
                                         selectedOption = parts.option;
+                                        if (!this.activeOptions.hasOwnProperty(selectedOption)) {
+                                            parts.option = Object.keys(this.activeOptions)[0];
+                                            selectedOption = parts.option
+                                        }
                                     }
                                     this.input.val(parts.value);
                                     if (opt.export) {
                                         this.element.val(opt.export(parts.value,parts.option||selectedOption));
                                     }
                                 }
-
                                 if (typeof selectedOption === "string") {
                                     this.optionValue = selectedOption;
                                     if (!this.activeOptions.hasOwnProperty(selectedOption)) {
                                         selectedOption = Object.keys(this.activeOptions)[0];
                                     }
-                                    this._updateOptionSelectLabel(this.activeOptions[selectedOption]);
-                                } else {
+                                    if (!selectedOption) {
+                                        this.optionSelectTrigger.hide();
+                                    } else {
+                                        this._updateOptionSelectLabel(this.activeOptions[selectedOption]);
+                                    }
+                                } else if (selectedOption) {
                                     this.optionValue = selectedOption.value;
                                     this._updateOptionSelectLabel(selectedOption);
+                                } else {
+                                    this.optionSelectTrigger.hide();
                                 }
                             }
                         }

From 946a6d604160ce07b513dc7df182461505528755 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 5 Jul 2018 10:43:33 +0100
Subject: [PATCH 113/113] Update RED.util.evaluateNodeProperty to support
 context stores

---
 red/runtime/util.js | 51 +++++++++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/red/runtime/util.js b/red/runtime/util.js
index 1d49641df..7d6464174 100644
--- a/red/runtime/util.js
+++ b/red/runtime/util.js
@@ -322,35 +322,54 @@ function evaluteEnvProperty(value) {
     return value;
 }
 
-function evaluateNodeProperty(value, type, node, msg) {
+var parseContextStore = function(key) {
+    var parts = {};
+    var m = /^#:\((\S+?)\)::(.*)$/.exec(key);
+    if (m) {
+        parts.store = m[1];
+        parts.key = m[2];
+    } else {
+        parts.key = key;
+    }
+    return parts;
+}
+
+function evaluateNodeProperty(value, type, node, msg, callback) {
+    var result;
     if (type === 'str') {
-        return ""+value;
+        result = ""+value;
     } else if (type === 'num') {
-        return Number(value);
+        result = Number(value);
     } else if (type === 'json') {
-        return JSON.parse(value);
+        result = JSON.parse(value);
     } else if (type === 're') {
-        return new RegExp(value);
+        result = new RegExp(value);
     } else if (type === 'date') {
-        return Date.now();
+        result = Date.now();
     } else if (type === 'bin') {
         var data = JSON.parse(value);
-        return Buffer.from(data);
+        result = Buffer.from(data);
     } else if (type === 'msg' && msg) {
-        return getMessageProperty(msg,value);
-    } else if (type === 'flow' && node) {
-        return node.context().flow.get(value);
-    } else if (type === 'global' && node) {
-        return node.context().global.get(value);
+        result = getMessageProperty(msg,value);
+    } else if ((type === 'flow' || type === 'global') && node) {
+        var contextKey = parseContextStore(value);
+        result = node.context()[type].get(contextKey.key,contextKey.store,callback);
+        if (callback) {
+            return;
+        }
     } else if (type === 'bool') {
-        return /^true$/i.test(value);
+        result = /^true$/i.test(value);
     } else if (type === 'jsonata') {
         var expr = prepareJSONataExpression(value,node);
-        return evaluateJSONataExpression(expr,msg);
+        result = evaluateJSONataExpression(expr,msg);
     } else if (type === 'env') {
-        return evaluteEnvProperty(value);
+        result = evaluteEnvProperty(value);
+    }
+    if (callback) {
+        callback(result);
+    } else {
+        return value;
     }
-    return value;
 }
 
 function prepareJSONataExpression(value,node) {