Switch to rapidjson, and fix CBOR

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/0.7@2552 b32b6428-25c9-4566-ad07-03861ab6144f

apps/dashboard/xaal/dashboard/core/json.py

@@ -9,6 +9,7 @@ to sio package.
 
 def dumps(*args,**kwargs):
     obj = args[0]
+    #import pdb;pdb.set_trace()
     return rapidjson.dumps(obj,uuid_mode=rapidjson.UM_CANONICAL)        
 
 

apps/dashboard/xaal/dashboard/core/sio.py

@@ -3,7 +3,7 @@ from . import xaal_core
 from . import json
 from xaal.lib import tools
 
-socket = socketio.Server(async_mode='gevent',ping_interval=0.5,json=json)
+socket = socketio.Server(async_mode='gevent',ping_interval=0.5,json=json,cors_allowed_origins='*',logger=False)
 
 def setup(wsgi_app):
     global socket
@@ -25,7 +25,7 @@ def send_xaal_request(sid,addr,action,body):
 def query_attributes(sid,addr):
     dev = xaal_core.get_device(addr)
     if dev:
-        msg = { 'address': dev.address,'attributes':dev.attributes}
+        msg = { 'address': dev.address.get(),'attributes':dev.attributes}
         socket.emit('event_attributeChanges',msg,room=sid)
 
 @socket.on('refresh_attributes')
@@ -34,7 +34,7 @@ def refresh_attributes(sid,addrs):
     for addr in addrs:
         dev = xaal_core.get_device(addr)
         if dev:
-            msg = { 'address': dev.address,'attributes':dev.attributes}
+            msg = { 'address': dev.address.get(),'attributes':dev.attributes}
             socket.emit('event_attributeChanges',msg,room=sid)
         else:
             print("Unknow device: %s" % addr)

apps/dashboard/xaal/dashboard/core/xaal_core.py

@@ -28,7 +28,7 @@ def monitor_filter(msg):
 
 def event_handler(ev_type,dev):
     logger.debug("Event %s %s" % (ev_type,dev.address))
-    msg = { 'address': dev.address,'attributes':dev.attributes}
+    msg = { 'address': dev.address.get(),'attributes':dev.attributes}
     sio.broadcast('event_attributeChanges',msg)
     
 def setup():