rom24-quickmud-python 2.1.0__py3-none-any.whl → 2.1.1__py3-none-any.whl

mud/net/connection.py

@@ -1448,6 +1448,214 @@ async def _select_character(
         await _send_line(conn, "Failed to load that character. Please try again.")
 
 
+async def handle_connection_with_stream(
+    conn: TelnetStream,
+    host_for_ban: str | None = None,
+    connection_type: str = "Telnet",
+) -> None:
+    """
+    Handle a connection using a pre-created stream object (TelnetStream or SSHStream).
+    
+    This function is used by SSH and other connection types that create their own
+    stream wrapper before calling the connection handler.
+    
+    Args:
+        conn: Pre-created TelnetStream or SSHStream object
+        host_for_ban: IP address for ban checking (optional)
+        connection_type: Type of connection for logging (default: "Telnet")
+    """
+    session = None
+    char = None
+    account: PlayerAccount | None = None
+    username = ""
+    
+    # Set peer host if not already set
+    if host_for_ban and not conn.peer_host:
+        conn.peer_host = host_for_ban
+    
+    permit_banned = bool(host_for_ban and bans.is_host_banned(host_for_ban, BanFlag.PERMIT))
+    newbie_banned = bool(host_for_ban and bans.is_host_banned(host_for_ban, BanFlag.NEWBIES))
+    qmconfig = get_qmconfig()
+
+    try:
+        if host_for_ban and bans.is_host_banned(host_for_ban, BanFlag.ALL):
+            await conn.send_line("Your site has been banned from this mud.")
+            return
+
+        await conn.negotiate()
+        if qmconfig.ansiprompt:
+            ansi_result = await _prompt_ansi_preference(conn)
+            if ansi_result is None:
+                return
+            ansi_preference, ansi_explicit = ansi_result
+        else:
+            ansi_preference = qmconfig.ansicolor
+            ansi_explicit = False
+        conn.set_ansi(ansi_preference)
+        await _send_help_greeting(conn)
+
+        login_result = await _run_account_login(conn, host_for_ban)
+        if not login_result:
+            return
+        account, username, was_reconnect = login_result
+
+        selection = await _select_character(
+            conn,
+            account,
+            username,
+            permit_banned=permit_banned,
+            newbie_banned=newbie_banned,
+        )
+        if selection is None:
+            return
+
+        char, is_creation = selection
+        if char is None:
+            return
+
+        if is_creation and not was_reconnect:
+            if account.id:
+                char.account_id = account.id
+                char.account_name = username
+            try:
+                save_character(char)
+            except Exception as exc:
+                print(f"[ERROR] Failed to save newly created character: {exc}")
+
+        char.connection = conn
+        char.desc = conn
+        
+        # Create a mock StreamReader for SSH connections (Session requires it but SSH doesn't use it)
+        mock_reader = asyncio.StreamReader()
+        
+        session = Session(
+            name=char.name or "",
+            character=char,
+            reader=mock_reader,
+            connection=conn,
+            account_name=username,
+            ansi_enabled=conn.ansi_enabled,
+        )
+        SESSIONS[char.name] = session
+
+        print(f"[{connection_type}] {char.name} entered the game")
+        
+        # Send welcome messages
+        try:
+            if is_creation:
+                # New character - send MOTD and newbie help
+                await send_to_char(char, "Character created successfully!")
+                if _should_send_newbie_help(char):
+                    await _send_newbie_help(char)
+            elif was_reconnect:
+                await send_to_char(char, RECONNECT_MESSAGE)
+            
+            # Announce login
+            note_reminder = _announce_login_or_reconnect(char, host_for_ban, was_reconnect)
+            if was_reconnect and note_reminder:
+                await send_to_char(
+                    char,
+                    "You have a note in progress. Type NWRITE to continue it.",
+                )
+        except Exception as exc:
+            print(f"[ERROR] Failed to send welcome messages for {session.name}: {exc}")
+
+        # Send initial room look
+        try:
+            if char.room:
+                response = process_command(char, "look")
+                await send_to_char(char, response)
+            else:
+                await send_to_char(char, "You are floating in a void...")
+        except Exception as exc:
+            print(f"[ERROR] Failed to send initial look: {exc}")
+            await send_to_char(char, "Welcome to the world!")
+
+        # Main game loop
+        while True:
+            try:
+                await asyncio.sleep(0.1)
+                if not char or not char.room:
+                    break
+
+                if session.command_queue:
+                    try:
+                        cmd = session.command_queue.pop(0)
+                        result = await interpret_command(char, cmd)
+                        if result and len(result) < 6000:
+                            await send_to_char(char, result)
+                        elif result:
+                            await send_to_char(
+                                char,
+                                "Sorry, there was an error processing that command.",
+                            )
+                    except Exception as exc:
+                        print(f"[ERROR] Command execution error: {exc}")
+                        await send_to_char(
+                            char,
+                            "Sorry, there was an error processing that command.",
+                        )
+
+                while char and char.messages:
+                    try:
+                        msg = char.messages.pop(0)
+                        await send_to_char(char, msg)
+                    except Exception as exc:
+                        print(f"[ERROR] Failed to send message: {exc}")
+                        break
+
+            except asyncio.CancelledError:
+                break
+            except Exception as exc:
+                print(f"[ERROR] Connection loop error for {session.name if session else 'unknown'}: {exc}")
+                break
+
+    except Exception as exc:
+        print(f"[ERROR] {connection_type} connection handler error: {exc}")
+    finally:
+        forced_disconnect = bool(session and getattr(session, "_forced_disconnect", False))
+        try:
+            if char and not forced_disconnect:
+                announce_wiznet_logout(char)
+        except Exception as exc:
+            print(f"[ERROR] Failed to announce wiznet logout for {session.name if session else 'unknown'}: {exc}")
+
+        try:
+            if char and not forced_disconnect:
+                save_character(char)
+        except Exception as exc:
+            print(f"[ERROR] Failed to save character: {exc}")
+
+        try:
+            if char and char.room and not forced_disconnect:
+                char.room.remove_character(char)
+        except Exception as exc:
+            print(f"[ERROR] Failed to remove character from room: {exc}")
+
+        if session and not forced_disconnect and session.name in SESSIONS:
+            SESSIONS.pop(session.name, None)
+
+        if char:
+            if not forced_disconnect:
+                char.desc = None
+                try:
+                    char.account_name = ""
+                except Exception:
+                    pass
+                if getattr(char, "connection", None) is conn:
+                    char.connection = None
+
+        if username and not forced_disconnect:
+            release_account(username)
+
+        try:
+            await conn.close()
+        except Exception as exc:
+            print(f"[ERROR] Failed to close connection: {exc}")
+
+        print(f"[{connection_type} DISCONNECT] {session.name if session else 'unknown'}")
+
+
 async def handle_connection(reader: asyncio.StreamReader, writer: asyncio.StreamWriter) -> None:
     addr = writer.get_extra_info("peername")
     host_for_ban: str | None = None

{rom24_quickmud_python-2.1.0.dist-info → rom24_quickmud_python-2.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rom24-quickmud-python
-Version: 2.1.0
+Version: 2.1.1
 Summary: A modern Python port of the ROM 2.4b6 MUD engine with full telnet server and JSON world loading
 Author-email: Mark Jedrzejczyk <mark.jedrzejczyk@gmail.com>
 Maintainer-email: Mark Jedrzejczyk <mark.jedrzejczyk@gmail.com>
@@ -158,7 +158,7 @@ python -m mud  # Start development server
 
 ## 🎯 Project Status
 
-- **Version**: 2.1.0 (Production Ready)
+- **Version**: 2.1.1 (Production Ready)
 - **ROM 2.4b Parity**: 100% (227/227 behavioral tests passing)
 - **ROM C Function Coverage**: 96.1% (716/745 functions mapped)
 - **Test Coverage**: 1435/1436 tests passing (99.93% success rate)

{rom24_quickmud_python-2.1.0.dist-info → rom24_quickmud_python-2.1.1.dist-info}/RECORD

@@ -159,7 +159,7 @@ mud/models/social_json.py,sha256=_dir6JDEMN3m4qERdbX4xveoga-YdRic7tLhpiHCfK4,447
 mud/music/__init__.py,sha256=QKXSuF6XcqoR22e9qAKjK8cYL2H0MveikdlF1cwA0_A,4435
 mud/net/__init__.py,sha256=LHCpGaVl9a5SqH396-1yngVEyNZSxWmaT62d-Ry5sms,178
 mud/net/ansi.py,sha256=ron4xslwKoAM2Y1tkfYHTL8tXiXkHyVv5cDEfyyrFaw,1128
-mud/net/connection.py,sha256=TH7fT1rW5A47W164J_IuWfxdf1Au55FTqiKtZ0M-rVQ,58602
+mud/net/connection.py,sha256=NOjOxTeNZ48L9o-6wmnRRF4FEfj3wEnKJePRdG7uMHI,66203
 mud/net/protocol.py,sha256=ImgMHwTcxYD2xgQ5SNOsGhiu7FwtB-pfms1KE4hCeXY,2760
 mud/net/session.py,sha256=U09R5agaguFqJNn6IoUbVNYvW2BhumHA1Q5xhgTaIr0,4779
 mud/net/ssh_server.py,sha256=sg5G3npy5lG96SgyHzE6Yl1I-Xgya05-LDAKmut0lmo,10629
@@ -200,9 +200,9 @@ mud/world/movement.py,sha256=Y7it7pXrPORgKyy2tRB8br_kb4-s9UK-gj0N-E2U9oM,18695
 mud/world/obj_find.py,sha256=7QjVAhA-XEqAEm0CoanNtBuYj6rKijNSu8Vu1JcueMY,4304
 mud/world/vision.py,sha256=q8VjzSzm0cbNrHX6-o0j1UG-jlcM3Z9bzUxK6T-Bsi8,9862
 mud/world/world_state.py,sha256=W9ABMADlY5H-ZmywACsryFKZp34OufjzMRD6WT331qg,7917
-rom24_quickmud_python-2.1.0.dist-info/licenses/LICENSE,sha256=anQ2j9As6sIC8tZgQCXbo0-09JDH9vPiqhA9djnOvkY,1078
-rom24_quickmud_python-2.1.0.dist-info/METADATA,sha256=Vyf_RX2VhMNrNaGACOcc0QkCYAAbd0SiMjojtL9wPW8,13934
-rom24_quickmud_python-2.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rom24_quickmud_python-2.1.0.dist-info/entry_points.txt,sha256=VFru08UQTXZA_CkK-NBjJmWHyEX5a3864fQHjhaojbw,41
-rom24_quickmud_python-2.1.0.dist-info/top_level.txt,sha256=Fk1WPmabIIjp7_iZXLYpbAVqiq7lG7TeAHt30AsOKtQ,4
-rom24_quickmud_python-2.1.0.dist-info/RECORD,,
+rom24_quickmud_python-2.1.1.dist-info/licenses/LICENSE,sha256=anQ2j9As6sIC8tZgQCXbo0-09JDH9vPiqhA9djnOvkY,1078
+rom24_quickmud_python-2.1.1.dist-info/METADATA,sha256=TdN0k96Tz-z5rx3ZmAvbYpsOKBXeiH5ttdRI0j4XYwA,13934
+rom24_quickmud_python-2.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rom24_quickmud_python-2.1.1.dist-info/entry_points.txt,sha256=VFru08UQTXZA_CkK-NBjJmWHyEX5a3864fQHjhaojbw,41
+rom24_quickmud_python-2.1.1.dist-info/top_level.txt,sha256=Fk1WPmabIIjp7_iZXLYpbAVqiq7lG7TeAHt30AsOKtQ,4
+rom24_quickmud_python-2.1.1.dist-info/RECORD,,