ChaTerminal 2.0.0__tar.gz → 2.0.1__tar.gz

{chaterminal-2.0.0 → chaterminal-2.0.1}/ChaTerminal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ChaTerminal
-Version: 2.0.0
+Version: 2.0.1
 Summary: A terminal-based encrypted chat system for MemerDevs
 Home-page: https://github.com/Gofaone315/ChaTerminal
 Author: Gofaone Tlalang

chaterminal-2.0.1/ChaTerminal.egg-info/SOURCES.txt

@@ -0,0 +1,33 @@
+LICENSE
+README.md
+setup.py
+ChaTerminal.egg-info/PKG-INFO
+ChaTerminal.egg-info/SOURCES.txt
+ChaTerminal.egg-info/dependency_links.txt
+ChaTerminal.egg-info/entry_points.txt
+ChaTerminal.egg-info/requires.txt
+ChaTerminal.egg-info/top_level.txt
+chaterminal/__init__.py
+chaterminal/__main__.py
+chaterminal/main.py
+chaterminal/core/__init__.py
+chaterminal/core/events.py
+chaterminal/core/logger.py
+chaterminal/core/state.py
+chaterminal/core/threads.py
+chaterminal/crypto/__init__.py
+chaterminal/crypto/encryption.py
+chaterminal/services/__init__.py
+chaterminal/services/auth_service.py
+chaterminal/services/firebase_service.py
+chaterminal/services/message_service.py
+chaterminal/services/presence_service.py
+chaterminal/services/websocket_service.py
+chaterminal/storage/__init__.py
+chaterminal/storage/database.py
+chaterminal/storage/session_store.py
+chaterminal/ui/__init__.py
+chaterminal/ui/console.py
+chaterminal/ui/panels.py
+chaterminal/ui/splash.py
+chaterminal/ui/terminal_ui.py

chaterminal-2.0.1/ChaTerminal.egg-info/top_level.txt

@@ -0,0 +1 @@
+chaterminal

