escape linefeeds in json string to prevent parser exceptions

closes error reported here: https://knx-user-forum.de/forum/supportforen/cometvisu/1490996-script-fehler-wenn-string-keinen-wert-liefert
CometVisu · Apr 10, 2020 · d13b573 · d13b573
1 parent 392be46
commit d13b573
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/client/source/class/cv/io/parser/Json.js b/client/source/class/cv/io/parser/Json.js
@@ -1,5 +1,5 @@
 /**
- * Sometimes the openHAB1 backend returns invalid JSON (e.g. multiple JSON object in one string)
+ * Sometimes the backend returns invalid JSON (e.g. multiple JSON object in one string) or there are linefeeds in the values.
  * This parser can handle those strings
  */
 qx.Class.define('cv.io.parser.Json', {
@@ -15,6 +15,7 @@ qx.Class.define('cv.io.parser.Json', {
       "jquery": function(data) {
         var result = {};
         try {
+          data = data.replace(/\n/g, "\\n");
           result = JSON.parse(data);
         } catch (e) {
           data.split("}{").forEach(function(subData, i) {
@@ -31,6 +32,7 @@ qx.Class.define('cv.io.parser.Json', {
       "qx": function(data) {
         var result = {};
         try {
+          data = data.replace(/\n/g, "\\n");
           result = qx.lang.Json.parse(data);
         } catch (e) {
           data.split("}{").forEach(function(subData, i) {

diff --git a/client/source/class/cv/io/transport/Sse.js b/client/source/class/cv/io/transport/Sse.js
@@ -98,7 +98,7 @@ qx.Class.define('cv.io.transport.Sse', {
      */
     handleMessage: function (e) {
       this.client.record("read", e.data);
-      var json = JSON.parse(e.data);
+      var json = cv.io.parser.Json.parse(e.data);
       var data = json.d;
       this.client.update(data);
       this.client.setDataReceived(true);