Iterate objects recursively and support array output (#1573)

* Iterate objects recursively and support array output

* Fix eslint errors

* Improve array handling and expand related test

* Improve tests and array support, add special case for color attributes

lib/controller.js

@@ -248,19 +248,36 @@ class Controller {
         if (settings.get().experimental.output === 'json') {
             this.mqtt.publish(entity.friendlyName, JSON.stringify(messagePayload), options);
         } else if (settings.get().experimental.output === 'attribute') {
-            Object.keys(messagePayload).forEach((key) => {
-                if (typeof messagePayload[key] == 'object') {
-                    Object.keys(messagePayload[key]).forEach((subKey) => {
-                        this.mqtt.publish(`${entity.friendlyName}/${key}-${subKey}`,
-                            `${messagePayload[key][subKey]}`, options);
-                    });
-                } else {
-                    this.mqtt.publish(`${entity.friendlyName}/${key}`, `${messagePayload[key]}`, options);
-                }
-            });
+            this.iteratePayloadForAttrOutput(entity.friendlyName+'/', messagePayload, options);
         }
     }
 
+    iteratePayloadForAttrOutput(topicRoot, payload, options) {
+        Object.keys(payload).forEach((key) => {
+            let subPayload = payload[key];
+            let message;
+
+            // Special cases
+            if (key === 'color' &&
+                subPayload.r !== undefined &&
+                subPayload.g !== undefined &&
+                subPayload.b !== undefined) {
+                subPayload = [subPayload.r, subPayload.g, subPayload.b];
+            }
+
+            // Check Array first, since it is also an Object
+            if (Array.isArray(subPayload)) {
+                message = subPayload.map((x) => `${x}`).join(',');
+            } else if (typeof subPayload === 'object') {
+                return this.iteratePayloadForAttrOutput(topicRoot+key+'-', subPayload, options);
+            } else {
+                message = typeof subPayload === 'string' ? subPayload : JSON.stringify(subPayload);
+            }
+
+            this.mqtt.publish(`${topicRoot}${key}`, message, options);
+        });
+    }
+
     getDeviceInfoForMqtt(ieeeAddr) {
         const device = this.zigbee.getDevice(ieeeAddr);
         const {