From 2c0180760e71440fe6fdd68ce55fbad1e23caadf Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 5 May 2025 21:03:14 +1000
Subject: [PATCH] micropython/aiorepl: Use blocking reads for raw_repl.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 micropython/aiorepl/aiorepl.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/micropython/aiorepl/aiorepl.py b/micropython/aiorepl/aiorepl.py
index 8f45dfac0..a7bfc85be 100644
--- a/micropython/aiorepl/aiorepl.py
+++ b/micropython/aiorepl/aiorepl.py
@@ -161,7 +161,7 @@ async def task(g=None, prompt="--> "):
                                 cmd = cmd[:-1]
                                 sys.stdout.write("\x08 \x08")
                     elif c == CHAR_CTRL_A:
-                        await raw_repl(s, g)
+                        await raw_repl(g)
                         break
                     elif c == CHAR_CTRL_B:
                         continue
@@ -239,7 +239,7 @@ async def task(g=None, prompt="--> "):
         micropython.kbd_intr(3)
 
 
-async def raw_paste(s, g, window=512):
+def raw_paste(window=512):
     sys.stdout.write("R\x01")  # supported
     sys.stdout.write(bytearray([window & 0xFF, window >> 8, 0x01]).decode())
     eof = False
@@ -248,7 +248,7 @@ async def raw_paste(s, g, window=512):
     file = b""
     while not eof:
         for idx in range(window):
-            b = await s.read(1)
+            b = sys.stdin.read(1)
             c = ord(b)
             if c == CHAR_CTRL_C or c == CHAR_CTRL_D:
                 # end of file
@@ -267,7 +267,12 @@ async def raw_paste(s, g, window=512):
     return file
 
 
-async def raw_repl(s: asyncio.StreamReader, g: dict):
+async def raw_repl(g: dict):
+    """
+    This function is blocking to prevent other
+    async tasks from writing to the stdio stream and
+    breaking the raw repl session.
+    """
     heading = "raw REPL; CTRL-B to exit\n"
     line = ""
     sys.stdout.write(heading)
@@ -276,7 +281,7 @@ async def raw_repl(s: asyncio.StreamReader, g: dict):
         line = ""
         sys.stdout.write(">")
         while True:
-            b = await s.read(1)
+            b = sys.stdin.read(1)
             c = ord(b)
             if c == CHAR_CTRL_A:
                 rline = line
@@ -284,7 +289,7 @@ async def raw_repl(s: asyncio.StreamReader, g: dict):
 
                 if len(rline) == 2 and ord(rline[0]) == CHAR_CTRL_E:
                     if rline[1] == "A":
-                        line = await raw_paste(s, g)
+                        line = raw_paste()
                         break
                 else:
                     # reset raw REPL