From 3897d97696de6224f304f3b1c68f283b2a20795d Mon Sep 17 00:00:00 2001
From: Cambridge Yang <jq_yang@mit.edu>
Date: Fri, 3 Apr 2020 10:48:52 -0400
Subject: [PATCH] reconnect paired device

---
 joycontrol/server.py  | 45 ++++++++++++++++++++++++++++++-------------
 run_controller_cli.py | 12 +++++-------
 2 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/joycontrol/server.py b/joycontrol/server.py
index a680f02..8000177 100644
--- a/joycontrol/server.py
+++ b/joycontrol/server.py
@@ -16,12 +16,25 @@ logger = logging.getLogger(__name__)
 
 async def _send_empty_input_reports(transport):
     report = InputReport()
-
     while True:
         await transport.write(report)
         await asyncio.sleep(1)
 
 
+async def _run_protocol_on_connection(protocol, client_itr, capture_file=None):
+    transport = L2CAP_Transport(asyncio.get_event_loop(), protocol, client_itr, 50, capture_file=capture_file)
+    protocol.connection_made(transport)
+
+    # send some empty input reports until the Switch decides to reply
+    future = asyncio.ensure_future(_send_empty_input_reports(transport))
+    await protocol.wait_for_output_report()
+    future.cancel()
+    try:
+        await future
+    except asyncio.CancelledError:
+        pass
+
+
 async def create_hid_server(protocol_factory, ctl_psm=17, itr_psm=19, device_id=None, capture_file=None):
     """
     :param protocol_factory: Factory function returning a ControllerProtocol instance
@@ -96,20 +109,26 @@ async def create_hid_server(protocol_factory, ctl_psm=17, itr_psm=19, device_id=
     # stop advertising
     hid.discoverable(False)
 
-    await run_protocol_on_connection(protocol, client_itr, capture_file=capture_file)
+    await _run_protocol_on_connection(protocol, client_itr, capture_file=capture_file)
 
     return protocol.transport, protocol
 
 
-async def run_protocol_on_connection(protocol, client_itr, capture_file=None):
-    transport = L2CAP_Transport(asyncio.get_event_loop(), protocol, client_itr, 50, capture_file=capture_file)
-    protocol.connection_made(transport)
+async def create_reconnection(protocol_factory, console_bt_addr, ctl_psm=17, itr_psm=19, capture_file=None):
+    """Setup a running protocal by reconnecting to a pairsed console.
+    
+    :param console_bt_addr: a bluetooth address for the Switch console.
+    :param *args, **kwargs: see `create_hid_server`, except that `create_reconnection` does not require device_id.
+    :returns: see `create_hid_server`
+    """
+    protocol = protocol_factory()
+    client_ctl = socket.socket(socket.AF_BLUETOOTH, socket.SOCK_SEQPACKET, socket.BTPROTO_L2CAP)
+    client_itr = socket.socket(socket.AF_BLUETOOTH, socket.SOCK_SEQPACKET, socket.BTPROTO_L2CAP)
+    client_ctl.connect((console_bt_addr, ctl_psm))
+    client_itr.connect((console_bt_addr, itr_psm))
+    client_ctl.setblocking(False)
+    client_itr.setblocking(False)
 
-    # send some empty input reports until the Switch decides to reply
-    future = asyncio.ensure_future(_send_empty_input_reports(transport))
-    await protocol.wait_for_output_report()
-    future.cancel()
-    try:
-        await future
-    except asyncio.CancelledError:
-        pass
+    await _run_protocol_on_connection(protocol, client_itr)
+    transport = protocol.transport
+    return transport, protocol
diff --git a/run_controller_cli.py b/run_controller_cli.py
index 2550924..70ed769 100644
--- a/run_controller_cli.py
+++ b/run_controller_cli.py
@@ -10,7 +10,8 @@ from joycontrol.command_line_interface import ControllerCLI
 from joycontrol.controller import Controller
 from joycontrol.memory import FlashMemory
 from joycontrol.protocol import controller_protocol_factory
-from joycontrol.server import create_hid_server, run_protocol_on_connection
+from joycontrol.server import create_hid_server, create_reconnection
+from joycontrol.report import InputReport
 
 logger = logging.getLogger(__name__)
 
@@ -22,12 +23,9 @@ async def _main(controller, console_bt_addr=None, capture_file=None, spi_flash=N
         transport, protocol = await create_hid_server(factory, 
             ctl_psm=ctl_psm, itr_psm=itr_psm, capture_file=capture_file, device_id=device_id)
     else:
-        protocol = factory()
-        client_ctl = socket.socket(socket.AF_BLUETOOTH, socket.SOCK_SEQPACKET, socket.BTPROTO_L2CAP)
-        # client_ctl.setblocking(False)
-        client_ctl.connect((console_bt_addr, ctl_psm))
-        await run_protocol_on_connection(protocol, client_ctl)
-        transport = protocol.transport
+        transport, protocol = await create_reconnection(factory, 
+            console_bt_addr,
+            ctl_psm=ctl_psm, itr_psm=itr_psm, capture_file=capture_file)
 
     controller_state = protocol.get_controller_state()