Implementation of websockets

Author: Insoleet

ucoinpy/__init__.py

@@ -21,7 +21,7 @@
 MANAGED_API=["BASIC_MERKLED_API"]
 
 __author__      = 'Caner Candan & inso'
-__version__     = '0.13.1'
+__version__     = '0.14.0'
 __nonsense__    = 'uCoin'
 
 from . import api, documents, key

ucoinpy/api/bma/__init__.py

@@ -21,7 +21,7 @@
 
 PROTOCOL_VERSION = "1"
 
-import aiohttp, asyncio, logging, jsonschema
+import aiohttp, json, logging, jsonschema
 
 logger = logging.getLogger("ucoin")
 
@@ -59,7 +59,7 @@ def __init__(self, connection_handler, module):
         self.connection_handler = connection_handler
         self.headers = {}
 
-    def reverse_url(self, path):
+    def reverse_url(self, scheme, path):
         """
         Reverses the url using self.url and path given in parameter.
 
@@ -69,7 +69,10 @@ def reverse_url(self, path):
 
         server, port = self.connection_handler.server, self.connection_handler.port
 
-        url = 'http://%s:%d/%s' % (server, port, self.module)
+        url = '{scheme}://{server}:{port}/{module}'.format(scheme=scheme,
+                                                           server=server,
+                                                           port=port,
+                                                           module=self.module)
         return url + path
 
     def get(self, **kwargs):
@@ -96,7 +99,21 @@ async def __post__(self, **kwargs):
         """interface purpose for POST request"""
         pass
 
-    async def parse(self, response):
+    def parse_text(self, text):
+        """
+        Validate and parse the BMA answer from websocket
+
+        :param str text: the bma answer
+        :return: the json data
+        """
+        try:
+            data = json.loads(text)
+            jsonschema.validate(data, self.schema)
+            return data
+        except TypeError:
+            raise jsonschema.ValidationError("Could not parse json")
+
+    async def parse_response(self, response):
         """
         Validate and parse the BMA answer
 
@@ -117,9 +134,9 @@ async def requests_get(self, path, **kwargs):
         Arguments:
         - `path`: the request path
         """
-        logging.debug("Request : {0}".format(self.reverse_url(path)))
+        logging.debug("Request : {0}".format(self.reverse_url("http", path)))
         with aiohttp.Timeout(15):
-            response = await aiohttp.get(self.reverse_url(path), params=kwargs,headers=self.headers)
+            response = await aiohttp.get(self.reverse_url("http", path), params=kwargs,headers=self.headers)
             if response.status != 200:
                 raise ValueError('status code != 200 => %d (%s)' % (response.status, (await response.text())))
 
@@ -137,7 +154,7 @@ async def requests_post(self, path, **kwargs):
 
         logging.debug("POST : {0}".format(kwargs))
         with aiohttp.Timeout(15):
-            response = await aiohttp.post(self.reverse_url(path), data=kwargs, headers=self.headers)
+            response = await aiohttp.post(self.reverse_url("http", path), data=kwargs, headers=self.headers)
             return response
 
     def connect_ws(self, path):
@@ -147,7 +164,8 @@ def connect_ws(self, path):
         :param str path: the url path
         :return:
         """
-        return aiohttp.ws_connect(self.reverse_url(path))
+        url = self.reverse_url("ws", path)
+        return aiohttp.ws_connect(url)
 
 
-from . import network, blockchain, tx, wot, node, ud, websocket
+from . import network, blockchain, tx, wot, node, ud, ws

ucoinpy/api/bma/blockchain/__init__.py

