Let JSON parser attempt to parse buffers if they contain strings

and add/fix test

CHANGELOG.md

@@ -1,3 +1,7 @@
+#### 2.2.0-beta.1: Beta Release
+
+
+
 #### 2.1.4: Maintenance Release
 
 Runtime

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "2.1.4",
+    "version": "2.2.0-beta.1",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "2.1.4",
+    "version": "2.2.0-beta.1",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "2.1.4",
-        "@node-red/editor-client": "2.1.4",
+        "@node-red/util": "2.2.0-beta.1",
+        "@node-red/editor-client": "2.2.0-beta.1",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.0",
         "clone": "2.1.2",

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "2.1.4",
+    "version": "2.2.0-beta.1",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

packages/node_modules/@node-red/nodes/core/parsers/70-JSON.js

@@ -49,7 +49,11 @@ module.exports = function(RED) {
             }
             var value = RED.util.getMessageProperty(msg,node.property);
             if (value !== undefined) {
-                if (typeof value === "string") {
+                if (typeof value === "string" || Buffer.isBuffer(value)) {
+                    // if (Buffer.isBuffer(value) && node.action !== "obj") {
+                    //     node.warn(RED._("json.errors.dropped")); done();
+                    // }
+                    // else
                     if (node.action === "" || node.action === "obj") {
                         try {
                             RED.util.setMessageProperty(msg,node.property,JSON.parse(value));

packages/node_modules/@node-red/nodes/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "2.1.4",
+    "version": "2.2.0-beta.1",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

packages/node_modules/@node-red/registry/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "2.1.4",
+    "version": "2.2.0-beta.1",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,7 +16,7 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "2.1.4",
+        "@node-red/util": "2.2.0-beta.1",
         "clone": "2.1.2",
         "fs-extra": "10.0.0",
         "semver": "7.3.5",

packages/node_modules/@node-red/runtime/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "2.1.4",
+    "version": "2.2.0-beta.1",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "2.1.4",
-        "@node-red/util": "2.1.4",
+        "@node-red/registry": "2.2.0-beta.1",
+        "@node-red/util": "2.2.0-beta.1",
         "async-mutex": "0.3.2",
         "clone": "2.1.2",
         "express": "4.17.1",

packages/node_modules/@node-red/util/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "2.1.4",
+    "version": "2.2.0-beta.1",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

packages/node_modules/node-red/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "2.1.4",
+    "version": "2.2.0-beta.1",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -31,10 +31,10 @@
         "flow"
     ],
     "dependencies": {
-        "@node-red/editor-api": "2.1.4",
-        "@node-red/runtime": "2.1.4",
-        "@node-red/util": "2.1.4",
-        "@node-red/nodes": "2.1.4",
+        "@node-red/editor-api": "2.2.0-beta.1",
+        "@node-red/runtime": "2.2.0-beta.1",
+        "@node-red/util": "2.2.0-beta.1",
+        "@node-red/nodes": "2.2.0-beta.1",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.17.1",

test/nodes/core/parsers/70-JSON_spec.js

@@ -50,6 +50,24 @@ describe('JSON node', function() {
         });
     });
 
+    it('should convert a buffer of a valid json string to a javascript object', function(done) {
+        var flow = [{id:"jn1",type:"json",action:"obj",wires:[["jn2"]]},
+                    {id:"jn2", type:"helper"}];
+        helper.load(jsonNode, flow, function() {
+            var jn1 = helper.getNode("jn1");
+            var jn2 = helper.getNode("jn2");
+            jn2.on("input", function(msg) {
+                msg.should.have.property('topic', 'bar');
+                msg.payload.should.have.property('employees');
+                msg.payload.employees[0].should.have.property('firstName', 'John');
+                msg.payload.employees[0].should.have.property('lastName', 'Smith');
+                done();
+            });
+            var jsonString = Buffer.from('{"employees":[{"firstName":"John", "lastName":"Smith"}]}');
+            jn1.receive({payload:jsonString,topic: "bar"});
+        });
+    });
+
     it('should convert a javascript object to a json string', function(done) {
         var flow = [{id:"jn1",type:"json",wires:[["jn2"]]},
                     {id:"jn2", type:"helper"}];
@@ -166,29 +184,55 @@ describe('JSON node', function() {
         });
     });
 
-    it('should log an error if asked to parse something thats not json or js', function(done) {
-        var flow = [{id:"jn1",type:"json",wires:[["jn2"]]},
+    it('should log an error if asked to parse an invalid json string in a buffer', function(done) {
+        var flow = [{id:"jn1",type:"json",action:"obj",wires:[["jn2"]]},
                     {id:"jn2", type:"helper"}];
         helper.load(jsonNode, flow, function() {
-            var jn1 = helper.getNode("jn1");
-            var jn2 = helper.getNode("jn2");
-            setTimeout(function() {
-                try {
-                    var logEvents = helper.log().args.filter(function(evt) {
-                        return evt[0].type == "json";
-                    });
-                    logEvents.should.have.length(1);
-                    logEvents[0][0].should.have.a.property('msg');
-                    logEvents[0][0].msg.toString().should.eql('json.errors.dropped-object');
-                    done();
-                } catch(err) {
-                    done(err);
-                }
-            },50);
-            jn1.receive({payload:Buffer.from("a")});
+            try {
+                var jn1 = helper.getNode("jn1");
+                var jn2 = helper.getNode("jn2");
+                jn1.receive({payload:Buffer.from('{"name":foo}'),topic: "bar"});
+                setTimeout(function() {
+                    try {
+                        var logEvents = helper.log().args.filter(function(evt) {
+                            return evt[0].type == "json";
+                        });
+                        logEvents.should.have.length(1);
+                        logEvents[0][0].should.have.a.property('msg');
+                        logEvents[0][0].msg.should.startWith("Unexpected token o");
+                        logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
+                        done();
+                    } catch(err) { done(err) }
+                },20);
+            } catch(err) {
+                done(err);
+            }
         });
     });
 
+    // it('should log an error if asked to parse something thats not json or js and not in force object mode', function(done) {
+    //     var flow = [{id:"jn1",type:"json",wires:[["jn2"]]},
+    //                 {id:"jn2", type:"helper"}];
+    //     helper.load(jsonNode, flow, function() {
+    //         var jn1 = helper.getNode("jn1");
+    //         var jn2 = helper.getNode("jn2");
+    //         setTimeout(function() {
+    //             try {
+    //                 var logEvents = helper.log().args.filter(function(evt) {
+    //                     return evt[0].type == "json";
+    //                 });
+    //                 logEvents.should.have.length(1);
+    //                 logEvents[0][0].should.have.a.property('msg');
+    //                 logEvents[0][0].msg.toString().should.eql('json.errors.dropped');
+    //                 done();
+    //             } catch(err) {
+    //                 done(err);
+    //             }
+    //         },50);
+    //         jn1.receive({payload:Buffer.from("abcd")});
+    //     });
+    // });
+
     it('should pass straight through if no payload set', function(done) {
         var flow = [{id:"jn1",type:"json",wires:[["jn2"]]},
                     {id:"jn2", type:"helper"}];