robot0nfire/fl0w-old
robot0nfire/fl0w-old
Archived
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

Major refactor and error handling on closed sock

Browse source
This commit is contained in:
PhilipTrauner 2016-03-21 00:17:00 +01:00
parent ac76cecdb3
commit 731e5f4e1e
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Shared/ESock.py
View file

@ -6,7 +6,7 @@ import Logging
class ConvertFailedError(ValueError): class ConvertFailedError(ValueError):
def __init__(self): def __init__(self):
super(ConvertFailedError, self).__init__("conversion failed (false data type supplied)") super(ValueError, self).__init__("conversion failed (false data type supplied)")
def convert_data(data, data_type): def convert_data(data, data_type):
try: try:
@ -23,6 +23,8 @@ def convert_data(data, data_type):
return data return data
class ESock: class ESock:
DATA_TYPES = {str : DataTypes.str, dict : DataTypes.json, list : DataTypes.json, bytes : DataTypes.bin, int : DataTypes.int, float : DataTypes.float}
def __init__(self, sock, debug=False, disconnect_callback=None): def __init__(self, sock, debug=False, disconnect_callback=None):
self._sock = sock self._sock = sock
self.address, self.port = self._sock.getpeername() self.address, self.port = self._sock.getpeername()
@ -80,25 +82,22 @@ class ESock:
def send(self, data, route=""): def send(self, data, route=""):
length = len(data) length = len(data)
data_type = type(data) original_data_type = type(data)
if self.debug: if self.debug:
Logging.info("Sending %d-long '%s' on route '%s': %s (%s:%d)" % (length, data_type.__name__, route, str(data).replace("\n", " "), self.address, self.port)) Logging.info("Sending %d-long '%s' on route '%s': %s (%s:%d)" % (length, original_data_type.__name__, route, str(data).replace("\n", " "), self.address, self.port))
route = route.encode() route = route.encode()
if data_type is str: if original_data_type in ESock.DATA_TYPES:
data = data.encode() data_type = ESock.DATA_TYPES[original_data_type]
self.sendall(struct.pack("cQ16s", DataTypes.str, len(data), route) + data)
elif data_type is dict or data_type is list:
data = json.dumps(data, separators=(',',':')).encode()
self.sendall(struct.pack("cQ16s", DataTypes.json, len(data), route) + data)
elif data_type is bytes:
self.sendall(struct.pack("cQ16s", DataTypes.bin, len(data), route) + data)
elif data_type is int:
self.sendall(struct.pack("cQ16s", DataTypes.int, len(data), route) + data)
elif data_type is float:
self.sendall(struct.pack("cQ16s", DataTypes.float, len(data), route) + data)
else: else:
self.sendall(struct.pack("cQ16s", DataTypes.other, len(data), route) + data) data_type = DataTypes.other
if original_data_type is str:
data = data.encode()
elif original_data_type is dict or original_data_type is list:
data = json.dumps(data, separators=(',',':')).encode()
self.sendall(struct.pack("cQ16s", data_type, len(data), route) + data)
def __eq__(self, other): def __eq__(self, other):
return self is other if type(other) is ESock:
return self._sock is other._sock
return False