@@ -84,7 +84,7 @@ class Parameters(Blockchain):
 
     async def __get__(self, **kwargs):
         r = await self.requests_get('/parameters', **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
 
 class Membership(Blockchain):
@@ -143,7 +143,7 @@ async def __post__(self, **kwargs):
     async def __get__(self, **kwargs):
         assert self.search is not None
         r = await self.requests_get('/memberships/%s' % self.search, **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
 
 class Block(Blockchain):
@@ -281,7 +281,7 @@ def __init__(self, connection_handler, number=None):
     async def __get__(self, **kwargs):
         assert self.number is not None
         r = await self.requests_get('/block/%d' % self.number, **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
     async def __post__(self, **kwargs):
         assert 'block' in kwargs
@@ -298,7 +298,7 @@ class Current(Blockchain):
 
     async def __get__(self, **kwargs):
         r = await self.requests_get('/current', **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
 
 class Hardship(Blockchain):
@@ -331,7 +331,7 @@ def __init__(self, connection_handler, fingerprint):
     async def __get__(self, **kwargs):
         assert self.fingerprint is not None
         r = await self.requests_get('/hardship/%s' % self.fingerprint.upper(), **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
 
 class Newcomers(Blockchain):
@@ -358,7 +358,7 @@ class Newcomers(Blockchain):
 
     async def __get__(self, **kwargs):
         r = await self.requests_get('/with/newcomers', **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
 
 class Certifications(Blockchain):
@@ -368,7 +368,7 @@ class Certifications(Blockchain):
 
     async def __get__(self, **kwargs):
         r = await self.requests_get('/with/certs', **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
 
 class Joiners(Blockchain):
@@ -378,7 +378,7 @@ class Joiners(Blockchain):
 
     async def __get__(self, **kwargs):
         r = await self.requests_get('/with/joiners', **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
 
 class Actives(Blockchain):
@@ -388,7 +388,7 @@ class Actives(Blockchain):
 
     async def __get__(self, **kwargs):
         r = await self.requests_get('/with/actives', **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
 
 class Leavers(Blockchain):
@@ -398,7 +398,7 @@ class Leavers(Blockchain):
 
     async def __get__(self, **kwargs):
         r = await self.requests_get('/with/leavers', **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
 
 class Excluded(Blockchain):
@@ -408,7 +408,7 @@ class Excluded(Blockchain):
 
     async def __get__(self, **kwargs):
         r = await self.requests_get('/with/excluded', **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
 
 class UD(Blockchain):
@@ -418,7 +418,7 @@ class UD(Blockchain):
 
     async def __get__(self, **kwargs):
         r = await self.requests_get('/with/ud', **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
 
 class TX(Blockchain):
@@ -428,4 +428,4 @@ class TX(Blockchain):
 
     async def __get__(self, **kwargs):
         r = await self.requests_get('/with/tx', **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))

ucoinpy/api/bma/network/__init__.py

@@ -55,6 +55,6 @@ class Peering(Network):
 
     async def __get__(self, **kwargs):
         r = await self.requests_get('/peering', **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
 from . import peering

ucoinpy/api/bma/network/peering/__init__.py

@@ -85,7 +85,7 @@ async def __get__(self, **kwargs):
         """creates a generator with one peering entry per iteration."""
 
         r = await self.requests_get('/peers', **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
     async def __post__(self, **kwargs):
         assert 'entry' in kwargs

ucoinpy/api/bma/node/__init__.py

@@ -55,5 +55,5 @@ def __init__(self, connection_handler, module='node'):
 
     async def __get__(self, **kwargs):
         r = await self.requests_get('/summary', **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 

ucoinpy/api/bma/tx/__init__.py

@@ -160,7 +160,7 @@ def __init__(self, conn_handler, pubkey, module='tx'):
     async def __get__(self, **kwargs):
         assert self.pubkey is not None
         r = await self.requests_get('/history/%s' % self.pubkey, **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
 
 class Process(Tx):
@@ -219,7 +219,7 @@ def __init__(self, connection_handler, pubkey, module='tx'):
     async def __get__(self, **kwargs):
         assert self.pubkey is not None
         r = await self.requests_get('/sources/%s' % self.pubkey, **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
 
 from . import history

ucoinpy/api/bma/tx/history/__init__.py

@@ -32,4 +32,4 @@ def __init__(self, conn_handler, pubkey, from_, to_, module='tx'):
 
     async def __get__(self, **kwargs):
         r = await self.requests_get('/history/%s/blocks/%s/%s' % (self.pubkey, self.from_, self.to_), **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))

ucoinpy/api/bma/wot/__init__.py

@@ -148,7 +148,7 @@ async def __get__(self, **kwargs):
         assert self.search is not None
 
         r = await self.requests_get('/lookup/%s' % self.search, **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
 
 class CertifiersOf(WOT):
@@ -231,7 +231,7 @@ async def __get__(self, **kwargs):
         assert self.search is not None
 
         r = await self.requests_get('/certifiers-of/%s' % self.search, **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
 
 class CertifiedBy(WOT):
@@ -248,7 +248,7 @@ async def __get__(self, **kwargs):
         assert self.search is not None
 
         r = await self.requests_get('/certified-by/%s' % self.search, **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))
 
 
 class Members(WOT):
@@ -277,4 +277,4 @@ def __init__(self, connection_handler, module='wot'):
 
     async def __get__(self, **kwargs):
         r = await self.requests_get('/members', **kwargs)
-        return (await self.parse(r))
+        return (await self.parse_response(r))

ucoinpy/api/bma/websocket/__init__.py renamed to ucoinpy/api/bma/ws/__init__.py

@@ -17,17 +17,20 @@
 #
 
 from .. import API, logging
+from ..blockchain import Block as _Block
+from ..network.peering import Peers as _Peers
 
-logger = logging.getLogger("ucoin/wot")
+logger = logging.getLogger("ucoin/ws")
 
 
 class Websocket(API):
-    def __init__(self, connection_handler, module='websocket'):
+    def __init__(self, connection_handler, module='ws'):
         super(Websocket, self).__init__(connection_handler, module)
 
 
 class Block(Websocket):
     """Connect to block websocket."""
+    schema = _Block.schema
 
     def connect(self):
 
@@ -37,6 +40,7 @@ def connect(self):
 
 class Peer(Websocket):
     """Connect to block websocket."""
+    schema = _Peers.schema
 
     def connect(self):