[JS] toJSON method is very wrong - it should return an object to be stringified (#380)

* toJSON method is very wrong - it should return an object to be stringified

* don't call toJSON directly, JSON.stringify will do that

Author: JoshuaGross

javascript/sbp/sbp.js

@@ -141,7 +141,7 @@ SBP.prototype.toJSON = function toJSON () {
     dict[k] = this.fields[k];
   }.bind(this));
 
-  return JSON.stringify(dict);
+  return dict;
 };
 
 /**

javascript/test_http_port.js

@@ -0,0 +1,24 @@
+/**
+ * Test decoding bytes coming from an HTTP stream.
+ */
+
+var path = require('path');
+var dispatch = require(path.resolve(__dirname, './sbp/')).dispatch;
+var request = require('request');
+
+// Message construction
+var constructMsg = require(path.resolve(__dirname, './sbp/construct'));
+var sbpPiksi = require(path.resolve(__dirname, './sbp/piksi'));
+var MsgReset = sbpPiksi.MsgReset;
+
+// Change this to a valid piksi serial port path.
+var serial = '/dev/cu.usbserial-00001014';
+
+var piksi = request('http://localhost:7770');
+
+console.log('Opened piksi.');
+
+dispatch(piksi, function (err, framedMsg) {
+  console.log('Message from piksi:', err, framedMsg.messageType, framedMsg);
+});
+

javascript/test_serial_port.js

@@ -12,7 +12,7 @@ var sbpPiksi = require(path.resolve(__dirname, './sbp/piksi'));
 var MsgReset = sbpPiksi.MsgReset;
 
 // Change this to a valid piksi serial port path.
-var serial = '/dev/cu.usbserial-00002014';
+var serial = '/dev/cu.usbserial-00001014';
 
 var piksi = new SerialPort(serial, {
   //baudrate: 115200 // serial or uart
@@ -25,14 +25,4 @@ piksi.on('open', function () {
   dispatch(piksi, function (err, framedMsg) {
     console.log('Message from piksi:', err, framedMsg.messageType);
   });
-
-  setTimeout(function () {
-    console.log('Sending a MSG_RESET');
-
-    var msgBytes = constructMsg(MsgReset, {}).toBuffer();
-
-    piksi.write(msgBytes, function () {
-      console.log('wrote bytes', msgBytes, arguments);
-    });
-  }, 1000);
 });

javascript/test_serial_port_reset.js

@@ -0,0 +1,38 @@
+/**
+ * To run this, install node-serialport globally: `npm install -g serialport`
+ */
+
+var SerialPort = require('serialport');
+var path = require('path');
+var dispatch = require(path.resolve(__dirname, './sbp/')).dispatch;
+
+// Message construction
+var constructMsg = require(path.resolve(__dirname, './sbp/construct'));
+var sbpPiksi = require(path.resolve(__dirname, './sbp/piksi'));
+var MsgReset = sbpPiksi.MsgReset;
+
+// Change this to a valid piksi serial port path.
+var serial = '/dev/cu.usbserial-00002014';
+
+var piksi = new SerialPort(serial, {
+  //baudrate: 115200 // serial or uart
+  baudrate: 1000000 // USB
+});
+
+piksi.on('open', function () {
+  console.log('Opened piksi.');
+
+  dispatch(piksi, function (err, framedMsg) {
+    console.log('Message from piksi:', err, framedMsg.messageType);
+  });
+
+  setTimeout(function () {
+    console.log('Sending a MSG_RESET');
+
+    var msgBytes = constructMsg(MsgReset, {}).toBuffer();
+
+    piksi.write(msgBytes, function () {
+      console.log('wrote bytes', msgBytes, arguments);
+    });
+  }, 1000);
+});

javascript/tests/test_decode.js

@@ -47,7 +47,7 @@ describe('test packages based on YAML descriptors', function () {
           });
           it('should serialize back to JSON properly', function () {
             var msg = decodeMsg();
-            assert.deepEqual(JSON.parse(msg.toJSON()), JSON.parse(testSpec['raw_json']));
+            assert.deepEqual(JSON.parse(JSON.stringify(msg)), JSON.parse(testSpec['raw_json']));
           });
           it('should be identical to constructed message with identical fields', function () {
             var msg = decodeMsg();

package.json

@@ -17,6 +17,8 @@
     "js-yaml": "^3.4.3"
   },
   "devDependencies": {
-    "mocha": "^2.4.5"
+    "mocha": "^2.4.5",
+    "request": "^2.74.0",
+    "serialport": "^4.0.1"
   }
 }