Merge pull request #468 from pascalopitz/master

Sanitizing malformed device description XML
bencevans · Jun 29, 2020 · cb15417 · cb15417
2 parents 37ab765 + cbec942
commit cb15417
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/lib/helpers.js b/lib/helpers.js
@@ -328,4 +328,15 @@ Helpers.ParseXml = async function (input) {
   })
 }
 
+/**
+ * Sanitizes Device Description XML async
+ * @param {String} input The XML to be sanitized
+ * @return {Promise}
+ */
+Helpers.SanitizeDeviceDescriptionXml = async function (input) {
+  // This is to fix malformed xml in description see https://github.com/bencevans/node-sonos/issues/465
+  debug('Helpers.SanitizeDeviceDescriptionXml %j', input)
+  return input.replace(/#([\w]+)#/gm, '<!-- #$1# -->')
+}
+
 module.exports = Helpers
diff --git a/lib/sonos.js b/lib/sonos.js
@@ -603,6 +603,7 @@ Sonos.prototype.deviceDescription = async function () {
   debug('Sonos.deviceDescription()')
   return request(`http://${this.host}:${this.port}/xml/device_description.xml`)
     .then(response => response.data)
+    .then(Helpers.SanitizeDeviceDescriptionXml)
     .then(Helpers.ParseXml)
     .then(result => {
       return result.root.device