sermo 0.2.0__tar.gz → 0.3.1__tar.gz

{sermo-0.2.0 → sermo-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sermo
-Version: 0.2.0
+Version: 0.3.1
 Summary: Command-line Sermo client
 Author: Sermo
 Project-URL: Homepage, https://sermo.jyonn.space
@@ -27,6 +27,7 @@ Sermo 的命令行客户端。它直接接入 `sermo-backend` API，适合在终
 - 支持进入空间并保存登录状态。
 - 支持查看当前账户、空间成员、聊天列表、好友列表、好友申请。
 - 支持查看聊天记录、发送文字消息、持续刷新新消息、监听全局新消息。
+- 支持 `sermo tui` 打开终端聊天界面，会话列表、消息流和输入框集中展示。
 - 支持好友申请处理、好友邀请链接、私聊打开、群聊创建和成员管理。
 - 支持账号资料、联系方式绑定、通知偏好、空间创建和管理员基础操作。
 - 图片、视频、语音、文件等多媒体消息在终端中展示为 `[图片]`、`[视频]`、`[语音]`、`[文件]`；也支持上传发送图片、视频和语音文件。
@@ -91,6 +92,20 @@ sermo me
 sermo chats
 ```
 
+打开 TUI：
+
+```bash
+sermo tui
+```
+
+在 TUI 里：
+
+- `↑/↓` 切换会话。
+- 直接输入文字，按 `Enter` 发送。
+- `F5` 手动刷新。
+- `Ctrl+U` 清空输入。
+- `Ctrl+Q` 退出。
+
 打开聊天：
 
 ```bash

{sermo-0.2.0 → sermo-0.3.1}/README.md

@@ -7,6 +7,7 @@ Sermo 的命令行客户端。它直接接入 `sermo-backend` API，适合在终
 - 支持进入空间并保存登录状态。
 - 支持查看当前账户、空间成员、聊天列表、好友列表、好友申请。
 - 支持查看聊天记录、发送文字消息、持续刷新新消息、监听全局新消息。
+- 支持 `sermo tui` 打开终端聊天界面，会话列表、消息流和输入框集中展示。
 - 支持好友申请处理、好友邀请链接、私聊打开、群聊创建和成员管理。
 - 支持账号资料、联系方式绑定、通知偏好、空间创建和管理员基础操作。
 - 图片、视频、语音、文件等多媒体消息在终端中展示为 `[图片]`、`[视频]`、`[语音]`、`[文件]`；也支持上传发送图片、视频和语音文件。
@@ -71,6 +72,20 @@ sermo me
 sermo chats
 ```
 
+打开 TUI：
+
+```bash
+sermo tui
+```
+
+在 TUI 里：
+
+- `↑/↓` 切换会话。
+- 直接输入文字，按 `Enter` 发送。
+- `F5` 手动刷新。
+- `Ctrl+U` 清空输入。
+- `Ctrl+Q` 退出。
+
 打开聊天：
 
 ```bash

{sermo-0.2.0 → sermo-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sermo"
-version = "0.2.0"
+version = "0.3.1"
 description = "Command-line Sermo client"
 readme = "README.md"
 requires-python = ">=3.10"

{sermo-0.2.0 → sermo-0.3.1}/sermo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sermo
-Version: 0.2.0
+Version: 0.3.1
 Summary: Command-line Sermo client
 Author: Sermo
 Project-URL: Homepage, https://sermo.jyonn.space
@@ -27,6 +27,7 @@ Sermo 的命令行客户端。它直接接入 `sermo-backend` API，适合在终
 - 支持进入空间并保存登录状态。
 - 支持查看当前账户、空间成员、聊天列表、好友列表、好友申请。
 - 支持查看聊天记录、发送文字消息、持续刷新新消息、监听全局新消息。
+- 支持 `sermo tui` 打开终端聊天界面，会话列表、消息流和输入框集中展示。
 - 支持好友申请处理、好友邀请链接、私聊打开、群聊创建和成员管理。
 - 支持账号资料、联系方式绑定、通知偏好、空间创建和管理员基础操作。
 - 图片、视频、语音、文件等多媒体消息在终端中展示为 `[图片]`、`[视频]`、`[语音]`、`[文件]`；也支持上传发送图片、视频和语音文件。
@@ -91,6 +92,20 @@ sermo me
 sermo chats
 ```
 
+打开 TUI：
+
+```bash
+sermo tui
+```
+
+在 TUI 里：
+
+- `↑/↓` 切换会话。
+- 直接输入文字，按 `Enter` 发送。
+- `F5` 手动刷新。
+- `Ctrl+U` 清空输入。
+- `Ctrl+Q` 退出。
+
 打开聊天：
 
 ```bash

{sermo-0.2.0 → sermo-0.3.1}/sermo.egg-info/SOURCES.txt

@@ -10,4 +10,5 @@ sermo_cli/__main__.py
 sermo_cli/api.py
 sermo_cli/cli.py
 sermo_cli/formatting.py
-sermo_cli/store.py
+sermo_cli/store.py
+sermo_cli/tui.py

{sermo-0.2.0 → sermo-0.3.1}/sermo_cli/cli.py

@@ -247,6 +247,14 @@ def command_chat(args: argparse.Namespace) -> int:
         last_seen = max(last_seen, message.get("message_id") or last_seen)
 
 
+def command_tui(args: argparse.Namespace) -> int:
+    client = build_client(args)
+    require_session(client)
+    from .tui import launch_tui
+
+    return launch_tui(client, refresh_interval=args.interval, limit=args.limit)
+
+
 def command_send(args: argparse.Namespace) -> int:
     client = build_client(args)
     session = require_session(client)
@@ -791,6 +799,11 @@ def build_parser() -> argparse.ArgumentParser:
     chat.add_argument("--no-mark-read", action="store_true", help="不标记已读")
     chat.set_defaults(func=command_chat)
 
+    tui = subparsers.add_parser("tui", help="打开终端聊天界面")
+    tui.add_argument("-n", "--limit", type=int, default=40, help="每个会话初始加载消息数")
+    tui.add_argument("--interval", type=float, default=5.0, help="自动刷新间隔秒数")
+    tui.set_defaults(func=command_tui)
+
     send = subparsers.add_parser("send", help="发送一条文字消息")
     send.add_argument("chat_id", type=int)
     send.add_argument("text", nargs="*")

sermo-0.3.1/sermo_cli/tui.py

@@ -0,0 +1,362 @@
+from __future__ import annotations
+
+import curses
+import time
+import unicodedata
+from typing import Any
+
+from .api import ApiClient, SermoApiError
+from .formatting import chat_title, format_time, message_text, user_name
+
+
+def cell_width(char: str) -> int:
+    if not char:
+        return 0
+    if unicodedata.combining(char):
+        return 0
+    if unicodedata.east_asian_width(char) in {"F", "W"}:
+        return 2
+    return 1
+
+
+def display_width(text: str) -> int:
+    return sum(cell_width(char) for char in str(text))
+
+
+def clip_display(text: str, max_width: int) -> str:
+    if max_width <= 0:
+        return ""
+    used = 0
+    result: list[str] = []
+    for char in str(text).replace("\n", " "):
+        width = cell_width(char)
+        if used + width > max_width:
+            break
+        result.append(char)
+        used += width
+    return "".join(result)
+
+
+def pad_display(text: str, width: int) -> str:
+    clipped = clip_display(text, width)
+    return clipped + " " * max(0, width - display_width(clipped))
+
+
+def wrap_display(text: str, width: int) -> list[str]:
+    if width <= 0:
+        return [""]
+    lines: list[str] = []
+    current: list[str] = []
+    used = 0
+    for char in str(text).replace("\n", " "):
+        char_width = cell_width(char)
+        if used + char_width > width and current:
+            lines.append("".join(current))
+            current = []
+            used = 0
+        current.append(char)
+        used += char_width
+    lines.append("".join(current))
+    return lines or [""]
+
+
+class SermoTui:
+    def __init__(self, client: ApiClient, *, refresh_interval: float = 5.0, limit: int = 40):
+        self.client = client
+        self.refresh_interval = max(1.0, refresh_interval)
+        self.limit = max(10, limit)
+        self.session = client.store.session() or {}
+        self.self_user_id = self.session.get("user", {}).get("user_id")
+        self.space = self.session.get("space") or {}
+        self.chats: list[dict[str, Any]] = []
+        self.messages_by_chat: dict[int, list[dict[str, Any]]] = {}
+        self.last_seen_by_chat: dict[int, int] = {}
+        self.selected_index = 0
+        self.input_line = ""
+        self.status = "正在连接 Sermo..."
+        self.next_refresh_at = 0.0
+        self.running = True
+
+    def run(self) -> int:
+        curses.wrapper(self._run)
+        return 0
+
+    def _run(self, stdscr: Any) -> None:
+        curses.curs_set(1)
+        curses.use_default_colors()
+        curses.start_color()
+        self._init_colors()
+        stdscr.keypad(True)
+        stdscr.timeout(100)
+
+        self._load_initial()
+        while self.running:
+            now = time.monotonic()
+            if now >= self.next_refresh_at:
+                self._refresh_current()
+                self.next_refresh_at = now + self.refresh_interval
+            self._draw(stdscr)
+            self._handle_key(stdscr.get_wch)
+
+    @staticmethod
+    def _init_colors() -> None:
+        curses.init_pair(1, curses.COLOR_CYAN, -1)
+        curses.init_pair(2, curses.COLOR_GREEN, -1)
+        curses.init_pair(3, curses.COLOR_RED, -1)
+        curses.init_pair(4, curses.COLOR_BLACK, curses.COLOR_CYAN)
+        curses.init_pair(5, curses.COLOR_BLUE, -1)
+
+    def _load_initial(self) -> None:
+        try:
+            self.chats = self._sorted_chats(self.client.chats())
+            if self.chats:
+                self.selected_index = min(self.selected_index, len(self.chats) - 1)
+                self._load_messages(self.current_chat_id)
+                self.status = "已同步"
+            else:
+                self.status = "暂无会话"
+        except SermoApiError as exc:
+            self.status = f"加载失败：{exc.message}"
+
+    def _sorted_chats(self, chats: list[dict[str, Any]]) -> list[dict[str, Any]]:
+        return sorted(chats, key=lambda chat: chat.get("last_chat_at") or 0, reverse=True)
+
+    @property
+    def current_chat(self) -> dict[str, Any] | None:
+        if not self.chats:
+            return None
+        return self.chats[min(self.selected_index, len(self.chats) - 1)]
+
+    @property
+    def current_chat_id(self) -> int | None:
+        chat = self.current_chat
+        if not chat:
+            return None
+        return int(chat["chat_id"])
+
+    def _load_messages(self, chat_id: int | None) -> None:
+        if not chat_id:
+            return
+        messages = self.client.messages(chat_id, limit=self.limit)
+        self.messages_by_chat[chat_id] = sorted(messages, key=lambda item: item.get("message_id") or 0)
+        self.last_seen_by_chat[chat_id] = max((item.get("message_id") or 0 for item in messages), default=0)
+        self._mark_read(chat_id)
+
+    def _refresh_current(self) -> None:
+        try:
+            previous_chat_id = self.current_chat_id
+            self.chats = self._sorted_chats(self.client.chats())
+            if not self.chats:
+                self.status = "暂无会话"
+                return
+            if previous_chat_id:
+                self.selected_index = next(
+                    (index for index, chat in enumerate(self.chats) if int(chat["chat_id"]) == previous_chat_id),
+                    min(self.selected_index, len(self.chats) - 1),
+                )
+            chat_id = self.current_chat_id
+            if chat_id not in self.messages_by_chat:
+                self._load_messages(chat_id)
+            else:
+                self._load_newer_messages(chat_id)
+            self.status = f"已同步 {format_time(time.time(), full=True)}"
+        except SermoApiError as exc:
+            self.status = f"同步失败：{exc.message}"
+
+    def _load_newer_messages(self, chat_id: int | None) -> None:
+        if not chat_id:
+            return
+        last_seen = self.last_seen_by_chat.get(chat_id, 0)
+        newer = self.client.messages(chat_id, limit=50, after=last_seen)
+        if not newer:
+            return
+        current = self.messages_by_chat.get(chat_id, [])
+        by_id = {item.get("message_id"): item for item in current if item.get("message_id")}
+        for message in newer:
+            if message.get("message_id"):
+                by_id[message["message_id"]] = message
+        merged = sorted(by_id.values(), key=lambda item: item.get("message_id") or 0)
+        self.messages_by_chat[chat_id] = merged[-200:]
+        self.last_seen_by_chat[chat_id] = max(item.get("message_id") or last_seen for item in newer)
+        self._mark_read(chat_id)
+
+    def _mark_read(self, chat_id: int) -> None:
+        try:
+            self.client.mark_read(chat_id)
+        except SermoApiError:
+            pass
+
+    def _send_current_message(self) -> None:
+        chat_id = self.current_chat_id
+        text = self.input_line.strip()
+        if not chat_id or not text:
+            return
+        self.input_line = ""
+        try:
+            message = self.client.send_text(chat_id, text)
+            current = self.messages_by_chat.get(chat_id, [])
+            self.messages_by_chat[chat_id] = [*current, message]
+            self.last_seen_by_chat[chat_id] = max(self.last_seen_by_chat.get(chat_id, 0), message.get("message_id") or 0)
+            self.status = "已发送"
+            self._refresh_current()
+        except SermoApiError as exc:
+            self.status = f"发送失败：{exc.message}"
+            self.input_line = text
+
+    def _select_chat(self, offset: int) -> None:
+        if not self.chats:
+            return
+        self.selected_index = min(len(self.chats) - 1, max(0, self.selected_index + offset))
+        chat_id = self.current_chat_id
+        if chat_id and chat_id not in self.messages_by_chat:
+            try:
+                self._load_messages(chat_id)
+                self.status = "已切换会话"
+            except SermoApiError as exc:
+                self.status = f"加载失败：{exc.message}"
+
+    def _handle_key(self, get_key: Any) -> None:
+        try:
+            key = get_key()
+        except curses.error:
+            return
+
+        if key in ("\x11", "\x03"):
+            self.running = False
+            return
+        if key == curses.KEY_F5:
+            self._refresh_current()
+            return
+        if key in (curses.KEY_UP, "\x10"):
+            self._select_chat(-1)
+            return
+        if key in (curses.KEY_DOWN, "\x0e"):
+            self._select_chat(1)
+            return
+        if key in ("\n", "\r", curses.KEY_ENTER):
+            self._send_current_message()
+            return
+        if key in (curses.KEY_BACKSPACE, "\b", "\x7f"):
+            self.input_line = self.input_line[:-1]
+            return
+        if key == "\x15":
+            self.input_line = ""
+            return
+        if isinstance(key, str) and key.isprintable():
+            self.input_line += key
+
+    def _draw(self, stdscr: Any) -> None:
+        stdscr.erase()
+        height, width = stdscr.getmaxyx()
+        if height < 10 or width < 50:
+            self._add(stdscr, 0, 0, "窗口太小，请放大终端。", curses.color_pair(3), width)
+            stdscr.refresh()
+            return
+
+        left_width = min(36, max(24, width // 3))
+        main_x = left_width + 1
+        input_y = height - 2
+        help_y = height - 1
+        content_height = height - 4
+
+        title = f"Sermo TUI · {self.space.get('name') or 'Sermo'} @{self.space.get('slug') or '-'}"
+        self._add(stdscr, 0, 0, title, curses.A_BOLD | curses.color_pair(1), width)
+        self._add(stdscr, 0, max(0, width - display_width(self.status) - 1), self.status, curses.color_pair(5), width)
+        self._draw_separator(stdscr, 1, width)
+        self._draw_chats(stdscr, 2, left_width, content_height)
+        self._draw_vertical_separator(stdscr, 2, left_width, height - 3)
+        self._draw_messages(stdscr, 2, main_x, width - main_x, content_height)
+        self._draw_input(stdscr, input_y, main_x, width - main_x)
+        help_text = "↑/↓ 切换会话 · Enter 发送 · F5 刷新 · Ctrl+U 清空输入 · Ctrl+Q 退出"
+        self._add(stdscr, help_y, 0, help_text, curses.A_DIM, width)
+        stdscr.move(input_y, min(width - 1, main_x + 2 + display_width(self.input_line)))
+        stdscr.refresh()
+
+    def _draw_chats(self, stdscr: Any, top: int, width: int, height: int) -> None:
+        self._add(stdscr, top - 1, 0, "会话", curses.A_BOLD, width)
+        if not self.chats:
+            self._add(stdscr, top, 1, "暂无会话", curses.A_DIM, width)
+            return
+        visible_count = max(1, height // 2)
+        start = max(0, min(self.selected_index - visible_count + 1, len(self.chats) - visible_count))
+        visible = self.chats[start:start + visible_count]
+        for row, chat in enumerate(visible):
+            index = start + row
+            y = top + row * 2
+            selected = index == self.selected_index
+            attrs = curses.color_pair(4) | curses.A_BOLD if selected else curses.A_NORMAL
+            unread = chat.get("unread_count") or 0
+            badge = f" +{unread}" if unread else ""
+            title = chat_title(chat, self.self_user_id)
+            preview = message_text(chat.get("last_message") or {}) if chat.get("last_message") else "暂无消息"
+            line = f"{title}{badge}"
+            sub = f"  {preview}"
+            self._add(stdscr, y, 0, line, attrs, width)
+            if y + 1 < top + height:
+                self._add(stdscr, y + 1, 0, sub, attrs if selected else curses.A_DIM, width)
+
+    def _draw_messages(self, stdscr: Any, top: int, x: int, width: int, height: int) -> None:
+        chat = self.current_chat
+        if not chat:
+            self._add(stdscr, top, x, "选择一个会话开始聊天。", curses.A_DIM, width)
+            return
+
+        self._add(stdscr, top - 1, x, chat_title(chat, self.self_user_id), curses.A_BOLD, width)
+        chat_id = int(chat["chat_id"])
+        messages = self.messages_by_chat.get(chat_id, [])
+        lines = self._message_lines(messages, width)
+        visible = lines[-height:]
+        y = top
+        for line, attrs in visible:
+            self._add(stdscr, y, x, line, attrs, width)
+            y += 1
+
+    def _message_lines(self, messages: list[dict[str, Any]], width: int) -> list[tuple[str, int]]:
+        if not messages:
+            return [("暂无消息。", curses.A_DIM)]
+        lines: list[tuple[str, int]] = []
+        wrap_width = max(20, width - 2)
+        for message in messages:
+            is_self = message.get("user", {}).get("user_id") == self.self_user_id
+            author = "我" if is_self else user_name(message.get("user"))
+            text = message_text(message)
+            prefix = f"{format_time(message.get('created_at'))} {author}: "
+            attrs = curses.color_pair(2) if is_self else curses.A_NORMAL
+            prefix_width = display_width(prefix)
+            wrapped = wrap_display(text, width=max(8, wrap_width - prefix_width))
+            lines.append((prefix + wrapped[0], attrs))
+            for extra in wrapped[1:]:
+                lines.append((" " * min(prefix_width, wrap_width - 1) + extra, attrs))
+        return lines
+
+    def _draw_input(self, stdscr: Any, y: int, x: int, width: int) -> None:
+        self._draw_separator(stdscr, y - 1, stdscr.getmaxyx()[1])
+        text = f"> {self.input_line}"
+        self._add(stdscr, y, x, text, curses.A_BOLD, width)
+
+    def _draw_separator(self, stdscr: Any, y: int, width: int) -> None:
+        self._add(stdscr, y, 0, "─" * max(1, width - 1), curses.A_DIM, width)
+
+    def _draw_vertical_separator(self, stdscr: Any, top: int, x: int, bottom: int) -> None:
+        for y in range(top, bottom):
+            self._add(stdscr, y, x, "│", curses.A_DIM, 1)
+
+    @staticmethod
+    def _add(stdscr: Any, y: int, x: int, text: str, attrs: int = 0, width: int | None = None) -> None:
+        if y < 0 or x < 0:
+            return
+        max_y, max_x = stdscr.getmaxyx()
+        if y >= max_y or x >= max_x:
+            return
+        max_width = max(0, min(width or max_x - x, max_x - x))
+        if max_width <= 0:
+            return
+        safe = pad_display(str(text), max_width)
+        try:
+            stdscr.addstr(y, x, safe, attrs)
+        except curses.error:
+            pass
+
+
+def launch_tui(client: ApiClient, *, refresh_interval: float = 5.0, limit: int = 40) -> int:
+    return SermoTui(client, refresh_interval=refresh_interval, limit=limit).run()