11import asyncio
22import datetime
33import functools
4- import json
54import logging
65import time
76import uuid
1211logger = logging .getLogger (__name__ )
1312
1413DELIM = b"\x1b [K"
15- SIZEB = b"\x1b [%dD"
16-
17-
18- class DataBuffer :
19- def __init__ (self , loop = None , deserializer = json .loads ):
20- self .q = asyncio .Queue (loop = loop )
21- self .data_buffer = b""
22- self .deserializer = deserializer
23-
24- def add (self , data ):
25- self .data_buffer = self .data_buffer + data
26- * ready , self .data_buffer = self .data_buffer .rsplit (DELIM )
27- for chunk in ready :
28- self .q .put_nowait (chunk )
29-
30- async def get (self ):
31- return self .deserializer (await self .q .get ())
3214
3315
3416class BaseProtocol (asyncio .Protocol ):
@@ -57,9 +39,7 @@ async def watch_queue(self):
5739 continue
5840
5941 try :
60- logger .debug ("about to write %s ... %s" , msg [:8 ], msg [- 8 :])
6142 self .transport .write (msg )
62- logger .debug ("written successfully" )
6343 except Exception :
6444 logger .exception ("Error received trying to write to %s" , self .id )
6545 await buffer_obj .put (msg )
@@ -78,7 +58,6 @@ def connection_lost(self, exc):
7858 self .receptor .remove_connection (self )
7959
8060 def data_received (self , data ):
81- logger .debug ("recv: %s ... %s" , data [:16 ], data [- 16 :])
8261 self .loop .create_task (self .incoming_buffer .put (data ))
8362
8463 async def wait_greeting (self ):
@@ -88,10 +67,8 @@ async def wait_greeting(self):
8867 '''
8968 logger .debug ('Looking for handshake...' )
9069 data = await self .incoming_buffer .get ()
91- logger .debug (data .header )
9270 if data .header ["cmd" ] == "HI" :
9371 self .handle_handshake (data .header )
94- logger .debug ("handshake complete, starting normal handle loop" )
9572 else :
9673 logger .error ("Handshake failed!" )
9774 self .transport .close ()
@@ -102,7 +79,6 @@ def handle_handshake(self, data):
10279 self .meta = data .get ("meta" , {})
10380 self .receptor .add_connection (self )
10481 self .loop .create_task (self .watch_queue ())
105- logger .debug ("starting message_handler: %s" , self .incoming_buffer )
10682 self .loop .create_task (self .receptor .message_handler (self .incoming_buffer ))
10783
10884 def send_handshake (self ):
@@ -184,7 +160,6 @@ def emit_response(self, response):
184160
185161 def _do_emit_callback (self , fut ):
186162 res = fut .result ()
187- logger .debug ("_do_emit_callback: %s" , res )
188163 self .transport .write (res + DELIM )
189164
190165 def data_received (self , data ):
0 commit comments