replx 1.5__tar.gz → 1.6__tar.gz

{replx-1.5/replx.egg-info → replx-1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: replx
-Version: 1.5
+Version: 1.6
 Summary: replx is a fast, modern MicroPython CLI: turbo REPL, robust file sync (put/get), project install, mpy-cross integration, and smart port discovery.
 Author-email: "chanmin.park" <devcamp@gmail.com>
 License-Expression: MIT

{replx-1.5 → replx-1.6}/replx/__init__.py

@@ -1,5 +1,5 @@
 __all__ = ["__version__", "get_version", "__description__"]
-__version__ = "1.5"
+__version__ = "1.6"
 __description__ = "Fast, modern MicroPython CLI with REPL, file sync, install, and smart port detection."
 __author__ = "PlanX Lab Development Team"
 

{replx-1.5 → replx-1.6}/replx/cli/agent/server/connection_manager.py

@@ -455,6 +455,10 @@ class ConnectionManager:
 
             conn = self._connections.pop(key)
 
+        # Remember whether a detached (user) script was running before clearing the flag.
+        # If so, the device is executing paste-mode code on its UART, NOT in raw REPL.
+        # Sending CTRL_B in that state would inject \x02 into the running script's stdin.
+        was_detached = conn.is_detached()
         conn.stop_detached()
 
         if conn.repl.active:
@@ -469,8 +473,11 @@ class ConnectionManager:
                 transport = conn.repl_protocol.transport
                 if transport:
                     try:
-                        transport.write(CTRL_B)
-                        time.sleep(0.1 if sys.platform == 'win32' else 0.05)
+                        if not was_detached:
+                            # Only send CTRL_B to leave raw REPL when no user script
+                            # was running; otherwise the byte contaminates the script stdin.
+                            transport.write(CTRL_B)
+                            time.sleep(0.1 if sys.platform == 'win32' else 0.05)
                     except Exception:
                         pass
                     transport.close()

{replx-1.5 → replx-1.6}/replx/cli/commands/exec.py

@@ -344,13 +344,11 @@ By default, runs a file from your computer. Use -d to run from device.
                     if stream_type == "stderr":
                         stderr_buffer.extend(data)
                     else:
-                        # Normalize line endings for all platforms
                         if not IS_WINDOWS:
-                            # Unix: CR+LF -> LF, then remove standalone CR
-                            data = data.replace(b'\r\n', b'\n')
-                            data = data.replace(b'\r', b'')
+                            data = data.replace(b'\r\n', b'\n')  # CRLF -> LF
+                            data = data.replace(b'\r', b'\n')    # lone CR -> LF
+                            data = data.replace(b'\n', b'\r\n')  # LF -> CRLF
                         else:
-                            # Windows: just remove CR (terminal handles LF)
                             data = data.replace(b'\r', b'')
                         
                         if data:

{replx-1.5 → replx-1.6/replx.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: replx
-Version: 1.5
+Version: 1.6
 Summary: replx is a fast, modern MicroPython CLI: turbo REPL, robust file sync (put/get), project install, mpy-cross integration, and smart port discovery.
 Author-email: "chanmin.park" <devcamp@gmail.com>
 License-Expression: MIT

replx-1.6/test/test_termio.py

@@ -0,0 +1,70 @@
+from termio import ReplSerial
+from utools import rand, clamp, intervalChecker
+import time
+
+
+def new_token() -> str:
+    return f"{rand(4):08x}"   # 예: "a3f2c1b4"
+
+
+with ReplSerial(timeout=0) as ser:
+    token        = new_token()
+    authed       = False
+    every_sess   = intervalChecker(1000)   # 미인증: 1초마다 SESSION 재전송
+    heartbeat    = intervalChecker(5000)   # 인증 후: 5초마다 ALIVE
+
+    # 최초 토큰 전송
+    ser.write(f"SESSION={token}\r\n".encode())
+
+    while True:
+        # timeout=0이므로 \r\n이 두 pump 사이클에 걸려 도착할 수 있음 → b"\n" 사용
+        line = ser.read_until(b"\n", max_size=64)
+        if line and line.endswith(b"\n"):
+            cmd = line.decode("utf-8", "replace").strip()
+
+            # 인증 (항상 허용)
+            if cmd.startswith("AUTH "):
+                if cmd[5:] == token:
+                    authed = True
+                    ser.write(b"OK authenticated\r\n")
+                else:
+                    authed = False
+                    ser.write(b"ERR wrong token\r\n")
+
+            # 미인증 요청 거부
+            elif not authed:
+                ser.write(b"ERR not authenticated\r\n")
+
+            # 인증 후 커맨드
+            elif cmd.startswith("SET_PWM:"):
+                try:
+                    duty = clamp(int(cmd[8:]), 0, 100)
+                    # pwm.duty(int(duty * 655.35))  # 0–100% → 0–65535
+                    ser.write(f"OK pwm={duty}%\r\n".encode())
+                except (ValueError, TypeError):
+                    ser.write(b"ERR bad value\r\n")
+
+            elif cmd.startswith("SET_FREQ:"):
+                try:
+                    freq = clamp(int(cmd[9:]), 1, 20_000)
+                    # pwm.freq(freq)
+                    ser.write(f"OK freq={freq}Hz\r\n".encode())
+                except (ValueError, TypeError):
+                    ser.write(b"ERR bad value\r\n")
+
+            elif cmd == "RESET_SESSION":
+                token  = new_token()
+                authed = False
+                every_sess = intervalChecker(1000)
+                ser.write(f"SESSION={token}\r\n".encode())
+
+            else:
+                ser.write(b"ERR unknown cmd\r\n")
+
+        # 주기적 전송 (커맨드 수신 여부와 무관)
+        if not authed and every_sess():
+            ser.write(f"SESSION={token}\r\n".encode())
+        elif authed and heartbeat():
+            ser.write(b"ALIVE\r\n")
+
+        time.sleep_ms(10)

replx-1.5/test/test_termio.py

@@ -1,42 +0,0 @@
-from termio import ReplSerial
-import time
-
-
-def discard_until_eol(ser, eol=b"\r\n", max_size=64):
-    """너무 긴 줄로 잘린 뒤, 다음 개행(\r\n)이 나타날 때까지 남은 바이트를 버립니다."""
-    old_timeout = ser.timeout
-    ser.timeout = 0.15
-    try:
-        while True:
-            chunk = ser.read_until(eol, max_size=max_size)
-            if not chunk:
-                # 타임아웃: 버퍼에 남은 조각이 있으면 read()로 비운 뒤 재시도합니다.
-                n = ser.in_waiting
-                if n:
-                    ser.read(n)
-                    continue
-                return
-            if chunk.endswith(eol):
-                return
-    finally:
-        ser.timeout = old_timeout
-
-
-with ReplSerial(timeout=0.1) as ser:
-    while True:
-        line = ser.read_until(b"\r\n", max_size=64)
-        if not line:
-            time.sleep_ms(10)
-            continue
-
-        if not line.endswith(b"\r\n"):
-            # max_size(64)로 잘려 나온 경우 → 나머지 조각을 버리고 다음 줄부터 다시 맞춥니다.
-            print("too long line -> discard")
-            discard_until_eol(ser, b"\r\n", max_size=64)
-            continue
-
-        cmd = line[:-2].decode("utf-8", "replace")
-        print("cmd=", cmd)
-        ser.write(("OK:" + cmd + "\r\n").encode("utf-8"))
-        if cmd == "quit":
-            break