TCP handling logic cleanup

Author: ZipFile

examples/async_server.py

@@ -1,7 +1,8 @@
+import asyncio
 import sys
-from pythonosc.osc_server import AsyncIOOSCUDPServer
+
 from pythonosc.dispatcher import Dispatcher
-import asyncio
+from pythonosc.osc_server import AsyncIOOSCUDPServer
 
 
 def filter_handler(address, *args):

examples/async_simple_tcp_client.py

@@ -7,8 +7,8 @@
 
 import argparse
 import asyncio
+import logging
 import random
-import sys
 
 from pythonosc import tcp_client
 
@@ -47,10 +47,6 @@ async def init_main():
             tg.create_task(send_messages(client))
 
 
-if sys.version_info >= (3, 7):
-    asyncio.run(init_main())
-else:
-    # TODO(python-upgrade): drop this once 3.6 is no longer supported
-    event_loop = asyncio.get_event_loop()
-    event_loop.run_until_complete(init_main())
-    event_loop.close()
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.DEBUG)
+    asyncio.run(init_main(), debug=True)

examples/async_tcp_server.py

@@ -1,6 +1,6 @@
 import argparse
 import asyncio
-import sys
+import logging
 
 from pythonosc.dispatcher import Dispatcher
 from pythonosc.osc_tcp_server import AsyncOSCTCPServer
@@ -42,10 +42,6 @@ async def init_main():
             tg.create_task(loop())
 
 
-if sys.version_info >= (3, 7):
-    asyncio.run(init_main())
-else:
-    # TODO(python-upgrade): drop this once 3.6 is no longer supported
-    event_loop = asyncio.get_event_loop()
-    event_loop.run_until_complete(init_main())
-    event_loop.close()
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.DEBUG)
+    asyncio.run(init_main(), debug=True)

examples/simple_tcp_client.py

@@ -5,11 +5,16 @@
 """
 
 import argparse
+import logging
 import random
+from random import randint
+from zlib import crc32
 
 from pythonosc import tcp_client
+from pythonosc.osc_tcp_server import FRAMING_BY_MODE, MODE_1_1
 
 if __name__ == "__main__":
+    logging.basicConfig(level=logging.DEBUG)
     parser = argparse.ArgumentParser()
     parser.add_argument("--ip", default="127.0.0.1", help="The ip of the OSC server")
     parser.add_argument(
@@ -27,6 +32,9 @@
             n = random.random()
             print(f"Sending /filter {n}")
             client.send_message("/filter", n)
+            data = bytes(random.randint(0, 255) for i in range(randint(1, 10000)))
+            print(f"Sending /crc {len(data)} bytes (should be {crc32(data):08X})")
+            client.send_message("/crc", data)
             resp = client.get_messages(1)
             for r in resp:
                 try:

examples/simple_tcp_server.py

@@ -5,7 +5,9 @@
 """
 
 import argparse
+import logging
 import math
+from zlib import crc32
 
 from pythonosc import osc_tcp_server
 from pythonosc.dispatcher import Dispatcher
@@ -23,6 +25,7 @@ def print_compute_handler(unused_addr, args, volume):
 
 
 if __name__ == "__main__":
+    logging.basicConfig(level=logging.DEBUG)
     parser = argparse.ArgumentParser()
     parser.add_argument("--ip", default="127.0.0.1", help="The ip to listen on")
     parser.add_argument("--port", type=int, default=5005, help="The port to listen on")
@@ -36,6 +39,7 @@ def print_compute_handler(unused_addr, args, volume):
 
     dispatcher = Dispatcher()
     dispatcher.map("/filter", print)
+    dispatcher.map("/crc", lambda _, v: f"{crc32(v):08X}")
     dispatcher.map("/volume", print_volume_handler, "Volume")
     dispatcher.map("/logvolume", print_compute_handler, "Log volume", math.log)