mirror of
https://github.com/undera/pylgbst.git
synced 2020-11-18 19:37:26 -08:00
Refactor
This commit is contained in:
Andrey Pohilko
parent
818715ad65
commit
3c8e6b4cbb
@ -7,25 +7,25 @@ log = logging.getLogger('pylgbst')
|
||||
|
||||
|
||||
def get_connection_bluegiga(controller=None, hub_mac=None):
|
||||
from pylgbst.comms_pygatt import BlueGigaConnection
|
||||
from pylgbst.comms.cpygatt import BlueGigaConnection
|
||||
|
||||
return BlueGigaConnection().connect(hub_mac)
|
||||
|
||||
|
||||
def get_connection_gattool(controller='hci0', hub_mac=None):
|
||||
from pylgbst.comms_pygatt import GattoolConnection
|
||||
from pylgbst.comms.cpygatt import GattoolConnection
|
||||
|
||||
return GattoolConnection(controller).connect(hub_mac)
|
||||
|
||||
|
||||
def get_connection_gatt(controller='hci0', hub_mac=None):
|
||||
from pylgbst.comms_gatt import GattConnection
|
||||
from pylgbst.comms.cgatt import GattConnection
|
||||
|
||||
return GattConnection(controller).connect(hub_mac)
|
||||
|
||||
|
||||
def get_connection_gattlib(controller='hci0', hub_mac=None):
|
||||
from pylgbst.comms_gattlib import GattLibConnection
|
||||
from pylgbst.comms.cgattlib import GattLibConnection
|
||||
|
||||
return GattLibConnection(controller).connect(hub_mac)
|
||||
|
||||
|
||||
190
pylgbst/comms.py
190
pylgbst/comms.py
@ -1,190 +0,0 @@
|
||||
"""
|
||||
This package holds communication aspects
|
||||
"""
|
||||
import binascii
|
||||
import json
|
||||
import logging
|
||||
import socket
|
||||
import traceback
|
||||
from abc import abstractmethod
|
||||
from binascii import unhexlify
|
||||
from threading import Thread
|
||||
|
||||
from pylgbst.constants import MSG_DEVICE_SHUTDOWN, ENABLE_NOTIFICATIONS_HANDLE, ENABLE_NOTIFICATIONS_VALUE
|
||||
from pylgbst.utilities import str2hex
|
||||
|
||||
log = logging.getLogger('comms')
|
||||
|
||||
LEGO_MOVE_HUB = "LEGO Move Hub"
|
||||
|
||||
|
||||
class Connection(object):
|
||||
def connect(self, hub_mac=None):
|
||||
pass
|
||||
|
||||
def disconnect(self):
|
||||
pass
|
||||
|
||||
@abstractmethod
|
||||
def write(self, handle, data):
|
||||
pass
|
||||
|
||||
@abstractmethod
|
||||
def set_notify_handler(self, handler):
|
||||
pass
|
||||
|
||||
def enable_notifications(self):
|
||||
self.write(ENABLE_NOTIFICATIONS_HANDLE, ENABLE_NOTIFICATIONS_VALUE)
|
||||
|
||||
|
||||
class DebugServer(object):
|
||||
"""
|
||||
Starts TCP server to be used with DebugServerConnection to speed-up development process
|
||||
It holds BLE connection to Move Hub, so no need to re-start it every time
|
||||
Usage: DebugServer(BLEConnection().connect()).start()
|
||||
|
||||
:type connection: BLEConnection
|
||||
"""
|
||||
|
||||
def __init__(self, connection):
|
||||
self._running = False
|
||||
self.sock = socket.socket()
|
||||
self.connection = connection
|
||||
|
||||
def start(self, port=9090):
|
||||
self.sock.bind(('', port))
|
||||
self.sock.listen(1)
|
||||
|
||||
self._running = True
|
||||
while self._running:
|
||||
log.info("Accepting MoveHub debug connections at %s", port)
|
||||
conn, addr = self.sock.accept()
|
||||
if not self._running:
|
||||
raise KeyboardInterrupt("Shutdown")
|
||||
self.connection.requester.notification_sink = lambda x, y: self._notify(conn, x, y)
|
||||
try:
|
||||
self._handle_conn(conn)
|
||||
except KeyboardInterrupt:
|
||||
raise
|
||||
except BaseException:
|
||||
log.error("Problem handling incoming connection: %s", traceback.format_exc())
|
||||
finally:
|
||||
self.connection.requester.notification_sink = self._notify_dummy
|
||||
conn.close()
|
||||
|
||||
def __del__(self):
|
||||
self.sock.close()
|
||||
|
||||
def _notify_dummy(self, handle, data):
|
||||
log.debug("Dropped notification from handle %s: %s", handle, binascii.hexlify(data))
|
||||
self._check_shutdown(data)
|
||||
|
||||
def _notify(self, conn, handle, data):
|
||||
payload = {"type": "notification", "handle": handle, "data": str2hex(data)}
|
||||
log.debug("Send notification: %s", payload)
|
||||
try:
|
||||
conn.send(json.dumps(payload) + "\n")
|
||||
except KeyboardInterrupt:
|
||||
raise
|
||||
except BaseException:
|
||||
log.error("Problem sending notification: %s", traceback.format_exc())
|
||||
|
||||
self._check_shutdown(data)
|
||||
|
||||
def _check_shutdown(self, data):
|
||||
if data[5] == MSG_DEVICE_SHUTDOWN:
|
||||
log.warning("Device shutdown")
|
||||
self._running = False
|
||||
|
||||
def _handle_conn(self, conn):
|
||||
"""
|
||||
:type conn: socket._socketobject
|
||||
"""
|
||||
buf = ""
|
||||
while True:
|
||||
data = conn.recv(1024)
|
||||
log.debug("Recv: %s", data.strip())
|
||||
if not data:
|
||||
break
|
||||
|
||||
buf += data
|
||||
|
||||
if "\n" in buf:
|
||||
line = buf[:buf.index("\n")]
|
||||
buf = buf[buf.index("\n") + 1:]
|
||||
|
||||
if line:
|
||||
log.info("Cmd line: %s", line)
|
||||
try:
|
||||
self._handle_cmd(json.loads(line))
|
||||
except KeyboardInterrupt:
|
||||
raise
|
||||
except BaseException:
|
||||
log.error("Failed to handle cmd: %s", traceback.format_exc())
|
||||
|
||||
def _handle_cmd(self, cmd):
|
||||
if cmd['type'] == 'write':
|
||||
self.connection.write(cmd['handle'], unhexlify(cmd['data']))
|
||||
else:
|
||||
raise ValueError("Unhandled cmd: %s", cmd)
|
||||
|
||||
|
||||
class DebugServerConnection(Connection):
|
||||
"""
|
||||
Connection type to be used with DebugServer, replaces BLEConnection
|
||||
"""
|
||||
|
||||
def __init__(self, port=9090):
|
||||
super(DebugServerConnection, self).__init__()
|
||||
self.notify_handler = None
|
||||
self.buf = ""
|
||||
self.sock = socket.socket()
|
||||
self.sock.connect(('localhost', port))
|
||||
self.incoming = []
|
||||
|
||||
self.reader = Thread(target=self._recv)
|
||||
self.reader.setName("Debug connection reader")
|
||||
self.reader.setDaemon(True)
|
||||
self.reader.start()
|
||||
|
||||
def __del__(self):
|
||||
self.sock.close()
|
||||
|
||||
def write(self, handle, data):
|
||||
payload = {
|
||||
"type": "write",
|
||||
"handle": handle,
|
||||
"data": str2hex(data)
|
||||
}
|
||||
self._send(payload)
|
||||
|
||||
def _send(self, payload):
|
||||
log.debug("Sending to debug server: %s", payload)
|
||||
self.sock.send(json.dumps(payload) + "\n")
|
||||
|
||||
def _recv(self):
|
||||
while True:
|
||||
data = self.sock.recv(1024)
|
||||
log.debug("Recv from debug server: %s", data.strip())
|
||||
if not data:
|
||||
raise KeyboardInterrupt("Server has closed connection")
|
||||
|
||||
self.buf += data
|
||||
|
||||
while "\n" in self.buf:
|
||||
line = self.buf[:self.buf.index("\n")]
|
||||
self.buf = self.buf[self.buf.index("\n") + 1:]
|
||||
if line:
|
||||
item = json.loads(line)
|
||||
if item['type'] == 'notification' and self.notify_handler:
|
||||
try:
|
||||
self.notify_handler(item['handle'], unhexlify(item['data']))
|
||||
except BaseException:
|
||||
log.error("Failed to notify handler: %s", traceback.format_exc())
|
||||
elif item['type'] == 'response':
|
||||
self.incoming.append(item)
|
||||
else:
|
||||
log.warning("Dropped inbound: %s", item)
|
||||
|
||||
def set_notify_handler(self, handler):
|
||||
self.notify_handler = handler
|
||||
190
pylgbst/comms/__init__.py
Normal file
190
pylgbst/comms/__init__.py
Normal file
@ -0,0 +1,190 @@
|
||||
"""
|
||||
This package holds communication aspects
|
||||
"""
|
||||
import binascii
|
||||
import json
|
||||
import logging
|
||||
import socket
|
||||
import traceback
|
||||
from abc import abstractmethod
|
||||
from binascii import unhexlify
|
||||
from threading import Thread
|
||||
|
||||
from pylgbst.constants import MSG_DEVICE_SHUTDOWN, ENABLE_NOTIFICATIONS_HANDLE, ENABLE_NOTIFICATIONS_VALUE
|
||||
from pylgbst.utilities import str2hex
|
||||
|
||||
log = logging.getLogger('comms')
|
||||
|
||||
LEGO_MOVE_HUB = "LEGO Move Hub"
|
||||
|
||||
|
||||
class Connection(object):
|
||||
def connect(self, hub_mac=None):
|
||||
pass
|
||||
|
||||
def disconnect(self):
|
||||
pass
|
||||
|
||||
@abstractmethod
|
||||
def write(self, handle, data):
|
||||
pass
|
||||
|
||||
@abstractmethod
|
||||
def set_notify_handler(self, handler):
|
||||
pass
|
||||
|
||||
def enable_notifications(self):
|
||||
self.write(ENABLE_NOTIFICATIONS_HANDLE, ENABLE_NOTIFICATIONS_VALUE)
|
||||
|
||||
|
||||
class DebugServer(object):
|
||||
"""
|
||||
Starts TCP server to be used with DebugServerConnection to speed-up development process
|
||||
It holds BLE connection to Move Hub, so no need to re-start it every time
|
||||
Usage: DebugServer(BLEConnection().connect()).start()
|
||||
|
||||
:type connection: BLEConnection
|
||||
"""
|
||||
|
||||
def __init__(self, connection):
|
||||
self._running = False
|
||||
self.sock = socket.socket()
|
||||
self.connection = connection
|
||||
|
||||
def start(self, port=9090):
|
||||
self.sock.bind(('', port))
|
||||
self.sock.listen(1)
|
||||
|
||||
self._running = True
|
||||
while self._running:
|
||||
log.info("Accepting MoveHub debug connections at %s", port)
|
||||
conn, addr = self.sock.accept()
|
||||
if not self._running:
|
||||
raise KeyboardInterrupt("Shutdown")
|
||||
self.connection.requester.notification_sink = lambda x, y: self._notify(conn, x, y)
|
||||
try:
|
||||
self._handle_conn(conn)
|
||||
except KeyboardInterrupt:
|
||||
raise
|
||||
except BaseException:
|
||||
log.error("Problem handling incoming connection: %s", traceback.format_exc())
|
||||
finally:
|
||||
self.connection.requester.notification_sink = self._notify_dummy
|
||||
conn.close()
|
||||
|
||||
def __del__(self):
|
||||
self.sock.close()
|
||||
|
||||
def _notify_dummy(self, handle, data):
|
||||
log.debug("Dropped notification from handle %s: %s", handle, binascii.hexlify(data))
|
||||
self._check_shutdown(data)
|
||||
|
||||
def _notify(self, conn, handle, data):
|
||||
payload = {"type": "notification", "handle": handle, "data": str2hex(data)}
|
||||
log.debug("Send notification: %s", payload)
|
||||
try:
|
||||
conn.send(json.dumps(payload) + "\n")
|
||||
except KeyboardInterrupt:
|
||||
raise
|
||||
except BaseException:
|
||||
log.error("Problem sending notification: %s", traceback.format_exc())
|
||||
|
||||
self._check_shutdown(data)
|
||||
|
||||
def _check_shutdown(self, data):
|
||||
if data[5] == MSG_DEVICE_SHUTDOWN:
|
||||
log.warning("Device shutdown")
|
||||
self._running = False
|
||||
|
||||
def _handle_conn(self, conn):
|
||||
"""
|
||||
:type conn: socket._socketobject
|
||||
"""
|
||||
buf = ""
|
||||
while True:
|
||||
data = conn.recv(1024)
|
||||
log.debug("Recv: %s", data.strip())
|
||||
if not data:
|
||||
break
|
||||
|
||||
buf += data
|
||||
|
||||
if "\n" in buf:
|
||||
line = buf[:buf.index("\n")]
|
||||
buf = buf[buf.index("\n") + 1:]
|
||||
|
||||
if line:
|
||||
log.info("Cmd line: %s", line)
|
||||
try:
|
||||
self._handle_cmd(json.loads(line))
|
||||
except KeyboardInterrupt:
|
||||
raise
|
||||
except BaseException:
|
||||
log.error("Failed to handle cmd: %s", traceback.format_exc())
|
||||
|
||||
def _handle_cmd(self, cmd):
|
||||
if cmd['type'] == 'write':
|
||||
self.connection.write(cmd['handle'], unhexlify(cmd['data']))
|
||||
else:
|
||||
raise ValueError("Unhandled cmd: %s", cmd)
|
||||
|
||||
|
||||
class DebugServerConnection(Connection):
|
||||
"""
|
||||
Connection type to be used with DebugServer, replaces BLEConnection
|
||||
"""
|
||||
|
||||
def __init__(self, port=9090):
|
||||
super(DebugServerConnection, self).__init__()
|
||||
self.notify_handler = None
|
||||
self.buf = ""
|
||||
self.sock = socket.socket()
|
||||
self.sock.connect(('localhost', port))
|
||||
self.incoming = []
|
||||
|
||||
self.reader = Thread(target=self._recv)
|
||||
self.reader.setName("Debug connection reader")
|
||||
self.reader.setDaemon(True)
|
||||
self.reader.start()
|
||||
|
||||
def __del__(self):
|
||||
self.sock.close()
|
||||
|
||||
def write(self, handle, data):
|
||||
payload = {
|
||||
"type": "write",
|
||||
"handle": handle,
|
||||
"data": str2hex(data)
|
||||
}
|
||||
self._send(payload)
|
||||
|
||||
def _send(self, payload):
|
||||
log.debug("Sending to debug server: %s", payload)
|
||||
self.sock.send(json.dumps(payload) + "\n")
|
||||
|
||||
def _recv(self):
|
||||
while True:
|
||||
data = self.sock.recv(1024)
|
||||
log.debug("Recv from debug server: %s", data.strip())
|
||||
if not data:
|
||||
raise KeyboardInterrupt("Server has closed connection")
|
||||
|
||||
self.buf += data
|
||||
|
||||
while "\n" in self.buf:
|
||||
line = self.buf[:self.buf.index("\n")]
|
||||
self.buf = self.buf[self.buf.index("\n") + 1:]
|
||||
if line:
|
||||
item = json.loads(line)
|
||||
if item['type'] == 'notification' and self.notify_handler:
|
||||
try:
|
||||
self.notify_handler(item['handle'], unhexlify(item['data']))
|
||||
except BaseException:
|
||||
log.error("Failed to notify handler: %s", traceback.format_exc())
|
||||
elif item['type'] == 'response':
|
||||
self.incoming.append(item)
|
||||
else:
|
||||
log.warning("Dropped inbound: %s", item)
|
||||
|
||||
def set_notify_handler(self, handler):
|
||||
self.notify_handler = handler
|
||||
@ -4,7 +4,7 @@ import unittest
|
||||
import dbus
|
||||
from gatt import DeviceManager
|
||||
|
||||
from pylgbst.comms_gatt import CustomDevice, GattConnection
|
||||
from pylgbst.comms.cgatt import CustomDevice, GattConnection
|
||||
from tests import log, str2hex
|
||||
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ from pygatt import BLEAddressType
|
||||
from pygatt.backends.bgapi.bgapi import MAX_CONNECTION_ATTEMPTS
|
||||
from pygatt.backends.bgapi.device import BGAPIBLEDevice
|
||||
|
||||
from pylgbst.comms_pygatt import GattoolConnection
|
||||
from pylgbst.comms.cpygatt import GattoolConnection
|
||||
from tests import log
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user