Fixed a bug that cannot properly parse JSON commands

Author: cheton

src/index.js

@@ -72,7 +72,7 @@ const parseLine = (() => {
         const re3 = new RegExp(/\s+/g);
         return (line => line.replace(re1, '').replace(re2, '').replace(re3, ''));
     })();
-    const re = /(%.*)|((?:\$\$)|(?:\$[a-zA-Z0-9#]*))|([a-zA-Z][0-9\+\-\.]*)|(\*[0-9]+)/igm;
+    const re = /(%.*)|({.*)|((?:\$\$)|(?:\$[a-zA-Z0-9#]*))|([a-zA-Z][0-9\+\-\.]*)|(\*[0-9]+)/igm;
 
     return (line, options) => {
         options = options || {};
@@ -93,6 +93,8 @@ const parseLine = (() => {
         let cs; // Checksum
         const words = stripComments(line).match(re) || [];
 
+        console.log(words);
+
         for (let i = 0; i < words.length; ++i) {
             const word = words[i];
             const letter = word[0].toUpperCase();
@@ -105,6 +107,12 @@ const parseLine = (() => {
                 continue;
             }
 
+            // Parser JSON commands for TinyG and g2core
+            if (letter === '{') {
+                result.cmds = (result.cmds || []).concat(line.trim());
+                continue;
+            }
+
             // Parse $ commands for Grbl
             // - $C Check gcode mode
             // - $H Run homing cycle

test/index.js

@@ -72,6 +72,24 @@ describe('gcode-parser', () => {
             expect(data.cmds).to.deep.equal(['$H', '$C']);
             done();
         });
+        it('should be able to parse JSON command (e.g. TinyG, g2core).', (done) => {
+            { // {sr:{spe:t,spd,sps:t}}
+                const data = parseLine('{sr:{spe:t,spd:t,sps:t}}');
+                expect(data).to.be.an('object');
+                expect(data.line).to.be.an('string');
+                expect(data.words).to.be.empty;
+                expect(data.cmds).to.deep.equal(['{sr:{spe:t,spd:t,sps:t}}']);
+            }
+            { // Request Motor Timeout: {mt:n}
+                const data = parseLine('{mt:n}');
+                expect(data).to.be.an('object');
+                expect(data.line).to.be.an('string');
+                expect(data.words).to.be.empty;
+                expect(data.cmds).to.deep.equal(['{mt:n}']);
+            }
+
+            done();
+        });
         it('should be able to parse % command (e.g. bCNC, CNCjs).', (done) => {
             { // %wait
                 const data = parseLine('%wait');