Allow spaces in device ID. Parse xsd:int values.

api.coffee

@@ -6,9 +6,9 @@ db = require './db'
 mongodb = require 'mongodb'
 
 # regular expression objects
-TASKS_REGEX = /^\/devices\/([a-zA-Z0-9\-\_]+)\/tasks\/?$/
-TAGS_REGEX = /^\/devices\/([a-zA-Z0-9\-\_]+)\/tags\/([a-zA-Z0-9\-\_]+)\/?$/
-PRESETS_REGEX = /^\/presets\/([a-zA-Z0-9\-\_]+)\/?$/
+TASKS_REGEX = /^\/devices\/([a-zA-Z0-9\-\_\%]+)\/tasks\/?$/
+TAGS_REGEX = /^\/devices\/([a-zA-Z0-9\-\_\%]+)\/tags\/([a-zA-Z0-9\-\_\%]+)\/?$/
+PRESETS_REGEX = /^\/presets\/([a-zA-Z0-9\-\_\%]+)\/?$/
 
 connectionRequest = (deviceId, callback) ->
   db.devicesCollection.findOne({_id : deviceId}, {'InternetGatewayDevice.ManagementServer.ConnectionRequestURL._value' : 1}, (err, device)->

common.coffee

@@ -25,9 +25,9 @@ exports.arrayToHash = (arr) ->
 exports.getDeviceId = (deviceIdStruct) ->
   # Guaranteeing globally unique id as defined in TR-069
   if deviceIdStruct['ProductClass']
-    return "#{escape(deviceIdStruct['OUI'])}-#{escape(deviceIdStruct['ProductClass'])}-#{escape(deviceIdStruct['SerialNumber'])}"
+    return "#{deviceIdStruct['OUI']}-#{deviceIdStruct['ProductClass']}-#{deviceIdStruct['SerialNumber']}"
 
-  return "#{escape(deviceIdStruct['OUI'])}-#{escape(deviceIdStruct['SerialNumber'])}"
+  return "#{deviceIdStruct['OUI']}-#{deviceIdStruct['SerialNumber']}"
 
 
 exports.extend = (obj, mixin) ->

tr-069.coffee

@@ -46,11 +46,16 @@ parameterValueList = (xml) ->
     valueType = e.get('Value').attr('type').value().trim()
     name = e.get('Name').text().trim()
     value = e.get('Value').text().trim()
-    switch valueType
-      when 'xsd:boolean'
-        value = Boolean(JSON.parse(value))
-      when 'xsd:unsignedInt'
-        value = JSON.parse(value)
+    try
+      switch valueType
+        when 'xsd:boolean'
+          value = Boolean(JSON.parse(value))
+        when 'xsd:unsignedInt'
+          value = JSON.parse(value)
+        when 'xsd:int'
+          value = JSON.parse(value)
+    catch err
+      value = null
     valueList.push([name, value])
   return valueList