auracaster/bumble_mirror
3
0
Fork 1
mirror of https://github.com/google/bumble.git synced 2026-05-09 04:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed lint and pre-commit errors.

Browse Source
This commit is contained in:
skarnataki
2023-10-16 07:13:30 +00:00
committed by Lucas Abel
parent 651e44e0b6
commit 3ab64ce00d
3 changed files with 108 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
bumble/hid.py
View File

@@ -41,12 +41,12 @@ logger = logging.getLogger(__name__)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Constants # Constants
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# fmt: off # fmt: on
HID_CONTROL_PSM = 0x0011 HID_CONTROL_PSM = 0x0011
HID_INTERRUPT_PSM = 0x0013 HID_INTERRUPT_PSM = 0x0013
class Message(): class Message:
message_type: MessageType message_type: MessageType
# Report types # Report types
class ReportType(enum.IntEnum): class ReportType(enum.IntEnum):
@@ -102,8 +102,10 @@ class GetReportMessage(Message):
def __bytes__(self) -> bytes: def __bytes__(self) -> bytes:
packet_bytes = bytearray() packet_bytes = bytearray()
packet_bytes.append(self.report_id) packet_bytes.append(self.report_id)
packet_bytes.extend([(self.buffer_size & 0xff), ((self.buffer_size >> 8) & 0xff)]) packet_bytes.extend(
if(self.report_type == Message.ReportType.OTHER_REPORT): [(self.buffer_size & 0xFF), ((self.buffer_size >> 8) & 0xFF)]
)
if self.report_type == Message.ReportType.OTHER_REPORT:
return self.header(self.report_type) + packet_bytes return self.header(self.report_type) + packet_bytes
else: else:
return self.header(0x08 | self.report_type) + packet_bytes return self.header(0x08 | self.report_type) + packet_bytes
@@ -136,6 +138,30 @@ class SetProtocolMessage(Message):
return self.header(self.protocol_mode) return self.header(self.protocol_mode)
@dataclass
class Suspend(Message):
message_type = Message.MessageType.CONTROL
def __bytes__(self) -> bytes:
return self.header(Message.ControlCommand.SUSPEND)
@dataclass
class ExitSuspend(Message):
message_type = Message.MessageType.CONTROL
def __bytes__(self) -> bytes:
return self.header(Message.ControlCommand.EXIT_SUSPEND)
@dataclass
class VirtualCableUnplug(Message):
message_type = Message.MessageType.CONTROL
def __bytes__(self) -> bytes:
return self.header(Message.ControlCommand.VIRTUAL_CABLE_UNPLUG)
@dataclass @dataclass
class SendData(Message): class SendData(Message):
data: bytes data: bytes
@@ -147,12 +173,14 @@ class SendData(Message):
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
class Host(EventEmitter): class Host(EventEmitter):
l2cap_channel: Optional[l2cap.Channel] l2cap_ctrl_channel: Optional[l2cap.ClassicChannel]
l2cap_intr_channel: Optional[l2cap.ClassicChannel]
def __init__(self, device: Device, connection: Connection) -> None: def __init__(self, device: Device, connection: Connection) -> None:
super().__init__() super().__init__()
self.device = device self.device = device
self.connection = connection self.connection = connection
self.l2cap_ctrl_channel = None self.l2cap_ctrl_channel = None
self.l2cap_intr_channel = None self.l2cap_intr_channel = None
@@ -166,8 +194,8 @@ class Host(EventEmitter):
self.l2cap_ctrl_channel = await self.device.l2cap_channel_manager.connect( self.l2cap_ctrl_channel = await self.device.l2cap_channel_manager.connect(
self.connection, HID_CONTROL_PSM self.connection, HID_CONTROL_PSM
) )
except ProtocolError as error: except ProtocolError:
logging.exception(f'L2CAP connection failed: {error}') logging.exception(f'L2CAP connection failed.')
raise raise
assert self.l2cap_ctrl_channel is not None assert self.l2cap_ctrl_channel is not None
@@ -180,8 +208,8 @@ class Host(EventEmitter):
self.l2cap_intr_channel = await self.device.l2cap_channel_manager.connect( self.l2cap_intr_channel = await self.device.l2cap_channel_manager.connect(
self.connection, HID_INTERRUPT_PSM self.connection, HID_INTERRUPT_PSM
) )
except ProtocolError as error: except ProtocolError:
logging.exception(f'L2CAP connection failed: {error}') logging.exception(f'L2CAP connection failed.')
raise raise
assert self.l2cap_intr_channel is not None assert self.l2cap_intr_channel is not None
@@ -193,33 +221,33 @@ class Host(EventEmitter):
raise InvalidStateError('invalid state') raise InvalidStateError('invalid state')
channel = self.l2cap_intr_channel channel = self.l2cap_intr_channel
self.l2cap_intr_channel = None self.l2cap_intr_channel = None
await channel.disconnect() # type: ignore await channel.disconnect()
async def disconnect_control_channel(self) -> None: async def disconnect_control_channel(self) -> None:
if self.l2cap_ctrl_channel is None: if self.l2cap_ctrl_channel is None:
raise InvalidStateError('invalid state') raise InvalidStateError('invalid state')
channel = self.l2cap_ctrl_channel channel = self.l2cap_ctrl_channel
self.l2cap_ctrl_channel = None self.l2cap_ctrl_channel = None
await channel.disconnect() # type: ignore await channel.disconnect()
def on_connection(self, l2cap_channel: l2cap.Channel) -> None: def on_connection(self, l2cap_channel: l2cap.ClassicChannel) -> None:
logger.debug(f'+++ New L2CAP connection: {l2cap_channel}') logger.debug(f'+++ New L2CAP connection: {l2cap_channel}')
l2cap_channel.on('open', lambda: self.on_l2cap_channel_open(l2cap_channel)) l2cap_channel.on('open', lambda: self.on_l2cap_channel_open(l2cap_channel))
def on_l2cap_channel_open(self, l2cap_channel: l2cap.Channel) -> None: def on_l2cap_channel_open(self, l2cap_channel: l2cap.ClassicChannel) -> None:
if l2cap_channel.psm == HID_CONTROL_PSM: if l2cap_channel.psm == HID_CONTROL_PSM:
self.l2cap_ctrl_channel = l2cap_channel # type: ignore self.l2cap_ctrl_channel = l2cap_channel
self.l2cap_ctrl_channel.sink = self.on_ctrl_pdu # type: ignore self.l2cap_ctrl_channel.sink = self.on_ctrl_pdu
else: else:
self.l2cap_intr_channel = l2cap_channel # type: ignore self.l2cap_intr_channel = l2cap_channel
self.l2cap_intr_channel.sink = self.on_intr_pdu # type: ignore self.l2cap_intr_channel.sink = self.on_intr_pdu
logger.debug(f'$$$ L2CAP channel open: {l2cap_channel}') logger.debug(f'$$$ L2CAP channel open: {l2cap_channel}')
def on_ctrl_pdu(self, pdu: bytes) -> None: def on_ctrl_pdu(self, pdu: bytes) -> None:
logger.debug(f'<<< HID CONTROL PDU: {pdu.hex()}') logger.debug(f'<<< HID CONTROL PDU: {pdu.hex()}')
# Here we will receive all kinds of packets, parse and then call respective callbacks # Here we will receive all kinds of packets, parse and then call respective callbacks
message_type = pdu[0] >> 4 message_type = pdu[0] >> 4
param = pdu[0] & 0x0f param = pdu[0] & 0x0F
if message_type == Message.MessageType.HANDSHAKE: if message_type == Message.MessageType.HANDSHAKE:
logger.debug(f'<<< HID HANDSHAKE: {Message.Handshake(param).name}') logger.debug(f'<<< HID HANDSHAKE: {Message.Handshake(param).name}')
@@ -248,28 +276,30 @@ class Host(EventEmitter):
self.emit("data", pdu) self.emit("data", pdu)
def get_report(self, report_type: int, report_id: int, buffer_size: int) -> None: def get_report(self, report_type: int, report_id: int, buffer_size: int) -> None:
msg = GetReportMessage(report_type = report_type , report_id = report_id , buffer_size = buffer_size) msg = GetReportMessage(
report_type=report_type, report_id=report_id, buffer_size=buffer_size
)
hid_message = bytes(msg) hid_message = bytes(msg)
logger.debug(f'>>> HID CONTROL GET REPORT, PDU: {hid_message.hex()}') logger.debug(f'>>> HID CONTROL GET REPORT, PDU: {hid_message.hex()}')
self.send_pdu_on_ctrl(hid_message) # type: ignore self.send_pdu_on_ctrl(hid_message)
def set_report(self, report_type: int, data: bytes): def set_report(self, report_type: int, data: bytes):
msg = SetReportMessage(report_type=report_type, data=data) msg = SetReportMessage(report_type=report_type, data=data)
hid_message = bytes(msg) hid_message = bytes(msg)
logger.debug(f'>>> HID CONTROL SET REPORT, PDU:{hid_message.hex()}') logger.debug(f'>>> HID CONTROL SET REPORT, PDU:{hid_message.hex()}')
self.send_pdu_on_ctrl(hid_message) # type: ignore self.send_pdu_on_ctrl(hid_message)
def get_protocol(self): def get_protocol(self):
msg = GetProtocolMessage() msg = GetProtocolMessage()
hid_message = bytes(msg) hid_message = bytes(msg)
logger.debug(f'>>> HID CONTROL GET PROTOCOL, PDU: {hid_message.hex()}') logger.debug(f'>>> HID CONTROL GET PROTOCOL, PDU: {hid_message.hex()}')
self.send_pdu_on_ctrl(hid_message) # type: ignore self.send_pdu_on_ctrl(hid_message)
def set_protocol(self, protocol_mode: int): def set_protocol(self, protocol_mode: int):
msg = SetProtocolMessage(protocol_mode=protocol_mode) msg = SetProtocolMessage(protocol_mode=protocol_mode)
hid_message = bytes(msg) hid_message = bytes(msg)
logger.debug(f'>>> HID CONTROL SET PROTOCOL, PDU: {hid_message.hex()}') logger.debug(f'>>> HID CONTROL SET PROTOCOL, PDU: {hid_message.hex()}')
self.send_pdu_on_ctrl(hid_message) # type: ignore self.send_pdu_on_ctrl(hid_message)
def send_pdu_on_ctrl(self, msg: bytes) -> None: def send_pdu_on_ctrl(self, msg: bytes) -> None:
self.l2cap_ctrl_channel.send_pdu(msg) # type: ignore self.l2cap_ctrl_channel.send_pdu(msg) # type: ignore
@@ -281,22 +311,22 @@ class Host(EventEmitter):
msg = SendData(data) msg = SendData(data)
hid_message = bytes(msg) hid_message = bytes(msg)
logger.debug(f'>>> HID INTERRUPT SEND DATA, PDU: {hid_message.hex()}') logger.debug(f'>>> HID INTERRUPT SEND DATA, PDU: {hid_message.hex()}')
self.send_pdu_on_intr(hid_message) # type: ignore self.send_pdu_on_intr(hid_message)
def suspend(self): def suspend(self):
header = (Message.MessageType.CONTROL << 4 | Message.ControlCommand.SUSPEND) msg = Suspend()
msg = bytearray([header]) hid_message = bytes(msg)
logger.debug(f'>>> HID CONTROL SUSPEND, PDU:{msg.hex()}') logger.debug(f'>>> HID CONTROL SUSPEND, PDU:{hid_message.hex()}')
self.l2cap_ctrl_channel.send_pdu(msg) # type: ignore self.send_pdu_on_ctrl(msg)
def exit_suspend(self): def exit_suspend(self):
header = (Message.MessageType.CONTROL << 4 | Message.ControlCommand.EXIT_SUSPEND) msg = ExitSuspend()
msg = bytearray([header]) hid_message = bytes(msg)
logger.debug(f'>>> HID CONTROL EXIT SUSPEND, PDU:{msg.hex()}') logger.debug(f'>>> HID CONTROL EXIT SUSPEND, PDU:{hid_message.hex()}')
self.l2cap_ctrl_channel.send_pdu(msg) # type: ignore self.send_pdu_on_ctrl(msg)
def virtual_cable_unplug(self): def virtual_cable_unplug(self):
header = (Message.MessageType.CONTROL << 4 | Message.ControlCommand.VIRTUAL_CABLE_UNPLUG) msg = VirtualCableUnplug()
msg = bytearray([header]) hid_message = bytes(msg)
logger.debug(f'>>> HID CONTROL VIRTUAL CABLE UNPLUG, PDU: {msg.hex()}') logger.debug(f'>>> HID CONTROL VIRTUAL CABLE UNPLUG, PDU: {hid_message.hex()}')
self.l2cap_ctrl_channel.send_pdu(msg) # type: ignore self.send_pdu_on_ctrl(msg)

2
bumble/sdp.py
View File

@@ -229,7 +229,7 @@ class DataElement:
return DataElement(DataElement.UUID, value) return DataElement(DataElement.UUID, value)
@staticmethod @staticmethod
def text_string(value: str) -> DataElement: def text_string(value: bytes) -> DataElement:
return DataElement(DataElement.TEXT_STRING, value) return DataElement(DataElement.TEXT_STRING, value)
@staticmethod @staticmethod

4
examples/hid_report_parser.py
View File

@@ -139,7 +139,9 @@ class Mouse:
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
class ReportParser: class ReportParser:
def parse_input_report(self, input_report: bytes) -> None: # type: ignore
@staticmethod
def parse_input_report(input_report: bytes) -> None:
report_id = input_report[0] # pylint: disable=unsubscriptable-object report_id = input_report[0] # pylint: disable=unsubscriptable-object
report_length = len(input_report) report_length = len(input_report)