safeishJSON to workaround invalid JSON from devices

kingkong123 · Jan 25, 2018 · 2639ab7 · 2639ab7
1 parent 67865ec
commit 2639ab7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/network.js b/lib/network.js
@@ -8,6 +8,8 @@ const debug = require('debug');
 const Packet = require('./packet');
 const tokens = require('./tokens');
 
+const safeishJSON = require('./safeishJSON');
+
 const PORT = 54321;
 
 const ERRORS = {
@@ -360,7 +362,7 @@ class DeviceInfo {
 
 			this.debug('<- Message: `' + str + '`');
 			try {
-				let object = JSON.parse(str);
+				let object = safeishJSON(str);
 
 				const p = this.promises.get(object.id);
 				if(! p) return;

diff --git a/lib/safeishJSON.js b/lib/safeishJSON.js
@@ -0,0 +1,12 @@
+'use strict';
+
+module.exports = function(str) {
+	try {
+		return JSON.parse(str);
+	} catch(ex) {
+		// Case 1: Load for subdevices fail as they return empty values
+		str = str.replace('[,]', '[null,null]');
+
+		return JSON.parse(str);
+	}
+};