{chaterminal-2.0.0 → chaterminal-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ChaTerminal
-Version: 2.0.0
+Version: 2.0.1
 Summary: A terminal-based encrypted chat system for MemerDevs
 Home-page: https://github.com/Gofaone315/ChaTerminal
 Author: Gofaone Tlalang

{chaterminal-2.0.0/ChaTerminal → chaterminal-2.0.1/chaterminal}/core/events.py

@@ -12,3 +12,11 @@ class EventType(Enum):
 def put_event(state, event_type: EventType, **kwargs):
     kwargs["type"] = event_type
     state.event_queue.put(kwargs)
+
+    if event_type == EventType.LOGOUT:
+        wake_prompt = getattr(state, "wake_prompt", None)
+        if callable(wake_prompt):
+            try:
+                wake_prompt()
+            except Exception:
+                pass

{chaterminal-2.0.0/ChaTerminal → chaterminal-2.0.1/chaterminal}/core/state.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass, field
+from collections.abc import Callable
 from queue import Queue
 import threading
 
@@ -17,3 +18,4 @@ class AppState:
 
     event_queue: Queue = field(default_factory=Queue)
     lock: threading.Lock = field(default_factory=threading.Lock)
+    wake_prompt: Callable[[], None] | None = None

{chaterminal-2.0.0/ChaTerminal → chaterminal-2.0.1/chaterminal}/main.py

@@ -65,6 +65,7 @@ def main():
     worker_manager = WorkerManager(state)
     worker_manager.start("WebsocketClient", ws_service.run)
     worker_manager.start("Heartbeat", presence.heartbeat_loop)
+    worker_manager.start("SessionGuard", presence.session_guard_loop)
     worker_manager.start("MessageSender", message_service.sender_worker)
 
     # 7. Run UI - single-threaded, blocks until /exit or Ctrl+C

{chaterminal-2.0.0/ChaTerminal → chaterminal-2.0.1/chaterminal}/services/auth_service.py

@@ -14,17 +14,21 @@ class AuthService:
         session = load_session()
 
         if session:
-            self.state.token = session.get("idToken")
-            self.state.refresh_token = session.get("refreshToken")
-            self.state.uid = session.get("localId")
-            self.state.token_expires_at = session.get("expiresAt", 0)
+            self._apply_session(session)
 
             if self.state.token_expires_at <= int(time.time()):
                 logger.info("[*] Refreshing session...")
                 if not self.firebase.refresh_token():
                     delete_session()
+                    self._clear_session()
                     session = None
 
+            if session and not self._stored_session_is_active():
+                logger.info("[*] Stored ChaTerminal session was revoked. Relinking required.")
+                delete_session()
+                self._clear_session()
+                session = None
+
         if not session:
             code = self._generate_activation_code()
             if not code:
@@ -72,6 +76,46 @@ class AuthService:
             
         return True
 
+    def _apply_session(self, session):
+        self.state.token = session.get("idToken")
+        self.state.refresh_token = session.get("refreshToken")
+        self.state.uid = session.get("localId")
+        self.state.token_expires_at = session.get("expiresAt", 0)
+
+    def _clear_session(self):
+        self.state.token = None
+        self.state.refresh_token = None
+        self.state.uid = None
+        self.state.token_expires_at = 0
+
+    def _stored_session_is_active(self):
+        try:
+            res = self.firebase.get(f"chaterminal/sessions/{self.state.uid}")
+        except Exception as e:
+            logger.error(f"[!] Failed to validate stored session: {e}")
+            return True
+
+        if res.status_code in (401, 403):
+            return False
+
+        if res.status_code != 200:
+            logger.error(f"[!] Failed to validate stored session: {res.status_code} {res.text}")
+            return True
+
+        if res.text.strip() == "null":
+            return False
+
+        try:
+            data = res.json()
+        except Exception:
+            return False
+
+        if not isinstance(data, dict):
+            return False
+
+        active_device_id = data.get("activeDeviceId")
+        return bool(active_device_id and active_device_id == self.state.device_id)
+
     def _generate_activation_code(self):
         alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
         attempts = 0

{chaterminal-2.0.0/ChaTerminal → chaterminal-2.0.1/chaterminal}/services/presence_service.py

@@ -1,7 +1,9 @@
 import time
 from chaterminal.core.logger import logger
 from chaterminal.core.events import EventType, put_event
-from chaterminal.storage.session_store import get_device_name
+from chaterminal.storage.session_store import delete_session, get_device_name
+
+SESSION_GUARD_INTERVAL = 5
 
 class PresenceService:
     def __init__(self, state, firebase_client, ws_service):
@@ -54,6 +56,59 @@ class PresenceService:
 
             time.sleep(60)
 
+    def session_guard_loop(self):
+        while self.state.running:
+            reason = self._remote_session_logout_reason()
+            if reason:
+                self._handle_remote_logout(reason)
+                return
+
+            time.sleep(SESSION_GUARD_INTERVAL)
+
+    def _remote_session_logout_reason(self):
+        if not self.state.uid or not self.state.device_id or not self.state.token:
+            return None
+
+        try:
+            res = self.firebase.get(f"chaterminal/sessions/{self.state.uid}")
+        except Exception:
+            return None
+
+        if res.status_code in (401, 403):
+            return "Your ChaTerminal session is no longer authorised."
+
+        if res.status_code != 200:
+            return None
+
+        if res.text.strip() == "null":
+            return "Your ChaTerminal session was revoked from MemerDevs settings."
+
+        try:
+            session = res.json()
+        except Exception:
+            return "Your ChaTerminal session record is invalid."
+
+        if not isinstance(session, dict):
+            return "Your ChaTerminal session record is invalid."
+
+        active_device_id = session.get("activeDeviceId")
+        if active_device_id != self.state.device_id:
+            return "You were logged out because ChaTerminal is active on another device."
+
+        return None
+
+    def _handle_remote_logout(self, reason):
+        logger.error(f"[!] {reason}")
+        delete_session()
+        self.state.token = None
+        self.state.refresh_token = None
+        put_event(self.state, EventType.LOGOUT, text=reason)
+        try:
+            if self.ws_service.ws:
+                self.ws_service.ws.close()
+        except Exception:
+            pass
+
     def fetch_online_users(self):
         try:
             res = self.firebase.get("users")

{chaterminal-2.0.0/ChaTerminal → chaterminal-2.0.1/chaterminal}/services/websocket_service.py

@@ -55,7 +55,11 @@ class WebsocketService:
                 active_id = payload.get("activeDeviceId")
                 if active_id and active_id != self.state.device_id:
                     logger.error("\n[!] Logged out from another device.")
-                    put_event(self.state, EventType.LOGOUT)
+                    put_event(
+                        self.state,
+                        EventType.LOGOUT,
+                        text="You were logged out because ChaTerminal is active on another device.",
+                    )
             elif msg_type == "message_ack":
                 logger.info(f"[+] Message acknowledged: {payload.get('msg_id', 'unknown')}")
         except Exception as e:

chaterminal-2.0.1/chaterminal/ui/console.py

@@ -0,0 +1,26 @@
+import os
+
+from rich.console import Console
+
+try:
+    from colorama import just_fix_windows_console
+
+    just_fix_windows_console()
+except Exception:
+    pass
+
+def _env_flag(name):
+    value = os.environ.get(name, "").strip().lower()
+    if not value:
+        return None
+    return value in {"1", "true", "yes", "on"}
+
+
+_color_forced = _env_flag("CHATTERMINAL_COLOR")
+
+console = Console(
+    color_system="auto",
+    force_terminal=True if _color_forced is True else None,
+    no_color=True if _color_forced is False else None,
+    highlight=False,
+)

{chaterminal-2.0.0/ChaTerminal → chaterminal-2.0.1/chaterminal}/ui/terminal_ui.py

@@ -8,6 +8,7 @@ from prompt_toolkit.patch_stdout import patch_stdout
 
 from chaterminal.core.events import EventType
 from chaterminal.core.logger import logger
+from chaterminal.storage.session_store import delete_session
 from chaterminal.ui.panels import get_user_color, activation_panel
 from chaterminal.ui.console import console
 
@@ -17,6 +18,7 @@ class TerminalUI:
         self.state = state
         self.message_service = message_service
         self.presence_service = presence_service
+        self._prompt_session = None
 
     def print_header(self):
         console.rule(f"[bold cyan]ChaTerminal v2[/bold cyan]  -  [green]{self.state.username}[/green]  -  E2EE Secure")
@@ -62,51 +64,83 @@ class TerminalUI:
     def run(self):
         """Main loop: drain event queue, then block on user input."""
         prompt = PromptSession()
+        self._prompt_session = prompt
+        self.state.wake_prompt = self._wake_prompt
 
-        with patch_stdout():
-            self.print_header()
-            self.print_history()
-            console.print("[bold green][+] Connected! Type a command below.[/bold green]\n")
-
-            while self.state.running:
-                # Drain any pending events first (non-blocking)
-                self._drain_events()
-
-                # Now block on user input
-                try:
-                    line = prompt.prompt("> ")
-                except (KeyboardInterrupt, EOFError):
-                    self.state.running = False
-                    break
-
-                if not line or not line.strip():
-                    continue
-
-                line = line.strip()
-
-                if line == "/exit":
-                    self.state.running = False
-                    break
-
-                elif line == "/help":
-                    console.print("[dim]Commands:[/dim] [yellow]/dm <user> <msg>[/yellow]  [yellow]/list[/yellow]  [yellow]/exit[/yellow]")
+        try:
+            with patch_stdout():
+                self.print_header()
+                self.print_history()
+                console.print("[bold green][+] Connected! Type a command below.[/bold green]\n")
+
+                while True:
+                    # Drain any pending events first (non-blocking)
+                    self._drain_events()
+
+                    if not self.state.running:
+                        break
+
+                    # Now block on user input
+                    try:
+                        line = prompt.prompt("> ")
+                    except (KeyboardInterrupt, EOFError):
+                        self.state.running = False
+                        break
+
+                    if not line or not line.strip():
+                        continue
+
+                    line = line.strip()
+
+                    if line == "/exit":
+                        self.state.running = False
+                        break
+
+                    elif line == "/help":
+                        console.print("[dim]Commands:[/dim] [yellow]/dm <user> <msg>[/yellow]  [yellow]/list[/yellow]  [yellow]/exit[/yellow]")
+
+                    elif line == "/list":
+                        online = self.presence_service.fetch_online_users()
+                        if online:
+                            console.print(f"[bold cyan][Online][/bold cyan] {', '.join(online)}")
+                        else:
+                            console.print("[yellow][!] No users currently online.[/yellow]")
+
+                    elif line.startswith("/dm "):
+                        parts = line.split(" ", 2)
+                        if len(parts) < 3:
+                            console.print("[red][!] Usage: /dm <username> <message>[/red]")
+                        else:
+                            self.message_service.queue_message(parts[1], parts[2])
 
-                elif line == "/list":
-                    online = self.presence_service.fetch_online_users()
-                    if online:
-                        console.print(f"[bold cyan][Online][/bold cyan] {', '.join(online)}")
                     else:
-                        console.print("[yellow][!] No users currently online.[/yellow]")
+                        console.print("[red][!] Unknown command. Try /help, /dm, /list, or /exit.[/red]")
+        finally:
+            if self.state.wake_prompt == self._wake_prompt:
+                self.state.wake_prompt = None
+            self._prompt_session = None
+
+    def _wake_prompt(self):
+        prompt = self._prompt_session
+        if not prompt:
+            return
 
-                elif line.startswith("/dm "):
-                    parts = line.split(" ", 2)
-                    if len(parts) < 3:
-                        console.print("[red][!] Usage: /dm <username> <message>[/red]")
-                    else:
-                        self.message_service.queue_message(parts[1], parts[2])
+        app = prompt.app
+
+        def exit_prompt():
+            try:
+                if app.is_running:
+                    app.exit(result="")
+            except Exception:
+                pass
 
-                else:
-                    console.print("[red][!] Unknown command. Try /help, /dm, /list, or /exit.[/red]")
+        try:
+            if app.is_running and app.loop and app.loop.is_running():
+                app.loop.call_soon_threadsafe(exit_prompt)
+            elif app.is_running:
+                exit_prompt()
+        except Exception:
+            exit_prompt()
 
     def _drain_events(self):
         """Consume all pending events from the queue without blocking."""
@@ -144,5 +178,9 @@ class TerminalUI:
             console.print(event.get("text", ""))
 
         elif event_type == EventType.LOGOUT:
-            console.print("\n[bold red][!] You were logged out from another device.[/bold red]")
+            delete_session()
+            self.state.token = None
+            self.state.refresh_token = None
+            message = event.get("text") or "You were logged out from another device."
+            console.print(f"\n[bold red][!] {message}[/bold red]")
             self.state.running = False

{chaterminal-2.0.0 → chaterminal-2.0.1}/setup.py

@@ -6,7 +6,7 @@ long_description = (this_directory / "README.md").read_text(encoding="utf-8")
 
 setup(
     name="ChaTerminal",
-    version="2.0.0",
+    version="2.0.1",
     author="Gofaone Tlalang",
     author_email="gofaone315@memerdevs.com",
     description="A terminal-based encrypted chat system for MemerDevs",

chaterminal-2.0.0/ChaTerminal/ui/console.py

@@ -1,28 +0,0 @@
-import os
-
-from rich.console import Console
-
-
-def _env_flag(name):
-    value = os.environ.get(name, "").strip().lower()
-    if not value:
-        return None
-    return value in {"1", "true", "yes", "on"}
-
-
-def supports_ansi():
-    forced = _env_flag("CHATTERMINAL_COLOR")
-    if forced is not None:
-        return forced
-
-    return False
-
-
-_use_color = supports_ansi()
-
-console = Console(
-    color_system="auto" if _use_color else None,
-    force_terminal=True if _use_color else False,
-    no_color=not _use_color,
-    highlight=False,
-)

chaterminal-2.0.0/ChaTerminal.egg-info/SOURCES.txt

@@ -1,33 +0,0 @@
-LICENSE
-README.md
-setup.py
-ChaTerminal/__init__.py
-ChaTerminal/__main__.py
-ChaTerminal/main.py
-ChaTerminal.egg-info/PKG-INFO
-ChaTerminal.egg-info/SOURCES.txt
-ChaTerminal.egg-info/dependency_links.txt
-ChaTerminal.egg-info/entry_points.txt
-ChaTerminal.egg-info/requires.txt
-ChaTerminal.egg-info/top_level.txt
-ChaTerminal/core/__init__.py
-ChaTerminal/core/events.py
-ChaTerminal/core/logger.py
-ChaTerminal/core/state.py
-ChaTerminal/core/threads.py
-ChaTerminal/crypto/__init__.py
-ChaTerminal/crypto/encryption.py
-ChaTerminal/services/__init__.py
-ChaTerminal/services/auth_service.py
-ChaTerminal/services/firebase_service.py
-ChaTerminal/services/message_service.py
-ChaTerminal/services/presence_service.py
-ChaTerminal/services/websocket_service.py
-ChaTerminal/storage/__init__.py
-ChaTerminal/storage/database.py
-ChaTerminal/storage/session_store.py
-ChaTerminal/ui/__init__.py
-ChaTerminal/ui/console.py
-ChaTerminal/ui/panels.py
-ChaTerminal/ui/splash.py
-ChaTerminal/ui/terminal_ui.py

chaterminal-2.0.0/ChaTerminal.egg-info/top_level.txt

@@ -1 +0,0 @@
-ChaTerminal