Skip to content

bugfix telnet server: prompt app not cancelled when client close connection #1585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

bugfix telnet server: prompt app not cancelled when client close connection #1585

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions prompt_toolkit/contrib/telnet/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ def __init__(self, connection: socket.socket, encoding: str) -> None:
self._connection = connection
self._errors = "strict"
self._buffer: List[bytes] = []
self._closed = False

def write(self, data: str) -> None:
data = data.replace("\n", "\r\n")
Expand All @@ -98,12 +99,16 @@ def isatty(self) -> bool:

def flush(self) -> None:
try:
self._connection.send(b"".join(self._buffer))
if not self._closed:
self._connection.send(b"".join(self._buffer))
except OSError as e:
logger.warning("Couldn't send data over socket: %s" % e)

self._buffer = []

def close(self) -> None:
self._closed = True

@property
def encoding(self) -> str:
return self._encoding
Expand Down Expand Up @@ -137,6 +142,7 @@ def __init__(
self._closed = False
self._ready = asyncio.Event()
self.vt100_output = None
self._task: Any = None

# Create "Output" object.
self.size = Size(rows=40, columns=79)
Expand Down Expand Up @@ -186,6 +192,9 @@ def handle_incoming_data() -> None:
# Connection closed by client.
logger.info("Connection closed by client. %r %r" % self.addr)
self.close()
# to abort the prompt app
if self._task:
self._task.cancel()

# Add reader.
loop = get_event_loop()
Expand All @@ -196,7 +205,10 @@ def handle_incoming_data() -> None:
await self._ready.wait()
with create_app_session(input=self.vt100_input, output=self.vt100_output):
self.context = contextvars.copy_context()
await self.interact(self)
self._task = get_event_loop().create_task(self.interact(self))
if self._task:
await self._task
self._task = None
except Exception as e:
print("Got %s" % type(e).__name__, e)
import traceback
Expand All @@ -222,6 +234,7 @@ def close(self) -> None:
self.vt100_input.close()
get_event_loop().remove_reader(self.conn)
self.conn.close()
self.stdout.close()

def send(self, formatted_text: AnyFormattedText) -> None:
"""
Expand Down