Correctly handle bad JSONs in JSONAscoltatore.

moscajs · Mar 21, 2014 · a1ee583 · a1ee583
1 parent aff537c
commit a1ee583
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/lib/json_ascoltatore.js b/lib/json_ascoltatore.js
@@ -27,10 +27,17 @@ JSONAscoltatore.prototype.wrapCallback = function(callback, next) {
   if (!callback._json_ascoltatore_wrapper) {
     callback._json_ascoltatore_wrapper = function(t, payload) {
       debug("converting from JSON");
+      var errored = false;
+
       try {
-        callback(t, JSON.parse(payload));
+        payload = JSON.parse(payload);
       } catch (e) {
-        console.log("The payload is not a valid JSON", e);
+        errored = true;
+        debug("The payload is not a valid JSON", e);
+      }
+
+      if (!errored) {
+        callback(t, payload);
       }
     };
   }

diff --git a/test/json_ascoltatore_spec.js b/test/json_ascoltatore_spec.js
@@ -63,4 +63,15 @@ describe("ascoltatori.JSONAscoltatore", function() {
       that.instance.pub("hello/123", false);
     });
   });
+
+  it("should not throw if a bad JSON arrives", function(done) {
+    var that = this;
+    this.instance.subscribe("/hello", function(topic, payload) {
+      done(new Error("this should never happen"));
+    }, function() {
+      that.included.publish("/hello", "not a json", function() {
+        done();
+      });
+    });
+  });
 });